Commit Graph

48109 Commits

Author SHA1 Message Date
Ashish Shah
2dd697ee77 fix: payment_order_status should be no_copy
payment_order_status should be no_copy

(cherry picked from commit adee2ba541)
2024-03-29 07:57:04 +00:00
rohitwaghchaure
bd7467a812 Merge pull request #40761 from frappe/mergify/bp/version-15-hotfix/pr-40757
chore: show item name in the validation message (backport #40757)
2024-03-29 13:24:18 +05:30
ruthra kumar
babcc420cc Merge pull request #40763 from frappe/mergify/bp/version-15-hotfix/pr-40760
fix: cost center shouldn't update debit/credit in Exc gain/loss JV (backport #40760)
2024-03-29 11:46:56 +05:30
ruthra kumar
71704beb6f fix: cost center shouldn't update debit/credit in Exc gain/loss JV
(cherry picked from commit 398d3022ef)
2024-03-29 06:13:51 +00:00
Rohit Waghchaure
0b4b0874f4 chore: show item name in the validation message
(cherry picked from commit d05412f96a)
2024-03-29 06:06:54 +00:00
rohitwaghchaure
0eb908e950 Merge pull request #40756 from frappe/mergify/bp/version-15-hotfix/pr-40752
chore: allow to override serial batch selector using custom app (backport #40752)
2024-03-29 09:15:37 +05:30
Rohit Waghchaure
8ca4f63572 chore: allow to override serial batch selector
(cherry picked from commit 0d9d42ae61)
2024-03-29 03:41:49 +00:00
rohitwaghchaure
fb67648c68 Merge pull request #40746 from frappe/mergify/bp/version-15-hotfix/pr-40741
fix: sales / purchase return validation issue (backport #40741)
2024-03-28 18:10:42 +05:30
ruthra kumar
3d61086ac0 Merge pull request #40745 from frappe/mergify/bp/version-15-hotfix/pr-40739
refactor: use sql to clear comments (backport #40739)
2024-03-28 17:57:14 +05:30
Rohit Waghchaure
7a21997701 fix: sales / prchase return validation issue
(cherry picked from commit 59dc4a96e1)
2024-03-28 12:24:15 +00:00
Deepesh Garg
f2ecc1d2d5 Merge pull request #40742 from frappe/mergify/bp/version-15-hotfix/pr-37630
refactor: configurable exchange gain or loss posting date (#37630)
2024-03-28 17:46:30 +05:30
ruthra kumar
f50a2586b6 refactor: use sql to clear comments
(cherry picked from commit 1f46c1530e)
2024-03-28 12:12:17 +00:00
ruthra kumar
565bfa16f2 chore: resolve conflicts 2024-03-28 17:22:53 +05:30
ruthra kumar
fd33437d7a test: varying posting date for gain loss journal
(cherry picked from commit 514d5434a3)
2024-03-28 10:59:24 +00:00
ruthra kumar
125722ae41 refactor: pass gain loss posting date to controller
(cherry picked from commit 7e600a6494)

# Conflicts:
#	erpnext/accounts/utils.py
2024-03-28 10:59:24 +00:00
ruthra kumar
39571d828e refactor: introduce fields in popup
(cherry picked from commit 5323bb7bee)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
2024-03-28 10:59:23 +00:00
ruthra kumar
1fe80c2d02 refactor: gain_loss posting date fields in the allocation table
(cherry picked from commit 55dbcee36a)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
2024-03-28 10:59:22 +00:00
rohitwaghchaure
beb8807b2e Merge pull request #40733 from frappe/mergify/bp/version-15-hotfix/pr-40713
fix: enable list view for the issues on the portal (backport #40713)
2024-03-28 12:11:21 +05:30
Rohit Waghchaure
b089eda8bf fix: enable list view for the issues on the portal
(cherry picked from commit bddc1e3974)
2024-03-28 05:38:12 +00:00
rohitwaghchaure
5f125c5e2f Merge pull request #40722 from frappe/mergify/bp/version-15-hotfix/pr-40718
fix: do not fetch received items in purchase receipt (backport #40718)
2024-03-27 22:59:38 +05:30
Rohit Waghchaure
3761e74436 fix: do not fetch received items in purchase receipt
(cherry picked from commit 5bff434902)
2024-03-27 17:11:25 +00:00
rohitwaghchaure
b7525263ff Merge pull request #40711 from frappe/mergify/bp/version-15-hotfix/pr-40708
fix: Priority not copied from project template (backport #40708)
2024-03-27 16:18:26 +05:30
Rohit Waghchaure
a3a6bf6ae1 fix: Priority not copied from project template
(cherry picked from commit 33fd7b8a1f)
2024-03-27 10:18:20 +00:00
rohitwaghchaure
ac4b7f20ca Merge pull request #40703 from frappe/mergify/bp/version-15-hotfix/pr-40700
fix: rate changed on changing of the qty (backport #40700)
2024-03-27 13:52:54 +05:30
Rohit Waghchaure
41b3a59aae fix: rate changed on changing of the qty
(cherry picked from commit cd36a1051f)
2024-03-27 08:07:18 +00:00
rohitwaghchaure
b6ac3e7d08 Merge pull request #40689 from frappe/mergify/bp/version-15-hotfix/pr-40685
fix: validation error for the subcontracting receipt (backport #40685)
2024-03-27 08:04:58 +05:30
Raffael Meyer
afa930ff48 fix: remove faulty translation (#40667) 2024-03-27 00:21:16 +01:00
Rohit Waghchaure
23ae82d282 fix: validation error for the subcontracting receipt
(cherry picked from commit 016585c248)
2024-03-26 14:27:36 +00:00
rohitwaghchaure
ad8961030e Merge pull request #40688 from frappe/mergify/bp/version-15-hotfix/pr-40684
fix: incorrect total qty in job card (backport #40684)
2024-03-26 19:54:46 +05:30
Rohit Waghchaure
68d57c3947 fix: incorrect total qty in job card
(cherry picked from commit c3546cf8e2)
2024-03-26 14:04:03 +00:00
rohitwaghchaure
9b9892da03 Merge pull request #40680 from frappe/mergify/bp/version-15-hotfix/pr-40674
fix: existing batch from different warehouse not showing in the dropdown (backport #40674)
2024-03-26 16:33:14 +05:30
Rohit Waghchaure
79d047802a fix: existing batch from different warehouse not showing in the dropdown
(cherry picked from commit 662cf21afb)
2024-03-26 10:35:51 +00:00
rohitwaghchaure
108e80419e Merge pull request #40673 from frappe/mergify/bp/version-15-hotfix/pr-40672
fix: item not coming in quick entry (backport #40672)
2024-03-26 14:33:46 +05:30
Rohit Waghchaure
008894d32b fix: item not coming in quick entry
(cherry picked from commit dcbb54c41f)
2024-03-26 06:13:17 +00:00
Deepesh Garg
634054c07b Merge pull request #40430 from frappe/mergify/bp/version-15-hotfix/pr-40385
fix: Book depreciation until the asset disposal date and remove unwanted commits (#40385)
2024-03-26 09:05:20 +05:30
SelenSoft
17a087663b fix: Turkish translations (#40650)
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
2024-03-25 23:27:51 +01:00
Deepesh Garg
b04cef9f3f Merge pull request #40653 from frappe/mergify/bp/version-15-hotfix/pr-40640
fix: Add default finance book check in P&L statement (backport #40640)
2024-03-25 17:08:40 +05:30
Deepesh Garg
f08715972a fix: Add default finance book check in P&L statement
(cherry picked from commit 5be3417fdf)
2024-03-25 09:14:45 +00:00
rohitwaghchaure
4e4e6c669d Merge pull request #40639 from frappe/mergify/bp/version-15-hotfix/pr-40638
fix: Batch No is mandatory while making manufacture entry (backport #40638)
2024-03-24 21:19:51 +05:30
Rohit Waghchaure
a638c9c8af fix: Batch No is mandatory while making manufacture entry
(cherry picked from commit 43fd60a877)
2024-03-24 13:02:10 +00:00
rohitwaghchaure
a95295b9f9 Merge pull request #40637 from frappe/mergify/bp/version-15-hotfix/pr-40594
fix: use serial/batch fields for subcontracting receipt and in transit in stock entry (backport #40594)
2024-03-24 17:45:50 +05:30
ruthra kumar
e33c383345 Merge pull request #40624 from frappe/mergify/bp/version-15-hotfix/pr-40622
refactor: reset update_outstanding_for_self flag for old records (backport #40622)
2024-03-24 16:39:03 +05:30
ruthra kumar
996f7d30b9 chore: resolve conflict 2024-03-24 16:24:10 +05:30
Rohit Waghchaure
9ec24bcc6c fix: use serial/batch fields for subcontracting receipt and in transit stock entry
(cherry picked from commit 3423334e4f)
2024-03-24 10:34:52 +00:00
Deepesh Garg
bfa316ad09 Merge pull request #40591 from frappe/mergify/bp/version-15-hotfix/pr-40587
refactor(Item Price): validate dates (#40587)
2024-03-23 08:58:47 +05:30
ruthra kumar
d238cdbdd5 refactor: hide on print formats
(cherry picked from commit fdcdc8a56e)
2024-03-22 14:54:02 +00:00
ruthra kumar
f25b5bdfab refactor: reset flag for old records
(cherry picked from commit a88bf8419e)

# Conflicts:
#	erpnext/patches.txt
2024-03-22 14:54:02 +00:00
rohitwaghchaure
9f13b6ed2b Merge pull request #40617 from frappe/mergify/bp/version-15-hotfix/pr-40616
fix: rate reset to zero (backport #40616)
2024-03-22 15:36:51 +05:30
Rohit Waghchaure
4636ef0a29 fix: rate reset to zero
(cherry picked from commit 6821baa850)
2024-03-22 09:50:50 +00:00
ruthra kumar
fcbe2556d3 Merge pull request #40613 from frappe/mergify/bp/version-15-hotfix/pr-38496
feat: utility to debug financial reports - Bisect Accounting Statements (backport #38496)
2024-03-22 14:19:42 +05:30