CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-12 17:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,401 Commits 397 Branches 1,698 Tags
bde19ab0101aaa9d81f8cc271e4b9ded995b1674
Commit Graph

54401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Navin-S-R
bde19ab010 fix: handle gross profit and percentage for return invoices 
(cherry picked from commit 51709f032f)
 2026-02-10 12:41:07 +00:00
Navin-S-R
303dac262c fix(gross-profit): handle returns outside sale period 
(cherry picked from commit 67d8223f73)
 2026-02-10 12:41:07 +00:00
Kavin
3e4bd3040a Merge pull request #52591 from aerele/backport-52527 
fix(stock): correct warehouse mapping for material issue (backport #52527)
 2026-02-10 15:33:53 +05:30
Pandiyan37
5a42ff0c3c fix(stock): inward stock for pick list test record 2026-02-10 12:14:54 +05:30
Pandiyan37
37ca45ea49 test(stock): add test to check from warehouse for issue type 2026-02-10 12:11:59 +05:30
Pandiyan37
19dca36dec fix(stock): set source warehouse for issue type 2026-02-10 12:10:34 +05:30
mergify[bot]
a6f5b88f9b fix: Added a missing option to the currency field (backport #52528) (#52586) 
fix: Added a missing option to the currency field (#52528)

(cherry picked from commit da07f84e44)

Co-authored-by: El-Shafei H. <el.shafei.developer@gmail.com>
 2026-02-09 20:59:58 +00:00
mergify[bot]
6c9681ba4c fix: email campaign timeout issue (backport #51994) (#52555) 
fix: email campaign timeout issue (#51994)

* fix: email campaign timeout issue

* refactor: email campaign backend logic

* refactor: use sendmail instead of manually batching

(cherry picked from commit 22123dd955)

Co-authored-by: Pratik Badhe <badhepd@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2026-02-10 02:10:05 +05:30
mergify[bot]
9519773c5c fix(map_current_doc): prevent mutation of query args in get_query (backport #52202) (#52583) 
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:16 +05:30
mergify[bot]
eea8cb5885 fix: validate asset movement transaction date (backport #52340) (#52560) 
* fix: validate asset movement transaction date (#52340)

* fix: validate asset transaction date

* fix: validate asset transaction date

* fix: add translation in validate_transaction_date

* test: test_movement_transaction_date

* fix: to ensure test reliability

(cherry picked from commit e98b68c38f)

# Conflicts:
#	erpnext/assets/doctype/asset_movement/test_asset_movement.py

* chore: fix conflicts

Removed unused imports and cleaned up code.

---------

Co-authored-by: Poojashree T R <159940572+22-poojashree@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2026-02-10 01:02:23 +05:30
Trusted Computer
b034f3d3db fix: remove incorrect validation from email digest throwing spurious error (backport #51827) (#52582) 2026-02-09 23:45:56 +05:30
rohitwaghchaure
cf851cfa56 Merge pull request #52557 from frappe/mergify/bp/version-15-hotfix/pr-52550 
feat: allow negative stock for the batch item (backport #52550)
 2026-02-09 20:07:43 +05:30
rohitwaghchaure
7f69556c45 chore: fix conflicts 2026-02-09 16:31:33 +05:30
Rohit Waghchaure
4c094c3d86 feat: allow negative stock for the batch item 
(cherry picked from commit 376ab0e346)

# Conflicts:
#	erpnext/stock/doctype/stock_settings/stock_settings.json
 2026-02-09 10:50:24 +00:00
Mihir Kandoi
816cbdea0d Merge pull request #52523 from frappe/mergify/bp/version-15-hotfix/pr-52497 
fix: add is_group filter for supplier_group and warehouse fields (backport #52497)
 2026-02-07 22:02:24 +05:30
Mihir Kandoi
66a4823640 chore: resolve conflicts 2026-02-07 21:45:35 +05:30
Sudharsanan11
5b7ee0af66 fix(stock): add is group filter for warehouse fields 
(cherry picked from commit a9829f5f7b)
 2026-02-07 16:11:16 +00:00
Sudharsanan11
436cb8dbfc fix(buying): add supplier group link filters in field level 
(cherry picked from commit cfdc554a19)

# Conflicts:
#	erpnext/buying/doctype/supplier/supplier.json
 2026-02-07 16:11:16 +00:00
Mihir Kandoi
ad2b8d2455 Merge pull request #52440 from frappe/mergify/bp/version-15-hotfix/pr-52416 
fix(stock): update target field attribute (backport #52416)
 2026-02-06 12:53:38 +05:30
Mihir Kandoi
2a1a7fd1f6 Merge pull request #52487 from frappe/mergify/bp/version-15-hotfix/pr-52219 
fix: enabling skip delivery option for order type maintenance (backport #52219)
 2026-02-06 12:46:22 +05:30
Pandiyan37
d0a8639a2d test(stock): testcase for different inventory dimension 
(cherry picked from commit 21d0ee8db1)
 2026-02-06 12:28:22 +05:30
Pandiyan37
9cfd704eef fix(stock): update target field attribute 
(cherry picked from commit 7e08154217)
 2026-02-06 12:28:22 +05:30
mergify[bot]
29b35494da Merge pull request #52483 from frappe/mergify/bp/version-15-hotfix/pr-52475 
fix: do not show update stock flag unneccessarily (backport #52475)
 2026-02-06 06:46:54 +00:00
Mihir Kandoi
292f17b1b0 chore: resolve conflicts 2026-02-06 12:12:59 +05:30
Mihir Kandoi
740dd878e9 chore: resolve conflicts 2026-02-06 12:12:24 +05:30
Nishka Gosalia
a8f05cadea fix: enabling skip delivery option for order type maintenance 
(cherry picked from commit 1a22e3cb61)

# Conflicts:
#	erpnext/selling/doctype/sales_order/sales_order.json
#	erpnext/selling/doctype/sales_order/test_sales_order.py
 2026-02-06 06:39:47 +00:00
rohitwaghchaure
3cf10fafdf Merge pull request #52462 from rohitwaghchaure/fixed-stock-reco-balance-value-v15 
fix: stock balance report issue
 2026-02-05 15:49:33 +05:30
Rohit Waghchaure
bda7220b70 fix: stock balance report issue 2026-02-05 15:00:40 +05:30
ruthra kumar
c62c30f7a3 Merge pull request #52425 from frappe/mergify/bp/version-15-hotfix/pr-51990 
refactor: use https over http while saving website link (backport #51990)
 2026-02-05 11:13:42 +05:30
ruthra kumar
d91cf01970 refactor: patch partner_website for old data 
(cherry picked from commit 8db29b0a81)

# Conflicts:
#	erpnext/patches.txt
 2026-02-05 10:58:29 +05:30
Mihir Kandoi
da0776a38c Merge pull request #52429 from frappe/mergify/bp/version-15-hotfix/pr-52427 2026-02-04 20:18:15 +05:30
archielister
9efdcf208a fix for obtaining bom_no 
(cherry picked from commit e4df0a393a)
 2026-02-04 14:33:05 +00:00
ruthra kumar
fb525fec80 refactor: scrub http and use https in sales partner 
(cherry picked from commit 8cf31548f2)
 2026-02-04 12:32:22 +00:00
Mihir Kandoi
f31bb6ad4a Merge pull request #52420 from frappe/mergify/bp/version-15-hotfix/pr-51773 
fix(manufacturing): refactor production analytics report (backport #51773)
 2026-02-04 17:24:13 +05:30
Sudharsanan11
99f3a7e4cf fix(manufacturing): fix chart period keys 
(cherry picked from commit 27091e5168)
 2026-02-04 11:28:05 +00:00
Sudharsanan11
f965b352c8 fix(manufacturing): handle None value for actual_end_date 
(cherry picked from commit 16f09141da)
 2026-02-04 11:28:05 +00:00
Mihir Kandoi
d93ba985e4 Merge pull request #52407 from frappe/mergify/bp/version-15-hotfix/pr-52383 
fix: rate comparison in stock reco (backport #52383)
 2026-02-04 12:32:56 +05:30
Mihir Kandoi
195f020636 fix: return None instead of 0 if valuation rate is falsy 
(cherry picked from commit e8d1e9d946)
 2026-02-04 06:48:17 +00:00
Mihir Kandoi
cacca812ed fix: rate comparison in stock reco 
(cherry picked from commit f1b4fe12a2)
 2026-02-04 06:48:16 +00:00
ruthra kumar
4347efdf2c Merge pull request #52387 from frappe/mergify/bp/version-15-hotfix/pr-51422 
fix: merge taxes in purchase receipt when get items from multiple purchase invoices (backport #51422)
 2026-02-04 09:52:23 +05:30
NaviN
68338abe07 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)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
 2026-02-04 07:19:28 +05:30
ruthra kumar
12be1dca7d Merge pull request #52378 from frappe/mergify/bp/version-15-hotfix/pr-51651 
fix: correct exchange gain loss in ppr (backport #51651)
 2026-02-03 20:59:56 +05:30
Mihir Kandoi
2d2bbe5fc2 Merge pull request #52384 from frappe/mergify/bp/version-15-hotfix/pr-52259 
fix(stock): include subcontracting order qty while calculating the bin qty (backport #52259)
 2026-02-03 20:48:53 +05:30
Mihir Kandoi
a0da47d7f4 Merge pull request #52381 from frappe/mergify/bp/version-15-hotfix/pr-52374 
fix(stock): fetch batch wise valuation rate in get_items (backport #52374)
 2026-02-03 20:32:15 +05:30
Mihir Kandoi
c0116bcde5 chore: resolve conflicts 2026-02-03 20:30:40 +05:30
Sudharsanan11
ba17fdd072 fix(stock): include subcontracting order qty while calculating the bin qty 
(cherry picked from commit de8f8ef9f4)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
 2026-02-03 14:55:08 +00:00
kavin-114
f1ba825818 fix(stock): fetch batch wise valuation rate in get_items 
(cherry picked from commit c5df570262)
 2026-02-03 14:47:36 +00:00
ravibharathi656
e42f8ffd5d fix: correct exchange gain loss in ppr 
(cherry picked from commit 02e96039ac)
 2026-02-03 14:35:42 +00:00
rohitwaghchaure
c9955ddb35 Merge pull request #52369 from rohitwaghchaure/fixed-zero-incoming-rate-58744 
fix: zero valuation rate if returning from different warehouse
 2026-02-03 19:10:37 +05:30
Rohit Waghchaure
28929df0e8 fix: zero valuation rate if returning from different warehouse 2026-02-03 18:54:36 +05:30