Rajesh Prajapati (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons19_settings-rpr into
lp:openobject-addons.
Requested reviews:
Divyesh Makwana(OpenERP) (mdi-openerp)
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons19_settings-rpr/+merge/132651
Hello
Made changes as per requirement of addons19 in settings.
Thanks,
Rajesh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons19_settings-rpr/+merge/132651
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons19_settings-rpr.
=== modified file 'base_action_rule/base_action_rule_view.xml'
--- base_action_rule/base_action_rule_view.xml 2012-10-09 12:27:39 +0000
+++ base_action_rule/base_action_rule_view.xml 2012-11-02 06:58:23 +0000
@@ -16,10 +16,10 @@
<group col="4">
<field name="name"/>
<field name="model_id"/>
- <field name="model" invisible="1"/>
<field name="filter_id" domain="[('model_id','=',model)]" context="{'default_model_id': model}"/>
<field name="sequence"/>
<field name="active"/>
+ <field name="model" invisible="1"/>
</group>
<notebook>
<page string="Conditions">
=== modified file 'base_setup/res_config.py'
--- base_setup/res_config.py 2012-09-12 07:14:13 +0000
+++ base_setup/res_config.py 2012-11-02 06:58:23 +0000
@@ -60,14 +60,14 @@
'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)."""),
'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
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,
Partner from the selected emails.
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
to your email and its attachments from MS Outlook. You can select a partner,
or a lead object and archive a selected
=== modified file 'plugin_outlook/plugin_outlook.xml'
--- plugin_outlook/plugin_outlook.xml 2012-09-06 10:17:23 +0000
+++ plugin_outlook/plugin_outlook.xml 2012-11-02 06:58:23 +0000
@@ -10,7 +10,11 @@
<form position="attributes">
<attribute name="string">Install Outlook Plug-In</attribute>
</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">
<group>
<field name="plugin32" widget="url"/>
@@ -19,10 +23,10 @@
<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>System requirements:</p>
- <ul>
- <li>1. MS Outlook 2005 or above.</li>
- <li>2. MS .Net Framework 3.5 or above.</li>
- </ul>
+ <ol>
+ <li> MS Outlook 2005 or above.</li>
+ <li> MS .Net Framework 3.5 or above.</li>
+ </ol>
</xpath>
<separator string="title" position="attributes">
<attribute name="string"></attribute>
@@ -51,7 +55,7 @@
<div>
<field name="module_plugin_outlook" class="oe_inline"/>
<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"/>
</div>
</div>
=== modified file 'plugin_thunderbird/plugin_thunderbird.py'
--- plugin_thunderbird/plugin_thunderbird.py 2012-06-25 10:32:35 +0000
+++ plugin_thunderbird/plugin_thunderbird.py 2012-11-02 06:58:23 +0000
@@ -36,7 +36,7 @@
_defaults = {
'thunderbird': True,
'plugin_name': 'openerp_plugin.xpi',
- 'pdf_file': 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
+ 'pdf_file': 'http://doc.openerp.com/v5.0/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
}
def default_get(self, cr, uid, fields, context=None):
=== modified file 'plugin_thunderbird/plugin_thunderbird.xml'
--- plugin_thunderbird/plugin_thunderbird.xml 2012-09-06 10:17:23 +0000
+++ plugin_thunderbird/plugin_thunderbird.xml 2012-11-02 06:58:23 +0000
@@ -10,7 +10,11 @@
<form position="attributes">
<attribute name="string">Install Thunderbird Plug-In</attribute>
</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">
<group>
<field name="thunderbird" invisible="1"/>
@@ -19,16 +23,16 @@
<field name="pdf_file" widget="url"/>
</group>
<separator string="Installation and Configuration Steps"/>
- <p>Thunderbird plugin installation:</p>
- <ul>
- <li>1. 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>3. Select the plug-in (the file named openerp_plugin.xpi).</li>
- <li>4. Click "Install Now".</li>
- <li>5. Restart Thunderbird.</li>
- <li>6. From the Thunderbird menubar: OpenERP -> Configuration.</li>
- <li>7. Configure your openerp server.</li>
- </ul>
+ <p>Thunderbird plug-in installation:</p>
+ <ol>
+ <li> Save the Thunderbird plug-in.</li>
+ <li> From the Thunderbird menubar: Tools > Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li>
+ <li> Select the plug-in (the file named openerp_plugin.xpi).</li>
+ <li> Click "Install Now".</li>
+ <li> Restart Thunderbird.</li>
+ <li> From the Thunderbird menubar: OpenERP -> Configuration.</li>
+ <li> Configure your openerp server.</li>
+ </ol>
</xpath>
<separator string="title" position="attributes">
<attribute name="string"></attribute>
@@ -57,7 +61,7 @@
<div>
<field name="module_plugin_thunderbird" class="oe_inline"/>
<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"/>
</div>
</div>
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml 2012-10-29 09:08:47 +0000
+++ purchase/purchase_view.xml 2012-11-02 06:58:23 +0000
@@ -267,7 +267,7 @@
<page string="Incoming Shipments & Invoices">
<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="purchase.group_delivery_invoice_address"/>
<field name="minimum_planned_date"/>
<field name="location_id" groups="stock.group_locations"/>
<field name="shipped" groups="base.group_no_one"/>
=== modified file 'purchase/res_config.py'
--- purchase/res_config.py 2012-09-17 10:01:52 +0000
+++ purchase/res_config.py 2012-11-02 06:58:23 +0000
@@ -43,7 +43,7 @@
'group_costing_method':fields.boolean("Compute product cost price based on average cost",
implied_group='product.group_costing_method',
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',
help="Allows you to specify different delivery and invoice addresses on a purchase order."),
'module_warning': fields.boolean("Alerts by products or supplier",
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
