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

[MERGE] from trunk 

bzr revid: rco@openerp.com-20120620120016-y6tav3i75p9fe1sj
This commit is contained in:
Raphael Collet 2012-06-20 14:00:16 +02:00
parent 03450a0fc8 a0a330d9ba
commit 2064e881ee
6 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/addons/base/ir/ir.xml
View File

@ -35,7 +35,7 @@
<field name="arch" type="xml">
<form string="User-defined Defaults" version="7.0">
<sheet>
<label for="name" class="oe_form_readonly_hidden"/>
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<group>
<group string="Model">

14
openerp/addons/base/module/module_view.xml
View File

@ -117,8 +117,8 @@
<field name="arch" type="xml">
<form string="Module" version="7.0">
<header>
<button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_form_button_hi"/>
<button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_form_button_hi"/>
<button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_highlight"/>
<button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_highlight"/>
<button name="button_uninstall" states="installed" string="Uninstall (beta)" icon="terp-dialog-close" type="object"
confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
<button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
@ -127,14 +127,14 @@
<field name="state" widget="statusbar" statusbar_visible="uninstalled"/>
</header>
<sheet>
<div class="oe_right oe_form_button_box">
<div class="oe_right oe_button_box">
<field name="icon_image" widget="image"/>
</div>
<div class="oe_form_title">
<label for="shortdesc" class="oe_form_readonly_hidden"/>
<div class="oe_title">
<label for="shortdesc" class="oe_edit_only"/>
<h1><field name="shortdesc"/></h1>
<label for="category_id" class="oe_form_readonly_hidden"/>
<h2><field name="category_id" class="oe_form_inline"/></h2>
<label for="category_id" class="oe_edit_only"/>
<h2><field name="category_id" class="oe_inline"/></h2>
</div>
<group>
<group>

4
openerp/addons/base/res/res_bank_view.xml
View File

@ -20,8 +20,8 @@
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_form_inline" placeholder="ZIP"/>
<field name="city" class="oe_form_inline" placeholder="City"/>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state" placeholder="State"/>
<field name="country" placeholder="Country"/>

12
openerp/addons/base/res/res_company_view.xml
View File

@ -21,14 +21,14 @@
<field name="arch" type="xml">
<form string="Company" version="7.0">
<sheet>
<div class="oe_right oe_form_avatar">
<div class="oe_right oe_avatar">
<field name="logo" nolabel="1" widget="image"/>
</div>
<div class="oe_right oe_form_button_box">
<div class="oe_right oe_button_box">
<button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print"/>
</div>
<div class="oe_form_title">
<label for="name" class="oe_form_readonly_hidden"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<group col="4">
<field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
@ -44,8 +44,8 @@
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_form_inline" placeholder="ZIP"/>
<field name="city" class="oe_form_inline" placeholder="City"/>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>

28
openerp/addons/base/res/res_partner_view.xml
View File

@ -101,33 +101,33 @@
<field name="arch" type="xml">
<form string="Partners" version="7.0">
<sheet>
<field name="photo" widget='image' class="oe_form_avatar oe_right" height="70"/>
<div class="oe_right oe_form_button_box" name="buttons">
<field name="photo" widget='image' class="oe_avatar oe_right" height="70"/>
<div class="oe_right oe_button_box" name="buttons">
</div>
<div class="oe_form_title">
<div class="oe_form_readonly_hidden">
<div class="oe_title">
<div class="oe_edit_only">
<label for="name" string="Customer Name"/>
(<field name="is_company" on_change="onchange_type(is_company)" class="oe_form_inline"/> <label for="is_company" string="Is a Company?"/>)
(<field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
</div>
<h1>
<field name="name"/>
</h1>
<div attrs="{'invisible': [('is_company','=', True)]}">
<label for="parent_id" class="oe_form_readonly_hidden"/>
<label for="parent_id" class="oe_edit_only"/>
</div>
<h2 attrs="{'invisible': [('is_company','=', True)]}">
<field name="parent_id"
domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
class="oe_form_inline"
class="oe_inline"
on_change="onchange_address(use_parent_address, parent_id)"/>,
</h2>
<div attrs="{'invisible' : [('is_company', '=', True)]}">
<label for="function" class="oe_form_readonly_hidden" />
<label for="function" class="oe_edit_only" />
</div>
<h2 attrs="{'invisible' : [('is_company', '=', True)]}">
<field name="function" class="oe_form_inline" placeholder="Job Position"/>
<field name="function" class="oe_inline" placeholder="Job Position"/>
</h2>
<field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
</div>
@ -136,11 +136,11 @@
<group>
<label for="type" attrs="{'invisible': [('parent_id','=', False)]}"/>
<div attrs="{'invisible': [('parent_id','=', False)]}">
<field class="oe_form_inline"
<field class="oe_inline"
name="type"/>
<label for="use_parent_address"/>
<field name="use_parent_address"
class="oe_form_inline"
class="oe_inline"
on_change="onchange_address(use_parent_address, parent_id)"/>
</div>
@ -149,8 +149,8 @@
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_form_inline" placeholder="ZIP"/>
<field name="city" class="oe_form_inline" placeholder="City"/>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
@ -193,7 +193,7 @@
<a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
<div class="oe_module_vignette">
<a type="edit">
<img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar oe_kanban_avatar_toto"/>
<img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_avatar oe_kanban_avatar_toto"/>
</a>
<div class="oe_module_desc">
<div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">

18
openerp/addons/base/res/res_users_view.xml
View File

@ -82,12 +82,12 @@
<field name="id" invisible="1"/>
<sheet>
<div class="oe_right">
<field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)" class="oe_form_avatar"/>
<field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)" class="oe_avatar"/>
</div>
<div class="oe_form_title">
<label for="name" class="oe_form_readonly_hidden"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="company_id" class="oe_form_readonly_hidden"/>
<label for="company_id" class="oe_edit_only"/>
<h2><field name="company_id" context="{'user_preference': 0}"/></h2>
</div>
<group>
@ -196,15 +196,15 @@
<field name="arch" type="xml">
<form string="Users" version="7.0">
<sheet>
<div class="oe_right oe_form_avatar">
<div class="oe_right oe_avatar">
<field name="avatar" widget='image' on_change="onchange_avatar(avatar)"/>
</div>
<div class="oe_form_title">
<div class="oe_title">
<h1>
<field name="name" readonly="1" class="oe_form_readonly_hidden"/>
(<field name="login" readonly="1" class="oe_form_readonly_hidden"/>)
<field name="name" readonly="1" class="oe_edit_only"/>
(<field name="login" readonly="1" class="oe_edit_only"/>)
</h1>
<label for="company_id" class="oe_form_readonly_hidden"/>
<label for="company_id" class="oe_edit_only"/>
<h2>
<field name="company_id" widget="selection" readonly="0"
groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>