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

[MERGE] from trunk

Browse Source 
bzr revid: rco@openerp.com-20120725151127-9n7oyn1egedm7nqn
This commit is contained in:
Raphael Collet
2012-07-25 17:11:27 +02:00
parent 594b4ed4af 695d0fd7ab
commit 34c67e6b83
5 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/module/module_data.xml
+5
View File
@@ -132,6 +132,11 @@
<record model="res.groups" id="group_multi_company">
<field name="category_id" ref="module_category_usability"/>
</record>
<record model="res.groups" id="group_multi_currency">
<field name="category_id" ref="module_category_usability"/>
</record>
<record model="res.groups" id="group_no_one">
<field name="category_id" ref="module_category_usability"/>
</record>
openerp/addons/base/res/res_country_view.xml
+1 -1
View File
@@ -41,7 +41,7 @@
<field name="help">Display and manage the list of all countries that can be assigned to your partner records. You can create or delete countries to make sure the ones you are working on will be maintained.</field>
</record>
<menuitem id="menu_localisation" name="Localisation" parent="menu_config_address_book" sequence="1"/>
<menuitem id="menu_localisation" name="Localisation" parent="menu_config_address_book" sequence="1" groups="base.group_no_one"/>
<menuitem action="action_country" id="menu_country_partner" parent="menu_localisation" sequence="0" groups="base.group_no_one"/>
openerp/addons/base/res/res_currency_view.xml
+1 -1
View File
@@ -78,7 +78,7 @@
<field name="search_view_id" ref="view_currency_search"/>
</record>
<menuitem action="action_currency_form" id="menu_action_currency_form" parent="menu_localisation" sequence="3"/>
<menuitem action="action_currency_form" id="menu_action_currency_form" parent="menu_localisation" sequence="3" groups="base.group_multi_currency"/>
<!--
Currency Rate Type
openerp/addons/base/res/res_partner_view.xml
+2 -3
View File
@@ -148,7 +148,7 @@
<field name="fax"/>
<field name="email" widget="email"/>
<field name="title" domain="[('domain', '=', 'contact')]"
class="oe_no_button" attrs="{'invisible': [('is_company','=', True)]}"/>
options='{"no_open": true}' attrs="{'invisible': [('is_company','=', True)]}" />
</group>
</group>
@@ -215,7 +215,7 @@
</group>
<group>
<field name="customer"/>
<field name="supplier"/>
<field name="supplier" invisible="1"/>
</group>
<group>
<field name="ref"/>
@@ -310,7 +310,6 @@
<li t-if="record.city.raw_value and !record.country.raw_value"><field name="city"/></li>
<li t-if="!record.city.raw_value and record.country.raw_value"><field name="country"/></li>
<li t-if="record.city.raw_value and record.country.raw_value"><field name="city"/>, <field name="country"/></li>
<li t-if="record.mobile.raw_value"><field name="mobile"/></li>
<li t-if="record.phone.raw_value">Tel: <field name="phone"/></li>
<li t-if="record.mobile.raw_value">Mobile: <field name="mobile"/></li>
<li t-if="record.email.raw_value"><a t-attf-href="mailto:#{record.email.raw_value}"><field name="email"/></a></li>
openerp/addons/base/security/base_security.xml
+4
View File
@@ -23,6 +23,10 @@
<record model="res.groups" id="group_multi_company">
<field name="name">Multi Companies</field>
</record>
<record model="res.groups" id="group_multi_currency">
<field name="name">Multi Currencies</field>
</record>
<record model="res.groups" id="group_no_one">
<field name="name">Technical Features</field>