Faris Ansari
d9e482759c
style: Missing semicolon
2019-08-01 12:53:19 +05:30
Faris Ansari
f650cb8e4b
style: Indent and missing semicolon
2019-07-30 17:46:15 +05:30
Faris Ansari
a4ada93834
fix: Field labels
2019-07-30 17:11:34 +05:30
Faris Ansari
1214e2d2a4
feat: BOM Comparison Tool
2019-07-30 16:54:46 +05:30
rohitwaghchaure
5be91173a1
Merge pull request #18108 from kaynes-technology/batch_bom_operations
...
feat: Add batch operation times in BOM Operation
2019-07-22 11:26:19 +05:30
Salmanmulani
b752acf803
fix: added default value for projected_qty in bin_dict
...
`projected_qty` if not in `bin_dict` would return None. And when compared to an integer would result in a TypeError.
This PR fixes this
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
2019-07-19 11:44:49 +05:30
Govind S Menokee
ce42c53c1c
Merge branch 'develop' into batch_bom_operations
2019-07-17 22:40:02 +05:30
Govind S Menokee
2ab9947647
Merge branch 'develop' into batch_bom_operations
2019-07-16 02:12:24 +05:30
Govind S Menokee
7d9d027bfe
feat: update modified to fetch latest state in patches
2019-07-16 02:01:27 +05:30
Rohit Waghchaure
c67743b1f8
fix: description set in the bom not pulled in the material request
2019-07-16 01:27:26 +05:30
Govind S Menokee
14ec76e8d9
feat: remove is_batch_operation from select query
2019-07-14 23:06:10 +05:30
Govind S Menokee
5965469abd
feat: remove is_batch_operation checkbox from work order operation
2019-07-14 23:02:33 +05:30
Govind S Menokee
f3e10a489d
feat: remove check box for batch operation
2019-07-14 22:55:12 +05:30
rohitwaghchaure
b390b70ee3
fix: set project in material request when pull items from bom ( #18256 )
2019-07-11 15:22:03 +05:30
Deepesh Garg
1640e7012b
Merge pull request #18172 from karthikeyan5/develop-terms-selling-buying-filter
...
feat(setup): adding selling buying filter in terms and conditions
2019-07-05 16:03:16 +05:30
Govind S Menokee
473a5477b6
Merge pull request #3 from kaynes-technology/develop
...
Merge develop
2019-07-05 13:33:25 +05:30
karthikeyan5
82e2bac891
fix(coding style): adding a few spaces
2019-07-05 12:41:19 +05:30
karthikeyan5
ad33c19510
fix: converting spaces to tabs on a few lines
2019-07-05 11:28:59 +05:30
karthikeyan5
830f2b642b
chore(manufacturing): added dashboard for doctypes
2019-07-05 09:48:38 +05:30
karthikeyan5
7fc6021ca5
feat(setup): adding selling buying filter in terms and conditions
2019-07-04 22:46:16 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Govind S Menokee
a596a7fd2b
feat: Add batch operation times in BOM Operation
2019-06-29 04:08:26 +05:30
KanchanChauhan
2433fb1596
feat: Terms and Conditions section in Blanket Order ( #17991 )
2019-06-28 12:54:12 +05:30
Deepesh Garg
dbe9a41389
feat: Confirmation to submit material request against Production Plan ( #18062 )
...
* feat: Confirmation to submit material request against Production Plan
* fix: Test cases for production plan
* fix: Test Cases for production plan
2019-06-28 12:48:28 +05:30
rohitwaghchaure
827ac1e291
Merge pull request #18040 from Mangesh-Khairnar/fix-price-list
...
fix(price list): change the field name
2019-06-25 15:23:44 +05:30
Rohit Waghchaure
a64e4037d2
fix: revert changes of bom recursion
2019-06-25 07:08:59 +05:30
Mangesh-Khairnar
558a5c199f
fix(price list): change the field name
2019-06-24 17:32:04 +05:30
Rohit Waghchaure
d95909c39a
fix: optimize bom update tool
2019-06-24 12:57:44 +05:30
Aditya Hase
c980143764
fix(test): Explicitly search for Material Request Item with Item Code
2019-06-20 21:15:55 +05:30
Anurag Mishra
4c1639305f
feat: creating stock entry against purchase receipt
2019-06-14 12:31:08 +05:30
Anurag Mishra
4ca393d14c
fix: renamed report BOM item scraps into BOM Explorer ( #17869 )
2019-06-06 18:05:08 +05:30
asbasawaraj
a281ce3dde
fix: Updated Field Labels in Work Order ( #17750 )
2019-05-27 13:33:37 +05:30
Rushabh Mehta
2d7993592f
Merge pull request #17703 from rmehta/yeah-form-js
...
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
2019-05-24 11:36:16 +05:30
Rushabh Mehta
7e4fb49c61
fix(minor): after manual testing
2019-05-24 11:22:31 +05:30
Saurabh
45cd60dfb2
Merge pull request #17645 from nabinhait/bom-item-rate-dev
...
fix: BOM Item rate based on uom conversion factor and exchange rate
2019-05-22 18:58:34 +05:30
Rushabh Mehta
04e89ce808
refactor: deprecate old API
2019-05-22 16:52:36 +05:30
Nabin Hait
06c8cf4321
fix: BOM Item rate based on uom conversion factor and exchange rate
2019-05-16 19:23:00 +05:30
Anurag Mishra
dd5d4c49c4
fix: indent
2019-05-16 17:08:44 +05:30
rohitwaghchaure
144e60a234
Update bom_items_and_scraps.py
2019-05-16 15:03:30 +05:30
Anurag Mishra
39c80789c9
Merge branch 'develop' into bom_items_and_scraps
2019-05-16 14:59:38 +05:30
Nabin Hait
3fccfaa7ce
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:54:05 +05:30
Anurag Mishra
f1f2a3eed0
feat: added report for showinrg complete hierarchy of bom with item details and scraps
2019-05-14 15:04:26 +05:30
deepeshgarg007
e13a56cc80
Merge branch develop into notification
2019-05-08 10:16:30 +05:30
deepeshgarg007
c5e6886937
feat: Notification for material request receipt
2019-05-01 18:03:40 +05:30
Nabin Hait
621006642c
feat: Added item image in work order and bom
2019-05-01 17:20:21 +05:30
Nabin Hait
319c912f91
fix: Load doc before save
2019-04-23 13:13:36 +05:30
Nabin Hait
3a2d6a4043
Merge pull request #17169 from rohitwaghchaure/production_plan_multiple_enhancements
...
feat: Production plan enhancements
2019-04-17 17:31:14 +05:30
Rohit Waghchaure
38238b0cfd
fixed test cases
2019-04-17 15:56:00 +05:30
Mangesh-Khairnar
3ab2a18088
Merge branch 'develop' into so-on-hold
2019-04-11 15:49:06 +05:30
Nabin Hait
89206e74d0
fixed merge conflict
2019-04-11 12:31:14 +05:30
Rohit Waghchaure
0e9cd2e00a
feat: Production plan enhancements
2019-04-09 16:53:38 +05:30
Mangesh-Khairnar
16c4fd6733
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
2019-04-09 12:13:45 +05:30
Suraj Shetty
6262c9ed6a
fix: Subquery in get_bom_items method
2019-03-28 14:59:27 +05:30
Prateeksha Singh
a0927c1ba6
fix: correct use of include_item_in_manufacturing
2019-03-26 16:55:13 +05:30
Nabin Hait
8aaee57921
fix(uom): Get items as per UOM defined in BOM, fixes #15081
2019-03-26 16:53:13 +05:30
Rohit Waghchaure
1f2f9cf360
feat: added stock entry type master to select purpose in the stock entry
2019-03-26 12:52:31 +05:30
Mangesh-Khairnar
324e06cba0
Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold
2019-03-25 18:51:13 +05:30
Mangesh-Khairnar
c423d6f2e4
fix: validate sales order linked work order creation on server side
2019-03-25 17:27:33 +05:30
Prateeksha Singh
cc1a022d63
fix: correct use of include_item_in_manufacturing
2019-03-22 14:58:22 +05:30
Nabin Hait
95705412f3
fix(uom): Get items as per UOM defined in BOM, fixes #15081
2019-03-22 13:19:17 +05:30
Rushabh Mehta
2537b7fce8
Merge branch 'develop' into hotfix-work-order-item-name
2019-03-22 12:48:56 +05:30
Deepesh Garg
3a05b3501c
fix: Failing test case on develop ( #16974 )
2019-03-21 12:53:12 +05:30
Saurabh
3c95387926
Merge branch 'master' into develop
2019-03-20 14:39:49 +05:30
Rohan Bansal
b4745ec668
fix(work_order): Change Work Order title to show item name instead of item code
2019-03-12 12:13:02 +05:30
Rohit Waghchaure
52729bf369
feat: child table to add multiple time logs in job card
2019-03-11 00:02:32 +05:30
Frappe Bot
7e67a400cd
Merge branch 'master' into develop
2019-03-08 09:39:33 +00:00
Rushabh Mehta
29c46bb311
fix(sales_order.py): handle zero bundle qty
2019-03-06 14:49:13 +05:30
Mangesh-Khairnar
8f7c7a6882
feat: check for on hold sales order
2019-03-02 20:48:04 +05:30
Sagar Vora
e0eafb1c2c
Merge branch 'master' into develop
2019-02-26 17:08:59 +05:30
Nabin Hait
9990306399
fix: Consider only active BOMs while updating cost via BOM Update Tool ( #16753 )
2019-02-25 11:59:05 +05:30
Suraj Shetty
2dadc1ef98
chore: Remove trailing whitespaces
2019-02-21 20:51:35 +05:30
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
