Gursheen Kaur Anand
99d1f1d67b
chore: resolve conflicts
2024-02-27 16:15:49 +05:30
Gursheen Kaur Anand
eadea0207c
chore: resolve conflicts
2024-02-27 16:13:49 +05:30
Gursheen Anand
e67d579ac4
test: pr billed amount against debit note
...
(cherry picked from commit 6d408448943c47f0a3632d5772a0786b14c75a59)
2024-02-27 10:24:01 +00:00
Gursheen Anand
bac2f66344
test: po billed amount against debit note
...
(cherry picked from commit 81dbfe189e66f48cee4a37c54544aeaa4f0b3c2e)
# Conflicts:
# erpnext/buying/doctype/purchase_order/test_purchase_order.py
2024-02-27 10:24:01 +00:00
Gursheen Anand
e7e8149fbe
feat: update billed amount in PO and PR
...
(cherry picked from commit 9f6535472d50e651fa99ef7b9001ce913acb6902)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
2024-02-27 10:24:00 +00:00
Gursheen Kaur Anand
df7afc3154
Merge pull request #40145 from frappe/mergify/bp/version-15-hotfix/pr-40143
...
fix(minor): type error for missing form object in hide_company util (backport #40143 )
2024-02-27 13:33:13 +05:30
Gursheen Anand
341f9030f5
fix: use frm instead of cur_frm
...
(cherry picked from commit ceeb8fc9e537a42aaae1dd3b337fa8250b04a74f)
2024-02-27 07:45:36 +00:00
Gursheen Anand
6b5e1cfeb7
fix: type error for missing frm obj
...
(cherry picked from commit 20fa3da950f3834cac812c9702284c470fb19af2)
2024-02-27 07:45:36 +00:00
ruthra kumar
9f8a27833a
Merge pull request #40135 from frappe/mergify/bp/version-15-hotfix/pr-40133
...
fix: reset advance amount on unreconciliation of Sales/Purchase Orders (backport #40133 )
2024-02-27 10:33:07 +05:30
mergify[bot]
1860399ccb
fix: use serial batch fields for packed items (backport #40140 ) ( #40142 )
...
fix: use serial batch fields for packed items (#40140 )
(cherry picked from commit bc9c48024632198f726bd78fa6368ea9d0c26dce)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-02-27 07:57:37 +05:30
mergify[bot]
57bb031602
fix: currency symbol in landed cost voucher and material request (backport #40138 ) ( #40141 )
...
fix: currency symbol in landed cost voucher and material request (#40138 )
(cherry picked from commit 8aa2b7c1838e2af39f73557a0359313e76032197)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-02-26 23:16:49 +05:30
mergify[bot]
9d19ec43c8
fix: Data too long for column 'serial_no' at row 1 (backport #40098 ) ( #40139 )
...
* fix: Data too long for column 'serial_no' at row 1 (#40098 )
(cherry picked from commit 08caa7cfa15912f8b45d97088fed30c32e55db29)
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-02-26 23:00:01 +05:30
ruthra kumar
0694fd19fd
fix: use correct variable name on hotfix branches
2024-02-26 20:35:22 +05:30
ruthra kumar
94bb6241ef
test: advance paid update on sales/purchase order unreconciliation
...
(cherry picked from commit 1f01ff3487f55a86723106b9f3c6d42cdaa837ba)
2024-02-26 12:22:55 +00:00
ruthra kumar
4d1f56c4bd
fix: on unreconciliation, update advance paid
...
(cherry picked from commit c9e2f03a3a30a382c0fdb2c065e77f43fed2ced3)
2024-02-26 12:22:55 +00:00
ruthra kumar
ad53633c66
Merge pull request #40118 from frappe/mergify/bp/version-15-hotfix/pr-40113
...
refactor: patch to setup dimensions in Reconciliation tool (backport #40113 )
2024-02-26 14:21:40 +05:30
ruthra kumar
2bf6125b71
refactor: patch to setup dimensions in Reconciliation tool
...
(cherry picked from commit 461fb183fc5269ca4e77da1115e173b536ca3fd9)
2024-02-26 13:08:47 +05:30
Gursheen Kaur Anand
e68d2d1c7a
Merge pull request #40109 from frappe/mergify/bp/version-15-hotfix/pr-40105
...
fix(minor): tax amount label according to party type (backport #40105 )
2024-02-26 11:10:08 +05:30
Gursheen Kaur Anand
93f64396ac
Merge pull request #40111 from frappe/mergify/bp/version-15-hotfix/pr-40062
...
fix: sales person / partner achieved targets in report (backport #40062 )
2024-02-26 11:08:15 +05:30
Gursheen Anand
91c21d13e5
test: sales person target variance
...
(cherry picked from commit 7566c1ee783bc0ea79ed44f4ecd9d9ea8eef8dd0)
2024-02-26 05:09:45 +00:00
Gursheen Anand
38abfdb8ae
feat: show contributed qty in transaction summary
...
(cherry picked from commit a823f16dff52ed8a92086aebbfa1b0a326eb2425)
2024-02-26 05:09:45 +00:00
Gursheen Anand
194f46be57
fix: only consider contributed qty towards achieved targets
...
(cherry picked from commit 339698d172c2c070fb843ac2bbf1e8c6d6c7b8dc)
2024-02-26 05:09:45 +00:00
Gursheen Anand
d541ba3e61
fix: amount label according to party type
...
(cherry picked from commit 9c8d103d8af85e52095071d43d8b8a03bdbf3255)
2024-02-26 05:05:27 +00:00
mergify[bot]
27703b54bd
fix: capacity planning issue in the job card (backport #40092 ) ( #40101 )
...
fix: capacity planning issue in the job card (#40092 )
* fix: capacity planning issue in the job card
* test: test case to test capacity planning for workstation
(cherry picked from commit 75f8464724382ac703a16ee3fd73de2c9bb56d13)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-02-25 19:22:51 +05:30
ruthra kumar
9ffbf5623a
Merge pull request #40097 from frappe/mergify/bp/version-15-hotfix/pr-40096
...
fix: Fiscal Year exception on demo data setup (backport #40096 )
2024-02-25 16:09:51 +05:30
ruthra kumar
56ee843233
fix: Fiscal Year exception on demo data setup
...
(cherry picked from commit 3c3c57c674e180dc6ea7617c11cfc0d86e8e641f)
2024-02-25 10:13:09 +00:00
ruthra kumar
383dfdd4ab
Merge pull request #40091 from frappe/mergify/bp/version-15-hotfix/pr-40073
...
refactor: update payments section on item removal (backport #40073 )
2024-02-25 09:34:42 +05:30
ruthra kumar
5c269a9947
refactor: update payments section on item removal
...
(cherry picked from commit 406793a6ff2f4e9aef9fc30d20fa2c3b81ca2f50)
2024-02-25 03:58:19 +00:00
mergify[bot]
cf5fa210bb
fix: do not make MR against raw materials of available sub assemblies (backport #40085 ) ( #40087 )
...
fix: do not make MR against raw materials of available sub assemblies (#40085 )
(cherry picked from commit 4c9048fb3960668edd63a6e716b26d2e444bc1f9)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-02-24 21:02:17 +05:30
mergify[bot]
53d943ec70
fix: Cannot read properties of undefined (backport #40081 ) ( #40083 )
...
fix: Cannot read properties of undefined
(cherry picked from commit 44ed52c5cfa6a2432769bbb6f3c352aa81025de2)
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2024-02-24 17:04:36 +05:30
rohitwaghchaure
d755b9d38c
Merge pull request #40080 from frappe/mergify/bp/version-15-hotfix/pr-40079
...
chore: change label name (backport #40079 )
2024-02-24 13:29:04 +05:30
Rohit Waghchaure
824df72eeb
fix: change label name
...
(cherry picked from commit 635174f1cee1e421bfb7c724acc2219f928af2ef)
2024-02-24 07:40:56 +00:00
Gursheen Kaur Anand
e4baacd79e
Merge pull request #40066 from frappe/mergify/bp/version-15-hotfix/pr-40040
...
fix: skip max discount validation for rate adjustment (backport #40040 )
2024-02-23 15:10:38 +05:30
Gursheen Kaur Anand
38b384dfa2
Merge pull request #40064 from frappe/mergify/bp/version-15-hotfix/pr-40035
...
fix: delete PLE containing invoice in against (backport #40035 )
2024-02-23 15:07:48 +05:30
ruthra kumar
10fe201bc8
Merge pull request #40068 from frappe/mergify/bp/version-15-hotfix/pr-39830
...
fix: check_credit_limit on_update_after_submit of Sales Order (backport #39830 )
2024-02-23 14:48:08 +05:30
ruthra kumar
bcb280c5e8
test: credit limit on update after submit
...
(cherry picked from commit 467c0898e9a2e4fb84049a3a3a20d3aa63c7f5a0)
2024-02-23 08:51:39 +00:00
Nihantra C. Patel
83d7111649
fix: check_credit_limit on_update_after_submit of Sales Order
...
(cherry picked from commit 17452b76933e7edb087741671f876782d0a70859)
2024-02-23 08:51:38 +00:00
Gursheen Anand
cd42089e20
fix: skip SO & DN validation for debit note
...
(cherry picked from commit e2d16955dd6de197ef621e5f8fb3159f5a9bfaaa)
2024-02-23 07:28:38 +00:00
Gursheen Anand
3b96aaeead
fix: skip max discount validation for rate adjustment
...
(cherry picked from commit 5a3b133d6520661fe28e4c2d73c17ef4eb48be1e)
2024-02-23 07:28:37 +00:00
Ankush Menat
83b4cc5091
build: specify frappe dependency ( #40061 )
...
build: specify frappe dependency
Added 15.10 as dependency because stock balance depends on https://github.com/frappe/frappe/pull/24346
2024-02-23 12:43:01 +05:30
Gursheen Anand
a75a69a01e
fix: only check for delinked PLEs
...
(cherry picked from commit 146c5b3e16b0521f0590aa6dfa957979fc6f3d9a)
2024-02-23 07:10:08 +00:00
Gursheen Anand
190bd45bd7
fix: delete PLE containing invoice in against
...
(cherry picked from commit c1e1fd882950352c61e5881076c34fe3436142c6)
2024-02-23 07:10:08 +00:00
ruthra kumar
c752bec2d9
Merge pull request #40058 from frappe/mergify/bp/version-15-hotfix/pr-40011
...
fix: Ledger entries for Cr/Dr notes with POS Payments (backport #40011 )
2024-02-23 06:20:30 +05:30
ruthra kumar
8fef484f0f
Merge pull request #40056 from frappe/mergify/bp/version-15-hotfix/pr-39831
...
fix: remove cancelled payment entry from Payment Period Based On Invoice Date (backport #39831 )
2024-02-23 06:20:14 +05:30
ruthra kumar
b40baf5e63
refactor: skip popup for POS invoices
...
(cherry picked from commit 3634c4c284061ecd2fe5576467238532f748b07a)
2024-02-23 00:33:08 +00:00
ruthra kumar
2c8ba892ac
test: ledger entries of Cr Note of POS Invoice
...
(cherry picked from commit 4288713abe2e614e2454589fd5e344ba87f38fe1)
2024-02-23 00:33:07 +00:00
ruthra kumar
2e07b03307
fix: Cr/Dr notes with POS Payments
...
(cherry picked from commit 68a23730f3fde5d8f306d77c3db5e373b1c6e937)
2024-02-23 00:33:07 +00:00
Nihantra C. Patel
0be520331c
fix: remove cancelled payment entry from PPBOID report
...
(cherry picked from commit 186cc3d7488b126ce5d2d6d2f9095f138fd44de3)
2024-02-23 00:30:50 +00:00
Nihantra C. Patel
72da3083e6
fix: remove cancelled payment entry from Payment Period Based On Invoice Date
...
(cherry picked from commit a2a8a8f2e0c7ca3f62c31ac8834e5a6053aeb87d)
2024-02-23 00:30:50 +00:00
ruthra kumar
a3ddd326d6
Merge pull request #40049 from frappe/mergify/bp/version-15-hotfix/pr-39828
...
fix: translate Sales Pipeline Analytics report (backport #39828 )
2024-02-22 20:46:55 +05:30
