Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,781 Commits 3 Branches 0 Tags 1 GiB
78ccbe24a3
Commit Graph

728 Commits

Author SHA1 Message Date
Nabin Hait
78ccbe24a3 fix(test): BOM raw materials rate from price list as per uom 2019-01-16 16:00:25 +05:30
Nabin Hait
158e7dcd8b fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM 2019-01-16 16:00:25 +05:30
Nabin Hait
3dde949419 feat(mr_against_so): Merge same items from different BOMs 2019-01-16 15:59:39 +05:30
Sahil Khan
693e81db48 more bis fixes 2019-01-16 15:59:39 +05:30
Sahil Khan
34766c0c50 BIS issue fixes 2019-01-16 15:59:39 +05:30
Sagar Vora
7d60c03ed9
Merge branch 'staging-fixes' into pplan_fix 2019-01-07 15:54:16 +05:30
Rohit Waghchaure
df4fe922c0 [Fix] Duplicate fieldnames operation and allow_alternative_item in BOM Item 2018-12-28 16:46:36 +05:30
Rohit Waghchaure
8406720a7a [Fix] Patch rename_bom_wo_fields 2018-12-26 16:25:44 +05:30
rohitwaghchaure
4265c5a772 Rename BOM and Work order fields (#16209) 
* Rename BOM and Work order fields

* Rearranged BOM fields
 2018-12-24 14:38:49 +05:30
Nabin Hait
614559f234 fix(pro-plan): Actual Qty of RM considering children in case source warehouse is a group warehouse 2018-12-13 16:36:35 +01:00
Zlash65
82e01bc923 fix fetch material request items logic 2018-12-13 18:31:05 +05:30
Rohit Waghchaure
57633b75ed [Fix] Transferred qty cannot be null 2018-12-10 17:36:01 +05:30
Nabin Hait
c5064069c7
Merge branch 'staging-fixes' into manufacturing_settings_permissions_issue 2018-11-26 20:23:11 +05:30
Rohit Waghchaure
15ed7a6351 [Fix] No permission for Manufacturing Settings 2018-11-26 17:31:18 +05:30
Nabin Hait
2508d11097 fix(test): Test cases fixed 2018-11-26 11:05:28 +05:30
Rohit Waghchaure
917dda1b76 [Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually 2018-11-14 01:18:41 +05:30
Alchez
6f1fd193eb fix(production_plan): Allow work orders to be cancelled (#15955) 2018-11-13 11:47:23 +05:30
Shreya Shah
89974b221d [Feature] Create Raw Material Request from Sales Order (#15452) 
* Add new button to Sales Order form - Request for Raw Materials

* Modify get_work_order_items function

* Commonify functions in Production Plan to make it compatible with new feature

* Create and submit Material Request from Sales Order

* Link Sales Order with Material Request

* Minor

* Rename label

* Fix Codacy

* Modify as per review suggestions

- Move dialog to a new function
- Move checkboxes below other fields

* Minor changes

* Check for permissions

* Add common checkboxes for all items

* Fix codacy

* fix: Travis

* fix: Use variable to store query result

* fix: Add comment before fetching exploded items

* refactor: Break into multiple functions

* test: Add test case
 2018-11-13 11:15:03 +05:30
Ameya Shenoy
42928f978b fix: work order item sorting (#15967) 2018-11-13 11:04:17 +05:30
Alchez
bf20be53ef fix(bom): Display item name in new BOM form (#15783) 2018-11-08 12:54:20 +05:30
Ameya Shenoy
77b60928bf
Merge branch 'master' into staging-fixes 2018-10-17 09:39:31 +00:00
Nabin Hait
44ec05f79b
fix(bom): deadlock issue via bom replace tool (#15694) 2018-10-15 18:56:16 +05:30
Stavros Anastasiadis
a398d6bf4f Allow Same Item Multiple Items (#15657) 2018-10-11 16:25:37 +05:30
rohitwaghchaure
5e466bace4 Removed update_job_card_reference method (#15614) 2018-10-08 12:36:45 +05:30
Rohit Waghchaure
9f2859701e [Fix] WorkOrderItem object has no attribute operation 2018-10-04 13:25:49 +05:30
Ameya Shenoy
9d3a97fd15
Merge branch 'master' into staging-fixes 2018-09-26 07:28:53 +00:00
rohitwaghchaure
fafc277666 [Fix] BOM update tool, too many writes in one request. Please send smaller requests (#15432) 2018-09-25 18:59:20 +05:30
JC
31f2c1c3d3 fix ‘BOMItem’ object has no attribute ‘operation’ error in bench run-tests --doctype ‘BOM’ (#15423) 2018-09-18 10:47:27 +05:30
Govind S Menokee
d38160c816 [FIX] Remove deprecated gen_object.next() function (#15418) 
BOM tree view was getting impacted due to use of a deprecated function.
This fix replaces deprecated object.next() function with next(gen_object).
 2018-09-18 10:42:21 +05:30
Zarrar
e79e4cb9b1 python 2-3 fix, *.keys() return dict_keys object in py3 (#15409) 2018-09-17 10:56:42 +05:30
Saurabh
393dd4286a [resolved] merge-conflicts 2018-09-12 14:48:30 +05:30
Nabin Hait
e11f299b21
Update production_order.py 2018-09-11 11:36:05 +05:30
rohitwaghchaure
3cc77b52e7 [Fix] Timeout error for bom update tool (#15343) 2018-09-07 16:16:58 +05:30
rohitwaghchaure
32dc3bf082 [Enhance] Job Card (#15244) 
* [Enhance] Added job card against the work order

* removed work order from timesheet

* Fixed codacy

* Added patch to make job card from the timesheet

* Timer in job card

* Dates validation in job card

* Added button to make job card from work order

* Added sub-assembly operation in the work order
 2018-09-06 19:21:48 +05:30
Nabin Hait
4e187e88f8 ignore non stock items in stock entry against work order 2018-09-01 18:15:33 +05:30
Rushabh Mehta
49f9747385 major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc (#15267) 
* major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc

* fix: remove debug
 2018-08-30 18:50:48 +05:30
Rushabh Mehta
13bcc4e27e perms: fix default import, export perms 2018-08-29 17:10:27 +05:30
Shreya Shah
a5add289bb Refactor Naming Series (#15070) 
* Patch to create Property Setter for existing naming series

* Update existing naming series options with new

* Add patch link to patches.txt

* Update patch

* Fix codacy

* Fix as per suggestions

* Remove old patch for property setter

* Improve as per suggested

- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname

* Fix Travis

* Rebase with develop
 2018-08-28 13:44:48 +05:30
rohitwaghchaure
c5cf428d00 [Enhance] Provision to backflush raw materials from WIP warehouse (#15184) 2018-08-24 11:27:41 +05:30
Nabin Hait
8fe8d1758a Permissions issue in BOM tree 2018-08-23 16:25:51 +05:30
Rushabh Mehta
708e47aadf optimize(various) 2018-08-08 16:37:31 +05:30
KanchanChauhan
0c3d345a9f [Minor] Moved mandatory Company field from More Information section to top (#14950) 2018-07-19 14:39:31 +05:30
rohitwaghchaure
526ab2ca30 [enhance] Allow transfer for manufacture in the BOM (#14891) 
* [enhance] Allow transfer for maufacture in the BOM

* Added patch

* Fix codacy

* Fixed typo and added test cases
 2018-07-15 20:04:41 +05:30
Saurabh
1cfcf70905 Resolved merge conflicts 2018-07-06 13:18:44 +05:30
Nabin Hait
d4453aef68 Fixed permission issue 2018-07-04 16:38:10 +05:30
rohitwaghchaure
205eae322b [Fix] BOM replace timeout issue (#14782) 2018-07-03 15:06:38 +05:30
rohitwaghchaure
e27b85de4f Added test cases for Overproduction against Work Order / Sales Order (#14704) 2018-06-28 12:48:28 +05:30
Shreya
32b57da335 Make supplier_name and customer_name fields read only 2018-06-27 15:20:33 +05:30
Shreya
18bed504dc Set target qty 0 
If the ordered qty exceeds the quantity in blanket order items, on routing to a new Purchase order or Sales order, set target qty as 0 to avoid negative qty.
 2018-06-27 15:14:43 +05:30
Ameya Shenoy
22c2f472e3
Merge branch 'master' into develop 2018-06-15 09:35:06 +00:00