Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,196 Commits 3 Branches 0 Tags
Commit Graph

5667 Commits

Author SHA1 Message Date
Sagar Sharma
60befcd8a8
Merge branch 'develop' into fix/quality-inspection/status 2022-10-08 13:34:21 +05:30
Sagar Sharma
4992e4a2b8 fix(test): test_rejected_qi_validation 2022-10-08 13:33:36 +05:30
Sagar Sharma
fcc1272d42 test: add test cases for Quality Inspection status 2022-10-08 13:33:36 +05:30
Sagar Sharma
2657ece2cd fix: set Quality Inspection status based on readings status 2022-10-08 13:33:22 +05:30
rohitwaghchaure
73a9791401
Merge branch 'develop' into provision-to-return-components 2022-10-07 23:50:05 +05:30
Rohit Waghchaure
d59ed24e6c feat: provision to return non consumed components against the work order 2022-10-07 22:45:53 +05:30
Sagar Sharma
d7c3b7633a fix: make readings status mandatory in Quality Inspection 2022-10-06 22:36:37 +05:30
Ankush Menat
8376fbc982
fix: Explicitly update modified (#32519) 
* fix: Explicitly update modified

required after https://github.com/frappe/frappe/pull/18301

* chore: fix broken translations
 2022-10-06 20:35:33 +05:30
Deepesh Garg
fbdd1f39e7
Merge pull request #32499 from rohitwaghchaure/fixed-TooManyWritesError-for-reposting 
fix: TooManyWritesError during reposting of stock
 2022-10-05 16:05:12 +05:30
Rohit Waghchaure
aaabba9b1e fix: TooManyWritesError during reposting of stock 2022-10-05 10:58:21 +05:30
Sagar Sharma
39707757a6 chore: add Manual Inspection field in Quality Inspection DocType 2022-10-04 23:16:16 +05:30
Sagar Sharma
e295d0c091
Merge branch 'develop' into fix/pick-list/picked-qty 2022-10-03 14:20:05 +05:30
Sagar Sharma
ba02209f1d fix: pick list picked-qty for batch item 2022-10-03 14:12:42 +05:30
Rohit Waghchaure
0b1727cf79 fix: not able to return sold expired batches 2022-10-03 12:06:32 +05:30
Sagar Sharma
ca2958a999
Merge branch 'develop' into fix/item/update-stock 2022-09-30 16:36:46 +05:30
Sagar Sharma
6d0842465b fix: don't allow to update Maintain Stock if the item has a BOM 2022-09-30 15:18:10 +05:30
Sagar Sharma
774097bd10
Merge branch 'develop' into item_dashboard_create_new 2022-09-30 12:37:58 +05:30
Rohit Waghchaure
3656f7d06f test: added test case 2022-09-29 14:01:51 +05:30
Deepesh Garg
0439e41a44 fix: Item details fetching on making transaction from item dashboard 2022-09-28 14:54:53 +05:30
Sagar Sharma
376febb9d1
Merge branch 'develop' into fix/work-order/finish-button 2022-09-27 15:36:15 +05:30
Rohit Waghchaure
a4a86ee23f fix: allow to return expired batches using purchase return 2022-09-27 13:55:27 +05:30
Sagar Sharma
9049db41ae fix: For Quantity error msg in Stock Entry 2022-09-27 12:00:50 +05:30
hendrik
f41d1500b0
fix: report chart field type 
* fix: report chart field type

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2022-09-26 17:47:24 +05:30
Sagar Sharma
afb323b01c
Merge branch 'develop' into refactor/stock/report/incorrect-stock-value 2022-09-26 17:09:22 +05:30
Sagar Sharma
b93331e844 refactor: rewrite Incorrect Stock Value Report queries in QB 2022-09-26 09:44:29 +05:30
Sagar Sharma
22299d2382 refactor: rewrite Item Price Stock Report queries in QB 2022-09-26 09:40:49 +05:30
Deepesh Garg
d4b01f6ffd Merge branch 'develop' of https://github.com/frappe/erpnext into fix-remove-no-copy-for-ignore_pricing_rule 2022-09-20 14:58:48 +05:30
Sagar Sharma
3dc754cac2 test: add test cases for Item Shortage Report 2022-09-20 10:48:05 +05:30
Sagar Sharma
f0a78aa559 refactor: rewrite Item Shortage Report queries in QB 2022-09-20 10:47:55 +05:30
Sagar Sharma
3a9c08e7c9 fix: po_detail or sco_rm_detail not getting set while while mapping SE 2022-09-19 18:47:46 +05:30
Sagar Sharma
b90875575c fix: make po_detail or sco_rm_detail mandatory for SE Send to Subcontractor 2022-09-18 11:37:07 +05:30
Sagar Sharma
2f97370b8e fix: sco_rm_detail in Stock Entry 2022-09-17 14:29:42 +05:30
Maharshi Patel
8c5b420aea fix: remove no_copy for ignore_pricing_rule 2022-09-16 18:26:00 +05:30
Nabin Hait
a5b5885933 fix: test cases 2022-09-15 11:19:14 +05:30
Sagar Sharma
bf1fa014f4 test: add test case for item master maintain-stock 2022-09-13 22:12:56 +05:30
Sagar Sharma
7b878ea3d8 fix: unknown column error while updating value of maintain-stock in item master 2022-09-13 21:52:58 +05:30
Nabin Hait
e24a4b18c4 Merge branch 'SaiFi0102-asset-capitalization' into develop 2022-09-13 15:00:21 +05:30
Nabin Hait
58d430fe3e feat: Asset Capitalization 
- manual selection of entry type
- GLE cleanup with smaller functions
- GLE considering periodical inventory
- test cases
 2022-09-13 14:56:21 +05:30
Ankush Menat
fffc245922
fix(UX): make Item attachments public by default (#32196) 2022-09-13 13:41:00 +05:30
Ahmad
4f1cc41b86 fix: pick_list - picked qty getting set to 1 
(cherry picked from commit 3256e2b8b7cee0e7b95ca58a6f22f96090e2ffaa)
 2022-09-12 16:49:45 +00:00
rohitwaghchaure
8f787c08a2
fix: customer code max characters limit issue (#32177) 2022-09-12 16:48:53 +05:30
Sagar Sharma
2e314a20f1
Merge branch 'develop' into fix/stock-entry/sco 2022-09-09 13:48:14 +05:30
Sagar Sharma
9a3dcb9ad1 fix: validate Subcontracting Order in Stock Entry 2022-09-09 13:46:50 +05:30
Sagar Sharma
30909a9b79 fix: status filter for Subcontracting Order in Stock Entry 2022-09-09 13:45:31 +05:30
Sagar Sharma
b49caf170c
Merge branch 'develop' into fix/v14/stock-entry/send-to-subcontractor 2022-09-09 11:37:12 +05:30
Rohit Waghchaure
a03b4ce213 fix: reposting not working for internal transferred purchase receipt 2022-09-08 19:16:00 +05:30
rohitwaghchaure
72d5366e96
Merge pull request #31918 from s-aga-r/fix/subcontracting-receipt/gl-entries 
fix: Subcontracting Receipt GL Entries
 2022-09-08 10:17:12 +05:30
Rohit Waghchaure
f1c4aea7b5 fix: option to start reposting from repost item valuation 2022-09-07 16:38:17 +05:30
Sagar Sharma
f19049e643
Merge branch 'develop' into fix/subcontracting-receipt/gl-entries 2022-09-07 14:55:56 +05:30
Sagar Sharma
01c2e4d2cf
Merge branch 'develop' into fix/v14/stock-entry/send-to-subcontractor 2022-09-07 14:52:16 +05:30