Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Anand Doshi
2012-12-27 15:36:30 +05:30
10 changed files with 14 additions and 253 deletions

View File

@@ -1,49 +0,0 @@
[
{
"owner": "harshada@webnotestech.com",
"docstatus": 0,
"creation": "2010-09-01 15:47:59",
"modified_by": "Administrator",
"modified": "2011-09-15 15:04:43"
},
{
"match_id": 0,
"parent": "Project-Delivery Note",
"name": "__common__",
"doctype": "Table Mapper Detail",
"parenttype": "DocType Mapper",
"from_table": "Project",
"to_table": "Delivery Note",
"validation_logic": "name is not null",
"parentfield": "table_mapper_details"
},
{
"map": "Yes",
"match_id": 0,
"parent": "Project-Delivery Note",
"name": "__common__",
"to_field": "customer",
"doctype": "Field Mapper Detail",
"parenttype": "DocType Mapper",
"checking_operator": "=",
"from_field": "customer",
"parentfield": "field_mapper_details"
},
{
"name": "__common__",
"to_doctype": "Delivery Note",
"module": "Stock",
"doctype": "DocType Mapper",
"from_doctype": "Project"
},
{
"name": "Project-Delivery Note",
"doctype": "DocType Mapper"
},
{
"doctype": "Field Mapper Detail"
},
{
"doctype": "Table Mapper Detail"
}
]

View File

@@ -78,13 +78,6 @@ class DocType(TransactionBase):
def get_tc_details(self):
return get_obj('Sales Common').get_tc_details(self)
def pull_project_customer(self):
res = sql("select customer from `tabProject` where name = '%s'" % self.doc.project_name)
if res and res[0][0]:
get_obj('DocType Mapper', 'Project-Delivery Note').dt_map('Project', 'Delivery Note', self.doc.project_name, self.doc, self.doclist, "[['Project', 'Delivery Note']]")
def get_item_details(self, args=None):
import json
args = args and json.loads(args) or {}