Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,955 Commits 3 Branches 0 Tags 1 GiB
5abccc1a61
Commit Graph

1066 Commits

Author SHA1 Message Date
Alchez
31ab64822c Make the item UOM more visible (#14315) 2018-06-05 10:35:55 +05:30
rohitwaghchaure
05152dad0b [Enhance] Provision to set overproduction percentage for work order (#14248) 2018-05-30 15:28:09 +05:30
Suraj Shetty
084b0b3a67 Treeview permission (#14232) 
* Replace frappe.db.sql to frappe.get_list to apply permissions (#14037)

* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace

* Add parent filter

* Add ifnull checks
 2018-05-26 09:12:59 +05:30
Nabin Hait
b903fc4e71 Item defaults query fixes 2018-05-24 17:07:51 +05:30
neckos
225af4a4cb unicode error in python3 (#14192) 2018-05-23 19:43:53 +05:30
Nabin Hait
5f861756a2 Item Default fixes 2018-05-23 19:37:06 +05:30
Prateeksha Singh
b434f2687e [charts] update, without new build system 2018-05-21 18:04:50 +05:30
rohitwaghchaure
eff678d2d6
Merge pull request #13918 from manassolanki/item-level-defualts 
[enhancement] add the item defaults in the child-table for multi-company
 2018-05-16 14:04:47 +05:30
Suraj Shetty
fbb6b3da5f Undo replace of frappe.db.sql with frappe.get_list (#14074) 2018-05-16 13:53:31 +05:30
Rushabh Mehta
0b628386de [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
Manas Solanki
087a2259d9 update for default warehouse 2018-05-16 12:44:07 +05:30
rohitwaghchaure
e48b47fc0c Production Plan, do not consider the sales orders against which work order has been created (#13800) 
* Production Plan, do not consider the sales orders against which work order has been created

* Added test cases
 2018-05-16 11:07:55 +05:30
Doridel Cahanap
e42192bb6c [WIP] Alternative items (#13705) 
* Alternative Items in BOM

* Alternative Items in Work Order
 2018-05-16 10:58:39 +05:30
Suraj Shetty
8501010f12 Replace frappe.db.sql to frappe.get_list to apply permissions (#14037) 
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace
 2018-05-16 10:44:38 +05:30
Shreya
3f77852e93 Pass buying or selling as filter parameters 
Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.
 2018-05-15 17:22:06 +05:30
Faris Ansari
a7387b45ec [fix] Get items from BOM error in python 3 (#14012) 2018-05-14 14:05:52 +05:30
Saurabh
e85a43c1c6 Merge branch 'master' into develop 2018-05-02 14:48:10 +05:30
Shreya
eb54331d5f removed color field from sales order and work order 2018-05-01 18:56:06 +05:30
Shreya
a7b2fc9250 color field for calendar in sales order and work order 2018-05-01 18:55:17 +05:30
Faris Ansari
bd99606a14 Change msgprint to unobtrusive alert 2018-05-01 10:52:02 +05:30
Kanchan Chauhan
7826dd1aeb Typo Fix in Work Order 2018-04-25 13:48:47 +05:30
Doridel Cahanap
ad76f9ad70 [Enhancement] Work Order Material Consumption (#13384) 
* Work Order Material Consumption

* Test cases and other minor fixes

* Test cases fixes

* Travis Fixes

* Work Order Material Consumption Request Changes

* Update work_order.js
 2018-04-09 10:31:28 +05:30
Gaurav Naik
03016e5000 Exploded view for BOM Stock Report (#12506) 
* Multilevel BOM Stock Report prototype

* Rechristened multilevel to exploded view

* Removed trailing whitespace in line 16. Replaced spaces with tabs for indentation

* Used BOM Explosion item in query for exploded view

* Removed trailing whitespaces for Codacy compliance
 2018-03-30 13:03:19 +05:30
Nabin Hait
ff2e4c898a Fixed merge conflict 2018-03-29 13:57:39 +05:30
rohitwaghchaure
badc855400 [Fix] BOM validation issue for scrap item (#13429) 2018-03-29 13:48:38 +05:30
rohitwaghchaure
a3c3dec5a2 [enhance] Item Alternative (#13121) 
* [enhance] Item Alternative

* Added two way provision in item alternative

* Test Cases

* documentation
 2018-03-28 11:51:44 +05:30
Nabin Hait
b9c82b9790 Fixed merge conflict 2018-03-27 14:25:27 +05:30
Shreya Shah
f3025f1596 operation time in grid view (#13400) 2018-03-27 10:34:05 +05:30
Faris Ansari
34dd079a68
Remove unnecessary columns Analytics Reports (#13344) 2018-03-22 11:12:02 +05:30
Zarrar
13ddc7e188 [ Enhance ] Production to Work Order (#12902) 
* remove occurrences of Production Order

* rename from report and jsons

* Change Production Order to Work Order

* change occurences of production order from other files

* resolve minor conflict issues and reports

* patch added

* codacy fix

* updated patches, leftover changes

* rename reports, rectify patches
 2018-03-20 12:38:43 +05:30
Achilles Rasquinha
cbfcb3e61d string_types from basestirng 2018-03-12 19:15:29 +05:30
Nabin Hait
2c7a6e6b43
Reserve for subcontracting (#13195) 
* [fix] #8427

* review comments changes

* Validation for reserved warhouse

* code improvements

* alignment

* test case

* message changes

* default warehouse / remove validation / change sql

* fix

* patch

* Fixed merge conflict

* Fixes and cleanups of reserve qty for subcontracting

* set from_warehouse only if purchase_order and purpose found (#12398)

* [HotFix] Validation issue for subcontract stock entry (#12127)

* [Fix] Validation issue for subcontract stock entry

* Update stock_entry.py

* Fixes and cleanups of reserve qty for subcontracting

* patch fixed

* Reload bin in patch

* [fix] set source warehouse in stock entry for manufacture

* [fix] #8540

* code alignment

* code alignment

* Move target warehouse validation to submit

* validation code improvement

* code changes for single stock entry

* validation fix

* call make_rm_stock_entry

* remove old stock entry method/rewrite test case

* Don't set bom_no against raw materials while trasferring items for sub-contracting

* minor fix
 2018-03-12 14:12:12 +05:30
Prateeksha Singh
9362cf37e0 [charts] update charts API 2018-03-12 09:54:56 +05:30
Achilles Rasquinha
b4de7e3d07 removed has_key, used pythonic in (#13236) 
* removed has_key, used pythonic in

* Update bom.py
 2018-03-09 12:35:47 +05:30
Nabin Hait
c43c95e0aa Fixed merge conflict 2018-03-05 14:54:44 +05:30
rohitwaghchaure
a942722619 [Fix] Timeout issue while saving multilevel BOM (#13118) 2018-03-01 13:15:25 +05:30
Zarrar
502af4dd67 display image fnd description for root BOM also (#13099) 2018-03-01 10:44:47 +05:30
Achilles Rasquinha
646522886c self.assertEqual 2018-02-28 21:13:51 +05:30
Achilles Rasquinha
a3555aa7bd [FIX] sorting multiple compares 2018-02-23 17:22:07 +05:30
Nabin Hait
cf72d7f135 Fixed merge conflict 2018-02-22 14:47:26 +05:30
rohitwaghchaure
23a2b65576 [Fix] BOM Update Tool not update grandparent's exploded BOM (#13026) 2018-02-22 11:32:09 +05:30
rohitwaghchaure
4e8fdf7b3f [Enhance] Quality Inspection Template (#12988) 
* [Enhance] Quality Inspection Template

* Test case and patch

* Update make_quality_inspection_template.py
 2018-02-22 11:03:48 +05:30
Zarrar
67f74414c4 disable expand_all button for BOM (#13015) 2018-02-21 14:46:41 +05:30
rohitwaghchaure
e2558308f6 [enhance] Production Plan (#12160) 
* [enhance] Production plan

* Test cases

* Removed production planning tool

* Documentation

* Added actual qty in material request production item

* Renamed field 'Use Multilevel BOM' to 'Include Exploded Items'
 2018-02-20 12:20:00 +05:30
rohitwaghchaure
5a5f73e46a
Merge pull request #12602 from PawanMeh/fixes_8540 
Select multiple raw material items for Sub Contract Stock Entries
 2018-02-15 18:54:29 +05:30
Saurabh
2735701aab resolved merge conflicts 2018-02-14 11:51:09 +05:30
Faris Ansari
5a91989665 Remove total_projected_qty (#12889) 2018-02-13 16:00:52 +05:30
Achilles Rasquinha
56b2e12af8 Python 3 fixes [merge asap] (#12884) 
* Python 3 fixes

* fixed compare
 2018-02-13 14:42:40 +05:30
rohitwaghchaure
7477899d2e Formatter, code cleanup (#12852) 2018-02-12 11:25:58 +05:30
pawan
5f779eb805 validation fix 2018-02-08 09:07:58 +05:30
pawan
2b885beaee code changes for single stock entry 2018-02-07 19:06:18 +05:30
Nabin Hait
2ef1f84041 Fixed merge conflict 2018-02-03 09:14:53 +05:30
Nabin Hait
2aba97bff1 Fetch items from BOM in Material Request 2018-02-01 18:52:50 +05:30
Nabin Hait
ec2c9ec897 Merge branch 'master' into develop 2018-01-31 15:39:16 +05:30
Zarrar
dea99cc3a8 treeview not set when routed from bom form (#12707) 2018-01-31 13:07:04 +05:30
Nabin Hait
dba5e7645b Minor fix in old patch 2018-01-30 16:38:47 +05:30
Rohit Waghchaure
c987500e08 Merge branch 'master' into develop 2018-01-19 13:29:57 +05:30
Rohit Waghchaure
2f3ad64bd6 [Fix] Precision issue while making material requests from production planning tool 2018-01-19 12:47:55 +05:30
Gaurav Naik
dc0db3a652 Exploded view for BOM Stock Report (#12506) 
* Multilevel BOM Stock Report prototype

* Rechristened multilevel to exploded view

* Removed trailing whitespace in line 16. Replaced spaces with tabs for indentation

* Used BOM Explosion item in query for exploded view

* Removed trailing whitespaces for Codacy compliance
 2018-01-17 16:12:55 +05:30
Manas Solanki
b19fd57043 [fix] set required quantity if item in bom found (#12460) 2018-01-12 16:28:30 +05:30
Saurabh
15d53c7912 [fix] key error (#12257) 2018-01-01 16:17:14 +05:30
rohitwaghchaure
a84d38999c [Fix] Sales order erased on production order on selection of sales order (#12225) 2017-12-28 18:45:27 +05:30
Nabin Hait
92615901a7 Fixed merge conflict 2017-12-25 13:41:04 +05:30
rohitwaghchaure
d8c6449f3a [Fix] Bom raw materials not in order in the stock entry (#12149) 2017-12-25 11:26:40 +05:30
Ameya Shenoy
87b7844ae8 [Agri] Item amount set on item set (#12091) 
* [Agri] Item amount set on item set

- closes #12008
- fixes #12010

* used frappe.call instead of frm.call in crop

* made modifications for sql query for BOM Item

- done since Crop doctype in Agri module also uses 'BOM Item' child table

* hide BOM no from BOM Item childtable in Crop
 2017-12-20 12:00:24 +05:30
Nabin Hait
13435dddcc BOM: Fetch valuation rate of raw materials from Item master if not found based on SLE 2017-12-15 15:46:43 +05:30
rohitwaghchaure
40f5d8edd4 [fix] Pull subcontracted item if subassembly is not defined (#11996) 2017-12-13 18:51:05 +05:30
Nabin Hait
0f97eda7c9 Merge branch 'master' into develop 2017-12-12 19:17:53 +05:30
Maxwell Morais
d06b7049c7 Allow manufacturing order from SO with Packed Items that contains BOM's (#11947) 2017-12-12 14:46:16 +05:30
Nabin Hait
de1e29bf1b
Production Order fixes (#11951) 
* Production Order from Sales Order fixes: Validate SO and set required items on save

* Codacy fixes
 2017-12-12 13:22:48 +05:30
Zarrar
17fd6610dc Fix travis (#11882) 
* fieldname wrong

* bifurcated test into two - error when both were running async

* minor fixes with link and route

* move school domain rename up

* fix async creation of operations test

* edit-in-full-page is button, not link

* set_route issue in production order test

* minor changes

* fix task tree test

* more fixes

* fix server side issue

* improvising ui tests
 2017-12-08 14:57:38 +05:30
Zarrar
5e470f757f [Fix] Filter on child table not working in Calendar (#11824) 
* use the new get_events method

* using the common get_events method for calendar_view

* using add_fetch to fill customer_name
 2017-12-04 11:22:25 +05:30
Zarrar
c43c5cae5a Set query sales order (#11772) 
* set_query for sales order based on production_item

* codacy fix

* check in packed item to fetch sales order

* Update production_order.py
 2017-11-29 13:54:35 +05:30
Saurabh
b750b304dd fixed merge-conflicts 2017-11-28 11:02:28 +05:30
Saurabh
9d0092f89a [fix] pull source warehouse from production order child table (#11718) 2017-11-27 12:04:41 +05:30
Shreya Shah
e3d6d21ec5 [Fix] Item name and description in production order (#11723) 
* fetch item name and description from bom

* Update production_order.py

* patch added

* Update set_item_name_in_production_order.py
 2017-11-27 12:02:13 +05:30
Nabin Hait
1c4653ed97
Merge branch 'develop' into payment-terms 2017-11-17 12:41:56 +05:30
Nabin Hait
b55e98570f Minor fixes 2017-11-14 17:40:30 +05:30
tunde
ffa659fd2c Merge branch 'develop' into payment-terms 2017-11-14 09:59:45 +01:00
Rushabh Mehta
4313326ba0
[fix] treeview for tasks (#11515) 
[fix] treeview for tasks
 2017-11-10 18:52:21 +05:30
Sushant Nadkar
72c40f0383 Enabled track seen for Sales Order, Sales Invoice, Production Order, and Delivery Note (#11440) 2017-11-08 11:35:46 +05:30
KanchanChauhan
21f946f365 [Minor] Source Warehouse should be filtered by Company in Production Order (#11376) 2017-10-31 12:59:45 +05:30
Prateeksha Singh
6b26e391b8 use the new frappe charts :D (#11391) 2017-10-31 12:58:48 +05:30
tunde
14e97ce0c8 Merge branch 'develop' into payment-terms 2017-10-26 13:35:42 +01:00
rohitwaghchaure
e02ee898e9 [Fix] Production order not displaying in the calendar view, if po has no operations (#11328) 2017-10-25 17:04:31 +05:30
Nabin Hait
4d22b6db30 Fixed Merge Conflict 2017-10-25 14:09:46 +05:30
Nabin Hait
f4283a3ebf Moved company field to the top in BOM (#11283) 2017-10-25 11:46:47 +05:30
tunde
c8d2361b81 Merge branch 'develop' into payment-terms 2017-10-24 12:25:29 +01:00
Nabin Hait
b4f5f14438 Timeout increased for setting __newname (#11252) 
* Timeout increased for setting __newname

* UI test fixes

* fixed ui test for PO

* ui tests

* ui tests

* ui tests

* ui tests

* ui tests
 2017-10-20 11:26:17 +05:30
tunde
09ce68ec19 Merge branch 'develop' into payment-terms 2017-10-19 17:47:31 +01:00
Neil Lasrado
7935d186f9 Auto set warehouses in Production Order if default warehouses are set in Manufacturing Settings and not mentioned in Production Order 2017-10-18 18:16:47 +05:30
Neil Lasrado
af091ac5dd [BUG] Map Production Order with the exact Sales Order line item 2017-10-18 18:16:46 +05:30
Saurabh
5fa2adcca9 Merge branch 'master' into develop 2017-10-18 16:23:44 +05:30
Nabin Hait
5ab6ff2470 [fix] Fetch raw material rate based on last purchase rate (#11205) 
* [fix] Fetch raw material rate based on last purchase rate

* Don't fetch sub-assembly item rate from BOM if not mentioned by the user
 2017-10-18 11:09:11 +05:30
Rushabh Mehta
bc4e2cd9c1 [added] hospitality domain (#11020) 
* [added] hospitality domain

* [tests] wip

* [tests] for restaurant

* [fix] tests for new naming

* [docs] added restaurant docs

* [docs] added restaurant docs
 2017-10-17 12:30:34 +05:30
Prateeksha Singh
bfb108d722 Replace c3 (#11112) 
* [charts] replace in asset.js

* replace in reports
 2017-10-17 12:03:02 +05:30
tunde
37c2b6116c Merge branch 'develop' into payment-terms 2017-10-09 15:42:47 +01:00
mbauskar
966b3c156a [conflicts] resolved merge conflicts 2017-10-09 15:20:30 +05:30
tundebabzy
2622d370c6 deal zero division possibility (#11098) 2017-10-09 12:44:24 +05:30
tunde
d82677f1e6 Merge branch 'develop' into payment-terms 2017-10-06 02:23:45 +01:00
Nabin Hait
395cf4689b Cleanup of schedule date functionality in Material Request 2017-10-05 18:27:37 +05:30
Doridel Cahanap
32456b0f14 [minor edits] BOM Stock Report (#11012) 
* HTML for BOM Stock Report to show filters in PDF

* Added BOM Stock Report in Manufacturing Config under Report
 2017-10-04 15:54:44 +05:30
Nabin Hait
7e5a9f5c0e Update new bom rate while replacing BOM (#11045) 2017-10-04 15:51:34 +05:30
Nabin Hait
b779644493 Merge branch 'master' into develop 2017-10-04 14:52:32 +05:30
Makarand Bauskar
d17bea0a31 [hotfix] check minimum actual start time and actual end time before updating PO Operations (#11041) 
* [hotfix] check minimum actual start time and actual end time before updating PO Operations

* Update production_order.py
 2017-10-04 14:30:12 +05:30
tunde
19e63b73ed Merge branch 'develop' into payment-terms 2017-10-03 12:02:38 +01:00
Nabin Hait
1f10d693e9 Don't set currency as company currency if default currency is different (#11011) 2017-10-02 13:20:51 +05:30
tunde
c49e748c85 Merge branch 'develop' into payment-terms 2017-09-29 13:30:22 +01:00
Nabin Hait
f65e55064b Fixed ui tests for production order 2017-09-29 12:50:37 +01:00
Nabin Hait
6488645d42 Fixed ui tests for production order 2017-09-29 16:38:28 +05:30
Rushabh Mehta
912ae24ca2 Merge branch 'master' into develop 2017-09-29 16:22:02 +05:30
Rushabh Mehta
d3a48a83fd [fix] bom.py, dont use keyword 2017-09-29 15:50:17 +05:30
tunde
3415ac6e9c Merge branch 'develop' into payment-terms 2017-09-29 10:10:24 +01:00
Nabin Hait
c314485d55 Fixes based on test case 2017-09-28 18:55:49 +05:30
tunde
131f0104b0 fix production order ui test 2017-09-28 14:08:25 +01:00
Sunny
73f1c93cd2 fix ppt code 2017-09-28 15:24:11 +08:00
Sunny
0d91d3f572 add schedule_date while creating Material Request 2017-09-28 15:23:52 +08:00
Rushabh Mehta
a0ba5594f9 [fix] production_order.py via error report 2017-09-28 11:26:24 +05:30
Nabin Hait
39c2f75e6d Merge branch 'master' into staging 2017-09-25 16:03:32 +05:30
Nabin Hait
cb5e1e550f Merge branch 'master' into develop 2017-09-25 16:03:31 +05:30
rohitwaghchaure
12fd8a6047 [fix] User not able to complete the production order because of decimal issue (#10868) 2017-09-21 14:39:10 +05:30
Nabin Hait
bd4b80e3d8 Merge branch 'master' into develop 2017-09-19 12:05:41 +05:30
Saurabh
590d401e5f [fix] if bom specified on purchase order item then don't pull default bom in purchase receipt (#10793) 
* [fix] if bom specified on purchase order item then don't pull default bom in purchase receipt

* Update bom.js

* Update stock_entry.py
 2017-09-18 15:49:19 +05:30
Nabin Hait
092f6d3739 Fixes ui tests 2017-09-14 16:45:47 +05:30
mbauskar
ea832b8157 resolved merge conflicts 2017-09-14 15:32:10 +05:30
Nabin Hait
77b225e021 Fetch BOM items in Production Order in the same order as BOM 2017-09-14 13:22:45 +05:30
Nabin Hait
3f583b6dd2 Merge branch 'sort_bom_items' of https://github.com/creamdory/erpnext into creamdory-sort_bom_items 2017-09-14 12:59:31 +05:30
rohitwaghchaure
f8458ed9e4 Merge pull request #10771 from nabinhait/pro_order_99 
Update actual dates in Production Order from Timesheet
 2017-09-14 10:53:48 +05:30
Nabin Hait
c443c9f05d Update actual dates in Production Order from Timesheet 2017-09-13 15:14:40 +05:30
Nabin Hait
f8f29677fd Merge branch 'master' into develop 2017-09-12 16:16:57 +05:30
rohitwaghchaure
67dfd26639 [fix] Production planning tool, unable to download material required report (#10704) 2017-09-12 15:54:27 +05:30
Nabin Hait
499fbe90dc Test case fixed for multi-currency and multi-uom BOM (#10679) 2017-09-05 15:16:32 +05:30
creamdory
05885ca184 Sorting in Production Order BOM Items 2017-09-05 17:02:54 +08:00
Rohit Waghchaure
c872095d76 update rate based on uom conversion factor 2017-09-05 11:25:05 +05:30
Nabin Hait
22cff25bf5 BOM rates as per selected currency and UOM 2017-09-04 18:31:45 +05:30
Aditya Hase
6ccb6562f1 Python 3 compatibility syntax error fixes (#10519) 
* Use Python 3 style print function

* Use 'Exception as e' instead of 'Exception, e'

* Unpack tuple arguments explicitly in instead of relying on auto unpacking

* Use consistent indentation

* Use 0 if stock_frozen_upto_days is None
 2017-08-28 18:17:36 +05:30
Makarand Bauskar
dd8c0febd5 [minor] changed the modified date for bom for rename_bom_update_tool patch (#10509) 2017-08-23 13:17:37 +05:30
rohitwaghchaure
7379e4e5de Merge pull request #10195 from nabinhait/auto_update_bom_cost 
Update BOM cost in all BOMs based on latest rm rate
 2017-08-22 19:14:53 +05:30
Nabin Hait
34c218b2de Minor improvements based on skip_transfer (#10457) 2017-08-22 19:07:16 +05:30
Nabin Hait
6c6e45157b Fixed test case for replace bom 2017-08-22 10:49:58 +05:30
Nabin Hait
52cc08dd2d Test case added for replacing BOM 2017-08-22 10:49:57 +05:30
Nabin Hait
adbf8adfb9 Update BOM cost in all BOMs based on latest rm rate 2017-08-22 10:49:57 +05:30
Ameya Shenoy
c87c1dbbbf converted production tests to INR from USD (#10472) 2017-08-21 14:10:04 +05:30
Zarrar
196b491ac4 [ui test ] Travis failing fix (#10468) 
* Value in assertion was wrong

* Update test_purchase_order_receipt.js
 2017-08-21 08:07:42 +05:30
Vishal Dhayagude
8fd5b325e0 [UI Test] travis.yml modified for fresh UI Test (#10446) 
* [UI Test] travis.yml modified for fresh UI Test

* [fix] travis

* Update test_production_order.js

* Update test_production_order.js

* Update test_purchase_order_receipt.js

* Update tests.txt

* Update test_purchase_order_receipt.js
 2017-08-20 10:59:48 +05:30
mbauskar
2fa8af3b02 Merge branch 'master' into develop 2017-08-14 09:31:01 +05:30
tundebabzy
041b9c3c32 make item name read only and add hide if not saved (#10382) 2017-08-14 09:16:07 +05:30
Ameya Shenoy
4331067e57 [ui-test] completed tests for manufacturing (#10218) 
* modified test_item to include child table assertions

* minor travis fixes

* removed css selectors and used cur_frm
 2017-08-04 10:50:32 +05:30
mbauskar
8b6f7914b0 resolved merge conflicts 2017-07-31 12:30:53 +05:30
Ameya Shenoy
4e91f28ce5 [ui-testing] added test for production order (#10138) 
* temporary commit for switching branches

* [ui-tests] added bill_of_materials test

* added warehouses required for production order

* [ui-test] added production order test

* debugging travis failure
 2017-07-31 11:02:28 +05:30
Rohit Waghchaure
33977827c4 [Fix] Timesheet Company Issue 2017-07-29 14:15:50 +05:30
Rushabh Mehta
d50da78f28 [fixes] errors caught on flake8 (#10126) 2017-07-28 11:39:01 +05:30
Saurabh
36645e4e2f Merge branch 'master' into staging 2017-07-25 16:15:51 +05:30
Saurabh
fb4f320df4 Merge branch 'master' into develop 2017-07-25 16:15:50 +05:30
Ameya Shenoy
08450878f1 [ui-test] added test for bill_of_materials (#10063) 
* temporary commit for switching branches

* [ui-tests] added bill_of_materials test

* fixed minor codacy problems

* added minor requested changes
 2017-07-25 15:23:58 +05:30
Makarand Bauskar
fcaf313c0f [minor] make-demo fixes for manufacturing domain (#10029) 2017-07-25 10:49:35 +05:30
bcornwellmott
1c32f5ace9 Whitelist method for adding production orders ops (#9997) 2017-07-24 22:43:44 +05:30
Ameya Shenoy
91b2833708 [ui-tests] added workstation and operation (#10044) 
* [ui-test] workstation and operation testing added

* [ui-tests] removed unnecessary assertions and used logical names for operations and workstations
 2017-07-24 14:34:30 +05:30
Nabin Hait
8e0f23efc7 Multiple delivery dates in Sales Order and make DN based on selected delivery dates (#9933) 
* Multiple delivery dates in Sales Order and make DN based on selected delivery dates

* Test case and some other minor fixes

* Updated docs for multi delivery date

* removed the trailing whitespace

* removed the trailing whitespace

* removed trailing whitespace
 2017-07-20 10:30:59 +05:30
Nabin Hait
e6c2ae3682 Merge pull request #9940 from rmehta/workstation-form 
[ux] workstation form layout
 2017-07-19 10:24:28 +05:30
Rushabh Mehta
d2d24554b3 [ux] workstation form layout 2017-07-18 22:29:59 +05:30
Ben Cornwell-Mott
c7d2bc67e8 Update qty from stock_qty before validate materials 2017-07-18 08:56:25 -07:00
Nabin Hait
e06526ffff Add indexes in some transaction doctypes (#9889) 2017-07-17 13:28:27 +05:30
Makarand Bauskar
1efb05233c [minor] don't trigger source_warehouse if item_code is not set in Production Order (#9806) 2017-07-12 14:53:14 +05:30
Nabin Hait
f7d2a59c18 Merge pull request #9538 from sagarvora/fix-bom-issue 
[minor] fix bom price resetting on validation
 2017-07-10 20:41:16 +05:30
Nabin Hait
dd7a723214 minor fixes while upgrading an old instance 2017-07-10 16:41:59 +05:30
Nabin Hait
b866fcf14f Finish prod order when skipped material transfer 2017-07-08 12:57:13 +05:30
Manas Solanki
cf7f72e586 frappe call only when there is item 2017-07-07 15:09:57 +05:30
Nabin Hait
e927b81292 Update production_order.js 2017-07-06 23:11:54 +05:30
Nabin Hait
02c8607d04 Production Order Documentation for Required Items table (#9647) 2017-07-06 11:28:07 +05:30
Nabin Hait
37c784eb3a Updated modified in bom doctypes 2017-07-05 16:09:23 +05:30
Nabin Hait
949a920022 Production Order Enhancements (#9432) 
* Production Order Enhancements
  - Show required items child table
  - Source warehouse for each raw materials, in Pro Order Item and BOM Item table
  - Group warehouse allowed for source and wip warehouse
  - Patch to populate required items, to fix status and reserved qty for stopped pro order
  - Cleaned up existing codes
  - Test cases

* Set available qty in source and wip warehouse

* minor fix in bom query naming

* Minor Fixes

* Reload BOM doctypes in patch
 2017-07-05 13:55:41 +05:30
Sagar Vora
7640858510 [minor] fix bom price resetting on validation 2017-06-29 22:20:07 +05:30
rohitwaghchaure
69279229cc Merge pull request #8987 from bcornwellmott/bom_convert_uom 
Added BOM UOM selection for items
 2017-06-28 16:28:31 +05:30
Rohit Waghchaure
5b7028c7bb stock qty not changed if item change 2017-06-28 15:58:51 +05:30
Makarand Bauskar
5e994ddf65 removed white spaces 2017-06-23 17:58:50 +05:30
creamdory
9961fb82d6 Bom Stock Report Change Requests 2017-06-23 15:57:52 +08:00
Makarand Bauskar
0ea5d941e6 Merge branch 'develop' into bom_convert_uom 2017-06-21 21:35:38 +05:30
Sagar Vora
086b6a33ea Fixed BOM value not updating on changing item (#9350) 2017-06-19 12:25:14 +05:30
Ben Cornwell-Mott
2c77165fc6 Fixed small code issues (codecy) 2017-06-16 13:47:40 -07:00
Rushabh Mehta
e0434ad40e Merge branch 'develop' into bom_convert_uom 2017-06-15 17:32:27 +05:30
mbauskar
f9e2bf1ab4 fixed merge conflicts 2017-06-15 13:42:47 +05:30
tundebabzy
f5604c101c Once primary key is generated, do not allow changing Series #8911 (#9265) 
* changes set_only_once field for tabDocField to 1

* changes all affected doctypes `set_only_once` option to 1

* add patch name to text file

* adds test cases

* Revert "add patch name to text file"

This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.

* Revert "changes set_only_once field for tabDocField to 1"

This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
 2017-06-14 16:10:09 +05:30
Sagar Vora
99a2db80ab move bom based rate calculation to end (#9271) 2017-06-14 12:38:27 +05:30
bcornwellmott
d53dd7f4c9 Merge branch 'develop' into bom_convert_uom 2017-06-13 08:40:24 -07:00
tundebabzy
26a39610ca fixes #8941: Better error message for duplicate items (#8968) 
* fixes #8941: Better error message for duplicate items

* gathers all non unique items instead of first encountered non unique item

* renders errored items with `br` instead of `li`
 2017-06-13 17:40:56 +05:30
bcornwellmott
fed9816213 Removed trailing whitespace 2017-06-09 07:37:27 -07:00
bcornwellmott
a35839aa47 Removing unused pprint 2017-06-09 07:36:15 -07:00
bcornwellmott
5491275b66 Merge branch 'develop' into bom_convert_uom 2017-06-07 08:42:54 -07:00
Faris Ansari
5f27c94100 Merge pull request #9078 from netchampfaris/remove-globals 
Lint and fix JS files
 2017-06-06 11:35:42 +05:30
Ben Cornwell-Mott
70fe968f02 Fixed some errors 2017-06-04 20:19:59 -07:00
Ben Cornwell-Mott
a3aa6a4449 Changed Explosion Item as well 2017-06-02 16:54:03 -07:00
Nabin Hait
c9fa07b16d Merge branch 'master' into develop 2017-05-30 15:59:04 +05:30
Manas Solanki
a85b68ee77 link for timesheet, fix https://github.com/frappe/erpnext/issues/9042 (#9071) 2017-05-30 15:55:00 +05:30
Faris Ansari
ab74ca7fff Lint and fix JS files 2017-05-30 12:54:42 +05:30
bcornwellmott
8fa1e03367 Merge branch 'develop' into bom_convert_uom 2017-05-24 12:35:12 -07:00
Ben Cornwell-Mott
0f0b121669 Added BOM UOM selection for items 
Added patch for BOM Item UOM

Fixed scrap qty issue

Added Scrap Qty update to patch

Reverted test record for production order
 2017-05-24 11:12:51 -07:00
Ishan Loya
9bf4563b7a Change modified time 2017-05-24 17:47:42 +05:30
Ishan Loya
a70b41fbb8 Remove Role 'All' from BOM 2017-05-24 17:47:42 +05:30
Ishan Loya
bdb2f95957 Show duplicate button in BOM unless in draft stage (#8826) 2017-05-16 08:25:07 +05:30
Ishan Loya
56c1b2a625 Make proposed corrections 2017-04-24 10:44:36 +05:30
Ishan Loya
b12e15dcc4 Change modified by 2017-04-24 10:44:36 +05:30
Ishan Loya
e5fdd47fd8 Hide 'Qty Transferred for Manufacturing' field if skip material transfer 2017-04-24 10:44:36 +05:30
Ishan Loya
7544904857 Add option to skip material transfer for production orders 2017-04-24 10:44:36 +05:30
mbauskar
40ca4c3bbb [minor] fixes in bom tree view template 2017-04-13 14:29:19 +05:30
Nabin Hait
075b299673 bom traversing: argument mutable issue 2017-04-11 18:27:34 +05:30
mbauskar
236f7aac7f [minor] track changes for transaction documents 2017-04-10 14:48:54 +05:30
Rohit Waghchaure
e7c0188732 [enhance] Get project from bom on production order 2017-03-31 13:40:06 +05:30
Nabin Hait
1f6bd0ad37 Fixed merge conflict 2017-03-30 13:15:22 +05:30
Nabin Hait
fede6d8fbe Updated modified date for production order 2017-03-28 20:42:42 +05:30
Nabin Hait
d1f6cc88f2 Required items table in Production order 2017-03-28 17:08:40 +05:30
Rohit Waghchaure
d7908f8e3a [fix] sales order with status closed fetching on production planning tool 2017-03-28 12:30:23 +05:30
Nabin Hait
0329c0ffab Test case fixed for production order 2017-03-27 19:11:45 +05:30
Nabin Hait
5b60ef2dce Fetch operations from all sub-assembly BOMs in Pro Order if multi-level BOM is checked 2017-03-27 16:29:51 +05:30
Kanchan Chauhan
7cf1a1d84b Project filter in BOM selection in Production Order 2017-03-16 17:09:37 +05:30
Rushabh Mehta
6b53792aea [fix] posting date, time is always current unless explicitly set 2017-03-14 17:06:51 +05:30
Nabin Hait
b3ffd6b282 Merge pull request #7828 from rohitwaghchaure/update_user_roles_to_roles 
Changed userrole to has role, commonify role editor of the user
 2017-03-06 18:44:53 +05:30
Nabin Hait
e68f32cf19 UOM Conversion in selling 2017-03-06 16:41:13 +05:30
Rohit Waghchaure
e7485150a1 added roles in the report 2017-03-06 14:26:09 +05:30
Rohit Waghchaure
94c30d81b1 [Fix] Production order operations scheduling issue 2017-02-24 19:21:40 +05:30
Nabin Hait
5079c9ef47 Fixed merge conflict 2017-02-22 15:31:31 +05:30
Nabin Hait
6e1a2b16a5 Company, Currency, Conversion Rate fields are mandatory in BOM 2017-02-21 13:11:02 +05:30
Nabin Hait
d5442b5544 Merge pull request #7791 from nabinhait/pro_order_stock_qty 
Build Qty considering quantity for which bom is created
 2017-02-21 09:58:13 +05:30
Nabin Hait
391eca18c7 Fixed merge conflict 2017-02-20 19:38:22 +05:30
Nabin Hait
afd8df8a20 Build Qty considering quantity for which bom is created 2017-02-20 18:06:50 +05:30
Nabin Hait
6ffd77660b Changed module for Production Analytics 2017-02-20 17:41:44 +05:30
Nabin Hait
3cdb65f782 Merge branch 'prod_ana' of https://github.com/bcornwellmott/erpnext into bcornwellmott-prod_ana 2017-02-20 17:25:01 +05:30
Nabin Hait
fd3ec066ce Added fields in global search 2017-02-20 13:38:31 +05:30
bcornwellmott
97ab1d2eb3 Merge pull request #7691 from bcornwellmott/stock_reports 
Stock reports
 2017-02-19 14:36:35 -08:00
bcornwellmott
568dac3aad Fixed Link Option for Warehouse 2017-02-19 14:04:20 -08:00
pratu16x7
0e94b4bec4 Mobile view fixes 2017-02-14 17:18:09 +05:30
pratu16x7
60fe77cc90 Website data from existing child tables, layout, images 2017-02-14 17:18:09 +05:30
pratu16x7
dee36e10ae Add operations and items to website 2017-02-14 17:18:09 +05:30
pratu16x7
aad8257e20 Add template 2017-02-14 17:18:09 +05:30
Ben Cornwell-Mott
67a13972fb Added warehouse to BOM Stock Report, fixed bugs with buildable qty 2017-02-09 23:21:52 -08:00
bcornwellmott
630882787a Added buildable qty 
The field indicates how many can be built.
 2017-02-09 20:41:12 -08:00
bcornwellmott
fc41bb6afd Fixed code issues 
Also changed qty to Quantity left to build
 2017-02-09 20:37:11 -08:00
Ben Cornwell-Mott
05dca985e6 Fixed stock query and corrected with suggestions from rohit 2017-02-07 09:15:33 -08:00
Ben Cornwell-Mott
02c02bc572 Fixed counting to correctly reflect all status at each month 2017-02-06 20:58:25 -08:00
Ben Cornwell-Mott
36d04fda37 Fixed filter dates and date comparisons 2017-02-05 14:00:46 -08:00
Ben Cornwell-Mott
b4a2c2f047 Got proper cumulative data working 2017-02-05 13:39:39 -08:00
Ben Cornwell-Mott
943124275d Production Analytics 2017-02-04 14:25:53 -08:00
Rushabh Mehta
6ede4a3809 [enhance] production order from sales order 2017-02-02 17:42:01 +05:30
Rushabh Mehta
3714626dd0 [minor] enhance BOM view 2017-02-01 18:35:53 +05:30
Kanchan Chauhan
45c14ed41c [Minor] Date fix in Production Order 2017-01-19 12:22:04 +05:30
Nabin Hait
6b3670848e Merge pull request #7477 from rmehta/custom-perms 
[minor] fix for custom perms
 2017-01-18 17:03:58 +05:30
Nabin Hait
f8676b2058 Create Material Requests considering projected qty of items 2017-01-17 14:11:43 +05:30
Ben Cornwell-Mott
5597f6a830 Fixes counting of in stock parent assemblies and formatting of csv 2017-01-17 14:11:43 +05:30
KanchanChauhan
b89be1e193 [Minor] Demo fixes (#7499) 2017-01-16 12:57:14 +05:30
Rushabh Mehta
af077dc616 [minor] fix for custom perms 2017-01-13 14:47:37 +05:30
Ben Cornwell-Mott
3d491f90cc Created 2 reports for stock details 2017-01-10 14:14:18 -08:00
Muhammad Huzaifah Bin Ismail
465da8ce09 Fixed spelling errors on Production Planning Tool and manual. 2016-12-28 18:15:45 +08:00
Rushabh Mehta
5a3f421453 [fix] expand all for treeview, fixes https://github.com/frappe/frappe/issues/2474 2016-12-20 12:59:09 +05:30
bhupen
9e146669d3 Issue Items Against Production Order 2016-12-14 17:40:32 +05:30
bhupen
52b3924006 mendatory hours field 2016-12-14 11:32:23 +05:30
bhupen
b42dc5a899 mendatory hours field 2016-12-13 15:25:53 +05:30
Rushabh Mehta
323c06ebbf [minor] rename icons as per FontAwesome 4 (#7136) 2016-12-05 14:17:26 +05:30
Nabin Hait
7f3da5dbb1 Fixed merge conflict 2016-11-28 14:23:51 +05:30
Nabin Hait
d0839799c1 Update workstation.py 2016-11-26 09:54:00 +05:30
Rohit Waghchaure
b1b328865e [Enhancement] Currency added in the BOM 2016-11-22 12:52:20 +05:30
Nabin Hait
d855167b9b Fixed merge conflict 2016-11-21 19:13:22 +05:30
Nabin Hait
9b797974b5 Set project from Sales Order while creating Material Request from PPT, fixed #6731 2016-11-21 18:15:50 +05:30
Nabin Hait
b30e184f6b Merge pull request #7003 from KanchanChauhan/workstation-fix 
[Fix]Workstation holiday list
 2016-11-21 14:51:24 +05:30
Nabin Hait
d7faefc739 Merge pull request #7004 from KanchanChauhan/bom-error-fix 
[Fix] Better error message if default BOM not found
 2016-11-21 14:51:03 +05:30
Kanchan Chauhan
fdcfe180ad [Fix] Better error message if default BOM not found 2016-11-21 11:29:18 +05:30
Kanchan Chauhan
d33c44e3a5 [Fix]Workstation holiday list 2016-11-21 11:23:01 +05:30
Nabin Hait
46753de6d7 fixed merge conflict 2016-11-17 15:55:11 +05:30
Nabin Hait
d4e8b297cd Merge pull request #6784 from RobertSchouten/calendar_fix 
[fix] calendar range fixes
 2016-11-17 14:45:59 +05:30
Nabin Hait
aa68058910 Updated modified_datetime in production planning tool 2016-11-16 17:41:08 +05:30
strixaluco
2ef9232707 [typo] desription → description in bom.json 2016-11-08 10:56:36 +08:00
Rushabh Mehta
13fc52d713 [minor] added default standard filters (#6854) 2016-11-07 17:19:19 +05:30
Nabin Hait
f5d8dd3b18 Fixed merge conflict 2016-11-04 16:54:53 +05:30
Rohit Waghchaure
0d2f7e62c0 set remember last selected value as true for company field 2016-11-03 16:19:34 +05:30
Rushabh Mehta
1aac956306 [minor] [fixes] can rename program and disable role on domainify 2016-11-02 07:33:18 +05:30
robert schouten
bb79fc5b0c [fix] calendar range fixes 2016-11-01 17:14:51 +08:00
bcornwellmott
30df3cd3dc Add description, stock UOM and Min Order Qty to MRs 
The material requests currently do not include descriptions, stock UOM and Min Order Quantities. This fix adds them. This is especially critical in the CSV export, which currently is missing all this info.
 2016-10-25 14:21:26 -07:00
Saurabh
8c3764a6ef test case for scrap item 2016-10-24 13:55:36 +05:30
Saurabh
4ae4eb0eb9 added get_scrap_items param to get_bom_items_as_dict 2016-10-24 13:55:36 +05:30
Saurabh
5a2fa8aac7 [enhance] scrap management 2016-10-24 13:55:36 +05:30
Saurabh
464c27e189 [feature] scrap management 2016-10-24 13:55:36 +05:30
Nabin Hait
0702fa2fc6 Fixed version conflict 2016-10-19 16:49:36 +05:30
Rohit Waghchaure
ac9172f6df [Fix] total projected qty 2016-10-19 15:06:30 +05:30
Nabin Hait
ff183eedb9 Fixes for testcases 2016-10-19 14:23:02 +05:30
Nabin Hait
fa1cdd5bf0 Fixed merge conflict 2016-10-18 15:37:33 +05:30
Rohit Waghchaure
8e881cc7b9 [Fix] making of production order from material request with sales order, restirct validation validate_production_order_against_so in production order 2016-10-10 14:58:33 +05:30
Nabin Hait
558f526a68 Fixed version conflict 2016-10-05 17:18:36 +05:30
Nabin Hait
2704a4a8fc Update production_order.py 2016-10-05 16:14:42 +05:30
Rushabh Mehta
aedad64445 [minor] fixes 2016-10-04 11:41:42 +05:30
Faris Ansari
70b7d3280b added required fields in doctypes for gantt (#6466) 2016-09-26 18:20:14 +05:30
Mainul Islam
dbf2ce67a6 Fixed Issue#6370 2016-09-19 12:49:01 +06:00
Nabin Hait
3cef7d5ae9 Update production_planning_tool.py 2016-09-15 17:01:00 +05:30
RobertSchouten
4ca64c33eb Update production_planning_tool.json 2016-09-13 08:36:05 +08:00
RobertSchouten
5414725fd6 PPT material request non-stock items 2016-09-13 08:27:51 +08:00
Nabin Hait
9d9d1dceeb Merge pull request #6314 from bcornwellmott/bom_desription 
Fixed spelling
 2016-09-12 18:45:21 +05:30
Nabin Hait
d7b95267b3 Update production_planning_tool.py 2016-09-12 18:33:17 +05:30
RobertSchouten
2efe20bd9a stock entries from production_order dont fetch serial number of project 2016-09-09 11:05:22 +08:00
RobertSchouten
b7fc4b76e4 stock entries from production_order dont fetch serial number of project 
stock entries from production_order dont fetch serial number of project
 2016-09-09 11:02:33 +08:00
Ben Cornwell-Mott
0261889c0f Fixed spelling 2016-09-07 02:28:50 -07:00
Nabin Hait
15b26d8b1a Fixed merge conflicts 2016-09-02 14:29:57 +05:30
Saurabh
ff910f4c72 [fixes] set filter for warehouse 2016-09-02 13:39:05 +05:30
Kanchan Chauhan
dd96cbd012 Coded column deleted, column added from UI 2016-08-26 14:32:38 +05:30
Nabin Hait
cfbd0199eb Merge branch 'master' into develop 2016-08-23 12:10:56 +05:30
Neil Trini Lasrado
20b01873ab Made operation mandatory and removed mandatory from operation desc in Production Order Operation, set operation name as desc in operation master if desc is blank 2016-08-22 15:05:50 +05:30
Ben Cornwell-Mott
a7c98ba0fe More formatting adjustments 2016-08-17 05:56:00 -07:00
Ben Cornwell-Mott
d5a9d475e7 Adjusted formatting 2016-08-17 05:45:43 -07:00
Ben Cornwell-Mott
06bfecea73 Fixed formatting of code and repositioned checkboxes in PPT. 2016-08-17 05:42:25 -07:00
Ben Cornwell-Mott
e977fc5dee Upgraded PPT for more variety of MR creation options. Added tests 2016-08-16 06:01:52 -07:00
Javier Wong
e6cd228288 [Enhancement + Fix] Disable buttons when Production Order is Stopped, Fixed Stopping and Re-Opening of Production Order 
Disabled the following buttons:
- Make Timesheet
- Start
- Finish `

- A better fix than 316f78f859
- Sets the Status to In Process or Not Started instead of Unstopped
- Displays this same status on the client prompt (msgprint)
 2016-08-07 16:01:49 +08:00
Nabin Hait
97c74f9f8f Merge pull request #5925 from rohitwaghchaure/bcornwellmott-1 
PPT looks at default MR type in Item to set MR type.
 2016-08-02 17:15:02 +05:30
Rohit Waghchaure
08aadb853c PPT looks at default MR type in Item to set MR type. 2016-08-02 16:59:03 +05:30
Nabin Hait
3bb1a421f0 Change amount calcualtion in POS if there is write off amount and gl entries in this scenario 2016-08-02 16:41:15 +05:30
Rushabh Mehta
6c3ac9587e [fix] quick entry 2016-07-25 15:03:39 +05:30
Javier Wong
5b2af6ad40 [Fixed] Stopping and Re-Opening of Production Order 2016-07-25 16:49:39 +08:00
Nabin Hait
9d93ad92bc minor fixes 2016-07-20 11:28:50 +05:30
Rushabh Mehta
76b134192f [fix] grid columns now restricted to 10 2016-07-18 14:30:27 +05:30
Nabin Hait
4d64f6d4b4 Merge pull request #5772 from rohitwaghchaure/demo_records 
Demo records for timesheet
 2016-07-16 10:52:03 +05:30
Rohit Waghchaure
ecb2031bbe [Fix] Timesheet workstation holiday issue 2016-07-15 20:11:01 +05:30
Rohit Waghchaure
8002d47ff6 Demo records for timesheet 2016-07-15 19:24:21 +05:30
Rohit Waghchaure
e3fe828ea6 [Fix] Added note in timesheet and minor fixes 2016-07-13 09:40:35 +05:30
Rushabh Mehta
391c0efcee [fix] make grids editable 2016-07-11 13:01:58 +05:30
Rushabh Mehta
cca33b2ff0 [cleanup] 2016-07-11 13:01:58 +05:30
Rohit Waghchaure
e94d18b4cd Rename Time Sheet doctype 2016-07-06 20:38:50 +05:30
Nabin Hait
819ed21ab5 Removed Pro Order from Quick Entry 2016-07-06 16:13:44 +05:30
Rohit Waghchaure
3188b56694 [Fixes] Time sheet fixes 2016-07-06 14:31:14 +05:30
Saurabh
621247807a [fix] BOM tree as default view 2016-06-30 15:05:06 +05:30
Rohit Waghchaure
3fa0b51e5e [Fixes] Time sheet fixes and changed timesheets to time_logs 2016-06-29 19:04:16 +05:30
Rohit Waghchaure
d6c986da8f [Enhancement] Time log wages and multiple active salary structure 2016-06-27 16:46:39 +05:30
Nabin Hait
8942d1782c Merge pull request #5481 from bcornwellmott/patch-2 
Create Manufacture MRs for BOM Items
 2016-06-25 14:01:32 +05:30
Saurabh
ec8babe7ac [minor][fix] 2016-06-25 11:06:14 +05:30
Saurabh
ac53357f53 [fixes] renamed _treeview to _tree 2016-06-25 11:06:14 +05:30
Saurabh
a9ba7343c4 [fix] deprecate browser pages for accounts, cost_center, sales , bom, item group 2016-06-25 11:06:14 +05:30
Saurabh
0e47bfeb16 [enhance] treeview to BOM, sales person, Cost Center and Chart of acounts 2016-06-25 11:06:13 +05:30
Saurabh
5f48cb6128 [enhancement] BOM treeview 2016-06-25 11:06:13 +05:30
Nabin Hait
a531ebea8a Merge branch 'master' into develop 2016-06-21 16:44:05 +05:30
bcornwellmott
c0a3311836 Create Manufacture MRs for BOM Items 
Corrects an issue where items with BOMs have Purchase material request submitted instead of Manufacture material requests.
 2016-06-15 11:16:12 -07:00
Rushabh Mehta
0b955e6c33 [minor] production planning, fix description 2016-06-08 11:10:34 +05:30
Rushabh Mehta
6125abc495 Merge pull request #5430 from shreyasp/issue/prod-order-qty 
[Fix] Allow user to quantity in fraction while transferring material using production order
 2016-06-07 10:58:20 +05:30
ShashaQin
6cac50b52e Update bom.py 2016-06-07 09:38:57 +08:00
Rushabh Mehta
af7d929386 [minor] fix supplier/customer and editable columns in BOM 2016-06-02 12:39:36 +05:30
bcornwellmott
c39c665136 [BUG] Fix Create Material Request OperationalError 
The call was invalid because "it.name" doesn't exist. Needs to be replaced with "item.name"
 2016-06-01 08:31:05 -07:00
shreyas
3b79f19614 [Fix] Allow user to quantity in fraction while transferring material using production order 2016-06-01 17:45:10 +05:30
Neil Trini Lasrado
45328f7729 Fixed error in bom autoname 2016-05-27 13:04:20 +05:30
Rushabh Mehta
3a87c479c7 Merge pull request #5346 from umairsy/domains 
Domainifying
 2016-05-16 12:02:51 +05:30
Umair Sayyed
e44d1430e1 fixes in domainification. Also reordered some fields in BOM 2016-05-13 18:31:20 +05:30
Rohit Waghchaure
8904730cd4 [Fix] Removed is_pro_applicable 2016-05-12 18:03:08 +05:30
Rushabh Mehta
2dd0581134 [added] domainify.py 2016-05-11 15:14:15 +05:30
Nabin Hait
b81ed45b2b fixed conflict 2016-05-11 12:52:31 +05:30
Nabin Hait
43d75448ea [fix] Create Material Requests for All Required Qty via Production Plannign Tool 2016-05-10 12:57:24 +05:30
Rushabh Mehta
be2ee18de4 [fixed] frappe.require is now async 💥 2016-04-29 17:22:42 +05:30
Nabin Hait
d6bc490274 Merge branch 'master' into develop 2016-04-22 12:24:26 +05:30
Nabin Hait
3ab6181a4f [fix] Fixed ambiguous column name in query 2016-04-22 11:26:44 +05:30
Rushabh Mehta
202cb7cdf1 Merge pull request #5249 from nabinhait/fixed_asset 
Fixed asset
 2016-04-21 11:41:11 +05:30
Rushabh Mehta
02772442b6 [cleanup] added dashboard in project 2016-04-20 18:45:56 +05:30
Nabin Hait
3d9c5c0c20 Fixed Asset module cleanup and fixes 2016-04-20 17:57:11 +05:30
Rushabh Mehta
0525387328 [enhancement] added reserved_qty_for_production in bin and updated item dashboard 2016-04-18 19:27:46 +05:30
Rushabh Mehta
e8e9440b06 [fix] [tests] 2016-04-15 15:19:35 +05:30
Rushabh Mehta
a305c29b0e [cleanup] remove is_pro_applicable 2016-04-15 15:03:16 +05:30
Umair Sayyed
72534deea2 removed Is Sales Item and Is Purchase Item 2016-04-15 12:57:00 +05:30
Rushabh Mehta
18fc39b609 [feature] progress bars on production order 2016-04-15 11:24:19 +05:30
Nabin Hait
972c25f78d Fixed conflict 2016-04-14 18:25:53 +05:30
Anand Doshi
3af1b00e4e [fix] BOM name in test_records.json 2016-04-08 16:21:03 +05:30
Anand Doshi
e6e7cd90c9 Merge pull request #5143 from KanchanChauhan/somefixes 
[Minor Fixes] Findings in setting up erpnext
 2016-04-08 16:20:11 +05:30
Kanchan Chauhan
017d30f465 [Minor Fixes] Findings in setting up erpnext 2016-04-06 19:28:50 +05:30
Rushabh Mehta
78b7a53635 [cleanup] set default bold, print_hide for prints 2016-04-06 15:29:45 +05:30
Rushabh Mehta
d690094b12 [image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM 2016-04-04 16:57:56 +05:30
Anand Doshi
08b39b1ff8 [fix] escape fg_item in production planning's get_so_items 2016-04-04 13:16:56 +05:30
Rushabh Mehta
72b4ad8155 [cleanup] for quick-entry 2016-03-30 15:42:22 +05:30
Nabin Hait
3a15c92c5e Fixed Asset Depreciation first commit 2016-03-29 11:54:37 +05:30
Neil Trini Lasrado
b6d9946854 Fixes Translations 2016-03-28 12:44:05 +05:30
Neil Trini Lasrado
11dafa27ba Added Project to materail request 2016-03-21 12:40:42 +05:30
Neil Trini Lasrado
c7f53ff318 Added Project filter to Production Planning Tool 2016-03-21 12:40:42 +05:30
Nabin Hait
9a75530c26 [fix] reload doctype for renaming project 2016-03-18 16:19:25 +05:30
Nabin Hait
2e08e3e186 Merge pull request #4991 from neilLasrado/develop 
Fixed Production Planning Tool
 2016-03-17 19:05:09 +05:30
Nabin Hait
2ed8f8f099 [fix] BOM Browser 2016-03-17 15:55:48 +05:30
Neil Trini Lasrado
41380dfad8 Fixed Production Planning Tool 2016-03-16 15:26:01 +05:30
Neil Trini Lasrado
6e343e23d9 Renamed project_name to project 2016-03-15 17:50:53 +05:30
sbkolate
a897882434 enable uom in BOM Table View 
reference 
https://discuss.erpnext.com/t/uom-in-item-tables/10733/4
 2016-02-26 19:32:11 +05:30
Nabin Hait
baa6d96a82 [fix] validate BOMs in BOM Replace Tool 2016-02-24 18:51:13 +05:30
Neil Trini Lasrado
f79760ce2d Mumtiple fixes 2016-02-23 18:35:45 +05:30
Neil Trini Lasrado
0dd8500393 Fixed Documentation 2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
fd9dc5e9f5 refactor code in Production Planning Tool 2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
877e2ebff8 Fixed Production PLanning Tool 2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
dddf42560f Added code to update Material Request on Submission of Production Order 2016-02-23 18:35:44 +05:30
Neil Trini Lasrado
abd9248ba6 Rename sales_order_no to sales_order in Material Request Item 2016-02-23 18:35:43 +05:30
Neil Trini Lasrado
9739dc3639 Added make Production Order button against Material Request 2016-02-23 18:35:42 +05:30
Neil Trini Lasrado
966e5643c9 Added Material Request Link to Production Order 2016-02-23 18:35:42 +05:30
Nabin Hait
1a99cb8bfe [fix] Escaping strings with percentage 2016-02-19 12:45:57 +05:30
Javier Wong
3d1f01ffc1 Fixed Get Open Sales Orders with Item Filter 
Previously Get Open Sales Orders with Item Filter does not filter properly and instead returns Sales Orders with all Items.
 2016-02-16 14:40:18 +05:30
Rushabh Mehta
3cdf3544fb [enhancement] default warehouse not mandatory in time, re-order level and re-order qty must always be set per warehosue 2016-02-08 18:50:40 +05:30
Nabin Hait
787e59c37e [fix] BOM Autonaming 2016-01-19 16:48:31 +05:30
Rushabh Mehta
b46069d44b [cleanup] contextual buttons in sales & purchase and fix rate setting in opp -> quotation and material request -> purchase order 2016-01-15 16:59:26 +05:30
Rushabh Mehta
2e3d2b8426 Merge pull request #4613 from nabinhait/fixes 
[fix] Item query and exchange rate
 2016-01-15 11:19:44 +05:30
Nabin Hait
a88912a2f5 [fix] Item query and exchange rate 2016-01-14 10:43:17 +05:30
Saurabh
e23e99f4bd [enhance] merge customize buttons under groups 2016-01-13 09:18:31 +05:30
Anand Doshi
b55dd5b284 [fix] BOM validate quantity > 0 2016-01-04 16:02:04 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
Rushabh Mehta
c819fd4ee8 [translations] for #4461 2015-12-10 10:34:32 +05:30
Rushabh Mehta
e1f8b1d695 [minor] [production planning tool] include non production items without default BOM in multi-level BOM 2015-12-04 10:53:15 +05:30
Rushabh Mehta
0fd67b23f4 [minor] duplicate button on BOM cancel 2015-11-26 10:37:24 +05:30
Nabin Hait
cf3cf2ca1f [fix] Update exploded materials table from 'Update Cost' button 2015-11-23 15:12:18 +05:30