Frappe PR Bot
|
e401ad5b8f
|
chore(release): Bumped to Version 14.74.6
## [14.74.6](https://github.com/frappe/erpnext/compare/v14.74.5...v14.74.6) (2024-10-16)
### Bug Fixes
* added parentheses for correct query formation for logical OR condition ([0f738de](0f738de5e5))
* added string for translation in bank reconciliation statement ([32f6eb7](32f6eb7ee7))
* conversion factor issue (backport [#43645](https://github.com/frappe/erpnext/issues/43645)) ([#43675](https://github.com/frappe/erpnext/issues/43675)) ([1262c32](1262c322d1))
* delete invalid pricing rule on change of applicable_for ([c7c2bdd](c7c2bdd159))
* ignore free item when qty is zero ([ae47fb9](ae47fb9617))
* missing child company accounts in consolidated balance sheet ([bb774ce](bb774cec58))
* removed unused query ([dcbfd4a](dcbfd4ae1d))
* run gl_entries and closing voucher processes in same function ([59c314c](59c314c98a))
* update formatings ([a8ad608](a8ad608fd8))
* update formatings ([699b098](699b09846a))
* update item details with actual quantity. ([c520a7c](c520a7c6c1))
* Use `ref_doc.get()` for `party_account_currency` ([01d6c10](01d6c1081b))
* validation for corrective job card (backport [#43555](https://github.com/frappe/erpnext/issues/43555)) (backport [#43558](https://github.com/frappe/erpnext/issues/43558)) ([#43628](https://github.com/frappe/erpnext/issues/43628)) ([1f09975](1f099752d2))
* zero incoming rate for delivery note return ([#43642](https://github.com/frappe/erpnext/issues/43642)) ([7eac9cc](7eac9cc1db))
v14.74.6
|
2024-10-16 05:02:55 +00:00 |
|
ruthra kumar
|
9106c2fdd8
|
Merge pull request #43668 from frappe/version-14-hotfix
chore: release v14
|
2024-10-16 10:31:35 +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 |
|
Frappe PR Bot
|
7404911940
|
chore(release): Bumped to Version 14.74.5
## [14.74.5](https://github.com/frappe/erpnext/compare/v14.74.4...v14.74.5) (2024-10-12)
### Bug Fixes
* validation for corrective job card (backport [#43555](https://github.com/frappe/erpnext/issues/43555)) (backport [#43558](https://github.com/frappe/erpnext/issues/43558)) ([#43628](https://github.com/frappe/erpnext/issues/43628)) ([ea0f044](ea0f044c48))
v14.74.5
|
2024-10-12 15:51:49 +00:00 |
|
rohitwaghchaure
|
136adcb793
|
Merge pull request #43629 from frappe/mergify/bp/version-14/pr-43628
fix: validation for corrective job card (backport #43555) (backport #43558) (backport #43628)
|
2024-10-12 21:20:29 +05:30 |
|
mergify[bot]
|
ea0f044c48
|
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>
(cherry picked from commit 1f099752d2)
|
2024-10-12 13:04:35 +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 |
|
Frappe PR Bot
|
e9dbbbe324
|
chore(release): Bumped to Version 14.74.4
## [14.74.4](https://github.com/frappe/erpnext/compare/v14.74.3...v14.74.4) (2024-10-10)
### Bug Fixes
* add parenttype condition for item table in Purchase Register Report ([4586f03](4586f03bdc))
* Add removed test code `b41f10c1b9` ([8f5c191](8f5c191136))
* create Account Closing Balance even though there are no transaction in period ([2fc776d](2fc776d0f5))
* deduct advances adjusted for threshold check for tcs ([de15728](de15728741))
* do not include advances for tds vouchers ([9d950a9](9d950a9b77))
* get company from ref doc as it's not available in payment request ([078eb46](078eb46eb8))
* multiple issues in Payment Request ([#42427](https://github.com/frappe/erpnext/issues/42427)) ([ef52be2](ef52be2f17))
* Remove `advance_payment_status` uses ([36b4f68](36b4f68566))
* Remove unreference method ([d4421da](d4421dade1))
* Remove unused field ([3a51cf4](3a51cf4e1a))
* Remove unused function `get_paid_amount_against_order` ([677aadd](677aadde7c))
* Separate `on_submit` and `before_submit` of PR ([d828ea6](d828ea6a1a))
v14.74.4
|
2024-10-10 00:48:02 +00:00 |
|
ruthra kumar
|
4b1e3c96c2
|
Merge pull request #43562 from frappe/version-14-hotfix
chore: release v14
|
2024-10-10 06:16:42 +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 |
|
Smit Vora
|
d6f9909ba5
|
Merge pull request #43552 from frappe/mergify/bp/version-14-hotfix/pr-43397
fix: do not include advances for tds vouchers (backport #43397)
|
2024-10-08 11:29:48 +05:30 |
|
ljain112
|
9d950a9b77
|
fix: do not include advances for tds vouchers
(cherry picked from commit 7ef918421e)
|
2024-10-08 05:09:01 +00:00 |
|
Smit Vora
|
0336e7ac45
|
Merge pull request #43529 from frappe/mergify/bp/version-14-hotfix/pr-43407
fix: multiple issues in Payment Request (backport #43407)
|
2024-10-08 10:38:50 +05:30 |
|
Smit Vora
|
078eb46eb8
|
fix: get company from ref doc as it's not available in payment request
|
2024-10-07 22:55:58 +05:30 |
|
Smit Vora
|
1d21f428c1
|
Merge pull request #43526 from frappe/mergify/bp/version-14-hotfix/pr-43391
fix: create Account Closing Balance even though there are no transaction in period (backport #43391)
|
2024-10-07 22:34:37 +05:30 |
|