Nabin Hait
0f0a5b73f6
Merge pull request #39566 from frappe/mergify/bp/version-15-hotfix/pr-39489
...
fix: fetch correct quantity and amount for grouped asset (backport #39489 )
2024-01-29 11:38:33 +05:30
Gursheen Anand
0aa73e31ce
fix: check page obj before adding menu
...
(cherry picked from commit 2486b646a1e28a61c02db911b6b538c3f63cc915)
2024-01-29 06:07:13 +00:00
mergify[bot]
a118417645
refactor: provision to filter on dimensions in reconciliation tool ( #39054 )
...
* refactor: dimensions section in allocation table in reconciliation
(cherry picked from commit 1cde804c773de41520a6148e7d99ab0c23c39ae1)
# Conflicts:
# erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
* refactor: update dimension doctypes in hooks
(cherry picked from commit cfb3d872673844f04f5c9dd3f7d7f56288e5dd22)
* refactor: dimensions filter section in payment reconciliation
(cherry picked from commit 20e0acc20a218029d7101a1ba6ff3c1ae03fac02)
* refactor: column break in dimension section
(cherry picked from commit 20576e0f47ba3c4937121bfab1e0d8d395a590ce)
# Conflicts:
# erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
* refactor: handle dimension filters
(cherry picked from commit c1fe4bcc64775507a3bd8e02b61274d8dc2d6447)
* refactor: pass dimension filters to query
(cherry picked from commit ff60ec85b85d5548886e247b72cf1262587feba3)
* refactor: set query filters for dimensions
(cherry picked from commit ad8475cb8b24d40b04f86903feee08ecac6aa1f1)
* refactor: pass dimension details to query
(cherry picked from commit 5dc22e1811bb1841bb8c790cc3a1e1315cef6074)
* refactor: replace sql with query builder for Jourals query
(cherry picked from commit 9c5a79209eb014c90aac46a5dd5ed0d9b7cb8f87)
* refactor: partial change on outstanding invoice popup
(cherry picked from commit 2154502955166243e354897d7dcb22d1987c4693)
* fix: typo's and parameter changes
(cherry picked from commit 0ec17590ae062fbda0c14a2806ec1ac07c638593)
* refactor: Credit Note and its Exc gain/loss JE inherits dimensions
(cherry picked from commit ab939cc6e8ab3669f1e9b0f007e9459be180ac32)
* refactor: apply dimension filters on cr/dr notes
(cherry picked from commit 188ff8cde794bb1ef1043f0e47469d65944aac1e)
* chore: test dimension filter output
(cherry picked from commit e3c44231abbbe389a1f815ab77f2d6ff0c614e1b)
* test: dimension inheritance for cr note reconciliation
(cherry picked from commit ba5a7c8cd8ee6fc09b0d81ffbe8b364e584f1f1b)
* refactor: pass dimension values to Gain/Loss journal
(cherry picked from commit c44eb432a59fb3ffb3748e47356068499f1129b1)
# Conflicts:
# erpnext/accounts/utils.py
* test: dimension inheritance in PE reconciliation
(cherry picked from commit 6148fb024b7157d637aa2308e7c856969858468d)
* refactor: pass dimensions on advance allocation
(cherry picked from commit cbd443a78afbc7c58055881e534a8aa56ca4bea6)
* test: dimension inheritance on adv allocation
(cherry picked from commit fcf4687c523202436234814af3da4c4d84f5eba9)
* refactor: dynamic dimension filters in pop up
(cherry picked from commit f8bbb0619cbbbaace8f54a9f8758c3962ebe4725)
* refactor: update dimensions, only if provided
(cherry picked from commit ec0f17ca8bd810e41ae73f5a45f304ba38c63d0a)
* refactor: handle dynamic dimension in order query
(cherry picked from commit 7c2cb70387d7dbb7f976d28919ce21f25a0b6acd)
* chore: resolve conflicts
---------
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2024-01-28 13:50:08 +05:30
mergify[bot]
a83f3106f3
feat: New financial views - Growth and margin views for P&L and balance sheet ( #39588 )
...
feat: New financial views - Growth and margin views for P&L and balance sheet (#39588 )
2024-01-28 13:48:55 +05:30
mergify[bot]
6d4ca6a1ee
fix: prevent extra transfer against inter transfer transaction (backport #39213 ) ( #39596 )
...
fix: prevent extra transfer against inter transfer transaction (#39213 )
* fix: prevent extra transfer against inter transfer transaction
* fix: internal transfer dashboard
(cherry picked from commit 8fdc244e16c26a74944a3a67613f8b64009a69b0)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-27 23:25:13 +05:30
ruthra kumar
ebec463166
Merge pull request #39594 from frappe/mergify/bp/version-15-hotfix/pr-39591
...
refactor: Do proper currency conversion on Future Payments column in AR/AP report (backport #39591 )
2024-01-27 13:19:27 +05:30
ruthra kumar
10488520e7
test: future payment with foreign currency
...
(cherry picked from commit 7b37389115cd10aac154c292e7b34fcefd4d7ba2)
2024-01-27 07:23:17 +00:00
ruthra kumar
9e15a3c981
refactor: do currency conversion on future amount columns
...
(cherry picked from commit 0de4197c886f6dfa500c0b3f1869c13cc3807aaf)
2024-01-27 07:23:16 +00:00
mergify[bot]
63eef680d0
fix: not able to save subcontracting purchase receipt (old flow) (backport #39590 ) ( #39592 )
...
fix: not able to save subcontracting purchase receipt (old flow) (#39590 )
(cherry picked from commit 67d828dab36d6f64fdb41e5f2cd203d508d2998c)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-27 12:15:11 +05:30
mergify[bot]
7def475eb1
fix: incorrect active serial nos (backport #39389 ) ( #39589 )
...
fix: incorrect active serial nos
(cherry picked from commit 64cb1153de2d09883234e4e80e5306de27db328f)
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2024-01-27 11:57:58 +05:30
mergify[bot]
ed06f0cd1b
refactor: BOM creator item selector with short description (backport #39433 ) ( #39435 )
...
refactor: BOM creator item selector with short description
(cherry picked from commit 0f881bc90a7a02dd66e167159266aa4386b8dcec)
Co-authored-by: Florian HENRY <florian.henry@open-concept.pro>
2024-01-27 09:51:14 +05:30
Gursheen Kaur Anand
9abc07e34b
Merge pull request #39585 from frappe/mergify/bp/version-15-hotfix/pr-39532
...
fix: type error in transaction.js (backport #39532 )
2024-01-26 23:46:57 +05:30
Gursheen Anand
a7d13686c7
fix: type error on company doc
...
(cherry picked from commit 030d35628dcd7bd919a9f4e62173206a115f6ea2)
2024-01-26 17:31:07 +00:00
Deepesh Garg
ab99414242
Merge pull request #39577 from frappe/mergify/bp/version-15-hotfix/pr-39511
...
refactor(Sales Invoice): set account and sum for payments (#39511 )
2024-01-26 10:04:23 +05:30
Deepesh Garg
fa8fb7a49e
Merge pull request #39575 from frappe/mergify/bp/version-15-hotfix/pr-39108
...
feat: In words in payment entry (#39108 )
2024-01-26 09:46:01 +05:30
barredterra
4fc3a264f9
refactor(Sales Invoice): set account for mode of payment
...
(cherry picked from commit 3815f07c33d9c84230304d53a735d8f580f3288e)
2024-01-26 04:15:14 +00:00
Deepesh Garg
5df2f5d523
feat: In words in payment entry
...
(cherry picked from commit b21da472f6e106ea7b2430c285ce24400a0208dd)
2024-01-26 04:01:45 +00:00
mergify[bot]
e0c35d60b4
fix: incorrect amount in the material request item (backport #39567 ) ( #39569 )
...
fix: incorrect amount in the material request item (#39567 )
fix: incoorect amount in the material request
(cherry picked from commit 2bdfdeeb9a5f2fd98cf67fc983a920790e56e1e1)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-25 17:22:31 +05:30
Gursheen Kaur Anand
14aa9d3d0f
Merge pull request #39564 from frappe/mergify/bp/version-15-hotfix/pr-39557
...
fix: make SO item code mandatory (backport #39557 )
2024-01-25 16:39:39 +05:30
Nabin Hait
3bdd1e9514
fix: fetch correct quantity and amount for grouped asset
...
(cherry picked from commit 06f48c678be51c85a98bd0c6175fa210a47788f0)
2024-01-25 10:51:53 +00:00
Gursheen Anand
171586db9b
fix: make SO item code reqd
...
(cherry picked from commit 7f8303a493c15a0e32f0b13e464a411c5c4c283b)
2024-01-25 10:50:38 +00:00
ruthra kumar
c3557a87ef
Merge pull request #39552 from frappe/mergify/bp/version-15-hotfix/pr-38218
...
fix: honour currency precision while fetching balance (backport #38218 )
2024-01-25 13:25:15 +05:30
mergify[bot]
4853ab1fec
fix: default enable closing stock balance (backport #39551 ) ( #39554 )
...
fix: default enable closing stock balance (#39551 )
(cherry picked from commit d1fb90edffbbbd48722fddda1ed3d9144783b774)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-25 12:51:55 +05:30
Dany Robert
ed032b3224
chore: avoid explicit escaping for precision
...
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit a8949174c878499e14228517abe66050f9b9ddb9)
2024-01-25 07:00:45 +00:00
Dany Robert
8b7900e6a7
chore: change f-string to sql params
...
(cherry picked from commit 383a4b132ed5cc3383b035de8c22ba759b1e1241)
2024-01-25 07:00:45 +00:00
Dany Robert
e0a38207f6
fix: honour currency precision while fetching balance
...
(cherry picked from commit bfaa93b0ca641352917be16a50e602a7fe458386)
2024-01-25 07:00:45 +00:00
rohitwaghchaure
e08c7bad63
Merge pull request #39549 from frappe/mergify/bp/version-15-hotfix/pr-39547
...
fix: Item Tax template is not working for e-commerce (backport #39547 )
2024-01-25 11:53:30 +05:30
Rohit Waghchaure
2905db19e5
fix: Item Tax template is not working for e-commerce
...
(cherry picked from commit 7d3240ae3a2e8fc761d460793fbddfb2b5cffc09)
2024-01-25 06:07:23 +00:00
ruthra kumar
bd7e8ed230
Merge pull request #39538 from frappe/mergify/bp/version-15-hotfix/pr-39331
...
fix: Payment Terms Status for Sales Order report show all payment terms from orders (not only when there is a payment terms template) (backport #39331 )
2024-01-24 16:27:29 +05:30
Florian HENRY
b2e0d24954
fix: Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template
...
(cherry picked from commit 6c8f52b26f0601135ec0dd1be94835951936cd11)
2024-01-24 10:43:08 +00:00
rohitwaghchaure
84a94cec6b
Merge pull request #39531 from frappe/mergify/bp/version-15-hotfix/pr-39525
...
fix: email list for auto reorder material request (backport #39525 )
2024-01-24 14:49:28 +05:30
ruthra kumar
871dc6b0da
Merge pull request #39533 from frappe/mergify/bp/version-15-hotfix/pr-39529
...
fix: AttributeError in company transaction deletion (backport #39529 )
2024-01-24 13:28:22 +05:30
ruthra kumar
222005ca44
fix: AttributeError in company transaction deletion
...
(cherry picked from commit b127aa308eeda0246cdf885c36f0b36f270e2ae1)
2024-01-24 07:40:59 +00:00
Rohit Waghchaure
98c56535d8
fix: email list for auto reorder material request
...
(cherry picked from commit 764f3422a0826e22d116616daa3849d02cc1e117)
2024-01-24 07:07:16 +00:00
rohitwaghchaure
f6a779e1aa
Merge pull request #39527 from frappe/mergify/bp/version-15-hotfix/pr-39521
...
fix: not able to edit address through portal (backport #39521 )
2024-01-24 12:17:05 +05:30
Rohit Waghchaure
1f5dbebe68
fix: not able to edit address through portal
...
(cherry picked from commit b046d980ad83b906d46515082bd32038daadcb3c)
2024-01-24 06:20:31 +00:00
Gursheen Kaur Anand
4073dfb90b
Merge pull request #39522 from frappe/mergify/bp/version-15-hotfix/pr-39493
...
fix: skip setting liability account for internal transfer (backport #39493 )
2024-01-24 11:08:53 +05:30
Gursheen Anand
e2d85c513c
fix: skip liability account for internal transfer
...
(cherry picked from commit 236b73565e6889aaa7027929f770918e89bca7fc)
2024-01-24 05:04:45 +00:00
rohitwaghchaure
880f648846
Merge pull request #39513 from frappe/mergify/bp/version-15-hotfix/pr-39503
...
fix: Serial No Ledger permission issue (backport #39503 )
2024-01-24 10:27:23 +05:30
Raffael Meyer
84d2a80f30
Merge pull request #39516 from frappe/mergify/bp/version-15-hotfix/pr-39512
2024-01-23 19:00:53 +01:00
barredterra
fe41e2a341
refactor(Batch): use const instead of var
...
(cherry picked from commit 7a7a2132855e496a0b1d51698cdb7d675c527650)
2024-01-23 16:55:27 +00:00
barredterra
a97b8fd876
fix(Batch): reload doc after splitting
...
to show updated qty
(cherry picked from commit 34ec2f8a2b805e63c531ad293f3adb2061c219eb)
2024-01-23 16:55:27 +00:00
barredterra
6ed42e939b
refactor: split batch
...
(cherry picked from commit 3c7e7a76f0c89b6bedf0b27062895f05f68c1fa5)
2024-01-23 16:55:26 +00:00
Rohit Waghchaure
f9d1995954
fix: Serial No Ledger permission issue
...
(cherry picked from commit 1a670ff266c83ea1b18ede1c504873c08c310de1)
2024-01-23 13:37:35 +00:00
rohitwaghchaure
1331fb75a3
Merge pull request #39496 from frappe/mergify/bp/version-15-hotfix/pr-39478
...
fix: UX improvements for Serial and Batch Bundle (backport #39478 )
2024-01-23 13:18:16 +05:30
Rohit Waghchaure
ca93f671df
fix: auto create serial no on scan
...
(cherry picked from commit fc0d2aeeffed9a2f87be0d87f0a0af0e837c5955)
2024-01-23 06:27:59 +00:00
Rohit Waghchaure
c76145985d
fix: UX improvements for Serial and Batch Bundle
...
(cherry picked from commit 5d94f0bde55329411c419c242749e0260d3bb7c9)
2024-01-23 06:27:59 +00:00
rohitwaghchaure
a6b4d5b101
Merge pull request #39492 from frappe/mergify/bp/version-15-hotfix/pr-39488
...
fix: UOM needs to be whole number not being checked in quotations (backport #39488 )
2024-01-23 11:54:54 +05:30
Rohit Waghchaure
c7d5857014
fix: UOM needs to be whole number not being checked in quotations
...
(cherry picked from commit aaf83da3e9a28244c0f57f01a86b98257bdf503b)
2024-01-22 11:55:29 +00:00
Gursheen Kaur Anand
b53e072082
Merge pull request #39483 from frappe/mergify/bp/version-15-hotfix/pr-39462
...
fix: party field in PDF for AP / AR reports (backport #39462 )
2024-01-22 17:05:48 +05:30
