rohitwaghchaure
e8a651bc00
fix: BOM stock report ( #21380 )
2020-04-23 09:45:09 +05:30
marination
8a30cb2565
chore: Commonify autofilling warehouses in child tables
2020-04-23 00:18:21 +05:30
Rucha Mahabal
eaa956b994
feat(Healthcare): Rehabilitation Module ( #21216 )
...
* feat: added rehab sub-module doctypes
* feat: rehab module
* feat: prescribe procedures in Patient Encounter
* feat: create Therapy Plan on Encounter submission
* feat: manage item for Therapy Type
* feat: book appointments, get prescribed therapies for Therapy Sessions
* feat: invoice Therapy Sessions
* feat: plan completion progress bar and exercise countsindicators
* feat: Motor Assessment Scale
* feat: add editable card view for exercise steps
* fix: add rehab in healthcare desk page
* fix: card deletion not working when child table is hidden
* feat: automatically fetch therapies according to Body Part
* fix: added tests for Therapy Type and Plan
* fix: add exercises according to body parts in Therapy Type
* fix: label for Exercise Instructions
* fix: exercise cards css
* feat: add dashboard for Therapy Plan
* feat: Patient Assessment Template and Patient Assessment
* feat: add title fields in Therapy Plan and Session
* fix: remove Motor Assessment Scale
* fix: fetch assessment description
* feat: create Patient Assessment from Therapy Session
* fix: anti pattern code
* fix: update desk page
* fix: exercise card rendering
* fix(test): filter out disabled Items in test_mapper
* fix: get stock uom from Stock Settings for Therapy Type Item creation
* fix: multiline SQL query
* fix: permissions for DocTypes
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-22 13:07:12 +05:30
Rohit Waghchaure
250daa3f94
fix: job card time issue
2020-04-17 00:50:00 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages ( #21138 )
2020-04-10 18:52:05 +05:30
rohitwaghchaure
05ac7213b3
fix: allow to make BOM against template item ( #21146 )
...
* fix: allow to make BOM against template item
* Update queries.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-06 10:17:57 +05:30
Deepesh Garg
0f25a40421
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order
2020-04-02 21:30:53 +05:30
Deepesh Garg
d29dd58e89
fix: Validation
2020-04-02 21:29:59 +05:30
Deepesh Garg
625acab057
fix: Add duplicate item validation
2020-04-02 11:18:22 +05:30
rohitwaghchaure
98a91f489d
Merge pull request #21015 from marination/so-mr-mapping-uom
...
fix: UOM fixes in Sales Order,Material Request & Production Plan
2020-03-31 16:24:37 +05:30
rohitwaghchaure
7845961d46
Merge pull request #21017 from Alchez/dev-remove-same-item-validation
...
feat: allow BOM to use same item as raw material (develop)
2020-03-31 16:04:26 +05:30
rohitwaghchaure
d274923ae1
fix: "Qty To Manufacture" field as non mandatory in job card ( #21081 )
2020-03-31 15:28:31 +05:30
Deepesh Garg
4d9fe69ba5
fix: Test cases
2020-03-31 14:17:53 +05:30
Deepesh Garg
c014c802dd
fix: Remove comments
2020-03-30 22:50:29 +05:30
Deepesh Garg
c33412b6ae
feat: Link blanket order and quotation
2020-03-30 22:44:13 +05:30
Saqib Ansari
b345fe0fe9
chore: hyperlinks in cannot cancel message
2020-03-28 20:11:26 +05:30
Rohan
ea182051d3
fix: consumed qty values in work order
2020-03-26 15:32:01 +05:30
Rohan
4464a591ef
fix: allow BOM to use same item as raw material
2020-03-20 18:49:08 +05:30
marination
73c8d23a79
fix: UOM fixes in Sales Order,Material Request & Production Plan
2020-03-20 17:52:28 +05:30
Deepesh Garg
9476170b09
Merge pull request #20994 from rohitwaghchaure/fixed_bom_comparision_issue_develop
...
fix: bom comparison issue
2020-03-19 10:55:14 +05:30
Rohit Waghchaure
d9469137cc
fix: bom comparison issue
2020-03-19 10:07:27 +05:30
Rohit Waghchaure
dd13d0a9a9
fix: reserved qty for production issue for partial completion of work order
2020-03-19 09:29:17 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis ( #20924 )
...
* fix: Multiple fixes for travis
* fix: Multiple fixes for travis
* fix: Run dashboard patch if table already exists
* fix: Multiple fixes for travis
* fix: deletion of auto-created batch
2020-03-17 17:04:18 +05:30
rohitwaghchaure
06dc6a527e
fix: bom replace tool issue ( #20842 )
2020-03-17 17:01:26 +05:30
Shivam Mishra
451382e08e
feat: update desk pages
2020-03-12 16:34:34 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk
2020-03-10 18:20:27 +05:30
Shivam Mishra
0310366d5a
fix (cleanup): remove incomplete dependencies data
2020-03-05 11:28:40 +05:30
Shivam Mishra
1f151c1032
refactor: update restrict to domain data
2020-03-02 19:37:12 +05:30
Shivam Mishra
3f59af3ef1
feat: added base config for domains
2020-03-02 17:25:18 +05:30
Yugandhara
ce1f6a73e2
fix: Changes done to get valid sales order list on production plan form( #20609 )
2020-02-15 16:31:53 +05:30
Yugandhara
e997168a23
fix: unused variable cdn removed
2020-02-15 16:14:46 +05:30
Yugandhara
af2b39891e
fix: Changes done to get valid sales order list on sales order child table of production plan
2020-02-15 16:01:41 +05:30
abhijitkumbharIND
a67ae3ad31
fix: Production Plan | Get items from Sales Order not fetching grand total value. #20568
2020-02-11 16:45:59 +05:30
rohitwaghchaure
716a85d81a
Merge pull request #20485 from rohitwaghchaure/source_warehouse_for_the_work_order
...
feat: added source warehouse field in the work order
2020-02-03 16:32:19 +05:30
Rohit Waghchaure
adbe291498
feat: added source warehouse field in the work order
2020-01-31 13:09:06 +05:30
Suraj Shetty
2f67647f7b
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations
2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9
fix: Incorrect translation syntax
2020-01-29 15:06:18 +05:30
rohitwaghchaure
da9a3936e1
fix: incorrect work order qty for sub assembly items ( #20449 )
2020-01-28 14:34:27 +05:30
Shivam Mishra
149b4e5985
chore: warn bom naming conflict ( #20244 )
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-01-27 15:20:30 +05:30
abhijitkumbharIND
0eb6f06685
fix: Gives a 404 error when clicked on the Download Required Material button while the form is not saved ( #20355 )
2020-01-21 19:16:32 +05:30
abhijitkumbharIND
b2f08a7a42
fix: Gives a 404 error when clicked on the Download Required Material button while the form is not saved ( #20355 )
2020-01-21 19:16:32 +05:30
rohitwaghchaure
6ae61a1693
fix: incorrect number of gl entries issue ( #20352 )
2020-01-20 17:53:19 +05:30
Rohan
ef734ee850
fix: handle default value for batch size in BOM operation ( #20328 )
2020-01-17 11:45:54 +05:30
Nabin Hait
e321fbb0d5
fix: Multiple fixes based on testing on pre-release branch ( #20301 )
...
* fix: Multiple fixes based on testing on pre-release branch
* fix: reload hr settings
2020-01-16 13:37:25 +05:30
rohitwaghchaure
d821c58a5e
fix: capacity planning validation ( #20317 )
2020-01-16 11:29:08 +05:30
Ishan Loya
fe0adc8b25
fix: read WIP warehouse from work order ( #20131 )
...
* fix: read wip_warehouse from work order in stock entry even if skip transfer is checked
* fix: remove skip_transfer in stock entry
Related to #10753
2019-12-30 12:19:08 +05:30
rohitwaghchaure
59a835602a
fix: service item's cost showing incorrect amount in stock entry ( #20106 )
2019-12-30 11:42:06 +05:30
Ishan Loya
b2a1ae77ce
Remove default BOM filter in Work Order ( #20117 )
...
Not all companies use default BOM (e.g. construction companies, etc.)
2019-12-27 17:06:34 +05:30
rohitwaghchaure
6e8a9286c2
fix: multiple stock entry issues for the work order ( #18686 )
...
* fix: multiple stock entry issues for the work order
* Update work_order.py
* Update work_order.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2019-12-24 18:53:32 +05:30
Rohit Waghchaure
4203eb4ee1
fix: not able to make work order from BOM
2019-12-17 18:19:26 +05:30
rohitwaghchaure
3772b2e03e
Merge pull request #19962 from rohitwaghchaure/allow_overproduction_against_work_order
...
fix: now allow to over production against work order
2019-12-17 17:16:24 +05:30
Rohit Waghchaure
b5bf22a821
fix: now allow to over production against work order
2019-12-16 16:53:00 +05:30
Rohit Waghchaure
197a99ee35
fix: incorrect children boms fetched
2019-12-16 16:20:47 +05:30
rohitwaghchaure
797481f9d5
Merge pull request #19802 from rohitwaghchaure/job_card_calendar_new_enhancement
...
fix: Manufacturing UX, added calendar view for job card
2019-12-11 13:01:16 +05:30
Rohit Waghchaure
502189913a
fix: 'NoneType' object is not iterable
2019-12-07 14:10:11 +05:30
Rohit Waghchaure
8ab8376975
fix: Manufacturing UX, added calendar view for job card
2019-12-06 17:40:09 +05:30
rohitwaghchaure
cfbf895876
Merge pull request #19498 from marination/stock_entry_bom_fetch
...
feat: Provision to fetch items from multiple BOMs in Stock Entry
2019-12-04 21:44:47 +05:30
ronelvcabrera
370cdc0170
feat(Sales/Purchase Order): optional to reference a Blanket Order ( #19612 )
2019-12-04 16:07:11 +05:30
rohitwaghchaure
36b60dbbef
Merge pull request #19441 from rohitwaghchaure/capacity_planning_for_workstataion_feature
...
fix: capacity planning back
2019-12-03 15:23:06 +05:30
Anurag Mishra
de5237fbd5
refactor: Report BOM Sock Calculated ( #19431 )
2019-12-02 17:08:12 +05:30
rohitwaghchaure
ce32f9a361
Merge branch 'develop' into capacity_planning_for_workstataion_feature
2019-12-02 11:29:06 +05:30
Rohit Waghchaure
8c6bc34bc4
added test cases
2019-11-29 18:42:20 +05:30
rohitwaghchaure
c9afe2f707
Merge pull request #19602 from Anurag810/bom-explorer-report-fix
...
fix: Raw material qty depending on the quantity of the parent BOM
2019-11-29 16:18:30 +05:30
Rohit Waghchaure
8b599f2bc9
fix: capacity planning back
2019-11-29 14:09:30 +05:30
Suraj Shetty
9d6d95c4a2
fix: valuation of "finished good" item in purchase receipt ( #19268 )
...
* fix: Remove redundant purchase orders and unwanted condition
* fix: [WIP] Purchase receipt value
* fix: Add raw material cost based on transfered raw material
* fix: get_qty_to_be_received
* fix: Remove debugger statement
* fix: Reset rm_supp_cost before setting subcontracted raw_materials
* test: Fix and modify tests for backflush_based_on_stock_entry
* fix: Add non stock items to Purchase Receipt from Purchase Order
* fix: Ignore valuation rate check for non stock raw material
* fix: Rename check all rows
* fix: Remove amount from test
* test: Fix item rate error
* fix: handling of serial nos in backflush
* fix: Add serial no. of raw materials
* fix: [WIP] Handle Batch nos for purchase reciept backflushed raw material
* fix: Raw material batch number selection in purchase receipt
* Update test_purchase_order.py
2019-11-29 13:26:52 +05:30
Rohit Waghchaure
9326fb78f2
fix: BOM UX
2019-11-25 18:56:18 +05:30
rohitwaghchaure
a85ddf2fb4
fix: performance issue of sales invoice while save/submit ( #19598 )
...
* fix: performace issue of sales invoice while save/submit
* Cached price list data, item group child data, added indexing for blanket order
2019-11-19 18:47:48 +05:30
Anurag Mishra
c0d8233a8b
fix: Raw material qty depending on the quantity of the parent BOM
2019-11-18 15:45:53 +05:30
rohitwaghchaure
6424416886
fix: sales order item shwoing incorrect produced qty ( #19584 )
2019-11-15 14:18:45 +05:30
rohitwaghchaure
16f6ca12a7
Merge pull request #19023 from Alchez/dev-work-order-bugs
...
fix: Work Order operating cost re-calculation on client-side (develop)
2019-11-15 11:19:10 +05:30
rohitwaghchaure
e942f99897
Update work_order.js
2019-11-14 15:26:18 +05:30
rohitwaghchaure
d064505ebe
fix: incorrect produced qty in the production plan ( #19569 )
2019-11-13 18:17:48 +05:30
Rohan
4d27b50437
Merge branch 'develop' into dev-work-order-bugs
2019-11-13 13:09:12 +05:30
MorezMartin
4fa6194009
feat: [production_plan -> fetching item description] Fetch item description from Material Request or Sales Order ( #19541 )
...
* Change packed item
* Remove description field on update_packed_items
* add possibility to modify description on packed items
* Fetch description from Material Request or Sales Order in production plan, add the possibility to modify the description un production plan
* sync with fork
* Fetch description from Material Request or Sales Order in production plan, Add the possibility to modify description in production plan
* code cleaning syncing fork
* code cleaning syncing fork
* code cleaning syncing fork
* code cleaning syncing fork
* rewied and add item_details.description in case of blank field
2019-11-12 18:19:01 +05:30
rohitwaghchaure
df75b7693a
fix: added description, uom fields in material request plan item table ( #19463 )
2019-11-11 10:59:10 +05:30
Deepesh Garg
7a23057eab
feat: Enhancement in landed cost voucher ( #19252 )
...
* feat: Enhancement in landed cost voucher
* fix: Make GL entries based on ledgers in Landed cost voucher
* fix: Patch to update expense account in Landed Cost Voucher and Stock Entry
* fix: Ability to select expense account in Stock Entry
* fix: Renaming and test case fixes
* fix: Test Cases
* fix: Additional cost in Stock Entry
* fix: Changed filters and test case fixes
* fix: Upadte filters in stokc entry expense account filter
* fix: company filter
2019-11-08 12:52:54 +05:30
Suraj Shetty
7508896bfb
perf: Optimise BOM Update Tool ( #19236 )
...
* perf: Optimize BOM update tool
- Remove redundant traverse_tree calls
- Cache bom_children data
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
* fix: Replace get_list with db.sql
* fix: Enable versioning for updated BOM
* fix: Directly save doc_before_save from bom obj instead of using load_doc_before_save
* fix: recurssion check performance issue
2019-11-06 18:46:57 +05:30
Saqib
01c19d3b93
internal issues ( #19496 )
...
* fix: user remark mandatory in quick entry but not in form
* fix: preview salary slip btn showing in draft and unsaved states
* minor: removed unecessay comma
* fix: department analytics report showing departments of all companies
2019-11-06 14:41:16 +05:30
Rohan
f527713b89
Merge branch 'develop' into dev-work-order-bugs
2019-11-06 11:39:24 +05:30
marination
075f6ea0d5
feat: Provision to fetch items from BOM in Stock Entry
...
Items are populated in child table and amounts are calculated
Warehouse Fields in popup toggle based on Stock Entry Type
2019-11-04 21:58:13 +05:30
Rohit Waghchaure
1bb5d01192
fix: Wrong warehouse fetched in production plan
2019-11-01 14:24:21 +05:30
Anurag Mishra
a11e738801
feat: Stock value and account balance sync. ( #19233 )
...
* feat: Allow user to sync stock_value and account_balance jv if perpetual inventory is checked
* fix(test): Sales Invoice
* fix(test): Purchase Invoice
* fix(test): Delivery Note
* fix: more test_case
* fix(test): Stock Entry
* fix(test): Purchase Receipt
* fix(more-test): Stock Entries
* fix(more-test): Sales Invoice and Delivery Note
* fix: tests for delivery note
* fix: tests for stock reconciliation
* refactor: stock and account balance function
* fix(more-test): Warehouse
* fix(test): Landed Cost Voucher
* fix: changes requested
2019-10-31 15:55:03 +05:30
rohitwaghchaure
7b6ab9738d
Merge pull request #19446 from rohitwaghchaure/not_able_to_select_project_in_work_order
...
fix: not able to select the project in the work order
2019-10-30 16:32:34 +05:30
Deepesh Garg
fac4eb919b
Merge pull request #19445 from scmmishra/typo-fix
...
fix: typo in production plan
2019-10-30 16:03:56 +05:30
Mangesh-Khairnar
83c7b5b44b
fix(bom): maintain a default bom for an item ( #19407 )
2019-10-30 14:25:50 +05:30
Rohit Waghchaure
486a8f67a4
fix: not able to select the project in the work order
2019-10-30 14:22:49 +05:30
Anurag Mishra
5c9d92eabf
fix: On Specific case if no item code in name ( #19419 )
2019-10-30 14:18:16 +05:30
Shivam Mishra
d8abac3278
fix: typo in production plan
2019-10-30 14:06:56 +05:30
Rohan
379f38e1cd
Merge branch 'develop' into dev-work-order-bugs
2019-10-29 11:25:53 +05:30
Deepesh Garg
453ad3c155
Merge branch 'develop' into develop
2019-10-22 17:30:13 +05:30
Rohan
ee5f0f7c30
Merge branch 'develop' into dev-work-order-bugs
2019-10-22 17:12:00 +05:30
Anurag Mishra
b7e9e2a1a5
fix: if naming if item-code and index both are same ( #19371 )
2019-10-22 11:47:03 +05:30
Khushal Trivedi
e22ca23b81
fix: fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order
2019-10-21 18:17:42 +05:30
Khushal Trivedi
ad71307a5e
fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order
2019-10-21 17:46:35 +05:30
Khushal Trivedi
ce5c2d8682
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-10-21 17:36:19 +05:30
Khushal Trivedi
cdebd400ec
[Fix] - changed codacy changers suggested
2019-10-21 16:29:16 +05:30
Deepesh Garg
4821f38d25
fix: Item Price changes are not persistent after updating cost on submitted BOM ( #19356 )
2019-10-21 13:27:40 +05:30
Khushal Trivedi
8750caa8e3
[Fix] - if its not multi company set it by default on BO
2019-10-18 17:01:16 +05:30
Rohan
d389ee457c
Merge branch 'develop' into dev-work-order-bugs
2019-10-16 15:08:58 +05:30
Khushal Trivedi
5f4b6d267c
[Fix] - making customer/supplier field manadatory on order type condition on BO
2019-10-16 13:40:58 +05:30
Khushal Trivedi
7084f07dab
[Fix] - making customer/supplier field manadatory on order type condition on BO
2019-10-16 13:40:33 +05:30
Khushal Trivedi
1675181e49
[Fix] - making customer/supplier field manadatory on order type condition on BO
2019-10-16 12:02:56 +05:30
Khushal Trivedi
01f8a4966a
[Fix] - making customer/supplier field manadatory on order type condition
2019-10-16 11:40:27 +05:30
Khushal Trivedi
e2bb950012
[fix] - from date cannot be greater than to date on blanket order
2019-10-15 15:03:13 +05:30
Mangesh-Khairnar
4ed9b45fb8
feat(Sales Order): Allow to skip delivery note creation ( #19222 )
...
* feat(sales-order): add option to skip delivery note creation for order type maintenance
* fix(sales-order): hide delivery date on setting skip delivery note creation
* fix: allow skipping delivery note for all order types
* fix: bypass delivery note creation on setting skip delivery note creation
* fix: show skip delivery note in list view
* fix: check for duplicate project name after submitting prompt
* fix: toggle delivery note reqd for skip delivery note
* fix: update status based on skip delivery note
2019-10-12 19:33:11 +05:30
rohitwaghchaure
86870b0aa6
fix: production plan not showing grand total against sales order ( #19283 )
2019-10-12 16:49:38 +05:30
rohitwaghchaure
a0c162c2d6
fix: project has not set in the sub assembly work order from production plan ( #19284 )
2019-10-12 16:48:57 +05:30
Rohan
d8cbbc7d65
Merge branch 'develop' into dev-work-order-bugs
2019-10-10 17:47:31 +05:30
Shivam Mishra
ba2faecdc7
fix: null check for valuation rate ( #19195 )
...
* fix: null check for valuatiomn rate
* fix: add rate for item in test records
* refactor: use flt instead of throwing error
* Revert "fix: add rate for item in test records"
This reverts commit f8cebe65f5fe32382aba842f765d263511cbb082.
2019-10-04 11:58:04 +05:30
rohitwaghchaure
f4245a2d9c
minor: show BOM related operations ( #19237 )
2019-10-03 11:41:36 +05:30
Marica
de15cc1387
fix: Work order dialog box 'Select Quantity' on clicking 'Finish' ( #19136 )
...
The dialog box fetched 0 as Quantity to Manufacture and Max Quantity on finishing a Work Order
2019-09-30 15:36:33 +05:30
rohitwaghchaure
8d889ef80e
fix: update the pending qty in production plan on completion of work order ( #19180 )
2019-09-30 15:22:12 +05:30
Rohan
60b852bb12
Merge branch 'develop' into dev-work-order-bugs
2019-09-30 13:08:12 +05:30
Rucha Mahabal
34326470b8
fix: produced_qty field hidden and not updated in sales order item ( #19037 )
...
* fix: produced_qty field hidden and not updated in sales order item
* fix: added patch for old sales orders
* fix: produced_qty for sales order item linked to multiple work orders
* fix: comment
* fix: function for updating produced_qty in SO Item
* fix: remove frappe.db.commit
2019-09-30 12:15:39 +05:30
Rohan
a51a304cf0
Merge branch 'develop' into dev-work-order-bugs
2019-09-24 11:53:00 +05:30
Mangesh-Khairnar
5dcf2c669f
chore: remove unlinked letter head references ( #19138 )
2019-09-24 09:53:06 +05:30
Rohan
8a097c8627
fix: only set times if job card is filled ( #19107 )
2019-09-18 20:05:49 +05:30
rohitwaghchaure
780fb8a4e5
fix: set stock adjustment account for the raw materials instead of COGS ( #19090 )
2019-09-17 18:46:49 +05:30
Nabin Hait
57835f0a37
fix: Company is required to get bin details ( #19058 )
2019-09-16 14:48:16 +05:30
Rohan
a656151ee9
fix: operating cost calculation in JS
2019-09-12 16:00:25 +05:30
rohitwaghchaure
bb736248a2
fix: incorrect qty calculation in the production plan fopr the sub assembely work orders ( #18970 )
2019-09-11 10:20:49 +05:30
Nabin Hait
4726fc4893
fix: Deleted unwanted production order files
2019-09-06 15:45:17 +05:30
Rohan
1635967c4e
fix: attribute error when trying to fetch items ( #18900 )
2019-09-05 12:16:49 +05:30
Suraj Shetty
88885184dc
fix: Show separate button for pick list creation in work order
2019-08-30 09:30:18 +05:30
Suraj Shetty
a6ab00162e
style: Remove commented code
2019-08-29 20:17:04 +05:30
Suraj Shetty
55a2699f4c
fix: Update dashboard of doctypes that are linked with pick list
2019-08-29 09:14:27 +05:30
Suraj Shetty
f455c92d02
fix: Remove Pick List Reference Item use Item locations table instead
2019-08-28 17:44:22 +05:30
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
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
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
Shreya Shah
a5add289bb
Refactor Naming Series ( #15070 )
...
* Patch to create Property Setter for existing naming series
* Update existing naming series options with new
* Add patch link to patches.txt
* Update patch
* Fix codacy
* Fix as per suggestions
* Remove old patch for property setter
* Improve as per suggested
- Modified the naming
- Also refactored naming for doctypes having autoname with series
- Added a patch to make property setter for autoname
* Fix Travis
* Rebase with develop
2018-08-28 13:44:48 +05:30
rohitwaghchaure
c5cf428d00
[Enhance] Provision to backflush raw materials from WIP warehouse ( #15184 )
2018-08-24 11:27:41 +05:30
Nabin Hait
8fe8d1758a
Permissions issue in BOM tree
2018-08-23 16:25:51 +05:30
Rushabh Mehta
708e47aadf
optimize(various)
2018-08-08 16:37:31 +05:30
KanchanChauhan
0c3d345a9f
[Minor] Moved mandatory Company field from More Information section to top ( #14950 )
2018-07-19 14:39:31 +05:30
Faris Ansari
9e874af9ba
Query report print ( #14935 )
...
* QueryReport
- Only print visible columns in report
- Use get_columns_for_print method instead of directly
accessing report.columns
* Query Report
- Replace frappe.query_report_filters_by_name with new API
2018-07-18 09:28:44 +05:30
rohitwaghchaure
526ab2ca30
[enhance] Allow transfer for manufacture in the BOM ( #14891 )
...
* [enhance] Allow transfer for maufacture in the BOM
* Added patch
* Fix codacy
* Fixed typo and added test cases
2018-07-15 20:04:41 +05:30
Saurabh
1cfcf70905
Resolved merge conflicts
2018-07-06 13:18:44 +05:30
Nabin Hait
d4453aef68
Fixed permission issue
2018-07-04 16:38:10 +05:30
rohitwaghchaure
205eae322b
[Fix] BOM replace timeout issue ( #14782 )
2018-07-03 15:06:38 +05:30
Manas Solanki
ee32a78e9f
Update bom_stock_calculated.py
2018-06-29 13:33:32 +05:30
Nabin Hait
7324815fdb
map payment terms template from SO to SI
2018-06-28 23:12:02 +05:30
rohitwaghchaure
e27b85de4f
Added test cases for Overproduction against Work Order / Sales Order ( #14704 )
2018-06-28 12:48:28 +05:30
Shreya
32b57da335
Make supplier_name and customer_name fields read only
2018-06-27 15:20:33 +05:30
Shreya
18bed504dc
Set target qty 0
...
If the ordered qty exceeds the quantity in blanket order items, on routing to a new Purchase order or Sales order, set target qty as 0 to avoid negative qty.
2018-06-27 15:14:43 +05:30
Ranjith Kurungadam
ce26610d39
Fix tax calculation ( #14635 )
...
* Salary Detail - field is_additional_component
* TDS fix - exclude additional component from monthly salary, but add to annual income to calculate tax
* fix indentation
2018-06-22 15:39:49 +05:30
umaepoch
0484547150
BOM Stock Calculation Report ( #14561 )
...
* BOM Stock Calculated
* BOM Stock Calculated
* BOM Stock Calculated
* BOM Stock Calculated
* BOM Stock Calculated
* Update bom_stock_calculated.json
2018-06-21 11:27:54 +05:30
Ameya Shenoy
22c2f472e3
Merge branch 'master' into develop
2018-06-15 09:35:06 +00:00
Nabin Hait
2737b08f0f
blanket order related fixes
2018-06-14 18:07:34 +05:30
Manas Solanki
c7afbea708
Update bom.py ( #14524 )
2018-06-14 17:30:26 +05:30
Nabin Hait
b2d3c0f040
Update ordered qty in blanket order
2018-06-14 15:56:29 +05:30
Manas Solanki
9a31dd7062
test + documentation
2018-06-14 15:56:29 +05:30
Manas Solanki
2df1b31707
[minor] minor fixes along with the codacy
2018-06-14 15:55:38 +05:30
Manas Solanki
e5e87f7137
[feature] Blanket Order
...
- Creaete Sales or Purchase order from the blanket order
- If there is any blanket order for the customer/supplier rates will be fetched from that order
- Manually selecting the Blanket order will change the rates accordingly
- Upon submission of the order, the ordered qty will be updated in the Blanket Order
2018-06-14 15:55:38 +05:30
Manas Solanki
2fb63e1724
init the blanket order
2018-06-14 15:55:37 +05:30
Rohit Waghchaure
86026d31cf
[Fix] Alternative item, transferred qty issue for backflush method
2018-06-11 14:11:00 +05:30
rohitwaghchaure
8fc64a9717
[Fix] Travis data ( #14422 )
2018-06-08 14:43:50 +05:30
Alchez
31ab64822c
Make the item UOM more visible ( #14315 )
2018-06-05 10:35:55 +05:30
rohitwaghchaure
05152dad0b
[Enhance] Provision to set overproduction percentage for work order ( #14248 )
2018-05-30 15:28:09 +05:30
Suraj Shetty
084b0b3a67
Treeview permission ( #14232 )
...
* Replace frappe.db.sql to frappe.get_list to apply permissions (#14037 )
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.
* Fix codacy
- Remove trailing whitespace
* Add parent filter
* Add ifnull checks
2018-05-26 09:12:59 +05:30
Nabin Hait
b903fc4e71
Item defaults query fixes
2018-05-24 17:07:51 +05:30
neckos
225af4a4cb
unicode error in python3 ( #14192 )
2018-05-23 19:43:53 +05:30
Nabin Hait
5f861756a2
Item Default fixes
2018-05-23 19:37:06 +05:30
Prateeksha Singh
b434f2687e
[charts] update, without new build system
2018-05-21 18:04:50 +05:30
rohitwaghchaure
eff678d2d6
Merge pull request #13918 from manassolanki/item-level-defualts
...
[enhancement] add the item defaults in the child-table for multi-company
2018-05-16 14:04:47 +05:30
Suraj Shetty
fbb6b3da5f
Undo replace of frappe.db.sql with frappe.get_list ( #14074 )
2018-05-16 13:53:31 +05:30
Rushabh Mehta
0b628386de
[minor] remove in_dialog old property
2018-05-16 12:51:22 +05:30
Manas Solanki
087a2259d9
update for default warehouse
2018-05-16 12:44:07 +05:30
rohitwaghchaure
e48b47fc0c
Production Plan, do not consider the sales orders against which work order has been created ( #13800 )
...
* Production Plan, do not consider the sales orders against which work order has been created
* Added test cases
2018-05-16 11:07:55 +05:30
Doridel Cahanap
e42192bb6c
[WIP] Alternative items ( #13705 )
...
* Alternative Items in BOM
* Alternative Items in Work Order
2018-05-16 10:58:39 +05:30
Suraj Shetty
8501010f12
Replace frappe.db.sql to frappe.get_list to apply permissions ( #14037 )
...
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.
* Fix codacy
- Remove trailing whitespace
2018-05-16 10:44:38 +05:30
Shreya
3f77852e93
Pass buying or selling as filter parameters
...
Wherever get_exchange_rate is called, pass filter buying or selling on the basis of doctype.
2018-05-15 17:22:06 +05:30
Faris Ansari
a7387b45ec
[fix] Get items from BOM error in python 3 ( #14012 )
2018-05-14 14:05:52 +05:30
Saurabh
e85a43c1c6
Merge branch 'master' into develop
2018-05-02 14:48:10 +05:30
Shreya
eb54331d5f
removed color field from sales order and work order
2018-05-01 18:56:06 +05:30
Shreya
a7b2fc9250
color field for calendar in sales order and work order
2018-05-01 18:55:17 +05:30
Faris Ansari
bd99606a14
Change msgprint to unobtrusive alert
2018-05-01 10:52:02 +05:30
Kanchan Chauhan
7826dd1aeb
Typo Fix in Work Order
2018-04-25 13:48:47 +05:30
Doridel Cahanap
ad76f9ad70
[Enhancement] Work Order Material Consumption ( #13384 )
...
* Work Order Material Consumption
* Test cases and other minor fixes
* Test cases fixes
* Travis Fixes
* Work Order Material Consumption Request Changes
* Update work_order.js
2018-04-09 10:31:28 +05:30
Gaurav Naik
03016e5000
Exploded view for BOM Stock Report ( #12506 )
...
* Multilevel BOM Stock Report prototype
* Rechristened multilevel to exploded view
* Removed trailing whitespace in line 16. Replaced spaces with tabs for indentation
* Used BOM Explosion item in query for exploded view
* Removed trailing whitespaces for Codacy compliance
2018-03-30 13:03:19 +05:30
Nabin Hait
ff2e4c898a
Fixed merge conflict
2018-03-29 13:57:39 +05:30
rohitwaghchaure
badc855400
[Fix] BOM validation issue for scrap item ( #13429 )
2018-03-29 13:48:38 +05:30
rohitwaghchaure
a3c3dec5a2
[enhance] Item Alternative ( #13121 )
...
* [enhance] Item Alternative
* Added two way provision in item alternative
* Test Cases
* documentation
2018-03-28 11:51:44 +05:30
Nabin Hait
b9c82b9790
Fixed merge conflict
2018-03-27 14:25:27 +05:30
Shreya Shah
f3025f1596
operation time in grid view ( #13400 )
2018-03-27 10:34:05 +05:30
Faris Ansari
34dd079a68
Remove unnecessary columns Analytics Reports ( #13344 )
2018-03-22 11:12:02 +05:30
Zarrar
13ddc7e188
[ Enhance ] Production to Work Order ( #12902 )
...
* remove occurrences of Production Order
* rename from report and jsons
* Change Production Order to Work Order
* change occurences of production order from other files
* resolve minor conflict issues and reports
* patch added
* codacy fix
* updated patches, leftover changes
* rename reports, rectify patches
2018-03-20 12:38:43 +05:30
Achilles Rasquinha
cbfcb3e61d
string_types from basestirng
2018-03-12 19:15:29 +05:30
Nabin Hait
2c7a6e6b43
Reserve for subcontracting ( #13195 )
...
* [fix] #8427
* review comments changes
* Validation for reserved warhouse
* code improvements
* alignment
* test case
* message changes
* default warehouse / remove validation / change sql
* fix
* patch
* Fixed merge conflict
* Fixes and cleanups of reserve qty for subcontracting
* set from_warehouse only if purchase_order and purpose found (#12398 )
* [HotFix] Validation issue for subcontract stock entry (#12127 )
* [Fix] Validation issue for subcontract stock entry
* Update stock_entry.py
* Fixes and cleanups of reserve qty for subcontracting
* patch fixed
* Reload bin in patch
* [fix] set source warehouse in stock entry for manufacture
* [fix] #8540
* code alignment
* code alignment
* Move target warehouse validation to submit
* validation code improvement
* code changes for single stock entry
* validation fix
* call make_rm_stock_entry
* remove old stock entry method/rewrite test case
* Don't set bom_no against raw materials while trasferring items for sub-contracting
* minor fix
2018-03-12 14:12:12 +05:30
Prateeksha Singh
9362cf37e0
[charts] update charts API
2018-03-12 09:54:56 +05:30
Achilles Rasquinha
b4de7e3d07
removed has_key, used pythonic in ( #13236 )
...
* removed has_key, used pythonic in
* Update bom.py
2018-03-09 12:35:47 +05:30
Nabin Hait
c43c95e0aa
Fixed merge conflict
2018-03-05 14:54:44 +05:30
rohitwaghchaure
a942722619
[Fix] Timeout issue while saving multilevel BOM ( #13118 )
2018-03-01 13:15:25 +05:30
Zarrar
502af4dd67
display image fnd description for root BOM also ( #13099 )
2018-03-01 10:44:47 +05:30
Achilles Rasquinha
646522886c
self.assertEqual
2018-02-28 21:13:51 +05:30
Achilles Rasquinha
a3555aa7bd
[FIX] sorting multiple compares
2018-02-23 17:22:07 +05:30
Nabin Hait
cf72d7f135
Fixed merge conflict
2018-02-22 14:47:26 +05:30
rohitwaghchaure
23a2b65576
[Fix] BOM Update Tool not update grandparent's exploded BOM ( #13026 )
2018-02-22 11:32:09 +05:30
rohitwaghchaure
4e8fdf7b3f
[Enhance] Quality Inspection Template ( #12988 )
...
* [Enhance] Quality Inspection Template
* Test case and patch
* Update make_quality_inspection_template.py
2018-02-22 11:03:48 +05:30
Zarrar
67f74414c4
disable expand_all button for BOM ( #13015 )
2018-02-21 14:46:41 +05:30
rohitwaghchaure
e2558308f6
[enhance] Production Plan ( #12160 )
...
* [enhance] Production plan
* Test cases
* Removed production planning tool
* Documentation
* Added actual qty in material request production item
* Renamed field 'Use Multilevel BOM' to 'Include Exploded Items'
2018-02-20 12:20:00 +05:30
rohitwaghchaure
5a5f73e46a
Merge pull request #12602 from PawanMeh/fixes_8540
...
Select multiple raw material items for Sub Contract Stock Entries
2018-02-15 18:54:29 +05:30
Saurabh
2735701aab
resolved merge conflicts
2018-02-14 11:51:09 +05:30
Faris Ansari
5a91989665
Remove total_projected_qty ( #12889 )
2018-02-13 16:00:52 +05:30
Achilles Rasquinha
56b2e12af8
Python 3 fixes [merge asap] ( #12884 )
...
* Python 3 fixes
* fixed compare
2018-02-13 14:42:40 +05:30
rohitwaghchaure
7477899d2e
Formatter, code cleanup ( #12852 )
2018-02-12 11:25:58 +05:30
pawan
5f779eb805
validation fix
2018-02-08 09:07:58 +05:30
pawan
2b885beaee
code changes for single stock entry
2018-02-07 19:06:18 +05:30
Nabin Hait
2ef1f84041
Fixed merge conflict
2018-02-03 09:14:53 +05:30
Nabin Hait
2aba97bff1
Fetch items from BOM in Material Request
2018-02-01 18:52:50 +05:30
Nabin Hait
ec2c9ec897
Merge branch 'master' into develop
2018-01-31 15:39:16 +05:30
Zarrar
dea99cc3a8
treeview not set when routed from bom form ( #12707 )
2018-01-31 13:07:04 +05:30
Nabin Hait
dba5e7645b
Minor fix in old patch
2018-01-30 16:38:47 +05:30
Rohit Waghchaure
c987500e08
Merge branch 'master' into develop
2018-01-19 13:29:57 +05:30
Rohit Waghchaure
2f3ad64bd6
[Fix] Precision issue while making material requests from production planning tool
2018-01-19 12:47:55 +05:30
Gaurav Naik
dc0db3a652
Exploded view for BOM Stock Report ( #12506 )
...
* Multilevel BOM Stock Report prototype
* Rechristened multilevel to exploded view
* Removed trailing whitespace in line 16. Replaced spaces with tabs for indentation
* Used BOM Explosion item in query for exploded view
* Removed trailing whitespaces for Codacy compliance
2018-01-17 16:12:55 +05:30
Manas Solanki
b19fd57043
[fix] set required quantity if item in bom found ( #12460 )
2018-01-12 16:28:30 +05:30
Saurabh
15d53c7912
[fix] key error ( #12257 )
2018-01-01 16:17:14 +05:30
rohitwaghchaure
a84d38999c
[Fix] Sales order erased on production order on selection of sales order ( #12225 )
2017-12-28 18:45:27 +05:30
Nabin Hait
92615901a7
Fixed merge conflict
2017-12-25 13:41:04 +05:30
rohitwaghchaure
d8c6449f3a
[Fix] Bom raw materials not in order in the stock entry ( #12149 )
2017-12-25 11:26:40 +05:30
Ameya Shenoy
87b7844ae8
[Agri] Item amount set on item set ( #12091 )
...
* [Agri] Item amount set on item set
- closes #12008
- fixes #12010
* used frappe.call instead of frm.call in crop
* made modifications for sql query for BOM Item
- done since Crop doctype in Agri module also uses 'BOM Item' child table
* hide BOM no from BOM Item childtable in Crop
2017-12-20 12:00:24 +05:30
Nabin Hait
13435dddcc
BOM: Fetch valuation rate of raw materials from Item master if not found based on SLE
2017-12-15 15:46:43 +05:30
rohitwaghchaure
40f5d8edd4
[fix] Pull subcontracted item if subassembly is not defined ( #11996 )
2017-12-13 18:51:05 +05:30
Nabin Hait
0f97eda7c9
Merge branch 'master' into develop
2017-12-12 19:17:53 +05:30
Maxwell Morais
d06b7049c7
Allow manufacturing order from SO with Packed Items that contains BOM's ( #11947 )
2017-12-12 14:46:16 +05:30
Nabin Hait
de1e29bf1b
Production Order fixes ( #11951 )
...
* Production Order from Sales Order fixes: Validate SO and set required items on save
* Codacy fixes
2017-12-12 13:22:48 +05:30
Zarrar
17fd6610dc
Fix travis ( #11882 )
...
* fieldname wrong
* bifurcated test into two - error when both were running async
* minor fixes with link and route
* move school domain rename up
* fix async creation of operations test
* edit-in-full-page is button, not link
* set_route issue in production order test
* minor changes
* fix task tree test
* more fixes
* fix server side issue
* improvising ui tests
2017-12-08 14:57:38 +05:30
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
Saurabh
9d0092f89a
[fix] pull source warehouse from production order child table ( #11718 )
2017-11-27 12:04:41 +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
Prateeksha Singh
6b26e391b8
use the new frappe charts :D ( #11391 )
2017-10-31 12:58:48 +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
Prateeksha Singh
bfb108d722
Replace c3 ( #11112 )
...
* [charts] replace in asset.js
* replace in reports
2017-10-17 12:03:02 +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
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
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