diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 7a048a50eb4..dd9bed97327 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -107,15 +107,15 @@ class sale_config_settings(osv.osv_memory):
'module_crm': fields.boolean('CRM'),
'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
- account, or any other object and attach the selected mail as a .eml file in
+ OpenERP objects. You can select a partner, or a lead and
+ attach the selected mail as a .eml file in
the attachment of a selected record. You can create documents for CRM Lead,
- HR Applicant and Project Issue from the selected emails.
+ Partner from the selected emails.
This installs the module plugin_thunderbird."""),
'module_plugin_outlook': fields.boolean('Outlook Plugin',
help="""The Outlook plugin 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,
- a project, an analytical account, or any other object and archive a selected
+ to your email and its attachments from MS Outlook. You can select a partner,
+ or a lead object and archive a selected
email into an OpenERP mail message with attachments.
This installs the module plugin_outlook."""),
}
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 0692b4f651c..c674aa0e712 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -51,7 +51,7 @@
-
+
@@ -59,11 +59,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index b40ed78bb16..563da4bd137 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -26,7 +26,7 @@ class crm_configuration(osv.osv_memory):
_inherit = ['sale.config.settings', 'fetchmail.config.settings']
_columns = {
- 'fetchmail_lead': fields.boolean("Create Leads from Incoming Mails", readonly=True,
+ 'fetchmail_lead': fields.boolean("Create Leads from Incoming Mails",
fetchmail_model='crm.lead', fetchmail_name='Incoming Leads',
help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
'module_crm_caldav': fields.boolean("Caldav Synchronization",
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index a09f333076f..53cdb0a873c 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -10,7 +10,9 @@
-
+
+
+
diff --git a/addons/crm_claim/res_config.py b/addons/crm_claim/res_config.py
index 0dca243890b..05f7962e18b 100644
--- a/addons/crm_claim/res_config.py
+++ b/addons/crm_claim/res_config.py
@@ -26,7 +26,7 @@ class crm_claim_settings(osv.osv_memory):
_inherit = ['sale.config.settings', 'fetchmail.config.settings']
_columns = {
- 'fetchmail_claim': fields.boolean("Create Claims from Incoming Mails", readonly=True,
+ 'fetchmail_claim': fields.boolean("Create Claims from Incoming Mails",
fetchmail_model='crm.claim', fetchmail_name='Incoming Claims',
help="""Allows you to configure your incoming mail server, and create claims from incoming emails."""),
}
diff --git a/addons/crm_claim/res_config_view.xml b/addons/crm_claim/res_config_view.xml
index 72632c1afef..865eb6d4769 100644
--- a/addons/crm_claim/res_config_view.xml
+++ b/addons/crm_claim/res_config_view.xml
@@ -10,8 +10,11 @@
+
-
+
+
+
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index 8a7dabeabcc..52558136455 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -20,6 +20,7 @@
+
@@ -35,8 +36,8 @@
-
+
diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py
index 28f501c5213..4818d280879 100644
--- a/addons/hr_recruitment/res_config.py
+++ b/addons/hr_recruitment/res_config.py
@@ -29,8 +29,8 @@ class hr_applicant_settings(osv.osv_memory):
'module_document_ftp': fields.boolean('Automatic Indexation of Resumes',
help="""Manage your CV's and motivation letter related to all applicants.
This installs the module document_ftp. This will install the knowledge management module in order to allow you to search using specific keywords through the content of all documents (PDF, .DOCx...)"""),
- 'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails', readonly=True,
- fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',
+ 'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails',
+ fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',
help ="""Allow applicants to send their job application to an email address (jobs@mycompany.com),
and create automatically application documents in the system."""),
}
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 659aa586d56..542f89a279f 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -12,7 +12,9 @@
-
+
+
+
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index e4ec3316c27..cbee02cb4a8 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -68,6 +68,13 @@ class mrp_config_settings(osv.osv_memory):
'group_mrp_properties': fields.boolean("Allow Several BoMs per Product",
implied_group='product.group_mrp_properties',
help="""The selection of the right Bill of Material to use will depend on the properties specified on the sale order and the Bill of Material."""),
+ 'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
+ help="""This allows you to define the following for a product:
+ * Manufacturer
+ * Manufacturer Product Name
+ * Manufacturer Product Code
+ * Product Attributes.
+ This installs the module product_manufacturer."""),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 258fe4f8356..1a5f6c88ead 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -12,18 +12,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py
index 676540dc63a..2b05282163f 100644
--- a/addons/plugin_outlook/plugin_outlook.py
+++ b/addons/plugin_outlook/plugin_outlook.py
@@ -22,29 +22,30 @@
from osv import fields
from osv import osv
import addons
-
import base64
class outlook_installer(osv.osv_memory):
_name = 'outlook.installer'
_inherit = 'res.config.installer'
-
_columns = {
'name':fields.char('Outlook Plug-in 32bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
'name2':fields.char('Outlook Plug-in 64bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
'description':fields.text('Description', readonly=True)
}
-
- _defaults = {
- 'name' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi',
- 'name2' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi',
- 'description' : """
-Click on icon next to the link above to download the installer either for 32 or 64 bits and execute it.
-
-System requirements:
- 1. MS Outlook 2005 or above.
- 2. MS .Net Framework 3.5 or above.
-"""
- }
-
+
+ def default_get(self, cr, uid, fields, context=None):
+ res = {}
+ plugin_32bit_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi'
+ plugin_64bit_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi'
+ description = """
+ Click on icon next to the link above to download the installer either for 32 or 64 bits and execute it.
+
+ System requirements:
+ 1. MS Outlook 2005 or above.
+ 2. MS .Net Framework 3.5 or above.
+ """
+ res['name'] = plugin_32bit_url
+ res['name2'] = plugin_64bit_url
+ res['description'] = description
+ return res
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py
index 7e9b5626e5b..88d84c57cd2 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.py
+++ b/addons/plugin_thunderbird/plugin_thunderbird.py
@@ -34,21 +34,24 @@ class plugin_thunderbird_installer(osv.osv_memory):
'pdf_file':fields.char('Installation Manual', size=264, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
'description':fields.text('Description', readonly=True)
}
+ def default_get(self, cr, uid, fields, context=None):
+ res = {}
+ plugin_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + '/plugin_thunderbird/static/openerp_plugin.xpi'
+ description = """
+ Thunderbird plugin installation:
+ 1. Save the Thunderbird plug-in.
+ 2. From the Thunderbird menubar: Tools > Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...
+ 4. Select the plug-in (the file named openerp_plugin.xpi).
+ 5. Click "Install Now".
+ 6. Restart Thunderbird.
+ 7. From the Thunderbird menubar: OpenERP -> Configuration.
+ 8. Configure your openerp server.
+ """
+ res['thunderbird'] = True,
+ res['name'] = 'openerp_plugin.xpi'
+ res['plugin_file'] = plugin_url
+ res['pdf_file'] = 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
+ res['description'] = description
+ return res
- _defaults = {
- 'thunderbird' : True,
- 'name' : 'openerp_plugin.xpi',
- 'pdf_file' : 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
- 'plugin_file' : '/plugin_thunderbird/static/openerp_plugin.xpi',
- 'description' : """
-Thunderbird plugin installation:
- 1. Save the Thunderbird plug-in.
- 2. From the Thunderbird menubar: Tools > Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...
- 4. Select the plug-in (the file named openerp_plugin.xpi).
- 5. Click "Install Now".
- 6. Restart Thunderbird.
- 7. From the Thunderbird menubar: OpenERP -> Configuration.
- 8. Configure your openerp server.
-"""
- }
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index b5601e7904a..c535527fc63 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -63,7 +63,7 @@
-
+
diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index 21281110fb9..3c396d76b3a 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -46,6 +46,7 @@ class project_configuration(osv.osv_memory):
'module_project_issue': fields.boolean("Issues and Bug Tracking",
help="""Provides management of issues/bugs in projects.
This installs the module project_issue."""),
+ 'time_unit': fields.many2one('product.uom', 'Working Time Unit'),
'module_project_issue_sheet': fields.boolean("Track and Invoice Issues Working Time",
help="""Provides timesheet support for the issues/bugs management in project.
This installs the module project_issue_sheet."""),
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 4914ff26e88..1a52936d055 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -7,28 +7,33 @@
form
+
+
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 1a4d5540b42..a139c8fc373 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -48,13 +48,7 @@ class purchase_config_settings(osv.osv_memory):
help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier.
Example: Product: this product is deprecated, do not purchase more than 5.
Supplier: don't forget to ask for an express delivery."""),
- 'module_product_manufacturer': fields.boolean("Define Manufacturers on Products",
- help="""This allows you to define the following for a product:
- * Manufacturer
- * Manufacturer Product Name
- * Manufacturer Product Code
- * Product Attributes.
- This installs the module product_manufacturer."""),
+
'module_purchase_double_validation': fields.boolean("Two Levels of Approval",
help="""Provide a double validation mechanism for purchases exceeding minimum amount.
This installs the module purchase_double_validation."""),
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 94073092c7e..0f9ed891b61 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -15,7 +15,7 @@
-
+
@@ -23,9 +23,7 @@
-
-
-
+
@@ -58,6 +56,8 @@
+
+
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 793088f6c31..de31fd604c7 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -27,7 +27,7 @@ class sale_configuration(osv.osv_memory):
_inherit = 'sale.config.settings'
_columns = {
- 'group_invoice_so_lines': fields.boolean('Based on Sales Orders',
+ 'group_invoice_so_lines': fields.boolean('Based on Sale Orders',
implied_group='sale.group_invoice_so_lines',
help="To allow your salesman to make invoices for sale order lines using the menu 'Lines to Invoice'."),
'group_invoice_deli_orders': fields.boolean('Based on Delivery Orders',
@@ -103,7 +103,16 @@ class sale_configuration(osv.osv_memory):
'module_project': fields.boolean("Project"),
'decimal_precision': fields.integer('Decimal Precision on Price',help="As an example, a decimal precision of 2 will allow prices like: 9.99 EUR, whereas a decimal precision of 4 will allow prices like: 0.0231 EUR per unit."),
}
-
+ def _check_decimal(self, cr, uid, ids, context=None):
+ for decimal in self.browse(cr, uid, ids, context=context):
+ if decimal.decimal_precision > 20:
+ return False
+ return True
+
+ _constraints = [
+ (_check_decimal, 'Digits must be between 0 to 20 ', ['decimal_precision']),
+ ]
+
def default_get(self, cr, uid, fields, context=None):
ir_model_data = self.pool.get('ir.model.data')
res = super(sale_configuration, self).default_get(cr, uid, fields, context)
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index c633ee4165e..bc67f8347e7 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -9,38 +9,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+