nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 00:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,608 Commits 472 Branches 1,757 Tags
daaa4ca0c8b364872a63c4e1695561dc62adf678
Commit Graph

4014 Commits

Author SHA1 Message Date
mergify[bot]
87b798b936 fix: validate variant values (backport #54831) (#54839) 
fix: validate variant values (#54831)

(cherry picked from commit 95705f18aa)

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-11 21:23:34 +05:30
mergify[bot]
f64f871d45 feat: partial delivery in dropshipping (backport #54787) (#54800) 
* feat: partial delivery in dropshipping (#54787)

(cherry picked from commit db74360396)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json

* chore: resolve conflicts

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-09 02:01:42 +00:00
mergify[bot]
e60490dceb fix: hide payment and payment request buttons based on permissions in invoices and orders (backport #53920) (#54736) 
Co-authored-by: Sakthivel Murugan S <129778327+ssakthivelmurugan@users.noreply.github.com>
Co-authored-by: ravibharathi656 <ravibharathi656@gmail.com>
fix: hide payment and payment request buttons based on permissions in invoices and orders (#53920)
 2026-05-05 12:17:57 +05:30
mergify[bot]
2cd4c1a052 fix: error when creating quotation from CRM (backport #54722) (#54725) 
fix: error when creating quotation from CRM (#54722)

(cherry picked from commit 2d3190effb)

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-04 16:04:03 +00:00
mergify[bot]
bca893a508 fix: add missing fields in set_currency_labels (backport #54689) (#54690) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: add missing fields in set_currency_labels (#54689)
 2026-05-01 14:39:39 +02:00
mergify[bot]
bd932da08b feat: copy terms attachments to transactions (backport #53403) (#54661) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2026-04-29 23:43:28 +02:00
Nishka Gosalia
48ebb4ca61 feat(ux): Naming series dialog (#54554) 
(cherry picked from commit 844f3dbc0b)
 2026-04-29 09:15:45 +00:00
mergify[bot]
9db03bc520 fix(selling): blanket order ordered qty recalculation on sales order status change (backport #54593) (#54623) 
fix(selling): blanket order ordered qty recalculation on sales order status change (#54593)

(cherry picked from commit d68801e73a)

Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
 2026-04-29 06:47:55 +00:00
mergify[bot]
e24ab72c0d fix: copy project from first row to new rows (backport #53295) (#54620) 
fix: copy project to new item row from parent

(cherry picked from commit 68cc518497)

Co-authored-by: ravibharathi656 <ravibharathi656@gmail.com>
 2026-04-29 11:55:46 +05:30
Trusted Computer
0d498baa10 refactor: bring back titles on sales transactions and make them optional and visible on purchase transactions (backport #52633) (#54601) 
* refactor: bring back titles on sales transactions and make them optional and visible on purchase transactions

* fix: update timestamp in json to UTC
 2026-04-28 21:12:41 +05:30
mergify[bot]
deef1696d6 refactor(sms_center): replaced raw SQL queries with Query Builder (backport #54600) (#54603) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-04-28 15:41:59 +00:00
mergify[bot]
134e4b7446 fix: update status of quotation in patch (backport #54577) (#54580) 
fix: update status of quotation in patch (#54577)

(cherry picked from commit 2088a01c19)

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-04-28 09:44:16 +00:00
Jatin3128
15b6633fc3 feat: add setting to hide Subscription references across doctypes (#54576) 2026-04-28 13:09:50 +05:30
mergify[bot]
8de9ac4e34 refactor(UX): selling settings form (backport #54412) (#54527) 2026-04-25 18:01:07 +05:30
Rohit Waghchaure
386f49978e fix: delivery schedule in the sales order 
(cherry picked from commit 435db260ee)
 2026-04-22 16:33:12 +00:00
ruthra kumar
91a748d9bf refactor(test): remove explicit sql delete calls 
(cherry picked from commit b16dd3f2dd)
 2026-04-22 05:43:48 +00:00
mergify[bot]
5923618df3 refactor(test): move contact and address creation to bootstrap (backport #54406) (#54410) 
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2026-04-22 00:24:36 +05:30
mergify[bot]
37d080bdb4 refactor: Sales Partner Commission Summary and Sales Partner Transaction Summary report (backport #54268) (#54431) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-04-21 09:21:10 +05:30
mergify[bot]
fa76e8ac7f fix: changed qty validation from qty field to stock_qty (backport #54352) (#54357) 
fix: changed qty validation from qty field to stock_qty (#54352)

(cherry picked from commit ba01d66c24)

Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
 2026-04-20 10:54:04 +05:30
nishkagosalia
5916e570af fix: Table row in dialog should not have delete row option 
(cherry picked from commit eb89903dec)
 2026-04-17 10:40:26 +00:00
mergify[bot]
b487f69b59 feat: add option to create production plan from sales order (backport #53662) (#54323) 
Co-authored-by: sudarsan2001 <frankel9675@gmail.com>
Co-authored-by: Venkatesh <47534423+venkat102@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-04-16 15:16:34 +05:30
Khushi Rawat
71a563428d Merge branch 'version-16-hotfix' into mergify/bp/version-16-hotfix/pr-53588 2026-04-13 15:41:39 +05:30
mergify[bot]
d2745f3ec9 fix(selling): enable selling_settings creation through fixtures (backport #54177) (#54215) 
Co-authored-by: mgicking-bmi <mgicking@bmi.com>
Fix(selling): enable selling_settings creation through fixtures (#54177)
 2026-04-11 05:32:11 +00:00
Khushi Rawat
66ee208cb2 fix: conflicts 2026-04-06 16:19:53 +05:30
khushi8112
cd98312083 fix: print hide unnecessary fields 
(cherry picked from commit 8f83616b60)

# Conflicts:
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json
 2026-04-06 10:43:49 +00:00
mergify[bot]
bc86e2c1f2 fix: update min date based on transaction_date (backport #53803) (#54025) 
Co-authored-by: Vishnu Priya Baskaran <145791817+ervishnucs@users.noreply.github.com>
fix: update min date based on transaction_date (#53803)
 2026-04-05 21:16:31 +05:30
Mihir Kandoi
8db397bdae feat: co product by product support (#52979) (#53975) 2026-04-01 07:41:39 +00:00
khushi8112
04cced2fb5 fix: prevent selection of group type customer group in customer master 
(cherry picked from commit 6068dc959f)
 2026-03-31 11:17:17 +00:00
ruthra kumar
05f47bbf6e refactor(test): remove AccountsTestMixin from Sales Order 
(cherry picked from commit 2aecf0103a)
 2026-03-31 15:05:19 +05:30
ruthra kumar
a8d0fb5ac9 refactor(test): erpnext testsuite should be primary superclass 
(cherry picked from commit f3148e052c)
 2026-03-31 09:32:44 +00:00
mergify[bot]
3d79dce8b3 fix: flaky currency exchange test (backport #53813) (#53817) 2026-03-26 15:09:13 +00:00
khushi8112
f5a9657a91 fix: remove unused print format 
(cherry picked from commit b9083411cc)
 2026-03-24 10:06:58 +00:00
khushi8112
7e5297a305 fix: add closing div tab 
(cherry picked from commit c99cec1071)
 2026-03-24 10:06:58 +00:00
khushi8112
a8769bfb77 feat: default print format for Quotation 
(cherry picked from commit 4307cd5b1c)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
#	erpnext/public/js/print.js
#	erpnext/setup/install.py
 2026-03-24 10:06:57 +00:00
Nabin Hait
25fa66f90c fix: Removed quick access link from selling workspace 
(cherry picked from commit d7c48d645a)
 2026-03-24 06:01:15 +00:00
mergify[bot]
cd1dfeeab3 fix: check for submit permissions instead of write permissions when updating status (backport #53697) (#53703) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix: check for `submit` permissions instead of `write` permissions when updating status (#53697)
 2026-03-23 10:56:15 +00:00
mergify[bot]
7ebed912cf fix: validate permission before updating status (backport #53651) (#53653) 
* fix: validate permission before updating status (#53651)

(cherry picked from commit 8e17c722fb)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py
#	erpnext/selling/doctype/sales_order/sales_order.py
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

* chore: resolve conflicts

---------

Co-authored-by: diptanilsaha <diptanil@frappe.io>
 2026-03-19 15:28:01 +00:00
ruthra kumar
7d0779c73c refactor(test): remove explicit call to master data setup 2026-03-19 12:57:12 +05:30
ruthra kumar
71ce7ff8ce refactor(test): make customer deterministic 2026-03-19 12:57:12 +05:30
ruthra kumar
fe8064c3e6 refactor(test): tax rule; removed setUpClass, tearDownClass 2026-03-19 12:57:12 +05:30
ruthra kumar
6426f63798 refactor(test): make sales partner target variance deterministic 2026-03-19 12:57:12 +05:30
ruthra kumar
1cc4b67098 refactor(test): make sales order analysis deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
6c9b32287c refactor(test): make test mapper deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
63908ad6dc refactor(test): remove redundant tearDown, tearDownClass and rollback 2026-03-19 12:57:11 +05:30
ruthra kumar
a110b20350 refactor(test): make party specific item deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
6824f3274a refactor(test): make sales order deterministic 2026-03-19 12:57:10 +05:30
ruthra kumar
3d4f145b16 refactor(test): make quotation deterministic 2026-03-19 12:57:10 +05:30
ruthra kumar
10de2e348b refactor(test): remove empty IntegrationTestCase 2026-03-19 12:57:10 +05:30
ruthra kumar
29cf028f9a refactor: replace all IntegrationTestCase -> ERPNextTestSuite 2026-03-19 12:57:10 +05:30
ruthra kumar
f1dfac417d refactor: replace IntegrationTestCase with ERPNextTestCase repo-wide 
- import ERPNextTestSuite
 - use it on test class
 2026-03-19 12:57:07 +05:30