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

929 Commits

Author SHA1 Message Date
Suraj Shetty
be0ae7a430 fix: Doctype changes 
- Check no copy for work order series field
- Add dashboard
- Set naming_series for pick list
 2019-08-28 12:40:26 +05:30
Suraj Shetty
457da47dba fix: set for_qty instead of pick_list 2019-08-26 10:05:35 +05:30
Suraj Shetty
2b9e256002 fix: Rename method name 2019-08-26 10:05:01 +05:30
Suraj Shetty
05f243590d fix: Show option to create pick list or work order 2019-08-26 09:29:31 +05:30
Suraj Shetty
8d55f81baa fix: Fix raw matterial selection based on finished item qty 2019-08-22 16:37:44 +05:30
Suraj Shetty
da2a623e38 Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-21 11:48:27 +05:30
Suraj Shetty
d79a16c9f3 fix: Warehouse selection login 
- Rename item_loactions -> locations, reference_items -> items
- Add customer and work_order field
- fix "Get Items" button UX
- fix get_pending_work_orders query

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-08-21 09:03:26 +05:30
Suraj Shetty
1a090432d9 fix: Quantity while creating pick list from work order 
- Fix get_mapped_doc config to filter items
- Fix erroneous condition in get_mapped_doc used for creation of pick_list
in sales order

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2019-08-20 12:04:07 +05:30
Suraj Shetty
e047de854b Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-09 11:14:14 +05:30
Deepesh Garg
7638301d01
Merge pull request #18527 from netchampfaris/bom-comparison-tool 
feat: BOM Comparison Tool
 2019-08-05 11:58:46 +05:30
rohitwaghchaure
9601b6c601 feat: added checkbox 'Update Consumed Material Cost In Project' in work order to don't update the consumed material cost in the project for the subassembely work orders (#18533) 2019-08-05 10:40:23 +05:30
Deepesh Garg
fb5aa43e77 fix: Type error handling while getting material request items (#18549) 
* fix: Type error handling while getting material request items

* fix: Remove flt
 2019-08-05 10:12:42 +05:30
Deepesh Garg
713d4bb1ba fix: Type error handling while getting material request items (#18550) 
* fix: Type error handling while getting material request items

* fix: Remove flt
 2019-08-05 10:12:17 +05:30
Suraj Shetty
6fd3a86012 fix: Option to create pick list from work order 2019-08-02 16:48:31 +05:30
Suraj Shetty
b35c0410b1 fix: Add option to get items from work order 2019-08-02 08:12:30 +05:30
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