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
|
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 |
|
Navin-S-R
|
edcdfdd194
|
refactor: update formatting changes
(cherry picked from commit 768bb0312a)
|
2024-09-17 14:35:39 +00:00 |
|
ruthra kumar
|
861edb438b
|
refactor(test): make use existing test data and dynamic fy creation
(cherry picked from commit f45638015f)
|
2024-09-17 14:35:39 +00:00 |
|
ruthra kumar
|
d91013a467
|
fix: ignore repost logic on Payment Reconciliation
(cherry picked from commit 75babd4c18)
|
2024-09-17 14:35:39 +00:00 |
|
Navin-S-R
|
310b131469
|
test: reconcile payment jv from closed fiscal year
(cherry picked from commit f47ea46806)
|
2024-09-17 14:35:39 +00:00 |
|
Navin-S-R
|
86e1818420
|
fix: map rows on journal entry by validating account, party, debit and credit value
(cherry picked from commit b634aa9cfb)
|
2024-09-17 14:35:38 +00:00 |
|
ruthra kumar
|
5fe347c909
|
Merge pull request #43249 from frappe/mergify/bp/version-15-hotfix/pr-43188
fix: invalid gp calculation (backport #43188)
|
2024-09-17 14:34:58 +05:30 |
|
Khushi Rawat
|
44dde1c58d
|
Merge pull request #43243 from frappe/mergify/bp/version-15-hotfix/pr-43233
fix: do not validate purchase document for composite asset (backport #43233)
|
2024-09-17 12:31:24 +05:30 |
|
Dany Robert
|
291f0a580b
|
fix: invalid gp calculation
(cherry picked from commit c79851239c)
|
2024-09-17 06:33:19 +00:00 |
|
ruthra kumar
|
9c4eaa230c
|
Merge pull request #43246 from frappe/mergify/bp/version-15-hotfix/pr-42969
fix: A project without tasks should be able to complete (backport #42969)
|
2024-09-17 10:43:18 +05:30 |
|
ruthra kumar
|
53c4c153ca
|
Merge pull request #43245 from frappe/mergify/bp/version-15-hotfix/pr-43225
fix(ux): set amount based on account currency while adding new row (backport #43225)
|
2024-09-17 10:26:43 +05:30 |
|
ruthra kumar
|
bee27f314f
|
Merge pull request #43230 from frappe/mergify/bp/version-15-hotfix/pr-43212
fix: prevent KeyError by checking `report_filter` existence (backport #43212)
|
2024-09-17 10:23:58 +05:30 |
|
ruthra kumar
|
c9b6b0d868
|
refactor(test): fix linter
(cherry picked from commit 4eeae8011e)
|
2024-09-17 04:49:45 +00:00 |
|
lukas.brandhoff
|
dea735de4d
|
fix: A project without tasks should be able to complete
(cherry picked from commit 268962c25f)
|
2024-09-17 04:49:44 +00:00 |
|
Navin-S-R
|
f7cedac526
|
fix(ux): set amount based on account currency while adding new row
(cherry picked from commit 0ff04f774d)
|
2024-09-17 04:48:42 +00:00 |
|
Khushi Rawat
|
c5051561e4
|
fix: do not validate purchase document for composite asset
(cherry picked from commit 5fd058dde9)
|
2024-09-16 18:48:26 +00:00 |
|
Shariq Ansari
|
48158fbde0
|
Merge pull request #43242 from frappe/mergify/bp/version-15-hotfix/pr-43238
fix: create and link address while creating prospect & customer (backport #43238)
|
2024-09-16 22:47:00 +05:30 |
|
Shariq Ansari
|
d6a3d0d468
|
fix: create and link address while creating prospect & customer
(cherry picked from commit 035c15794c)
|
2024-09-16 16:46:01 +00:00 |
|
Smit Vora
|
30e9f08f37
|
Merge pull request #43241 from frappe/mergify/bp/version-15-hotfix/pr-43176
fix: hide and reset discount control on new POS order (backport #43176)
|
2024-09-16 20:01:26 +05:30 |
|
ljain112
|
42494db3c7
|
fix: hide and reset discount control on new POS order
(cherry picked from commit 5b0053f8dd)
|
2024-09-16 14:25:20 +00:00 |
|
Smit Vora
|
a6a2b2daae
|
Merge pull request #43237 from frappe/mergify/bp/version-15-hotfix/pr-42849
fix: TDS workflow consistency in Purchase Order (backport #42849)
|
2024-09-16 19:41:33 +05:30 |
|
ljain112
|
741c18b144
|
fix: do not auto apply tds in purchase order
(cherry picked from commit 0b942a0614)
|
2024-09-16 13:16:15 +00:00 |
|
ljain112
|
7027be8fbc
|
fix: set tax_withholding_category from Purchase Order while creating pi form po
(cherry picked from commit b9048ca6fa)
|
2024-09-16 13:16:15 +00:00 |
|
ljain112
|
01f30682ee
|
fix: consistent behaviour on refresh
(cherry picked from commit b216d71278)
|
2024-09-16 13:16:15 +00:00 |
|