Commit Graph

48549 Commits

Author SHA1 Message Date
rohitwaghchaure
3a380245c6 Merge pull request #40765 from frappe/mergify/bp/version-15/pr-40761
chore: show item name in the validation message (backport #40757) (backport #40761)
2024-03-30 00:38:40 +05:30
rohitwaghchaure
8cde784383 Merge pull request #40759 from frappe/mergify/bp/version-15/pr-40746
fix: sales / purchase return validation issue (backport #40741) (backport #40746)
2024-03-30 00:38:32 +05:30
ruthra kumar
8ef0a66d3e Merge pull request #40767 from frappe/mergify/bp/version-15-hotfix/pr-40758
fix: payment_order_status should be no_copy (backport #40758)
2024-03-29 13:49:16 +05:30
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
Rohit Waghchaure
a8ac196cde chore: show item name in the validation message
(cherry picked from commit d05412f96a)
(cherry picked from commit 0b4b0874f4)
2024-03-29 07:56:05 +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
Frappe PR Bot
6077cd8160 chore(release): Bumped to Version 15.18.2
## [15.18.2](https://github.com/frappe/erpnext/compare/v15.18.1...v15.18.2) (2024-03-29)

### Bug Fixes

* use sql to clear comments ([e2196ef](e2196efe1a))
v15.18.2
2024-03-29 05:41:25 +00:00
ruthra kumar
aa4998a3b5 Merge pull request #40748 from frappe/mergify/bp/version-15/pr-40739
refactor: use sql to clear comments (backport #40739)
2024-03-29 11:10:07 +05:30
Rohit Waghchaure
2eac2ef69f fix: sales / prchase return validation issue
(cherry picked from commit 59dc4a96e1)
(cherry picked from commit 7a21997701)
2024-03-29 05:28:31 +00:00
ruthra kumar
e2196efe1a fix: use sql to clear comments
(cherry picked from commit 1f46c1530e)
2024-03-29 10:49:33 +05:30
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
Deepesh Garg
3c3b08f517 Merge pull request #40750 from frappe/mergify/bp/version-15/pr-40742
refactor: configurable exchange gain or loss posting date (#37630)
2024-03-28 22:12:29 +05:30
ruthra kumar
0247d5c87f chore: resolve conflicts
(cherry picked from commit 565bfa16f2)
2024-03-28 15:26:55 +00:00
ruthra kumar
ba4d1bc1a4 test: varying posting date for gain loss journal
(cherry picked from commit 514d5434a3)
(cherry picked from commit fd33437d7a)
2024-03-28 15:26:54 +00:00
ruthra kumar
22d352e875 refactor: pass gain loss posting date to controller
(cherry picked from commit 7e600a6494)

# Conflicts:
#	erpnext/accounts/utils.py
(cherry picked from commit 125722ae41)
2024-03-28 15:26:54 +00:00
ruthra kumar
63c3f51ffa refactor: introduce fields in popup
(cherry picked from commit 5323bb7bee)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
(cherry picked from commit 39571d828e)
2024-03-28 15:26:54 +00:00
ruthra kumar
efd40772ee 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
(cherry picked from commit 1fe80c2d02)
2024-03-28 15:26:53 +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
Nihantra Patel
5fb642831c fix: markdown to text editor set for supplier quotation
(cherry picked from commit 9828d34b19)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
2024-03-28 07:16:15 +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
Frappe PR Bot
ca3827efea chore(release): Bumped to Version 15.18.1
## [15.18.1](https://github.com/frappe/erpnext/compare/v15.18.0...v15.18.1) (2024-03-27)

### Bug Fixes

* rate changed on changing of the qty ([471f1c8](471f1c835c))
v15.18.1
2024-03-27 08:37:31 +00:00
rohitwaghchaure
d2584dd3e8 Merge pull request #40704 from frappe/mergify/bp/version-15/pr-40703
fix: rate changed on changing of the qty (backport #40700) (backport #40703)
2024-03-27 14:06:20 +05:30
Rohit Waghchaure
471f1c835c fix: rate changed on changing of the qty
(cherry picked from commit cd36a1051f)
(cherry picked from commit 41b3a59aae)
2024-03-27 08:24:00 +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
Deepesh Garg
c1b9ad2f3a chore: Reduce usage of cur_frm
(cherry picked from commit e44809bcc9)
2024-03-27 06:16:31 +00:00
Frappe PR Bot
70ce49e32c chore(release): Bumped to Version 15.18.0
# [15.18.0](https://github.com/frappe/erpnext/compare/v15.17.6...v15.18.0) (2024-03-27)

### Bug Fixes

* Add default finance book check in P&L statement ([f087159](f08715972a))
* Batch No is mandatory while making manufacture entry ([a638c9c](a638c9c8af))
* Book depreciation until the asset disposal date and removed unwanted commits ([2d7ff5d](2d7ff5d4cf))
* Cannot read properties of undefined (reading 'rate') ([d287ed5](d287ed5e47))
* existing batch from different warehouse not showing in the dropdown ([79d0478](79d047802a))
* incorrect total qty in job card ([68d57c3](68d57c3947))
* item not coming in quick entry ([008894d](008894d32b))
* permissions during bulk transaction logs ([6e6ca42](6e6ca42261))
* pick list not picked qty less than 1 ([5310ec3](5310ec38ca))
* rate not fetching from the item price ([fd02060](fd02060cd2))
* rate reset to zero ([4636ef0](4636ef0a29))
* remove faulty translation ([#40667](https://github.com/frappe/erpnext/issues/40667)) ([afa930f](afa930ff48))
* style for tax breakup ([501b09a](501b09a170))
* translatability of bom configurator labels ([cf49cec](cf49cec203))
* Turkish translations ([#40650](https://github.com/frappe/erpnext/issues/40650)) ([17a0876](17a087663b))
* use serial/batch fields for subcontracting receipt and in transit stock entry ([9ec24bc](9ec24bcc6c))
* use Text Editor for rendering tax breakup table ([a95bb27](a95bb27c65))
* validate gl for previous fiscal year ([4b973b2](4b973b2f86))
* validation error for the subcontracting receipt ([23ae82d](23ae82d282))
* wrong buying amount if delivered and billed qty varies ([c224240](c2242406f4))

### Features

* bisect doctype ([884a18f](884a18f8f1))
* nodes doctype ([bfccfa4](bfccfa4af1))

### Performance Improvements

* add in some indexes (backport [#40590](https://github.com/frappe/erpnext/issues/40590)) ([#40605](https://github.com/frappe/erpnext/issues/40605)) ([f66cf7d](f66cf7d838))
v15.18.0
2024-03-27 03:27:37 +00:00
Deepesh Garg
d09821e1e1 Merge pull request #40678 from frappe/version-15-hotfix
chore: release v15
2024-03-27 08:56:26 +05:30
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