nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-21 15:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,269 Commits 454 Branches 1,739 Tags
a49026e9d2eda85bf35dec5fd6fcfb3d83c1d2a7
Commit Graph

876 Commits

Author SHA1 Message Date
Rohit Waghchaure
a49026e9d2 fix: not able to save material request 
(cherry picked from commit c5e36eb323)
(cherry picked from commit 0e2bca4b34)
 2025-06-27 11:18:10 +00:00
ruthra kumar
3a6956ba05 Merge pull request #48230 from frappe/mergify/bp/version-15-hotfix/pr-47627 
fix: auto append_taxes_from_item_tax_template in backend (backport #47627)
 2025-06-24 17:38:14 +05:30
Lakshit Jain
c2c5e45bc6 fix: get already billed amount from current doc instead of database (#48079) 
* fix: get already billed amount from current doc instead of database

* fix: throw overbilling validation for all items in single call

* refactor: minor fixes

---------

Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com>
(cherry picked from commit 47c3c4808e)
 2025-06-24 10:11:43 +00:00
ljain112
1ccdb67c55 chore: resolve conflicts 2025-06-24 15:31:34 +05:30
ljain112
2bf8dffb60 fix: auto append_taxes_from_item_tax_template in backend 
(cherry picked from commit 4cb1fa2b6b)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
#	erpnext/controllers/tests/test_accounts_controller.py
 2025-06-24 09:48:21 +00:00
ravibharathi656
9a47c507c0 feat: add validation for inter company transactions 2025-06-09 19:12:51 +05:30
Deepesh Garg
d3202068d9 style: Linting issues 
(cherry picked from commit c4aecb15ce)
 2025-06-05 11:03:52 +00:00
Deepesh Garg
76c2477d23 feat: Add hook to update gl dict by apps 
(cherry picked from commit 10ff369ff2)
 2025-06-05 11:03:51 +00:00
ljain112
895231a8a7 fix: setting paid amount to 0 when is_paid is unchecked in purchase invoice 
(cherry picked from commit e358a9e53f)
 2025-05-27 08:32:33 +00:00
Marica
890ce4a676 Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-46214 2025-05-13 17:07:43 +02:00
Bernd Oliver Sünderhauf
cf45ffdabe refactor: Consolidate duplicate zero-quantity transaction Items checks. 
(cherry picked from commit 4918aeb4c6)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/stock_entry.py
 2025-05-13 12:13:47 +00:00
marination
3deb11e5b2 fix: Merge conflicts 2025-05-13 13:35:19 +02:00
ruthra kumar
40faa7f7b9 chore: resolve conflicts and pass all parameters 2025-05-06 14:14:41 +05:30
marination
eba73df88e test: Purchase Order with Unit Price Items 
- chore: Fix error message in accounts controller

(cherry picked from commit eea758f5b2)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/test_purchase_order.py
#	erpnext/buying/doctype/supplier_quotation/test_supplier_quotation.py
 2025-05-05 16:59:16 +00:00
marination
33366fce6c feat: Unit Price Contract 
(cherry picked from commit c1e4e7af28)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.py
#	erpnext/selling/doctype/selling_settings/selling_settings.json
 2025-05-05 16:59:15 +00:00
Sugesh393
04a1578b53 refactor: update base_outstanding calculation 
(cherry picked from commit 02356029a8)
 2025-04-22 11:42:13 +00:00
Sagar Vora
f764b9713b Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-41721 2025-04-19 16:18:37 +05:30
ruthra kumar
4eb0f39af7 chore: pass doctype and name 2025-04-08 15:15:24 +05:30
ruthra kumar
d6b488f529 chore: resolve conflict 2025-04-08 14:36:15 +05:30
Bhavan23
fb06f886d2 fix(accounting): update outstanding amount based on update_outstanding_for_self 
fix(accounting): against voucher has been already paid show proper message and update update_outstanding_for_self as 1

(cherry picked from commit 222f1834f1)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2025-04-08 08:59:04 +00:00
venkat102
ea289a40fb fix: update payment amount if automatically_fetch_payment_terms is enabled 
(cherry picked from commit 7bf1a39861)
 2025-04-07 05:34:25 +00:00
venkat102
1b9980bb86 fix(payment term): allocate payment amount when payment term is fetched from order 
(cherry picked from commit 5618859bd8)
 2025-04-07 05:34:25 +00:00
ljain112
d1311e619d fix: do not use self object for setting party and party type 
(cherry picked from commit 80b746d4dd)
 2025-03-27 05:38:38 +00:00
ljain112
391b5c4226 fix: do not validate if conversion rate is 1 for different currency 
(cherry picked from commit e8a66d03bc)
 2025-03-25 08:42:31 +00:00
Sugesh393
412e6be502 fix: add base_outstanding and base_paid_amount in payment schedule table 
(cherry picked from commit 6c2f9a563e)

# Conflicts:
#	erpnext/accounts/doctype/payment_schedule/payment_schedule.json
 2025-03-24 06:14:41 +00:00
Mihir Kandoi
41d8b26dd2 fix: fetch bom_no when updating items in sales order 
(cherry picked from commit 508727a57a)

# Conflicts:
#	erpnext/public/js/utils.js
 2025-03-19 10:15:18 +00:00
Sugesh393
7fb26f802c refactor: replace get_list with get_all for dynamic link child access 
(cherry picked from commit 8f7f0b81f6)
 2025-03-14 04:22:25 +00:00
Sugesh G
38dabdf584 fix: use shipping_address_name for address validation in sales invoice (#46473) 
* fix: validate address and contact related to party

* fix: solve unboundlocal error

* refactor: improve variable scope

* refactor: translatable strings

* fix: use shipping_address_name for address validation in sales invoice

* test: add new unit test for address and contact validation

* chore: to avoid keyerror

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit 0bdb81db53)
 2025-03-12 10:44:37 +00:00
Ninad Parikh
877d5bd3aa fix: base_net_rate Required to Check Valid Range (backport #46332) (#46382) 
fix: `base_net_rate` required to check valid range
 2025-03-12 16:12:44 +05:30
ruthra kumar
07f938cc10 refactor: isolate to specific doctypes 
(cherry picked from commit b348aa3b37)
 2025-03-08 06:36:35 +00:00
ruthra kumar
d7baa451e3 refactor: move utility method to controller 
(cherry picked from commit d1d06885dc)
 2025-03-08 06:36:33 +00:00
mergify[bot]
c816f9bd0a fix: validate accounting dimension company in Journal Entry & Stock Entry (backport #46204) (#46369) 
fix: validate accounting dimension company in Journal Entry & Stock Entry (#46204)

* fix: validate accounting dimension company in journal entry and stock entry

* test: update test cases to validate company-based accounting dimension

* fix(test): ensure 'Pick List' company matches 'Delivery Note' to prevent test failures

* chore: remove redundant lines of code

(cherry picked from commit 7b6ebad9e6)

Co-authored-by: Bhavansathru <122002510+Bhavan23@users.noreply.github.com>
 2025-03-06 18:12:06 +05:30
Rohit Waghchaure
75bc68b863 fix: rate changing on the deliver note 
(cherry picked from commit 6f40849d55)
 2025-03-04 16:12:37 +00:00
Ninad1306
90dea426d8 fix: set taxes before calculating taxes and totals 
(cherry picked from commit 0fd0695bbb)
 2025-03-03 11:27:45 +00:00
Diptanil Saha
dd34bbe570 fix: pos return validation on v15 (#45951) 2025-02-17 16:03:19 +05:30
barredterra
2adab1d36f fix: skip warning for free items 
(cherry picked from commit 772776ad8a)
 2025-02-12 09:20:15 +00:00
Mihir Kandoi
1d3da4d49a fix: dont update rate of free item on save 
(cherry picked from commit 6591e76a63)
 2025-02-12 03:13:41 +00:00
Mihir Kandoi
6a03f99546 fix: logical error failing tests 
(cherry picked from commit fee318a275)
 2025-02-05 10:23:26 +00:00
Mihir Kandoi
b140ce71d7 fix: fetch rate from item price list when document is saved 
(cherry picked from commit 1e4b9fbdf0)
 2025-02-05 10:23:26 +00:00
ruthra kumar
aef6b62f7d refactor: auto add taxes from template 
(cherry picked from commit d1086722bf)
 2025-01-29 09:59:20 +00:00
Sugesh393
67e45cf002 chore: update variable names for improved readability 
(cherry picked from commit 36bae55299)
 2025-01-27 15:18:24 +05:30
Sugesh393
8f0d270746 feat: add company level validation for accounting dimension 
(cherry picked from commit 60efd3e219)
 2025-01-27 09:25:01 +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
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]
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
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
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
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