From cfd348586579b96767b0a8e290818dbc5cba57ef Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Thu, 1 Mar 2012 17:33:27 +0530 Subject: [PATCH] [IMP] rename the fields bzr revid: tpa@tinyerp.com-20120301120327-iu9aw7r793hybzyv --- .../account_analytic_analysis_view.xml | 6 +++--- addons/crm/res_config.py | 16 +++++++-------- addons/crm/res_config_view.xml | 16 +++++++-------- addons/sale/res_config.py | 20 +++++++++---------- addons/sale/res_config_view.xml | 12 +++++------ 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index 5cdc744ccb6..5558d5f3323 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -117,10 +117,10 @@ form - + - - + + diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py index 662648ba080..1082052344c 100644 --- a/addons/crm/res_config.py +++ b/addons/crm/res_config.py @@ -25,7 +25,7 @@ class crm_configuration(osv.osv_memory): _inherit = 'res.config' _columns = { - 'crm_caldav' : fields.boolean("Use caldav to synchronize Meetings", + 'module_crm_caldav' : fields.boolean("Use caldav to synchronize Meetings", help="Install crm_caldav module: Caldav features in Meeting"), 'fetchmail_crm': fields.boolean("Lead/Opportunity mail gateway"), 'server' : fields.char('Server Name', size=256), @@ -38,21 +38,21 @@ class crm_configuration(osv.osv_memory): 'is_ssl': fields.boolean('SSL/TLS', help="Connections are encrypted with SSL/TLS through a dedicated port (default: IMAPS=993, POP=995)"), 'user' : fields.char('Username', size=256), 'password' : fields.char('Password', size=1024), - 'import_sugarcrm' : fields.boolean("Import data from sugarCRM?", + 'module_import_sugarcrm' : fields.boolean("Import data from sugarCRM?", help="""Import SugarCRM Leads, Opportunities, Users, Accounts, Contacts, Employees, Meetings, Phonecalls, Emails, and Project, Project Tasks Data into OpenERP Module. It installs import_sugarcrm module. """), - 'import_google' : fields.boolean("Import Contacts & Meetings from Google", + 'module_import_google' : fields.boolean("Import Contacts & Meetings from Google", help=""" Import google contact in partner address and add google calendar events details in Meeting It installs import_google module. """), - 'wiki_sale_faq' : fields.boolean("Install a sales FAQ?", + 'module_wiki_sale_faq' : fields.boolean("Install a sales FAQ?", help=""" It provides demo data, thereby creating a Wiki Group and a Wiki Page for Wiki Sale FAQ. It installs wiki_sale_faq module. """), - 'base_contact' : fields.boolean("Manage a several address per customer", + 'module_base_contact' : fields.boolean("Manage a several address per customer", help=""" It lets you define: * contacts unrelated to a partner, @@ -60,12 +60,12 @@ class crm_configuration(osv.osv_memory): * contacts with possibly different functions for each of its job's addresses It installs base_contact module. """), - 'google_map' : fields.boolean("Google maps on customer", + 'module_google_map' : fields.boolean("Google maps on customer", help=""" This allows yopu to locate customer on Google Map It installs google_map module. """), - 'plugin_thunderbird': fields.boolean('Thunderbird plugin', + 'module_plugin_thunderbird': fields.boolean('Thunderbird plugin', help=""" The plugin allows you archive email and its attachments to the selected OpenERP objects. You can select a partner, a task, a project, an analytical @@ -74,7 +74,7 @@ class crm_configuration(osv.osv_memory): HR Applicant and Project Issue from selected mails. It installs plugin_thunderbird module. """), - 'plugin_outlook': fields.boolean('Outlook plugin', + 'module_plugin_outlook': fields.boolean('Outlook plugin', help=""" Outlook plug-in allows you to select an object that you would like to add to your email and its attachments from MS Outlook. You can select a partner, a task, diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml index 7f07554b8b1..66130eae4a8 100644 --- a/addons/crm/res_config_view.xml +++ b/addons/crm/res_config_view.xml @@ -12,9 +12,9 @@ - + - + @@ -38,25 +38,25 @@ - + - + - + - + - + - + diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index d18334994af..0eb580c10c7 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -51,7 +51,7 @@ class sale_configuration(osv.osv_memory): ('manual', 'Invoice Based on Sales Orders'), ('picking', 'Invoice Based on Deliveries'), ], 'Main Method Based On', required=True, help="You can generate invoices based on sales orders or based on shippings."), - 'delivery': fields.boolean('Do you charge the delivery?', + 'module_delivery': fields.boolean('Do you charge the delivery?', help =""" Allows you to add delivery methods in sale orders and picking, You can define your own carrier and delivery grids for prices. @@ -61,27 +61,27 @@ class sale_configuration(osv.osv_memory): 'picking_policy' : fields.boolean("Deliver all products at once?", help = ""), 'group_sale_delivery_address':fields.boolean("Multiple Address",help="Group To Allow delivery address different from invoice address"), 'group_sale_disc_per_sale_order_line':fields.boolean("Discounts per sale order lines ",help="Group to apply discounts per sale order lines"), - 'sale_layout':fields.boolean("Notes & subtotals per line",help="Allows to format sale order lines using notes, separators, titles and subtotals. It installs the sale_layout module."), - 'warning': fields.boolean("Alerts by products or customers", + 'module_sale_layout':fields.boolean("Notes & subtotals per line",help="Allows to format sale order lines using notes, separators, titles and subtotals. It installs the sale_layout module."), + 'module_warning': fields.boolean("Alerts by products or customers", help="""To trigger warnings in OpenERP objects. Warning messages can be displayed for objects like sale order, purchase order, picking and invoice. The message is triggered by the form's onchange event. It installs the warning module."""), - 'sale_margin': fields.boolean("Display Margin For Users", + 'module_sale_margin': fields.boolean("Display Margin For Users", help="""This adds the 'Margin' on sales order, This gives the profitability by calculating the difference between the Unit Price and Cost Price. .It installs the sale_margin module."""), - 'sale_journal': fields.boolean("Invoice journal?", + 'module_sale_journal': fields.boolean("Invoice journal?", help="""This allows you to categorise your sales and deliveries (picking lists) between different journals. It installs the sale_journal module."""), - 'analytic_user_function' : fields.boolean("User function by contracts", + 'module_analytic_user_function' : fields.boolean("User function by contracts", help="""This allows you to define what is the default function of a specific user on a given account This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled. But the possibility to change these values is still available. It Installs analytic_user_function module"""), - 'analytic_journal_billing_rate' : fields.boolean("Billing rates by contracts", + 'module_analytic_journal_billing_rate' : fields.boolean("Billing rates by contracts", help=""" This allows you to define what is the default invoicing rate for a specific journal on a given account. It installs analytic_journal_billing_rate module. """), - 'account_analytic_analysis': fields.boolean('Contracts', + 'module_account_analytic_analysis': fields.boolean('Contracts', help = """ For modifying account analytic view to show important data to project manager of services companies, You can also view the report of account analytic summary user-wise as well as month wise @@ -160,8 +160,8 @@ class sale_configuration(osv.osv_memory): def create(self, cr, uid, vals, context=None): ids = super(sale_configuration, self).create(cr, uid, vals, context=context) self.execute(cr, uid, [ids], vals, context=context) - return ids - + return ids + def write(self, cr, uid, ids, vals, context=None): self.execute(cr, uid, ids, vals, context=context) return super(sale_configuration, self).write(cr, uid, ids, vals, context=context) diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index 302ab9b014e..5eb77eee6a5 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -24,7 +24,7 @@ - + @@ -43,9 +43,9 @@ on_change="onchange_tax_policy(tax_policy,tax_value)"/> - + - + @@ -56,9 +56,9 @@ - + - + @@ -66,7 +66,7 @@ - +