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
Anand Doshi
602e8253be
[enhancement] Int, Currency, Float, Percent as not null and default to 0
2015-11-19 13:23:36 +05:30