schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,616 Commits 322 Branches 1,581 Tags
dc0bb220ed2d7a7e0bb2db8d284480d051b9e221
Commit Graph

2536 Commits

Author SHA1 Message Date
mergify[bot]
dc0bb220ed fix: multiple issues related to serial and batch bundle (backport #41662) (#41668) 
* fix: multiple issues related to serial and batch bundle (#41662)

(cherry picked from commit ce834f5dba)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-05-28 21:57:13 +05:30
mergify[bot]
17ea958170 fix: SCR batch qty issue (backport #41595) (#41599) 
fix: SCR batch qty issue (#41595)

(cherry picked from commit 418439b58f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-05-23 16:30:30 +05:30
mergify[bot]
0a36139ef4 fix: convert invoice_portion value from str to float (backport #41485) (#41555) 
fix: convert invoice_portion value from str to float (#41485)

(cherry picked from commit a1d489195d)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-05-20 18:36:48 +05:30
mergify[bot]
a070ad786d fix: not able to submit landed cost voucher (backport #41481) (#41486) 
fix: not able to submit landed cost voucher (#41481)

(cherry picked from commit 81a9521f04)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-05-15 18:05:39 +05:30
“Khushi
9b3f309598 refactor: renamed purchase receipt amount field to purchase amount 
(cherry picked from commit 31841b4ab2)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/assets/doctype/asset/asset.py
#	erpnext/patches.txt
 2024-05-14 12:47:53 +00:00
Nihantra C. Patel
5c1043fe88 fix: correct ordered qty on SO when removing PO item - v15 (#41342) 2024-05-06 21:36:27 +05:30
Nikhil Kothari
ee9822fd42 fix: party and party type label on accounting preview 
(cherry picked from commit f7f3b22786)
 2024-04-29 13:24:48 +00:00
Rohit Waghchaure
4555f8a9a6 feat: allow to do reposting for all transactions (audit) 
(cherry picked from commit aefbe21b46)

# Conflicts:
#	erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
 2024-04-26 08:15:11 +00:00
mergify[bot]
93242ca883 fix: validate uom is integer for PR item (backport #41074) (#41077) 
fix: validate uom is integer for PR item

(cherry picked from commit 9a290fdfc9)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-04-18 07:53:20 +05:30
mergify[bot]
1ae447e4fc fix: do not add qty to supplied items (backport #41061) (#41066) 
fix: do not add qty to supplied items

(cherry picked from commit 8233c392fb)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-04-17 17:30:43 +05:30
ruthra kumar
59950290a2 test: exc gain/loss journals booking in Payable accounts 
(cherry picked from commit 8821c98625)
 2024-04-16 05:29:53 +00:00
ruthra kumar
361d7f1ba5 fix: incorrect exc gain/loss for PE against JE for payable accounts 
(cherry picked from commit 81b574053f)
 2024-04-16 05:29:52 +00:00
Rohit Waghchaure
5de9b6ac75 fix: do not validate batch qty for LCV 
(cherry picked from commit baf0c83cc5)
 2024-04-12 08:36:12 +00:00
rohitwaghchaure
ea8c57263b Merge pull request #40969 from frappe/mergify/bp/version-15-hotfix/pr-40967 
fix: zero division error (backport #40967)
 2024-04-11 18:15:36 +05:30
Rohit Waghchaure
e9c6c5a8eb fix: zero division error 
(cherry picked from commit f9e230e758)
 2024-04-11 12:25:39 +00:00
Rohit Waghchaure
4e215c6b7b fix: landed cost voucher for legacy pr with batch 
(cherry picked from commit fa91cda46c)
 2024-04-11 12:12:52 +00:00
Nabin Hait
91fe25356e Merge pull request #40960 from nabinhait/itemised-tds-breakup-v15-hotfix 
fix: Show itemised TDS breakup based on Apply TDS checkbox on item level
 2024-04-11 11:49:34 +05:30
Nabin Hait
5e9f31cf21 fix: Ignore permissions while fetching module settings properties 2024-04-11 11:23:19 +05:30
Nabin Hait
4e3c885808 fix: Show itemised TDS breakup based on Apply TDS checkbox on item level 2024-04-11 11:20:38 +05:30
Deepesh Garg
3b179bad89 fix: Values in transaciton currency 
(cherry picked from commit a3c9fd6567)
 2024-04-10 15:16:39 +00:00
Akhil Narang
7828eee014 fix(treewide): manual ruff fixes 
(cherry picked from commit f63396ef47)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 16:11:10 +05:30
Akhil Narang
960ef14b7a refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 14:15:58 +05:30
Smit Vora
4ef4466e67 feat: new hook fields_for_group_similar_items to group additional fields for print formats (#40831) 
(cherry picked from commit f7c9e1538b)
 2024-04-08 10:18:24 +00:00
ruthra kumar
e9b87fdd42 refactor: merge taxes from delivery note to Sales Invoice 
(cherry picked from commit 550cbbd91c)
 2024-04-08 09:09:46 +00:00
ruthra kumar
4b78eb7e76 test: payment against JE reconciliation with different rates 
(cherry picked from commit fe84558b77)
 2024-04-05 05:04:02 +00:00
Deepesh Garg
5117494a52 fix: Recalculate sales commission on item update 
(cherry picked from commit f76da50b7e)
 2024-04-01 15:09:05 +00:00
Rohit Waghchaure
d2a6509950 fix: button to select serial / batch bundle in the subcontracting receipt 
(cherry picked from commit d73b1f3e6a)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
#	erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
 2024-03-30 05:54:14 +00:00
ruthra kumar
fd33437d7a test: varying posting date for gain loss journal 
(cherry picked from commit 514d5434a3)
 2024-03-28 10:59:24 +00:00
ruthra kumar
125722ae41 refactor: pass gain loss posting date to controller 
(cherry picked from commit 7e600a6494)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-03-28 10:59:24 +00:00
Rohit Waghchaure
3761e74436 fix: do not fetch received items in purchase receipt 
(cherry picked from commit 5bff434902)
 2024-03-27 17:11:25 +00:00
Rohit Waghchaure
79d047802a fix: existing batch from different warehouse not showing in the dropdown 
(cherry picked from commit 662cf21afb)
 2024-03-26 10:35:51 +00:00
Rohit Waghchaure
9ec24bcc6c fix: use serial/batch fields for subcontracting receipt and in transit stock entry 
(cherry picked from commit 3423334e4f)
 2024-03-24 10:34:52 +00:00
Deepesh Garg
313350534f fix: Remove custom queries for customer 
(cherry picked from commit 60ba25caf2)
 2024-03-16 14:34:36 +00:00
Deepesh Garg
2512d4c7f2 chore: Remove custom party queries 
(cherry picked from commit c9623b6fd6)
 2024-03-16 14:34:36 +00:00
ruthra kumar
78eb6bd9ea Merge pull request #40466 from frappe/mergify/bp/version-15-hotfix/pr-40461 
refactor: disallow '0' qty return invoices with stock effect (backport #40461)
 2024-03-16 10:05:22 +05:30
mergify[bot]
61d59b392a fix: serial and batch for internal transfer (backport #40467) (#40477) 
fix: serial and batch for internal transfer (#40467)

* fix: serial and batch for internal transfer

* chore: fix test cases

(cherry picked from commit 59222813af)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-15 18:19:56 +05:30
Gursheen Anand
8242a9cd46 fix: use in_import flag for checking imported records 
(cherry picked from commit f504f2caf3)
 2024-03-15 07:16:26 +00:00
Gursheen Anand
9cdde50f7c fix: auto-update due date for invoices via data import 
(cherry picked from commit c096133897)
 2024-03-15 07:16:25 +00:00
ruthra kumar
144aec8d6a refactor: disallow '0' qty return invoices with stock effect 
(cherry picked from commit 898affbee9)
 2024-03-15 05:37:36 +00:00
ruthra kumar
bfa78aaf74 fix: advance journal fetching logic in Advances section 
(cherry picked from commit e786a93c2e)
 2024-03-14 10:06:05 +00:00
mergify[bot]
ce2626e911 fix: incorrect gross profit on the quotation (backport #40438) (#40442) 
fix: incorrect gross profit on the quotation (#40438)

(cherry picked from commit f4a945aee4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-13 21:56:20 +05:30
ruthra kumar
70375dfbde refactor: pass 'name' to get_link_to_form 2024-03-13 13:15:07 +05:30
ruthra kumar
1093e0d46f chore: resolve conflicts 2024-03-13 12:17:46 +05:30
ruthra kumar
d87b98d945 chore: better popup message 
(cherry picked from commit 445d2acf50)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-03-13 06:13:11 +00:00
ruthra kumar
b5f22c39ec chore: update popup message 
(cherry picked from commit adf13a19c4)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-03-13 06:13:10 +00:00
mergify[bot]
40752c1f5c fix: conditionally apply is_group filter in accounting dimension query (backport #40414) (#40416) 
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:31 +05:30
mergify[bot]
32660abdc8 fix: Use serial/batch fields for delivery note return (backport #40374) (#40376) 
fix: Use serial/batch fields for delivery note return (#40374)

fix: User serial/batch fields for delivery note return
(cherry picked from commit b9a8dd468b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-11 17:27:02 +05:30
Deepesh Garg
173b3b85f6 fix: Filter for projects in Sales Cycle 
(cherry picked from commit d0e0b66b2f)
 2024-03-10 13:57:13 +00:00
ruthra kumar
d6a3b179ec refactor(test): make sure party has USD account 
1. Don't reset 'party_account_currency' of SO/PO  upon Payment Entry
cancellation. This happens when there are no payments against a SO/PO

(cherry picked from commit e52c4c8f22)
 2024-03-10 11:09:54 +00:00
ruthra kumar
6a5a941a5a fix: advance paid amount and ledger entries against SO/PO 
(cherry picked from commit d9a0494fc3)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-03-10 11:09:53 +00:00