Saqib Ansari
3b225b13e8
refactor(pos): use pos invoice item name as unique identifier
2021-06-22 21:18:20 +05:30
Deepesh Garg
dc6e4f12c6
Merge pull request #26076 from nextchamp-saqib/export-round-off-fix
...
fix(e-invoicing): IRN generation for export invoices with round off
2021-06-22 20:45:24 +05:30
Deepesh Garg
7b0d86ead5
fix: Do not show received amount after tax for internal tarnsfers
2021-06-22 20:38:35 +05:30
Deepesh Garg
2af8c171c1
fix: Taxes on Internal Transfer payment entry
2021-06-22 19:48:08 +05:30
Noah Jacob
ce72d0c2c1
fix: fixed rounding off ordered percent to 100 in condition ( #26148 )
2021-06-22 17:54:16 +05:30
Noah Jacob
c05496a5a7
fix: fixed rounding off ordered percent to 100 in condition ( #26152 )
2021-06-22 17:53:53 +05:30
Subin Tom
a446d61e10
fix: Changed profitability analysis report width
2021-06-22 16:51:15 +05:30
Subin Tom
219a87d530
fix: disable sales order cancellation if linked to draft invoice ( #26125 )
2021-06-22 16:28:58 +05:30
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
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
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
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
rohitwaghchaure
6a07869e55
Update production_plan.js
2021-06-21 15:41:30 +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
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
Rohit Waghchaure
01faa9ca11
fix: rate not able to change in purchase order
2021-06-21 14:56:38 +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
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
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
