CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-12 14:58:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,505 Commits 413 Branches 1,717 Tags
dcf4ac66bb3833a67847bb6c8280ab04ee7cffa2
Commit Graph

54505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mihir Kandoi
dcf4ac66bb fix: remove supplier invoice date/posting date validation 
(cherry picked from commit 7cff0ba626)
 2026-02-21 06:55:08 +00:00
Mihir Kandoi
813f0fa8c9 Merge pull request #52836 from frappe/mergify/bp/version-15-hotfix/pr-52835 
fix: inconsistent label name between parent and child (backport #52835)
 2026-02-20 17:17:55 +05:30
Mihir Kandoi
58d9694173 chore: resolve conflicts 2026-02-20 17:01:17 +05:30
Mihir Kandoi
1bf608f835 fix: inconsistent label name between parent and child 
(cherry picked from commit d6e1ca0f10)

# Conflicts:
#	erpnext/selling/doctype/sales_order_item/sales_order_item.json
 2026-02-20 11:28:35 +00:00
Mihir Kandoi
5eb4baccd6 Merge pull request #52826 from frappe/mergify/bp/version-15-hotfix/pr-52821 
fix: sensible insufficient stock message in pick list (backport #52821)
 2026-02-20 14:39:00 +05:30
Mihir Kandoi
ae0acd9ba1 Merge pull request #52828 from frappe/mergify/bp/version-15-hotfix/pr-52825 
fix: update items fetches wrong item code (backport #52825)
 2026-02-20 14:26:37 +05:30
Mihir Kandoi
97a4a5f1cc fix: update items fetches wrong item code 
(cherry picked from commit ba96d37c11)
 2026-02-20 08:54:14 +00:00
Mihir Kandoi
3bafa360b2 fix: sensible insufficient stock message in pick list 
(cherry picked from commit 1352dc79bb)
 2026-02-20 08:53:36 +00:00
Mihir Kandoi
de571c9266 Merge pull request #52817 from mihir-kandoi/gh52069 
feat: update item button addition for quotation (backport #50976)
 2026-02-19 23:30:52 +05:30
Mihir Kandoi
e7e67902e9 Merge pull request #52818 from frappe/mergify/bp/version-15-hotfix/pr-52811 
fix: permission issue for quotation item during update item (backport #52811)
 2026-02-19 23:19:42 +05:30
mergify[bot]
800e38453b feat: update item button addition for quotation (backport #50976) (#52810) 
* feat: update item button addition for quotation (#50976)

* feat: update item button addition for quotation

* feat: update item button addition for supplier quotation

* fix: test case

---------

Co-authored-by: Nishka Gosalia <nishkagosalia@Nishkas-MacBook-Air.local>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
(cherry picked from commit f4c0611cc5)

* chore: resolve conflicts

* chore: resolve conflicts

* chore: resolve conflicts

* chore: resolve conflicts

* chore: resolve conflicts

* chore: resolve conflicts

---------

Co-authored-by: Nishka Gosalia <58264710+nishkagosalia@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-02-19 23:11:32 +05:30
Mihir Kandoi
38939005ca fix: typo 
(cherry picked from commit 732c98b72f)
 2026-02-19 17:28:31 +00:00
Mihir Kandoi
bce77b6117 fix: ignore permissions instead of saving parent 
(cherry picked from commit 6342e9a3e2)
 2026-02-19 17:28:31 +00:00
Nishka Gosalia
5a3c027432 fix: permission issue for quotation item during update item 
(cherry picked from commit 58b8af0fa8)
 2026-02-19 17:28:30 +00:00
Mihir Kandoi
ee7602e752 Merge pull request #52813 from frappe/revert-52810-mergify/bp/version-15-hotfix/pr-50976 
revert: "feat: update item button addition for quotation"
 2026-02-19 20:39:43 +05:30
Mihir Kandoi
656b1bcede Revert "feat: update item button addition for quotation (backport #50976) (#5…" 
This reverts commit e2a1a7a36d.
 2026-02-19 20:22:25 +05:30
mergify[bot]
e2a1a7a36d feat: update item button addition for quotation (backport #50976) (#52810) 
* feat: update item button addition for quotation (#50976)

* feat: update item button addition for quotation

* feat: update item button addition for supplier quotation

* fix: test case

---------

Co-authored-by: Nishka Gosalia <nishkagosalia@Nishkas-MacBook-Air.local>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
(cherry picked from commit f4c0611cc5)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
#	erpnext/buying/doctype/supplier_quotation/test_supplier_quotation.py
#	erpnext/controllers/accounts_controller.py
#	erpnext/selling/doctype/quotation/test_quotation.py

* chore: resolve conflicts

* chore: resolve conflicts

* chore: resolve conflicts

* chore: resolve conflicts

* chore: resolve conflicts

* chore: resolve conflicts

---------

Co-authored-by: Nishka Gosalia <58264710+nishkagosalia@users.noreply.github.com>
Co-authored-by: Mihir Kandoi <kandoimihir@gmail.com>
 2026-02-19 14:41:01 +00:00
Mihir Kandoi
283b118773 Merge pull request #52805 from frappe/mergify/bp/version-15-hotfix/pr-52804 
fix(Purchase Receipt): copy project from first row when adding items (backport #52804)
 2026-02-19 14:03:34 +05:30
Marc Ramser
fd48fb49b9 fix(Purchase Receipt): copy project from first row when adding items 
Adds `items_add` method to copy expense_account, cost_center and project from first row to newly added items, matching Purchase Invoice behavior.

(cherry picked from commit 21423676c9)
 2026-02-19 08:31:59 +00:00
Mihir Kandoi
a57a9d7548 Merge pull request #52795 from frappe/mergify/bp/version-15-hotfix/pr-52794 
fix: reservation based on field should be read only in SRE (backport #52794)
 2026-02-19 12:56:57 +05:30
Mihir Kandoi
49dca6016c Merge pull request #52797 from frappe/mergify/bp/version-15-hotfix/pr-52792 
fix: unable to submit subcontracting order if created from material r… (backport #52792)
 2026-02-19 12:56:45 +05:30
Mihir Kandoi
0422117003 fix: unable to submit subcontracting order if created from material request 
(cherry picked from commit 37323480dd)
 2026-02-19 05:39:34 +00:00
Mihir Kandoi
6d32089d9e chore: resolve conflicts 2026-02-19 10:51:40 +05:30
Mihir Kandoi
c3626d67ca fix: reservation based on field should be read only in SRE 
(cherry picked from commit 21452b4c6e)

# Conflicts:
#	erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 2026-02-19 05:10:25 +00:00
Mihir Kandoi
3fcda3a414 Merge pull request #52787 from frappe/mergify/bp/version-15-hotfix/pr-52490 
fix: Add handling for Sales Invoice Item quantity field (backport #52490)
 2026-02-19 10:15:30 +05:30
Mihir Kandoi
2fc3e30f9f fix: add purchase invoice as well 
(cherry picked from commit 1fc2eddf6f)
 2026-02-19 04:12:47 +00:00
Thomas antony
41c7890a6d fix: Add handling for Sales Invoice Item quantity field 
Add handling for Sales Invoice Item quantity field

(cherry picked from commit edfcaee99b)
 2026-02-19 04:12:46 +00:00
mergify[bot]
d9f1b0be77 Merge pull request #52785 from frappe/mergify/bp/version-15-hotfix/pr-52712 
fix: addresses portal (backport #52712)
 2026-02-19 04:08:56 +00:00
Mihir Kandoi
fd7f6fd7f3 Merge pull request #52774 from frappe/mergify/bp/version-15-hotfix/pr-52628 
fix(manufacturing): set pick list purpose while creating it from work order (backport #52628)
 2026-02-18 15:30:45 +05:30
Sudharsanan11
33d48c5575 fix(manufacturing): set pick list purpose while creating it from work order 
(cherry picked from commit 23ccc2a8c5)
 2026-02-18 09:45:36 +00:00
Sagar Vora
f7332258e7 Merge pull request #52773 from frappe/revert-52366-mergify/bp/version-15-hotfix/pr-52279 
revert: "fix(profit and loss statement): exclude non period columns"
 2026-02-18 08:34:13 +00:00
Sagar Vora
d782c52b76 Revert "fix(profit and loss statement): exclude non period columns (backport #52279)" 2026-02-18 13:52:50 +05:30
ruthra kumar
be4fe38998 Merge pull request #52767 from frappe/mergify/bp/version-15-hotfix/pr-52763 
fix: better permissions on make payment request (backport #52763)
 2026-02-18 12:44:32 +05:30
ruthra kumar
ce7101f555 fix: better permissions on make payment request 
(cherry picked from commit f36962fc58)
 2026-02-18 06:58:27 +00:00
ruthra kumar
56dd37c9e6 Merge pull request #52765 from frappe/mergify/bp/version-15-hotfix/pr-52419 
fix: enfore permission on make_payment_request (backport #52419)
 2026-02-18 12:23:29 +05:30
ruthra kumar
460291990a fix: enfore permission on make_payment_request 
(cherry picked from commit b755ca12ca)
 2026-02-18 06:32:29 +00:00
Mihir Kandoi
80976ae466 Merge pull request #52753 from frappe/mergify/bp/version-15-hotfix/pr-52750 
fix: setup fails to set abbr to departments (backport #52750)
 2026-02-17 21:47:32 +05:30
Mihir Kandoi
9a28d4ef5a Merge pull request #52751 from frappe/mergify/bp/version-15-hotfix/pr-52743 
bug: fix comparison regarding `None` values (backport #52743)
 2026-02-17 21:37:25 +05:30
Mihir Kandoi
c432506912 fix: setup fails to set abbr to departments 
(cherry picked from commit debe868950)
 2026-02-17 15:57:32 +00:00
Markus Lobedann
852c200ee0 fix: bug with comparison regarding None values and empty string 
In their default state, the fields can be `None`. When a user enters something and deletes it afterwards, the fields contain an empty string.

This fixes the comparison.

(cherry picked from commit 3fd5a0f100)
 2026-02-17 15:51:48 +00:00
rohitwaghchaure
128c2bf8b9 Merge pull request #52739 from frappe/mergify/bp/version-15-hotfix/pr-52729 
feat: Negative Batch report (backport #52729)
 2026-02-17 17:17:42 +05:30
Mihir Kandoi
7aa46af0c3 Merge pull request #52735 from frappe/mergify/bp/version-15-hotfix/pr-52733 
fix: allow sequence ID edit in BOM if routing is not set (backport #52733)
 2026-02-17 16:39:01 +05:30
Rohit Waghchaure
631363632b feat: Negative Batch report 
(cherry picked from commit 34edbed00b)
 2026-02-17 11:04:17 +00:00
Mihir Kandoi
3e3c489178 Merge pull request #52737 from frappe/mergify/bp/version-15-hotfix/pr-52677 
fix: standalone credit/debit notes should not fetch any serial or bat… (backport #52677)
 2026-02-17 16:25:58 +05:30
Mihir Kandoi
79c3bc9bcd fix: standalone credit/debit notes should not fetch any serial or batch by default 
(cherry picked from commit 2017edca88)
 2026-02-17 10:40:08 +00:00
Mihir Kandoi
c6682f130c chore: resolve conflicts 2026-02-17 16:07:49 +05:30
Mihir Kandoi
c425944bdf fix: allow sequence id edit in BOM if routing is not set 
(cherry picked from commit 08529964b4)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_operation/bom_operation.json
 2026-02-17 10:35:58 +00:00
Mihir Kandoi
0935b181bf Merge pull request #52721 from aerele/backport-52626 
fix(manufacturing): add sales order fields in subassembly child table (backport #52626)
 2026-02-17 13:42:26 +05:30
ruthra kumar
bc50b94a87 Merge pull request #52595 from ljain112/fix-tds-report-v15 
fix: add base_tax_withholding_net_total to tax withholding report
 2026-02-17 13:39:48 +05:30
Mihir Kandoi
02f16715e0 Merge pull request #52717 from frappe/mergify/bp/version-15-hotfix/pr-52716 
fix: do not allow plant floor company and warehouse to be updated (backport #52716)
 2026-02-17 12:42:30 +05:30