Raffael Meyer
|
e8497b2d80
|
fix: translatable web footer (#40834)
(cherry picked from commit f3bcdbe5bd)
|
2024-04-02 15:16:15 +00:00 |
|
rohitwaghchaure
|
d3044e635e
|
Merge pull request #40832 from frappe/mergify/bp/version-15-hotfix/pr-40828
chore: remove rate of material based on Manual (backport #40828)
|
2024-04-02 19:41:04 +05:30 |
|
rohitwaghchaure
|
ca6caa86bc
|
chore: fix conflicts
|
2024-04-02 19:18:02 +05:30 |
|
rohitwaghchaure
|
152921b82a
|
chore: fix conflicts
|
2024-04-02 19:17:41 +05:30 |
|
Rohit Waghchaure
|
ecc317d690
|
chore: remove rate of material based on Manual
(cherry picked from commit 0b63dbf221)
# Conflicts:
# erpnext/manufacturing/doctype/bom/bom.json
# erpnext/manufacturing/doctype/bom_creator/bom_creator.json
|
2024-04-02 12:42:22 +00:00 |
|
Nabin Hait
|
8016b0aee7
|
fix: linter issues
(cherry picked from commit 21a40a2236)
|
2024-04-02 10:27:55 +00:00 |
|
Nabin Hait
|
79043894b2
|
fix: show currency symbol in base currency in fixed asset register report
(cherry picked from commit 8b6220efd8)
|
2024-04-02 10:27:55 +00:00 |
|
rohitwaghchaure
|
6607e6b2c3
|
Merge pull request #40822 from frappe/mergify/bp/version-15-hotfix/pr-40816
fix: added validation if parent id is missing in BOM Creator (backport #40816)
|
2024-04-02 15:37:29 +05:30 |
|
Rohit Waghchaure
|
87ce9d834f
|
fix: added validation if parent id is missing in BOM Creator
(cherry picked from commit 0a1fab762f)
|
2024-04-02 09:43:37 +00:00 |
|
rohitwaghchaure
|
204aea856d
|
Merge pull request #40817 from frappe/mergify/bp/version-15-hotfix/pr-40814
fix: barcode not fetched on selection of item (backport #40814)
|
2024-04-02 14:22:58 +05:30 |
|
Rohit Waghchaure
|
2b1b51b5bb
|
fix: barcode not fetched on selection of item
(cherry picked from commit b0730293e2)
|
2024-04-02 05:52:11 +00:00 |
|
Deepesh Garg
|
d8c5f15bc0
|
fix: Default company bank account
(cherry picked from commit 7ac91deb83)
|
2024-04-01 15:09:57 +00:00 |
|
Deepesh Garg
|
5117494a52
|
fix: Recalculate sales commission on item update
(cherry picked from commit f76da50b7e)
|
2024-04-01 15:09:05 +00:00 |
|
Deepesh Garg
|
0cee954f84
|
fix: Receive payment entry from Employee
(cherry picked from commit 29e5c6807e)
|
2024-04-01 15:08:35 +00:00 |
|
rohitwaghchaure
|
3971ff5f72
|
Merge pull request #40806 from frappe/mergify/bp/version-15-hotfix/pr-40735
fix: Show Stock Ageing Data filter not working in stock balance report (backport #40735)
|
2024-04-01 19:47:20 +05:30 |
|
rohitwaghchaure
|
f32de045e3
|
chore: fix conflicts
|
2024-04-01 18:53:04 +05:30 |
|
Rohit Waghchaure
|
2185a29555
|
fix: Show Stock Ageing Data filter not working in stock balance report
(cherry picked from commit 621421bda2)
# Conflicts:
# erpnext/stock/report/stock_ageing/stock_ageing.py
|
2024-04-01 11:25:46 +00:00 |
|
ruthra kumar
|
d12f89cdb2
|
Merge pull request #40804 from frappe/mergify/bp/version-15-hotfix/pr-40181
fix: show future payments consider allocated sales returns (backport #40181)
|
2024-04-01 14:13:50 +05:30 |
|
Devin Slauenwhite
|
0561d0a81c
|
fix: show future payments allocated sales returns is considered as payment
(cherry picked from commit 3381d0d945)
|
2024-04-01 07:34:45 +00:00 |
|
Devin Slauenwhite
|
ed4c6ef1a7
|
test: show future payments allocated sales returns is considered as payment
(cherry picked from commit daaa00bd4a)
|
2024-04-01 07:34:44 +00:00 |
|
rohitwaghchaure
|
ec91148672
|
Merge pull request #40738 from frappe/mergify/bp/version-15-hotfix/pr-40731
fix: markdown to text editor set for supplier quotation (backport #40731)
|
2024-03-31 21:14:15 +05:30 |
|
rohitwaghchaure
|
458d82aff2
|
Merge pull request #40784 from frappe/mergify/bp/version-15-hotfix/pr-40783
fix: button to select serial / batch bundle in the subcontracting receipt (backport #40783)
|
2024-03-31 21:13:45 +05:30 |
|
rohitwaghchaure
|
390b4986f9
|
chore: fix conflicts
|
2024-03-31 11:41:00 +05:30 |
|
rohitwaghchaure
|
6ecafe7606
|
chore: fix linter issue
|
2024-03-31 11:39:55 +05:30 |
|
rohitwaghchaure
|
04da610288
|
chore: fix conflicts
|
2024-03-30 20:05:21 +05:30 |
|
rohitwaghchaure
|
b397535392
|
chore: fix conflicts
|
2024-03-30 20:04:53 +05:30 |
|
Rohit Waghchaure
|
d2a6509950
|
fix: button to select serial / batch bundle in the subcontracting receipt
(cherry picked from commit d73b1f3e6a)
# Conflicts:
# erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
# erpnext/subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
|
2024-03-30 05:54:14 +00:00 |
|
mergify[bot]
|
33b6244ae6
|
fix: Warehouse linked company name in multicompany setup (backport #40779) (#40781)
fix: Warehouse linked company name in multicompany setup (#40779)
(cherry picked from commit 679aea607b)
Co-authored-by: jeshani <56191568+jeshani@users.noreply.github.com>
|
2024-03-30 10:18:33 +05:30 |
|
Frappe PR Bot
|
8ab26cd76d
|
chore(release): Bumped to Version 15.18.3
## [15.18.3](https://github.com/frappe/erpnext/compare/v15.18.2...v15.18.3) (2024-03-29)
### Bug Fixes
* sales / prchase return validation issue ([2eac2ef](2eac2ef69f))
v15.18.3
|
2024-03-29 19:09:53 +00:00 |
|
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 |
|