From 2a44bf82456c862f7d2798bf8cdf6b5d86b0b477 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 15 Nov 2012 15:11:15 +0530 Subject: [PATCH] customer_issue: moved allocated to assigned --- .../page/accounts_browser/accounts_browser.js | 7 +- home/page/latest_updates/latest_updates.js | 3 + .../customer_issue_allocated_to_assigned.py | 15 + patches/patch_list.py | 4 + .../doctype/customer_issue/customer_issue.py | 8 - .../doctype/customer_issue/customer_issue.txt | 343 ++++++++---------- 6 files changed, 182 insertions(+), 198 deletions(-) create mode 100644 patches/november_2012/customer_issue_allocated_to_assigned.py diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js index e1b8048ff1..3ef5045842 100644 --- a/accounts/page/accounts_browser/accounts_browser.js +++ b/accounts/page/accounts_browser/accounts_browser.js @@ -152,13 +152,16 @@ erpnext.AccountsChart = Class.extend({ var d = new wn.ui.Dialog({ title:'New Account', fields: [ - {fieldtype:'Data', fieldname:'account_name', label:'New Account Name', reqd:true}, + {fieldtype:'Data', fieldname:'account_name', label:'New Account Name', reqd:true, + description: "Name of new Account. Note: Please don't create accounts for Customers and Suppliers, \ + they are created automatically from the Customer and Supplier master"}, {fieldtype:'Select', fieldname:'group_or_ledger', label:'Group or Ledger', options:'Group\nLedger', description:'Further accounts can be made under Groups,\ but entries can be made against Ledger'}, {fieldtype:'Select', fieldname:'account_type', label:'Account Type', options: ['', 'Fixed Asset Account', 'Bank or Cash', 'Expense Account', 'Tax', - 'Income Account', 'Chargeable'].join('\n') }, + 'Income Account', 'Chargeable'].join('\n'), + description: "Optional. This setting will be used to filter in various transactions." }, {fieldtype:'Float', fieldname:'tax_rate', label:'Tax Rate'}, {fieldtype:'Button', fieldname:'create_new', label:'Create New' } ] diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js index b82655dca2..ad6ef7be82 100644 --- a/home/page/latest_updates/latest_updates.js +++ b/home/page/latest_updates/latest_updates.js @@ -1,6 +1,9 @@ erpnext.updates = [ ["14th November 2012", [ + "Customer Issue: Moved all allocations to 'Assigned' so that there is avoid duplication fo features.", "Letter Head: Show preview, make upload button more visible.", + "Price List: Removed import, now import from Data Import Tool.", + "Data Import Tool: More help in template.", ]], ["14th November 2012", [ "Employee: If User ID is set, Employee Name will be updated in defaults and will appear automatically in all relevant forms.", diff --git a/patches/november_2012/customer_issue_allocated_to_assigned.py b/patches/november_2012/customer_issue_allocated_to_assigned.py new file mode 100644 index 0000000000..22634018b4 --- /dev/null +++ b/patches/november_2012/customer_issue_allocated_to_assigned.py @@ -0,0 +1,15 @@ +from __future__ import unicode_literals +import webnotes + +def execute(): + from webnotes.widgets.form.assign_to import add + for t in webnotes.conn.sql("""select * from `tabCustomer Issue` + where ifnull(allocated_to, '')!=''""", as_dict=1): + add({ + 'doctype': "Customer Issue", + 'name': t['name'], + 'assign_to': t['allocated_to'], + 'assigned_by': t['owner'], + 'description': t['complaint'], + 'date': t['creation'] + }) \ No newline at end of file diff --git a/patches/patch_list.py b/patches/patch_list.py index abf7fae917..2b404b9472 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -663,4 +663,8 @@ patch_list = [ 'patch_module': 'patches.november_2012', 'patch_file': 'report_permissions', }, + { + 'patch_module': 'patches.november_2012', + 'patch_file': 'customer_issue_allocated_to_assigned', + }, ] diff --git a/support/doctype/customer_issue/customer_issue.py b/support/doctype/customer_issue/customer_issue.py index d6e29e1d45..7dccf0a78d 100644 --- a/support/doctype/customer_issue/customer_issue.py +++ b/support/doctype/customer_issue/customer_issue.py @@ -44,8 +44,6 @@ class DocType(TransactionBase): def autoname(self): self.doc.name = make_autoname(self.doc.naming_series + '.######') -#check if maintenance schedule already generated -#============================================ def check_maintenance_visit(self): nm = sql("select t1.name from `tabMaintenance Visit` t1, `tabMaintenance Visit Purpose` t2 where t2.parent=t1.name and t2.prevdoc_docname=%s and t1.docstatus=1 and t1.completion_status='Fully Completed'", self.doc.name) nm = nm and nm[0][0] or '' @@ -53,12 +51,6 @@ class DocType(TransactionBase): if not nm: return 'No' - def on_submit(self): - if session['user'] != 'Guest': - if not self.doc.allocated_to: - msgprint("Please select service person name whom you want to assign this issue") - raise Exception - def validate(self): if session['user'] != 'Guest' and not self.doc.customer: msgprint("Please select Customer from whom issue is raised") diff --git a/support/doctype/customer_issue/customer_issue.txt b/support/doctype/customer_issue/customer_issue.txt index a96e91e6bd..6d4218fde3 100644 --- a/support/doctype/customer_issue/customer_issue.txt +++ b/support/doctype/customer_issue/customer_issue.txt @@ -3,11 +3,11 @@ # These values are common in all dictionaries { - 'creation': '2012-04-13 11:56:39', - 'docstatus': 0, - 'modified': '2012-05-18 17:04:36', - 'modified_by': u'Administrator', - 'owner': u'harshada@webnotestech.com' + u'creation': '2012-07-03 13:30:52', + u'docstatus': 0, + u'modified': '2012-11-15 15:05:51', + u'modified_by': u'Administrator', + u'owner': u'harshada@webnotestech.com' }, # These values are common for all DocType @@ -15,10 +15,10 @@ '_last_update': u'1325570647', 'colour': u'White:FFF', 'default_print_format': u'Standard', - 'doctype': 'DocType', + u'doctype': u'DocType', 'is_submittable': 1, 'module': u'Support', - 'name': '__common__', + u'name': u'__common__', 'search_fields': u'status,customer,customer_name,allocated_to,allocated_on, territory', 'section_style': u'Tabbed', 'server_code_error': u' ', @@ -30,8 +30,8 @@ # These values are common for all DocField { - 'doctype': u'DocField', - 'name': '__common__', + u'doctype': u'DocField', + u'name': u'__common__', 'parent': u'Customer Issue', 'parentfield': u'fields', 'parenttype': u'DocType' @@ -39,8 +39,8 @@ # These values are common for all DocPerm { - 'doctype': u'DocPerm', - 'name': '__common__', + u'doctype': u'DocPerm', + u'name': u'__common__', 'parent': u'Customer Issue', 'parentfield': u'permissions', 'parenttype': u'DocType', @@ -49,79 +49,13 @@ # DocType, Customer Issue { - 'doctype': 'DocType', - 'name': u'Customer Issue' - }, - - # DocPerm - { - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Guest', - 'write': 1 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'System Manager', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'System Manager' - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Maintenance Manager', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Maintenance Manager' - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': u'DocPerm', - 'permlevel': 0, - 'role': u'Maintenance User', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'doctype': u'DocPerm', - 'permlevel': 1, - 'role': u'Maintenance User' + u'doctype': u'DocType', + u'name': u'Customer Issue' }, # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'basic_info', 'fieldtype': u'Section Break', 'label': u'Basic Info', @@ -131,11 +65,11 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'naming_series', 'fieldtype': u'Select', 'in_filter': 0, - 'label': u'Series', + 'label': u'Naming Series', 'no_copy': 1, 'oldfieldname': u'naming_series', 'oldfieldtype': u'Select', @@ -145,10 +79,28 @@ 'search_index': 0 }, + # DocField + { + 'colour': u'White:FFF', + 'default': u'Open', + u'doctype': u'DocField', + 'fieldname': u'status', + 'fieldtype': u'Select', + 'in_filter': 1, + 'label': u'Status', + 'no_copy': 1, + 'oldfieldname': u'status', + 'oldfieldtype': u'Select', + 'options': u'\nOpen\nClosed\nWork In Progress\nCancelled', + 'permlevel': 0, + 'reqd': 1, + 'search_index': 1 + }, + # DocField { 'default': u'Today', - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'complaint_date', 'fieldtype': u'Date', 'in_filter': 1, @@ -162,7 +114,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'column_break0', 'fieldtype': u'Column Break', 'oldfieldtype': u'Column Break', @@ -173,7 +125,7 @@ # DocField { 'colour': u'White:FFF', - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'customer', 'fieldtype': u'Link', 'in_filter': 1, @@ -190,7 +142,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'customer_address', 'fieldtype': u'Link', 'label': u'Customer Address', @@ -201,7 +153,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'contact_person', 'fieldtype': u'Link', 'label': u'Contact Person', @@ -212,7 +164,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'issue_details', 'fieldtype': u'Section Break', 'label': u'Issue Details', @@ -223,7 +175,22 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', + 'fieldname': u'complaint', + 'fieldtype': u'Small Text', + 'label': u'Issue', + 'no_copy': 1, + 'oldfieldname': u'complaint', + 'oldfieldtype': u'Small Text', + 'permlevel': 0, + 'reqd': 1 + }, + + # DocField + { + 'colour': u'White:FFF', + 'description': u'Item, Warranty, AMC (Annual Maintenance Contract) details will be automatically fetched when Serial Number is selected.', + u'doctype': u'DocField', 'fieldname': u'serial_no', 'fieldtype': u'Link', 'label': u'Serial No', @@ -235,7 +202,7 @@ # DocField { 'colour': u'White:FFF', - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'item_code', 'fieldtype': u'Link', 'in_filter': 1, @@ -251,20 +218,7 @@ # DocField { - 'doctype': u'DocField', - 'fieldname': u'complaint', - 'fieldtype': u'Small Text', - 'label': u'Issue', - 'no_copy': 1, - 'oldfieldname': u'complaint', - 'oldfieldtype': u'Small Text', - 'permlevel': 0, - 'reqd': 1 - }, - - # DocField - { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'column_break1', 'fieldtype': u'Column Break', 'oldfieldtype': u'Column Break', @@ -276,7 +230,7 @@ { 'colour': u'White:FFF', 'depends_on': u'eval:doc.item_code', - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'item_name', 'fieldtype': u'Data', 'label': u'Item Name', @@ -289,7 +243,7 @@ { 'colour': u'White:FFF', 'depends_on': u'eval:doc.item_code', - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'description', 'fieldtype': u'Small Text', 'label': u'Description', @@ -302,7 +256,7 @@ # DocField { 'colour': u'White:FFF', - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'warranty_amc_status', 'fieldtype': u'Select', 'hidden': 0, @@ -314,7 +268,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'warranty_expiry_date', 'fieldtype': u'Date', 'label': u'Warranty Expiry Date', @@ -323,7 +277,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'amc_expiry_date', 'fieldtype': u'Date', 'label': u'AMC Expiry Date', @@ -332,7 +286,9 @@ # DocField { - 'doctype': u'DocField', + 'colour': u'White:FFF', + 'description': u'To assign this issue, use the "Assign" button in the sidebar.', + u'doctype': u'DocField', 'fieldname': u'resolution_section', 'fieldtype': u'Section Break', 'label': u'Resolution', @@ -343,44 +299,7 @@ # DocField { - 'doctype': u'DocField', - 'fieldname': u'allocated_on', - 'fieldtype': u'Date', - 'in_filter': 1, - 'label': u'Allocated On', - 'oldfieldname': u'allocated_on', - 'oldfieldtype': u'Date', - 'permlevel': 0, - 'search_index': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'allocated_to', - 'fieldtype': u'Link', - 'in_filter': 1, - 'label': u'Allocated To', - 'oldfieldname': u'allocated_to', - 'oldfieldtype': u'Link', - 'options': u'Profile', - 'permlevel': 0, - 'search_index': 1 - }, - - # DocField - { - 'doctype': u'DocField', - 'fieldname': u'column_break2', - 'fieldtype': u'Column Break', - 'oldfieldtype': u'Column Break', - 'permlevel': 0, - 'width': u'50%' - }, - - # DocField - { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'resolution_date', 'fieldtype': u'Date', 'in_filter': 1, @@ -394,7 +313,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'resolved_by', 'fieldtype': u'Link', 'in_filter': 1, @@ -409,7 +328,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'resolution_details', 'fieldtype': u'Text', 'label': u'Resolution Details', @@ -421,7 +340,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'contact_info', 'fieldtype': u'Section Break', 'label': u'Contact Info', @@ -430,7 +349,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'col_break3', 'fieldtype': u'Column Break', 'permlevel': 0, @@ -439,7 +358,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'customer_name', 'fieldtype': u'Data', 'label': u'Customer Name', @@ -448,7 +367,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'customer_group', 'fieldtype': u'Link', 'label': u'Customer Group', @@ -461,7 +380,7 @@ # DocField { 'colour': u'White:FFF', - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'territory', 'fieldtype': u'Link', 'in_filter': 1, @@ -477,7 +396,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'address_display', 'fieldtype': u'Small Text', 'label': u'Address', @@ -486,7 +405,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'col_break4', 'fieldtype': u'Column Break', 'permlevel': 0, @@ -495,7 +414,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'contact_display', 'fieldtype': u'Small Text', 'label': u'Contact', @@ -504,7 +423,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'contact_mobile', 'fieldtype': u'Data', 'label': u'Mobile No', @@ -513,7 +432,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'contact_email', 'fieldtype': u'Data', 'label': u'Contact Email', @@ -522,7 +441,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'service_address', 'fieldtype': u'Small Text', 'label': u'Service Address', @@ -533,7 +452,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'more_info', 'fieldtype': u'Section Break', 'label': u'More Info', @@ -542,7 +461,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'col_break5', 'fieldtype': u'Column Break', 'permlevel': 0, @@ -552,7 +471,7 @@ # DocField { 'colour': u'White:FFF', - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'company', 'fieldtype': u'Link', 'in_filter': 1, @@ -569,7 +488,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'fiscal_year', 'fieldtype': u'Select', 'in_filter': 1, @@ -585,25 +504,7 @@ # DocField { - 'colour': u'White:FFF', - 'default': u'Open', - 'doctype': u'DocField', - 'fieldname': u'status', - 'fieldtype': u'Select', - 'in_filter': 1, - 'label': u'Status', - 'no_copy': 1, - 'oldfieldname': u'status', - 'oldfieldtype': u'Select', - 'options': u'\nOpen\nClosed\nWork In Progress\nCancelled', - 'permlevel': 0, - 'reqd': 1, - 'search_index': 1 - }, - - # DocField - { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'col_break6', 'fieldtype': u'Column Break', 'permlevel': 0, @@ -612,7 +513,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'complaint_raised_by', 'fieldtype': u'Data', 'label': u'Raised By', @@ -623,7 +524,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'from_company', 'fieldtype': u'Data', 'label': u'From Company', @@ -634,7 +535,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'amended_from', 'fieldtype': u'Data', 'hidden': 1, @@ -649,7 +550,7 @@ # DocField { - 'doctype': u'DocField', + u'doctype': u'DocField', 'fieldname': u'amendment_date', 'fieldtype': u'Date', 'hidden': 1, @@ -660,5 +561,71 @@ 'permlevel': 0, 'print_hide': 1, 'width': u'100px' + }, + + # DocPerm + { + 'create': 1, + u'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Guest', + 'write': 1 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + u'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'System Manager', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + u'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'System Manager' + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + u'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Maintenance Manager', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + u'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Maintenance Manager' + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + u'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Maintenance User', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + u'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Maintenance User' } ] \ No newline at end of file