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

879 Commits

Author SHA1 Message Date
Rohan
ee5f0f7c30
Merge branch 'develop' into dev-work-order-bugs 2019-10-22 17:12:00 +05:30
Anurag Mishra
b7e9e2a1a5 fix: if naming if item-code and index both are same (#19371) 2019-10-22 11:47:03 +05:30
Deepesh Garg
4821f38d25 fix: Item Price changes are not persistent after updating cost on submitted BOM (#19356) 2019-10-21 13:27:40 +05:30
Rohan
d389ee457c
Merge branch 'develop' into dev-work-order-bugs 2019-10-16 15:08:58 +05:30
Mangesh-Khairnar
4ed9b45fb8 feat(Sales Order): Allow to skip delivery note creation (#19222) 
* feat(sales-order): add option to skip delivery note creation for order type maintenance

* fix(sales-order): hide delivery date on setting skip delivery note creation

* fix: allow skipping delivery note for all order types

* fix: bypass delivery note creation on setting skip delivery note creation

* fix: show skip delivery note in list view

* fix: check for duplicate project name after submitting prompt

* fix:  toggle delivery note reqd for skip delivery note

* fix: update status based on skip delivery note
 2019-10-12 19:33:11 +05:30
rohitwaghchaure
86870b0aa6 fix: production plan not showing grand total against sales order (#19283) 2019-10-12 16:49:38 +05:30
rohitwaghchaure
a0c162c2d6 fix: project has not set in the sub assembly work order from production plan (#19284) 2019-10-12 16:48:57 +05:30
Rohan
d8cbbc7d65
Merge branch 'develop' into dev-work-order-bugs 2019-10-10 17:47:31 +05:30
Shivam Mishra
ba2faecdc7 fix: null check for valuation rate (#19195) 
* fix: null check for valuatiomn rate

* fix: add rate for item in test records

* refactor: use flt instead of throwing error

* Revert "fix: add rate for item in test records"

This reverts commit f8cebe65f5fe32382aba842f765d263511cbb082.
 2019-10-04 11:58:04 +05:30
rohitwaghchaure
f4245a2d9c minor: show BOM related operations (#19237) 2019-10-03 11:41:36 +05:30
Marica
de15cc1387 fix: Work order dialog box 'Select Quantity' on clicking 'Finish' (#19136) 
The dialog box fetched 0 as Quantity to Manufacture and Max Quantity on finishing a Work Order
 2019-09-30 15:36:33 +05:30
rohitwaghchaure
8d889ef80e fix: update the pending qty in production plan on completion of work order (#19180) 2019-09-30 15:22:12 +05:30
Rohan
60b852bb12
Merge branch 'develop' into dev-work-order-bugs 2019-09-30 13:08:12 +05:30
Rucha Mahabal
34326470b8 fix: produced_qty field hidden and not updated in sales order item (#19037) 
* fix: produced_qty field hidden and not updated in sales order item

* fix: added patch for old sales orders

* fix: produced_qty for sales order item linked to multiple work orders

* fix: comment

* fix: function for updating produced_qty in SO Item

* fix: remove frappe.db.commit
 2019-09-30 12:15:39 +05:30
Rohan
a51a304cf0
Merge branch 'develop' into dev-work-order-bugs 2019-09-24 11:53:00 +05:30
Rohan
8a097c8627 fix: only set times if job card is filled (#19107) 2019-09-18 20:05:49 +05:30
rohitwaghchaure
780fb8a4e5 fix: set stock adjustment account for the raw materials instead of COGS (#19090) 2019-09-17 18:46:49 +05:30
Nabin Hait
57835f0a37
fix: Company is required to get bin details (#19058) 2019-09-16 14:48:16 +05:30
Rohan
a656151ee9 fix: operating cost calculation in JS 2019-09-12 16:00:25 +05:30
rohitwaghchaure
bb736248a2 fix: incorrect qty calculation in the production plan fopr the sub assembely work orders (#18970) 2019-09-11 10:20:49 +05:30
Nabin Hait
4726fc4893 fix: Deleted unwanted production order files 2019-09-06 15:45:17 +05:30
Rohan
1635967c4e fix: attribute error when trying to fetch items (#18900) 2019-09-05 12:16:49 +05:30
Suraj Shetty
88885184dc fix: Show separate button for pick list creation in work order 2019-08-30 09:30:18 +05:30
Suraj Shetty
a6ab00162e style: Remove commented code 2019-08-29 20:17:04 +05:30
Suraj Shetty
55a2699f4c fix: Update dashboard of doctypes that are linked with pick list 2019-08-29 09:14:27 +05:30
Suraj Shetty
f455c92d02 fix: Remove Pick List Reference Item use Item locations table instead 2019-08-28 17:44:22 +05:30
Suraj Shetty
be0ae7a430 fix: Doctype changes 
- Check no copy for work order series field
- Add dashboard
- Set naming_series for pick list
 2019-08-28 12:40:26 +05:30
Suraj Shetty
457da47dba fix: set for_qty instead of pick_list 2019-08-26 10:05:35 +05:30
Suraj Shetty
2b9e256002 fix: Rename method name 2019-08-26 10:05:01 +05:30
Suraj Shetty
05f243590d fix: Show option to create pick list or work order 2019-08-26 09:29:31 +05:30
Suraj Shetty
8d55f81baa fix: Fix raw matterial selection based on finished item qty 2019-08-22 16:37:44 +05:30
Suraj Shetty
da2a623e38 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-21 11:48:27 +05:30
Suraj Shetty
d79a16c9f3 fix: Warehouse selection login 
- Rename item_loactions -> locations, reference_items -> items
- Add customer and work_order field
- fix "Get Items" button UX
- fix get_pending_work_orders query

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-08-21 09:03:26 +05:30
Suraj Shetty
1a090432d9 fix: Quantity while creating pick list from work order 
- Fix get_mapped_doc config to filter items
- Fix erroneous condition in get_mapped_doc used for creation of pick_list
in sales order

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-08-20 12:04:07 +05:30
Suraj Shetty
e047de854b Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-09 11:14:14 +05:30
Deepesh Garg
7638301d01
Merge pull request #18527 from netchampfaris/bom-comparison-tool 
feat: BOM Comparison Tool
 2019-08-05 11:58:46 +05:30
rohitwaghchaure
9601b6c601 feat: added checkbox 'Update Consumed Material Cost In Project' in work order to don't update the consumed material cost in the project for the subassembely work orders (#18533) 2019-08-05 10:40:23 +05:30
Deepesh Garg
fb5aa43e77 fix: Type error handling while getting material request items (#18549) 
* fix: Type error handling while getting material request items

* fix: Remove flt
 2019-08-05 10:12:42 +05:30
Deepesh Garg
713d4bb1ba fix: Type error handling while getting material request items (#18550) 
* fix: Type error handling while getting material request items

* fix: Remove flt
 2019-08-05 10:12:17 +05:30
Suraj Shetty
6fd3a86012 fix: Option to create pick list from work order 2019-08-02 16:48:31 +05:30
Suraj Shetty
b35c0410b1 fix: Add option to get items from work order 2019-08-02 08:12:30 +05:30
Faris Ansari
a4ada93834 fix: Field labels 2019-07-30 17:11:34 +05:30
Faris Ansari
1214e2d2a4 feat: BOM Comparison Tool 2019-07-30 16:54:46 +05:30
rohitwaghchaure
5be91173a1
Merge pull request #18108 from kaynes-technology/batch_bom_operations 
feat: Add batch operation times in BOM Operation
 2019-07-22 11:26:19 +05:30
Salmanmulani
b752acf803
fix: added default value for projected_qty in bin_dict 
`projected_qty` if not in `bin_dict` would return None. And when compared to an integer would result in a TypeError.

This PR fixes this

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
 2019-07-19 11:44:49 +05:30
Govind S Menokee
ce42c53c1c
Merge branch 'develop' into batch_bom_operations 2019-07-17 22:40:02 +05:30
Govind S Menokee
2ab9947647
Merge branch 'develop' into batch_bom_operations 2019-07-16 02:12:24 +05:30
Govind S Menokee
7d9d027bfe feat: update modified to fetch latest state in patches 2019-07-16 02:01:27 +05:30
Rohit Waghchaure
c67743b1f8 fix: description set in the bom not pulled in the material request 2019-07-16 01:27:26 +05:30
Govind S Menokee
14ec76e8d9 feat: remove is_batch_operation from select query 2019-07-14 23:06:10 +05:30