Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fixes] removed no copy for warehouse field

Browse Source
This commit is contained in:
Saurabh 2016-02-23 18:16:06 +05:30
parent 3724448cd3
commit ac33724656
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/selling/doctype/quotation/quotation.py
View File

@ -106,8 +106,7 @@ def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
"Quotation Item": { "Quotation Item": {
"doctype": "Sales Order Item", "doctype": "Sales Order Item",
"field_map": { "field_map": {
"parent": "prevdoc_docname", "parent": "prevdoc_docname"
"warehouse": "warehouse"
} }
}, },
"Sales Taxes and Charges": { "Sales Taxes and Charges": {

4
erpnext/selling/doctype/quotation_item/quotation_item.json
View File

@ -730,7 +730,7 @@
"in_list_view": 0, "in_list_view": 0,
"label": "Warehouse", "label": "Warehouse",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 0,
"options": "Warehouse", "options": "Warehouse",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@ -1032,7 +1032,7 @@
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2016-02-17 14:48:49.320786", "modified": "2016-02-23 18:12:49.939175",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation Item", "name": "Quotation Item",

3
erpnext/stock/get_item_details.py
View File

@ -164,8 +164,7 @@ def get_basic_details(args, item):
"net_amount": 0.0, "net_amount": 0.0,
"discount_percentage": 0.0, "discount_percentage": 0.0,
"supplier": item.default_supplier, "supplier": item.default_supplier,
"delivered_by_supplier": item.delivered_by_supplier, "delivered_by_supplier": item.delivered_by_supplier
"actual_qty": get_available_qty(item.name, user_default_warehouse or args.warehouse or item.default_warehouse)
}) })
# if default specified in item is for another company, fetch from company # if default specified in item is for another company, fetch from company