Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,385 Commits 3 Branches 0 Tags 1 GiB
a596a7fd2b
Commit Graph

893 Commits

Author SHA1 Message Date
deepeshgarg007
bf6b36a39b fix: Removed white spaces 2019-02-21 19:30:27 +05:30
deepeshgarg007
1b04534095 fix: Removed duplicate fields from BOM Item 2019-02-19 21:36:12 +05:30
Sagar Vora
cc6e51c62d Merge branch 'master' into develop 2019-02-19 18:09:49 +05:30
Nabin Hait
750fe6eaea fix: get item rate in bom 2019-02-18 18:56:08 +05:30
Rohit Waghchaure
99e7362006 fix: Allow to make material request from draft job card 2019-02-18 18:26:50 +05:30
Frappe Bot
74fd5daeb2 Merge branch 'master' into develop 2019-02-15 10:22:33 +00:00
Nabin Hait
f66c6874ca
Merge pull request #16652 from nabinhait/work-order-fix 
fix: Make work order from production plan considering already ordered qty
 2019-02-14 18:50:30 +05:30
Deepesh Garg
4d1bc0ca85 fix: Add total row in analytics report (#16648) 2019-02-13 16:58:46 +05:30
Nabin Hait
1a3c27bbea fix: Make work order from production plan considering already ordered qty 2019-02-12 17:38:37 +05:30
Sagar Vora
551f52fd25 Merge branch 'master' into develop 2019-02-12 16:41:24 +05:30
Aditya Hase
691c166a56 fix(py3): Use six.text_type instead of unicode 2019-02-07 20:35:52 +05:30
Faris Ansari
504f317434 fix: BOM Stock Calculated Report (#16585) 
- Cast null values to 0 to avoid mathematic errors
 2019-02-07 07:15:38 +05:30
Sagar Vora
da1dc7fa52 Merge branch 'master' into develop 2019-02-05 18:40:39 +05:30
Nabin Hait
8a46df5c4b
Removed duplicate fields 2019-02-05 13:31:32 +05:30
Nabin Hait
1c288ca4ab
Merge pull request #16558 from deepeshgarg007/production_plan 
fix: Validation while getting raw materials for production in Production Plan
 2019-02-05 10:35:16 +05:30
Nabin Hait
fe6f1ad244
Update production_plan.py 2019-02-05 10:34:58 +05:30
Rohit Waghchaure
780c6b0d77 fix: job card not working if transfer against work order 2019-02-04 21:04:48 +05:30
Deepesh Garg
d442d06947
Update production_plan.py 2019-02-03 12:45:20 +05:30
dgarg007
f667cff5a6 fix: Validation while getting raw materils for production in Production Plan 2019-02-02 21:57:00 +05:30
Sagar Vora
7a1c40c7c1 Merge branch 'master' into develop 2019-01-30 20:09:45 +05:30
Nabin Hait
16d7b49d73 fix: Default value for 'raw materials rate based on' in BOM 2019-01-30 17:27:08 +05:30
Sagar Vora
f97c5dad82 Merge branch 'staging' into develop 2019-01-29 18:39:14 +05:30
Nabin Hait
cc41b876fb
Merge pull request #16497 from nabinhait/bom_price 
BOM raw materials price
 2019-01-29 14:58:40 +05:30
Nabin Hait
e8190473f5
Merge branch 'staging-fixes' into unicode 2019-01-29 11:13:04 +05:30
Nabin Hait
01ca3e5e36 fix(manufacturing): Get raw materials rate from price list ignoring party 2019-01-25 16:25:15 +05:30
Frappe Bot
e415cce1a9 Merge branch 'staging' into develop 2019-01-23 08:19:00 +00:00
Aditya Hase
4b4265f8a7 fix(dead-code): Remove .py files (#16457) 2019-01-22 20:54:21 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Sagar Vora
4d1a9b10ed Merge branch 'staging' into develop 2019-01-22 15:56:39 +05:30
Rohit Waghchaure
11ce45077d [Fix] Not able to submit work order 2019-01-21 19:18:52 +05:30
Nabin Hait
bace4d3e6d
Merge pull request #16358 from adityahase/naming-series 
feat(naming): Deferred naming for SLE and GL Entry
 2019-01-18 10:55:30 +05:30
Nabin Hait
bef2c22d23 Fix: merge conflict 2019-01-18 10:15:47 +05:30
Nabin Hait
78ccbe24a3 fix(test): BOM raw materials rate from price list as per uom 2019-01-16 16:00:25 +05:30
Nabin Hait
158e7dcd8b fix(bom-uom_issue)Fetch rate in BOM from Price List based on UOM 2019-01-16 16:00:25 +05:30
Nabin Hait
3dde949419 feat(mr_against_so): Merge same items from different BOMs 2019-01-16 15:59:39 +05:30
Sahil Khan
693e81db48 more bis fixes 2019-01-16 15:59:39 +05:30
Sahil Khan
34766c0c50 BIS issue fixes 2019-01-16 15:59:39 +05:30
Aditya Hase
0c16424d7d fix(naming): Use creation instead of name to order SLEs 2019-01-08 00:09:36 +05:30
Sagar Vora
7d60c03ed9
Merge branch 'staging-fixes' into pplan_fix 2019-01-07 15:54:16 +05:30
Frappe Bot
fdd5d54d41 Merge branch 'staging' into develop 2019-01-05 09:11:15 +00:00
Rohit Waghchaure
df4fe922c0 [Fix] Duplicate fieldnames operation and allow_alternative_item in BOM Item 2018-12-28 16:46:36 +05:30
Suraj Shetty
3de12db2b1 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-27 09:05:25 +05:30
Frappe Bot
9e09b3adbe Merge branch 'staging' into develop 2018-12-26 12:16:20 +00:00
Rohit Waghchaure
8406720a7a [Fix] Patch rename_bom_wo_fields 2018-12-26 16:25:44 +05:30
Suraj Shetty
146be9f6a6 Merge branch 'develop' of github.com:frappe/erpnext into general-ui-fixes 2018-12-24 16:08:43 +05:30
rohitwaghchaure
4265c5a772 Rename BOM and Work order fields (#16209) 
* Rename BOM and Work order fields

* Rearranged BOM fields
 2018-12-24 14:38:49 +05:30
Suraj Shetty
83e3c4c0fa Fix quote error 2018-12-24 11:11:04 +05:30
Suraj Shetty
b2965001d1 Replace 'Make' with 'Create' 2018-12-23 13:25:58 +05:30
Frappe Bot
1b7c583c48 Merge branch 'staging' into develop 2018-12-21 05:46:23 +00:00
Nabin Hait
614559f234 fix(pro-plan): Actual Qty of RM considering children in case source warehouse is a group warehouse 2018-12-13 16:36:35 +01:00
Zlash65
82e01bc923 fix fetch material request items logic 2018-12-13 18:31:05 +05:30
Frappe Bot
5b50b2848d Merge branch 'staging' into develop 2018-12-10 13:08:33 +00:00
Rohit Waghchaure
57633b75ed [Fix] Transferred qty cannot be null 2018-12-10 17:36:01 +05:30
Frappe Bot
7c2a5bddb1 Merge branch 'staging' into develop 2018-12-06 09:50:25 +00:00
deepeshgarg007
4c79274054 Fixed patch and deprecated grid reports 2018-11-30 18:01:22 +05:30
deepeshgarg007
1a1c013b2a Analytics report bug fixes and code cleaning 2018-11-29 08:34:47 +05:30
Ameya Shenoy
fe1f532bc0
Merge branch 'staging' into develop 2018-11-28 08:28:37 +00:00
Nabin Hait
c5064069c7
Merge branch 'staging-fixes' into manufacturing_settings_permissions_issue 2018-11-26 20:23:11 +05:30
Rohit Waghchaure
15ed7a6351 [Fix] No permission for Manufacturing Settings 2018-11-26 17:31:18 +05:30
Nabin Hait
2508d11097 fix(test): Test cases fixed 2018-11-26 11:05:28 +05:30
Frappe Bot
98a2348779 Merge branch 'staging' into develop 2018-11-14 11:33:08 +00:00
Rohit Waghchaure
917dda1b76 [Fix] On save Allow Transfer for Manufacture reset to default value even if user has changed manually 2018-11-14 01:18:41 +05:30
Frappe Bot
b5c7b96a73 Merge branch 'staging' into develop 2018-11-13 11:33:31 +00:00
Doridel Cahanap
2b14d6a058 Contract Manufacturing : Customer Provided Items (#15828) 
* Material Request from Production Plan for Customer provided parts

* Test cases

* Customer web portal for their material requests
 2018-11-13 12:07:16 +05:30
Alchez
6f1fd193eb fix(production_plan): Allow work orders to be cancelled (#15955) 2018-11-13 11:47:23 +05:30
Deepesh Garg
b65bb5df2e Function renaming, code cleaning and minor fixes (#15938) 2018-11-13 11:28:58 +05:30
Stavros Anastasiadis
a695dad525 Upgrade BOM Stock Report base with Qty to Produce (#15939) 2018-11-13 11:17:41 +05:30
Shreya Shah
89974b221d [Feature] Create Raw Material Request from Sales Order (#15452) 
* Add new button to Sales Order form - Request for Raw Materials

* Modify get_work_order_items function

* Commonify functions in Production Plan to make it compatible with new feature

* Create and submit Material Request from Sales Order

* Link Sales Order with Material Request

* Minor

* Rename label

* Fix Codacy

* Modify as per review suggestions

- Move dialog to a new function
- Move checkboxes below other fields

* Minor changes

* Check for permissions

* Add common checkboxes for all items

* Fix codacy

* fix: Travis

* fix: Use variable to store query result

* fix: Add comment before fetching exploded items

* refactor: Break into multiple functions

* test: Add test case
 2018-11-13 11:15:03 +05:30
Ameya Shenoy
42928f978b fix: work order item sorting (#15967) 2018-11-13 11:04:17 +05:30
Frappe Bot
1ff9c691b7 Merge branch 'staging' into develop 2018-11-09 10:21:07 +00:00
Alchez
bf20be53ef fix(bom): Display item name in new BOM form (#15783) 2018-11-08 12:54:20 +05:30
Ameya Shenoy
df62296a26
Merge branch 'staging' into develop 2018-10-30 12:54:16 +00:00
Shreya Shah
69bbe1995c
Update production_analytics.py 2018-10-29 15:38:21 +05:30
deepeshgarg007
7b91f9fa0c Bug Fixes 2018-10-29 15:16:25 +05:30
Ameya Shenoy
c1231d65fd
Merge branch 'staging' into develop 2018-10-19 13:27:07 +00:00
deepeshgarg007
25edac451d Production Analytics Query Report (#15673) 
* Production Analytics Query Report

* Changes in production analytics report

* Updated json file and other changes
 2018-10-18 17:43:41 +05:30
Ameya Shenoy
d1c467bcf5
Merge branch 'staging' into develop 2018-10-17 09:44:39 +00:00
Ameya Shenoy
77b60928bf
Merge branch 'master' into staging-fixes 2018-10-17 09:39:31 +00:00
Nabin Hait
44ec05f79b
fix(bom): deadlock issue via bom replace tool (#15694) 2018-10-15 18:56:16 +05:30
Stavros Anastasiadis
a398d6bf4f Allow Same Item Multiple Items (#15657) 2018-10-11 16:25:37 +05:30
Stavros Anastasiadis
66922b9c8e Allow Same Item Multiple Items (#15657) 2018-10-11 16:20:30 +05:30
Ameya Shenoy
de5206ff43
Merge branch 'staging' into develop 2018-10-08 07:28:24 +00:00
rohitwaghchaure
5e466bace4 Removed update_job_card_reference method (#15614) 2018-10-08 12:36:45 +05:30
Ameya Shenoy
da10f6ebd8
Merge branch 'staging' into develop 2018-10-04 11:51:30 +00:00
Rohit Waghchaure
9f2859701e [Fix] WorkOrderItem object has no attribute operation 2018-10-04 13:25:49 +05:30
Ameya Shenoy
430c3c88ff
Merge branch 'staging' into develop 2018-09-26 07:32:45 +00:00
Ameya Shenoy
9d3a97fd15
Merge branch 'master' into staging-fixes 2018-09-26 07:28:53 +00:00
rohitwaghchaure
fafc277666 [Fix] BOM update tool, too many writes in one request. Please send smaller requests (#15432) 2018-09-25 18:59:20 +05:30
Suraj Shetty
bfc195dd8b Changes to support refactor in frappe pg-poc branch (#15287) 
* Remove quotes from sql to make it compatible with postgres as well

* Fix queries
- Replace mysql specifc queries with standard ones

* Make repo URL chages to test pg-poc

* Add root passowrd to test site config

* Fix quotes issue

* Remove debug flag from a pricing rule query

* Remove python 3.6 version from travis.yml

* Fix improper query issue

* Fix incorrect query

* Fix a query

- This fix need to be changed when we will  start supporting postgres
since date_format is not supported by postgres

* Get price list map as dict

* Convert price_list_currency_map to dict
 2018-09-21 10:20:52 +05:30
Mangesh-Khairnar
0374cc54ba [bug fix]:stopped orders in progress report (#15428) 2018-09-19 13:10:53 +05:30
JC
31f2c1c3d3 fix ‘BOMItem’ object has no attribute ‘operation’ error in bench run-tests --doctype ‘BOM’ (#15423) 2018-09-18 10:47:27 +05:30
Govind S Menokee
d38160c816 [FIX] Remove deprecated gen_object.next() function (#15418) 
BOM tree view was getting impacted due to use of a deprecated function.
This fix replaces deprecated object.next() function with next(gen_object).
 2018-09-18 10:42:21 +05:30
Zarrar
e79e4cb9b1 python 2-3 fix, *.keys() return dict_keys object in py3 (#15409) 2018-09-17 10:56:42 +05:30
Saurabh
393dd4286a [resolved] merge-conflicts 2018-09-12 14:48:30 +05:30
Nabin Hait
e11f299b21
Update production_order.py 2018-09-11 11:36:05 +05:30
rohitwaghchaure
3cc77b52e7 [Fix] Timeout error for bom update tool (#15343) 2018-09-07 16:16:58 +05:30
rohitwaghchaure
32dc3bf082 [Enhance] Job Card (#15244) 
* [Enhance] Added job card against the work order

* removed work order from timesheet

* Fixed codacy

* Added patch to make job card from the timesheet

* Timer in job card

* Dates validation in job card

* Added button to make job card from work order

* Added sub-assembly operation in the work order
 2018-09-06 19:21:48 +05:30
Nabin Hait
4e187e88f8 ignore non stock items in stock entry against work order 2018-09-01 18:15:33 +05:30
Rushabh Mehta
49f9747385 major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc (#15267) 
* major(manufacturing): fixes to ux, material requests to purchase order based on default supplier etc

* fix: remove debug
 2018-08-30 18:50:48 +05:30
Rushabh Mehta
13bcc4e27e perms: fix default import, export perms 2018-08-29 17:10:27 +05:30