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

[MERGE] merged with maint runk

Browse Source 
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
This commit is contained in:
Quentin (OpenERP)
2012-06-29 14:36:18 +02:00
parent a642b36339 37601079a9
commit 6fe94bd4bc
283 changed files with 4524 additions and 3088 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_setup/res_config_view.xml
+6 -4
View File
@@ -8,8 +8,9 @@
<field name="arch" type="xml">
<form string="General Settings" version="7.0">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
<button string="Cancel" type="object" name="cancel"/>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<sheet>
<group string="Company Settings">
@@ -55,8 +56,9 @@
<field name="arch" type="xml">
<form string="Configure Sales" version="7.0">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
<button string="Cancel" type="object" name="cancel"/>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<sheet>
<field name="module_crm" invisible="1"/>