From df019807a9b7d82d8e7445c716a9f58b320721fb Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 4 Dec 2013 16:27:30 +0530 Subject: [PATCH 01/12] In Website Contact form, if Support is selected from first dropdown, a Support Ticket should be created instead of a Lead Communication --- portal/utils.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/portal/utils.py b/portal/utils.py index 16fc0723d76..89800f3e1d2 100644 --- a/portal/utils.py +++ b/portal/utils.py @@ -64,9 +64,14 @@ def send_message(subject="Website Query", message="", sender="", status="Open"): if not website_send_message(subject, message, sender): return - - # make lead / communication - from selling.doctype.lead.get_leads import add_sales_communication - add_sales_communication(subject or "Website Query", message, sender, sender, - mail=None, status=status) + + if subject=="Support": + # create support ticket + from support.doctype.support_ticket.get_support_mails import add_support_communication + add_support_communication(subject, message, sender, mail=None) + else: + # make lead / communication + from selling.doctype.lead.get_leads import add_sales_communication + add_sales_communication(subject or "Website Query", message, sender, sender, + mail=None, status=status) \ No newline at end of file From e587c689a3399dc470fe4ec297b85ca48be275c6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Thu, 5 Dec 2013 13:02:06 +0530 Subject: [PATCH 02/12] [minor] added simplified and traditional chinese in languages list --- translations/languages.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/translations/languages.json b/translations/languages.json index fe6bf2dfa98..9bffb5c9ffd 100644 --- a/translations/languages.json +++ b/translations/languages.json @@ -1,4 +1,6 @@ { + "中国（简体）": "zh-cn", + "中國（繁體）": "zh-tw", "deutsch": "de", "ελληνικά": "el", "english": "en", From c8c13b90ce50fca537e79f4977cf7b5af9b24713 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 5 Dec 2013 16:08:30 +0530 Subject: [PATCH 03/12] [report] stock ledger loading time --- stock/report/stock_ledger/stock_ledger.js | 4 +- stock/report/stock_ledger/stock_ledger.py | 59 ++++++++++++++++------- 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/stock/report/stock_ledger/stock_ledger.js b/stock/report/stock_ledger/stock_ledger.js index 0e323ebb619..752d6d2813b 100644 --- a/stock/report/stock_ledger/stock_ledger.js +++ b/stock/report/stock_ledger/stock_ledger.js @@ -15,14 +15,14 @@ wn.query_reports["Stock Ledger"] = { "fieldname":"from_date", "label": wn._("From Date"), "fieldtype": "Date", - "default": wn.defaults.get_user_default("year_start_date"), + "default": wn.datetime.add_months(wn.datetime.get_today(), -1), "reqd": 1 }, { "fieldname":"to_date", "label": wn._("To Date"), "fieldtype": "Date", - "default": wn.defaults.get_user_default("year_end_date"), + "default": wn.datetime.get_today(), "reqd": 1 }, { diff --git a/stock/report/stock_ledger/stock_ledger.py b/stock/report/stock_ledger/stock_ledger.py index 3ae9135dcad..ea1a60fac2c 100644 --- a/stock/report/stock_ledger/stock_ledger.py +++ b/stock/report/stock_ledger/stock_ledger.py @@ -3,37 +3,62 @@ from __future__ import unicode_literals import webnotes +from webnotes import _ def execute(filters=None): - columns = ["Date:Datetime:95", "Item:Link/Item:100", "Item Name::100", + columns = get_columns() + sl_entries = get_stock_ledger_entries(filters) + item_details = get_item_details(filters) + + data = [] + for sle in sl_entries: + item_detail = item_details[sle.item_code] + data.append([sle.date, sle.item_code, item_detail.item_name, item_detail.item_group, + item_detail.brand, item_detail.description, sle.warehouse, item_detail.stock_uom, + sle.actual_qty, sle.qty_after_transaction, sle.stock_value, sle.voucher_type, + sle.voucher_no, sle.batch_no, sle.serial_no, sle.company]) + + return columns, data + +def get_columns(): + return ["Date:Datetime:95", "Item:Link/Item:100", "Item Name::100", "Item Group:Link/Item Group:100", "Brand:Link/Brand:100", "Description::200", "Warehouse:Link/Warehouse:100", "Stock UOM:Link/UOM:100", "Qty:Float:50", "Balance Qty:Float:80", "Balance Value:Currency:100", "Voucher Type::100", "Voucher #::100", "Batch:Link/Batch:100", "Serial #:Link/Serial No:100", "Company:Link/Company:100"] - - data = webnotes.conn.sql("""select concat_ws(" ", posting_date, posting_time), - item.name, item.item_name, item.item_group, brand, description, warehouse, sle.stock_uom, - actual_qty, qty_after_transaction, stock_value, voucher_type, voucher_no, - batch_no, serial_no, company - from `tabStock Ledger Entry` sle, - (select name, item_name, description, stock_uom, brand, item_group - from `tabItem` {item_conditions}) item - where item_code = item.name and - company = %(company)s and + +def get_stock_ledger_entries(filters): + if not filters.get("company"): + webnotes.throw(_("Company is mandatory")) + if not filters.get("from_date"): + webnotes.throw(_("From Date is mandatory")) + if not filters.get("to_date"): + webnotes.throw(_("To Date is mandatory")) + + return webnotes.conn.sql("""select concat_ws(" ", posting_date, posting_time) as date, + item_code, warehouse, actual_qty, qty_after_transaction, + stock_value, voucher_type, voucher_no, batch_no, serial_no, company + from `tabStock Ledger Entry` + where company = %(company)s and posting_date between %(from_date)s and %(to_date)s {sle_conditions} - order by posting_date desc, posting_time desc, sle.name desc"""\ - .format(item_conditions=get_item_conditions(filters), - sle_conditions=get_sle_conditions(filters)), - filters) + order by posting_date desc, posting_time desc, name desc"""\ + .format(sle_conditions=get_sle_conditions(filters)), filters, as_dict=1) - return columns, data +def get_item_details(filters): + item_details = {} + for item in webnotes.conn.sql("""select name, item_name, description, item_group, + brand, stock_uom from `tabItem` {item_conditions}"""\ + .format(item_conditions=get_item_conditions(filters)), filters, as_dict=1): + item_details.setdefault(item.name, item) + + return item_details def get_item_conditions(filters): conditions = [] if filters.get("item_code"): - conditions.append("item_code=%(item_code)s") + conditions.append("name=%(item_code)s") if filters.get("brand"): conditions.append("brand=%(brand)s") From c3d8b0662356bdc5cd1a0229bc242d5f6b35caa2 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Thu, 5 Dec 2013 16:56:37 +0600 Subject: [PATCH 04/12] bumped to version 3.1.0 --- config.json | 154 ++++++++++++++++++++++++++-------------------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/config.json b/config.json index 05918ef7eb2..7bdd1ad5ca4 100644 --- a/config.json +++ b/config.json @@ -1,78 +1,78 @@ { - "app_name": "ERPNext", - "app_version": "3.0.0", - "requires_framework_version": "==3.0.0", - "base_template": "app/portal/templates/base.html", - "modules": { - "Selling": { - "link": "selling-home", - "color": "#1abc9c", - "icon": "icon-tag", - "type": "module" - }, - "Accounts": { - "link": "accounts-home", - "color": "#3498db", - "icon": "icon-money", - "type": "module" - }, - "Stock": { - "type": "module", - "link": "stock-home", - "color": "#f39c12", - "icon": "icon-truck" - }, - "Buying": { - "type": "module", - "link": "buying-home", - "color": "#c0392b", - "icon": "icon-shopping-cart" - }, - "Support": { - "type": "module", - "link": "support-home", - "color": "#2c3e50", - "icon": "icon-phone" - }, - "Projects": { - "type": "module", - "link": "projects-home", - "color": "#8e44ad", - "icon": "icon-puzzle-piece" - }, - "Manufacturing": { - "type": "module", - "link": "manufacturing-home", - "color": "#7f8c8d", - "icon": "icon-cogs" - }, - "HR": { - "type": "module", - "link": "hr-home", - "color": "#2ecc71", - "label": "Human Resources", - "icon": "icon-group" - }, - "Setup": { - "type": "setup", - "link": "Setup", - "color": "#bdc3c7", - "icon": "icon-wrench" - }, - "Activity": { - "type": "page", - "link": "activity", - "color": "#e67e22", - "icon": "icon-play", - "label": "Activity" - }, - "Notes": { - "type": "list", - "doctype": "Note", - "link": "List/Note", - "color": "#95a5a6", - "label": "Notes", - "icon": "icon-file-alt" - } - } -} + "app_name": "ERPNext", + "app_version": "3.1.0", + "base_template": "app/portal/templates/base.html", + "modules": { + "Accounts": { + "color": "#3498db", + "icon": "icon-money", + "link": "accounts-home", + "type": "module" + }, + "Activity": { + "color": "#e67e22", + "icon": "icon-play", + "label": "Activity", + "link": "activity", + "type": "page" + }, + "Buying": { + "color": "#c0392b", + "icon": "icon-shopping-cart", + "link": "buying-home", + "type": "module" + }, + "HR": { + "color": "#2ecc71", + "icon": "icon-group", + "label": "Human Resources", + "link": "hr-home", + "type": "module" + }, + "Manufacturing": { + "color": "#7f8c8d", + "icon": "icon-cogs", + "link": "manufacturing-home", + "type": "module" + }, + "Notes": { + "color": "#95a5a6", + "doctype": "Note", + "icon": "icon-file-alt", + "label": "Notes", + "link": "List/Note", + "type": "list" + }, + "Projects": { + "color": "#8e44ad", + "icon": "icon-puzzle-piece", + "link": "projects-home", + "type": "module" + }, + "Selling": { + "color": "#1abc9c", + "icon": "icon-tag", + "link": "selling-home", + "type": "module" + }, + "Setup": { + "color": "#bdc3c7", + "icon": "icon-wrench", + "link": "Setup", + "type": "setup" + }, + "Stock": { + "color": "#f39c12", + "icon": "icon-truck", + "link": "stock-home", + "type": "module" + }, + "Support": { + "color": "#2c3e50", + "icon": "icon-phone", + "link": "support-home", + "type": "module" + } + }, + "requires_framework_version": "==3.1.0" +} \ No newline at end of file From d701e839610c53018d75c1dd3ae583b9b585963c Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Thu, 5 Dec 2013 18:05:07 +0530 Subject: [PATCH 05/12] [minor] make slow branch migratable to master --- patches/may_2013/p06_make_notes.py | 1 - patches/october_2013/p09_update_naming_series_settings.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/may_2013/p06_make_notes.py b/patches/may_2013/p06_make_notes.py index adb3dfdf725..149547fb9fa 100644 --- a/patches/may_2013/p06_make_notes.py +++ b/patches/may_2013/p06_make_notes.py @@ -37,7 +37,6 @@ def execute(): webnotes.delete_doc("DocType", "Question") webnotes.delete_doc("DocType", "Answer") - webnotes.bean("Style Settings").save() # update comment delete webnotes.conn.sql("""update tabDocPerm \ diff --git a/patches/october_2013/p09_update_naming_series_settings.py b/patches/october_2013/p09_update_naming_series_settings.py index 36632b44c0c..7771b7333fc 100644 --- a/patches/october_2013/p09_update_naming_series_settings.py +++ b/patches/october_2013/p09_update_naming_series_settings.py @@ -15,4 +15,5 @@ def execute(): # reset property setters for series for name in ("Stock Settings", "Selling Settings", "Buying Settings", "HR Settings"): - webnotes.bean(name, name).save() \ No newline at end of file + webnotes.reload_doc(name.split()[0], 'DocType', name) + webnotes.bean(name, name).save() From 1417c6d58fe92974853c772e40858458d312fab7 Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Fri, 6 Dec 2013 14:50:06 +0530 Subject: [PATCH 06/12] [hotfix] fix null issue in budget variance --- .../report/budget_variance_report/budget_variance_report.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounts/report/budget_variance_report/budget_variance_report.py b/accounts/report/budget_variance_report/budget_variance_report.py index 2cbbd622e60..a5860c83bd3 100644 --- a/accounts/report/budget_variance_report/budget_variance_report.py +++ b/accounts/report/budget_variance_report/budget_variance_report.py @@ -121,6 +121,6 @@ def get_costcenter_account_month_map(filters): for ad in actual_details.get(ccd.name, {}).get(ccd.account, []): if ad.month_name == month: - tav_dict.actual += ad.debit - ad.credit + tav_dict.actual += flt(ad.debit) - flt(ad.credit) - return cam_map \ No newline at end of file + return cam_map From 32e7b3074484eebf12bb06a214cdb2951024615f Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Sun, 8 Dec 2013 17:17:05 +0600 Subject: [PATCH 07/12] bumped to version 3.1.1 --- config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.json b/config.json index 7bdd1ad5ca4..497268e336d 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "app_name": "ERPNext", - "app_version": "3.1.0", + "app_version": "3.1.1", "base_template": "app/portal/templates/base.html", "modules": { "Accounts": { From 5ce1b8b8f9f6a0cb10441ed81a567eff83a93063 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Mon, 9 Dec 2013 16:29:04 +0530 Subject: [PATCH 08/12] [fix] [minor] customer name visibility fixed in sales invoice --- hr/doctype/earning_type/earning_type.txt | 4 ++-- manufacturing/doctype/bom/bom.txt | 6 +++--- selling/sales_common.js | 2 +- stock/doctype/delivery_note/delivery_note.txt | 4 ++-- stock/doctype/stock_entry/stock_entry.js | 2 +- stock/doctype/stock_entry/stock_entry.txt | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/hr/doctype/earning_type/earning_type.txt b/hr/doctype/earning_type/earning_type.txt index 0c84cf1d4ec..902a4ed85b4 100644 --- a/hr/doctype/earning_type/earning_type.txt +++ b/hr/doctype/earning_type/earning_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-24 11:03:32", "docstatus": 0, - "modified": "2013-07-22 15:25:26", + "modified": "2013-12-09 16:24:07", "modified_by": "Administrator", "owner": "Administrator" }, @@ -85,7 +85,7 @@ "doctype": "DocField", "fieldname": "exemption_limit", "fieldtype": "Float", - "hidden": 1, + "hidden": 0, "label": "Exemption Limit", "oldfieldname": "exemption_limit", "oldfieldtype": "Currency" diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt index 68553fb9e31..a5ff1252931 100644 --- a/manufacturing/doctype/bom/bom.txt +++ b/manufacturing/doctype/bom/bom.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-22 15:11:38", "docstatus": 0, - "modified": "2013-12-04 11:51:36", + "modified": "2013-12-09 16:25:50", "modified_by": "Administrator", "owner": "Administrator" }, @@ -121,12 +121,12 @@ }, { "depends_on": "with_operations", + "description": "Specify the operations, operating cost and give a unique Operation no to your operations.", "doctype": "DocField", "fieldname": "operations", "fieldtype": "Section Break", "label": "Operations", - "oldfieldtype": "Section Break", - "options": "Specify the operations, operating cost and give a unique Operation no to your operations." + "oldfieldtype": "Section Break" }, { "doctype": "DocField", diff --git a/selling/sales_common.js b/selling/sales_common.js index ee55dfab7ad..d6c8fdd0e40 100644 --- a/selling/sales_common.js +++ b/selling/sales_common.js @@ -95,7 +95,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({ refresh: function() { this._super(); this.frm.toggle_display("customer_name", - (this.customer_name && this.frm.doc.customer_name!==this.frm.doc.customer)); + (this.frm.doc.customer_name && this.frm.doc.customer_name!==this.frm.doc.customer)); if(this.frm.fields_dict.packing_details) { var packing_list_exists = this.frm.get_doclist({parentfield: "packing_details"}).length; this.frm.toggle_display("packing_list", packing_list_exists ? true : false); diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt index 7fb166e6867..1dc3cd30110 100644 --- a/stock/doctype/delivery_note/delivery_note.txt +++ b/stock/doctype/delivery_note/delivery_note.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:09", "docstatus": 0, - "modified": "2013-11-03 14:20:19", + "modified": "2013-12-09 16:24:08", "modified_by": "Administrator", "owner": "Administrator" }, @@ -229,7 +229,7 @@ "doctype": "DocField", "fieldname": "po_date", "fieldtype": "Date", - "hidden": 1, + "hidden": 0, "label": "Customer's Purchase Order Date", "no_copy": 0, "oldfieldname": "po_date", diff --git a/stock/doctype/stock_entry/stock_entry.js b/stock/doctype/stock_entry/stock_entry.js index ed41d7d8792..76284eabb74 100644 --- a/stock/doctype/stock_entry/stock_entry.js +++ b/stock/doctype/stock_entry/stock_entry.js @@ -106,7 +106,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({ }, callback: function(r) { if (!r.exc) { - for(d in getchildren('Stock Entry Detail',doc.name,'mtn_details')) { + for(d in getchildren('Stock Entry Detail', me.frm.doc.name, 'mtn_details')) { if(!d.expense_account) d.expense_account = r.message; } } diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt index ca9b5f29a2d..18a07a3550c 100644 --- a/stock/doctype/stock_entry/stock_entry.txt +++ b/stock/doctype/stock_entry/stock_entry.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-09 11:43:55", "docstatus": 0, - "modified": "2013-11-03 14:11:42", + "modified": "2013-12-09 16:24:10", "modified_by": "Administrator", "owner": "Administrator" }, @@ -108,7 +108,7 @@ "doctype": "DocField", "fieldname": "delivery_note_no", "fieldtype": "Link", - "hidden": 1, + "hidden": 0, "in_filter": 0, "label": "Delivery Note No", "no_copy": 1, @@ -126,7 +126,7 @@ "doctype": "DocField", "fieldname": "sales_invoice_no", "fieldtype": "Link", - "hidden": 1, + "hidden": 0, "label": "Sales Invoice No", "no_copy": 1, "options": "Sales Invoice", @@ -139,7 +139,7 @@ "doctype": "DocField", "fieldname": "purchase_receipt_no", "fieldtype": "Link", - "hidden": 1, + "hidden": 0, "in_filter": 0, "label": "Purchase Receipt No", "no_copy": 1, @@ -299,7 +299,7 @@ "doctype": "DocField", "fieldname": "production_order", "fieldtype": "Link", - "hidden": 1, + "hidden": 0, "in_filter": 1, "label": "Production Order", "no_copy": 0, From e4bb2ba158e9dd1df48ab74909c84ff9916b270d Mon Sep 17 00:00:00 2001 From: Pratik Vyas Date: Mon, 9 Dec 2013 17:41:11 +0600 Subject: [PATCH 09/12] bumped to version 3.1.2 --- config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index 497268e336d..bc72fa9bc93 100644 --- a/config.json +++ b/config.json @@ -1,6 +1,6 @@ { "app_name": "ERPNext", - "app_version": "3.1.1", + "app_version": "3.1.2", "base_template": "app/portal/templates/base.html", "modules": { "Accounts": { @@ -74,5 +74,5 @@ "type": "module" } }, - "requires_framework_version": "==3.1.0" + "requires_framework_version": "==3.1.1" } \ No newline at end of file From 5d3da6c095daf4094fe92eddcc450f10f3a8a0d0 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Tue, 10 Dec 2013 11:18:08 +0530 Subject: [PATCH 10/12] [fix] [minor] rename fix for customer and supplier --- buying/doctype/supplier/supplier.py | 10 ++++++++++ manufacturing/doctype/bom/bom.txt | 4 +++- selling/doctype/customer/customer.py | 12 +++++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/buying/doctype/supplier/supplier.py b/buying/doctype/supplier/supplier.py index b2873c5661b..48bb9c276c0 100644 --- a/buying/doctype/supplier/supplier.py +++ b/buying/doctype/supplier/supplier.py @@ -151,6 +151,16 @@ class DocType(TransactionBase): def before_rename(self, olddn, newdn, merge=False): from accounts.utils import rename_account_for rename_account_for("Supplier", olddn, newdn, merge) + self.rename_address(olddn, newdn) + self.rename_contact(olddn, newdn) + + def rename_address(self, olddn, newdn): + webnotes.conn.sql("""update `tabAddress` set supplier_name=%s, + address_title=%s where supplier=%s""", (newdn, newdn, olddn)) + + def rename_contact(self,olddn, newdn): + webnotes.conn.sql("""update `tabContact` set supplier_name=%s + where supplier=%s""", (newdn, olddn)) def after_rename(self, olddn, newdn, merge=False): if webnotes.defaults.get_global_default('supp_master_name') == 'Supplier Name': diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt index a5ff1252931..023473a620e 100644 --- a/manufacturing/doctype/bom/bom.txt +++ b/manufacturing/doctype/bom/bom.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-22 15:11:38", "docstatus": 0, - "modified": "2013-12-09 16:25:50", + "modified": "2013-12-09 16:56:41", "modified_by": "Administrator", "owner": "Administrator" }, @@ -102,6 +102,7 @@ "doctype": "DocField", "fieldname": "with_operations", "fieldtype": "Check", + "hidden": 0, "label": "With Operations" }, { @@ -125,6 +126,7 @@ "doctype": "DocField", "fieldname": "operations", "fieldtype": "Section Break", + "hidden": 0, "label": "Operations", "oldfieldtype": "Section Break" }, diff --git a/selling/doctype/customer/customer.py b/selling/doctype/customer/customer.py index d00926f43c0..356628a6b9e 100644 --- a/selling/doctype/customer/customer.py +++ b/selling/doctype/customer/customer.py @@ -146,7 +146,17 @@ class DocType(TransactionBase): def before_rename(self, olddn, newdn, merge=False): from accounts.utils import rename_account_for rename_account_for("Customer", olddn, newdn, merge) - + self.rename_address(olddn, newdn) + self.rename_contact(olddn, newdn) + + def rename_address(self, olddn, newdn): + webnotes.conn.sql("""update `tabAddress` set customer_name=%s, + address_title=%s where customer=%s""", (newdn, newdn, olddn)) + + def rename_contact(self,olddn, newdn): + webnotes.conn.sql("""update `tabContact` set customer_name=%s + where customer=%s""", (newdn, olddn)) + def after_rename(self, olddn, newdn, merge=False): if webnotes.defaults.get_global_default('cust_master_name') == 'Customer Name': webnotes.conn.set(self.doc, "customer_name", newdn) From abefa3fd40440a92a65ca4cf0cc99f0dc5792849 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Tue, 10 Dec 2013 14:22:52 +0530 Subject: [PATCH 11/12] [fix] [minor] supplier & customer rename fix --- buying/doctype/supplier/supplier.py | 30 ++++++++++++++++++---------- selling/doctype/customer/customer.py | 30 ++++++++++++++++++---------- 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/buying/doctype/supplier/supplier.py b/buying/doctype/supplier/supplier.py index 48bb9c276c0..503ec8a1dd8 100644 --- a/buying/doctype/supplier/supplier.py +++ b/buying/doctype/supplier/supplier.py @@ -27,6 +27,14 @@ class DocType(TransactionBase): else: self.doc.name = make_autoname(self.doc.naming_series + '.#####') + def update_address(self): + webnotes.conn.sql("""update `tabAddress` set supplier_name=%s + where supplier=%s""", (self.doc.supplier_name, self.doc.name)) + + def update_contact(self): + webnotes.conn.sql("""update `tabContact` set supplier_name=%s + where supplier=%s""", (self.doc.supplier_name, self.doc.name)) + def update_credit_days_limit(self): webnotes.conn.sql("""update tabAccount set credit_days = %s where name = %s""", (cint(self.doc.credit_days), self.doc.name + " - " + self.get_company_abbr())) @@ -35,6 +43,9 @@ class DocType(TransactionBase): if not self.doc.naming_series: self.doc.naming_series = '' + self.update_address() + self.update_contact() + # create account head self.create_account_head() @@ -151,20 +162,19 @@ class DocType(TransactionBase): def before_rename(self, olddn, newdn, merge=False): from accounts.utils import rename_account_for rename_account_for("Supplier", olddn, newdn, merge) - self.rename_address(olddn, newdn) - self.rename_contact(olddn, newdn) - def rename_address(self, olddn, newdn): - webnotes.conn.sql("""update `tabAddress` set supplier_name=%s, - address_title=%s where supplier=%s""", (newdn, newdn, olddn)) - - def rename_contact(self,olddn, newdn): - webnotes.conn.sql("""update `tabContact` set supplier_name=%s - where supplier=%s""", (newdn, olddn)) - def after_rename(self, olddn, newdn, merge=False): + condition = value = '' if webnotes.defaults.get_global_default('supp_master_name') == 'Supplier Name': webnotes.conn.set(self.doc, "supplier_name", newdn) + self.update_contact() + condition = ", supplier_name=%s" + value = newdn + self.update_supplier_address(newdn, condition, value) + + def update_supplier_address(self, newdn, condition, value): + webnotes.conn.sql("""update `tabAddress` set address_title=%s %s + where supplier=%s""" % ('%s', condition, '%s'), (newdn, value, newdn)) @webnotes.whitelist() def get_dashboard_info(supplier): diff --git a/selling/doctype/customer/customer.py b/selling/doctype/customer/customer.py index 356628a6b9e..71116b33b19 100644 --- a/selling/doctype/customer/customer.py +++ b/selling/doctype/customer/customer.py @@ -47,6 +47,14 @@ class DocType(TransactionBase): if self.doc.lead_name: webnotes.conn.sql("update `tabLead` set status='Converted' where name = %s", self.doc.lead_name) + def update_address(self): + webnotes.conn.sql("""update `tabAddress` set customer_name=%s where customer=%s""", + (self.doc.customer_name, self.doc.name)) + + def update_contact(self): + webnotes.conn.sql("""update `tabContact` set customer_name=%s where customer=%s""", + (self.doc.customer_name, self.doc.name)) + def create_account_head(self): if self.doc.company : abbr = self.get_company_abbr() @@ -99,6 +107,9 @@ class DocType(TransactionBase): self.validate_name_with_customer_group() self.update_lead_status() + self.update_address() + self.update_contact() + # create account head self.create_account_head() # update credit days and limit in account @@ -146,20 +157,19 @@ class DocType(TransactionBase): def before_rename(self, olddn, newdn, merge=False): from accounts.utils import rename_account_for rename_account_for("Customer", olddn, newdn, merge) - self.rename_address(olddn, newdn) - self.rename_contact(olddn, newdn) - - def rename_address(self, olddn, newdn): - webnotes.conn.sql("""update `tabAddress` set customer_name=%s, - address_title=%s where customer=%s""", (newdn, newdn, olddn)) - - def rename_contact(self,olddn, newdn): - webnotes.conn.sql("""update `tabContact` set customer_name=%s - where customer=%s""", (newdn, olddn)) def after_rename(self, olddn, newdn, merge=False): + condition = value = '' if webnotes.defaults.get_global_default('cust_master_name') == 'Customer Name': webnotes.conn.set(self.doc, "customer_name", newdn) + self.update_contact() + condition = ", customer_name=%s" + value = newdn + self.update_customer_address(newdn, condition, value) + + def update_customer_address(self, newdn, condition, value): + webnotes.conn.sql("""update `tabAddress` set address_title=%s %s + where customer=%s""" % ('%s', condition, '%s'), (newdn, value, newdn)) @webnotes.whitelist() def get_dashboard_info(customer): From 4e677a3f5235c96e86c5fe5acd8d2f59dff895dc Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Tue, 10 Dec 2013 15:23:07 +0530 Subject: [PATCH 12/12] [fix] [minor] stashed bom.txt --- manufacturing/doctype/bom/bom.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt index 023473a620e..a5ff1252931 100644 --- a/manufacturing/doctype/bom/bom.txt +++ b/manufacturing/doctype/bom/bom.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-22 15:11:38", "docstatus": 0, - "modified": "2013-12-09 16:56:41", + "modified": "2013-12-09 16:25:50", "modified_by": "Administrator", "owner": "Administrator" }, @@ -102,7 +102,6 @@ "doctype": "DocField", "fieldname": "with_operations", "fieldtype": "Check", - "hidden": 0, "label": "With Operations" }, { @@ -126,7 +125,6 @@ "doctype": "DocField", "fieldname": "operations", "fieldtype": "Section Break", - "hidden": 0, "label": "Operations", "oldfieldtype": "Section Break" },