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

[fix] validate with prev doc

Browse Source
This commit is contained in:
Nabin Hait 2013-07-10 15:33:29 +05:30
parent cb04d0cd14
commit 6e68e0e5d8
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
setup/doctype/sales_person/test_sales_person.py
View File

@ -1,21 +1,25 @@
test_dependencies = ["Employee"]
test_records = [ test_records = [
[{ [{
"doctype": "Sales Person", "doctype": "Sales Person",
"sales_person_name": "_Test Sales Person", "sales_person_name": "_Test Sales Person",
"parent_sales_person": "All Sales Persons", "parent_sales_person": "All Sales Persons",
"is_group": "No" "is_group": "No",
"employee": "_T-Employee-0001",
}], }],
[{ [{
"doctype": "Sales Person", "doctype": "Sales Person",
"sales_person_name": "_Test Sales Person 1", "sales_person_name": "_Test Sales Person 1",
"parent_sales_person": "All Sales Persons", "parent_sales_person": "All Sales Persons",
"is_group": "No" "is_group": "No",
"employee": "_T-Employee-0002",
}], }],
[{ [{
"doctype": "Sales Person", "doctype": "Sales Person",
"sales_person_name": "_Test Sales Person 2", "sales_person_name": "_Test Sales Person 2",
"parent_sales_person": "All Sales Persons", "parent_sales_person": "All Sales Persons",
"is_group": "No" "is_group": "No",
"employee": "_T-Employee-0003",
}] }]

29
utilities/transaction_base.py
View File

@ -301,23 +301,28 @@ class TransactionBase(StatusUpdater):
def validate_with_previous_doc(self, source_dt, ref): def validate_with_previous_doc(self, source_dt, ref):
for key, val in ref.items(): for key, val in ref.items():
is_child = val.get("is_child_table")
ref_doc = {} ref_doc = {}
for d in self.doclist.get({"doctype": source_dt}): for d in self.doclist.get({"doctype": source_dt}):
if d.fields.get(val["ref_dn_field"]): ref_dn = d.fields.get(val["ref_dn_field"])
ref_doc.setdefault(key, d.fields[val["ref_dn_field"]]) if ref_dn:
if is_child:
if val.get("is_child_table"): self.compare_values({key: [ref_dn]}, val["compare_fields"], d)
self.compare_values(ref_doc, val["compare_fields"], d) elif ref_dn:
else: ref_doc.setdefault(key, [])
if ref_dn not in ref_doc[key]:
ref_doc[key].append(ref_dn)
if ref_doc:
self.compare_values(ref_doc, val["compare_fields"]) self.compare_values(ref_doc, val["compare_fields"])
def compare_values(self, ref_doc, fields, doc=None): def compare_values(self, ref_doc, fields, doc=None):
for ref_doctype, ref_docname in ref_doc.items(): for ref_doctype, ref_dn_list in ref_doc.items():
prevdoc_values = webnotes.conn.get_value(ref_doctype, ref_docname, for ref_docname in ref_dn_list:
[d[0] for d in fields], as_dict=1) prevdoc_values = webnotes.conn.get_value(ref_doctype, ref_docname,
[d[0] for d in fields], as_dict=1)
for field, condition in fields:
self.validate_value(field, condition, prevdoc_values[field], doc) for field, condition in fields:
self.validate_value(field, condition, prevdoc_values[field], doc)
def get_default_address_and_contact(party_field, party_name, fetch_shipping_address=False): def get_default_address_and_contact(party_field, party_name, fetch_shipping_address=False):
out = {} out = {}