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

[fixes] opportunity, task minor

Browse Source
This commit is contained in:
Rushabh Mehta 2015-02-23 14:40:19 +05:30
parent 281dc5d639
commit 93b2f167f8
4 changed files with 41 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/crm/doctype/opportunity/opportunity.json
View File

@ -48,7 +48,7 @@
"in_filter": 1,
"in_list_view": 0,
"label": "Customer",
"no_copy": 1,
"no_copy": 0,
"oldfieldname": "customer",
"oldfieldtype": "Link",
"options": "Customer",
@ -391,7 +391,7 @@
"icon": "icon-info-sign",
"idx": 1,
"is_submittable": 1,
"modified": "2015-02-21 06:18:43.345191",
"modified": "2015-02-23 02:19:39.853388",
"modified_by": "Administrator",
"module": "CRM",
"name": "Opportunity",

8
erpnext/crm/doctype/opportunity/opportunity.py
View File

@ -120,6 +120,14 @@ class Opportunity(TransactionBase):
if not self.get('items'):
frappe.throw(_("Items required"))
# set missing values
item_fields = ("item_name", "description", "item_group", "brand")
for d in self.items:
item = frappe.db.get_value("Item", d.item_code, item_fields, as_dict=True)
for key in item_fields:
if not d.get(key): d.set(key, item.get(key))
def validate_lead_cust(self):
if self.enquiry_from == 'Lead':
if not self.lead:

4
erpnext/projects/doctype/project_task/project_task.json
View File

@ -38,7 +38,7 @@
"in_list_view": 1,
"label": "Status",
"no_copy": 0,
"options": "Open\nClosed",
"options": "Open\nWorking\nPending Review\nClosed\nCancelled",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@ -143,7 +143,7 @@
"is_submittable": 0,
"issingle": 0,
"istable": 1,
"modified": "2015-02-22 11:53:23.317993",
"modified": "2015-02-23 01:55:18.865117",
"modified_by": "Administrator",
"module": "Projects",
"name": "Project Task",

70
erpnext/selling/doctype/opportunity_item/opportunity_item.json
View File

@ -20,14 +20,13 @@
"permlevel": 0
},
{
"fieldname": "item_name",
"fieldtype": "Data",
"fieldname": "qty",
"fieldtype": "Float",
"in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
"permlevel": 0,
"reqd": 1
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
"permlevel": 0
},
{
"description": "",
@ -62,6 +61,27 @@
"permlevel": 0,
"precision": ""
},
{
"fieldname": "uom",
"fieldtype": "Link",
"in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
"options": "UOM",
"permlevel": 0,
"search_index": 0
},
{
"fieldname": "item_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Item Name",
"oldfieldname": "item_name",
"oldfieldtype": "Data",
"permlevel": 0,
"reqd": 0
},
{
"fieldname": "description",
"fieldtype": "Text",
@ -71,7 +91,7 @@
"oldfieldtype": "Text",
"permlevel": 0,
"print_width": "300px",
"reqd": 1,
"reqd": 0,
"width": "300px"
},
{
@ -98,22 +118,6 @@
"permlevel": 0,
"precision": ""
},
{
"fieldname": "quantity_and_rate",
"fieldtype": "Section Break",
"in_list_view": 0,
"label": "Quantity and Rate",
"permlevel": 0
},
{
"fieldname": "qty",
"fieldtype": "Float",
"in_list_view": 1,
"label": "Qty",
"oldfieldname": "qty",
"oldfieldtype": "Currency",
"permlevel": 0
},
{
"fieldname": "basic_rate",
"fieldtype": "Currency",
@ -125,27 +129,11 @@
"options": "Company:company:default_currency",
"permlevel": 0,
"print_hide": 1
},
{
"fieldname": "col_break2",
"fieldtype": "Column Break",
"permlevel": 0
},
{
"fieldname": "uom",
"fieldtype": "Link",
"in_list_view": 0,
"label": "UOM",
"oldfieldname": "uom",
"oldfieldtype": "Link",
"options": "UOM",
"permlevel": 0,
"search_index": 0
}
],
"idx": 1,
"istable": 1,
"modified": "2015-02-12 15:18:08.997193",
"modified": "2015-02-23 02:09:55.105233",
"modified_by": "Administrator",
"module": "Selling",
"name": "Opportunity Item",