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 |
|
ruthra kumar
|
a05d6de2be
|
Merge pull request #43716 from frappe/mergify/bp/version-14-hotfix/pr-42898
fix: incorrect amount in bank clearance (backport #42898)
|
2024-10-18 11:01:11 +05:30 |
|
NIYAZ RAZAK
|
98362d9183
|
fix: incorrect amount in bank clearance
(cherry picked from commit 9a11df59fc)
|
2024-10-18 10:37:17 +05:30 |
|
ruthra kumar
|
2e6ead30e0
|
Merge pull request #43683 from frappe/mergify/bp/version-14-hotfix/pr-43661
fix: missing child company accounts in consolidated balance sheet (backport #43661)
|
2024-10-15 17:38:11 +05:30 |
|
ruthra kumar
|
70050081ff
|
Merge pull request #43681 from frappe/mergify/bp/version-14-hotfix/pr-43663
fix: run gl_entries and closing voucher processes in same function (backport #43663)
|
2024-10-15 17:28:04 +05:30 |
|
ljain112
|
bb774cec58
|
fix: missing child company accounts in consolidated balance sheet
(cherry picked from commit 7fae9d57d2)
|
2024-10-15 11:37:52 +00:00 |
|
ruthra kumar
|
7c549e60d6
|
Merge pull request #43679 from frappe/mergify/bp/version-14-hotfix/pr-43602
fix: added parentheses for correct query formation for logical OR condition (backport #43602)
|
2024-10-15 17:07:17 +05:30 |
|
ljain112
|
59c314c98a
|
fix: run gl_entries and closing voucher processes in same function
(cherry picked from commit af4daa5b0f)
|
2024-10-15 11:35:55 +00:00 |
|
ljain112
|
0f738de5e5
|
fix: added parentheses for correct query formation for logical OR condition
(cherry picked from commit c0da8f11f7)
|
2024-10-15 11:15:40 +00:00 |
|
ruthra kumar
|
8701cb73ef
|
Merge pull request #43677 from frappe/mergify/bp/version-14-hotfix/pr-43600
fix: added string for translation in bank reconciliation statement (backport #43600)
|
2024-10-15 16:40:53 +05:30 |
|
ljain112
|
32f6eb7ee7
|
fix: added string for translation in bank reconciliation statement
(cherry picked from commit c99d9f7037)
|
2024-10-15 11:02:29 +00:00 |
|
mergify[bot]
|
1262c322d1
|
fix: conversion factor issue (backport #43645) (#43675)
fix: conversion factor issue (#43645)
(cherry picked from commit a52756f1d4)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
|
2024-10-15 16:08:37 +05:30 |
|
ruthra kumar
|
aa85c3abee
|
Merge pull request #43669 from frappe/mergify/bp/version-14-hotfix/pr-43557
fix: delete invalid pricing rule on change of applicable_for values (backport #43557)
|
2024-10-15 15:56:29 +05:30 |
|
ljain112
|
5d9474c98c
|
test: added test for change in applicable_for_value in promotional scheme
(cherry picked from commit 2613bdd868)
|
2024-10-15 09:55:31 +00:00 |
|
ljain112
|
c7c2bdd159
|
fix: delete invalid pricing rule on change of applicable_for
(cherry picked from commit 42746fc630)
|
2024-10-15 09:55:31 +00:00 |
|
ruthra kumar
|
1913caf2b0
|
Merge pull request #43665 from frappe/mergify/bp/version-14-hotfix/pr-43662
fix: removed unused query (backport #43662)
|
2024-10-15 13:55:52 +05:30 |
|
ruthra kumar
|
5aff4242e3
|
Merge pull request #43657 from frappe/mergify/bp/version-14-hotfix/pr-43570
fix: update item details with actual quantity (backport #43570)
|
2024-10-15 13:52:23 +05:30 |
|
ruthra kumar
|
e7f630fc74
|
chore: resolve conflict
|
2024-10-15 13:34:37 +05:30 |
|