From afc44cf54ed48518575bc948b4c89ae33cf396ee Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Thu, 5 Dec 2013 17:42:53 +0530 Subject: [PATCH 01/11] [fix] [minor] email settings - set send print in body and attachment --- patches/december_2013/__init__.py | 0 ...l_settings_set_send_print_in_body_and_attachment.py | 10 ++++++++++ patches/patch_list.py | 1 + 3 files changed, 11 insertions(+) create mode 100644 patches/december_2013/__init__.py create mode 100644 patches/december_2013/p01_email_settings_set_send_print_in_body_and_attachment.py diff --git a/patches/december_2013/__init__.py b/patches/december_2013/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/patches/december_2013/p01_email_settings_set_send_print_in_body_and_attachment.py b/patches/december_2013/p01_email_settings_set_send_print_in_body_and_attachment.py new file mode 100644 index 0000000000..7b7e7fb4f1 --- /dev/null +++ b/patches/december_2013/p01_email_settings_set_send_print_in_body_and_attachment.py @@ -0,0 +1,10 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals +import webnotes + +def execute(): + webnotes.conn.sql("""update `tabSingles` set value = 1 + where doctype = 'Email Settings' and field = 'send_print_in_body_and_attachment' and + ifnull(value,'')=''""") \ No newline at end of file diff --git a/patches/patch_list.py b/patches/patch_list.py index 9400e08872..8a7d10e450 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -258,4 +258,5 @@ patch_list = [ "execute:webnotes.delete_doc('Report', 'Stock Ledger') #2013-11-29", "execute:webnotes.delete_doc('Report', 'Payment Collection With Ageing')", "execute:webnotes.delete_doc('Report', 'Payment Made With Ageing')", + "patches.december_2013.p01_email_settings_set_send_print_in_body_and_attachment", ] \ No newline at end of file From d9255abd46f167e6fe34b105ee3a5d786def0265 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Fri, 6 Dec 2013 18:49:48 +0530 Subject: [PATCH 02/11] [fix] [minor] set send_print_in_body_and_attachment in email settings --- hr/doctype/earning_type/earning_type.txt | 4 ++-- manufacturing/doctype/bom/bom.txt | 10 ++++++---- ...l_settings_set_send_print_in_body_and_attachment.py | 7 +++++++ setup/doctype/email_settings/email_settings.txt | 3 ++- stock/doctype/delivery_note/delivery_note.txt | 4 ++-- stock/doctype/stock_entry/stock_entry.js | 4 ++-- stock/doctype/stock_entry/stock_entry.txt | 10 +++++----- 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/hr/doctype/earning_type/earning_type.txt b/hr/doctype/earning_type/earning_type.txt index 0c84cf1d4e..905bbd89b9 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-06 15:16:11", "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 68553fb9e3..1878f25e1f 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-06 18:48:23", "modified_by": "Administrator", "owner": "Administrator" }, @@ -120,18 +120,20 @@ "options": "Price List" }, { - "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", + "hidden": 0, "label": "Operations", - "oldfieldtype": "Section Break", - "options": "Specify the operations, operating cost and give a unique Operation no to your operations." + "oldfieldtype": "Section Break" }, { + "depends_on": "with_operations", "doctype": "DocField", "fieldname": "bom_operations", "fieldtype": "Table", + "hidden": 0, "label": "BOM Operations", "oldfieldname": "bom_operations", "oldfieldtype": "Table", diff --git a/patches/december_2013/p01_email_settings_set_send_print_in_body_and_attachment.py b/patches/december_2013/p01_email_settings_set_send_print_in_body_and_attachment.py index 7b7e7fb4f1..1a11f57871 100644 --- a/patches/december_2013/p01_email_settings_set_send_print_in_body_and_attachment.py +++ b/patches/december_2013/p01_email_settings_set_send_print_in_body_and_attachment.py @@ -5,6 +5,13 @@ from __future__ import unicode_literals import webnotes def execute(): + doctype = webnotes.conn.sql("""select doctype from `tabSingles` + where doctype = 'Email Settings'""") + if not doctype: + email_settings = webnotes.bean("Email Settings", "Email Settings") + email_settings.doc.send_print_in_body_and_attachment = 1 + email_settings.save() + webnotes.conn.sql("""update `tabSingles` set value = 1 where doctype = 'Email Settings' and field = 'send_print_in_body_and_attachment' and ifnull(value,'')=''""") \ No newline at end of file diff --git a/setup/doctype/email_settings/email_settings.txt b/setup/doctype/email_settings/email_settings.txt index 3689718ff5..6b28f10f35 100644 --- a/setup/doctype/email_settings/email_settings.txt +++ b/setup/doctype/email_settings/email_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-25 17:53:21", "docstatus": 0, - "modified": "2013-11-28 11:54:42", + "modified": "2013-12-06 13:12:25", "modified_by": "Administrator", "owner": "Administrator" }, @@ -103,6 +103,7 @@ "label": "Auto Email Id" }, { + "default": "1", "description": "If checked, an email with an attached HTML format will be added to part of the EMail body as well as attachment. To only send as attachment, uncheck this.", "doctype": "DocField", "fieldname": "send_print_in_body_and_attachment", diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt index 7fb166e686..b94310e8ac 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-06 15:15:49", "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 ed41d7d879..440a9a3a1e 100644 --- a/stock/doctype/stock_entry/stock_entry.js +++ b/stock/doctype/stock_entry/stock_entry.js @@ -244,7 +244,7 @@ cur_frm.script_manager.make(erpnext.stock.StockEntry); cur_frm.cscript.toggle_related_fields = function(doc) { disable_from_warehouse = inList(["Material Receipt", "Sales Return"], doc.purpose); - disable_to_warehouse = inList(["Material Issue", "Purchase Return"], doc.purpose) + disable_to_warehouse = inList(["Material Issue", "Purchase Return"], doc.purpose); cur_frm.toggle_enable("from_warehouse", !disable_from_warehouse); cur_frm.toggle_enable("to_warehouse", !disable_to_warehouse); @@ -302,7 +302,7 @@ cur_frm.fields_dict['production_order'].get_query = function(doc) { } cur_frm.cscript.purpose = function(doc, cdt, cdn) { - cur_frm.cscript.toggle_related_fields(doc, cdt, cdn); + cur_frm.cscript.toggle_related_fields(doc); } // Overloaded query for link batch_no diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt index ca9b5f29a2..a63f8a4492 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-06 15:15:25", "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 a652347bd12923839cba570ab27ee2a035801920 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Mon, 9 Dec 2013 15:52:47 +0530 Subject: [PATCH 03/11] [fix] [minor] customer_name not visible in sales invoice --- accounts/doctype/sales_invoice/sales_invoice.txt | 2 +- selling/sales_common.js | 2 +- stock/doctype/stock_entry/stock_entry.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt index 99bfe5cdf0..ece17a4ef7 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.txt +++ b/accounts/doctype/sales_invoice/sales_invoice.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:05", "docstatus": 0, - "modified": "2013-11-18 15:16:50", + "modified": "2013-12-09 14:05:34", "modified_by": "Administrator", "owner": "Administrator" }, diff --git a/selling/sales_common.js b/selling/sales_common.js index ee55dfab7a..d6c8fdd0e4 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/stock_entry/stock_entry.js b/stock/doctype/stock_entry/stock_entry.js index 440a9a3a1e..73fd441f76 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; } } From 7b1d9409f16312566ef1089aa4af54aba29a4e01 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Mon, 9 Dec 2013 15:57:26 +0530 Subject: [PATCH 04/11] [fix] [minor] remove email patch --- patches/december_2013/__init__.py | 0 ...ngs_set_send_print_in_body_and_attachment.py | 17 ----------------- patches/patch_list.py | 1 - 3 files changed, 18 deletions(-) delete mode 100644 patches/december_2013/__init__.py delete mode 100644 patches/december_2013/p01_email_settings_set_send_print_in_body_and_attachment.py diff --git a/patches/december_2013/__init__.py b/patches/december_2013/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/patches/december_2013/p01_email_settings_set_send_print_in_body_and_attachment.py b/patches/december_2013/p01_email_settings_set_send_print_in_body_and_attachment.py deleted file mode 100644 index 1a11f57871..0000000000 --- a/patches/december_2013/p01_email_settings_set_send_print_in_body_and_attachment.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors -# License: GNU General Public License v3. See license.txt - -from __future__ import unicode_literals -import webnotes - -def execute(): - doctype = webnotes.conn.sql("""select doctype from `tabSingles` - where doctype = 'Email Settings'""") - if not doctype: - email_settings = webnotes.bean("Email Settings", "Email Settings") - email_settings.doc.send_print_in_body_and_attachment = 1 - email_settings.save() - - webnotes.conn.sql("""update `tabSingles` set value = 1 - where doctype = 'Email Settings' and field = 'send_print_in_body_and_attachment' and - ifnull(value,'')=''""") \ No newline at end of file diff --git a/patches/patch_list.py b/patches/patch_list.py index 8a7d10e450..9400e08872 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -258,5 +258,4 @@ patch_list = [ "execute:webnotes.delete_doc('Report', 'Stock Ledger') #2013-11-29", "execute:webnotes.delete_doc('Report', 'Payment Collection With Ageing')", "execute:webnotes.delete_doc('Report', 'Payment Made With Ageing')", - "patches.december_2013.p01_email_settings_set_send_print_in_body_and_attachment", ] \ 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 05/11] [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 b2873c5661..48bb9c276c 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 a5ff125293..023473a620 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 d00926f43c..356628a6b9 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 06/11] [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 48bb9c276c..503ec8a1dd 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 356628a6b9..71116b33b1 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 07/11] [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 023473a620..a5ff125293 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" }, From f0dad52aaa51f495812ed341881da905fdad0df9 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Tue, 10 Dec 2013 18:11:31 +0530 Subject: [PATCH 08/11] [fix] [minor] merge conflict fix --- manufacturing/doctype/bom/bom.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt index 57076654df..a5ff125293 100644 --- a/manufacturing/doctype/bom/bom.txt +++ b/manufacturing/doctype/bom/bom.txt @@ -120,24 +120,18 @@ "options": "Price List" }, { -<<<<<<< HEAD -======= "depends_on": "with_operations", ->>>>>>> 4e677a3f5235c96e86c5fe5acd8d2f59dff895dc "description": "Specify the operations, operating cost and give a unique Operation no to your operations.", "doctype": "DocField", "fieldname": "operations", "fieldtype": "Section Break", - "hidden": 0, "label": "Operations", "oldfieldtype": "Section Break" }, { - "depends_on": "with_operations", "doctype": "DocField", "fieldname": "bom_operations", "fieldtype": "Table", - "hidden": 0, "label": "BOM Operations", "oldfieldname": "bom_operations", "oldfieldtype": "Table", From 42a8fc2ee31229e6b77e04dda3ae8806e669c2fe Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Wed, 11 Dec 2013 11:15:03 +0530 Subject: [PATCH 09/11] [fix] [minor] stashed sales_invoice.txt --- accounts/doctype/sales_invoice/sales_invoice.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt index ece17a4ef7..99bfe5cdf0 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.txt +++ b/accounts/doctype/sales_invoice/sales_invoice.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:05", "docstatus": 0, - "modified": "2013-12-09 14:05:34", + "modified": "2013-11-18 15:16:50", "modified_by": "Administrator", "owner": "Administrator" }, From 229b246d6df2ab743dd8dcb5975740cf2d2b6ad2 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Wed, 11 Dec 2013 18:49:11 +0530 Subject: [PATCH 10/11] [fix] [minor] production planning tool clear sales order table --- .../accounts_receivable.py | 2 +- .../production_planning_tool.py | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/accounts/report/accounts_receivable/accounts_receivable.py b/accounts/report/accounts_receivable/accounts_receivable.py index ad0d92523b..945bae434a 100644 --- a/accounts/report/accounts_receivable/accounts_receivable.py +++ b/accounts/report/accounts_receivable/accounts_receivable.py @@ -85,7 +85,7 @@ class AccountsReceivableReport(object): def get_account_map(self): if not hasattr(self, "account_map"): self.account_map = dict(((r.name, r) for r in webnotes.conn.sql("""select - account.name, customer.customer_name, customer.territory + account.name, customer.name as customer_name, customer.territory from `tabAccount` account, `tabCustomer` customer where account.master_type="Customer" and customer.name=account.master_name""", as_dict=True))) diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/manufacturing/doctype/production_planning_tool/production_planning_tool.py index f3626a3da3..ce93d80c6b 100644 --- a/manufacturing/doctype/production_planning_tool/production_planning_tool.py +++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.py @@ -72,9 +72,9 @@ class DocType: and (exists (select name from `tabItem` item where item.name=so_item.item_code and (ifnull(item.is_pro_applicable, 'No') = 'Yes' or ifnull(item.is_sub_contracted_item, 'No') = 'Yes') %s) - or exists (select name from `tabPacked Item` dnpi - where dnpi.parent = so.name and dnpi.parent_item = so_item.item_code - and exists (select name from `tabItem` item where item.name=dnpi.item_code + or exists (select name from `tabPacked Item` pi + where pi.parent = so.name and pi.parent_item = so_item.item_code + and exists (select name from `tabItem` item where item.name=pi.item_code and (ifnull(item.is_pro_applicable, 'No') = 'Yes' or ifnull(item.is_sub_contracted_item, 'No') = 'Yes') %s))) """ % ('%s', so_filter, item_filter, item_filter), self.doc.company, as_dict=1) @@ -83,6 +83,8 @@ class DocType: def add_so_in_table(self, open_so): """ Add sales orders in the table""" + self.clear_so_table() + so_list = [d.sales_order for d in getlist(self.doclist, 'pp_so_details')] for r in open_so: if cstr(r['name']) not in so_list: @@ -116,19 +118,19 @@ class DocType: or ifnull(item.is_sub_contracted_item, 'No') = 'Yes'))""" % \ (", ".join(["%s"] * len(so_list))), tuple(so_list), as_dict=1) - dnpi_items = webnotes.conn.sql("""select distinct dnpi.parent, dnpi.item_code, dnpi.warehouse as reserved_warhouse, - (((so_item.qty - ifnull(so_item.delivered_qty, 0)) * dnpi.qty) / so_item.qty) + packed_items = webnotes.conn.sql("""select distinct pi.parent, pi.item_code, pi.warehouse as reserved_warhouse, + (((so_item.qty - ifnull(so_item.delivered_qty, 0)) * pi.qty) / so_item.qty) as pending_qty - from `tabSales Order Item` so_item, `tabPacked Item` dnpi - where so_item.parent = dnpi.parent and so_item.docstatus = 1 - and dnpi.parent_item = so_item.item_code + from `tabSales Order Item` so_item, `tabPacked Item` pi + where so_item.parent = pi.parent and so_item.docstatus = 1 + and pi.parent_item = so_item.item_code and so_item.parent in (%s) and ifnull(so_item.qty, 0) > ifnull(so_item.delivered_qty, 0) - and exists (select * from `tabItem` item where item.name=dnpi.item_code + and exists (select * from `tabItem` item where item.name=pi.item_code and (ifnull(item.is_pro_applicable, 'No') = 'Yes' or ifnull(item.is_sub_contracted_item, 'No') = 'Yes'))""" % \ (", ".join(["%s"] * len(so_list))), tuple(so_list), as_dict=1) - return items + dnpi_items + return items + packed_items def add_items(self, items): From 7d4c2d62bf11f5f740a1e1df151d6afde3e74b32 Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Thu, 12 Dec 2013 12:32:43 +0530 Subject: [PATCH 11/11] [fix] [minor] allowed renaming for address and contact --- buying/doctype/supplier/supplier.py | 18 +++++++++--------- selling/doctype/customer/customer.py | 22 +++++++++++----------- utilities/doctype/address/address.txt | 3 ++- utilities/doctype/contact/contact.txt | 3 ++- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/buying/doctype/supplier/supplier.py b/buying/doctype/supplier/supplier.py index 503ec8a1dd..2435d0cc31 100644 --- a/buying/doctype/supplier/supplier.py +++ b/buying/doctype/supplier/supplier.py @@ -28,11 +28,11 @@ class DocType(TransactionBase): self.doc.name = make_autoname(self.doc.naming_series + '.#####') def update_address(self): - webnotes.conn.sql("""update `tabAddress` set supplier_name=%s + webnotes.conn.sql("""update `tabAddress` set supplier_name=%s, modified=NOW() where supplier=%s""", (self.doc.supplier_name, self.doc.name)) def update_contact(self): - webnotes.conn.sql("""update `tabContact` set supplier_name=%s + webnotes.conn.sql("""update `tabContact` set supplier_name=%s, modified=NOW() where supplier=%s""", (self.doc.supplier_name, self.doc.name)) def update_credit_days_limit(self): @@ -164,17 +164,17 @@ class DocType(TransactionBase): rename_account_for("Supplier", olddn, newdn, merge) def after_rename(self, olddn, newdn, merge=False): - condition = value = '' + set_field = '' 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) + set_field = ", supplier_name=%(newdn)s" + self.update_supplier_address(newdn, set_field) - 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)) + def update_supplier_address(self, newdn, set_field): + webnotes.conn.sql("""update `tabAddress` set address_title=%(newdn)s + {set_field} where supplier=%(newdn)s"""\ + .format(set_field=set_field), ({"newdn": newdn})) @webnotes.whitelist() def get_dashboard_info(supplier): diff --git a/selling/doctype/customer/customer.py b/selling/doctype/customer/customer.py index 71116b33b1..49296b0b1c 100644 --- a/selling/doctype/customer/customer.py +++ b/selling/doctype/customer/customer.py @@ -48,12 +48,12 @@ class DocType(TransactionBase): 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)) + webnotes.conn.sql("""update `tabAddress` set customer_name=%s, modified=NOW() + 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)) + webnotes.conn.sql("""update `tabContact` set customer_name=%s, modified=NOW() + where customer=%s""", (self.doc.customer_name, self.doc.name)) def create_account_head(self): if self.doc.company : @@ -159,17 +159,17 @@ class DocType(TransactionBase): rename_account_for("Customer", olddn, newdn, merge) def after_rename(self, olddn, newdn, merge=False): - condition = value = '' + set_field = '' 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) + set_field = ", customer_name=%(newdn)s" + self.update_customer_address(newdn, set_field) - 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)) + def update_customer_address(self, newdn, set_field): + webnotes.conn.sql("""update `tabAddress` set address_title=%(newdn)s + {set_field} where customer=%(newdn)s"""\ + .format(set_field=set_field), ({"newdn": newdn})) @webnotes.whitelist() def get_dashboard_info(customer): diff --git a/utilities/doctype/address/address.txt b/utilities/doctype/address/address.txt index 09be67eb10..5b4ada995e 100644 --- a/utilities/doctype/address/address.txt +++ b/utilities/doctype/address/address.txt @@ -2,11 +2,12 @@ { "creation": "2013-01-10 16:34:32", "docstatus": 0, - "modified": "2013-07-11 17:02:12", + "modified": "2013-12-12 12:17:46", "modified_by": "Administrator", "owner": "Administrator" }, { + "allow_rename": 1, "doctype": "DocType", "document_type": "Master", "icon": "icon-map-marker", diff --git a/utilities/doctype/contact/contact.txt b/utilities/doctype/contact/contact.txt index 199aaea82e..1c8a5cf94a 100644 --- a/utilities/doctype/contact/contact.txt +++ b/utilities/doctype/contact/contact.txt @@ -2,11 +2,12 @@ { "creation": "2013-01-10 16:34:32", "docstatus": 0, - "modified": "2013-10-08 16:48:50", + "modified": "2013-12-12 12:18:19", "modified_by": "Administrator", "owner": "Administrator" }, { + "allow_rename": 1, "doctype": "DocType", "document_type": "Master", "icon": "icon-user",