nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-14 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,799 Commits 650 Branches 1,810 Tags
24910cf2d20a7be3b6c50cf5a1a1534d1dcabc85
Commit Graph

8316 Commits

Author SHA1 Message Date
mergify[bot]
09279f08e3 Feat/shipment default contact (backport #53029) (#53355) 
Co-authored-by: David <52141166+sdavidbastos@users.noreply.github.com>
 2026-03-12 05:47:32 +00:00
mergify[bot]
82b97abbad fix(delivery note): avoid maintaining si_detail on return delivery note (backport #52456) (#53353) 
Co-authored-by: NaviN <118178330+Navin-S-R@users.noreply.github.com>
fix(delivery note): avoid maintaining si_detail on return delivery note (#52456)
 2026-03-12 05:26:02 +00:00
mergify[bot]
541bfb664b fix: re-calculate taxes and totals after resetting bundle item rate (backport #53342) (#53350) 
Co-authored-by: V Shankar <shankarv292002@gmail.com>
fix: re-calculate taxes and totals after resetting bundle item rate (#53342)
 2026-03-12 05:22:27 +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
Rohit Waghchaure
8f02184c80 fix: validation for cancellation 
(cherry picked from commit 8de272a8a1)
 2026-03-09 07:49:38 +00:00
Rohit Waghchaure
10538d58ad fix: HRMS test cases failing due to validation in item 
(cherry picked from commit 6702506f58)
 2026-03-06 12:24:59 +00:00
rohitwaghchaure
b510f78510 Merge pull request #53208 from frappe/mergify/bp/version-16-hotfix/pr-53200 
fix: stock balance report qty (backport #53200)
 2026-03-06 13:14:55 +05:30
Rohit Waghchaure
699a683b8e fix: stock balance report qty 
(cherry picked from commit a15e5fdc4e)
 2026-03-06 07:15:46 +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
fb17a00fb6 fix: balance qty for inv dimension 
(cherry picked from commit a3eafe5b18)
 2026-03-05 08:20:20 +00:00
mergify[bot]
76a6ff9026 Merge pull request #53096 from frappe/mergify/bp/version-16-hotfix/pr-52838 
fix: correct fields being updated on material request and purchase or… (backport #52838)
 2026-03-04 07:23:39 +00:00
Mihir Kandoi
8463cf88df fix: do not update fg_completed_qty when changing qty of fg line item 
(cherry picked from commit 2d83069b82)
 2026-03-04 06:40:12 +00:00
Sudharsanan11
4350c6b9e3 test(stock): add test to validate company for receipts and expense accounts 
(cherry picked from commit d58171987c)
 2026-03-03 15:47:20 +00:00
Sudharsanan11
25c134d11c fix: set company based expense account 
(cherry picked from commit d54d0c25a2)
 2026-03-03 15:47:20 +00:00
Sudharsanan11
c6e0eb6d17 fix(stock): validate company for receipt documents and expense accounts 
(cherry picked from commit 15dfc08a31)
 2026-03-03 15:47:19 +00:00
Mihir Kandoi
41b9566dec Merge pull request #53125 from frappe/mergify/bp/version-16-hotfix/pr-53123 
fix: serial no status for Disassemble entry (backport #53123)
 2026-03-03 21:12:42 +05:30
kavin-114
417e8a4371 fix: pass company in test case using make_quality_inspections 
(cherry picked from commit 397de1274f)
 2026-03-03 15:10:48 +00:00
kavin-114
3844982824 test: add unit test to handle company condition in naming rule 
(cherry picked from commit 4c39cf2d65)
 2026-03-03 15:10:47 +00:00
Rohit Waghchaure
dc0592a905 fix: serial no status for Disassemble entry 
(cherry picked from commit 81acefa8ad)
 2026-03-03 13:24:22 +00:00
rohitwaghchaure
35336350ca Merge pull request #53098 from frappe/mergify/bp/version-16-hotfix/pr-53093 
fix: opening qty in stock balance (backport #53093)
 2026-03-02 21:43:29 +05:30
rohitwaghchaure
97f6b3a3b5 Merge pull request #53092 from frappe/mergify/bp/version-16-hotfix/pr-53087 
perf: add index on reference_purchase_receipt column (backport #53087)
 2026-03-02 21:38:02 +05:30
Rohit Waghchaure
1f2342cf4b fix: opening qty in stock balance 
(cherry picked from commit d7fdab99cb)
 2026-03-02 15:19:56 +00:00
kavin-114
664f1f1675 perf: add index on reference_purchase_receipt column 
(cherry picked from commit 8c94396ad9)
 2026-03-02 09:08:44 +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
Mihir Kandoi
c92fd26e1b fix: use the correct precision value in stock reco 
(cherry picked from commit 36726b0f7b)
 2026-03-01 15:52:17 +00:00
Sanjesh
788cd82b4b fix: correct sle voucher_type comparison in get_ref_doctype 
(cherry picked from commit cffb59ae73)
 2026-03-01 15:16:44 +00:00
Mihir Kandoi
8ed2d45729 Merge pull request #53061 from frappe/mergify/bp/version-16-hotfix/pr-53057 
fix: allow allowed roles to bypass over billing validation (backport #53057)
 2026-03-01 16:03:42 +05:30
Mihir Kandoi
8752b2f767 Merge pull request #53059 from frappe/mergify/bp/version-16-hotfix/pr-53052 
fix: use stock qty instead of qty when creating stock entry from MR (backport #53052)
 2026-03-01 15:50:24 +05:30
Mihir Kandoi
c274b7cc2e fix: allow allowed roles to bypass over billing validation 
(cherry picked from commit 04127019f9)
 2026-03-01 10:18:22 +00:00
Mihir Kandoi
1e4478765a fix: use stock qty instead of qty when creating stock entry from MR 
(cherry picked from commit 30c3ff2efe)
 2026-03-01 09:51:54 +00:00
Mihir Kandoi
f939e980a6 fix: use conversion factor when creating stock entry from pick list 
(cherry picked from commit 5f12b0db3f)
 2026-03-01 09:40:37 +00:00
Rohit Waghchaure
c28568f4fd fix: same reposting entry picked by multiple rq jobs 
(cherry picked from commit 4dfbacfd92)
 2026-02-28 02:06:33 +00:00
Rohit Waghchaure
ea5ad3179c fix: old stock reco entries causing issue in the stock balance report 
(cherry picked from commit 0874cbc268)
 2026-02-27 09:27:00 +00:00
rohitwaghchaure
44c9fccd34 Merge pull request #52969 from frappe/mergify/bp/version-16-hotfix/pr-52967 
fix: patch to complete onboarding stpes for existing records (backport #52967)
 2026-02-26 10:51:05 +05:30
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
Rohit Waghchaure
ab7e33f83d fix: reposting creation slow for GL entries 
(cherry picked from commit d9ac198bad)
 2026-02-25 10:34:25 +00:00
ruthra kumar
270b09f936 chore: resolve conflicts 2026-02-25 14:42:52 +05:30
ruthra kumar
0433f73b03 refactor: utm analytics section delivery note 
(cherry picked from commit 578783af8e)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.json
 2026-02-25 06:54:16 +00:00
Mihir Kandoi
265342d40a chore: clearer description for internal transfer at arms length 
(cherry picked from commit bd9e5e97d7)
 2026-02-25 04:43:22 +00:00
Harsh Patadia
27c03fee1c refactor: separate construction of chart related data from get_columns() (#52824) 
* fix: avoid hardcoded column slicing for Profit & Loss chart data

* refactor: improve parameter naming and reduce code repetion by using same function get_period_columns()

* refactor: improved parameter naming in get_data() and get_chart_data()

(cherry picked from commit bdcb2c1512)
 2026-02-24 12:37:51 +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
Imesha Sudasingha
fb8f085885 Merge pull request #52544 from one-highflyer/fix/improve-reserved-serial-no-error-message 
fix(stock): improve error message when serial no is reserved via SRE

(cherry picked from commit 71248ff40b)
 2026-02-23 15:13:17 +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
rohitwaghchaure
ddfdc1a4e7 Merge pull request #52867 from frappe/mergify/bp/version-16-hotfix/pr-52508 
refactor: form cleanup for stock and manufacturing doctypes (backport #52508)
 2026-02-23 12:12:43 +05:30
rohitwaghchaure
7223acf266 Merge pull request #52866 from frappe/mergify/bp/version-16-hotfix/pr-52469 
refactor: form cleanup for master doctypes related to stock module (backport #52469)
 2026-02-23 11:27:27 +05:30
Rohit Waghchaure
575fd4988b refactor: form cleanup for stock and manufacturing doctypes 
(cherry picked from commit bf20ecca60)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
 2026-02-23 05:27:39 +00:00