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

606 Commits

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