odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] thunderbird plugin + purchase fix 

bzr revid: fp@tinyerp.com-20121108093319-imp9wmzhoxmfcv34
This commit is contained in:
Fabien Pinckaers 2012-11-08 10:33:19 +01:00
parent d7f5edf313 6bdbd8e4d3
commit 10ee314620
7 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/base_action_rule/base_action_rule_view.xml
View File

@ -16,10 +16,10 @@
<group col="4"> <group col="4">
<field name="name"/> <field name="name"/>
<field name="model_id"/> <field name="model_id"/>
<field name="model" invisible="1"/>
<field name="filter_id" domain="[('model_id','=',model)]" context="{'default_model_id': model}"/> <field name="filter_id" domain="[('model_id','=',model)]" context="{'default_model_id': model}"/>
<field name="sequence"/> <field name="sequence"/>
<field name="active"/> <field name="active"/>
<field name="model" invisible="1"/>
</group> </group>
<notebook> <notebook>
<page string="Conditions"> <page string="Conditions">

4
addons/base_setup/res_config.py
View File

@ -60,14 +60,14 @@ class sale_config_settings(osv.osv_memory):
'module_web_linkedin': fields.boolean('Get contacts automatically from linkedIn', 'module_web_linkedin': fields.boolean('Get contacts automatically from linkedIn',
help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""), help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""),
'module_crm': fields.boolean('CRM'), 'module_crm': fields.boolean('CRM'),
'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plugin', 'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plug-in',
help="""The plugin allows you archive email and its attachments to the selected help="""The plugin allows you archive email and its attachments to the selected
OpenERP objects. You can select a partner, or a lead and OpenERP objects. You can select a partner, or a lead and
attach the selected mail as a .eml file in attach the selected mail as a .eml file in
the attachment of a selected record. You can create documents for CRM Lead, the attachment of a selected record. You can create documents for CRM Lead,
Partner from the selected emails. Partner from the selected emails.
This installs the module plugin_thunderbird."""), This installs the module plugin_thunderbird."""),
'module_plugin_outlook': fields.boolean('Enable Outlook plugin', 'module_plugin_outlook': fields.boolean('Enable Outlook plug-in',
help="""The Outlook plugin allows you to select an object that you would like to add 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, to your email and its attachments from MS Outlook. You can select a partner,
or a lead object and archive a selected or a lead object and archive a selected

16
addons/plugin_outlook/plugin_outlook.xml
View File

@ -10,7 +10,11 @@
<form position="attributes"> <form position="attributes">
<attribute name="string">Install Outlook Plug-In</attribute> <attribute name="string">Install Outlook Plug-In</attribute>
</form> </form>
<xpath expr="//footer" position="replace"/> <xpath expr="//footer" position="replace">
<footer>
<button string="Close" special="Cancel" class="oe_highlight"/>
</footer>
</xpath>
<xpath expr="//separator[@string='title']" position="after" version="7.0"> <xpath expr="//separator[@string='title']" position="after" version="7.0">
<group> <group>
<field name="plugin32" widget="url"/> <field name="plugin32" widget="url"/>
@ -19,10 +23,10 @@
<separator string="Installation and Configuration Steps"/> <separator string="Installation and Configuration Steps"/>
<p>Click on the link above to download the installer for either 32 or 64 bits, and execute it.</p> <p>Click on the link above to download the installer for either 32 or 64 bits, and execute it.</p>
<p>System requirements:</p> <p>System requirements:</p>
<ul> <ol>
<li>1. MS Outlook 2005 or above.</li> <li> MS Outlook 2005 or above.</li>
<li>2. MS .Net Framework 3.5 or above.</li> <li> MS .Net Framework 3.5 or above.</li>
</ul> </ol>
</xpath> </xpath>
<separator string="title" position="attributes"> <separator string="title" position="attributes">
<attribute name="string"></attribute> <attribute name="string"></attribute>
@ -51,7 +55,7 @@
<div> <div>
<field name="module_plugin_outlook" class="oe_inline"/> <field name="module_plugin_outlook" class="oe_inline"/>
<label for="module_plugin_outlook"/> <label for="module_plugin_outlook"/>
<button name="%(action_outlook_installer)d" type="action" string="Download and install the plugin" icon="gtk-execute" <button name="%(action_outlook_installer)d" type="action" string="Download and install the plug-in" icon="gtk-execute"
attrs="{'invisible': [('module_plugin_outlook','=',False)]}" class="oe_link"/> attrs="{'invisible': [('module_plugin_outlook','=',False)]}" class="oe_link"/>
</div> </div>
</div> </div>

4
addons/plugin_thunderbird/plugin_thunderbird.py
View File

@ -30,13 +30,11 @@ class plugin_thunderbird_installer(osv.osv_memory):
'thunderbird': fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you would like to add to your email and its attachments."), 'thunderbird': fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you would like to add to your email and its attachments."),
'plugin_name': fields.char('File name', size=64), 'plugin_name': fields.char('File name', size=64),
'plugin_file': fields.char('Thunderbird Plug-in', size=256, readonly=True, help="Thunderbird plug-in file. Save this file and install it in Thunderbird."), 'plugin_file': fields.char('Thunderbird Plug-in', size=256, readonly=True, help="Thunderbird plug-in file. Save this file and install it in Thunderbird."),
'pdf_file': fields.char('Installation Manual', size=256, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
} }
_defaults = { _defaults = {
'thunderbird': True, 'thunderbird': True,
'plugin_name': 'openerp_plugin.xpi', 'plugin_name': 'openerp_plugin.xpi',
'pdf_file': 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
} }
def default_get(self, cr, uid, fields, context=None): def default_get(self, cr, uid, fields, context=None):
@ -45,4 +43,4 @@ class plugin_thunderbird_installer(osv.osv_memory):
res['plugin_file'] = base_url + '/plugin_thunderbird/static/openerp_plugin.xpi' res['plugin_file'] = base_url + '/plugin_thunderbird/static/openerp_plugin.xpi'
return res return res
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

29
addons/plugin_thunderbird/plugin_thunderbird.xml
View File

@ -10,25 +10,28 @@
<form position="attributes"> <form position="attributes">
<attribute name="string">Install Thunderbird Plug-In</attribute> <attribute name="string">Install Thunderbird Plug-In</attribute>
</form> </form>
<xpath expr="//footer" position="replace"/> <xpath expr="//footer" position="replace">
<footer>
<button string="Close" special="Cancel" class="oe_highlight"/>
</footer>
</xpath>
<xpath expr="//separator[@string='title']" position="after"> <xpath expr="//separator[@string='title']" position="after">
<group> <group>
<field name="thunderbird" invisible="1"/> <field name="thunderbird" invisible="1"/>
<field name="plugin_name" invisible="1"/> <field name="plugin_name" invisible="1"/>
<field name="plugin_file" filename="plugin_name" widget="url"/> <field name="plugin_file" filename="plugin_name" widget="url"/>
<field name="pdf_file" widget="url"/>
</group> </group>
<separator string="Installation and Configuration Steps"/> <separator string="Installation and Configuration Steps"/>
<p>Thunderbird plugin installation:</p> <p>Thunderbird plug-in installation:</p>
<ul> <ol>
<li>1. Save the Thunderbird plug-in.</li> <li> Save the Thunderbird plug-in.</li>
<li>2. From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li> <li> From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li>
<li>3. Select the plug-in (the file named openerp_plugin.xpi).</li> <li> Select the plug-in (the file named openerp_plugin.xpi).</li>
<li>4. Click "Install Now".</li> <li> Click "Install Now".</li>
<li>5. Restart Thunderbird.</li> <li> Restart Thunderbird.</li>
<li>6. From the Thunderbird menubar: OpenERP -> Configuration.</li> <li> From the Thunderbird menubar: OpenERP -> Configuration.</li>
<li>7. Configure your openerp server.</li> <li> Configure your openerp server.</li>
</ul> </ol>
</xpath> </xpath>
<separator string="title" position="attributes"> <separator string="title" position="attributes">
<attribute name="string"></attribute> <attribute name="string"></attribute>
@ -57,7 +60,7 @@
<div> <div>
<field name="module_plugin_thunderbird" class="oe_inline"/> <field name="module_plugin_thunderbird" class="oe_inline"/>
<label for="module_plugin_thunderbird"/> <label for="module_plugin_thunderbird"/>
<button name="%(action_thunderbird_installer)d" type="action" string="Download and install the plugin" icon="gtk-execute" <button name="%(action_thunderbird_installer)d" type="action" string="Download and install the plug-in" icon="gtk-execute"
attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}" class="oe_link"/> attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}" class="oe_link"/>
</div> </div>
</div> </div>

2
addons/purchase/purchase_view.xml
View File

@ -268,7 +268,7 @@
<page string="Incoming Shipments &amp; Invoices"> <page string="Incoming Shipments &amp; Invoices">
<group> <group>
<group> <group>
<field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/> <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)" groups="stock.group_locations"/>
<field name="minimum_planned_date"/> <field name="minimum_planned_date"/>
<field name="location_id" groups="stock.group_locations"/> <field name="location_id" groups="stock.group_locations"/>
<field name="shipped" groups="base.group_no_one"/> <field name="shipped" groups="base.group_no_one"/>

2
addons/purchase/res_config.py
View File

@ -43,7 +43,7 @@ class purchase_config_settings(osv.osv_memory):
'group_costing_method':fields.boolean("Compute product cost price based on average cost", 'group_costing_method':fields.boolean("Compute product cost price based on average cost",
implied_group='product.group_costing_method', implied_group='product.group_costing_method',
help="""Allows you to compute product cost price based on average cost."""), help="""Allows you to compute product cost price based on average cost."""),
'group_purchase_delivery_address': fields.boolean("Allow a different address for incoming products and invoicings", 'group_purchase_delivery_address': fields.boolean("Allow a different address for incoming products and invoicing",
implied_group='purchase.group_delivery_invoice_address', implied_group='purchase.group_delivery_invoice_address',
help="Allows you to specify different delivery and invoice addresses on a purchase order."), help="Allows you to specify different delivery and invoice addresses on a purchase order."),
'module_warning': fields.boolean("Alerts by products or supplier", 'module_warning': fields.boolean("Alerts by products or supplier",