nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-09 16:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,121 Commits 494 Branches 1,768 Tags
d093b719463685ff7150770ef0a806c98e345a25
Commit Graph

3269 Commits

Author SHA1 Message Date
mergify[bot]
a94bf6db06 fix(payment_schedule): using show_alert instead of msgprint for non-selection of payment schedule (backport #53623) (#53631) 
Co-authored-by: diptanilsaha <diptanil@frappe.io>
fix(payment_schedule): using `show_alert` instead of `msgprint` for non-selection of payment schedule (#53623)
 2026-03-19 12:57:45 +05:30
mergify[bot]
9ccafd30be fix(stock): fix the property setter (backport #53422) (#53574) 
Co-authored-by: Sudharsanan Ashok <135326972+Sudharsanan11@users.noreply.github.com>
fix(stock): fix the property setter (#53422)
 2026-03-17 22:07:43 +05:30
sokumon
10cb6f8306 fix: use same label 
(cherry picked from commit ed3444de5a)
 2026-03-17 11:36:20 +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
ervishnucs
29d565b9de fix: allow payment_request to be created in draft 
(cherry picked from commit 24825a16e0)
 2026-03-09 14:54:36 +00:00
Nishka Gosalia
76a32686a5 fix :buttons not visible on purchase and sales order 
(cherry picked from commit 829dbbe12b)
 2026-03-09 09:36:06 +00:00
Rohit Waghchaure
93a597410e feat: option to enable serial / batch features 
(cherry picked from commit 82c3da5b1e)

# Conflicts:
#	erpnext/patches.txt
 2026-03-06 06:48:17 +00:00
Rohit Waghchaure
e89aaca870 feat: organization desktop icon 
(cherry picked from commit 4e9a2a327f)
 2026-03-05 08:36:29 +00:00
jacob-salvi
1938a56164 chore: new organisation icon 
(cherry picked from commit 6f93210b9b)
 2026-03-05 08:10:14 +00:00
jacob-salvi
f97e0f8c9c chore: new accounting icons 
(cherry picked from commit 728c678cf9)
 2026-03-05 08:10:14 +00:00
SowmyaArunachalam
b2f695310c fix: fetch payment terms from quotation 
(cherry picked from commit 99ed1c34f3)
 2026-03-05 06:20:47 +00:00
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
Luis Mendoza
3f284f0c55 fix(accounts): round and convert net_amount to company currency in JS tax controller 
(cherry picked from commit b10b205394)
 2026-02-26 08:18:12 +00:00
Luis Mendoza
adb4023ba4 style: prettier formatting 
(cherry picked from commit 485166b668)
 2026-02-26 08:18:12 +00:00
Luis Mendoza
429bd245d1 fix(accounts): compute tax net_amount in JS controller 
(cherry picked from commit 153ad99f85)
 2026-02-26 08:18:11 +00:00
Mihir Kandoi
0fd9fc48f3 fix: item code shows undefined 
(cherry picked from commit 9ef7f05712)
 2026-02-25 04:55:59 +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
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
b67d42ee58 fix: link field displays incorrect value when empty 
(cherry picked from commit db00860662)
 2026-02-23 13:37:44 +00:00
Abdeali Chharchhoda
123b7191fc refactor: fetch employee contact details in realtime 
(cherry picked from commit 2ea6508fa5)
 2026-02-23 12:22:56 +00:00
Abdeali Chharchhoda
94f9f8b30a feat: retrieve employee contact details 
(cherry picked from commit a41297d841)
 2026-02-23 12:22:56 +00:00
Rohit Waghchaure
91e9867fb1 refactor: Cleanup buying module forms 
(cherry picked from commit f3ea1863ae)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 2026-02-23 05:26:46 +00:00
Mihir Kandoi
3355c60c79 fix: update items fetches wrong item code 
(cherry picked from commit ba96d37c11)
 2026-02-20 08:54:31 +00:00
Mihir Kandoi
dd4e1867f5 fix: standalone credit/debit notes should not fetch any serial or batch by default 
(cherry picked from commit 2017edca88)
 2026-02-17 10:40:32 +00:00
ervishnucs
e2183ebde9 fix: allow non-stock items while updating items 
(cherry picked from commit 07db5941aa)
 2026-02-15 07:28:48 +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
ruthra kumar
00caebe90c Merge pull request #52397 from frappe/mergify/bp/version-16-hotfix/pr-52396 
fix: remove customer_pos_id reference (backport #52396)
 2026-02-10 18:28:49 +05:30
mergify[bot]
b8256e5f31 fix(map_current_doc): prevent mutation of query args in get_query (backport #52202) (#52584) 
fix(map_current_doc): prevent mutation of query args in get_query (#52202)

(cherry picked from commit 23a73c9cdb)

Co-authored-by: V Shankar <shankarv292002@gmail.com>
 2026-02-10 01:26:00 +05:30
Mihir Kandoi
e86ab97b7e chore: add line in the end so linter check passes 2026-02-04 17:26:01 +05:30
Diptanil Saha
ab59f73064 fix: remove customer_pos_id reference (#52396) 
(cherry picked from commit 036f64013d)
 2026-02-04 05:18:56 +00:00
rohitwaghchaure
4a7e2742ec Merge pull request #52388 from frappe/mergify/bp/version-16-hotfix/pr-51422 
fix: merge taxes in purchase receipt when get items from multiple purchase invoices (backport #51422)
 2026-02-03 22:53:40 +05:30
rohitwaghchaure
b8ac04fb54 Merge branch 'version-16' into version-16-hotfix 2026-02-03 22:50:07 +05:30
NaviN
d80c8d14b0 fix: merge taxes in purchase receipt when get items from multiple purchase invoices (#51422) 
* fix: merge taxes in purchase receipt when get items from multiple purchase invoices

* fix: make merge tax configurable

* chore: follow standard merge taxes method

* chore: follow standard merge taxes method

(cherry picked from commit 6fde0a6261)
 2026-02-03 15:34:03 +00:00
sokumon
e264d8e2d6 chore: rename icons 
(cherry picked from commit 2d312bcfe8)
 2026-02-03 10:02:54 +00:00
Rohit Waghchaure
2a3642b55a fix: batch selector not working if Use Legacy (Client side) Reactivity disabled 
(cherry picked from commit d1cba1073f)
 2026-02-02 16:32:18 +00:00
Mihir Kandoi
b8ab55fee8 fix: better fix for aac39b2671 
(cherry picked from commit b24ae5e9a2)
 2026-01-31 14:21:27 +00:00
UmakanthKaspa
af167f91fe fix: item code not showing in report view 
(cherry picked from commit b20f57321f)
 2026-01-30 16:46:26 +00:00
Mihir Kandoi
e4cdd971c8 fix(barcode): failing request when item has both batch and serial 
(cherry picked from commit 89f6f0f46f)
 2026-01-30 06:17:41 +00:00
Jacob Salvi
3394e1a126 refactor: new accounting icons (#52173) 
* chore: new icons share-management

* chore: new accounting icons

* chore: trigger CI

---------

Co-authored-by: Soham Kulkarni <77533095+sokumon@users.noreply.github.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
(cherry picked from commit cdcf3fa593)
 2026-01-29 09:13:39 +00:00
mergify[bot]
66086010fc fix(demo): removed toolbar eventlistener (backport #52171) (#52172) 
Co-authored-by: Diptanil Saha <diptanil@frappe.io>
fix(demo): removed toolbar eventlistener (#52171)
 2026-01-29 11:29:59 +05:30
mergify[bot]
554aeb94fd feat: clear demo data from desktop screen (backport #52128) (#52150) 
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Soham Kulkarni <77533095+sokumon@users.noreply.github.com>
 2026-01-28 18:19:41 +05:30
mergify[bot]
05e30dc011 feat: clear demo data from desktop screen (backport #52128) (#52147) 
Co-authored-by: Soham Kulkarni <77533095+sokumon@users.noreply.github.com>
 2026-01-28 17:36:04 +05:30
SowmyaArunachalam
0b7684eccd fix: handle parent level project change 
(cherry picked from commit 543b6e51c0)
 2026-01-27 16:24:22 +00:00
SowmyaArunachalam
574460c009 chore: use frappe.model.set_value 
(cherry picked from commit 3b27f49d79)
 2026-01-27 16:24:22 +00:00
SowmyaArunachalam
27fe754a7d fix(sales order): set project at item level from parent 
(cherry picked from commit 9e51701e2a)
 2026-01-27 16:24:22 +00:00
ruthra kumar
31385a1f91 Merge pull request #52118 from frappe/mergify/bp/version-16-hotfix/pr-51894 
refactor: accounting workspace (backport #51894)
 2026-01-27 20:08:29 +05:30
mergify[bot]
9ed3801d06 feat(accounts): retain filters when switching between financial statements (backport #51668) (#52117) 2026-01-27 19:03:44 +05:30
ruthra kumar
61ad67ec29 refactor: reuse icon for invoicing 
(cherry picked from commit f0332c4dc7)
 2026-01-27 13:15:37 +00:00
mergify[bot]
6115f8fb9a fix(accounts): correct base grand total and rounded total mismatch (backport #51739) (#52101) 
Co-authored-by: Dharanidharan S <dharanidharans1328@gmail.com>
fix(accounts): correct base grand total and rounded total mismatch (#51739)
 2026-01-27 14:23:10 +05:30