Frappe PR Bot
7e7eb95934
chore(release): Bumped to Version 15.8.1
...
## [15.8.1](https://github.com/frappe/erpnext/compare/v15.8.0...v15.8.1 ) (2023-12-28)
### Bug Fixes
* not able to cancel sales invoice (backport [#38979 ](https://github.com/frappe/erpnext/issues/38979 )) (backport [#38980 ](https://github.com/frappe/erpnext/issues/38980 )) ([#38981 ](https://github.com/frappe/erpnext/issues/38981 )) ([83e62bb](83e62bbaad
2023-12-28 05:55:23 +00:00
mergify[bot]
83e62bbaad
fix: not able to cancel sales invoice (backport #38979 ) (backport #38980 ) ( #38981 )
...
fix: not able to cancel sales invoice (backport #38979 ) (#38980 )
fix: not able to cancel sales invoice (#38979 )
(cherry picked from commit a117ef3cb88223f0a9f94f863e232b2771b277c8)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit f8625f3eb7e60b3985de900f7443864c7dec20e3)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-28 11:24:16 +05:30
Frappe PR Bot
f3ab5a33c7
chore(release): Bumped to Version 15.8.0
...
# [15.8.0](https://github.com/frappe/erpnext/compare/v15.7.0...v15.8.0 ) (2023-12-27)
### Bug Fixes
* `Reserved Stock` report (backport [#38922 ](https://github.com/frappe/erpnext/issues/38922 )) ([#38924 ](https://github.com/frappe/erpnext/issues/38924 )) ([8f643f0](8f643f0df8#38880 ](https://github.com/frappe/erpnext/issues/38880 )) (backport [#38882 ](https://github.com/frappe/erpnext/issues/38882 )) ([#38885 ](https://github.com/frappe/erpnext/issues/38885 )) ([74606dc](74606dc927#38949 ](https://github.com/frappe/erpnext/issues/38949 )) ([#38954 ](https://github.com/frappe/erpnext/issues/38954 )) ([a41cf62](a41cf62437#38896 ](https://github.com/frappe/erpnext/issues/38896 )) ([#38899 ](https://github.com/frappe/erpnext/issues/38899 )) ([f6eb2b5](f6eb2b521de0dbb573b1#38964 ](https://github.com/frappe/erpnext/issues/38964 )) ([#38966 ](https://github.com/frappe/erpnext/issues/38966 )) ([5874be0](5874be0f79#38850 ](https://github.com/frappe/erpnext/issues/38850 )) ([#38877 ](https://github.com/frappe/erpnext/issues/38877 )) ([e3be9c1](e3be9c1da4#38956 ](https://github.com/frappe/erpnext/issues/38956 )) ([#38958 ](https://github.com/frappe/erpnext/issues/38958 )) ([ab9fce3](ab9fce333d#38950 ](https://github.com/frappe/erpnext/issues/38950 )) ([#38955 ](https://github.com/frappe/erpnext/issues/38955 )) ([0e48ef7](0e48ef7ace#38895 ](https://github.com/frappe/erpnext/issues/38895 )) (backport [#38897 ](https://github.com/frappe/erpnext/issues/38897 )) ([#38901 ](https://github.com/frappe/erpnext/issues/38901 )) ([eabb956](eabb956aca#38925 ](https://github.com/frappe/erpnext/issues/38925 )) ([#38926 ](https://github.com/frappe/erpnext/issues/38926 )) ([82960e3](82960e33122d9a0a8e2ebf98a8f855#38870 ](https://github.com/frappe/erpnext/issues/38870 )) ([#38871 ](https://github.com/frappe/erpnext/issues/38871 )) ([d75ac13](d75ac136d732d3d4e571#38942 ](https://github.com/frappe/erpnext/issues/38942 )) ([#38944 ](https://github.com/frappe/erpnext/issues/38944 )) ([f704ccb](f704ccbb59a65bc77b02#38558 ](https://github.com/frappe/erpnext/issues/38558 )) ([#38920 ](https://github.com/frappe/erpnext/issues/38920 )) ([8c2c90f](8c2c90f77a#38879 ](https://github.com/frappe/erpnext/issues/38879 )) ([#38887 ](https://github.com/frappe/erpnext/issues/38887 )) ([58f1df5](58f1df5004#38884 ](https://github.com/frappe/erpnext/issues/38884 )) ([#38913 ](https://github.com/frappe/erpnext/issues/38913 )) ([308c6ff](308c6ffb4f#38830 ](https://github.com/frappe/erpnext/issues/38830 )) ([#38876 ](https://github.com/frappe/erpnext/issues/38876 )) ([648f275](648f275797
2023-12-27 08:41:36 +00:00
rohitwaghchaure
e2bf03bdb2
Merge pull request #38952 from frappe/version-15-hotfix
...
chore: release v15
2023-12-27 14:10:09 +05:30
mergify[bot]
5874be0f79
fix: incorrect qty in serial batch bundle against pick list (backport #38964 ) ( #38966 )
...
fix: incorrect qty in serial batch bundle against pick list (#38964 )
(cherry picked from commit 47ee801d373058a2739c2fd42d971d624c42d5a7)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-27 14:06:55 +05:30
mergify[bot]
ab9fce333d
fix: min order qty optional in production plan (backport #38956 ) ( #38958 )
...
fix: min order qty optional in production plan (#38956 )
* fix: min order qty optional in production plan
* fix: test cases
(cherry picked from commit b09c9354fb621c4283d6ebde91f3d061ea88f7f6)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-26 21:55:23 +05:30
mergify[bot]
0e48ef7ace
fix: not able to import serial batch bundle using csv (backport #38950 ) ( #38955 )
...
* fix: not able to import serial batch bundle using csv (#38950 )
(cherry picked from commit d00f6672a8d9db1e28f9a86ff8efbedcdc95c41a)
# Conflicts:
# erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
* chore: fixed conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-26 16:29:34 +05:30
mergify[bot]
a41cf62437
fix: do not make serial batch bundle for zero qty (backport #38949 ) ( #38954 )
...
fix: do not make serial batch bundle for zero qty (#38949 )
(cherry picked from commit 06d6220a2aa2f7855db2c2f985d046280e26f13a)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-26 15:39:00 +05:30
mergify[bot]
f704ccbb59
fix(ux): make PR and PI Item rate field readonly based on Maintain Same Rate (backport #38942 ) ( #38944 )
...
* fix(ux): make PI Item rate field editable
(cherry picked from commit eb5bb9f9a99e54be71c7ae5e24235b5b44692444)
* fix(ux): make PI Item rate field readonly based on `Maintain Same Rate`
(cherry picked from commit cb9114442b936f03c9c975900282b3b9db62e453)
* fix(ux): make PR Item rate field readonly based on `Maintain Same Rate`
(cherry picked from commit b1ba2103323c8bfe066c288b4c285cf1f3c5b20b)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-26 14:45:05 +05:30
ruthra kumar
1ea8574be9
Merge pull request #38946 from frappe/mergify/bp/version-15-hotfix/pr-38891
...
fix: incorrect price list in customer-wise item price report (backport #38891 )
2023-12-26 12:16:55 +05:30
ruthra kumar
e0dbb573b1
fix: incorrect price list in customer-wise item price report
...
(cherry picked from commit 9a00edb03115b72afb4274e6fcf2dc7d5b431657)
2023-12-26 06:17:54 +00:00
mergify[bot]
82960e3312
fix: reset the incoming rate on changing of the warehouse (backport #38925 ) ( #38926 )
...
fix: reset the incoming rate on changing of the warehouse (#38925 )
(cherry picked from commit 161ae1edd1ebcafd14d7a302ad1adde238e43426)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-22 17:55:58 +05:30
mergify[bot]
8f643f0df8
fix: Reserved Stock report (backport #38922 ) ( #38924 )
...
* chore: improve `Allowed Qty` error msg
(cherry picked from commit 1a1629196d0daedef3db4f73191e21321689306d)
* fix: `Reserved Stock` report
(cherry picked from commit a5d5223c0e7f85a64f70288ec6e0048864b2ffd7)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-22 16:45:40 +05:30
mergify[bot]
8c2c90f77a
feat: provision to add items in Stock Reservation dialog (backport #38558 ) ( #38920 )
...
* feat: provision to update items in Stock Reservation dialog
(cherry picked from commit 9471d8fff94f84a627957c5ff2c7f8f1ed53a098)
* fix(ux): show row index and field label while selecting the Sales Order Item
(cherry picked from commit 00261094c8ce0663f953b73ae17a5e7f3f494b59)
* feat: provision to add items in Stock Reservation dialog
(cherry picked from commit 8d5045ef4caf695dbfdc087b78c8f68a79976813)
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-22 15:50:07 +05:30
mergify[bot]
a8f3f2343d
chore: fixup broken JSON files (backport #38915 ) ( #38917 )
...
chore: fixup broken JSON files (#38915 )
(cherry picked from commit 2dc49c834a0cab620465fafa555d239092107864)
Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-22 07:41:00 +05:30
mergify[bot]
308c6ffb4f
perf: Drop unused/duplicate/sub-optimal indexes (backport #38884 ) ( #38913 )
...
perf: Drop unused/duplicate/sub-optimal indexes (#38884 )
* ci: enable more checks
* perf: Drop unused/duplicate indexes
(cherry picked from commit 787333896c3710d16b1fa72432db0fe59c74dfa8)
Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-21 21:39:20 +05:30
mergify[bot]
a99470e017
chore: additional_asset_cost field (backport #38904 ) ( #38906 )
...
chore: additional_asset_cost field (#38904 )
(cherry picked from commit 283763dfb2affa6a0b7bb29e19123c3e1fb27f30)
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-12-21 16:55:41 +05:30
mergify[bot]
eabb956aca
fix: reposting not fixing valuation rate for sales return using movin… (backport #38895 ) (backport #38897 ) ( #38901 )
...
fix: reposting not fixing valuation rate for sales return using movin… (backport #38895 ) (#38897 )
* fix: reposting not fixing valuation rate for sales return using movin… (#38895 )
fix: reposting not fixing valuation rate for sales return using moving average method
(cherry picked from commit 3a668bbe9694fdd6e8265869c6943e42f889ac41)
# Conflicts:
# erpnext/stock/stock_ledger.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 07175367d8158355e5f699c7c66a2a6743a85c29)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-21 15:44:50 +05:30
mergify[bot]
f6eb2b521d
fix: do not reset the basic rate for the material receipt stock entry (backport #38896 ) ( #38899 )
...
fix: do not reset the basic rate for the material receipt stock entry (#38896 )
(cherry picked from commit 98bfcc4c758b61f714c53ea0f00246731a30fdaf)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-21 14:22:53 +05:30
ruthra kumar
135aced98e
Merge pull request #38894 from frappe/mergify/bp/version-15-hotfix/pr-38893
...
fix: typeerror on pos order summary to new order screen (backport #38893 )
2023-12-21 12:26:04 +05:30
ruthra kumar
bf98a8f855
fix: typeerror on pos order summary to new order screen
...
(cherry picked from commit 6a0a08b59c5b1eadbfdc657a131531d0e7461b11)
2023-12-21 06:53:22 +00:00
mergify[bot]
74606dc927
fix: allow to set rate manually for service item in BOM (backport #38880 ) (backport #38882 ) ( #38885 )
...
fix: allow to set rate manually for service item in BOM (backport #38880 ) (#38882 )
fix: allow to set rate manually for service item in BOM (#38880 )
(cherry picked from commit c2f692a4e4f3dd5089fe4949c6cd74574282fdb1)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit a6ab53236e08cb57fc8a45496ee4c9ccfbc53e10)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-21 10:44:20 +05:30
mergify[bot]
58f1df5004
feat: total_asset_cost field (backport #38879 ) ( #38887 )
...
* feat: total_asset_cost field (#38879 )
(cherry picked from commit d370c60a6c840be23ec4094593b9bbf1d1dca88b)
# Conflicts:
# erpnext/patches.txt
* chore: resolve conflicts
* chore: remove unnecessary patch
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-12-20 22:47:48 +05:30
mergify[bot]
e3be9c1da4
fix: local reference error in BOM (backport #38850 ) ( #38877 )
...
fix: local reference error in BOM (#38850 )
fix: local reference error
(cherry picked from commit ae353398d96746e9e89640b586d1bbd6afbbce77)
Co-authored-by: NIYAZ RAZAK <76736615+niyazrazak@users.noreply.github.com>
2023-12-20 16:34:27 +05:30
mergify[bot]
648f275797
perf: use estimated rows instead of actual rows (backport #38830 ) ( #38876 )
...
perf: use estimated rows instead of actual rows (#38830 )
(cherry picked from commit 9983283f95753e7523cf30cc258df0572f88081d)
Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-20 13:58:38 +05:30
ruthra kumar
4626ab5e19
Merge pull request #38873 from frappe/mergify/bp/version-15-hotfix/pr-38838
...
fix: use party account currency when party account is specified (backport #38838 )
2023-12-20 13:09:15 +05:30
Devin Slauenwhite
2d9a0a8e2e
fix(test): expect account currency when party account is specified.
...
(cherry picked from commit a09241e3c763882a0a0e06b21ccaa0b06f60bc75)
2023-12-20 07:05:32 +00:00
Devin Slauenwhite
32d3d4e571
fix: use party account currency when party account is specified
...
(cherry picked from commit c7b961ffa27c611a1e0a45750b38f1f23b0b0c7f)
2023-12-20 07:05:32 +00:00
mergify[bot]
d75ac136d7
fix: typerror on tree doctypes - Item Group, Customer Group, Supplier Group and Territory (backport #38870 ) ( #38871 )
...
fix: typerror on tree doctypes - Item Group, Customer Group, Supplier Group and Territory (#38870 )
* refactor: typerror on set_root_readonly
* refactor: remove 'cur_frm' usage in supplier_group
* refactor: remove 'cur_frm' usage in territory.js
* refactor: remove 'cur_frm' from sales_person.js
(cherry picked from commit 6d5bdc6c68dfda915972f3747de752b8fad7cdb5)
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
2023-12-20 12:32:35 +05:30
ruthra kumar
88b3811c5d
Merge pull request #38839 from pps190/backport/version-15/37746
...
feat: in_party_currency option for AR/AP reports (backport #37746 )
2023-12-20 12:25:11 +05:30
Frappe PR Bot
2a5164d170
chore(release): Bumped to Version 15.7.0
...
# [15.7.0](https://github.com/frappe/erpnext/compare/v15.6.1...v15.7.0 ) (2023-12-20)
### Bug Fixes
* asset patch failure due to missing shift_based column (backport [#38776 ](https://github.com/frappe/erpnext/issues/38776 )) ([#38777 ](https://github.com/frappe/erpnext/issues/38777 )) ([6e92c78](6e92c78cbd#38716 ](https://github.com/frappe/erpnext/issues/38716 )) ([#38718 ](https://github.com/frappe/erpnext/issues/38718 )) ([1dcb065](1dcb065c647d844411fbf55b561ff9fba28d694158de9913b9#38755 ](https://github.com/frappe/erpnext/issues/38755 )) ([#38756 ](https://github.com/frappe/erpnext/issues/38756 )) ([ad3a5b5](ad3a5b58e4#38861 ](https://github.com/frappe/erpnext/issues/38861 )) ([#38865 ](https://github.com/frappe/erpnext/issues/38865 )) ([5ec75fb](5ec75fb6df#38849 ](https://github.com/frappe/erpnext/issues/38849 )) (backport [#38863 ](https://github.com/frappe/erpnext/issues/38863 )) ([#38866 ](https://github.com/frappe/erpnext/issues/38866 )) ([d65be69](d65be69c4c#37858 ](https://github.com/frappe/erpnext/issues/37858 )) ([#38811 ](https://github.com/frappe/erpnext/issues/38811 )) ([18bd330](18bd330a597802f6c528#38845 ](https://github.com/frappe/erpnext/issues/38845 )) (backport [#38847 ](https://github.com/frappe/erpnext/issues/38847 )) ([#38851 ](https://github.com/frappe/erpnext/issues/38851 )) ([7320440](7320440b61#38817 ](https://github.com/frappe/erpnext/issues/38817 )) (backport [#38821 ](https://github.com/frappe/erpnext/issues/38821 )) ([#38829 ](https://github.com/frappe/erpnext/issues/38829 )) ([4bd1a5f](4bd1a5f955#38826 ](https://github.com/frappe/erpnext/issues/38826 )) (backport [#38828 ](https://github.com/frappe/erpnext/issues/38828 )) ([#38833 ](https://github.com/frappe/erpnext/issues/38833 )) ([02ceee6](02ceee6669#38848 ](https://github.com/frappe/erpnext/issues/38848 )) (backport [#38859 ](https://github.com/frappe/erpnext/issues/38859 )) ([#38862 ](https://github.com/frappe/erpnext/issues/38862 )) ([cbbc6af](cbbc6af12877dba4834c#38789 ](https://github.com/frappe/erpnext/issues/38789 )) ([#38791 ](https://github.com/frappe/erpnext/issues/38791 )) ([2045306](2045306283#38754 ](https://github.com/frappe/erpnext/issues/38754 )) ([#38806 ](https://github.com/frappe/erpnext/issues/38806 )) ([8990c48](8990c48e7b#38842 ](https://github.com/frappe/erpnext/issues/38842 )) ([#38855 ](https://github.com/frappe/erpnext/issues/38855 )) ([4e27174](4e27174c854ed86dbff2bf8a2d0e3a#38712 ](https://github.com/frappe/erpnext/issues/38712 )) ([#38713 ](https://github.com/frappe/erpnext/issues/38713 )) ([feb452b](feb452b740#38745 ](https://github.com/frappe/erpnext/issues/38745 )) ([#38747 ](https://github.com/frappe/erpnext/issues/38747 )) ([a551660](a551660d2a#38720 ](https://github.com/frappe/erpnext/issues/38720 )) ([#38763 ](https://github.com/frappe/erpnext/issues/38763 )) ([703be50](703be50bc7aa5e16e681#38778 ](https://github.com/frappe/erpnext/issues/38778 )) ([#38780 ](https://github.com/frappe/erpnext/issues/38780 )) ([7fc8150](7fc8150617cff9e47162f30bede2e0f7706211ea#38827 ](https://github.com/frappe/erpnext/issues/38827 )) ([#38832 ](https://github.com/frappe/erpnext/issues/38832 )) ([6ad75e7](6ad75e72e6
2023-12-20 04:47:03 +00:00
Deepesh Garg
028228ee12
Merge pull request #38853 from frappe/version-15-hotfix
...
chore: release v15
2023-12-20 10:15:54 +05:30
mergify[bot]
4e27174c85
fix: set fg-itm-qty based on qty instead of the other way round in Subcontracting POs (backport #38842 ) ( #38855 )
...
fix: set `fg-itm-qty` based on `qty` instead of the other way round
(cherry picked from commit a99d0a65b028b05b5c3bcb46a48a16771d00861f)
Co-authored-by: Gughan Ravikumar <gughanrk@gmail.com>
2023-12-20 09:12:20 +05:30
mergify[bot]
d65be69c4c
fix: incoming rate for sales return with Moving Average valuation method (backport #38849 ) (backport #38863 ) ( #38866 )
...
fix: incoming rate for sales return with Moving Average valuation method (backport #38849 ) (#38863 )
* fix: incoming rate for sales return with Moving Average valuation method (#38849 )
(cherry picked from commit 7fdac62393ee1e96969cca38a4ce0c07993dce7e)
# Conflicts:
# erpnext/stock/doctype/delivery_note/test_delivery_note.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 4057682c878bd6abffa63e7343ba33bd220bc88c)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-19 19:13:08 +05:30
mergify[bot]
5ec75fb6df
fix: if not budget then don't validate (backport #38861 ) ( #38865 )
...
fix: if not budget then don't validate (#38861 )
(cherry picked from commit d375164100158db9b974742caa3e05062c481d7d)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-19 18:30:36 +05:30
mergify[bot]
cbbc6af128
fix: on closed unreserved the production plan qty (backport #38848 ) (backport #38859 ) ( #38862 )
...
fix: on closed unreserved the production plan qty (backport #38848 ) (#38859 )
fix: on closed unreserved the production plan qty (#38848 )
(cherry picked from commit 2184e8ef58379f53ef8f1d069afa26e64796b073)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 5e68b7e3a6cea0001ad1275300a019c0db9e8e13)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-19 18:18:40 +05:30
mergify[bot]
7320440b61
fix: item variant with manufacturer (backport #38845 ) (backport #38847 ) ( #38851 )
...
fix: item variant with manufacturer (backport #38845 ) (#38847 )
* fix: item variant with manufacturer (#38845 )
(cherry picked from commit e0c8ff10daeed0829266aea9142805f68ceedb2b)
* chore: fix test case
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 4aa960b744c289b0cda9acfae7911b1ef6ffe5d6)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-19 15:17:54 +05:30
ruthra kumar
637343f751
Merge pull request #38844 from frappe/mergify/bp/version-15-hotfix/pr-38797
...
fix: wrong paid and cn amount on pos invoice (backport #38797 )
2023-12-19 11:33:23 +05:30
Dany Robert
ffb6d65910
test: partial payment for pos invoice
...
(cherry picked from commit 877262891235b21447c5b74684fb7173910427e1)
2023-12-19 05:33:15 +00:00
Dany Robert
cff9e47162
fix: wrong paid and cn amount on pos invoice
...
(cherry picked from commit 5cb5e09dbbac878906023c07423d5d8233279790)
2023-12-19 05:33:15 +00:00
Richard Case
dc9b4de976
chore: update tests
2023-12-18 18:13:27 +00:00
Richard Case
a65bc77b02
feat: in_party_currency option for AR/AP reports
2023-12-18 18:13:15 +00:00
mergify[bot]
02ceee6669
fix: not able to make inter-company po from so (backport #38826 ) (backport #38828 ) ( #38833 )
...
fix: not able to make inter-company po from so (backport #38826 ) (#38828 )
fix: not able to make inter-company po from so (#38826 )
(cherry picked from commit 23042dfc3c0d02374c5710ed679731b1910f9b9a)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 32a608f94848564806d6254d11c6c0655fbcaa9a)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-18 18:31:28 +05:30
mergify[bot]
4bd1a5f955
fix: not able to cancel SCR with Batch (backport #38817 ) (backport #38821 ) ( #38829 )
...
fix: not able to cancel SCR with Batch (backport #38817 ) (#38821 )
* fix: not able to cancel SCR with Batch (#38817 )
(cherry picked from commit fb5090fd3f23ada507fe8abc5a899f4b06e48d7e)
# Conflicts:
# erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
* chore: fix test case
* chore: fix test case
* chore: fix test case
* chore: fix test case
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 71e833c3f2323873953c3ad7ab4a9403ebbdeb0a)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2023-12-18 18:13:15 +05:30
mergify[bot]
6ad75e72e6
perf: index return_against on delivery note (backport #38827 ) ( #38832 )
...
perf: index `return_against` on delivery note (#38827 )
There's a multi-column index but that's useful IFF all parts of column
are part of query.
return against on it's own is VERY unique because it's a primary key, we
don't need a multi-column index here.
(cherry picked from commit 8d79365e0ddef42e788f97c668a64c479a803617)
Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-12-18 18:09:42 +05:30
ruthra kumar
c696370cff
Merge pull request #38823 from frappe/mergify/bp/version-15-hotfix/pr-38820
...
refactor: ignore ERR journals in Statment of Accounts (backport #38820 )
2023-12-18 16:24:48 +05:30
ruthra kumar
5a807af505
refactor: ignore ERR journals in Statment of Accounts
...
(cherry picked from commit 39ef75e2d0f18aa8d7434297be596b9223aa7910)
2023-12-18 10:26:30 +00:00
Raffael Meyer
4fe7988249
Merge pull request #38814 from frappe/mergify/bp/version-15-hotfix/pr-38803
...
fix: groups for current accounts in German CoAs (backport #38803 )
2023-12-17 19:52:24 +01:00
barredterra
58de9913b9
fix: groups for current accounts in German CoAs
...
(cherry picked from commit 259f313af75c3cbdcc1af75a8e7d2ad1a3a90c0c)
2023-12-17 18:24:07 +00:00
Deepesh Garg
b52ceceeb7
Merge pull request #38808 from vorasmit/fetch-item-taxes-v15
...
fix: fetch item_tax_template values if fields with fetch_from exisit (#38284 )
2023-12-17 18:51:05 +05:30
