From 562de92070d9741456c4c7b8699a681583d9eb7f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 27 Dec 2012 15:14:27 +0530 Subject: [PATCH] removed project related doctype mapper --- .../Project-Sales Invoice.txt | 49 ------------------- .../doctype/sales_invoice/sales_invoice.js | 7 --- .../doctype/sales_invoice/sales_invoice.py | 7 --- .../december_2012/remove_project_mapper.py | 6 +++ patches/patch_list.py | 4 ++ .../Project-Sales Order.txt | 49 ------------------- .../Project-Delivery Note.txt | 49 ------------------- stock/doctype/delivery_note/delivery_note.py | 7 --- 8 files changed, 10 insertions(+), 168 deletions(-) delete mode 100644 accounts/DocType Mapper/Project-Sales Invoice/Project-Sales Invoice.txt create mode 100644 patches/december_2012/remove_project_mapper.py delete mode 100644 selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt delete mode 100644 stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt diff --git a/accounts/DocType Mapper/Project-Sales Invoice/Project-Sales Invoice.txt b/accounts/DocType Mapper/Project-Sales Invoice/Project-Sales Invoice.txt deleted file mode 100644 index dd5705da9a..0000000000 --- a/accounts/DocType Mapper/Project-Sales Invoice/Project-Sales Invoice.txt +++ /dev/null @@ -1,49 +0,0 @@ -[ - { - "owner": "ashwini@webnotestech.com", - "docstatus": 0, - "creation": "2010-09-01 15:47:59", - "modified_by": "Administrator", - "modified": "2012-04-03 12:49:50" - }, - { - "match_id": 0, - "parent": "Project-Sales Invoice", - "name": "__common__", - "doctype": "Table Mapper Detail", - "parenttype": "DocType Mapper", - "from_table": "Project", - "to_table": "Sales Invoice", - "validation_logic": "name is not null", - "parentfield": "table_mapper_details" - }, - { - "map": "Yes", - "match_id": 0, - "parent": "Project-Sales Invoice", - "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": "Sales Invoice", - "module": "Accounts", - "doctype": "DocType Mapper", - "from_doctype": "Project" - }, - { - "name": "Project-Sales Invoice", - "doctype": "DocType Mapper" - }, - { - "doctype": "Field Mapper Detail" - }, - { - "doctype": "Table Mapper Detail" - } -] \ No newline at end of file diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js index 7c9b47710f..86dc3a5c14 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.js +++ b/accounts/doctype/sales_invoice/sales_invoice.js @@ -264,13 +264,6 @@ cur_frm.cscript.write_off_amount = function(doc) { } -//---- get customer details ---------------------------- -cur_frm.cscript.project_name = function(doc,cdt,cdn){ - $c_obj(make_doclist(doc.doctype, doc.name),'pull_project_customer','', function(r,rt){ - refresh_many(['customer', 'customer_name','customer_address', 'territory']); - }); -} - //Set debit and credit to zero on adding new row //---------------------------------------------- cur_frm.fields_dict['entries'].grid.onrowadd = function(doc, cdt, cdn){ diff --git a/accounts/doctype/sales_invoice/sales_invoice.py b/accounts/doctype/sales_invoice/sales_invoice.py index 486bc0aad1..5042f5380b 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.py +++ b/accounts/doctype/sales_invoice/sales_invoice.py @@ -320,13 +320,6 @@ class DocType(TransactionBase): def get_advances(self): self.doclist = get_obj('GL Control').get_advances(self, self.doc.debit_to, 'Sales Invoice Advance', 'advance_adjustment_details', 'credit') - - def pull_project_customer(self): - res = webnotes.conn.sql("select customer from `tabProject` where name = '%s'" % - self.doc.project_name) - if res and res[0][0]: - get_obj('DocType Mapper', 'Project-Sales Invoice').dt_map('Project', 'Sales Invoice', self.doc.project_name, self.doc, self.doclist, "[['Project', 'Sales Invoice']]") - def get_company_abbr(self): return webnotes.conn.sql("select abbr from tabCompany where name=%s", self.doc.company)[0][0] diff --git a/patches/december_2012/remove_project_mapper.py b/patches/december_2012/remove_project_mapper.py new file mode 100644 index 0000000000..39aae6b764 --- /dev/null +++ b/patches/december_2012/remove_project_mapper.py @@ -0,0 +1,6 @@ +import webnotes + +def execute(): + from webnotes.model import delete_doc + for d in ["Project-Sales Order", "Project-Delivery Note", "Project-Sales Invoice"]: + delete_doc("DocType Mapper", d) \ No newline at end of file diff --git a/patches/patch_list.py b/patches/patch_list.py index 2ca4822f37..7a347ff6a0 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -562,4 +562,8 @@ patch_list = [ 'patch_module': 'patches.december_2012', 'patch_file': 'delete_form16_print_format', }, + { + 'patch_module': 'patches.december_2012', + 'patch_file': 'remove_project_mapper', + }, ] \ No newline at end of file diff --git a/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt b/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt deleted file mode 100644 index 0d4a5a3e97..0000000000 --- a/selling/DocType Mapper/Project-Sales Order/Project-Sales Order.txt +++ /dev/null @@ -1,49 +0,0 @@ -[ - { - "owner": "ashwini@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-Sales Order", - "name": "__common__", - "doctype": "Table Mapper Detail", - "parenttype": "DocType Mapper", - "from_table": "Project", - "to_table": "Sales Order", - "validation_logic": "name is not null", - "parentfield": "table_mapper_details" - }, - { - "map": "Yes", - "match_id": 0, - "parent": "Project-Sales Order", - "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": "Sales Order", - "module": "Selling", - "doctype": "DocType Mapper", - "from_doctype": "Project" - }, - { - "name": "Project-Sales Order", - "doctype": "DocType Mapper" - }, - { - "doctype": "Field Mapper Detail" - }, - { - "doctype": "Table Mapper Detail" - } -] \ No newline at end of file diff --git a/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt b/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt deleted file mode 100644 index 6bc90f42d5..0000000000 --- a/stock/DocType Mapper/Project-Delivery Note/Project-Delivery Note.txt +++ /dev/null @@ -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" - } -] \ No newline at end of file diff --git a/stock/doctype/delivery_note/delivery_note.py b/stock/doctype/delivery_note/delivery_note.py index ef22437797..af4d91e9aa 100644 --- a/stock/doctype/delivery_note/delivery_note.py +++ b/stock/doctype/delivery_note/delivery_note.py @@ -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 {}