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
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
Nabin Hait
1f10d693e9
Don't set currency as company currency if default currency is different ( #11011 )
2017-10-02 13:20:51 +05:30
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
Nabin Hait
c314485d55
Fixes based on test case
2017-09-28 18:55:49 +05:30
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
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
