mergify[bot]
|
ad0c65500a
|
fix: update project cost from timesheet (backport #44211) (#44212)
fix: update project cost from timesheet (#44211)
(cherry picked from commit b21fb8f8b6)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-11-19 22:59:16 +05:30 |
|
ruthra kumar
|
704452a9fa
|
Merge pull request #44218 from frappe/mergify/bp/version-15-hotfix/pr-44190
fix(setup): Fix typo in COA setup (backport #44190)
|
2024-11-19 19:51:41 +05:30 |
|
Corentin Forler
|
7abcfca1cb
|
fix(setup): Fix typo in COA setup
(cherry picked from commit a245cc6b07)
|
2024-11-19 12:15:15 +00:00 |
|
ruthra kumar
|
610c483d83
|
Merge pull request #44217 from frappe/mergify/bp/version-15-hotfix/pr-44104
fix: check if pricing rule matches with coupon code (backport #44104)
|
2024-11-19 17:37:55 +05:30 |
|
Nikolas Beckel
|
608966158a
|
fix: check if pricing rule matches with coupon code (#44104)
* fix: check if pricing rule matches with coupon code
* fix: correct linting error
(cherry picked from commit 9d31bf7647)
|
2024-11-19 11:42:04 +00:00 |
|
ruthra kumar
|
efdbe93cf0
|
Merge pull request #44206 from frappe/mergify/bp/version-15-hotfix/pr-44145
fix: updated label "Is short year" to "Is Short/Long year" for both short and long fiscal years (backport #44145)
|
2024-11-19 14:47:19 +05:30 |
|
ajiragroup
|
c2748e923e
|
refactor: update label and description on short year checkbox
Is short/long year.
(cherry picked from commit 1d6b9b405f)
|
2024-11-19 08:56:54 +00:00 |
|
ruthra kumar
|
a17e1f6b6d
|
Merge pull request #44202 from frappe/mergify/bp/version-15-hotfix/pr-44188
chore: update oldest_items.json, change owner back to administrator (backport #44188)
|
2024-11-19 12:30:49 +05:30 |
|
Ismail Arif
|
0ea6691189
|
chore: update oldest_items.json, change owner back to administrator
Signed-off-by: Ismail Arif <38789073+ismxilxrif@users.noreply.github.com>
(cherry picked from commit 7ceb24fb4c)
|
2024-11-19 06:33:18 +00:00 |
|
ruthra kumar
|
eca43916f0
|
Merge pull request #44193 from frappe/mergify/bp/version-15-hotfix/pr-44134
fix: set debit in transaction currency in GL Entry (backport #44134)
|
2024-11-19 11:58:14 +05:30 |
|
ruthra kumar
|
8cc59e3be7
|
refactor: update test case
(cherry picked from commit 4aab6f55f5)
|
2024-11-19 11:40:37 +05:30 |
|
mergify[bot]
|
b130e2065b
|
feat: new DocTypes "Code List" and "Common Code" (backport #43425) (#44173)
Co-authored-by: David <dgx.arnold@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
|
2024-11-18 21:08:21 +01:00 |
|
ruthra kumar
|
d7deed6c45
|
refactor: assume any of the foreign currency as transaction currency
On a foreign currency payment entry, assume any one of the foreign
currency as the transaction currency
(cherry picked from commit 6681882bd8)
|
2024-11-18 11:42:49 +00:00 |
|
sudarsan2001
|
7cc31df587
|
chore: change account name
(cherry picked from commit 4a1cd5a8d6)
|
2024-11-18 11:42:49 +00:00 |
|
sudarsan2001
|
c30a17cd7a
|
test: add unit test to validate gl values
(cherry picked from commit e8b8a589be)
|
2024-11-18 11:42:49 +00:00 |
|
sudarsan2001
|
c0d3f8cbbe
|
fix: set debit in transaction currency in GL Entry
(cherry picked from commit 29a6eb21a3)
|
2024-11-18 11:42:49 +00:00 |
|
ruthra kumar
|
73a31cb395
|
Merge pull request #44182 from frappe/mergify/bp/version-15-hotfix/pr-44127
fix: set default Party Type based on Payment Type in Payment Entry (backport #44127)
|
2024-11-18 10:49:24 +05:30 |
|
vishakhdesai
|
08f6ceeb50
|
fix: set default party type in Payment Entry
(cherry picked from commit 19222690d3)
|
2024-11-18 04:44:58 +00:00 |
|
ruthra kumar
|
f04a934ed1
|
Merge pull request #44180 from frappe/mergify/bp/version-15-hotfix/pr-44147
fix: set conversion factor before applying price list (backport #44147)
|
2024-11-18 10:14:45 +05:30 |
|
ruthra kumar
|
c6bfaa41be
|
Merge pull request #44178 from frappe/mergify/bp/version-15-hotfix/pr-44157
fix: apply "cannot_add_rows" directly to table field for more efficient solution (backport #44157)
|
2024-11-18 10:14:23 +05:30 |
|
vishakhdesai
|
5848de76ea
|
fix: set conversion factor before applying price list
(cherry picked from commit 9749fe23cc)
|
2024-11-18 04:38:37 +00:00 |
|
UmakanthKaspa
|
2a54cd5004
|
refactor: set 'cannot_add_rows' directly in the allocations table field (optimized approach)
(cherry picked from commit 5dd8eafdfc)
|
2024-11-18 04:36:19 +00:00 |
|
mergify[bot]
|
d61f696f85
|
feat: inventory dimension for rejected materials (backport #44156) (#44165)
feat: inventory dimension for rejected materials (#44156)
(cherry picked from commit 9bf16df41e)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-11-15 17:28:41 +05:30 |
|
mergify[bot]
|
725d107288
|
fix: validation for serial no (backport #44133) (#44151)
* fix: validation for serial no (#44133)
(cherry picked from commit 93c8b4c39a)
# Conflicts:
# erpnext/stock/doctype/stock_entry/test_stock_entry.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-11-15 16:55:32 +05:30 |
|
mergify[bot]
|
b6fe1f5842
|
fix: stock ledger variance report filter options (backport #44137) (#44150)
fix: stock ledger variance report filter options (#44137)
(cherry picked from commit e8bbf6492f)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-11-15 15:04:48 +05:30 |
|
ruthra kumar
|
5b3f0825af
|
Merge pull request #44162 from frappe/mergify/bp/version-15-hotfix/pr-43414
fix: Get Entries not showing accounts with no gain or loss in Exchange Rate Revaluation issue fixed (backport #43414)
|
2024-11-15 13:09:45 +05:30 |
|
Vishakh Desai
|
381101f552
|
fix: linters
(cherry picked from commit 9cc22b4cac)
|
2024-11-15 07:19:01 +00:00 |
|
Vishakh Desai
|
1fe534290d
|
fix: Get Entries not showing accounts with no gain or loss in Exchange Rate Revaluation issue
(cherry picked from commit 6de6f55b39)
|
2024-11-15 07:19:01 +00:00 |
|
ruthra kumar
|
5004b8fbc9
|
Merge pull request #44160 from frappe/mergify/bp/version-15-hotfix/pr-44158
fix: broken UI on currency exchange (backport #44158)
|
2024-11-15 12:29:32 +05:30 |
|
ruthra kumar
|
f4603910e4
|
fix: broken UI on currency exchange
(cherry picked from commit e91b65e7bd)
|
2024-11-15 06:52:46 +00:00 |
|
ruthra kumar
|
50d15249fc
|
Merge pull request #44155 from frappe/mergify/bp/version-15-hotfix/pr-44089
fix: apply posting date sorting to invoices in Payment Reconciliation similar to payments (backport #44089)
|
2024-11-15 10:49:12 +05:30 |
|
UmakanthKaspa
|
5bd633b40f
|
fix: remove trailing whitespace
(cherry picked from commit d6703eb88b)
|
2024-11-15 05:00:07 +00:00 |
|
UmakanthKaspa
|
41c8cfac73
|
fix: apply posting date sorting to invoices in Payment Reconciliation similar to payments
(cherry picked from commit 0bd83d920d)
|
2024-11-15 05:00:06 +00:00 |
|
ruthra kumar
|
68f3dd848a
|
Merge pull request #44153 from frappe/mergify/bp/version-15-hotfix/pr-44148
Fix: Disable "Add Row" button in allocations table during UnReconcile process (backport #44148)
|
2024-11-15 10:24:16 +05:30 |
|
UmakanthKaspa
|
c59a778503
|
fix: correctly set 'cannot_add_rows' property on allocations table field
(cherry picked from commit 13ca2700f8)
|
2024-11-15 04:47:53 +00:00 |
|
ruthra kumar
|
8ee7e7d828
|
Merge pull request #44140 from frappe/mergify/bp/version-15-hotfix/pr-43189
fix: broken apply on other item (backport #43189)
|
2024-11-14 13:45:29 +05:30 |
|
ruthra kumar
|
5d6451fca7
|
fix: broken apply on other item pricing rule
(cherry picked from commit e5119a749c)
|
2024-11-14 07:54:15 +00:00 |
|
ruthra kumar
|
90b7ce2dd6
|
Merge pull request #44136 from frappe/mergify/bp/version-15-hotfix/pr-42588
refactor: separate round off account for opening (backport #42588)
|
2024-11-14 13:04:13 +05:30 |
|
ruthra kumar
|
7b77128aab
|
Merge pull request #43651 from vv-varun/erpnext_issue_43634
fix: bulk update invoice remarks during site upgrade
|
2024-11-14 12:48:50 +05:30 |
|
ruthra kumar
|
9598b1fc0f
|
chore: resolve conflicts
|
2024-11-14 12:36:56 +05:30 |
|
ruthra kumar
|
ba79560c0c
|
refactor(test): filter for active ledger entries
(cherry picked from commit cf11ac87fb)
|
2024-11-14 07:01:54 +00:00 |
|
ruthra kumar
|
9bfd5cdb2b
|
test: opening purchase invoice with rounding adjustment
(cherry picked from commit b7edc6dea9)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
|
2024-11-14 07:01:54 +00:00 |
|
ruthra kumar
|
8bec67cbcf
|
refactor: handle opening round off on purchase invoice
(cherry picked from commit a5d6a25a96)
|
2024-11-14 07:01:53 +00:00 |
|
ruthra kumar
|
7eb4b42280
|
refactor: filter on account_type
(cherry picked from commit 193ea9ad8f)
|
2024-11-14 07:01:53 +00:00 |
|
ruthra kumar
|
da2f6a045a
|
test: opening round off with inclusive tax
(cherry picked from commit 79267358d0)
|
2024-11-14 07:01:53 +00:00 |
|
ruthra kumar
|
820692f246
|
test: rounding adjustment validation and posting
(cherry picked from commit 5021c7ca2c)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
|
2024-11-14 07:01:53 +00:00 |
|
ruthra kumar
|
186b646dee
|
refactor: handle opening round off from sales invoice
(cherry picked from commit 96e3c2ad10)
|
2024-11-14 07:01:52 +00:00 |
|
ruthra kumar
|
b28ff25180
|
chore: default should return 3 elements
(cherry picked from commit fc46ebcd7c)
|
2024-11-14 07:01:52 +00:00 |
|
ruthra kumar
|
9a3e9c4c9a
|
refactor: use separate round off for opening entries
(cherry picked from commit 88e68168e3)
# Conflicts:
# erpnext/accounts/general_ledger.py
|
2024-11-14 07:01:52 +00:00 |
|
ruthra kumar
|
8e6249d361
|
feat: round off for opening entries
(cherry picked from commit a5b228549c)
|
2024-11-14 07:01:51 +00:00 |
|