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

2665 Commits

Author SHA1 Message Date
ruthra kumar
c90d33acc3 test: exc gain/loss posting date based on configuration 
(cherry picked from commit 2f3281579a)
 2025-01-24 04:50:32 +00:00
ruthra kumar
ccaf0d4b85 refactor: only apply configuration on normal payments 
patch to update default value

(cherry picked from commit b2c3da135e)
 2025-01-24 04:50:32 +00:00
venkat102
70ed8b78d2 fix: include pos invoice in modifing key for returned item validation 
(cherry picked from commit 2936139c79)
 2025-01-21 11:06:17 +00:00
ruthra kumar
c76ac04ddd Merge pull request #45314 from frappe/mergify/bp/version-15-hotfix/pr-45271 
fix: round off tax withholding amount (backport #45271)
 2025-01-21 13:55:03 +05:30
ruthra kumar
085d80521c Merge pull request #45316 from frappe/mergify/bp/version-15-hotfix/pr-45275 
fix: Ambiguous column error while creating Sales Return (backport #45275)
 2025-01-20 12:13:39 +05:30
Nabin Hait
842d72f7c4 fix: Ambiguous column error while creating Sales Return (#45275) 
(cherry picked from commit ec487c14d9)
 2025-01-17 11:22:22 +00:00
Lakshit Jain
3c10d809b0 fix: round off tax withholding amount (#45271) 
(cherry picked from commit ada272a29b)
 2025-01-17 11:21:15 +00:00
rohitwaghchaure
e965b6ef45 fix: sales return for multi-uom (#45303) 
(cherry picked from commit 9163f60191)
 2025-01-17 11:07:38 +00:00
Rohit Waghchaure
2f2554e9e5 fix: auto fetch batch and serial no for draft stock transactions 
(cherry picked from commit 88ab9be79c)

# Conflicts:
#	erpnext/stock/get_item_details.py
 2025-01-14 07:06:32 +00:00
Rohit Waghchaure
87405f0753 fix: issue in returning components against the SCO 
(cherry picked from commit 729ce1dc50)
 2025-01-07 13:02:09 +00:00
mergify[bot]
500deff3e9 feat: validate discount date in payment schedule (backport #44646) (#44727) 
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2025-01-03 13:19:34 +01:00
Mihir Kandoi
b3b808335f fix: Fixed logic in if condition causing tests to fail 
(cherry picked from commit 575fb43f9c)
 2025-01-01 11:06:27 +00:00
Mihir Kandoi
66544bfa10 fix: Added patch and fallback code to prevent future issues similiar to helpdesk ticket 28246 
(cherry picked from commit 65dc3505c4)

# Conflicts:
#	erpnext/patches.txt
 2025-01-01 11:06:27 +00:00
ruthra kumar
e09fb87597 refactor: use existing method parameters 2024-12-31 17:12:34 +05:30
ruthra kumar
885dd31c5c chore: resolve conflict 2024-12-31 15:54:06 +05:30
ljain112
8885b07114 fix: update item_tax_rate in backend 
(cherry picked from commit de54c0b41f)

# Conflicts:
#	erpnext/controllers/taxes_and_totals.py
 2024-12-31 10:21:39 +00:00
Khushi Rawat
b8922823a3 fix: remove unused variable 2024-12-31 12:55:41 +05:30
Khushi Rawat
00ae829d89 fix: resolved conflicts 2024-12-31 12:43:38 +05:30
Khushi Rawat
839ffb3f2a fix: copy accounting dimensions to asset and sales invoice (#44964) 
* fix: copy accounting dimensions to asset and sales invoice

* fix: replace sql query with query builder

* refactor: reuse function for accounting dimensions

* fix: loop handling

* fix: use explicit param

(cherry picked from commit 079ec864de)

# Conflicts:
#	erpnext/controllers/buying_controller.py
 2024-12-31 07:07:16 +00:00
venkat102
74220430e5 fix: include company in filter condition 
(cherry picked from commit b92f8bc514)
 2024-12-30 09:59:09 +00:00
mergify[bot]
cc827c8077 fix: fetch advance payment entries on pos invoice (backport #44856) (#44931) 
fix: fetch advance payment entries on pos invoice

(cherry picked from commit a7078e5702)

Co-authored-by: Diptanil Saha <diptanilsaha@Diptanils-MacBook-Air.local>
 2024-12-30 13:59:42 +05:30
ruthra kumar
508435ac9f refactor: early return is always better 
validate_advance_entries() has a heavy IO bound operation. Early
return on unwanted cases is always better.

(cherry picked from commit 0589fa7f3e)
 2024-12-27 07:54:44 +00:00
Sanket322
6cc70605fa fix: clear payment schedule in purchase invoice for is_paid 
(cherry picked from commit e1fc239f3d)
 2024-12-27 07:54:44 +00:00
mergify[bot]
042d12b2c1 fix: material request status (backport #44917) (#44918) 
* fix: material request status (#44917)

(cherry picked from commit 1319ce4bc1)

* chore: fix test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-26 22:58:29 +05:30
mergify[bot]
57e6ed4645 fix: set project in GL from the SLE (backport #44879) (#44885) 
fix: set project in GL from the SLE (#44879)

(cherry picked from commit 021d077808)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-24 15:12:32 +05:30
mergify[bot]
d6001e5ef9 fix: stock entry not fetching expired batches (backport #44863) (#44868) 
fix: stock entry not fetching expired batches (#44863)

(cherry picked from commit c9b143b509)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-23 22:31:16 +05:30
mergify[bot]
8092d58d9c fix: do not validate qc for scrap item (backport #44844) (#44853) 
fix: do not validate qc for scrap item (#44844)

(cherry picked from commit a2c2b8b5ad)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-23 19:15:46 +05:30
ruthra kumar
33fc987d95 refactor(test): remove hardcoded names 2024-12-23 14:52:02 +05:30
rs-rethik
3ab4acfafa fix: update query 
(cherry picked from commit 854e37c05c)
 2024-12-23 08:39:55 +00:00
rs-rethik
13123a0412 refactor: convert sql query to query builder 
(cherry picked from commit 2d58e845e6)
 2024-12-23 08:39:54 +00:00
rs-rethik
4884849f23 test: add unit test to validate journal entry posting date 
(cherry picked from commit c14a2d73bf)
 2024-12-23 08:39:54 +00:00
rs-rethik
7498cdf644 feat: use difference_posting_date for journal entry posting_date 
(cherry picked from commit ff1d040a6e)
 2024-12-23 08:39:54 +00:00
ljain112
875797e655 fix: correct args for get_advance_payment_entries_for_regional 
(cherry picked from commit df13a4cc2f)
 2024-12-23 07:28:34 +00:00
mergify[bot]
8f811728d9 feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (backport #44711) (#44782) 
* feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711)

* feat(subcontracting): Added provision to create multiple Subcontracting Orders from a single Subcontracted Purchase Order

* refactor(new_sc_flow_2): Fixed error thrown by semgrep

(cherry picked from commit 3eba6bf3dd)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.js
#	erpnext/buying/doctype/purchase_order/test_purchase_order.py
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
#	erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
#	erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json

* feat(subcontracting): Added provision to create multiple Subcontracting Orders against a single Purchase Order (#44711)

* feat(subcontracting): Added provision to create multiple Subcontracting Orders from a single Subcontracted Purchase Order

* refactor(new_sc_flow_2): Fixed error thrown by semgrep

* fix: Resolved errors and removed code from develop branch merged by mistake

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2024-12-20 12:18:01 +05:30
mergify[bot]
b706a8274f perf: SABB (backport #44764) (#44789) 
perf: SABB (#44764)

(cherry picked from commit 90baa38f64)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-19 13:31:28 +05:30
mergify[bot]
8ba7424996 fix: purchase return entry issue (backport #44721) (#44737) 
fix: purchase return entry issue (#44721)

(cherry picked from commit 1f5d7072e7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-12-17 14:48:18 +05:30
ljain112
98bd5f20c4 fix: restrict advance payment entries with flag 
where "book_advance_payments_in_separate_party_account" is true
 2024-12-09 20:57:24 +05:30
mergify[bot]
06ac21dd85 chore: Ignore stock validation for non stock invoices (backport #44549) (#44554) 
chore: Ignore stock validation for non stock invoices (#44549)

* chore: Ignore stock validation for non stock invoices

* chore: Ignore stock validation for non stock invoices

(cherry picked from commit 1ac292285e)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-12-05 22:57:09 +05:30
Ninad1306
558d49b3d3 test: validate buying workflow 
(cherry picked from commit 94d3fc9fde)
 2024-12-03 08:48:52 +00:00
Ninad1306
05795af471 fix: always set sales incoming rate for internal transfers 
(cherry picked from commit d049c97884)
 2024-12-03 08:48:51 +00:00
ljain112
c8e2c9aa25 fix: handle multi currency in common party journal entry 
(cherry picked from commit e371f68d66)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
 2024-12-02 07:10:11 +00:00
Sagar Vora
48059a7c74 perf: reduce queries during transaction save 
(cherry picked from commit b6b8a06fda)
 2024-11-29 19:17:31 +00:00
Sagar Vora
1f97979059 perf: cache product bundle items at document level (#44440) 
(cherry picked from commit 6de7320ef4)
 2024-11-29 17:23:36 +00:00
mergify[bot]
0e39aa349e fix: SABB print for packed items (backport #44413) (#44428) 
fix: SABB print for packed items (#44413)

(cherry picked from commit 5266f236b7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-29 17:00:59 +05:30
vimalraj27
fd1cbf4b6f chore: Fix typo "Purchase Reecipt" 
(cherry picked from commit 21049bae91)
 2024-11-27 14:28:00 +00:00
Ernesto Ruiz
465a26f714 chore: Add translations to QI validations in Update stock_controller.py 
chore: Add translations to QI validations in Update stock_controller.py
(cherry picked from commit 6754f15487)
 2024-11-26 06:07:15 +00:00
mergify[bot]
20d0e95d7c feat: available qty at company in sales transactions (backport #44260) (#44325) 
* feat: available qty at company in sales transactions

(cherry picked from commit d8b9aef14f)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#	erpnext/selling/doctype/quotation_item/quotation_item.json
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json
#	erpnext/stock/doctype/delivery_note_item/delivery_note_item.json

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-11-25 20:29:13 +05:30
ljain112
f3c3f170a7 fix: validate sales team to ensure all sales person are enabled 
(cherry picked from commit 548dbb33eb)
 2024-11-20 05:11:41 +00:00
mergify[bot]
d61f696f85 feat: inventory dimension for rejected materials (backport #44156) (#44165) 
feat: inventory dimension for rejected materials (#44156)

(cherry picked from commit 9bf16df41e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-15 17:28:41 +05:30
ruthra kumar
9a3e9c4c9a refactor: use separate round off for opening entries 
(cherry picked from commit 88e68168e3)

# Conflicts:
#	erpnext/accounts/general_ledger.py
 2024-11-14 07:01:52 +00:00