diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py index 5f6318ec5a1..8050d220dae 100644 --- a/addons/base_setup/todo.py +++ b/addons/base_setup/todo.py @@ -88,7 +88,7 @@ class base_setup_company(osv.osv_memory): 'city':fields.char('City', size=128), 'state_id':fields.selection(_get_all_states, 'State'), 'country_id':fields.selection(_get_all_countries, 'Country'), - 'email':fields.char('E-mail', size=64), + 'email':fields.char('E-mail', size=64, required=True), 'phone':fields.char('Phone', size=64), 'currency':fields.many2one('res.currency', 'Currency', required=True), 'rml_header1':fields.char('Report Header', size=200, @@ -154,7 +154,7 @@ base_setup_company() class res_currency(osv.osv): _inherit = 'res.currency' - + def name_get(self, cr, uid, ids, context=None): if context is None: context = {} @@ -168,7 +168,7 @@ class res_currency(osv.osv): ids = [ids] reads = self.read(cr, uid, ids, ['name','code'], context, load='_classic_write') return [(x['id'], tools.ustr(x['name']) + ' (' + tools.ustr(x['code']) + ')') for x in reads] - + res_currency() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/crm_installer.py b/addons/crm/crm_installer.py index 8fb7c02ff85..5f2a4ce63ee 100644 --- a/addons/crm/crm_installer.py +++ b/addons/crm/crm_installer.py @@ -30,19 +30,19 @@ import tools class crm_installer(osv.osv_memory): _name = 'crm.installer' _inherit = 'res.config.installer' - + _columns = { - 'name': fields.char('Name', size=64), - 'crm_helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."), - 'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fund raising process and tracking."), - 'crm_claim': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."), - 'crm_caldav': fields.boolean('Calendar Synchronizing', help="Help you to synchronize the meetings with other calender clients(e.g.: Sunbird)."), - 'sale_crm': fields.boolean('Create Quotation from Opportunity', help="This module relates sale to opportunity cases in the CRM."), + 'name': fields.char('Name', size=64), + 'crm_helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."), + 'crm_fundraising': fields.boolean('Fundraising', help="This may help associations in their fund raising process and tracking."), + 'crm_claim': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."), + 'crm_caldav': fields.boolean('Calendar Synchronizing', help="Help you to synchronize the meetings with other calender clients(e.g.: Sunbird)."), + 'sale_crm': fields.boolean('Opportunity to Quotation', help="This module relates sale to opportunity cases in the CRM."), 'fetchmail': fields.boolean('Fetch Emails', help="Fetchmail Server."), - 'thunderbird': fields.boolean('Thunderbird', help="Thunderbird Interface."), - 'wiki_sale_faq': fields.boolean('Sale FAQ', help="Sale FAQ."), + 'thunderbird': fields.boolean('Thunderbird', help="Thunderbird Interface."), + 'wiki_sale_faq': fields.boolean('Sale FAQ', help="Sale FAQ."), } - + def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): res = super(crm_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False) #Checking sale module is installed or not diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py index a260a083d74..f8a489a941c 100644 --- a/addons/document/__openerp__.py +++ b/addons/document/__openerp__.py @@ -46,7 +46,7 @@ 'security/document_security.xml', 'document_view.xml', 'document_data.xml', - 'wizard/document_configuration_view.xml', +# 'wizard/document_configuration_view.xml', 'security/ir.model.access.csv', 'report/document_report_view.xml', 'board_document_view.xml', diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml index e1da251fb9a..fb5d14e6e75 100644 --- a/addons/knowledge/knowledge_installer.xml +++ b/addons/knowledge/knowledge_installer.xml @@ -20,7 +20,7 @@ - From this screen, you can select various OpenERP applications which will help employees store information, distribute it and share it with one another. + You can select various OpenERP applications which will help you and your employees to store and share information. diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml index c3929df10af..73fc81af73d 100644 --- a/addons/mrp/mrp_installer.xml +++ b/addons/mrp/mrp_installer.xml @@ -16,7 +16,7 @@ - After having installed the core manufacturing application, you can extend it with a few more depending on the needs of your organization + After having installed the core manufacturing application, you can extend it depending on the needs of your MRP's organization diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml index c989ab50aab..6c760bc65d1 100644 --- a/addons/project/project_installer.xml +++ b/addons/project/project_installer.xml @@ -1,6 +1,6 @@ - + project.installer.view project.installer @@ -18,7 +18,7 @@ - Various OpenERP applications are available to bring your project management to the next levels of control and flexibility. + Various OpenERP applications are available to manage your projects with different level of control and flexibility. Configure @@ -65,6 +65,6 @@ - + diff --git a/addons/purchase/wizard/purchase_installer.py b/addons/purchase/wizard/purchase_installer.py index 3e195935f3a..2c0a24d0f65 100644 --- a/addons/purchase/wizard/purchase_installer.py +++ b/addons/purchase/wizard/purchase_installer.py @@ -26,6 +26,7 @@ class purchase_installer(osv.osv_memory): _columns = { 'purchase_requisition':fields.boolean('Purchase Requisition',help="Manages your Purchase Requisition and allow you to easily keep track and manage all your purchase orders."), + 'purchase_analytic_plans': fields.boolean('Purchase Analytic Plans',help="Manages analytic distribution and purchase orders.") } purchase_installer() diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml index 635297d0f21..dc10beacd98 100644 --- a/addons/purchase/wizard/purchase_installer.xml +++ b/addons/purchase/wizard/purchase_installer.xml @@ -20,13 +20,14 @@ - After having installed the core purchase application, you can extend it with more modules on needs of your organization + In this page, you can extend your purchase system with purchase requisition facility and analytic distribution of purchase orders. Configure + diff --git a/addons/report_designer/installer.py b/addons/report_designer/installer.py index 2eb061d1344..1dd9797a68b 100644 --- a/addons/report_designer/installer.py +++ b/addons/report_designer/installer.py @@ -26,9 +26,17 @@ class report_designer_installer(osv.osv_memory): _columns = { # Reporting - 'base_report_designer':fields.boolean('OpenOffice Report Designer'), - 'base_report_creator':fields.boolean('Query Builder'), - 'olap':fields.boolean('Business Intelligence Report'), + 'base_report_designer':fields.boolean('OpenOffice Report Designer',help="This module adds wizards to import/export .SXW report that " + "you can modify in OpenOffice.Once you have modified it you can " + "upload the report using the same wizard."), + 'base_report_creator':fields.boolean('Query Builder',help="his module allows you to create any statistic " + "reports on several objects. It's a SQL query builder and browser for and users. " + "After installation, it adds a menu to define custom report in the Dashboard menu."), + 'olap':fields.boolean('Business Intelligence Report',help="Olap module is used to install BI module in client. Olap provides Online " + "Analytical Process with the mdx query. BI provides Cube Browsing and Cube Designing. " + "After installation you will get Cube Browser and Cube Desinger in Reporting Menu. " + "Cube Browser is used to generate the reports with table view (mdx view) of mdx query " + "and Cube designer is used to make cubes in BI."), } report_designer_installer() diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py index 2225c1b8dbb..2c9140fa767 100644 --- a/addons/thunderbird/installer.py +++ b/addons/thunderbird/installer.py @@ -50,7 +50,7 @@ class thunderbird_installer(osv.osv_memory): 'thunderbird' : True, 'name' : 'tiny_plugin-2.0.xpi', 'pdf_name' : 'Installation Guide to OpenERP Thunderbid Plug-in.pdf', - 'description' : """ * Save the Thunderbird plug­in. \n * Follows the following step to install Thunderbird plug­in. \n -> 1.From Menu Bar of Thunderbird, open Tools ­> Add ons. \n -> 2. Click on install button and a browser window appears. \n -> 3. Select the plug-in(.xpi file) and click Ok. \n -> 4. Software installation window appears and within a short time “Install Now” button will be enabled -> 5. Click "Install Now". \n -> 6. Restart Thunderbird.""" + 'description' : """ * Save the Thunderbird plug­in. \n * Follows the step to install Thunderbird plug­in. \n -> 1.From Menu Bar of Thunderbird, open Tools ­> Add ons. \n -> 2. Click on install button and a browser window appears. \n -> 3. Select the plug-in(.xpi file) and click Ok. \n -> 4. Software installation window appears and within a short time “Install Now” button will be enabled \n -> 5. Click "Install Now". \n -> 6. Restart Thunderbird.""" } thunderbird_installer() diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml index 834ac7c6a38..0baaa27495b 100644 --- a/addons/thunderbird/thunderbird_installer.xml +++ b/addons/thunderbird/thunderbird_installer.xml @@ -15,7 +15,7 @@ Thunderbird - This module allows you to archive an e-mail on one or more objects of OpenERP. You can attach an email to a partner, a task, an analytic account or any other object. You can also create a new object like a lead, a phone call, claim and many more. + This module allows you to archive an e-mail on one or more objects of OpenERP. You can attach an email to a partner, a task, an analytic account or any other object. You can also create a new document like a lead, a phone call, claim and many more. Configure