Commit Graph

563 Commits

Author SHA1 Message Date
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