rohitwaghchaure
|
b1b6953aed
|
chore: fix conflicts
|
2025-12-02 17:44:17 +05:30 |
|
rohitwaghchaure
|
b2ea5620b2
|
chore: fix conflicts
Removed the expense account assignment for subcontracting delivery.
|
2025-12-02 17:42:18 +05:30 |
|
Pugazhendhi Velu
|
4553d04c38
|
test: add test for fg item expense account in direct manufacturing
(cherry picked from commit ba2411b4ee)
# Conflicts:
# erpnext/stock/doctype/stock_entry/test_stock_entry.py
|
2025-12-02 12:03:37 +00:00 |
|
Pugazhendhi Velu
|
4ca5e9eef8
|
fix(stock entry): use fg item expense account for direct manufacturing entry
(cherry picked from commit ce1312764f)
# Conflicts:
# erpnext/stock/doctype/stock_entry/stock_entry.py
|
2025-12-02 12:03:37 +00:00 |
|
Khushi Rawat
|
25a9327b14
|
Merge pull request #50862 from frappe/mergify/bp/version-15-hotfix/pr-50794
fix: use asset in against_voucher while posting gl entries for capitalised asset repairs (backport #50794)
|
2025-12-02 12:45:20 +05:30 |
|
Mihir Kandoi
|
d0d38214c5
|
Merge pull request #50790 from Abdeali099/fix-incorrect-fieldname
|
2025-12-02 12:30:48 +05:30 |
|
Khushi Rawat
|
991c46d058
|
Merge pull request #50858 from frappe/mergify/bp/version-15-hotfix/pr-50793
fix: include accounting dimensions in stock entries created during asset repair. (backport #50793)
|
2025-12-02 12:23:10 +05:30 |
|
rohitwaghchaure
|
ca9bd8b499
|
Merge pull request #50845 from frappe/mergify/bp/version-15-hotfix/pr-50844
fix: label for warehouse based on material request type (backport #50844)
|
2025-12-02 12:22:18 +05:30 |
|
Khushi Rawat
|
199e25ec06
|
fix: conflicts
|
2025-12-02 12:20:48 +05:30 |
|
Navin-S-R
|
f38fb68d62
|
chore: reload asset doc before assertEqual
(cherry picked from commit 8c35a6ecdd)
|
2025-12-02 06:37:54 +00:00 |
|
Navin-S-R
|
3a22d29d7b
|
test: add unit test to validate capitalized asset repair gl entries being booked against the asset
(cherry picked from commit bcf6deec9a)
# Conflicts:
# erpnext/assets/doctype/asset_repair/test_asset_repair.py
|
2025-12-02 06:37:54 +00:00 |
|
Navin S R
|
80642edf4f
|
fix: use asset in against_voucher while posting gl entries for capitalized asset repairs
(cherry picked from commit a7e43eddad)
|
2025-12-02 06:37:54 +00:00 |
|
ljain112
|
9a3e1058f6
|
refactor: show_general ledger for consistency with other doctyoes
(cherry picked from commit cdbe8b909b)
|
2025-12-02 06:27:21 +00:00 |
|
ljain112
|
26872c3c25
|
fix: include accounting dimensions in stock entries created during asset repair.
(cherry picked from commit 147a5ee953)
|
2025-12-02 06:27:21 +00:00 |
|
rohitwaghchaure
|
dba3f3d335
|
chore: fix conflicts
|
2025-12-02 11:04:27 +05:30 |
|
Rohit Waghchaure
|
8ee7c47fdf
|
fix: label for warehouse based on material request type
(cherry picked from commit 699e9b4452)
# Conflicts:
# erpnext/stock/doctype/material_request/material_request.js
|
2025-12-01 15:58:39 +00:00 |
|
Raffael Meyer
|
441a2bcf38
|
chore: backport translations from develop (#50842)
|
2025-12-01 14:50:04 +00:00 |
|
mergify[bot]
|
821f3f5884
|
fix(Employee): add/delete user permission (backport #47016) (#50761)
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
|
2025-12-01 12:49:37 +01:00 |
|
Diptanil Saha
|
ca70e8e9a6
|
Merge pull request #50825 from frappe/mergify/bp/version-15-hotfix/pr-50797
fix(payment-recon): add validation for outstanding of dr_cr (backport #50797)
|
2025-12-01 13:27:15 +05:30 |
|
l0gesh29
|
70feb500f6
|
fix(payment-recon): add validation for outstanding of dr_cr
(cherry picked from commit 765f9a9bbf)
|
2025-12-01 07:41:28 +00:00 |
|
rohitwaghchaure
|
bf8b3d0546
|
Merge pull request #50818 from frappe/mergify/bp/version-15-hotfix/pr-50799
fix: negative batch in subcontracting receipt (backport #50799)
|
2025-12-01 12:50:42 +05:30 |
|
Diptanil Saha
|
07d8bc7852
|
Merge pull request #50819 from frappe/mergify/bp/version-15-hotfix/pr-50814
fix(email campaign): send emails using bcc (backport #50814)
|
2025-12-01 12:30:55 +05:30 |
|
diptanilsaha
|
b660b90adc
|
fix(email campaign): send emails using bcc
(cherry picked from commit 7e8d19b0c8)
|
2025-12-01 06:17:15 +00:00 |
|
Rohit Waghchaure
|
5def006033
|
fix: negative batch in subcontracting receipt
(cherry picked from commit 71e46b3ef5)
|
2025-12-01 06:15:37 +00:00 |
|
Khushi Rawat
|
ade6acccfb
|
Merge pull request #50800 from frappe/mergify/bp/version-15-hotfix/pr-50772
fix: use posting_date instead of bill_date from purchase invoice (backport #50772)
|
2025-11-29 00:28:11 +05:30 |
|
Khushi Rawat
|
bd795f5546
|
fix: resolve conflict
|
2025-11-28 17:26:33 +05:30 |
|
Navin S R
|
c12a560c63
|
fix: use posting_date instead of bill_date from purchase invoice
(cherry picked from commit 145d40dec8)
# Conflicts:
# erpnext/assets/doctype/asset/asset.py
|
2025-11-28 11:49:33 +00:00 |
|
mergify[bot]
|
ff1ca9d480
|
fix: incorrect positional param for get_field_precision util (backport #50764) (#50795)
|
2025-11-28 08:50:03 +00:00 |
|
Abdeali Chharchhoda
|
4b49080bc4
|
fix: correct field name for subcontracted items in material request
|
2025-11-28 12:33:38 +05:30 |
|
Diptanil Saha
|
64e6b36d04
|
Merge pull request #50789 from frappe/mergify/bp/version-15-hotfix/pr-50642
fix(payment reconciliation): added a hint that posting date can be changed on exchange gain/loss reconcile dialog (backport #50642)
|
2025-11-28 11:54:32 +05:30 |
|
Jatin3128
|
0e0360781e
|
fix(payment reconciliation): added a hint that posting date can be changed on exchange gain/loss reconcile dialog
(cherry picked from commit 4b612c64a8)
|
2025-11-28 06:22:00 +00:00 |
|
Mihir Kandoi
|
c62be10620
|
Merge pull request #50778 from frappe/mergify/bp/version-15-hotfix/pr-50777
|
2025-11-27 17:28:07 +05:30 |
|
Mihir Kandoi
|
fa541a2604
|
chore: make unnecessary field read only and show only when required
(cherry picked from commit aab7cd1ae6)
|
2025-11-27 11:41:54 +00:00 |
|
Diptanil Saha
|
5590b8d40b
|
Merge pull request #50558 from efeone/pos_rate_issue
|
2025-11-27 16:33:50 +05:30 |
|
Mihir Kandoi
|
a32165016d
|
Merge pull request #50774 from mihir-kandoi/gh50218
|
2025-11-27 14:56:44 +05:30 |
|
Mihir Kandoi
|
57112258e6
|
feat: add stock uom read only field to stock reconciliation item doctype
|
2025-11-27 14:39:19 +05:30 |
|
rohitwaghchaure
|
0bec404e69
|
Merge pull request #50770 from frappe/mergify/bp/version-15-hotfix/pr-50769
fix: two primary buttons (backport #50769)
|
2025-11-27 12:06:10 +05:30 |
|
Rohit Waghchaure
|
1d2fccfc0b
|
fix: two primary buttons
(cherry picked from commit f68515210b)
|
2025-11-27 06:27:09 +00:00 |
|
Raffael Meyer
|
cac9eed306
|
fix(Job Card): avoid Type Error when completed_qty is None (#50447)
|
2025-11-26 13:16:47 +01:00 |
|
Diptanil Saha
|
a6713b176b
|
Merge pull request #50754 from frappe/mergify/bp/version-15-hotfix/pr-50752
fix: enhance SalesOrderController setup method to call super.setup (backport #50752)
|
2025-11-26 14:35:21 +05:30 |
|
ljain112
|
7805ccf176
|
fix: enhance SalesOrderController setup method to call super.setup
(cherry picked from commit 563c2998ca)
|
2025-11-26 09:02:56 +00:00 |
|
ruthra kumar
|
8ed3a0ec65
|
Merge branch 'version-15' into version-15-hotfix
|
2025-11-25 20:14:37 +05:30 |
|
mergify[bot]
|
488d635dc9
|
chore: switched frankfurter domain from frankfurter.app to frankfurter.dev (backport #50734) (#50740)
Co-authored-by: diptanilsaha <diptanil@frappe.io>
|
2025-11-25 15:49:53 +05:30 |
|
ruthra kumar
|
08d230b3e3
|
Merge pull request #50731 from frappe/mergify/bp/version-15-hotfix/pr-50561
fix(ledger-summary-report): show party group and territory (backport #50561)
|
2025-11-25 12:33:49 +05:30 |
|
Mihir Kandoi
|
f383fafb15
|
Merge pull request #50728 from frappe/mergify/bp/version-15-hotfix/pr-50727
fix: incorrect query filter when selecting primary customer adr (backport #50727)
|
2025-11-25 12:14:17 +05:30 |
|
ruthra kumar
|
38124a7616
|
chore: resolve conflicts
|
2025-11-25 12:01:37 +05:30 |
|
l0gesh29
|
56cf5382f0
|
test: add party_group, territory in json
(cherry picked from commit 8f91919933)
# Conflicts:
# erpnext/accounts/report/customer_ledger_summary/test_customer_ledger_summary.py
|
2025-11-25 05:38:57 +00:00 |
|
l0gesh29
|
56f03aee02
|
fix(ledger-summary-report): show party group and territory
(cherry picked from commit 231479a6e2)
# Conflicts:
# erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py
|
2025-11-25 05:38:57 +00:00 |
|
Mihir Kandoi
|
841f5c24ad
|
chore: resolve conflicts
|
2025-11-25 10:51:39 +05:30 |
|
ruthra kumar
|
e8051ba180
|
Merge pull request #50729 from frappe/mergify/bp/version-15-hotfix/pr-50621
feat(accounting-dimension): add dynamic triggers for custom accounting dimensions (backport #50621)
|
2025-11-25 10:26:47 +05:30 |
|