nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-15 09:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,893 Commits 649 Branches 1,810 Tags
a9d139ae6b83b3117a34efffcf224903e43b85b5
Commit Graph

2340 Commits

Author SHA1 Message Date
Mihir Kandoi
51aecec598 fix(controllers): correct negative rate settings link 
(cherry picked from commit 4089f138f2)
 2026-08-09 11:16:00 +00:00
nishkagosalia
e657a7f19f fix: handling negative grand total 
(cherry picked from commit 136f92db04)
 2026-08-09 11:16:00 +00:00
Mihir Kandoi
d8bbe865a8 fix: use stock settings for warehouse defaults 2026-08-09 13:01:00 +05:30
Pandiyan P
c9977be5d4 fix: allow selecting a warehouse for new items in the update items dialog (#57876) 
(cherry picked from commit 55fe269046)

# Conflicts:
#	erpnext/accounts/services/child_item_update.py
#	erpnext/public/js/utils.js
 2026-08-09 06:02:00 +00:00
mergify[bot]
6b45002abc fix: set restrict_globals=True in frappe.render_template (backport #57899) (#57902) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
 2026-08-09 00:04:36 +05:30
Mihir Kandoi
2cd8e39f04 chore: resolve conflict 2026-08-07 22:28:30 +05:30
Mihir Kandoi
db49b03913 fix: declare precision 9 on all conversion_factor fields 
The Float control parses values with the field precision, falling back
to the global float precision when the docfield declares none
(frappe ControlFloat.parse / get_precision). On a site with float
precision 2, a fetched UOM factor of 0.453592292 was written back to
the model as 0.45, silently corrupting every derived quantity by 0.8
percent. A ratio must not inherit display precision meant for
quantities, so declare the same precision 9 the UOM Conversion Factor
master already uses on every transaction-level conversion_factor
field.

(cherry picked from commit 69a35a12cb)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
#	erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
#	erpnext/manufacturing/doctype/bom_secondary_item/bom_secondary_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
#	erpnext/stock/doctype/packed_item/packed_item.json
#	erpnext/stock/doctype/pick_list_item/pick_list_item.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
#	erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
#	erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
#	erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
 2026-08-07 16:51:40 +00:00
Afsal Syed
6cbf73a326 test(stock): prevent settings leakage in purchase order tests 
(cherry picked from commit 99630f40eb)
 2026-08-03 07:10:14 +00:00
Afsal Syed
3a0f988a9e test(stock): add test cases verifying stock over delivery role does not bypass order allowance 
(cherry picked from commit 0b271e24b6)

# Conflicts:
#	erpnext/manufacturing/doctype/blanket_order/test_blanket_order.py
 2026-08-03 07:10:14 +00:00
pandiyan
9e5f77b57c fix: use company currency instead of global default in report (backport #56561) 
Reports like Sales Order Trends and Purchase Order Trends showed the global
default currency symbol instead of the transacting company's currency.

Threads the company currency through conditions["company_currency"] in
trends.get_columns and uses it for both the chart's currency and the Total
row. The chart now skips the grand-total row by its label instead of by a
falsy first periodic cell, so the already-summed Total row is not added into
the datapoints a second time.

Backport of #56561 (frappe/erpnext). Tests from the original PR are not
included: the trends report test files do not exist on this branch.
 2026-07-28 11:08:13 +05:30
Afsal Syed
74451366c2 test(stock): add portal user contact link verification for customer and supplier 
(cherry picked from commit 9ae2069bd9)
 2026-07-16 15:46:06 +05:30
Afsal Syed
134d63de78 feat(stock): automatically link portal users to their associated contact profiles for customers and suppliers 
(cherry picked from commit 337a06dfb6)
 2026-07-16 15:44:45 +05:30
Mihir Kandoi
6d47c51c5b Merge pull request #57166 from frappe/mergify/bp/version-16-hotfix/pr-57163 
fix: hide job card field in purchase order item (backport #57163)
 2026-07-15 11:03:06 +05:30
Mihir Kandoi
b256c76c3b chore: resolve conflicts 2026-07-15 10:48:51 +05:30
Mihir Kandoi
e24ef847dc fix: set correct currency in supplier quotation net rate field 
(cherry picked from commit 27672851cd)
 2026-07-15 05:17:11 +00:00
Mihir Kandoi
20f6ac81b9 fix: hide job card field in purchase order item 
(cherry picked from commit f44bcae47d)

# Conflicts:
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
 2026-07-15 05:13:39 +00:00
Mihir Kandoi
4d931a7108 test: remove test 
(cherry picked from commit b2ec906ff3)
 2026-07-14 11:01:57 +00:00
SandraFrappe
4d951c1cf8 fix: prevent duplicate material request items in purchase order 
(cherry picked from commit 2d6f89a7f5)
 2026-07-14 11:01:57 +00:00
khushi8112
0371e8eaf0 fix: add page numbers to print format footer 
(cherry picked from commit 2d0c0a8c09)
 2026-07-02 21:13:53 +00:00
khushi8112
fa4d32dcdb fix: render letter head footer in print formats 
(cherry picked from commit e60a467972)
 2026-07-02 21:13:53 +00:00
Mihir Kandoi
e64e9866fb chore: fix conflicts 2026-06-27 16:34:20 +05:30
Mihir Kandoi
0b42241682 fix: party aliases should be no copy 
(cherry picked from commit 057af21cd8)

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
#	erpnext/selling/doctype/customer/customer.json
 2026-06-27 10:55:31 +00:00
khushi8112
a80de9bd01 fix: resolve backport merge conflicts in supplier.json 
Apply form-cleanup label changes while preserving the hotfix-only
no_copy flags and the alias field. Drop removed column_break_44 and
the duplicate is_frozen field_order entry.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-23 16:10:11 +05:30
khushi8112
2035fac494 fix: supplier status in list view 
(cherry picked from commit 515983e016)
 2026-06-22 11:42:29 +00:00
khushi8112
e5c9e7abdc fix: supplier master form cleanup 
(cherry picked from commit 820c0caf88)

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
 2026-06-22 11:42:29 +00:00
nishkagosalia
97279c7e26 fix: removing the document naming series dialog and moving to framework 
(cherry picked from commit aa7402b1e3)
 2026-06-22 10:37:41 +00:00
Mihir Kandoi
768425ebf1 feat: party aliases 
(cherry picked from commit 5e16d41387)
 2026-06-22 13:16:56 +05:30
Ejaaz Khan
74da0bebae Merge pull request #55891 from frappe/mergify/bp/version-16-hotfix/pr-53949 
feat: sticky columns in reports (backport #53949)
 2026-06-15 13:00:39 +05:30
Rohit Waghchaure
be1aa0e5eb fix: regression issues related to security fixes 2026-06-14 23:41:59 +05:30
Ejaaz Khan
331715815c feat: sticky columns in reports 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
(cherry picked from commit 03e4df7a1a)
 2026-06-14 08:39:09 +00:00
rohitwaghchaure
34cfc049fd Merge pull request #55821 from rohitwaghchaure/fixed-github-55757 
fix: create_raw_materials_supplied method not found
 2026-06-11 15:43:00 +05:30
Rohit Waghchaure
d51ad0d19f fix: create_raw_materials_supplied method not found 2026-06-11 14:54:45 +05:30
Shllokkk
b2e7fd7957 fix: remove ignore_permissions from get_party_details signature (#55491) 
(cherry picked from commit efb8336bf8)
 2026-06-11 12:39:53 +05:30
mergify[bot]
2ae6451f10 fix: Add authorization checks on internal functions (backport #55709) (#55726) 
* fix: Add authorization checks on internal functions (#55709)

(cherry picked from commit ba936eefab)

# Conflicts:
#	erpnext/accounts/doctype/pos_profile/pos_profile.py
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
#	erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py
#	erpnext/support/doctype/issue/issue.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2026-06-08 10:16:12 +00:00
mergify[bot]
808e51db19 fix: duplicating a Customer/Supplier shouldn't inherit the source's primary contact and address (backport #55421) (#55609) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Antoine Maas <antoine.maas@okte.io>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: duplicating a Customer/Supplier shouldn't inherit the source's primary contact and address (#55421)
 2026-06-03 16:03:59 +00:00
mergify[bot]
0274afe560 perf: batch status check for on-hold/closed documents, remove N+1 queries (backport #54798) (#55573) 
* perf: batch status check for on-hold/closed documents, remove N+1 queries (#54798)

(cherry picked from commit 5074597d00)

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

* chore: resolve conflicts

---------

Co-authored-by: Shubh Doshi <124681920+shubhdoshi21@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-06-03 16:00:54 +00:00
mergify[bot]
fc842fb45f fix: pick correct name when creating user from RFQ (backport #55468) (#55472) 
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
fix: pick correct name when creating user from RFQ (#55468)
 2026-06-01 05:58:12 +00:00
nishkagosalia
b74e365421 fix: merge conflicts 2026-05-28 15:35:10 +05:30
nishkagosalia
20592fc25d fix(UX): Move title field to More Info 
(cherry picked from commit 34c24b86fa)

# Conflicts:
#	erpnext/accounts/doctype/pos_invoice/pos_invoice.json
#	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/buying/doctype/request_for_quotation/request_for_quotation.json
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/stock/doctype/delivery_note/delivery_note.json
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
 2026-05-28 09:39:37 +00:00
nishkagosalia
08eaaa5b83 feat: over order allowance setting 
(cherry picked from commit 355d71dbd2)
 2026-05-28 08:49:11 +00:00
mergify[bot]
3c571a1691 fix: status not changing for dropshipped POs and SOs (backport #54934) (#54937) 
fix: status not changing for dropshipped POs and SOs (#54934)

* fix: status not changing for dropshipped POs and SOs

* test: change test case to accomodate new flow

(cherry picked from commit 78a79120ea)

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-14 14:47:35 +05:30
Nishka Gosalia
e7ae296614 fix(UX): Buying settings form cleanup (#54731) 
* fix(UX): Buying settings form cleanup

* fix: controller approach modification

* fix: dark mode support

(cherry picked from commit 45f05fbeaa)
 2026-05-13 09:24:12 +00:00
nishkagosalia
7086db1e1c fix: rename supplier wise stock analytics report 
(cherry picked from commit 85206e0278)
 2026-05-12 07:08:04 +00:00
mergify[bot]
0db7e1e56b fix: check if item is dropshipped before updating quantity (backport #54825) (#54827) 
fix: check if item is dropshipped before updating quantity (#54825)

(cherry picked from commit 23e9ad3fd9)

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-11 08:08:09 +00:00
mergify[bot]
f24b556336 fix: do not rely on client side to update quantities during partial d… (backport #54804) (#54821) 
* fix: do not rely on client side to update quantities during partial d… (#54804)

fix: do not rely on client side to update quantities during partial dropship
(cherry picked from commit 03acbc3dc9)

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

* chore: resolve conflicts

---------

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-05-11 07:40:14 +00:00
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]
86cf256358 fix: correct project filter in buying doctypes (backport #54644) (#54652) 
fix: correct project filter in buying doctypes (#54644)

(cherry picked from commit a04c028522)

Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-04-29 17:28:12 +05:30
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