From d98b65386e376fa0cac8e7aa8ace0701f9e1e7f8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 21 Jan 2013 18:54:01 +0530 Subject: [PATCH 1/2] pull item_tax from item master while selecting item in purchase cycle --- buying/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buying/utils.py b/buying/utils.py index d623020987..97efbc7333 100644 --- a/buying/utils.py +++ b/buying/utils.py @@ -56,7 +56,7 @@ def get_item_details(args): "conversion_factor": 1, "warehouse": args.warehouse or item.default_warehouse, "item_tax_rate": json.dumps(dict(([d.tax_type, d.tax_rate] for d in - item_wrapper.doclist.get({"parentfield": "ref_rate_details"})))), + item_wrapper.doclist.get({"parentfield": "item_tax"})))), "batch_no": None, "expense_head": item.purchase_account, "cost_center": item.cost_center From fc36e57233534a68ce9d8e66ffa6e972c98f926b Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 21 Jan 2013 19:02:58 +0530 Subject: [PATCH 2/2] fixes in setup control and website contact helper --- setup/doctype/setup_control/setup_control.py | 2 +- website/helpers/contact.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/doctype/setup_control/setup_control.py b/setup/doctype/setup_control/setup_control.py index 4bc36481d5..86cdc8e82e 100644 --- a/setup/doctype/setup_control/setup_control.py +++ b/setup/doctype/setup_control/setup_control.py @@ -236,7 +236,7 @@ class DocType: on duplicate key update `password`=password(%s)""", (user_email, pwd, pwd)) - self.add_all_roles_to(pr.name) + add_all_roles_to(pr.name) def add_all_roles_to(name): profile = webnotes.doc("Profile", name) diff --git a/website/helpers/contact.py b/website/helpers/contact.py index a9499abb79..0ec279ecad 100644 --- a/website/helpers/contact.py +++ b/website/helpers/contact.py @@ -36,7 +36,7 @@ def send_message(subject="Website Query", message="", sender="", status="Open"): name = webnotes.conn.get_value("Lead", {"email_id": sender}, "name") if name: lead = webnotes.model_wrapper("Lead", name) - lead.doc.status = "Open" + lead.doc.status = status lead.ignore_permissions = True lead.save() else: @@ -44,7 +44,7 @@ def send_message(subject="Website Query", message="", sender="", status="Open"): "doctype":"Lead", "lead_name": sender, "email_id": sender, - "status": "Open", + "status": status, "source": "Website" }) lead.ignore_permissions = True