Kavin
|
8bc76bae9c
|
refactor: update clearance date in payment entry
(cherry picked from commit c218f7527f)
|
2024-09-24 05:29:49 +00:00 |
|
Kavin
|
9d2cbccff2
|
test: add test case for updating clearance date on pos invoice
(cherry picked from commit ce8600520f)
|
2024-09-24 05:29:49 +00:00 |
|
Kavin
|
10ecdb99fe
|
fix: update clearance date in invoice payment table
(cherry picked from commit 487c2a29a6)
|
2024-09-24 05:29:49 +00:00 |
|
ruthra kumar
|
2aa1380c81
|
Merge pull request #43351 from frappe/mergify/bp/version-15-hotfix/pr-43257
fix: item_query in pos_invoice (backport #43257)
|
2024-09-24 10:27:33 +05:30 |
|
ljain112
|
99e004b619
|
fix: item_query in pos_invoice
(cherry picked from commit 7f82a06e65)
|
2024-09-24 02:56:24 +00:00 |
|
ruthra kumar
|
b415e858e7
|
Merge pull request #43346 from frappe/mergify/bp/version-15-hotfix/pr-43283
fix: shipping rule must match the company (backport #43283)
|
2024-09-24 08:25:18 +05:30 |
|
Nihantra C. Patel
|
4cec68c7ad
|
Merge pull request #43343 from frappe/mergify/bp/version-15-hotfix/pr-43253
fix: partial return on POS invoice (backport #43253)
|
2024-09-23 23:36:04 +05:30 |
|
barredterra
|
085a4c61ac
|
fix: shipping rule must match the company
(cherry picked from commit df8f4086f6)
|
2024-09-23 14:41:18 +00:00 |
|
ruthra kumar
|
5f08ef5cd1
|
Merge pull request #43344 from frappe/mergify/bp/version-15-hotfix/pr-43299
fix(Payment Reconciliation): German translations (backport #43299)
|
2024-09-23 20:07:53 +05:30 |
|
barredterra
|
e06a01fae5
|
fix(Payment Reconciliation): German translations
(cherry picked from commit 32d4f96e02)
|
2024-09-23 14:35:49 +00:00 |
|
Nihantra C. Patel
|
998fef779b
|
fix: partial return on POS invoice
(cherry picked from commit 18bdd06652)
|
2024-09-23 14:26:21 +00:00 |
|
Nihantra C. Patel
|
b99ca7d9e9
|
fix: partial return on POS invoice
(cherry picked from commit 76289fa8dc)
|
2024-09-23 14:26:21 +00:00 |
|
ruthra kumar
|
0fd2964032
|
Merge pull request #43336 from frappe/mergify/bp/version-15-hotfix/pr-43316
fix: incorrect outstanding on non-pos invoice with write_off_account (backport #43316)
|
2024-09-23 18:22:30 +05:30 |
|
ruthra kumar
|
15baa3f305
|
Merge pull request #43338 from frappe/mergify/bp/version-15-hotfix/pr-43308
fix: show chart tool tip in report currency (backport #43308)
|
2024-09-23 18:22:06 +05:30 |
|
ruthra kumar
|
5920525369
|
Merge pull request #43340 from frappe/mergify/bp/version-15-hotfix/pr-43307
fix: change dynamic link doctype fieldtype to data (backport #43307)
|
2024-09-23 18:21:48 +05:30 |
|
venkat102
|
05c92cce71
|
fix: change dynamic link doctype fieldtype to data
(cherry picked from commit 1e46f7344a)
|
2024-09-23 12:23:52 +00:00 |
|
ruthra kumar
|
a0f01dac1a
|
Merge pull request #43334 from frappe/mergify/bp/version-15-hotfix/pr-43331
fix: transaction exchange rate on GL's for Multi currency Journals (backport #43331)
|
2024-09-23 17:52:51 +05:30 |
|
ruthra kumar
|
e8c174c12b
|
Merge pull request #43333 from frappe/mergify/bp/version-15-hotfix/pr-43321
fix: handle missing liability account scenario in `set_liability_account` (backport #43321)
|
2024-09-23 17:50:06 +05:30 |
|
venkat102
|
927f80035d
|
fix: add currency in financial statement
(cherry picked from commit 91a27bda84)
|
2024-09-23 12:11:54 +00:00 |
|
venkat102
|
e5ae828580
|
fix: show chart tool tip in report currency
(cherry picked from commit 827b3f4542)
|
2024-09-23 12:11:53 +00:00 |
|
ruthra kumar
|
f89a3dbb65
|
fix: incorrect outstanding on non-pos invoice with write_off_account
(cherry picked from commit d5e2906e59)
|
2024-09-23 12:09:50 +00:00 |
|
ruthra kumar
|
2d9142832d
|
test: transaction exchange rate on multi-currency journals
(cherry picked from commit c524825d2d)
|
2024-09-23 12:03:59 +00:00 |
|
ruthra kumar
|
a7ccc9420b
|
fix: transaction exchange rate on GL's for Multi currency Journals
(cherry picked from commit 8cd9ad5361)
|
2024-09-23 12:03:59 +00:00 |
|
ljain112
|
40459288f6
|
fix: handle missing liability account scenario in set_liability_account
(cherry picked from commit ee7ab4b065)
|
2024-09-23 12:00:39 +00:00 |
|
ruthra kumar
|
250a1c9341
|
Merge pull request #43332 from frappe/mergify/bp/version-15-hotfix/pr-43328
fix: allow tax rule filter on tax category name with % (backport #43328)
|
2024-09-23 17:26:06 +05:30 |
|
venkat102
|
63d4fddb49
|
fix: make to tax category on tax rule to filter with percent
(cherry picked from commit 3aaa13cb29)
|
2024-09-23 11:47:22 +00:00 |
|
mergify[bot]
|
7e6d6f08a2
|
fix: ui clean-up (backport #43305) (#43312)
* fix: ui clean-up (#43305)
fix: ui cleanup
(cherry picked from commit b127a0c8b7)
# Conflicts:
# erpnext/manufacturing/doctype/bom_creator/bom_creator.json
# erpnext/manufacturing/doctype/plant_floor/plant_floor.json
# erpnext/public/js/templates/visual_plant_floor_template.html
* chore: fix conflicts
* chore: fix conflicts
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-09-22 11:18:42 +05:30 |
|
Smit Vora
|
d1c72dc27b
|
Merge pull request #43314 from frappe/mergify/bp/version-15-hotfix/pr-42842
refactor: use common functionality to validate account number (backport #42842)
|
2024-09-21 07:06:49 +05:30 |
|
HENRY Florian
|
86ae644574
|
refactor: use common functionality to validate account number (#42842)
feat: Allow unique Account number by root type (not unique for accros all Accounts)
(cherry picked from commit 40d97f4fe9)
|
2024-09-21 01:20:03 +00:00 |
|
mergify[bot]
|
f6725e2eed
|
fix: incorrect stock balance for inventory dimension (backport #43284) (#43290)
fix: incorrect stock balance for inventory dimension (#43284)
(cherry picked from commit 3e7a7a54bf)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-09-19 09:35:54 +05:30 |
|
ruthra kumar
|
e90532e406
|
Merge pull request #43293 from frappe/mergify/bp/version-15-hotfix/pr-43274
fix: translate in js (backport #43274)
|
2024-09-19 09:17:39 +05:30 |
|
Doğancan
|
84e26e21ab
|
fix: translate in js
(cherry picked from commit 25faec5662)
|
2024-09-19 03:27:13 +00:00 |
|
ruthra kumar
|
34d159b3a2
|
Merge pull request #43213 from sameer55chauhan/patch-4
fix: Payment Ledger Report currency fieldtype fix
|
2024-09-19 07:05:43 +05:30 |
|
Shariq Ansari
|
953b5790ed
|
Merge pull request #43281 from frappe/mergify/bp/version-15-hotfix/pr-43279
fix: create_address is failing while creating customer (backport #43279)
|
2024-09-18 22:47:56 +05:30 |
|
Shariq Ansari
|
557ef5d214
|
fix: create_address is failing
(cherry picked from commit acc1d52ac8)
|
2024-09-18 17:01:49 +00:00 |
|
Nihantra C. Patel
|
680354ac0d
|
Merge pull request #43278 from frappe/mergify/bp/version-15-hotfix/pr-43276
fix: Translation for button SO to PO (backport #43276)
|
2024-09-18 21:51:03 +05:30 |
|
Nihantra C. Patel
|
73d98addbc
|
fix: Translation for button SO to PO
(cherry picked from commit a5275e9f28)
|
2024-09-18 16:14:54 +00:00 |
|
ruthra kumar
|
7aeadcbf98
|
Merge pull request #43268 from frappe/mergify/bp/version-15-hotfix/pr-43239
fix: add currency in options for rate field in pricing rule (backport #43239)
|
2024-09-18 12:28:59 +05:30 |
|
ruthra kumar
|
82982e25c6
|
chore: resolve conflict
|
2024-09-18 12:10:42 +05:30 |
|
krishna
|
782c9dda1a
|
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:42 +00:00 |
|
ruthra kumar
|
dfe47261ae
|
Merge pull request #43266 from frappe/mergify/bp/version-15-hotfix/pr-43216
fix: get cost center allocation percentage only from the applicable allocation (backport #43216)
|
2024-09-18 11:40:02 +05:30 |
|
venkat102
|
3d29007aeb
|
fix: cancel cost center allocation and journal entry after test
(cherry picked from commit 3c65b98b49)
|
2024-09-18 05:49:34 +00:00 |
|
venkat102
|
52a161f076
|
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:34 +00:00 |
|
venkat102
|
0fe901a137
|
fix: fetch cost center allocation percentage only from the applicable allocation
(cherry picked from commit 36e5945c66)
|
2024-09-18 05:49:34 +00:00 |
|
Khushi Rawat
|
8c28cb6b25
|
Merge pull request #43264 from frappe/mergify/bp/version-15-hotfix/pr-43210
fix: updated filtering in depreciation and balances report (backport #43210)
|
2024-09-18 02:13:54 +05:30 |
|
Khushi Rawat
|
4ba37e49d8
|
chore: resolved failing check
(cherry picked from commit af52f0e71f)
|
2024-09-17 20:27:32 +00:00 |
|
Khushi Rawat
|
1e89c007ed
|
chore: resolved linter check with #nosemgrep
(cherry picked from commit 8c8e25214c)
|
2024-09-17 20:27:32 +00:00 |
|
Khushi Rawat
|
78c68397d9
|
fix: updated filtering in depreciation and balances report
(cherry picked from commit 3a34eecdcf)
|
2024-09-17 20:27:32 +00:00 |
|
ruthra kumar
|
f61cec27ae
|
Merge pull request #43259 from frappe/mergify/bp/version-15-hotfix/pr-43226
fix: map rows on journal entry by validating account, party, debit and credit value (backport #43226)
|
2024-09-17 20:22:59 +05:30 |
|
Navin-S-R
|
78768f883c
|
fix: create fiscal year without overlapping existing Fiscal Years
(cherry picked from commit 720a330617)
|
2024-09-17 14:35:39 +00:00 |
|