CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-11 22:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,721 Commits 411 Branches 1,717 Tags
52e1c2f48b6750767fe1e047ff31499b727dcef9
Commit Graph

46721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
52e1c2f48b fix: allow gain/loss for Journals against Journals 
(cherry picked from commit 5b67631d40)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.py
 2024-03-02 10:07:32 +00:00
ruthra kumar
c1a0ac655e fix: make use of 'flt' to prevent really low precision exc gain/loss 
(cherry picked from commit 0aa72f841d)
 2024-03-02 10:07:31 +00:00
ruthra kumar
21a10eee0d Merge pull request #40232 from frappe/mergify/bp/version-14-hotfix/pr-40149 
fix: incorrect exchange rate if JE has multi parties (backport #40149)
 2024-03-02 15:36:15 +05:30
ruthra kumar
64bf52899f chore: resolve linter 2024-03-02 14:57:48 +05:30
ruthra kumar
572def058f test: exchange rate fetch on JE with multiple forex parties 
(cherry picked from commit ed95d41a51)
 2024-03-02 14:39:37 +05:30
ruthra kumar
e25ec4156e fix: don't override reference exchange rate 
(cherry picked from commit eaac02655b)
 2024-03-02 08:22:41 +00:00
ruthra kumar
1b5a23709a fix: incorrect exchange rate if JE has multi parties 
(cherry picked from commit 694c17487d)
 2024-03-02 08:22:38 +00:00
Raffael Meyer
d7abb21f7b Merge pull request #40209 from frappe/mergify/bp/version-14-hotfix/pr-40203 
fix(Project): filter department by company (backport #40203)
 2024-02-29 23:34:17 +01:00
barredterra
646b55eeea fix(Project): filter department by company 
(cherry picked from commit 5e736f0d06)
 2024-02-29 17:30:05 +00:00
ruthra kumar
fca70e3d03 Merge pull request #40039 from SherinKR/bank_account_validation 
fix: account validation error on bank account after editing existing bank account
 2024-02-29 17:38:34 +05:30
Gursheen Kaur Anand
aeb555a426 Merge pull request #40188 from frappe/mergify/bp/version-14-hotfix/pr-40176 
fix(minor): make warning for previously existing SO an alert (backport #40176)
 2024-02-29 11:59:44 +05:30
mergify[bot]
035c90c3b8 fix(setup): avoid duplicate entry for Analytics role (backport #40183) (#40184) 
fix(setup): avoid duplicate entry for Analytics role (#40183)

(cherry picked from commit 29f91a7919)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-02-29 11:34:23 +05:30
Gursheen Anand
c8b817c87a fix: make warning for previously existing SO an alert 
(cherry picked from commit 24dcd64c16)
 2024-02-29 06:03:26 +00:00
Deepesh Garg
19a7b6d122 Merge pull request #40169 from frappe/mergify/bp/version-14-hotfix/pr-40137 
fix: default taxable value for item not found in item list (backport #40137)
 2024-02-28 08:23:57 +05:30
ljain112
30315aba37 fix: default taxable value for item not found in item list 
(cherry picked from commit 5885978fc2)
 2024-02-27 16:39:03 +00:00
Deepesh Garg
1cc3351e6f Merge pull request #40164 from vorasmit/ic-deps-v14 
fix: add flags for repost to ensure correct accounting from India Compliance App (#40162)
 2024-02-27 22:08:29 +05:30
Smit Vora
8c772cfb9f fix: add flags for repost to ensure correct accounting from India Compliance App 2024-02-27 20:33:02 +05:30
Gursheen Kaur Anand
0b1689a3aa Merge pull request #40151 from frappe/mergify/bp/version-14-hotfix/pr-40095 
fix: unique GL account for plaid bank accounts (backport #40095)
 2024-02-27 17:47:32 +05:30
Gursheen Anand
88af431eea chore: semantic commits bump node version to 20 2024-02-27 17:20:01 +05:30
mergify[bot]
9a85ab45e7 fix: parent warehouse checks in the production plan for sub-assemblies (backport #40150) (#40156) 
fix: parent warehouse checks in the production plan for sub-assemblies

(cherry picked from commit 6f5815e44f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-27 17:18:24 +05:30
rohitwaghchaure
9ac09d1b8b Merge branch 'version-14' into version-14-hotfix 2024-02-27 17:16:56 +05:30
Gursheen Anand
22db6f6b72 fix: test for plaid bank account validation 2024-02-27 16:51:48 +05:30
Gursheen Kaur Anand
42382d2a0f Merge pull request #40153 from frappe/mergify/bp/version-14-hotfix/pr-40102 
feat: toggle updation of billed amount in previous purchase docs (backport #40102)
 2024-02-27 16:40:28 +05:30
Gursheen Kaur Anand
614119b3e1 chore: resolve conflicts 2024-02-27 16:04:34 +05:30
Gursheen Kaur Anand
8f983e6109 chore: resolve conflicts 2024-02-27 16:01:33 +05:30
Gursheen Kaur Anand
42b7be60ef chore: resolve conflicts 2024-02-27 15:57:43 +05:30
Gursheen Anand
a84fc0fe40 test: pr billed amount against debit note 
(cherry picked from commit 6d40844894)
 2024-02-27 10:23:59 +00:00
Gursheen Anand
4f87e73f55 test: po billed amount against debit note 
(cherry picked from commit 81dbfe189e)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/test_purchase_order.py
 2024-02-27 10:23:58 +00:00
Gursheen Anand
019d8f92fe feat: update billed amount in PO and PR 
(cherry picked from commit 9f6535472d)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
 2024-02-27 10:23:57 +00:00
Gursheen Anand
ad6067795f fix: remove config for default bank account in test 
(cherry picked from commit c42444ab3b)
 2024-02-27 10:10:18 +00:00
Gursheen Anand
8638d14bab fix: unique gl account for plaid bank accounts 
(cherry picked from commit bf6e32a960)
 2024-02-27 10:10:18 +00:00
Gursheen Kaur Anand
317738dc36 Merge pull request #40063 from frappe/mergify/bp/version-14-hotfix/pr-40035 
fix: delete PLE containing invoice in against (backport #40035)
 2024-02-27 12:41:42 +05:30
Gursheen Anand
65a2adfc55 fix: linting issue 2024-02-27 12:16:08 +05:30
Gursheen Kaur Anand
674f577647 Merge pull request #40065 from frappe/mergify/bp/version-14-hotfix/pr-40040 
fix: skip max discount validation for rate adjustment (backport #40040)
 2024-02-27 10:51:02 +05:30
Gursheen Anand
e289aef1b4 fix: linting issue 2024-02-27 09:59:08 +05:30
Nihantra C. Patel
193cd0db96 fix: sales funnel text color in light/dark theme (#40132) 
* fix: sales funnel text color in light/dark theme

* fix: sales funnel text color in light/dark theme
 2024-02-26 23:01:41 +05:30
ruthra kumar
ac3c23922a Merge pull request #40134 from frappe/mergify/bp/version-14-hotfix/pr-40133 
fix: reset advance amount on unreconciliation of Sales/Purchase Orders (backport #40133)
 2024-02-26 21:32:23 +05:30
ruthra kumar
812eebf1ab fix: use correct variable name for hotfix branches 2024-02-26 20:32:48 +05:30
mergify[bot]
8a573a1aff fix: capacity planning issue in the job card (backport #40092) (#40100) 
* fix: capacity planning issue in the job card (#40092)

* fix: capacity planning issue in the job card

* test: test case to test capacity planning for workstation

(cherry picked from commit 75f8464724)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py
#	erpnext/manufacturing/doctype/work_order/test_work_order.py

* chore: fix conflicts

* chore: fix conflicts

* chore: fix test cases

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-26 18:52:05 +05:30
ruthra kumar
58c869c562 test: advance paid update on sales/purchase order unreconciliation 
(cherry picked from commit 1f01ff3487)
 2024-02-26 12:22:33 +00:00
ruthra kumar
fe88a110b1 fix: on unreconciliation, update advance paid 
(cherry picked from commit c9e2f03a3a)
 2024-02-26 12:22:33 +00:00
ruthra kumar
5772cb1953 Merge pull request #40117 from frappe/mergify/bp/version-14-hotfix/pr-40113 
refactor: patch to setup dimensions in Reconciliation tool (backport #40113)
 2024-02-26 14:21:49 +05:30
ruthra kumar
6828a2d46d refactor: patch to setup dimensions in Reconciliation tool 
(cherry picked from commit 461fb183fc)
 2024-02-26 13:10:44 +05:30
Gursheen Kaur Anand
8e1ec5ff31 Merge pull request #40108 from frappe/mergify/bp/version-14-hotfix/pr-40105 
fix(minor): tax amount label according to party type (backport #40105)
 2024-02-26 11:09:53 +05:30
Gursheen Kaur Anand
48dd8acfa1 Merge pull request #40110 from frappe/mergify/bp/version-14-hotfix/pr-40062 
fix: sales person / partner achieved targets in report (backport #40062)
 2024-02-26 11:08:43 +05:30
Gursheen Anand
57f4eb121c test: sales person target variance 
(cherry picked from commit 7566c1ee78)
 2024-02-26 05:09:41 +00:00
Gursheen Anand
89d19422d1 feat: show contributed qty in transaction summary 
(cherry picked from commit a823f16dff)
 2024-02-26 05:09:40 +00:00
Gursheen Anand
0484857402 fix: only consider contributed qty towards achieved targets 
(cherry picked from commit 339698d172)
 2024-02-26 05:09:40 +00:00
Gursheen Anand
bb3a7cdb3d fix: amount label according to party type 
(cherry picked from commit 9c8d103d8a)
 2024-02-26 05:05:27 +00:00
ruthra kumar
b3735d29bf Merge pull request #40090 from frappe/mergify/bp/version-14-hotfix/pr-40073 
refactor: update payments section on item removal (backport #40073)
 2024-02-25 09:29:51 +05:30