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
e68f32cf19
UOM Conversion in selling
2017-03-06 16:41:13 +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
391eca18c7
Fixed merge conflict
2017-02-20 19:38:22 +05:30
Nabin Hait
fd3ec066ce
Added fields in global search
2017-02-20 13:38:31 +05:30
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
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
