CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-23 13:12:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,577 Commits 426 Branches 1,724 Tags
9d73faddfee9a6eaef9d0a71bf260ebcca5072a7
Commit Graph

54577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
9d73faddfe chore: fix conflicts 
Removed redundant on_update method and cleaned up code.
 2026-03-02 14:35:45 +05:30
Rohit Waghchaure
d5e25153f8 fix: validate warehouse of SABB for draft entry 
(cherry picked from commit 9b8f685c82)

# Conflicts:
#	erpnext/controllers/stock_controller.py
 2026-03-02 08:52:37 +00:00
rohitwaghchaure
94afc32a8d Merge pull request #53076 from frappe/mergify/bp/version-15-hotfix/pr-53050 
fix: voucher detail no in SABB (backport #53050)
 2026-03-02 12:48:03 +05:30
rohitwaghchaure
97df39a630 chore: fix conflicts 2026-03-02 12:10:43 +05:30
Rohit Waghchaure
6e5738e95c fix: voucher detail no in SABB 
(cherry picked from commit c37a56ec89)

# Conflicts:
#	erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
 2026-03-02 04:23:42 +00:00
Mihir Kandoi
6147541f58 Merge pull request #53068 from frappe/mergify/bp/version-15-hotfix/pr-53067 
fix: use the correct precision value in stock reco (backport #53067)
 2026-03-01 21:36:56 +05:30
Mihir Kandoi
6d726e4b64 fix: use the correct precision value in stock reco 
(cherry picked from commit 36726b0f7b)
 2026-03-01 15:52:02 +00:00
Mihir Kandoi
8fed606357 Merge pull request #53065 from frappe/mergify/bp/version-15-hotfix/pr-53062 
fix: correct sle voucher_type comparison in get_ref_doctype (backport #53062)
 2026-03-01 21:01:39 +05:30
Sanjesh
a587b6a57c fix: correct sle voucher_type comparison in get_ref_doctype 
(cherry picked from commit cffb59ae73)
 2026-03-01 15:16:29 +00:00
Mihir Kandoi
51fb7affeb Merge pull request #53060 from frappe/mergify/bp/version-15-hotfix/pr-53057 
fix: allow allowed roles to bypass over billing validation (backport #53057)
 2026-03-01 20:43:16 +05:30
Mihir Kandoi
6ac2f510a6 chore: resolve conflicts 2026-03-01 20:28:00 +05:30
Mihir Kandoi
2a78f47f02 Merge pull request #53058 from frappe/mergify/bp/version-15-hotfix/pr-53052 
fix: use stock qty instead of qty when creating stock entry from MR (backport #53052)
 2026-03-01 15:52:19 +05:30
Mihir Kandoi
8e59fe90cc fix: allow allowed roles to bypass over billing validation 
(cherry picked from commit 04127019f9)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
 2026-03-01 10:18:05 +00:00
Mihir Kandoi
bf7b9c10dc Merge pull request #53053 from frappe/mergify/bp/version-15-hotfix/pr-53051 
fix: use conversion factor when creating stock entry from pick list (backport #53051)
 2026-03-01 15:25:57 +05:30
Mihir Kandoi
2984f79a69 fix: use stock qty instead of qty when creating stock entry from MR 
(cherry picked from commit 30c3ff2efe)
 2026-03-01 09:51:35 +00:00
Mihir Kandoi
f2e1482f63 fix: use conversion factor when creating stock entry from pick list 
(cherry picked from commit 5f12b0db3f)
 2026-03-01 09:40:21 +00:00
Diptanil Saha
0458930d9e Merge pull request #53019 from diptanilsaha/tb_total 2026-02-27 16:52:46 +05:30
rohitwaghchaure
51d5885454 Merge pull request #53020 from frappe/mergify/bp/version-15-hotfix/pr-53013 
fix: old stock reco entries causing issue in the stock balance report (backport #53013)
 2026-02-27 16:02:12 +05:30
rohitwaghchaure
cc6fbde463 chore: fix conflicts 
Added a method to prepare stock reconciliation voucher-wise count and updated logic for handling stock reconciliation entries.
 2026-02-27 15:46:52 +05:30
Rohit Waghchaure
b712467049 fix: old stock reco entries causing issue in the stock balance report 
(cherry picked from commit 0874cbc268)

# Conflicts:
#	erpnext/stock/report/stock_balance/stock_balance.py
 2026-02-27 09:26:37 +00:00
diptanilsaha
eabaef2f0b fix(trial-balance): totals with filter show_group_accounts enabled 2026-02-27 14:42:53 +05:30
Mihir Kandoi
f90e984833 Merge pull request #53017 from frappe/mergify/bp/version-15-hotfix/pr-53012 2026-02-27 13:58:02 +05:30
Thomas antony
f6a05ec85e feat: UOM query filter for opportunity items 
Add UOM query filter based on item code in opportunity form.

(cherry picked from commit b33f06701c)
 2026-02-27 08:23:31 +00:00
Diptanil Saha
5ba38bcf32 Merge pull request #53001 from frappe/mergify/bp/version-15-hotfix/pr-38468 
fix: Variant Items, List View Enabled to Variant Status Change (backport #38468)
 2026-02-26 16:50:55 +05:30
diptanilsaha
39f8d35414 chore: resolve conflict 2026-02-26 16:44:17 +05:30
Parameshwari Palanisamy
25b169059d fix: Variant Items, List View Enabled to Variant Status Change (#38468) 
* feat: Purchase Register Report Supplier Group filter Adding

* fix: Variant Items, List View Enabled to Variant Status Change

* Update purchase_register.js

* Update purchase_register.py

(cherry picked from commit 9ea963bfe9)

# Conflicts:
#	erpnext/stock/doctype/item/item_list.js
 2026-02-26 11:08:55 +00:00
ruthra kumar
a2a6460c6c Merge pull request #52992 from frappe/mergify/bp/version-15-hotfix/pr-52188 
fix(payment entry): round unallocated amount (backport #52188)
 2026-02-26 13:24:06 +05:30
ravibharathi656
76a19076bf fix(payment entry): round unallocated amount 
(cherry picked from commit b0d6751777)
 2026-02-26 07:38:07 +00:00
ruthra kumar
fdaa0b8b58 Merge pull request #52974 from frappe/mergify/bp/version-15-hotfix/pr-52973 
fix: ensure cache is cleared on fiscal year update and trash (backport #52973)
 2026-02-26 10:00:29 +05:30
ljain112
7278166b2c fix: ensure cache is cleared on fiscal year update and trash 
(cherry picked from commit 39b0e3522a)
 2026-02-25 14:35:48 +00:00
mergify[bot]
9657c6431d Merge pull request #52932 from frappe/mergify/bp/version-15-hotfix/pr-52824 
refactor: separate construction of chart related data from `get_columns()` (backport #52824)
 2026-02-25 15:11:46 +05:30
Mihir Kandoi
4ffb161ec8 Merge pull request #52943 from frappe/mergify/bp/version-15-hotfix/pr-52942 2026-02-25 10:30:10 +05:30
Mihir Kandoi
b37fc6676e chore: clearer description for internal transfer at arms length 
(cherry picked from commit bd9e5e97d7)
 2026-02-25 04:43:07 +00:00
ruthra kumar
965fcf8b71 Merge pull request #52928 from frappe/mergify/bp/version-15-hotfix/pr-52029 
fix: prevent precision errors in  discount distribution with inclusive tax (backport #52029)
 2026-02-24 18:39:37 +05:30
ljain112
61ac18069b fix: prevent precision errors in discount distribution with inclusive tax 
(cherry picked from commit 2068299766)
 2026-02-24 11:28:44 +00:00
ruthra kumar
3ae5de7b11 fix(sales-order): update quotation status while cancelling sales order (backport #52822) (#52918) 
fix(sales-order): update quotation status while cancelling sales order (#52822)

* fix(sales-order): update quotation status while cancelling sales order

* test: validate quotation status

* chore: remove submit

(cherry picked from commit d638f3e033)

Co-authored-by: Sowmya <106989392+SowmyaArunachalam@users.noreply.github.com>
 2026-02-24 12:08:25 +05:30
Sowmya
2420122f0e fix(sales-order): update quotation status while cancelling sales order (#52822) 
* fix(sales-order): update quotation status while cancelling sales order

* test: validate quotation status

* chore: remove submit

(cherry picked from commit d638f3e033)
 2026-02-24 06:18:23 +00:00
ruthra kumar
c5826f4132 Merge pull request #52907 from frappe/mergify/bp/version-15-hotfix/pr-52896 
fix: skip empty dimension values in exchange gain loss (backport #52896)
 2026-02-23 21:22:02 +05:30
ravibharathi656
09ba9808de fix: skip empty dimension values in exchange gain loss 
(cherry picked from commit 7df9d951c6)
 2026-02-23 15:36:29 +00:00
Imesha Sudasingha
71248ff40b 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
 2026-02-23 15:12:08 +00:00
Diptanil Saha
bfe0443530 Merge pull request #52899 from frappe/mergify/bp/version-15-hotfix/pr-50301 2026-02-23 20:38:49 +05:30
mergify[bot]
eda4462e5f Merge pull request #52722 from frappe/mergify/bp/version-15-hotfix/pr-52720 
fix: wrong display_depends_on condition for item group and brand chil… (backport #52720)
 2026-02-23 15:04:41 +00:00
diptanilsaha
0ba965aae6 fix: restore missing has_permission import 2026-02-23 20:07:27 +05:30
mergify[bot]
07eb5c714a Merge pull request #52897 from frappe/mergify/bp/version-15-hotfix/pr-52878 
fix: standalone sales invoice return should not fallback to item mast… (backport #52878)
 2026-02-23 13:54:53 +00:00
Mihir Kandoi
245bc7d2fb Merge pull request #52886 from frappe/mergify/bp/version-15-hotfix/pr-52840 
fix(manufacturing): remove delete query of job card & batch and serial no  (backport #52840)
 2026-02-23 19:16:45 +05:30
Abdeali Chharchhoda
773e56808a refactor: method to get employee contact without permission check 
(cherry picked from commit 58cdb9503b)
 2026-02-23 13:33:39 +00:00
Abdeali Chharchhoda
cb17dbd616 refactor: use common method to get employee contacts 
(cherry picked from commit ec1eb6d222)
 2026-02-23 13:33:39 +00:00
Abdeali Chharchhoda
943e2c00bc fix: get employee email with priority if preferred is not set 
(cherry picked from commit 7b89c12470)
 2026-02-23 13:33:39 +00:00
Abdeali Chharchhoda
0866c03e20 refactor: add validation for missing employee parameter 
(cherry picked from commit b8e06b9636)
 2026-02-23 13:33:38 +00:00
Abdeali Chharchhoda
4078e252c2 refactor: fetch employee contact details in realtime 
(cherry picked from commit 2ea6508fa5)
 2026-02-23 13:33:38 +00:00