Gursheen Kaur Anand
8574941cb6
Merge pull request #39648 from frappe/mergify/bp/version-15-hotfix/pr-39519
...
fix: don't overwrite existing terms in transaction (backport #39519 )
2024-02-01 23:48:18 +05:30
ruthra kumar
4f994cf26c
Merge pull request #39666 from frappe/mergify/bp/version-15-hotfix/pr-39655
...
fix: correctly calculate diff amount for included taxes (backport #39655 )
2024-02-01 19:44:57 +05:30
ruthra kumar
bb3591deec
Merge pull request #39680 from frappe/mergify/bp/version-15-hotfix/pr-39674
...
refactor: use pop up to inform of possible data issue (backport #39674 )
2024-02-01 17:31:18 +05:30
ruthra kumar
e2d041f51c
refactor: use pop up to inform of possible data issue
...
and leave a comment in communcation trail as well
(cherry picked from commit 78483e2ee6fdef9e36b63408f6796f0a1e78dac1)
2024-02-01 11:43:19 +00:00
ruthra kumar
63f306f1b4
Merge pull request #39676 from frappe/mergify/bp/version-15-hotfix/pr-39671
...
refactor: move ignore ERR filter from SOA to General Ledger (backport #39671 )
2024-02-01 16:38:33 +05:30
ruthra kumar
72c95d31d1
refactor(test): use party with USD billing currency
...
(cherry picked from commit beff566c8267104b97f7e4b80c36715e4eb91832)
2024-02-01 10:41:39 +00:00
ruthra kumar
1ee15f65a8
test: ignore_err filter out in General Ledger
...
(cherry picked from commit affca3a519c626a2c3273a82f00ee1579853b0e1)
2024-02-01 10:41:39 +00:00
ruthra kumar
0a235584ad
refactor: move ignore ERR filters from SOA to General Ledger
...
(cherry picked from commit c077eda64e8b57011c42fbf7b4fe41af9ab2bc2f)
2024-02-01 10:41:39 +00:00
Gursheen Kaur Anand
7f4cd3cd15
fix: correctly calculate diff amount for included taxes ( #39655 )
...
(cherry picked from commit 772f540bef28117c008512ead6558db801d395cd)
2024-02-01 04:44:40 +00:00
barredterra
ba55d0ede7
chore: resolve conflicts
2024-01-31 13:19:19 +01:00
rohitwaghchaure
c74482a27c
Merge pull request #39658 from frappe/mergify/bp/version-15-hotfix/pr-39643
...
fix(portal): show PO pay button if payments installed (backport #39643 )
2024-01-31 17:30:48 +05:30
rohitwaghchaure
510ab769f1
chore: fix conflicts
2024-01-31 15:23:14 +05:30
Gursheen Anand
e9314325cc
fix: conditionally display show btn setting
...
(cherry picked from commit 0c9572bb489c7b1cc12b38e3308f987dd61f162f)
# Conflicts:
# erpnext/buying/doctype/buying_settings/buying_settings.json
2024-01-31 09:16:12 +00:00
Gursheen Anand
cea4ed6f88
fix(portal): show PO pay button if payments installed
...
(cherry picked from commit ae7be84d873cee0b0ea35614804a249ea56c05bb)
2024-01-31 09:16:11 +00:00
mergify[bot]
29eb090528
fix: Exchange rate on MR to PO creation for muticurrency POs ( #39646 )
...
fix: Exchange rate on MR to PO creation for muticurrency POs (#39646 )
(cherry picked from commit cfd1666181ffdff8ae79bbbb7863e1b12b3c6090)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2024-01-31 12:49:48 +05:30
mergify[bot]
aebb0c7979
chore: cleanup doctype descriptions (backport #39637 ) ( #39652 )
...
* chore: cleanup doctype descriptions (#39637 )
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 6b8f046fb4cfef201464976f5b4c95dc79f96731)
# Conflicts:
# erpnext/accounts/doctype/accounts_settings/accounts_settings.json
# erpnext/accounts/doctype/fiscal_year/fiscal_year.json
# erpnext/stock/doctype/item_price/item_price.json
# erpnext/stock/doctype/stock_settings/stock_settings.json
* chore: fix conflicts
---------
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2024-01-31 12:38:37 +05:30
barredterra
dcdd3e8cc4
fix: don't overwrite existing terms in transaction
...
(cherry picked from commit 77b044f1a6e7273b21ce5a884429875b10d3bb2e)
# Conflicts:
# erpnext/public/js/controllers/transaction.js
2024-01-31 00:14:44 +00:00
mergify[bot]
d785c6ce3e
fix: perf issue while submitting stock entry (backport #39634 ) ( #39642 )
...
fix: perf issue while submitting stock entry (#39634 )
(cherry picked from commit b14886b227730813c83b746f440616508f678392)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-30 15:43:50 +05:30
ruthra kumar
bc8ab51f9d
Merge pull request #39633 from frappe/mergify/bp/version-15-hotfix/pr-39559
...
fix: prevent Return Invoices(Credit/Debit Note) from using a different account (backport #39559 )
2024-01-30 11:20:25 +05:30
ruthra kumar
5c9c3bee70
test: debit note account mismatch
...
(cherry picked from commit bdca718103a98eba64e69715eaf628dfd9377d5e)
2024-01-30 05:31:53 +00:00
ruthra kumar
c9ea83591f
test: account mismatch validation
...
(cherry picked from commit 8bdc76073367d4a912524f16bf098d94340f50c5)
2024-01-30 05:31:53 +00:00
ruthra kumar
10fcf5af5f
refactor: prevent '{debit/credit}_to' account mismatch
...
(cherry picked from commit 6f2fae1b6133286ab882e421e69f6a87ecb97d4a)
2024-01-30 05:31:52 +00:00
mergify[bot]
e4230cf6d9
feat: Partly billed status in Purchase Receipt ( #39543 )
...
feat: Partly billed status in Purchase Receipt (#39543 )
(cherry picked from commit a673220feb91419f7d9949926fa4b3dd67d63682)
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2024-01-29 22:41:09 +05:30
mergify[bot]
53c705506b
fix: not able to save BOM (duplicate key error) (backport #39620 ) ( #39623 )
...
fix: not able to save BOM (duplicate key error) (#39620 )
(cherry picked from commit 4e182b89ce66db9bfb97c332c0132c12e6a83b57)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-29 21:22:34 +05:30
mergify[bot]
960443d268
fix: not able to submit subcontracting pr (old flow) (backport #39622 ) ( #39625 )
...
fix: not able to submit subcontracting pr (old flow) (#39622 )
(cherry picked from commit 5cf47ae5f991218ed74efeb2cce7f00a54475e6b)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2024-01-29 21:22:21 +05:30
Gursheen Kaur Anand
f71af209c0
Merge pull request #39618 from frappe/mergify/bp/version-15-hotfix/pr-39616
...
fix(minor): do not auto-populate item delivery date from qtn (backport #39616 )
2024-01-29 16:53:39 +05:30
Gursheen Anand
6b20a7eed1
fix: qtn tests using delivery date
...
(cherry picked from commit 079cd30b9c80739f6beec910b838b62f077e236b)
2024-01-29 10:22:01 +00:00
Gursheen Anand
5cdc22adf3
fix: do not auto-populate item delivery date
...
(cherry picked from commit 49cb11c1f357bd73afb0b150a502a418d5560067)
2024-01-29 10:22:00 +00:00
mergify[bot]
9e36ab7de7
fix amount not updated when change rate in material request (backport #39606 ) ( #39615 )
...
fix amount not updated when change rate in material request (#39606 )
* fix amount not updated when change rate in material request
* make code consistent
(cherry picked from commit efade9b9aee13c4702c69841cdb6766f305d5b30)
Co-authored-by: Jeffry Suryadharma <41689493+jeffrysurya@users.noreply.github.com>
2024-01-29 13:36:27 +05:30
Gursheen Kaur Anand
daafe45dd4
Merge pull request #39612 from frappe/mergify/bp/version-15-hotfix/pr-39562
...
fix: enqueue JV submission when > 100 accounts (backport #39562 )
2024-01-29 11:55:58 +05:30
Gursheen Kaur Anand
706d1111ad
Merge pull request #39610 from frappe/mergify/bp/version-15-hotfix/pr-39598
...
fix(minor): type error in financial statements for dashboard (backport #39598 )
2024-01-29 11:42:17 +05:30
Gursheen Anand
da33079f12
fix: return doc obj after submit
...
(cherry picked from commit fc677811b7d896879d9c2537b0527635a8ff3855)
2024-01-29 06:10:03 +00:00
Gursheen Anand
07bcc24e35
fix: enqueue JV submission when more than 100 accounts
...
(cherry picked from commit 53b44ccf2907ee15ca4dd6291400272e7cc2acf3)
2024-01-29 06:10:02 +00:00
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
