Commit Graph

37113 Commits

Author SHA1 Message Date
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
GangaManoj
740df95c58 fix(Asset Repair): Set completion_date on changing repair_status to 'Completed' 2021-06-20 17:44:35 +05:30
rohitwaghchaure
1d3b66eefe
Merge pull request #26119 from rohitwaghchaure/develop-sub-contract-enhancemnet
feat: subcontract code refactor and enhancement
2021-06-20 16:21:44 +05:30
Rohit Waghchaure
f0dfea1d47 fix: test case for Project Profitability report 2021-06-20 15:31:25 +05:30
Rohit Waghchaure
e5fb23972a fix: available qty for consumption 2021-06-20 15:28:25 +05:30
Rohit Waghchaure
110e152fa3 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-20 15:28:23 +05:30
Rohit Waghchaure
6bbc8ec3e8 fix: code cleanup and convert public method to private for subcontracting class 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
d755b29943 fix: toggle consumed qty field based on condition 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
21b58ef045 fix: semgrep error 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
7b7ceaadd9 feat: subcontract code refactor and enhancement 2021-06-20 15:27:01 +05:30
Rohit Waghchaure
9e616b09a2 fix: material request and supplier quotation not linked if sq created from supplier portal against rfq 2021-06-20 15:17:20 +05:30
rohitwaghchaure
ab3cd7e283
Merge pull request #26023 from rohitwaghchaure/fixed-linking-between-mr-and-sq
fix: material request and supplier quotation not linked if supplier quotation created from supplier portal
2021-06-20 15:16:32 +05:30
Marica
29a1a8d2d6
Merge pull request #25878 from rohitwaghchaure/v13-sub-contract-enhancemnet
feat: subcontract code refactor and enhancement
2021-06-20 11:54:23 +05:30
Rohit Waghchaure
3d7f660bec fix: test case for Project Profitability report 2021-06-20 10:20:35 +05:30
Rohit Waghchaure
f5db407461 fix: available qty for consumption 2021-06-19 23:19:45 +05:30
Rohit Waghchaure
5cc3f14506 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-19 23:16:23 +05:30
Rohit Waghchaure
ddb0ec261a fix: code cleanup and convert public method to private for subcontracting class 2021-06-19 23:16:23 +05:30
Rohit Waghchaure
2fb5291785 fix: toggle consumed qty field based on condition 2021-06-19 23:16:22 +05:30
Rohit Waghchaure
9a2db0b5b1 fix: semgrep error 2021-06-19 23:16:22 +05:30
Rohit Waghchaure
a94b89727c feat: subcontract code refactor and enhancement 2021-06-19 23:16:22 +05:30
rohitwaghchaure
1c846c5be7
Merge pull request #26114 from rohitwaghchaure/fixed-stock-entry-submission-performance-v13-hotfix
fix: time out while submitting the stock transactions with more than 50 Items
2021-06-19 18:51:47 +05:30
Rohit Waghchaure
4d81d45a0e fix: time out while submitting the stock transactions with more than 50 items 2021-06-19 16:15:08 +05:30
rohitwaghchaure
a2bb1b8acd
Merge pull request #26081 from rohitwaghchaure/fixed-stock-entry-submission-performance
fix: time out while submit / cancel the stock transactions with more than 50 Items
2021-06-19 16:14:14 +05:30
Rohit Waghchaure
8c844e4515 fix: material request and supplier quotation not linked if sq created from supplier portal against rfq 2021-06-19 16:08:26 +05:30
GangaManoj
23876c0854 fix(Asset Repair): Prevent some fields from being copied on duplicating the doc 2021-06-19 15:23:06 +05:30
GangaManoj
012b9eaeff fix(Asset Repair): Make Error Description non-mandatory 2021-06-19 15:18:54 +05:30
GangaManoj
7db7988e4c fix(Asset Repair): Add Stock Entry field 2021-06-19 14:54:30 +05:30
GangaManoj
09ba6f6477 fix(Asset Repair): Move Total Repair Cost to the Stock Consumption Details section 2021-06-19 14:06:45 +05:30
GangaManoj
da8da9fa4e fix: Replace edit_dates with flags.increase_in_asset_life 2021-06-19 14:00:26 +05:30
GangaManoj
2b93e54e1f fix(Asset Repair): Fix depreciation_amount calculation 2021-06-19 13:45:37 +05:30