Frappe PR Bot
79edcb2a94
chore(release): Bumped to Version 14.72.1
...
## [14.72.1](https://github.com/frappe/erpnext/compare/v14.72.0...v14.72.1 ) (2024-08-16)
### Bug Fixes
* **patch:** replace repost with direct sql to update 'against_voucher ([f6f341a ](f6f341ad58 ))
2024-08-16 11:09:57 +00:00
ruthra kumar
bd2f408f00
Merge pull request #42795 from frappe/mergify/bp/version-14/pr-42791
...
fix(patch): Use sql to update 'against_voucher' rather than reposting (backport #42791 )
2024-08-16 16:38:39 +05:30
ruthra kumar
3b02f80a4e
chore: resolve conflict
2024-08-16 16:04:52 +05:30
ruthra kumar
bebd1a0426
chore: update patches.txt
...
(cherry picked from commit 1721175a20 )
# Conflicts:
# erpnext/patches.txt
2024-08-16 10:26:22 +00:00
ruthra kumar
f6f341ad58
fix(patch): replace repost with direct sql to update 'against_voucher
...
(cherry picked from commit 13bb48434f )
2024-08-16 10:26:22 +00:00
Frappe PR Bot
2796aa8b57
chore(release): Bumped to Version 14.72.0
...
# [14.72.0](https://github.com/frappe/erpnext/compare/v14.71.0...v14.72.0 ) (2024-08-14)
### Bug Fixes
* dimensions in common party journal entry ([b73df8f ](b73df8f5f0 ))
* expense causing p&l test case to fail ([a9fa9e8 ](a9fa9e86ea ))
* force fetch updates for subcription ([f35bc43 ](f35bc43242 ))
* german translation of exit ([db27dd8 ](db27dd8702 ))
* ledger entries for pos return with update outstanding for self ([714a432 ](714a432c1c ))
* Maintain same rate on qty change on Quotation to Sales Order ([29449cb ](29449cbaf9 ))
* missing def expense if no exp in first month ([7cd6deb ](7cd6debd0e ))
* patch to fix incorrect against_voucher references in ledger ([5473546 ](54735469c1 ))
* pre-commit for better code formatting ([8f19832 ](8f19832aa5 ))
* Sort lists before calling itertools.groupby ([29cfb7c ](29cfb7cf25 ))
* test case for zero deferred expense ([186701b ](186701b54f ))
* text color in sales funnel report based on theme ([2509618 ](25096185c9 ))
* typeerror on payment entry ([c4c001b ](c4c001b6f9 ))
* update 'Paid Amount' on forex payment request ([365ef6b ](365ef6b88a ))
* warning message for negative stock (backport [#42683 ](https://github.com/frappe/erpnext/issues/42683 )) ([#42709 ](https://github.com/frappe/erpnext/issues/42709 )) ([e44daf7 ](e44daf73fb ))
### Features
* changes in opportunity.py to show contacts and addresses from referenced and opportunities ([8d7e150 ](8d7e150afb ))
2024-08-14 08:00:58 +00:00
ruthra kumar
a5ca5b5081
Merge pull request #42744 from frappe/version-14-hotfix
...
chore: release v14
2024-08-14 13:29:41 +05:30
Frappe PR Bot
a8a8a033a1
chore(release): Bumped to Version 14.71.0
...
# [14.71.0](https://github.com/frappe/erpnext/compare/v14.70.14...v14.71.0 ) (2024-08-07)
### Bug Fixes
* 'undefined' in PL and BS report summary on Consolidated report ([a5e1432 ](a5e14324da ))
* company filter for filtring tax withheld vouchers ([b7731c8 ](b7731c8fd7 ))
* do not update item price and last purchase rate for inter transf… (backport [#42616 ](https://github.com/frappe/erpnext/issues/42616 )) ([#42632 ](https://github.com/frappe/erpnext/issues/42632 )) ([5c5349e ](5c5349ed16 ))
* filter condition in item-wise purchase register ([bc9b461 ](bc9b46126b ))
* fixed depreciation calculation as per income tax act ([8df1079 ](8df1079618 ))
* item_code filter in item-wise sales register ([f0f8a2f ](f0f8a2f01b ))
* min height for rows in sales funnel ([7086a96 ](7086a96462 ))
* set query filters for sales / purchase tax template on PE ([c8d8536 ](c8d85364b9 ))
* slowness in reposting dependent vouchers. (backport [#42282 ](https://github.com/frappe/erpnext/issues/42282 )) ([#42569 ](https://github.com/frappe/erpnext/issues/42569 )) ([3fb6f97 ](3fb6f97f66 ))
### Features
* expiry date column in Available Batch Report (backport [#42628 ](https://github.com/frappe/erpnext/issues/42628 )) ([#42641 ](https://github.com/frappe/erpnext/issues/42641 )) ([83928bb ](83928bbf78 ))
2024-08-07 09:27:57 +00:00
ruthra kumar
f0230b2dfd
Merge pull request #42648 from frappe/version-14-hotfix
...
chore: release v14
2024-08-07 14:56:41 +05:30
Frappe PR Bot
4089af5a7b
chore(release): Bumped to Version 14.70.14
...
## [14.70.14](https://github.com/frappe/erpnext/compare/v14.70.13...v14.70.14 ) (2024-08-01)
### Bug Fixes
* slowness in reposting dependent vouchers. (backport [#42282 ](https://github.com/frappe/erpnext/issues/42282 )) ([#42569 ](https://github.com/frappe/erpnext/issues/42569 )) ([cccfbf1 ](cccfbf193e ))
2024-08-01 09:12:20 +00:00
rohitwaghchaure
06c73ef2da
Merge pull request #42570 from frappe/mergify/bp/version-14/pr-42569
...
fix: slowness in reposting dependent vouchers. (backport #42282 ) (backport #42569 )
2024-08-01 14:40:58 +05:30
mergify[bot]
cccfbf193e
fix: slowness in reposting dependent vouchers. (backport #42282 ) ( #42569 )
...
fix: slowness in reposting dependent vouchers. (#42282 )
(cherry picked from commit b17696a8ae )
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
(cherry picked from commit 3fb6f97f66 )
2024-08-01 07:52:46 +00:00
Frappe PR Bot
37a7da3371
chore(release): Bumped to Version 14.70.13
...
## [14.70.13](https://github.com/frappe/erpnext/compare/v14.70.12...v14.70.13 ) (2024-07-31)
### Bug Fixes
* builtins.KeyError: ('ABC', 'Store - CP') (backport [#42505 ](https://github.com/frappe/erpnext/issues/42505 )) ([#42508 ](https://github.com/frappe/erpnext/issues/42508 )) ([0256c64 ](0256c64634 ))
* consider payment entries for checking if tds is deducted ([e7432fc ](e7432fc60d ))
* dynamic condition in the pricing rule not working (backport [#42467 ](https://github.com/frappe/erpnext/issues/42467 )) ([#42543 ](https://github.com/frappe/erpnext/issues/42543 )) ([53034c3 ](53034c332b ))
* **gross profit:** incorrect valuation rate on different warehouses ([1a7efbb ](1a7efbb654 ))
* ignore duplicates while creating default templates ([99bc8e8 ](99bc8e849c ))
* incorrect cost_center on AR/AP report ([0e2abbd ](0e2abbd08e ))
* keep status as In Progress for RIV for Timeout Error (backport [#42274 ](https://github.com/frappe/erpnext/issues/42274 )) ([#42504 ](https://github.com/frappe/erpnext/issues/42504 )) ([8e8d0c7 ](8e8d0c7bd0 ))
* parenttype in item wise purchase and sales register ([97f2e88 ](97f2e88f4c ))
* performance issue for the report Purchase Order Analysis report (backport [#42503 ](https://github.com/frappe/erpnext/issues/42503 )) ([#42506 ](https://github.com/frappe/erpnext/issues/42506 )) ([f42f1bb ](f42f1bb35f ))
* price_list_currency not found error (backport [#42534 ](https://github.com/frappe/erpnext/issues/42534 )) ([#42538 ](https://github.com/frappe/erpnext/issues/42538 )) ([3ba6f40 ](3ba6f40063 ))
* warehouse filter in Product Bundle Balance (backport [#42532 ](https://github.com/frappe/erpnext/issues/42532 )) ([#42536 ](https://github.com/frappe/erpnext/issues/42536 )) ([0441984 ](0441984405 ))
2024-07-31 06:00:37 +00:00
ruthra kumar
81c362dbe4
Merge pull request #42542 from frappe/version-14-hotfix
...
chore: release v14
2024-07-31 11:29:23 +05:30
Frappe PR Bot
fe4b2e36cc
chore(release): Bumped to Version 14.70.12
...
## [14.70.12](https://github.com/frappe/erpnext/compare/v14.70.11...v14.70.12 ) (2024-07-24)
### Bug Fixes
* missing cr/dr notes on payment reconciliation ([90ee21f ](90ee21f868 ))
* remove proprietorship and update it with individual (backport [#42307 ](https://github.com/frappe/erpnext/issues/42307 )) ([8c1f619 ](8c1f6196b8 ))
* set pos data if not return doc ([6ecb064 ](6ecb064264 ))
* Show the rows in AR/AP report where outstanding equals to 0.01 ([2936988 ](2936988cc6 ))
2024-07-24 07:26:52 +00:00
ruthra kumar
6759b90f85
Merge pull request #42448 from frappe/version-14-hotfix
...
chore: release v14
2024-07-24 12:55:36 +05:30
Frappe PR Bot
12a31de25a
chore(release): Bumped to Version 14.70.11
...
## [14.70.11](https://github.com/frappe/erpnext/compare/v14.70.10...v14.70.11 ) (2024-07-17)
### Bug Fixes
* missing discount on POS Credit Notes ([ac48c3d ](ac48c3d4e7 ))
2024-07-17 05:11:39 +00:00
ruthra kumar
3b9400755e
Merge pull request #42353 from frappe/version-14-hotfix
...
chore: release v14
2024-07-17 10:40:24 +05:30
Frappe PR Bot
1d66b7e5a3
chore(release): Bumped to Version 14.70.10
...
## [14.70.10](https://github.com/frappe/erpnext/compare/v14.70.9...v14.70.10 ) (2024-07-10)
### Bug Fixes
* add missing german translations ([d5c1c62 ](d5c1c62622 ))
* empty item-wise sales/purchase register reports on initial load ([13895fa ](13895fa060 ))
* fetch expence account from asset category ([4d6a71a ](4d6a71ab4b ))
* group by in item-wise purchase register ([62ad466 ](62ad466a3b ))
* **Holiday List:** sort holidays on save to avoid disorienting the user (backport [#42236 ](https://github.com/frappe/erpnext/issues/42236 )) ([#42251 ](https://github.com/frappe/erpnext/issues/42251 )) ([fcf6500 ](fcf6500144 ))
* manual pick allow to pick more than available stock (backport [#42155 ](https://github.com/frappe/erpnext/issues/42155 )) ([#42158 ](https://github.com/frappe/erpnext/issues/42158 )) ([454e147 ](454e147592 ))
* multiple free items on same Item Group ([701dd9e ](701dd9e19b ))
* removed max discount validation for sales return ([4195c50 ](4195c50f02 ))
* stock qty validation in SCR (backport [#42124 ](https://github.com/frappe/erpnext/issues/42124 )) ([#42224 ](https://github.com/frappe/erpnext/issues/42224 )) ([e2f8e02 ](e2f8e02c73 ))
* tax on stock_rbnb on repost of Purchase Receipt ([106c154 ](106c154a16 ))
* **tds:** use doctype reference when mapping keys across multiple doctypes ([51cbbee ](51cbbee4ca ))
* updated logic for calculating tax_withholding_net_total in payment entry ([49e5066 ](49e50662b6 ))
* use standard method to get `_doc_before_save` ([9fde733 ](9fde7330e0 ))
2024-07-10 10:43:56 +00:00
ruthra kumar
ab9bde86f9
Merge pull request #42254 from frappe/version-14-hotfix
...
chore: release v14
2024-07-10 16:12:40 +05:30
Frappe PR Bot
30cba7ee2c
chore(release): Bumped to Version 14.70.9
...
## [14.70.9](https://github.com/frappe/erpnext/compare/v14.70.8...v14.70.9 ) (2024-07-05)
### Bug Fixes
* blank item-wise sales/purchase register reports on first load ([0f275a9 ](0f275a9ff0 ))
* group by in item-wise purchase register ([1840267 ](18402677da ))
2024-07-05 02:47:14 +00:00
ruthra kumar
21a60c9927
Merge pull request #42190 from frappe/mergify/bp/version-14/pr-41975
...
fix: group by in item-wise purchase register (backport #41975 )
2024-07-05 08:15:53 +05:30
ruthra kumar
0f275a9ff0
fix: blank item-wise sales/purchase register reports on first load
2024-07-05 07:50:37 +05:30
Nihantra C. Patel
18402677da
fix: group by in item-wise purchase register
...
(cherry picked from commit 3fab00135b )
2024-07-05 02:05:26 +00:00
Frappe PR Bot
f2d113dcf2
chore(release): Bumped to Version 14.70.8
...
## [14.70.8](https://github.com/frappe/erpnext/compare/v14.70.7...v14.70.8 ) (2024-07-03)
### Bug Fixes
* always post to tax account heads if LCV is booked ([650b25f ](650b25fc23 ))
* asset value correction in fixed asset register ([#41943 ](https://github.com/frappe/erpnext/issues/41943 )) ([a2ee463 ](a2ee4631cc ))
* consistent query field name in item wise purchase register with item wise sales register ([9665212 ](9665212607 ))
* **Delivery Note:** only show permitted actions ([0aa246c ](0aa246c39e ))
* dynamic_link for party in customer and supplier dashboard ([6de7a8d ](6de7a8de10 ))
* incorrect against_account upon reposting ([6028a19 ](6028a19e6b ))
* Re-open allows SO's to be over credit limit ([952a7b4 ](952a7b46d5 ))
* **Sales Order:** only show permitted actions ([5468a3b ](5468a3b0b7 ))
* timeout while cancelling LCV ([#42030 ](https://github.com/frappe/erpnext/issues/42030 )) ([21bf7fd ](21bf7fd1f8 ))
2024-07-03 05:02:59 +00:00
ruthra kumar
97e4495f1f
Merge pull request #42141 from frappe/version-14-hotfix
...
chore: release v14
2024-07-03 10:31:45 +05:30
Frappe PR Bot
b593f57637
chore: release v14 ( #42023 )
...
* fix(Sales Order): only show permitted actions
(cherry picked from commit c29d955371 )
# Conflicts:
# erpnext/selling/doctype/sales_order/sales_order.js
* fix(Delivery Note): only show permitted actions
(cherry picked from commit 418bdc1dcc )
# Conflicts:
# erpnext/stock/doctype/delivery_note/delivery_note.js
* fix: consistent query field name in item wise purchase register with item wise sales register
* chore: resolve conflicts
* refactor: remove use of can_create for Payment Request (#41647 )
(cherry picked from commit 47bc5691a1 )
* fix: incorrect against_account upon reposting
(cherry picked from commit 20c4098399 )
* fix: asset value correction in fixed asset register (#41943 )
* fix: timeout while cancelling LCV (#42030 )
fix: timeout while canelling LCV
---------
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com >
Co-authored-by: ljain112 <ljain112@gmail.com >
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com >
Co-authored-by: ruthra kumar <ruthra@erpnext.com >
Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com >
2024-06-26 18:02:23 +05:30
Frappe PR Bot
5ae9ec2657
chore(release): Bumped to Version 14.70.7
...
## [14.70.7](https://github.com/frappe/erpnext/compare/v14.70.6...v14.70.7 ) (2024-06-19)
### Bug Fixes
* add LCV flag to determine negative expenses ([20b8ee1 ](20b8ee1e90 ))
* allow Auditor to read a Fiscal Year ([b1a911a ](b1a911aa9c ))
* allow Auditor to select a company ([18b6d50 ](18b6d50a31 ))
* allow Employee role to select Department (backport [#41877 ](https://github.com/frappe/erpnext/issues/41877 )) ([#41880 ](https://github.com/frappe/erpnext/issues/41880 )) ([245c6d8 ](245c6d8672 ))
* migrate lead notes ([8f5278e ](8f5278e3d4 ))
* only show user and date if available ([598c581 ](598c581623 ))
* parameters for PI references ([d484553 ](d48455393e ))
* regional overide for updating item valution ([6441bc7 ](6441bc7862 ))
* reposting validation related PCV ([bcfc83d ](bcfc83d8d5 ))
* reset perpetual inventory flag after test ([eae5f27 ](eae5f27ec8 ))
2024-06-19 06:25:45 +00:00
ruthra kumar
890289563a
Merge pull request #41942 from frappe/version-14-hotfix
...
chore: release v14
2024-06-19 11:54:25 +05:30
Frappe PR Bot
32fba94b2a
chore(release): Bumped to Version 14.70.6
...
## [14.70.6](https://github.com/frappe/erpnext/compare/v14.70.5...v14.70.6 ) (2024-06-11)
### Bug Fixes
* Add additional condition application ([e79e9e9 ](e79e9e94d0 ))
* fixing Item-wise sales register ([5d97c7c ](5d97c7cff9 ))
* fixing Item-wise sales register [#41373 ](https://github.com/frappe/erpnext/issues/41373 ) ([ab90b81 ](ab90b815e3 ))
* fixing Item-wise sales register and purchase register [#41373 ](https://github.com/frappe/erpnext/issues/41373 ) ([ee47440 ](ee47440063 ))
* Item-wise Sales and Purchase register with no item codes [#41373 ](https://github.com/frappe/erpnext/issues/41373 ) ([bc24e75 ](bc24e75c24 ))
* terms and conditions for material request (backport [#41834 ](https://github.com/frappe/erpnext/issues/41834 )) ([#41836 ](https://github.com/frappe/erpnext/issues/41836 )) ([7234625 ](7234625d65 ))
2024-06-11 13:07:24 +00:00
rohitwaghchaure
a6ed10b712
Merge pull request #41853 from frappe/version-14-hotfix
...
chore: release v14
2024-06-11 18:36:07 +05:30
Frappe PR Bot
0c4a2af9ab
chore(release): Bumped to Version 14.70.5
...
## [14.70.5](https://github.com/frappe/erpnext/compare/v14.70.4...v14.70.5 ) (2024-06-10)
### Bug Fixes
* Add additional condition application ([810378c ](810378c899 ))
* fixing Item-wise sales register ([3823e0e ](3823e0e494 ))
* fixing Item-wise sales register [#41373 ](https://github.com/frappe/erpnext/issues/41373 ) ([e8286d7 ](e8286d7b3c ))
* fixing Item-wise sales register and purchase register [#41373 ](https://github.com/frappe/erpnext/issues/41373 ) ([fd73a8a ](fd73a8a348 ))
* Item-wise Sales and Purchase register with no item codes [#41373 ](https://github.com/frappe/erpnext/issues/41373 ) ([91de469 ](91de46922d ))
2024-06-10 04:55:25 +00:00
Deepesh Garg
5ba0082bc7
Merge pull request #41832 from frappe/mergify/bp/version-14/pr-41829
...
fix: Item-wise Sales and Purchase register with no item codes (#41424 )
2024-06-10 10:24:04 +05:30
Deepesh Garg
47b3e96a37
chore: resolve conflicts
...
(cherry picked from commit e9b7d00afb )
2024-06-10 04:53:29 +00:00
Deepesh Garg
810378c899
fix: Add additional condition application
...
(cherry picked from commit 8ec364df6f )
# Conflicts:
# erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
(cherry picked from commit e79e9e94d0 )
2024-06-10 04:53:29 +00:00
Deepesh Garg
bdf198c94f
chore: update condition queries in qb
...
(cherry picked from commit d2af36e1eb )
# Conflicts:
# erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
# erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit e94e15259b )
2024-06-10 04:53:29 +00:00
Poorvi-R-Bhat
e8286d7b3c
fix: fixing Item-wise sales register #41373
...
(cherry picked from commit eafa88b8e9 )
# Conflicts:
# erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit ab90b815e3 )
2024-06-10 04:53:29 +00:00
Poorvi-R-Bhat
fd73a8a348
fix: fixing Item-wise sales register and purchase register #41373
...
(cherry picked from commit 76073ae228 )
# Conflicts:
# erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
(cherry picked from commit ee47440063 )
2024-06-10 04:53:29 +00:00
Poorvi-R-Bhat
91de46922d
fix: Item-wise Sales and Purchase register with no item codes #41373
...
(cherry picked from commit 1b45ecfcae )
# Conflicts:
# erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
# erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
(cherry picked from commit bc24e75c24 )
2024-06-10 04:53:29 +00:00
Poorvi
3823e0e494
fix: fixing Item-wise sales register
...
(cherry picked from commit c90185f533 )
(cherry picked from commit 5d97c7cff9 )
2024-06-10 04:53:28 +00:00
Frappe PR Bot
b6648eebfa
chore(release): Bumped to Version 14.70.4
...
## [14.70.4](https://github.com/frappe/erpnext/compare/v14.70.3...v14.70.4 ) (2024-06-05)
### Bug Fixes
* Filters in account balance report ([570985f ](570985f40e ))
* get assets received but not billed account only if any asset item is received ([#41734 ](https://github.com/frappe/erpnext/issues/41734 )) ([39885b2 ](39885b2b01 ))
* Ignore disabling default currency field while creating new company (backport [#41699 ](https://github.com/frappe/erpnext/issues/41699 )) ([#41760 ](https://github.com/frappe/erpnext/issues/41760 )) ([5ab5bd1 ](5ab5bd138f ))
* payment term when creating PO from SO (backport [#41376 ](https://github.com/frappe/erpnext/issues/41376 )) ([#41743 ](https://github.com/frappe/erpnext/issues/41743 )) ([dc32657 ](dc3265751c ))
2024-06-05 01:17:52 +00:00
ruthra kumar
faa3c7c3a4
Merge pull request #41774 from frappe/version-14-hotfix
...
chore: release v14
2024-06-05 06:46:34 +05:30
Frappe PR Bot
13dfbe3d80
chore(release): Bumped to Version 14.70.3
...
## [14.70.3](https://github.com/frappe/erpnext/compare/v14.70.2...v14.70.3 ) (2024-05-29)
### Bug Fixes
* add in some indices to speed up Purchase Order deletion ([c16c41e ](c16c41ee59 ))
* Add to Cart button width for Mobile/Tablet ([819ced4 ](819ced4cb3 ))
* cost center filter according to the company in project ([7035969 ](7035969db7 ))
* cost center filter according to the company in project ([0cf97f2 ](0cf97f2559 ))
* cost center filter according to the company in project ([459d136 ](459d136368 ))
* dict can not be used as parameter ([#41598 ](https://github.com/frappe/erpnext/issues/41598 )) ([649c192 ](649c192abe ))
* Fetch outstanding and total amount for reference journal entry ([50f6afd ](50f6afd588 ))
* set expense account as Assets RBNB only if it is booked in linked PR ([#41368 ](https://github.com/frappe/erpnext/issues/41368 )) ([014486d ](014486de39 ))
* Update depreciation schedule via asset repair ([#41344 ](https://github.com/frappe/erpnext/issues/41344 )) ([eb418e8 ](eb418e8659 ))
2024-05-29 07:52:36 +00:00
ruthra kumar
7e3c15e0b6
Merge pull request #41665 from frappe/version-14-hotfix
...
chore: release v14
2024-05-29 13:21:18 +05:30
Frappe PR Bot
c910b8ab03
chore(release): Bumped to Version 14.70.2
...
## [14.70.2](https://github.com/frappe/erpnext/compare/v14.70.1...v14.70.2 ) (2024-05-23)
### Bug Fixes
* Fetch outstanding and total amount for reference journal entry ([94c3ee6 ](94c3ee645d ))
2024-05-23 11:01:54 +00:00
ruthra kumar
b9ebb50a02
Merge pull request #41600 from frappe/mergify/bp/version-14/pr-40957
...
fix: Fetch correct outstanding and total amount for reference journal entry (backport #40920 ) (backport #40957 )
2024-05-23 16:30:31 +05:30
ruthra kumar
38cc28a4c3
chore: resolve conflicts
...
(cherry picked from commit 5230d411bf )
2024-05-23 10:39:16 +00:00
ruthra kumar
bbb9b9e3b6
chore: remove unused imports
...
(cherry picked from commit a6bf7c1ebd )
2024-05-23 10:39:15 +00:00
Nabin Hait
94c3ee645d
fix: Fetch outstanding and total amount for reference journal entry
...
(cherry picked from commit f331f9b15c )
# Conflicts:
# erpnext/accounts/doctype/payment_entry/payment_entry.js
# erpnext/accounts/doctype/payment_entry/payment_entry.py
(cherry picked from commit 50f6afd588 )
2024-05-23 10:39:15 +00:00
Frappe PR Bot
b7d6a54bed
chore(release): Bumped to Version 14.70.1
...
## [14.70.1](https://github.com/frappe/erpnext/compare/v14.70.0...v14.70.1 ) (2024-05-22)
### Bug Fixes
* minor Dr and Cr between Purchase Receipt and Purchase Invoice ([82d206b ](82d206b709 ))
* possible sql error on General Ledger ([dfb4c47 ](dfb4c47089 ))
* print format bold for field "total" ([89d507e ](89d507e07e ))
* priority not working for multiple pricing rules (backport [#41516 ](https://github.com/frappe/erpnext/issues/41516 )) ([#41524 ](https://github.com/frappe/erpnext/issues/41524 )) ([97fdda8 ](97fdda8a7c ))
* typerror on hide_fields ([331a743 ](331a743d69 ))
* validate reorder group warehouse (backport [#41478 ](https://github.com/frappe/erpnext/issues/41478 )) ([#41479 ](https://github.com/frappe/erpnext/issues/41479 )) ([2659535 ](26595351cc ))
2024-05-22 08:46:30 +00:00
ruthra kumar
05e4dae1b8
Merge pull request #41575 from frappe/version-14-hotfix
...
chore: release v14
2024-05-22 14:15:11 +05:30
Frappe PR Bot
dfaca93292
chore(release): Bumped to Version 14.70.0
...
# [14.70.0](https://github.com/frappe/erpnext/compare/v14.69.1...v14.70.0 ) (2024-05-15)
### Bug Fixes
* "Based on" field always has the value "Not applicable" ([1078a98 ](1078a98cce ))
* address filter and quotation to for prospect ([c9e7f45 ](c9e7f450c5 ))
* address filter and quotation to for prospect ([6902780 ](690278042d ))
* address filter and quotation to for prospect ([754e193 ](754e193c76 ))
* consistent use of "Address & Contact" (backport [#41386 ](https://github.com/frappe/erpnext/issues/41386 )) ([#41387 ](https://github.com/frappe/erpnext/issues/41387 )) ([256d6a4 ](256d6a47ac ))
* data getting override in delivery trip (backport [#41431 ](https://github.com/frappe/erpnext/issues/41431 )) ([#41432 ](https://github.com/frappe/erpnext/issues/41432 )) ([5366356 ](5366356400 ))
* Default dates in report ([c3244f0 ](c3244f009b ))
* default fiscal year ([7a380f5 ](7a380f584d ))
* Duplicate party name column in AR/AP report ([a8be5f0 ](a8be5f0789 ))
* PSOA ageing ([e69e540 ](e69e5404d3 ))
### Features
* allow to pick manually qty / batches / serial nos (backport [#40723 ](https://github.com/frappe/erpnext/issues/40723 )) ([#41435 ](https://github.com/frappe/erpnext/issues/41435 )) ([7b28d7d ](7b28d7d2b8 ))
2024-05-15 05:12:14 +00:00
Deepesh Garg
40de3f3481
Merge pull request #41458 from frappe/version-14-hotfix
...
chore: release v14
2024-05-15 10:40:58 +05:30
Frappe PR Bot
9d5e4b3b3a
chore(release): Bumped to Version 14.69.1
...
## [14.69.1](https://github.com/frappe/erpnext/compare/v14.69.0...v14.69.1 ) (2024-05-09)
### Bug Fixes
* added brand column in Warehouse wise Item Balance Age and Value … (backport [#41280 ](https://github.com/frappe/erpnext/issues/41280 )) ([#41281 ](https://github.com/frappe/erpnext/issues/41281 )) ([d727c52 ](d727c52421 ))
* Cost center not getting saved in PSOA ([e82ea12 ](e82ea12cbc ))
* filter validation for batch-wise balance history report (backport [#41356 ](https://github.com/frappe/erpnext/issues/41356 )) ([#41360 ](https://github.com/frappe/erpnext/issues/41360 )) ([339256b ](339256bc71 ))
* incorrect query for Purchase Invoice rate in GP ([93b30d9 ](93b30d9f11 ))
* missing Item Name on Save for Quotation created from Item (backport [#41233 ](https://github.com/frappe/erpnext/issues/41233 )) ([#41303 ](https://github.com/frappe/erpnext/issues/41303 )) ([a26ae64 ](a26ae64385 ))
* pricing rule rounding ([d2ce927 ](d2ce927891 ))
* reset rate for serial batch supplied items ([#41293 ](https://github.com/frappe/erpnext/issues/41293 )) ([cd33199 ](cd33199da2 ))
### Performance Improvements
* index on item code for the Pick List Item doctype (backport [#41357 ](https://github.com/frappe/erpnext/issues/41357 )) ([#41362 ](https://github.com/frappe/erpnext/issues/41362 )) ([4647ec8 ](4647ec8892 ))
2024-05-09 05:30:06 +00:00
ruthra kumar
d7709cf4e4
Merge pull request #41354 from frappe/version-14-hotfix
...
chore: release v14
2024-05-09 10:58:39 +05:30
Frappe PR Bot
5ae29655f9
chore(release): Bumped to Version 14.69.0
...
# [14.69.0](https://github.com/frappe/erpnext/compare/v14.68.2...v14.69.0 ) (2024-05-02)
### Bug Fixes
* 'NoneType' object has no attribute '_read_rowdata_packet_unbuffered' ([949aa93 ](949aa9346c ))
* args when get the delivery note in delivery trip ([abe64aa ](abe64aa1ab ))
* args when get the delivery note in delivery trip ([1a7b3c4 ](1a7b3c437d ))
* display term name for single term invoices ([58b68b7 ](58b68b7597 ))
* duplicate column in the stock ledger report ([3fcdcef ](3fcdcef178 ))
* handle stock balance unbuffered_cursor error (backport [#41186 ](https://github.com/frappe/erpnext/issues/41186 )) ([#41187 ](https://github.com/frappe/erpnext/issues/41187 )) ([59010c9 ](59010c9a61 ))
* incorrectly applying TDS when Advance is in previous FY ([eb22fb9 ](eb22fb9326 ))
* mode of payment has precedance ([33d38ba ](33d38ba3a7 ))
* multiple pricing rules with discount amount and discount percentage not working ([#41211 ](https://github.com/frappe/erpnext/issues/41211 )) ([54313b5 ](54313b5db9 ))
* negative stock qty error for stock reconciliation ([#41283 ](https://github.com/frappe/erpnext/issues/41283 )) ([9aa054c ](9aa054c400 ))
* permission issue when user permission restricts on company ([45c4167 ](45c4167c86 ))
* validation to prevent overallocation ([8318286 ](8318286865 ))
### Features
* allow to do reposting for all stock transactions (audit) (backport [#41165 ](https://github.com/frappe/erpnext/issues/41165 )) ([#41205 ](https://github.com/frappe/erpnext/issues/41205 )) ([1e13193 ](1e1319351d ))
### Performance Improvements
* timeout issue while submitting purchase receipt (v14) ([113351e ](113351e850 ))
2024-05-02 04:31:43 +00:00
ruthra kumar
81a99309d8
Merge pull request #41264 from frappe/version-14-hotfix
...
chore: release v14
2024-05-02 09:59:30 +05:30
Frappe PR Bot
d160f5b61a
chore(release): Bumped to Version 14.68.2
...
## [14.68.2](https://github.com/frappe/erpnext/compare/v14.68.1...v14.68.2 ) (2024-04-26)
### Performance Improvements
* timeout issue while submitting purchase receipt (v14) ([c93840e ](c93840eb56 ))
2024-04-26 06:53:19 +00:00
rohitwaghchaure
40ece3f5da
Merge pull request #41193 from frappe/mergify/bp/version-14/pr-41174
...
perf: timeout issue while submitting purchase receipt (v14) (backport #41174 )
2024-04-26 12:21:59 +05:30
Rohit Waghchaure
c93840eb56
perf: timeout issue while submitting purchase receipt (v14)
...
(cherry picked from commit 113351e850 )
2024-04-26 05:27:47 +00:00
Frappe PR Bot
2026c986ba
chore(release): Bumped to Version 14.68.1
...
## [14.68.1](https://github.com/frappe/erpnext/compare/v14.68.0...v14.68.1 ) (2024-04-25)
### Bug Fixes
* mode of payment has precedance ([7e52f72 ](7e52f72bed ))
2024-04-25 03:43:28 +00:00
ruthra kumar
91c202f172
Merge pull request #41179 from frappe/mergify/bp/version-14/pr-41142
...
fix: mode of payment has precedance in Payment Entry (backport #41142 )
2024-04-25 09:12:14 +05:30
ruthra kumar
7e52f72bed
fix: mode of payment has precedance
...
Mode of Payment is given precedence over company/party bank account
(cherry picked from commit 4aef969879 )
2024-04-25 09:06:04 +05:30
Frappe PR Bot
30b2cac423
chore(release): Bumped to Version 14.68.0
...
# [14.68.0](https://github.com/frappe/erpnext/compare/v14.67.2...v14.68.0 ) (2024-04-24)
### Bug Fixes
* account and stock manager read perm ([03ce9ee ](03ce9ee321 ))
* allow Employee role to select cost center & project (accounting dimensions) (backport [#41160 ](https://github.com/frappe/erpnext/issues/41160 )) ([#41161 ](https://github.com/frappe/erpnext/issues/41161 )) ([bb48440 ](bb48440591 ))
* do not add actual expense twice for validating budget ([ec4f07f ](ec4f07fd60 ))
* don't attempt to set gender from salutation (backport [#40997 ](https://github.com/frappe/erpnext/issues/40997 )) ([#41072 ](https://github.com/frappe/erpnext/issues/41072 )) ([5d05bf8 ](5d05bf8d4e ))
* Missing args while fetching items from delivery note ([0df80ad ](0df80ad923 ))
* Multiple partial payment requests against Purchase Invoice ([f1b75e8 ](f1b75e8c54 ))
* Party type in Payment Order ([a2e1d13 ](a2e1d132df ))
* Permission for lower dedcution certificate ([a22be6f ](a22be6f9b9 ))
* Test case ([5aef9d2 ](5aef9d2ef2 ))
* validate uom is integer for PR item (backport [#41074 ](https://github.com/frappe/erpnext/issues/41074 )) ([#41076 ](https://github.com/frappe/erpnext/issues/41076 )) ([9d0c1dc ](9d0c1dc46f ))
### Features
* Available batches report as on specific date ([8868cb1 ](8868cb147d ))
* show expense breakup ([f087ec8 ](f087ec8df5 ))
### Performance Improvements
* stock ageing and batch-wise balance history report ([6017e7a ](6017e7ac3e ))
2024-04-24 07:32:43 +00:00
Deepesh Garg
67be2ba9dc
Merge pull request #41151 from frappe/version-14-hotfix
...
chore: release v14
2024-04-24 13:01:19 +05:30
Frappe PR Bot
84789b7407
chore(release): Bumped to Version 14.67.2
...
## [14.67.2](https://github.com/frappe/erpnext/compare/v14.67.1...v14.67.2 ) (2024-04-17)
### Bug Fixes
* barcode not fetched on selection of item (backport [#40814 ](https://github.com/frappe/erpnext/issues/40814 )) ([#41027 ](https://github.com/frappe/erpnext/issues/41027 )) ([0bee921 ](0bee921d40 ))
* Delayed Order Report not working (backport [#41037 ](https://github.com/frappe/erpnext/issues/41037 )) ([#41038 ](https://github.com/frappe/erpnext/issues/41038 )) ([e956dbb ](e956dbbf68 ))
* Don't call get_fiscal_year if setup is not done yet ([59cea9f ](59cea9f4dd ))
* Don't set delivery date as today while making SO from Quotation ([b47e224 ](b47e224a1c ))
* exclude some query builder lines from ruff rules ([2425119 ](2425119b5e ))
* expense account set as COGS for stock entry Material Issue (backport [#41026 ](https://github.com/frappe/erpnext/issues/41026 )) ([#41028 ](https://github.com/frappe/erpnext/issues/41028 )) ([153e0ba ](153e0ba81b ))
* get address if multiple companies ([c2b6b64 ](c2b6b64e2e ))
* get address if multiple companies ([0493872 ](04938726d9 ))
* **gp:** SLEs not fetched for correct warehouse ([97e7b3f ](97e7b3f3d3 ))
* incorrect exc gain/loss for PE against JE for payable accounts ([50a74ee ](50a74ee7fe ))
* Resolve merge conflicts ([cc925ae ](cc925ae938 ))
* Subcontracting Receipt GL Entries (backport [#40773 ](https://github.com/frappe/erpnext/issues/40773 )) ([#40978 ](https://github.com/frappe/erpnext/issues/40978 )) ([c2c4548 ](c2c4548cc0 ))
* test cases ([79e23da ](79e23dad2c ))
* **treewide:** manual ruff fixes ([b087fb3 ](b087fb3d54 ))
* use 'eq' and isnull() on qb conditions ([b4ed2d2 ](b4ed2d2c16 ))
2024-04-17 06:12:30 +00:00
rohitwaghchaure
cd70c6c1b2
Merge pull request #41032 from frappe/version-14-hotfix
...
chore: release v14
2024-04-17 11:41:15 +05:30