nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-21 10:19:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,684 Commits 605 Branches 1,802 Tags
e2824e1dc5bbcfb87de3df60f87eb7f86190c1a6
Commit Graph

3240 Commits

Author SHA1 Message Date
Mihir Kandoi
3e8ebf8c14 chore: resolve conflicts 2026-03-03 20:44:40 +05:30
kavin-114
d61ad3bd95 fix(stock): pass company to avoid document naming rule issue in QI 
When a Document Naming Rule is configured in QI with a condition based on the company,
the system was not passing the company value properly. As a result, the naming rule
condition was skipped and the document name was generated using the default series.

This fix ensures that the company is passed correctly so that the configured
Document Naming Rule is evaluated and applied as expected.

(cherry picked from commit 74def423ed)

# Conflicts:
#	erpnext/controllers/stock_controller.py
 2026-03-03 15:10:47 +00:00
Rohit Waghchaure
b8de82f0e4 fix: validate warehouse of SABB for draft entry 
(cherry picked from commit 9b8f685c82)
 2026-03-02 08:53:09 +00:00
Rohit Waghchaure
744d7a2793 fix: voucher detail no in SABB 
(cherry picked from commit c37a56ec89)
 2026-03-02 04:24:00 +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
ljain112
6902fd6b33 refactor: use postprocess in mapped_doc to update items in subcontracting controller 
(cherry picked from commit 1d3d09f48c)
 2026-02-24 15:07:59 +00:00
ljain112
0e2e89c355 fix: prevent precision errors in discount distribution with inclusive tax 
(cherry picked from commit 2068299766)
 2026-02-24 11:29:05 +00:00
Mihir Kandoi
6e1a8083a5 fix: standalone sales invoice return should not fallback to item master for valuation rate 
(cherry picked from commit a85a0aef52)
 2026-02-23 13:19:55 +00:00
Mihir Kandoi
0c4b9ea9ca fix: typo 
(cherry picked from commit 732c98b72f)
 2026-02-19 17:28:53 +00:00
Mihir Kandoi
715dbc0093 fix: ignore permissions instead of saving parent 
(cherry picked from commit 6342e9a3e2)
 2026-02-19 17:28:53 +00:00
Nishka Gosalia
bccca6f58e fix: permission issue for quotation item during update item 
(cherry picked from commit 58b8af0fa8)
 2026-02-19 17:28:53 +00:00
Mihir Kandoi
c5bc92d50e fix: unable to submit subcontracting order if created from material request 
(cherry picked from commit 37323480dd)
 2026-02-19 13:44:30 +05:30
Rohit Waghchaure
ac90975f43 fix: cancel SABB if SLE cancelled from LCV 
(cherry picked from commit f23a49a25e)
 2026-02-16 15:42:23 +00:00
Mihir Kandoi
46b5884420 fix: total weight does not update when updating items 
(cherry picked from commit 63323a2611)
 2026-02-15 08:45:19 +00:00
Navin-S-R
b844afe0ec feat: show formatted currency symbol on ledger preview 
(cherry picked from commit 5c8cb1e7ec)
 2026-02-12 05:59:06 +00:00
Rohit Waghchaure
8ce51b2f80 fix: zero valuation rate if returning from different warehouse 
(cherry picked from commit 28929df0e8)
(cherry picked from commit eb2119e292)
 2026-02-03 13:59:59 +00:00
Dharanidharan2813
6048add4c0 feat(delivery-note): add status indicator when document is partially billed 
(cherry picked from commit 7767000ccf)
 2026-02-03 10:59:20 +00:00
Sudharsanan11
95c4b8de06 fix(subcontracting): include item bom in supplied items grouping key 
(cherry picked from commit 0d372a62a1)
 2026-02-03 03:40:18 +00:00
Mihir Kandoi
9997185071 Merge pull request #52246 from mihir-kandoi/st58765 
(cherry picked from commit 135a433018)
 2026-02-02 15:15:38 +00:00
Mihir Kandoi
024e7b01ac fix: reset incoming rate in selling controller if there are changes in item 
(cherry picked from commit 2d6b43fd54)
 2026-02-02 14:18:20 +00:00
Mihir Kandoi
e7ace8e620 fix: validate over ordering of quotation 
(cherry picked from commit 4cc306d2d8)

# Conflicts:
#	erpnext/patches.txt
 2026-01-30 14:00:52 +00:00
Mihir Kandoi
02e6c49130 test: add test case 
(cherry picked from commit e2c3d0fa94)
 2026-01-30 11:41:46 +00:00
Mihir Kandoi
b365444027 fix: add precision to rejected batch no qty calculation 
(cherry picked from commit 838d245215)
 2026-01-30 06:35:59 +00:00
kavin-114
0f9bf08685 fix(credit-note): set incoming rate as zero for expired batch 
(cherry picked from commit e78c750b4e)
 2026-01-28 10:43:58 +00:00
Mihir Kandoi
75758610dd fix: show everything else besides other party specific item 
(cherry picked from commit 71371b0ba5)
 2026-01-27 10:57:40 +00:00
Mihir Kandoi
dcd6279d47 Merge pull request #51983 from frappe/mergify/bp/version-16-hotfix/pr-51908 
fix: throw if item order field is not set in subcontracting controller (backport #51908)
 2026-01-22 10:53:05 +05:30
ljain112
264855e5e1 fix: throw if item order field is not set in subcontracting controller 
(cherry picked from commit d256365f4a)
 2026-01-22 05:05:22 +00:00
ljain112
7120fbd14b fix: calculate weighted average rate for customer provided items in subcontracting inward order 
(cherry picked from commit 37ee560eae)
 2026-01-22 05:02:16 +00:00
Mihir Kandoi
c7c7a55a58 fix: rejected qty in PR doesn't consider conversion factor 
(cherry picked from commit 343ee9695b)
 2026-01-21 17:21:00 +00:00
barredterra
621243c1d3 fix(accounts_controller): make return message translatable 
(cherry picked from commit 0209f0fe29)
 2026-01-20 02:26:48 +00:00
Mihir Kandoi
2131c7aadb fix: no attribute error on subcontracting receipt 
(cherry picked from commit fbac8b032e)
 2026-01-19 14:30:08 +00:00
Lakshit Jain
181141b56a Merge pull request #51787 from ljain112/fix-taxes-disc 
fix: recalculate taxes when item tax template changes after discount
(cherry picked from commit f00aeec9b4)
 2026-01-19 07:01:52 +00:00
Rohit Waghchaure
8d4a179a8f refactor: single table for better performance 2026-01-11 13:43:09 +05:30
rohitwaghchaure
d3a480200e Merge branch 'develop' into fixed-serial-no-save-performance-issue 2026-01-09 16:57:24 +05:30
ruthra kumar
f4f02458ef Merge pull request #51534 from aerele/fix/support-56421 
fix(accounts): correct sales order item deletion message for MR and PO linkage
 2026-01-08 17:39:21 +05:30
Rohit Waghchaure
d420ec0b22 fix: purchase return issue 2026-01-06 19:02:33 +05:30
Rohit Waghchaure
20320c4a6c perf: SABB taking time to save the record 2026-01-06 18:47:35 +05:30
Pandiyan5273
5a47503611 fix(accounts): correct sales order item deletion message for MR and PO linkage 2026-01-06 12:58:54 +05:30
Rohit Waghchaure
344572cf87 fix: not able to make purchase return for serial nos 2026-01-04 19:47:33 +05:30
Mihir Kandoi
87d00a373f Merge pull request #51305 from mihir-kandoi/gh45824 2025-12-31 09:26:38 +00:00
Mihir Kandoi
2860d5a406 fix: variant creation with translation 2025-12-30 12:14:43 +05:30
Nishka Gosalia
41a7e64772 feat: Adding support for discarding document (#51316) 
Co-authored-by: Nishka Gosalia <nishkagosalia@Nishkas-MacBook-Air.local>
 2025-12-29 08:49:46 +00:00
Raffael Meyer
b6cb9d4799 fix: don't duplicate default income account to Item (#50413) 
* fix: don't duplicate default income account to Item

Only store _Default Income Account_ in **Item** if it's different from the **Company**'s  _Default Income Account_.

Resolves #48231

* refactor: move db call out of loop

* docs: add docstring
 2025-12-25 10:22:37 +01:00
Lakshit Jain
c66f78c784 feat: Introduce tax withholding entry 2025-12-23 20:47:53 +05:30
Nishka Gosalia
8310b5ca36 feat: Added description column for update items 2025-12-23 15:47:44 +05:30
Mihir Kandoi
17320d1062 refactor: pick list from material request 2025-12-18 09:17:42 +00:00
Nishka Gosalia
1562e9b828 fix: Disallow due date to be before the posting date in Quotation 2025-12-17 14:44:24 +05:30
Nishka Gosalia
f4c0611cc5 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>
 2025-12-17 13:53:10 +05:30
Mihir Kandoi
c287665033 fix: rejected qty not outward-ed in SCR 2025-12-16 11:23:19 +05:30
Mihir Kandoi
9b794d5a42 Merge pull request #51083 from aerele/mr-customer-provided-status 2025-12-13 14:39:35 +05:30