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 |
|
ruthra kumar
|
9697cb066c
|
Merge pull request #43659 from frappe/mergify/bp/version-14-hotfix/pr-43642
fix: zero incoming rate for delivery note return (backport #43642)
|
2024-10-15 13:26:03 +05:30 |
|
ruthra kumar
|
be78e17e8c
|
chore: resolve conflict
|
2024-10-15 13:25:14 +05:30 |
|
ljain112
|
dcbfd4ae1d
|
fix: removed unused query
(cherry picked from commit 5f590ddfa2)
# Conflicts:
# erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
|
2024-10-15 07:53:40 +00:00 |
|
rohitwaghchaure
|
a585a7029f
|
chore: fix conflicts
|
2024-10-15 12:08:24 +05:30 |
|
rohitwaghchaure
|
7eac9cc1db
|
fix: zero incoming rate for delivery note return (#43642)
(cherry picked from commit 6087a57b0c)
# Conflicts:
# erpnext/stock/doctype/delivery_note/test_delivery_note.py
|
2024-10-15 06:28:36 +00:00 |
|
Bhavan23
|
a8ad608fd8
|
fix: update formatings
(cherry picked from commit 5044297321)
|
2024-10-15 06:27:42 +00:00 |
|
Bhavan23
|
699b09846a
|
fix: update formatings
(cherry picked from commit 5f4a523340)
# Conflicts:
# erpnext/selling/doctype/sales_order/sales_order.py
|
2024-10-15 06:27:41 +00:00 |
|
Bhavan23
|
dc2483bb92
|
test: Validate the actual quantity when creating a material request from the sales order
(cherry picked from commit 17fdd42645)
|
2024-10-15 06:27:41 +00:00 |
|
Bhavan23
|
c520a7c6c1
|
fix: update item details with actual quantity.
(cherry picked from commit 9dbdfec9b7)
|
2024-10-15 06:27:40 +00:00 |
|
ruthra kumar
|
475c9b8450
|
Merge pull request #43653 from frappe/mergify/bp/version-14-hotfix/pr-43601
refactor: remove 'format:' based naming (backport #43601)
|
2024-10-15 07:34:49 +05:30 |
|
ruthra kumar
|
2cce2cfdbe
|
Merge pull request #43649 from frappe/mergify/bp/version-14-hotfix/pr-43614
fix: ignore free item when qty is zero (backport #43614)
|
2024-10-15 06:01:44 +05:30 |
|
ruthra kumar
|
065465626e
|
chore: resolve conflict
|
2024-10-15 06:00:47 +05:30 |
|
venkat102
|
fc7207bcd3
|
refactor: remove 'format:' based naming
(cherry picked from commit e8e1ec0e85)
# Conflicts:
# erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
|
2024-10-14 15:45:57 +00:00 |
|
Ninad1306
|
3b1f0c191e
|
test: test case to validate free item is ignored when qty is zero
(cherry picked from commit a2b41a0c16)
|
2024-10-14 10:51:00 +00:00 |
|
Ninad1306
|
ae47fb9617
|
fix: ignore free item when qty is zero
(cherry picked from commit 7ae98f77ee)
|
2024-10-14 10:51:00 +00:00 |
|
Smit Vora
|
16d9ca72e8
|
Merge pull request #43640 from frappe/mergify/bp/version-14-hotfix/pr-43638
fix: Use `ref_doc.get()` for `party_account_currency` (backport #43638)
|
2024-10-14 13:59:05 +05:30 |
|
Abdeali Chharchhoda
|
01d6c1081b
|
fix: Use ref_doc.get() for party_account_currency
(cherry picked from commit b79549422a)
|
2024-10-14 06:09:08 +00:00 |
|
mergify[bot]
|
1f099752d2
|
fix: validation for corrective job card (backport #43555) (backport #43558) (#43628)
fix: validation for corrective job card (backport #43555) (#43558)
* fix: validation for corrective job card (#43555)
(cherry picked from commit 7a0a893d08)
# Conflicts:
# erpnext/manufacturing/doctype/job_card/job_card.py
* chore: fix conflicts
* chore: fix linters issue
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit cf0fa0db7b)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
|
2024-10-12 18:32:30 +05:30 |
|
Sagar Vora
|
8714ec608b
|
Merge pull request #43571 from frappe/mergify/bp/version-14-hotfix/pr-43271
fix: deduct advances adjusted for threshold check for tcs (backport #43271)
|
2024-10-09 18:38:07 +05:30 |
|
Sagar Vora
|
e7518414cb
|
Merge pull request #43595 from ljain112/fix-pr-43271
|
2024-10-09 17:44:37 +05:30 |
|
ljain112
|
d5c82ccbab
|
test: fixed account settings in test case
|
2024-10-09 17:34:59 +05:30 |
|
ljain112
|
f5a7c8b0b0
|
test: added test cases for the tcs deduction for advances adjusted.
(cherry picked from commit efe238cefd)
|
2024-10-08 12:05:48 +00:00 |
|
ljain112
|
de15728741
|
fix: deduct advances adjusted for threshold check for tcs
(cherry picked from commit 767c8f92be)
|
2024-10-08 12:05:48 +00:00 |
|