Subin Tom
e3a697c582
fix: disable sales order cancellation if linked to draft invoice ( #26104 )
2021-06-22 16:27:53 +05:30
Subin Tom
889140fd8c
fix: sql syntax error in get_project_name method ( #26147 )
2021-06-22 16:26:19 +05:30
GangaManoj
3b0eac79bf
fix(Asset Repair): Compute total_value
2021-06-22 16:26:09 +05:30
Saqib
4b4eb990a9
Merge branch 'develop' into asset-repair-refactor
2021-06-22 16:21:13 +05:30
Subin Tom
943b46a759
fix: sql syntax error in get_project_name method ( #26145 )
2021-06-22 14:26:36 +05:30
Deepesh Garg
cfdda21dd2
fix: Export invoices not visible in GSTR-1 report
2021-06-22 13:03:22 +05:30
Marica
c6939f37d4
Merge pull request #26140 from marination/product-weightage-develop
...
fix: Sort website products by weightage mentioned in Item master
2021-06-22 11:45:28 +05:30
marination
c212d7fafd
fix: Sort website products by weightage mentioned in Item master
2021-06-22 11:20:23 +05:30
Marica
703c30f5f8
fix: Consistent alert indicators
2021-06-22 11:20:17 +05:30
Dany Robert
884dd9764b
Merge branch 'develop' into patch-4
2021-06-22 11:18:17 +05:30
Marica
9f15ebe711
Merge pull request #26134 from marination/product-weightage
...
fix: Sort website products by weightage mentioned in Item master
2021-06-22 11:16:20 +05:30
GangaManoj
d0d5fedd48
fix(Sales Invoice): Print appropriate message if item.asset is missing when the Item is a Fixed Asset
2021-06-22 00:22:08 +05:30
GangaManoj
5b07e58412
fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice
2021-06-21 23:51:09 +05:30
GangaManoj
600333875a
fix(Sales Invoice): Let item.asset be copied on duplicating the doc
2021-06-21 23:41:35 +05:30
rohitwaghchaure
82adb4f16e
Merge pull request #26118 from rohitwaghchaure/fixed-linking-between-mr-and-sq-develop
...
fix: material request and supplier quotation not linked if supplier quotation created from supplier portal
2021-06-21 22:36:03 +05:30
marination
f97206b3cb
fix: Sort website products by weightage mentioned in Item master
2021-06-21 19:38:37 +05:30
GangaManoj
5776a962b3
fix(Asset Repair): Return Depreciation Schedule to original state on cancellation
2021-06-21 18:57:11 +05:30
marination
ea0dea46e0
fix: sider and semgrep
2021-06-21 16:51:12 +05:30
marination
49ec0e5ac3
feat: Optionally allow rejected quality inspection on submission
2021-06-21 16:18:35 +05:30
rohitwaghchaure
6a07869e55
Update production_plan.js
2021-06-21 15:41:30 +05:30
Noah Jacob
38f105eaee
test: test cases for fetching customer group details
2021-06-21 15:40:13 +05:30
Rohit Waghchaure
00c05108b2
fix: allow to select group warehouse while downloading materials from production plan
2021-06-21 15:39:49 +05:30
rohitwaghchaure
d6eacf556d
Merge pull request #26126 from rohitwaghchaure/production-plan-fix-to-show-parent-warehouse
...
fix: allow to select group warehouse while downloading materials from production plan
2021-06-21 15:39:13 +05:30
Noah Jacob
acef77fb53
test: test case for fetching supplier group details
2021-06-21 15:39:05 +05:30
rohitwaghchaure
8347eb1dba
Update production_plan.js
2021-06-21 15:38:44 +05:30
rohitwaghchaure
40d7e45a34
Merge pull request #26128 from rohitwaghchaure/fix-rate-not-able-to-change-develop
...
fix: rate not able to change in purchase order
2021-06-21 15:37:32 +05:30
Noah Jacob
89215e44a4
feat: details fetched from customer group in customer
2021-06-21 15:37:17 +05:30
Noah Jacob
ffe306c2f6
feat: details fetched from supplier group in supplier
2021-06-21 15:36:46 +05:30
GangaManoj
91a99e0d89
fix(Asset Repair): Increase stock quantity and decrease asset value on cancellation
2021-06-21 15:22:02 +05:30
GangaManoj
f88a13b292
fix(Asset Repair): Compute total_value instantly
2021-06-21 15:02:40 +05:30
Rohit Waghchaure
01faa9ca11
fix: rate not able to change in purchase order
2021-06-21 14:56:38 +05:30
GangaManoj
a34bf5edec
fix: Rename 'Stock Item' to 'Asset Repair Consumed Item'
2021-06-21 14:55:34 +05:30
Rohit Waghchaure
773aabae44
fix: allow to select group warehouse while downloading materials from production plan
2021-06-21 14:54:27 +05:30
GangaManoj
b081d79332
fix(Asset Repair): Fix tests
2021-06-21 14:52:00 +05:30
rohitwaghchaure
3956f82e7c
Merge pull request #26122 from rohitwaghchaure/fix-rate-not-able-to-change
...
fix: rate not able to change in purchase order
2021-06-21 13:40:29 +05:30
Nabin Hait
27f0495156
Merge branch 'version-13' into develop
2021-06-21 11:28:58 +05:30
Nabin Hait
6495a4d2ed
Merge branch 'version-13-pre-release' into version-13
2021-06-21 11:28:57 +05:30
Nabin Hait
94484d7766
bumped to version 13.5.1
2021-06-21 11:48:57 +05:50
Nabin Hait
9cab26b7bf
Merge pull request #26123 from nextchamp-saqib/pos-change-gl-fix-pre-release
...
fix(pos): unsupported operand type -= for 'float' and 'NoneType'
2021-06-21 11:27:59 +05:30
Afshan
127d637b3d
fix: check for duplicate payment terms in Payment Term Template ( #25999 )
2021-06-21 11:24:45 +05:30
Ankush
7dae0fbe95
fix: status indicator for delivery notes (bp #26062 )
...
On list view `per_returned` isn't fetched i.e. `undefined` which become
0 hence the list view indicator is false.
This "computation" is already done by status updater, so relying on
doc.status is better than redefining it.
2021-06-21 11:19:47 +05:30
Saqib Ansari
9b54aee43e
test: service item purchase with perpetual inventory enabled
2021-06-21 11:18:56 +05:30
Saqib Ansari
d329e27346
Merge branch 'develop' of https://github.com/frappe/erpnext into pr-item-gl-fix
2021-06-21 11:18:45 +05:30
Ankush
e78364c191
fix: status indicator for delivery notes ( #26062 )
...
On list view `per_returned` isn't fetched i.e. `undefined` which become
0 hence the list view indicator is false.
This "computation" is already done by status updater, so relying on
doc.status is better than redefining it.
2021-06-21 11:15:16 +05:30
Saqib
d8d3e536e0
Merge branch 'develop' into export-round-off-fix
2021-06-21 10:52:12 +05:30
Saqib
4b32ccb124
fix(pos): unsupported operand type -=: for 'float' and 'NoneType' ( #26097 )
2021-06-21 10:49:25 +05:30
Saqib
fb89008a13
fix(pos): unsupported operand type -=: for 'float' and 'NoneType' ( #26097 )
2021-06-21 10:49:09 +05:30
Saqib
7ff19ebec8
fix(pos): unsupported operand type -= for 'float' and 'NoneType' ( #26096 )
2021-06-21 10:48:50 +05:30
Saqib Ansari
99531a35e0
fix(pos): unsupported operand type -= for 'float' and 'NoneType'
2021-06-21 10:47:23 +05:30
Rohit Waghchaure
582f187726
fix: rate not able to change in purchase order
2021-06-21 00:59:02 +05:30
