ruthra kumar
|
cc85f5de26
|
Merge pull request #43916 from frappe/mergify/bp/version-14-hotfix/pr-43886
fix: remarks field in payment reconciliation (backport #43886)
|
2024-10-30 10:51:39 +05:30 |
|
ruthra kumar
|
15881ea718
|
chore: resolve conflicts
|
2024-10-30 10:30:48 +05:30 |
|
Ahmed Shareef
|
93243b1d95
|
fix: remarks field in payment reconciliation
(cherry picked from commit 2d5b079949)
# Conflicts:
# erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
# erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py
|
2024-10-30 04:50:23 +00:00 |
|
mergify[bot]
|
76530de786
|
fix: work order finish button not showing (backport #43875) (#43877)
* fix: work order finish button not showing (#43875)
(cherry picked from commit 0a70be5b99)
# Conflicts:
# erpnext/manufacturing/doctype/job_card/job_card.js
# erpnext/manufacturing/doctype/job_card/job_card.py
* chore: fix conflicts
* chore: fix conflicts
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-10-29 22:00:36 +05:30 |
|
ruthra kumar
|
d04396b697
|
Merge pull request #43896 from frappe/mergify/bp/version-14-hotfix/pr-43856
fix: add parenttype clause to invoice tax query in sales_register report (backport #43856)
|
2024-10-29 16:12:46 +05:30 |
|
ruthra kumar
|
e552df31d6
|
Merge pull request #43894 from frappe/mergify/bp/version-14-hotfix/pr-43698
fix: Project name instead of ID in chart (backport #43698)
|
2024-10-29 16:12:32 +05:30 |
|
Imesha Sudasingha
|
cbe704c73c
|
fix: add parenttype clause to invoice tax query in sales_register report
(cherry picked from commit e30ab141f4)
|
2024-10-29 10:10:37 +00:00 |
|
rohitwaghchaure
|
0742e6e193
|
fix: not able to submit stock entry (#43890)
|
2024-10-29 15:35:19 +05:30 |
|
lukas.brandhoff
|
3fa392ebdf
|
refactor: include 'Project Name' in Project summary report
Keep name field for backwards compatibility
(cherry picked from commit 736d1a1105)
|
2024-10-29 09:54:26 +00:00 |
|
ruthra kumar
|
a3c2121870
|
Merge pull request #43863 from frappe/mergify/bp/version-14-hotfix/pr-43685
fix: do not check for payment terms details for return invoices. (backport #43685)
|
2024-10-28 15:53:06 +05:30 |
|
mergify[bot]
|
aaae81f7e8
|
fix: added validation for UOM must be whole number (backport #43710) (#43711)
* fix: added validation for UOM must be whole number (#43710)
(cherry picked from commit 4fd4a37dc9)
# Conflicts:
# erpnext/controllers/accounts_controller.py
* chore: fix conflicts
* chore: fix linters issue
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-10-28 15:12:16 +05:30 |
|
rohitwaghchaure
|
a7cc7b28c0
|
fix: purchase return validation issue (#43871)
|
2024-10-28 15:11:07 +05:30 |
|
mergify[bot]
|
51c1d032ba
|
fix: basic rate not editable in Stock Entry Detail (backport #43837) (#43839)
* fix: basic rate not editable in Stock Entry Detail (#43837)
(cherry picked from commit 5a967bc868)
# Conflicts:
# erpnext/stock/doctype/stock_entry/stock_entry.js
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-10-28 14:02:23 +05:30 |
|
ruthra kumar
|
c695959902
|
chore: resolve conflicts
|
2024-10-28 13:32:30 +05:30 |
|
ruthra kumar
|
83f5a24520
|
Merge pull request #43868 from frappe/mergify/bp/version-14-hotfix/pr-43862
refactor: fix garbage title, desc and name in razorpay (backport #43862)
|
2024-10-28 12:47:42 +05:30 |
|
ruthra kumar
|
627832fe5b
|
refactor: fix garbage title, desc and name in razorpay
(cherry picked from commit 7332ec8fbd)
|
2024-10-28 06:55:08 +00:00 |
|
ljain112
|
78db8c0029
|
fix: hide payment terms for return and paid purchase invoices
(cherry picked from commit 912e1e3f3d)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
|
2024-10-28 05:53:55 +00:00 |
|
ljain112
|
bd34a67871
|
fix: do not set payment terms for return invoices
(cherry picked from commit 8b700eadc7)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
# erpnext/accounts/doctype/sales_invoice/sales_invoice.js
|
2024-10-28 05:53:54 +00:00 |
|
ljain112
|
fd63ace6c7
|
fix: do not check for payment terms details for return invoices.
(cherry picked from commit 6703b7d1ae)
|
2024-10-28 05:53:54 +00:00 |
|
ruthra kumar
|
36fdd540c0
|
Merge pull request #43858 from frappe/mergify/bp/version-14-hotfix/pr-43833
refactor: query for expense_account moved to setup hook in purchase invoice (backport #43833)
|
2024-10-28 09:59:55 +05:30 |
|
ruthra kumar
|
b81dc2bf5e
|
chore: resolve conflict
|
2024-10-28 09:55:04 +05:30 |
|
ljain112
|
7e7cc807a5
|
refactor: query for expense_account moved to setup hook in purchase invoice
(cherry picked from commit a9ac0cc223)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
|
2024-10-28 04:14:14 +00:00 |
|
mergify[bot]
|
895f1bff01
|
fix(RFQ): make strings translatable (backport #43843) (#43847)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(RFQ): make strings translatable (#43843)
|
2024-10-26 19:51:31 +02:00 |
|
ruthra kumar
|
53c4b5f752
|
Merge pull request #43832 from frappe/mergify/bp/version-14-hotfix/pr-43830
fix: set bill_no before `against_voucher` gets concatenated (backport #43830)
|
2024-10-25 14:28:44 +05:30 |
|
ruthra kumar
|
2f3c3d5519
|
fix: set bill_no before against_voucher gets concatenated
(cherry picked from commit 7bade7f1fe)
|
2024-10-25 14:05:15 +05:30 |
|
ruthra kumar
|
6ddff1b168
|
Merge pull request #43806 from frappe/mergify/bp/version-14-hotfix/pr-43755
fix: Add Company Filter (backport #43755)
|
2024-10-23 17:57:42 +05:30 |
|
IamSaiyyamChhetri
|
d3e29fe828
|
fix: add company filter for project
- In Project dt Sales Order field
- In Sales Order dt Project field
(cherry picked from commit 9909d760a5)
|
2024-10-23 17:31:44 +05:30 |
|
Smit Vora
|
3ace876c1f
|
Merge pull request #43784 from frappe/mergify/bp/version-14-hotfix/pr-43462
fix: get stock accounts from the doc in `validate_stock_accounts` in Journal Entry (backport #43462)
|
2024-10-23 10:36:30 +05:30 |
|
mergify[bot]
|
5b0a8fd2ce
|
fix: use correct variable in error message (backport #43790) (#43791)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: use correct variable in error message (#43790)
|
2024-10-22 19:43:13 +02:00 |
|
Sagar Vora
|
f5f6c7609a
|
test: fix test case
|
2024-10-22 20:27:06 +05:30 |
|
Vishakh Desai
|
ad04610c94
|
fix: get stock accounts from the doc instead of db in validate_stock_accounts
(cherry picked from commit 30954586d8)
|
2024-10-22 14:07:06 +00:00 |
|
ruthra kumar
|
1a4a329c1d
|
Merge pull request #43779 from frappe/mergify/bp/version-14-hotfix/pr-43778
refactor: validate_return_against_account (backport #43778)
|
2024-10-22 17:36:37 +05:30 |
|
Raffael Meyer
|
411f7c3a2c
|
refactor: validate_return_against_account (#43778)
(cherry picked from commit c4faa0e101)
|
2024-10-22 11:45:49 +00:00 |
|
ruthra kumar
|
c55d473c92
|
Merge pull request #43776 from frappe/mergify/bp/version-14-hotfix/pr-43775
fix(deferred_revenue): Escape account in query (backport #43775)
|
2024-10-22 16:40:02 +05:30 |
|
Corentin Forler
|
3d082c93bc
|
fix(deferred_revenue): Escape account in query
(cherry picked from commit c7b3ae41d4)
|
2024-10-22 10:42:08 +00:00 |
|
ruthra kumar
|
a3e8cc6abe
|
Merge pull request #43767 from frappe/mergify/bp/version-14-hotfix/pr-43766
refactor: allow unreconcile on bank and cash entry type journals (backport #43766)
|
2024-10-22 12:12:52 +05:30 |
|
ruthra kumar
|
0dcb5a4fbb
|
refactor: allow unreconcile on bank and cash entry type journals
(cherry picked from commit 2c4f37f488)
|
2024-10-22 06:35:37 +00:00 |
|
ruthra kumar
|
14a589eb2f
|
Merge pull request #43764 from frappe/mergify/bp/version-14-hotfix/pr-43761
fix: coupon code validation logic (backport #43761)
|
2024-10-22 10:39:10 +05:30 |
|
ruthra kumar
|
2af36383cc
|
chore: resolve conflict
|
2024-10-22 10:16:57 +05:30 |
|
bhaveshkumar.j
|
719565c897
|
fix: remove extra space
(cherry picked from commit 1561a9e1bf)
|
2024-10-22 04:37:48 +00:00 |
|
bhaveshkumar.j
|
c18beaea6b
|
fix: coupon code validation logic
(cherry picked from commit d04257a32d)
# Conflicts:
# erpnext/accounts/doctype/pricing_rule/utils.py
|
2024-10-22 04:37:48 +00:00 |
|
ruthra kumar
|
3d5c15df0a
|
Merge pull request #43741 from frappe/mergify/bp/version-14-hotfix/pr-43726
fix: "show_remarks" checkbox in Process statement of accounts (backport #43726)
|
2024-10-21 13:09:04 +05:30 |
|
ruthra kumar
|
0cf172c0da
|
Merge pull request #43743 from frappe/mergify/bp/version-14-hotfix/pr-43727
fix: get period estimate till service end date (backport #43727)
|
2024-10-21 13:08:44 +05:30 |
|
ruthra kumar
|
5289022351
|
Merge pull request #43745 from frappe/mergify/bp/version-14-hotfix/pr-43720
fix: party_balance based on company in payment entry (backport #43720)
|
2024-10-21 13:08:22 +05:30 |
|
ruthra kumar
|
bbce58524e
|
Merge pull request #43747 from frappe/mergify/bp/version-14-hotfix/pr-42461
fix: Freeze Screen on load invoices on POS Closing Entry (backport #42461)
|
2024-10-21 13:08:02 +05:30 |
|
HarryPaulo
|
725b6beff3
|
fix: Freeze Screen on load invoices on POS Closing Entry
(cherry picked from commit 486d396174)
|
2024-10-21 06:57:51 +00:00 |
|
ljain112
|
5333f33c21
|
fix: party_balance based on company in payment entry
(cherry picked from commit 97c9adf06b)
|
2024-10-21 06:53:31 +00:00 |
|
ruthra kumar
|
beb5318446
|
chore: resolve conflict
|
2024-10-21 12:21:51 +05:30 |
|
venkat102
|
35c257a7ae
|
fix: get period estimate till service end date
(cherry picked from commit a7ba7e9c28)
|
2024-10-21 06:50:26 +00:00 |
|
ljain112
|
083382399f
|
fix: "show_remarks" checkbox in Process statement of accounts
(cherry picked from commit f4600df1f7)
# Conflicts:
# erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
|
2024-10-21 06:44:35 +00:00 |
|