Doğancan
|
e43c357c08
|
fix: translate in js
(cherry picked from commit 25faec5662)
|
2024-09-19 03:27:14 +00:00 |
|
ruthra kumar
|
66349d0877
|
Merge pull request #43288 from frappe/mergify/bp/version-14-hotfix/pr-43213
fix: Payment Ledger Report currency fieldtype fix (backport #43213)
|
2024-09-19 08:50:19 +05:30 |
|
sameer Chauhan
|
7ac39dc233
|
fix: Payment Ledger Report currency fieldtype fix
(cherry picked from commit ad2d6a1625)
|
2024-09-19 01:36:31 +00:00 |
|
Nihantra C. Patel
|
02f414e0aa
|
Merge pull request #43277 from frappe/mergify/bp/version-14-hotfix/pr-43276
fix: Translation for button SO to PO (backport #43276)
|
2024-09-18 21:49:31 +05:30 |
|
Nihantra C. Patel
|
b6ce9222aa
|
fix: Translation for button SO to PO --conflicts
|
2024-09-18 21:47:30 +05:30 |
|
Nihantra C. Patel
|
a8b5bcfe02
|
fix: Translation for button SO to PO
(cherry picked from commit a5275e9f28)
# Conflicts:
# erpnext/selling/doctype/sales_order/sales_order.js
|
2024-09-18 16:14:06 +00:00 |
|
ruthra kumar
|
c442dc6b8e
|
Merge pull request #43267 from frappe/mergify/bp/version-14-hotfix/pr-43239
fix: add currency in options for rate field in pricing rule (backport #43239)
|
2024-09-18 12:39:25 +05:30 |
|
ruthra kumar
|
fff8f8b83f
|
chore: resolve conflict
|
2024-09-18 12:12:06 +05:30 |
|
krishna
|
c9467f4c1f
|
fix: add currency in options for rate field in pricing rule
(cherry picked from commit 636c0131fa)
# Conflicts:
# erpnext/accounts/doctype/pricing_rule/pricing_rule.json
|
2024-09-18 06:29:34 +00:00 |
|
ruthra kumar
|
eed7eba695
|
Merge pull request #43265 from frappe/mergify/bp/version-14-hotfix/pr-43216
fix: get cost center allocation percentage only from the applicable allocation (backport #43216)
|
2024-09-18 11:40:10 +05:30 |
|
venkat102
|
4646f11829
|
fix: cancel cost center allocation and journal entry after test
(cherry picked from commit 3c65b98b49)
|
2024-09-18 05:49:31 +00:00 |
|
venkat102
|
872c150ea7
|
test: add unit test for validating multiple cost center allocation with different child cost center
(cherry picked from commit 4d5d6150e1)
|
2024-09-18 05:49:30 +00:00 |
|
venkat102
|
a26f0e9973
|
fix: fetch cost center allocation percentage only from the applicable allocation
(cherry picked from commit 36e5945c66)
|
2024-09-18 05:49:30 +00:00 |
|
ruthra kumar
|
dc6d3cca70
|
Merge pull request #43248 from frappe/mergify/bp/version-14-hotfix/pr-43188
fix: invalid gp calculation (backport #43188)
|
2024-09-17 14:35:06 +05:30 |
|
Dany Robert
|
9af2df3810
|
fix: invalid gp calculation
(cherry picked from commit c79851239c)
|
2024-09-17 06:33:14 +00:00 |
|
Smit Vora
|
84447caac7
|
Merge pull request #43240 from frappe/mergify/bp/version-14-hotfix/pr-43176
fix: hide and reset discount control on new POS order (backport #43176)
|
2024-09-16 20:01:15 +05:30 |
|
ljain112
|
5434432cfc
|
fix: hide and reset discount control on new POS order
(cherry picked from commit 5b0053f8dd)
|
2024-09-16 14:25:19 +00:00 |
|
ruthra kumar
|
2193395072
|
Merge pull request #43201 from frappe/mergify/bp/version-14-hotfix/pr-43191
fix: delete exchange gain loss journal entry while deleting payment entry (backport #43191)
|
2024-09-13 11:22:56 +05:30 |
|
ruthra kumar
|
73821ac647
|
Merge pull request #43203 from frappe/mergify/bp/version-14-hotfix/pr-43192
refactor(test): use test fixture on pricing rule test suite (backport #43192)
|
2024-09-13 11:22:29 +05:30 |
|
ruthra kumar
|
2e323cc126
|
refactor(test): use test fixture on pricing rule test suite
(cherry picked from commit 0ea1d6d960)
|
2024-09-13 05:20:23 +00:00 |
|
Navin-S-R
|
95a66b8d8f
|
test: add unit test for deletion of gain loss jv while deleting payment entry
(cherry picked from commit 7855d3034b)
|
2024-09-13 05:19:04 +00:00 |
|
Navin-S-R
|
62f12861f1
|
fix: delete exchange gain loss journal entry while deleting payment entry
(cherry picked from commit 9886cf0d46)
|
2024-09-13 05:19:03 +00:00 |
|
ruthra kumar
|
77bdf18c23
|
Merge pull request #43170 from frappe/mergify/copy/version-14-hotfix/pr-43169
refactor: enable no-copy on Purchase Invoice status (copy #43169)
|
2024-09-11 14:20:38 +05:30 |
|
ruthra kumar
|
097eae478d
|
refactor: enable no-copy on Purchase Invoice status
(cherry picked from commit 0d9741fdd7)
|
2024-09-11 07:56:59 +00:00 |
|
mergify[bot]
|
91105344bb
|
fix: bom cost update is not working (backport #43155) (#43156)
fix: bom cost update is not working (#43155)
(cherry picked from commit 05f9015c0b)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-09-10 23:07:52 +05:30 |
|
ruthra kumar
|
6895efe577
|
Merge pull request #43147 from frappe/mergify/bp/version-14-hotfix/pr-43144
feat: utility report for identifying invalid ledger entries (backport #43144)
|
2024-09-10 16:00:10 +05:30 |
|
ruthra kumar
|
2a890f9061
|
refactor: allow all accounts
(cherry picked from commit 43198c946b)
|
2024-09-10 09:06:14 +00:00 |
|
ruthra kumar
|
b2d361b495
|
refactor: fetch as dictionary
(cherry picked from commit 2126b10a92)
|
2024-09-10 09:06:14 +00:00 |
|
ruthra kumar
|
d51cf281c3
|
refactor: barebones methods with basic logic
(cherry picked from commit b05b378ef0)
|
2024-09-10 09:06:14 +00:00 |
|
ruthra kumar
|
3574d11946
|
refactor: standard filters
(cherry picked from commit dccbc1f432)
|
2024-09-10 09:06:14 +00:00 |
|
ruthra kumar
|
37b8715096
|
feat: utility report to identify invalid ledger entries
(cherry picked from commit 832c4aaf82)
|
2024-09-10 09:06:13 +00:00 |
|
mergify[bot]
|
e8aae5018a
|
fix: return type of get_party_details (backport #43131) (#43135)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: return type of `get_party_details` (#43131)
|
2024-09-09 19:26:21 +02:00 |
|
mergify[bot]
|
a4b9dda4b2
|
fix: incorrect actual cost in Procurement Tracker report (backport #43109) (#43137)
fix: incorrect actual cost in Procurement Tracker report (#43109)
(cherry picked from commit 80f101f92e)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-09-09 20:35:14 +05:30 |
|
ruthra kumar
|
a5a0c0cb07
|
Merge pull request #43128 from frappe/mergify/bp/version-14-hotfix/pr-42801
fix(Delivery Note): translatability of validation errors (backport #42801)
|
2024-09-09 15:15:36 +05:30 |
|
barredterra
|
14ae3edc1d
|
refactor: extract common validation method
(cherry picked from commit 08646b7ab7)
|
2024-09-09 09:14:01 +00:00 |
|
barredterra
|
5e33961448
|
fix(Delivery Note): translatability of validation errors
(cherry picked from commit 34df6e39dc)
|
2024-09-09 09:14:00 +00:00 |
|
ruthra kumar
|
2db15d7375
|
Merge pull request #43126 from frappe/mergify/bp/version-14-hotfix/pr-43051
fix: unreconcile allocation child table redirect url voucher no issue (backport #43051)
|
2024-09-09 14:34:11 +05:30 |
|
Prashant Kamble
|
53496ed79f
|
fix: unreconcile allocation child table redirect url voucher no issue
(cherry picked from commit 5d6f6a2fb9)
|
2024-09-09 09:00:19 +00:00 |
|
ruthra kumar
|
4536e8bc47
|
Merge pull request #43124 from frappe/mergify/bp/version-14-hotfix/pr-43121
fix: set today in 'On This Date' in Available Batch Report (backport #43121)
|
2024-09-09 14:14:26 +05:30 |
|
Nihantra C. Patel
|
36f65fc592
|
fix: set today in 'On This Date' in Available Batch Report
(cherry picked from commit 9fd55e4c83)
|
2024-09-09 08:27:14 +00:00 |
|
ruthra kumar
|
c237f3c4c4
|
Merge pull request #43119 from frappe/mergify/bp/version-14-hotfix/pr-43095
fix: check multi-currency on jv for common party accounting with foreign currency (backport #43095)
|
2024-09-09 11:24:00 +05:30 |
|
ruthra kumar
|
cf78f9702c
|
chore: resolve conflict
|
2024-09-09 11:01:54 +05:30 |
|
ruthra kumar
|
de0b8c07f6
|
refactor(test): use change_settings decorator
(cherry picked from commit ee94fb37c8)
|
2024-09-09 05:06:22 +00:00 |
|
venkat102
|
4dd06b69a1
|
fix: uncomment internal parties
(cherry picked from commit 454e18ad5f)
|
2024-09-09 05:06:21 +00:00 |
|
venkat102
|
b6f352a024
|
test: add unit test for common party with foreign currency
(cherry picked from commit 740a04a704)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
|
2024-09-09 05:06:21 +00:00 |
|
venkat102
|
a3a40febf3
|
fix: check multi-currency on jv for common party accounting with foreign currency
(cherry picked from commit 00938bfd4d)
|
2024-09-09 05:06:21 +00:00 |
|
Smit Vora
|
6bfc8a0152
|
Merge pull request #43091 from frappe/mergify/bp/version-14-hotfix/pr-43013
fix: `default_advance_account` field in Process Payment Reconciliation (backport #43013)
|
2024-09-09 08:00:21 +05:30 |
|
Smit Vora
|
5113b0063e
|
chore: resolve conflicts with backport
|
2024-09-09 06:58:34 +05:30 |
|
Smit Vora
|
9e77a0245a
|
chore: resolve conflicts with backport
|
2024-09-09 06:51:30 +05:30 |
|
mergify[bot]
|
77892f4e24
|
fix: incorrect qty after transaction in SLE (backport #43103) (#43104)
fix: incorrect qty after transaction in SLE (#43103)
(cherry picked from commit 5ff87edc85)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-09-07 17:34:22 +05:30 |
|