pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merged with lp:~openerp-dev/openobject-addons/trunk-application_setting_cleanup-atp

Browse Source 
bzr revid: bde@tinyerp.com-20120611085744-1wi5vglx330e53b9
This commit is contained in:
Bharat Devnani (OpenERP)
2012-06-11 14:27:44 +05:30
parent a46b5cfeab 2f70c11e19
commit 2529ede93a
20 changed files with 142 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_setup/base_setup.py
+5 -5
View File
@@ -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."""),
}
addons/base_setup/base_setup_views.xml
+6 -6
View File
@@ -51,7 +51,7 @@
<button string="Cancel" special="cancel"/>
</header>
<sheet layout="auto">
<group>
<group colspan="4" col="4">
<group name="config_sale" colspan="4"/>
<!-- this part is necessary to allow the plugins to extend the view -->
@@ -59,11 +59,11 @@
<group name="config_fetchmail" colspan="4" attrs="{'invisible': [('module_crm','=',False)]}">
<separator string="Emails"/>
</group>
<field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
<newline/>
<field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
<group name="config_crm" colspan="4"/>
<newline/>
<field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
<newline/>
<field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
<group name="config_crm"/>
</group>
</sheet>
</form>
addons/crm/res_config.py
+1 -1
View File
@@ -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",
addons/crm/res_config_view.xml
+3 -1
View File
@@ -10,7 +10,9 @@
<field name="arch" type="xml">
<group name="config_fetchmail" position="after">
<field name="fetchmail_lead"/>
<button colspan="2" type="object" name="configure_fetchmail_lead" string="Configure" icon="gtk-execute"/>
<group attrs="{'invisible': [('fetchmail_lead','=',False)]}">
<button colspan="2" type="object" name="configure_fetchmail_lead" string="Configure" icon="gtk-execute"/>
</group>
</group>
<group name="config_crm" position="after">
addons/crm_claim/res_config.py
+1 -1
View File
@@ -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."""),
}
addons/crm_claim/res_config_view.xml
+4 -1
View File
@@ -10,8 +10,11 @@
<field name="priority" eval="12"/> <!-- to put fetchmail_lead before fetchmail_claim -->
<field name="arch" type="xml">
<group name="config_fetchmail" position="after">
<newline/>
<field name="fetchmail_claim"/>
<button colspan="2" type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-execute"/>
<group attrs="{'invisible': [('fetchmail_claim','=',False)]}">
<button colspan="2" type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-execute"/>
</group>
</group>
</field>
</record>
addons/hr/res_config_view.xml
+2 -1
View File
@@ -20,6 +20,7 @@
<button string="Cancel" special="cancel"/>
</header>
<sheet layout="auto">
<group colspan="4" col="4">
<separator string="Additional Features" colspan="4"/>
<field name="module_hr_expense"/>
<field name="module_hr_recruitment"/>
@@ -35,8 +36,8 @@
<field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
<field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
<field name="module_hr_timesheet_sheet"/>
<group name="config_recruitment" colspan="4"/>
</group>
</sheet>
</form>
</field>
addons/hr_recruitment/res_config.py
+2 -2
View File
@@ -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."""),
}
addons/hr_recruitment/res_config_view.xml
+3 -1
View File
@@ -12,7 +12,9 @@
<field name="module_document_ftp"/>
<newline/>
<field name="fetchmail_applicants"/>
<button colspan="2" type="object" name="configure_fetchmail_applicants" string="Configure" icon="gtk-execute"/>
<group attrs="{'invisible': [('fetchmail_applicants','=',False)]}">
<button colspan="2" type="object" name="configure_fetchmail_applicants" string="Configure" icon="gtk-execute"/>
</group>
</group>
</field>
</record>
addons/mrp/res_config.py
+7
View File
@@ -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:
addons/mrp/res_config_view.xml
+15 -12
View File
@@ -12,18 +12,21 @@
<button string="Cancel" special="cancel"/>
</header>
<sheet layout="auto">
<separator string="Manufacturing Order" colspan="4"/>
<field name="module_mrp_operations"/>
<field name="module_stock_planning"/>
<field name="module_mrp_subproduct"/>
<field name="module_mrp_repair"/>
<separator string="Logistics" colspan="4"/>
<field name="module_mrp_jit"/>
<field name="module_stock_no_autopicking"/>
<separator string="Bill Of Material" colspan="4"/>
<field name="group_mrp_routings"/>
<field name="group_mrp_properties"/>
<group>
<separator string="Manufacturing Order" colspan="4"/>
<field name="module_mrp_operations"/>
<field name="module_stock_planning"/>
<field name="module_mrp_subproduct"/>
<field name="module_mrp_repair"/>
<separator string="Logistics" colspan="4"/>
<field name="module_mrp_jit"/>
<field name="module_stock_no_autopicking"/>
<separator string="Bill Of Material" colspan="4"/>
<field name="group_mrp_routings"/>
<field name="group_mrp_properties"/>
<separator string="Products" colspan="4"/>
<field name="module_product_manufacturer"/>
</group>
</sheet>
</form>
</field>
addons/plugin_outlook/plugin_outlook.py
+16 -15
View File
@@ -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:
addons/plugin_thunderbird/plugin_thunderbird.py
+20 -17
View File
@@ -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:
addons/plugin_thunderbird/plugin_thunderbird.xml
+1 -1
View File
@@ -63,7 +63,7 @@
<field name="inherit_id" ref="base.view_sale_config_settings"/>
<field name="arch" type="xml">
<field name="module_plugin_thunderbird" position="after">
<group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
<group colspan="2" attrs="{'invisible': ['|',('module_crm','=',False),('module_plugin_thunderbird','=',False)]}">
<button name="%(action_thunderbird_installer)d" type="action"
string="Configure Thunderbird Plugin" icon="gtk-execute"/>
</group>
addons/project/res_config.py
+1
View File
@@ -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."""),
addons/project/res_config_view.xml
+9 -4
View File
@@ -7,28 +7,33 @@
<field name="type">form</field>
<field name="priority" eval="20"/>
<field name="arch" type="xml">
<form string="Configure Project" layout="manual">
<header>
<button string="Apply" type="object" name="execute"/>
<button string="Cancel" special="cancel"/>
</header>
<sheet layout="auto">
<group>
<separator string="Project" colspan="4"/>
<field name="group_time_work_estimation_tasks"/>
<field name="group_tasks_work_on_tasks"/>
<field name="time_unit"/>
<field name="module_project_mrp"/>
<field name="module_project_timesheet"/>
<field name="module_pad"/>
<field name="group_tasks_work_on_tasks"/>
<field name="group_time_work_estimation_tasks"/>
<separator string="Planning" colspan="4"/>
<field name="module_project_long_term"/>
<separator string="Helpdesk and Support" colspan="4"/>
<field name="module_project_issue"/>
<field name="module_project_issue_sheet"/>
<group name="support" colspan="4"/>
</group>
</sheet>
</form>
</field>
</record>
addons/purchase/res_config.py
+1 -7
View File
@@ -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."""),
addons/purchase/res_config_view.xml
+4 -4
View File
@@ -15,7 +15,7 @@
<separator string="Invoicing Control" colspan="4"/>
<field name="default_invoice_method"/>
<field name="decimal_precision"/>
<group>
<separator string="Purchase Order" colspan="4"/>
<field name="group_purchase_pricelist"/>
<field name="group_uom"/>
@@ -23,9 +23,7 @@
<field name="module_purchase_requisition"/>
<field name="module_warning"/>
<field name="module_purchase_analytic_plans"/>
<separator string="Products" colspan="4"/>
<field name="module_product_manufacturer"/>
</group>
</sheet>
</form>
</field>
@@ -58,6 +56,8 @@
</group>
</field>
</record>
</data>
</openerp>
addons/sale/res_config.py
+11 -2
View File
@@ -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)
addons/sale/res_config_view.xml
+30 -32
View File
@@ -9,38 +9,36 @@
<field name="inherit_id" ref="base.view_sale_config_settings"/>
<field name="arch" type="xml">
<group name="config_sale" position="after">
<separator string="Invoicing Policy" colspan="4"/>
<field name="module_project_timesheet" invisible="1"/>
<field name="module_project_mrp" invisible="1"/>
<field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
<field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
<newline/>
<field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
<field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
<newline/>
<field name="task_work" on_change="onchange_task_work(task_work)"/>
<newline/>
<field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
<field name="time_unit" domain="[('category_id.name','=','Working Time')]"
attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
<separator string="Sale Order" colspan="4"/>
<field name="group_sale_pricelist"/>
<field name="group_uom"/>
<field name="group_sale_delivery_address"/>
<field name="group_discount_per_so_line"/>
<field name="module_sale_margin"/>
<field name="module_sale_layout"/>
<field name="module_warning"/>
<field name="module_sale_journal"/>
<field name="group_multiple_shops"/>
<field name="decimal_precision"/>
<field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
<separator string="Contracts" colspan="4"/>
<field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
<field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
<field name="module_analytic_journal_billing_rate" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
<separator string="Sale Order" colspan="4"/>
<field name="group_uom"/>
<field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
<field name="group_sale_delivery_address"/>
<field name="group_discount_per_so_line"/>
<field name="group_sale_pricelist"/>
<field name="module_sale_margin"/>
<field name="group_multiple_shops"/>
<field name="module_sale_layout"/>
<field name="decimal_precision"/>
<field name="module_sale_journal"/>
<field name="module_warning"/>
<separator string="Invoicing Policy" colspan="4"/>
<field name="module_project_timesheet" invisible="1"/>
<field name="module_project_mrp" invisible="1"/>
<field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
<field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
<field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
<field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
<field name="task_work" on_change="onchange_task_work(task_work)"/>
<newline/>
<field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
<field name="time_unit" domain="[('category_id.name','=','Working Time')]"
attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
<separator string="Contracts" colspan="4"/>
<field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
<field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
<field name="module_analytic_journal_billing_rate" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
</group>
</field>
</record>