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

2678 Commits

Author SHA1 Message Date
Rohit Waghchaure
24a6f611d8 fix: validation to prevent submission if the SABB is not linked to a stock transaction 
(cherry picked from commit f976115a2b)
 2025-01-31 09:14:53 +00:00
mergify[bot]
8b75401db9 perf: stock entry with batch (backport #45486) (#45602) 
perf: stock entry with batch

(cherry picked from commit 0b1b964b77)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2025-01-30 11:21:20 +05:30
ruthra kumar
aef6b62f7d refactor: auto add taxes from template 
(cherry picked from commit d1086722bf)
 2025-01-29 09:59:20 +00:00
mergify[bot]
a2ffdc7805 fix: return qty error due to precision (backport #45536) (#45581) 
fix: return qty error due to precision

(cherry picked from commit 3078578692)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2025-01-29 12:46:44 +05:30
Sugesh393
67e45cf002 chore: update variable names for improved readability 
(cherry picked from commit 36bae55299)
 2025-01-27 15:18:24 +05:30
Sugesh393
fac4e99b0e test: add new unit test for company validation in accounting dimension 
(cherry picked from commit c94091d68f)
 2025-01-27 09:25:02 +00:00
Sugesh393
8f0d270746 feat: add company level validation for accounting dimension 
(cherry picked from commit 60efd3e219)
 2025-01-27 09:25:01 +00:00
Sugesh393
172fdad244 fix: set party_account_currency for pos_invoice returns 
(cherry picked from commit 2af6fca7fa)
 2025-01-27 08:58:58 +00:00
mergify[bot]
7ff7ec7929 fix: validate items against selling settings (backport #45288) (#45431) 
fix: validate items against selling settings (#45288)

fix: validate_for_duplicate_items

Co-authored-by: Sanket322 <shahsanket322003.com>
(cherry picked from commit d862e9b771)

Co-authored-by: Sanket Shah <113279972+Sanket322@users.noreply.github.com>
 2025-01-24 16:37:36 +05:30
mergify[bot]
224a92587d fix: resolved pos return setting to default mode of payment instead of user selection (backport #45377) (#45419) 
fix: resolved pos return setting to default mode of payment instead of user selection (#45377)

* fix: resolved pos return setting to default mode of payment instead of user selection

* refactor: removed console log statement

* refactor: moved get_payment_data to sales_and_purchase_return.py

(cherry picked from commit 54d234e05d)

Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2025-01-24 13:13:15 +05:30
ruthra kumar
3906e5c33f chore: use correct decorator 2025-01-23 17:05:36 +05:30
ruthra kumar
693687d8a3 test: exc gain/loss posting date based on configuration 
(cherry picked from commit 2f3281579a)
 2025-01-23 10:59:53 +00:00
ruthra kumar
c070a140f2 refactor: only apply configuration on normal payments 
patch to update default value

(cherry picked from commit b2c3da135e)
 2025-01-23 10:59:53 +00:00
mergify[bot]
04f5a72e08 perf: optimize DB calls with frappe.get_all (backport #45289) (#45391) 
perf: optimize DB calls with frappe.get_all (#45289)

* perf: reduce multiple db queries

* fix: use frappe._dict instread of extra iteration

---------

Co-authored-by: Sanket322 <shahsanket322003.com>
(cherry picked from commit 2a400dd3f8)

Co-authored-by: Sanket Shah <113279972+Sanket322@users.noreply.github.com>
 2025-01-23 13:01:12 +05:30
mergify[bot]
2403cdc4d7 fix: System was allowing to save payment schedule amount less than grand total (backport #45322) (#45381) 
fix: System was allowing to save payment schedule amount less than grand total (#45322)

* fix: System was allowing to save payment schedule amount less than grand_total

* style: After run pre-commit

(cherry picked from commit b26f0b6633)

Co-authored-by: Diógenes Souza <103958767+devdiogenes@users.noreply.github.com>
 2025-01-23 11:16:09 +05:30
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