Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,698 Commits 3 Branches 0 Tags 1 GiB
8396f24e70
Commit Graph

38698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saqib
08c269510e
Merge branch 'develop' into pos-fixes-9 2021-06-23 10:15:07 +05:30
GangaManoj
8127208774 fix(Sales Invoice): Reset Asset status on issuing Credit Note 2021-06-22 23:12:56 +05:30
GangaManoj
721ff9438a Merge branch 'develop' into asset-credit-note 2021-06-22 22:45:11 +05:30
marination
ea2c02738d fix: Include Stock Reco logic in update_qty_in_future_sle 2021-06-22 21:44:50 +05:30
Saqib Ansari
75ce023170 fix: hide images from cart & details 2021-06-22 21:18:44 +05:30
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
GangaManoj
2e45965405 fix(Asset Repair): Fix Sider issues 2021-06-22 17:24:14 +05:30
GangaManoj
859c8c92f7 fix: Remove changes made to Asset Maintenance 2021-06-22 17:16:12 +05:30
Subin Tom
a446d61e10 fix: Changed profitability analysis report width 2021-06-22 16:51:15 +05:30
GangaManoj
2ea325c0c3 fix(Asset Repair): Revert Stock Entry on cancellation 2021-06-22 16:33:10 +05:30
Subin Tom
219a87d530
fix: disable sales order cancellation if linked to draft invoice (#26125) 2021-06-22 16:28:58 +05:30
GangaManoj
3a44d88866 fix(Asset): Fix tests for Asset Repair 2021-06-22 16:28:29 +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
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
Rucha Mahabal
cce19db826 feat: org chart mobile interactions 2021-06-21 21:55:50 +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