nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,052 Commits 401 Branches 1,700 Tags
34deab5b71c84f9d98911a2c19c730117a1862cd
Commit Graph

38052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akash Krishna
34deab5b71 fix: Healthcare Practitioner - query (#28303) 2021-11-23 17:48:50 +05:30
mergify[bot]
623cef1032 fix: Replace 'parent' with 'invoice_or_item' (#28516) 2021-11-23 14:02:54 +05:30
mergify[bot]
b7c63212cd fix: POS Item cart only taxes with amount displayed (#28515) 2021-11-23 11:41:24 +05:30
mergify[bot]
adcf906d1c fix: Employee link formatter showing incorrect value for Employee Name (#28504) (#28514) 
(cherry picked from commit 5ba1bc1572)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-23 09:39:10 +05:30
mergify[bot]
294de89b9b fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (#28497) (#28505) 
* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim

* fix: Expense Claim Advance form labels

(cherry picked from commit e7eef9601d)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-11-23 08:52:31 +05:30
Deepesh Garg
fe94ec6036 Merge pull request #28502 from frappe/mergify/bp/version-13-hotfix/pr-28469 
fix: FY query returning None for new company (backport #28469)
 2021-11-22 20:20:07 +05:30
Subin Tom
b68d5f86f9 fix: FY query returning None for new company 
(cherry picked from commit 350ed1a6c2)
 2021-11-22 13:53:44 +00:00
mergify[bot]
3bdf5c8673 fix: KSA Invoice print format for multicurrency invoices (#28496) 2021-11-22 18:25:21 +05:30
mergify[bot]
358205b177 feat: Accounts, Selling & Assets Onboarding cleanup (#28491) 2021-11-22 16:45:23 +05:30
Anupam Kumar
295dc32bd2 Merge pull request #28436 from anupamvs/crm-lead-validate-cleanup 
fix: lead validate function cleanup
 2021-11-22 14:43:47 +05:30
Anupam Kumar
08717192c7 Merge branch 'version-13-hotfix' into crm-lead-validate-cleanup 2021-11-22 14:43:34 +05:30
mergify[bot]
b6b45c6275 fix: POS string translation (#28490) 2021-11-22 13:58:47 +05:30
mergify[bot]
dff3decd56 fix: Closed status error in Work Order Summary (backport #28460) 
* fix: Closed status error in Work Order Summary (#28460)

* fix: Closed status error in Work Order Summary

* chore: use get_meta to get status options

* refactor: simplify code

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit aa689874e3)

# Conflicts:
#	erpnext/manufacturing/report/work_order_summary/work_order_summary.py

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-22 13:24:25 +05:30
Saqib
2a7ca32296 Merge pull request #28480 from frappe/mergify/bp/version-13-hotfix/pr-28402 
fix: Gross Profit report totals (backport #28402)
 2021-11-22 13:15:30 +05:30
mergify[bot]
d8025b37cd feat: create party link from customer/supplier (#28481) 2021-11-22 13:15:12 +05:30
mergify[bot]
464428b15a fix: cost center wise ledger posting for pcv (#28482) 2021-11-22 13:14:53 +05:30
mergify[bot]
7c731147ba fix: Add extra column to display Invoice or Item when grouped by Invoice (#28483) 2021-11-22 13:14:38 +05:30
Ankush Menat
f4797ac5e3 fix: don't use cached doc while reposting 
(cherry picked from commit c436e30ee6)
 2021-11-22 13:08:21 +05:30
Ankush Menat
636a6fcae0 fix: ignore permissions while creating repost 
If user reached this code then they already have permission to create
stock transaction, hence ignore permission checks while
creating/cancelling repost item valuation entries.

(cherry picked from commit aa024fc9da)
 2021-11-22 13:08:21 +05:30
Ankush Menat
1267543064 fix: restrict repost valuation to manager roles 
(cherry picked from commit 42f1dd98dd)
 2021-11-22 13:08:21 +05:30
Anupam Kumar
3fa8b8956f Merge branch 'version-13-hotfix' into crm-lead-validate-cleanup 2021-11-22 13:04:18 +05:30
mergify[bot]
705319e563 fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (#28478) 2021-11-22 12:22:16 +05:30
mergify[bot]
c3c35c5ab5 fix: add child button in coa tree (#28479) 2021-11-22 12:21:56 +05:30
GangaManoj
46621bc3b1 fix: Replace 'Totals' with 'Total' 
(cherry picked from commit 1affa12b74)
 2021-11-22 06:51:55 +00:00
GangaManoj
53d1733162 fix: Display totals row in bold 
(cherry picked from commit 508a2301ee)
 2021-11-22 06:51:55 +00:00
GangaManoj
e9f599de5d fix: Remove unnecessary condition 
(cherry picked from commit c7ffe3a7b4)
 2021-11-22 06:51:54 +00:00
GangaManoj
85bf2574be fix: Add totals row when Grouped By Invoice 
(cherry picked from commit 582a7ae964)
 2021-11-22 06:51:54 +00:00
GangaManoj
826d4051a8 fix: Remove default Totals row 
(cherry picked from commit 3aaf7cb408)
 2021-11-22 06:51:54 +00:00
mergify[bot]
063d474cd0 refactor!: remove abbreviation renaming (#28441) 2021-11-22 11:36:56 +05:30
Deepesh Garg
707c41af3b Merge pull request #28475 from frappe/mergify/bp/version-13-hotfix/pr-28471 
fix: bug with qrcode generation due to default print format name (backport #28471)
 2021-11-22 11:17:10 +05:30
Saqib
5266b34010 fix(e-invoicing): totals validation of e-invoices (#28418) 2021-11-22 10:57:05 +05:30
Saqib Ansari
9d58613159 fix: bug with qrcode generation due to default print format name 
(cherry picked from commit ac27391a1f)
 2021-11-22 05:08:36 +00:00
mergify[bot]
cca51f5a6e fix: coa balance rendering bug (#28472) 2021-11-20 15:47:02 +05:30
Deepesh Garg
b4f20a43d8 Merge pull request #28459 from deepeshgarg007/gst_category_set_fix 
fix(India): GST category not getting auto updated
 2021-11-19 12:21:12 +05:30
Deepesh Garg
cdbc991e3f fix: Add test for gst category check 2021-11-19 11:58:44 +05:30
Deepesh Garg
f8a26a9fac fix(India): GST category not getting auto updated 2021-11-19 11:03:13 +05:30
Marica
4a4b327026 Merge pull request #28412 from frappe/mergify/bp/version-13-hotfix/pr-28269 
refactor:  (ux) Accepted/Rejected/Received Qty UX (backport #28269)
 2021-11-18 15:40:15 +05:30
marination
1d706fd0f7 fix: (server test) Missing variable declaration 2021-11-18 15:19:12 +05:30
Ankush Menat
5052989957 test: basic test for serialize reco cancel 
(cherry picked from commit ed99aca36f)
 2021-11-18 14:35:36 +05:30
Ankush Menat
098d6ccedf fix: can not cancel stock reconciliation with sr no 
(cherry picked from commit 8c85012a70)
 2021-11-18 14:35:36 +05:30
mergify[bot]
840256ee31 chore: remove manual collapsing of section (#28435) (#28450) 
(cherry picked from commit 8102e4a210)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-18 14:12:27 +05:30
mergify[bot]
a60c64857a fix: unchecking the "With Operations" in BOM clears operations table (backport #28446) (#28447) 
* fix: unchecking the "With Operations" in BOM clears operations table #28446

(cherry picked from commit 488d34af1f)

# Conflicts:
#	erpnext/manufacturing/doctype/bom/bom.js

* fix: resolve conflict

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-18 14:11:45 +05:30
Anupam Kumar
9346398e19 Merge branch 'version-13-hotfix' into crm-lead-validate-cleanup 2021-11-18 10:38:32 +05:30
Ankush Menat
38d956f9f9 Merge branch 'version-13-hotfix' into mergify/bp/version-13-hotfix/pr-28269 2021-11-17 19:38:57 +05:30
mergify[bot]
3359c547d6 fix: (style) Warehouse Capacity Dashboard UI (#28438) 
- Made refresh button icon visible
- Edit Capacity button size and alignment
- Medium font on dashboard

(cherry picked from commit 23486a929d)

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2021-11-17 19:37:38 +05:30
mergify[bot]
b961ad6789 fix: added job_card_item link in material request (#28222) (#28433) 
* fix: added job_card_item links in material request

* fix: add no copy to row references

(cherry picked from commit cb064b06ad)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-11-17 19:37:08 +05:30
Anupam
8343a1d81e fix: linter issue 2021-11-17 18:27:58 +05:30
Anupam
b876d5b328 fix: linter issue 2021-11-17 18:24:32 +05:30
Anupam
dbda20a71f Merge branch 'crm-lead-validate-cleanup' of github.com:anupamvs/erpnext into crm-lead-validate-cleanup 2021-11-17 17:45:13 +05:30
Anupam
00b1d33ec6 fix: linter issue 2021-11-17 17:44:42 +05:30