CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-09 21:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,776 Commits 411 Branches 1,714 Tags
1ddb162ef1beef447189fe49eec423baae29f395
Commit Graph

46776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
1ddb162ef1 chore: update popup message 
(cherry picked from commit adf13a19c4)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-03-13 06:12:43 +00:00
ruthra kumar
4d6b56e55b refactor: checkbox to toggle always standalone credit note 
(cherry picked from commit 2cefe2a20e)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
 2024-03-13 06:12:43 +00:00
mergify[bot]
cd40038b18 fix: conditionally apply is_group filter in accounting dimension query (backport #40414) (#40415) 
fix: conditionally apply `is_group` filter in accounting dimension query (#40414)

(cherry picked from commit daf4ae2a6b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-03-12 20:45:43 +05:30
Raffael Meyer
3dd4514478 Merge pull request #40405 from frappe/mergify/bp/version-14-hotfix/pr-40403 
fix: error message wording (backport #40403)
 2024-03-12 14:33:59 +01:00
mergify[bot]
c413b04539 fix: incorrect work order status (backport #40407) (#40410) 
fix: incorrect work order status (#40407)

(cherry picked from commit 948297692e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 18:34:35 +05:30
mergify[bot]
21b57d9aef fix: qc created for raw materials during manufacture entry (backport #40408) (#40412) 
fix: qc created for raw materials during manufacture entry (#40408)

(cherry picked from commit f8a1a7f515)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 18:29:21 +05:30
Raffael Meyer
05e4517094 chore: resolve conflicts 2024-03-12 12:35:17 +01:00
Raffael Meyer
74023035af fix: error message wording (#40403) 
(cherry picked from commit 79a0473705)

# Conflicts:
#	erpnext/accounts/doctype/subscription/subscription.py
 2024-03-12 11:26:23 +00:00
mergify[bot]
06e38749bc fix: recursion issue while submitting work order (backport #40400) (#40401) 
* fix: recursion issue while submitting work order (#40400)

(cherry picked from commit 72614bb8ff)

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

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 16:53:48 +05:30
mergify[bot]
80df6094e3 fix: barcode field on line item not working (backport #40381) (#40383) 
fix: barcode field on line item not working (#40381)

(cherry picked from commit 0da19a40a7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 13:49:08 +05:30
rohitwaghchaure
ffd04b3960 fix: subcontracting receipt -> alllow to change Batch / Serial Nos (v14) (#40371) 
fix: subcontracting receipt -> alllow to change Batch / Serial Nos
 2024-03-11 16:42:13 +05:30
mergify[bot]
c6fe409b56 fix: MR Default Supplier search query (backport #40273) (#40350) 
fix: MR Default Supplier search query

(cherry picked from commit c0a1f298a1)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-03-11 11:07:48 +05:30
Ankush Menat
6b88cca9ad Merge pull request #40367 from ankush/mergify/bp/version-14-hotfix/pr-40206 
style: format js code
 2024-03-11 11:07:06 +05:30
Ankush Menat
4c629d31c6 style: format js files 2024-03-11 11:03:58 +05:30
barredterra
c46be27e9e ci: add prettier to pre-commit 
(cherry picked from commit 2c16036ef3)
 2024-03-11 11:03:56 +05:30
Deepesh Garg
2e45a3f491 Merge pull request #40363 from frappe/mergify/bp/version-14-hotfix/pr-40344 
fix: get_user_default_as_list args order (#40344)
 2024-03-10 22:32:29 +05:30
Deepesh Garg
3bea2d4d1d Merge pull request #40357 from frappe/mergify/bp/version-14-hotfix/pr-40323 
fix: Filter for projects in Sales Cycle (#40323)
 2024-03-10 22:32:11 +05:30
Devin Slauenwhite
e0d1b4b15f fix: get_user_default_as_list args order 
(cherry picked from commit ac1961b687)
 2024-03-10 15:45:31 +00:00
Deepesh Garg
306e76874d Merge pull request #40359 from frappe/mergify/bp/version-14-hotfix/pr-40325 
fix: Sender email in process statements of accounts (#40325)
 2024-03-10 19:57:28 +05:30
Deepesh Garg
407f0b929e Merge pull request #40009 from govindsmenokee/patch-12 
fix: UAE tax computation fix
 2024-03-10 19:55:39 +05:30
Deepesh Garg
d57af37ec7 Merge pull request #39724 from GursheenK/subscription-failed-msg 
fix: message for failed subscription process
 2024-03-10 19:33:41 +05:30
Deepesh Garg
ec3913fdd3 Merge pull request #40089 from frappe/mergify/bp/version-14-hotfix/pr-31463 
feat: german translations (#31463)
 2024-03-10 19:29:07 +05:30
Deepesh Garg
ea605e76a3 fix: Sender email in process statements of accounts 
(cherry picked from commit 65a2f3d12c)
 2024-03-10 13:57:34 +00:00
Deepesh Garg
8d63d19d45 fix: Filter for projects in Sales Cycle 
(cherry picked from commit d0e0b66b2f)
 2024-03-10 13:56:50 +00:00
Deepesh Garg
12d260c444 Merge pull request #40336 from frappe/mergify/bp/version-14-hotfix/pr-40334 
fix: load ignored doctype and include Mode of Payment Account (#40334)
 2024-03-10 19:25:24 +05:30
Nihantra C. Patel
411157c258 fix: load ignored doctype and include Mode of Payment Account (#40334) 
(cherry picked from commit 68baa3612a)
 2024-03-07 12:14:10 +00:00
Raffael Meyer
b29e70a126 Merge pull request #40320 from frappe/mergify/bp/version-14-hotfix/pr-40317 
fix(Shipment Parcel): make length, width and height non-mandatory (backport #40317)
 2024-03-06 19:49:47 +01:00
barredterra
911a582941 fix(Shipment Parcel): make length, width and height non-mandatory 
It's tedious to enter all these values and some shipping providers only need to know the weigth and quantity. Companies can alwas cutomize the values to be mandatory, but the reverse is not possible. I'll make sure that the erpnext-shipping app does not break because of this (or fix any problems).

(cherry picked from commit 898c6e30eb)
 2024-03-06 18:26:20 +00:00
ruthra kumar
83734c6be4 Merge pull request #40283 from frappe/mergify/bp/version-14-hotfix/pr-40278 
fix: incorrect TCS on customer and suppliers with same name (backport #40278)
 2024-03-05 15:48:27 +05:30
ruthra kumar
af568464db fix: incorrect TCS on customer and suppliers with same name 
(cherry picked from commit 9904a9868c)
 2024-03-05 09:54:47 +00:00
mergify[bot]
091d6f330a fix: do not allow to cancel incomplete reposting (backport #40224) (#40229) 
* fix: do not allow to cancel incomplete reposting (#40224)

(cherry picked from commit 72ac56b6c4)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-04 13:14:32 +05:30
Gursheen Kaur Anand
cc923f50ef Merge pull request #40257 from GursheenK/remove-balance-fetching-in-JV 
perf: remove unnecessary fetching of balances in JV
 2024-03-04 11:16:01 +05:30
Gursheen Anand
2f8fe17b60 refactor: remove controller logic for setting balances 2024-03-04 00:37:29 +05:30
Gursheen Anand
e3d6f70eee refactor: exclude balances while setting currency 2024-03-04 00:37:26 +05:30
Gursheen Anand
a1c22811a2 refactor: exclude balance while setting acc details 2024-03-04 00:35:54 +05:30
Gursheen Anand
d715c29edc refactor: remove balance formatter 2024-03-04 00:35:54 +05:30
Gursheen Anand
85a7ce6d30 refactor: remove balance fields from jv account 2024-03-04 00:35:51 +05:30
Gursheen Kaur Anand
c42d7505bd Merge pull request #40204 from frappe/mergify/bp/version-14-hotfix/pr-39584 
fix: use receipt amount for reverse provisional entry (backport #39584)
 2024-03-03 18:24:57 +05:30
Gursheen Kaur Anand
29f4e68827 Merge pull request #40251 from frappe/mergify/bp/version-14-hotfix/pr-40250 
fix(minor): company filter in cost center allocation (backport #40250)
 2024-03-03 18:24:42 +05:30
Gursheen Anand
38baf8d406 feat: add company filter to child table field 
(cherry picked from commit 51909077bd)
 2024-03-03 12:45:33 +00:00
Gursheen Anand
89e7ad790f chore: linting issue 2024-03-03 18:00:10 +05:30
mergify[bot]
b937c4be4f fix: rate change on changing of the qty (backport #40241) (#40242) 
fix: rate change on changing of the qty (#40241)

(cherry picked from commit e7d707797a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-02 16:49:40 +05:30
ruthra kumar
793fdf9562 Merge pull request #40238 from frappe/mergify/bp/version-14-hotfix/pr-40220 
refactor: Gain/Loss Journal creation for Journals against Journals (backport #40220)
 2024-03-02 16:25:32 +05:30
ruthra kumar
753223da78 chore: resolve merge conflict 2024-03-02 16:00:29 +05:30
ruthra kumar
46063518d7 test: gain/loss on Journals against Journals 
(cherry picked from commit 8a5078b826)

# Conflicts:
#	erpnext/controllers/tests/test_accounts_controller.py
 2024-03-02 10:07:33 +00:00
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