mergify[bot]
|
c7b96df69c
|
fix: report path from the Item and Putaway Rule list (backport #40190) (#40266)
fix: report path from the Item and Putaway Rule list (#40190)
(cherry picked from commit 8e2f9787c1)
Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
|
2024-03-04 20:03:42 +05:30 |
|
mergify[bot]
|
63209f4eac
|
fix: do not allow to cancel incomplete reposting (backport #40224) (#40230)
* fix: do not allow to cancel incomplete reposting (#40224)
(cherry picked from commit 72ac56b6c4)
# Conflicts:
# erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-03-04 13:14:21 +05:30 |
|
mergify[bot]
|
93f3af7dba
|
perf: serial and batch bundle valuation (reposting) (backport #40255) (#40262)
* perf: serial and batch bundle valuation (reposting) (#40255)
perf: serial and batch bundle valuation
(cherry picked from commit 6379238893)
* chore: fix styles
* chore: fix linters
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-03-04 13:13:49 +05:30 |
|
Gursheen Kaur Anand
|
0b1417e891
|
Merge pull request #40256 from GursheenK/editable-journals-v15
feat: editable journals v15
|
2024-03-04 11:15:41 +05:30 |
|
Gursheen Anand
|
16349553c7
|
fix: test for repost accounting in JVs
|
2024-03-04 00:25:57 +05:30 |
|
Gursheen Anand
|
4b5712688a
|
feat: add patch for making repostable dimension fields editable
|
2024-03-04 00:25:54 +05:30 |
|
Gursheen Anand
|
cd24a2a05d
|
fix: allow editable accounting dimensions for repostable doctypes
|
2024-03-04 00:24:32 +05:30 |
|
Gursheen Anand
|
c55c0f7173
|
fix: disable editable account heads
|
2024-03-04 00:24:26 +05:30 |
|
Gursheen Anand
|
6230bbc77d
|
fix: test for reposting pi
|
2024-03-04 00:18:09 +05:30 |
|
Gursheen Anand
|
e20c1acb6e
|
fix: check child rows before update
|
2024-03-04 00:18:09 +05:30 |
|
Gursheen Anand
|
6173654093
|
chore: correct typo
|
2024-03-04 00:18:09 +05:30 |
|
Gursheen Anand
|
b0be08f05d
|
test: reposting entries for JV
|
2024-03-04 00:18:09 +05:30 |
|
Gursheen Anand
|
7aeb53a806
|
refactor: use qb for JV tests
|
2024-03-04 00:18:09 +05:30 |
|
Gursheen Anand
|
e5eeb216e8
|
feat: repost ledger button in JV
|
2024-03-04 00:18:09 +05:30 |
|
Gursheen Anand
|
8585cfc533
|
feat: validate before allowing repost
|
2024-03-04 00:18:04 +05:30 |
|
Gursheen Anand
|
a512ec7af5
|
refactor: better abstraction for controller code
|
2024-03-04 00:16:39 +05:30 |
|
Gursheen Anand
|
cdab3fa970
|
feat: update after submit in JV
|
2024-03-04 00:16:32 +05:30 |
|
Gursheen Anand
|
6c3b5bb402
|
feat: allow on submit for selected fields
|
2024-03-04 00:14:28 +05:30 |
|
Gursheen Anand
|
db7348a1de
|
refactor: remove controller logic for setting balances
|
2024-03-04 00:13:32 +05:30 |
|
Gursheen Anand
|
84672e2275
|
refactor: exclude balances while setting currency
|
2024-03-04 00:13:32 +05:30 |
|
Gursheen Anand
|
c68939a0e0
|
refactor: exclude balance while setting acc details
|
2024-03-04 00:13:32 +05:30 |
|
Gursheen Anand
|
0c234e5c1a
|
refactor: remove balance formatter
|
2024-03-04 00:13:32 +05:30 |
|
Gursheen Anand
|
689f277d13
|
refactor: remove balance fields from jv account
|
2024-03-04 00:11:23 +05:30 |
|
Gursheen Kaur Anand
|
328728e3a4
|
Merge pull request #40252 from frappe/mergify/bp/version-15-hotfix/pr-40250
fix(minor): company filter in cost center allocation (backport #40250)
|
2024-03-03 18:24:27 +05:30 |
|
Gursheen Anand
|
0ede99b3cb
|
feat: add company filter to child table field
(cherry picked from commit 51909077bd)
|
2024-03-03 12:45:39 +00:00 |
|
Gursheen Kaur Anand
|
d130aadcf3
|
Merge pull request #40205 from frappe/mergify/bp/version-15-hotfix/pr-39584
fix: use receipt amount for reverse provisional entry (backport #39584)
|
2024-03-03 17:55:31 +05:30 |
|
mergify[bot]
|
1d421713be
|
fix: rate change on changing of the qty (backport #40241) (#40243)
fix: rate change on changing of the qty (#40241)
(cherry picked from commit e7d707797a)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-03-02 16:50:01 +05:30 |
|
ruthra kumar
|
0b091aaf14
|
Merge pull request #40239 from frappe/mergify/bp/version-15-hotfix/pr-40220
refactor: Gain/Loss Journal creation for Journals against Journals (backport #40220)
|
2024-03-02 15:57:18 +05:30 |
|
ruthra kumar
|
e5fdca7b05
|
test: gain/loss on Journals against Journals
(cherry picked from commit 8a5078b826)
|
2024-03-02 10:08:19 +00:00 |
|
ruthra kumar
|
d8cf6ba38d
|
fix: allow gain/loss for Journals against Journals
(cherry picked from commit 5b67631d40)
|
2024-03-02 10:08:19 +00:00 |
|
ruthra kumar
|
9057bff786
|
fix: make use of 'flt' to prevent really low precision exc gain/loss
(cherry picked from commit 0aa72f841d)
|
2024-03-02 10:08:18 +00:00 |
|
ruthra kumar
|
014d21a050
|
Merge pull request #40233 from frappe/mergify/bp/version-15-hotfix/pr-40149
fix: incorrect exchange rate if JE has multi parties (backport #40149)
|
2024-03-02 14:35:25 +05:30 |
|
ruthra kumar
|
05e4d1c240
|
test: exchange rate fetch on JE with multiple forex parties
(cherry picked from commit ed95d41a51)
|
2024-03-02 08:22:47 +00:00 |
|
ruthra kumar
|
4513d83f22
|
fix: don't override reference exchange rate
(cherry picked from commit eaac02655b)
|
2024-03-02 08:22:47 +00:00 |
|
ruthra kumar
|
b785901efa
|
fix: incorrect exchange rate if JE has multi parties
(cherry picked from commit 694c17487d)
|
2024-03-02 08:22:45 +00:00 |
|
mergify[bot]
|
b398cc6579
|
fix: uom wise price in sales or purchase transaction (backport #40216) (#40225)
fix: uom wise price in sales or purchase transaction (#40216)
fix: uom wise price
(cherry picked from commit 13b05aa7fb)
Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
|
2024-03-02 13:00:52 +05:30 |
|
mergify[bot]
|
85ae9eee25
|
fix: serial no valuation rate (backport #40221) (#40223)
fix: serial no valuation rate (#40221)
(cherry picked from commit a5232d9c10)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-03-01 22:48:15 +05:30 |
|
ruthra kumar
|
70ab25a611
|
Merge pull request #40201 from frappe/mergify/bp/version-15-hotfix/pr-40197
fix: ignore self on GL account validation for Bank Account (backport #40197)
|
2024-03-01 09:45:39 +05:30 |
|
Raffael Meyer
|
0d8358bdd1
|
Merge pull request #40210 from frappe/mergify/bp/version-15-hotfix/pr-40203
fix(Project): filter department by company (backport #40203)
|
2024-02-29 23:34:38 +01:00 |
|
barredterra
|
13e334398e
|
fix(Project): filter department by company
(cherry picked from commit 5e736f0d06)
|
2024-02-29 17:30:05 +00:00 |
|
Gursheen Anand
|
823abfd6e0
|
test: partial billing for provisional accounting
(cherry picked from commit c5770f2ecc)
|
2024-02-29 15:48:36 +00:00 |
|
Gursheen Anand
|
e55dc2a7c0
|
test: overbilling for provisional accounting
(cherry picked from commit ff3ca50a4b)
|
2024-02-29 15:48:36 +00:00 |
|
Gursheen Anand
|
00d410cc1d
|
fix: over billing qty along with rate
(cherry picked from commit cc96d2b50c)
|
2024-02-29 15:48:36 +00:00 |
|
Gursheen Anand
|
87596e6e29
|
fix: handle partial invoice against provisional entry
(cherry picked from commit 2a46799188)
|
2024-02-29 15:48:36 +00:00 |
|
Gursheen Anand
|
0182b95230
|
fix: provisional reverse entry amount
(cherry picked from commit 3e59c66806)
|
2024-02-29 15:48:36 +00:00 |
|
ruthra kumar
|
1947a67f3d
|
fix: ignore self on GL account validation for Bank Account
(cherry picked from commit 3c19186654)
|
2024-02-29 14:25:48 +00:00 |
|
ruthra kumar
|
8720115f01
|
Merge pull request #40199 from frappe/mergify/bp/version-15-hotfix/pr-40196
fix: include debit_to or credit_to account while fetching advance on Sales/Purchase Invoice (backport #40196)
|
2024-02-29 19:54:45 +05:30 |
|
ruthra kumar
|
a5b3c1e7cb
|
test: advance pulling logic on Sales/Purchase Invoice
(cherry picked from commit 646e9ca0dd)
|
2024-02-29 12:22:48 +00:00 |
|
ruthra kumar
|
23d7a1fc76
|
fix: include Debit To/Credit To account while fetching advance
(cherry picked from commit 3327599c9d)
|
2024-02-29 12:22:48 +00:00 |
|
Gursheen Kaur Anand
|
c7ca929ddb
|
Merge pull request #40189 from frappe/mergify/bp/version-15-hotfix/pr-40176
fix(minor): make warning for previously existing SO an alert (backport #40176)
|
2024-02-29 11:59:36 +05:30 |
|