nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-15 18:01:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,522 Commits 635 Branches 1,810 Tags
0d498baa100098b2481ad664fdc543a5dddb0d4e
Commit Graph

2291 Commits

Author SHA1 Message Date
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
Jatin3128
15b6633fc3 feat: add setting to hide Subscription references across doctypes (#54576) 2026-04-28 13:09:50 +05:30
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]
cac907383b fix: Disallow negative rates in Purchase invoice (backport #54254) (#54393) 
fix: Disallow negative rates in Purchase invoice (#54254)

(cherry picked from commit 23768ae0a5)

Co-authored-by: Nishka Gosalia <58264710+nishkagosalia@users.noreply.github.com>
 2026-04-19 07:46:21 +00:00
mergify[bot]
d7da5b047d fix: add portal user ownership check to supplier quotation (backport #54298) (#54300) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: add portal user ownership check to supplier quotation (#54298)
 2026-04-15 06:13:11 +00:00
AarDG10
21cf83b915 refactor: update reset password method name 
(cherry picked from commit c4d74483e1)
 2026-04-09 06:23:58 +00:00
Rohit Waghchaure
5719992cda fix: GL entries for different exchange rate in the purchase invoice 
(cherry picked from commit a953709640)
 2026-04-06 11:53:06 +00:00
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
Sagar Vora
9bc0e3b2ce test: add test for discount amount on partial purchase receipt 
Co-authored-by: ravibharathi656 <131471282+ravibharathi656@users.noreply.github.com>
(cherry picked from commit 135cb5fd67)
 2026-04-06 07:31:09 +00:00
Rohit Waghchaure
bfb51326ed fix: purchase invoice missing item 
(cherry picked from commit af994c1a22)
 2026-03-30 09:15:18 +00:00
ravibharathi656
d12b54c50a chore: resolve conflict 2026-03-27 11:24:35 +05:30
Pandiyan P
f2195fa67d fix(accounts): set supplier name as title field in Purchase Invoice (#53710) 
fix(accounts): update title field in purchase order and purchase invoice

(cherry picked from commit 5b1fa81451)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
 2026-03-26 13:30:44 +00:00
Khushi Rawat
b072dd4497 Merge pull request #53728 from frappe/mergify/bp/version-16-hotfix/pr-53646 
feat: default print format for Request for Quotation (backport #53646)
 2026-03-25 17:32:17 +05:30
ruthra kumar
9669a2c56f refactor(test): move commits inside test guard clause 
(cherry picked from commit ed76d6699a)
 2026-03-24 12:14:03 +00:00
khushi8112
a5250f8827 fix: set default print format for when downlod pdf 
(cherry picked from commit 6b9fb77772)
 2026-03-23 20:04:45 +00:00
khushi8112
ab0e215290 feat: default print format for Request for Quotation 
(cherry picked from commit 2af0d9cf6c)
 2026-03-23 20:04:45 +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
ee19765c96 Merge pull request #53608 from ruthra-kumar/ci_lightmode_runner_v16 
refactor(test): repo wide test suite refactor (backport #47910)
 2026-03-19 13:35:08 +05:30
ruthra kumar
37d6978190 refactor(test): make purchase order 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
35d35a0588 refactor(test): make requested items order and receive 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
678841c77e refactor(test): make purchase order deterministic 2026-03-19 12:57:11 +05:30
ruthra kumar
b0d44847ac refactor(test): make supplier quotation deterministic 2026-03-19 12:57:10 +05:30
ruthra kumar
4cdf5f542e refactor: utility to return default supplier scorecards 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
mergify[bot]
7edcef1248 fix: consider returned qty in subcontracting report (backport #53616) (#53621) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: consider returned qty in subcontracting report (#53616)
 2026-03-19 11:52:24 +05:30
ruthra kumar
de34cf227a chore: remove EXTRA_TEST_RECORD_DEPENDENCIES 2026-03-19 11:33:34 +05:30
ruthra kumar
f7e4d07a7e chore: delete all test_records.json 2026-03-19 11:33:34 +05:30
mergify[bot]
afe8e3a023 fix: enable logs to track changes in doctype. (backport #53491) (#53524) 
* fix: enable logs to track changes in doctype. (#53491)

Co-authored-by: jeraldin2003 <jeraldin2003>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
(cherry picked from commit e2667ab098)

# Conflicts:
#	erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json

* chore: resolve conflicts

---------

Co-authored-by: Jeraldin P J <113301032+jeraldin2003@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-03-17 05:32:00 +00:00
ruthra kumar
5fac73c920 refactor: disable total row in trends report 
(cherry picked from commit 4dbc72b301)
 2026-03-13 12:33:15 +00:00
khushi8112
c8afc04957 feat: show subsidiary companies value in purchase analytics 
(cherry picked from commit 9f755ad65a)
 2026-03-13 09:12:35 +00:00
mergify[bot]
ac9ec7e34a refactor: supplier quotation comparision report button should start f… (backport #53361) (#53363) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-03-12 06:19:40 +00:00
mergify[bot]
a4d2c34dde fix: update child item schedule_date and prevent past dates (backport #53298) (#53346) 
Co-authored-by: Pandiyan P <pandiyanpalani37@gmail.com>
fix: update child item schedule_date and prevent past dates (#53298)
 2026-03-12 10:30:15 +05:30
ruthra kumar
c7da21812a chore: resolve conflicts 2026-03-10 17:58:37 +05:30
Nabin Hait
f9a38696b6 fix: set default list view columns and filters for sales, purchase and accounts module 
(cherry picked from commit 9cf529215f)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json
 2026-03-10 12:22:40 +00:00
Nishka Gosalia
69b217065c feat: allowing rate modification in update item in quotation 
(cherry picked from commit 2ec02e477f)
 2026-03-04 06:50:13 +00:00
Pugazhendhi Velu
317873621a fix: handle html email template separately in RFQ to avoid jinja context error 
(cherry picked from commit 49d363b174)
 2026-03-03 15:36:53 +00:00
kavin-114
acdb8f2b78 fix: populate mr owner and set po owner as fallback 
(cherry picked from commit bdf4e51da3)
 2026-03-03 15:09:33 +00:00
rohitwaghchaure
b4a5bbc7e2 chore: fix conflicts 2026-03-02 14:38:28 +05:30
Sudharsanan11
2526876eaa fix(accounts): add transaction time field 
(cherry picked from commit 9538a9870c)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/selling/doctype/sales_order/sales_order.json
 2026-03-02 08:16:32 +00:00
Rohit Waghchaure
941a78e1a8 fix: patch to complete onboarding stpes for existing records 
(cherry picked from commit d90ec49241)

# Conflicts:
#	erpnext/patches.txt
 2026-02-25 12:30:24 +00:00
khushi8112
f4ec356dfb refactor: add translation and fix typo 
(cherry picked from commit cbea4493c1)
 2026-02-24 15:53:41 +00:00
khushi8112
222f51b4d0 feat: standard print format for Sales Order and Purchase Invoice 
(cherry picked from commit 371efce88a)
 2026-02-24 15:53:41 +00:00
Jatin3128
751a081253 feat(payment request): create payment request as per payment schedules 
(cherry picked from commit e476dff842)
 2026-02-24 13:09:27 +00:00
Rohit Waghchaure
aac7fc30d5 fix: remove form tour for sales and purchase order 
(cherry picked from commit ed7315d78e)
 2026-02-24 11:53:56 +00:00
Rohit Waghchaure
858119f907 feat: module onboarding 
(cherry picked from commit 792a1a7ab7)
 2026-02-24 07:20:09 +00:00
mergify[bot]
217709836b fix: sales and purchase modules forms clean-up (backport #52875) (#52911) 
* fix: sales and purchase modules forms clean-up

(cherry picked from commit 0e356dc2e3)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json

* chore: fix conflicts

* chore: fix conflicts

Removed unnecessary fields and updated the modified date.

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

Removed UTM Analytics section and column break from delivery note JSON configuration. Updated the modified timestamp.

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2026-02-24 11:28:34 +05:30
mergify[bot]
8437355072 Merge pull request #52876 from frappe/mergify/bp/version-16-hotfix/pr-52399 
refactor: Better organizing of the fields in various doctypes (backport #52399)
 2026-02-23 16:54:54 +05:30