Devishree Brahmbhatt (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-fp-notes-apa-remove-nolabel-view-dbr
into lp:~openerp-dev/openobject-server/trunk-fp-notes-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-fp-notes-apa-remove-nolabel-view-dbr/+merge/109823
Hello sir,
Remove nolabel="1" from view files.
so,kindly review it.
Thanks,
DBR
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-fp-notes-apa-remove-nolabel-view-dbr/+merge/109823
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-fp-notes-apa.
=== modified file 'openerp/addons/base/ir/ir.xml'
--- openerp/addons/base/ir/ir.xml 2012-06-09 12:40:45 +0000
+++ openerp/addons/base/ir/ir.xml 2012-06-12 12:14:39 +0000
@@ -41,7 +41,7 @@
<field name="key2" string="Condition"/>
</group>
<group string="Default Value">
- <field name="value_unpickle" nolabel="1"/>
+ <field name="value_unpickle" />
</group>
<group string="Default Value Scope">
<field name="user_id"/>
@@ -464,10 +464,10 @@
</group>
</group>
<group string="Help">
- <field colspan="2" name="help" nolabel="1"/>
+ <field colspan="2" name="help" />
</group>
<group string="Views">
- <field colspan="2" name="view_ids" nolabel="1">
+ <field colspan="2" name="view_ids" >
<form string="Views" version="7.0">
<group>
<field colspan="4" name="sequence"/>
@@ -710,7 +710,7 @@
<group col="4">
<field name="user_id"/>
<field name="ref_id"/>
- <field name="arch" colspan="4" nolabel="1"/>
+ <field name="arch" colspan="4" />
</group>
</form>
</field>
@@ -1178,10 +1178,10 @@
<field name="res_id"/>
</group>
<group string="Source Term">
- <field name="src" nolabel="1" height="400"/>
+ <field name="src" height="400"/>
</group>
<group string="Translation">
- <field name="value" nolabel="1" height="400"/>
+ <field name="value" height="400"/>
</group>
</group>
</form>
@@ -1509,10 +1509,10 @@
</group>
</group>
<separator string="Rule Definition (Domain Filter)"/>
- <field name="domain_force" colspan="2" nolabel="1"/>
+ <field name="domain_force" colspan="2" />
<group string="Groups (no group = global)">
<field name="global"/>
- <field name="groups" nolabel="1" colspan="4"/>
+ <field name="groups" colspan="4"/>
</group>
<group string="Interaction between rules">
<label colspan="2"
@@ -1638,7 +1638,7 @@
<group col="4" string="Fields Mapping">
<field name="srcmodel_id" attrs="{'required':[('state','!=','dummy'), ('state','!=','sms'), ('state','!=','code'), ('state','!=','loop'), ('state','!=','trigger'), ('state','!=','object_copy'), ('state','!=','client_action'), ('state','!=','email'), ('state','!=','sms'), ('state','!=','other')]}"/>
<field name="copy_object" on_change="change_object(copy_object, state)" attrs="{'required':[('state','!=','dummy'), ('state','!=','sms'), ('state','!=','code'), ('state','!=','loop'), ('state','!=','trigger'), ('state','!=','object_write'), ('state','!=','object_create'), ('state','!=','client_action'), ('state','!=','email'), ('state','!=','sms'), ('state','!=','other')]}"/>
- <field name="fields_lines" nolabel="1" colspan="2">
+ <field name="fields_lines" colspan="2">
<tree string="Field Mappings" editable="top">
<field name="col1" domain="[('model_id','=',parent.srcmodel_id or parent.model_id)]"/>
<field name="type"/>
@@ -1752,7 +1752,7 @@
<field name="category_id"/>
</group>
<group string="Groups">
- <field name="groups_id" nolabel="1" colspan="4"/>
+ <field name="groups_id" colspan="4"/>
</group>
<group col="4">
<field name="state" readonly="1"/>
@@ -1822,7 +1822,7 @@
<group col="4">
<field name="name"/>
<field name="sequence"/>
- <field name="wizards_ids" nolabel="1" colspan="4"/>
+ <field name="wizards_ids" colspan="4"/>
</group>
</form>
</field>
=== modified file 'openerp/addons/base/module/wizard/base_export_language_view.xml'
--- openerp/addons/base/module/wizard/base_export_language_view.xml 2012-01-16 14:01:58 +0000
+++ openerp/addons/base/module/wizard/base_export_language_view.xml 2012-06-12 12:14:39 +0000
@@ -10,7 +10,7 @@
<form string="Export Translations">
<group col="8">
<group colspan="3">
- <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+ <field name="config_logo" widget="image" width="220" height="130" colspan="1"/>
<newline/>
<label colspan="4" width="220" string="OpenERP translations (core, modules, clients) are managed through Launchpad.net, our open source project management facility. We use their online interface to synchronize all translations efforts."/>
<label colspan="4" width="220" string="To improve or expand the official translations, you should use directly Lauchpad's web interface (Rosetta). If you need to perform mass translation, Launchpad also allows uploading full .po files at once"/>
@@ -25,14 +25,14 @@
<separator colspan="4" string="Export Translation"/>
<field name="lang"/>
<field name="format" required="1"/>
- <field height="200" name="modules" nolabel="1" colspan="4"/>
+ <field height="200" name="modules" colspan="4"/>
<field invisible="1" name="state"/>
</group>
<group colspan="4" states="get">
<separator string="Export done" colspan="4"/>
<field name="name" invisible="1" colspan="4"/>
- <field name="data" nolabel="1" readonly="1" filename="name" colspan="4"/>
- <field height="80" name="advice" nolabel="1" colspan="4"/>
+ <field name="data" readonly="1" filename="name" colspan="4"/>
+ <field height="80" name="advice" colspan="4"/>
</group>
</group>
<group colspan="8" col="8" states="choose">
=== modified file 'openerp/addons/base/module/wizard/base_import_language_view.xml'
--- openerp/addons/base/module/wizard/base_import_language_view.xml 2012-06-09 12:40:45 +0000
+++ openerp/addons/base/module/wizard/base_import_language_view.xml 2012-06-12 12:14:39 +0000
@@ -13,7 +13,7 @@
<button special="cancel" string="_Close" icon="gtk-cancel"/>
</header>
<separator string="Import Translation" colspan="2"/>
- <label nolabel="1" string="If you need another language than the official ones available, you can import a language pack from here. Other OpenERP languages than the official ones can be found on launchpad." colspan="2"/>
+ <label string="If you need another language than the official ones available, you can import a language pack from here. Other OpenERP languages than the official ones can be found on launchpad." colspan="2"/>
<group col="4">
<field name="name"/>
<field name="code"/>
=== modified file 'openerp/addons/base/module/wizard/base_language_install_view.xml'
--- openerp/addons/base/module/wizard/base_language_install_view.xml 2012-04-25 08:12:50 +0000
+++ openerp/addons/base/module/wizard/base_language_install_view.xml 2012-06-12 12:14:39 +0000
@@ -10,7 +10,7 @@
<form string="Load Official Translation">
<group colspan="4" col="8">
<group colspan="1">
- <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+ <field name="config_logo" widget="image" width="220" height="130" colspan="1"/>
<newline/>
<label colspan="4" width="220" string="This wizard helps you add a new language to your OpenERP system. After loading a new language it becomes available as default interface language for users and partners."/>
<label colspan="4" width="220"/>
=== modified file 'openerp/addons/base/module/wizard/base_module_import_view.xml'
--- openerp/addons/base/module/wizard/base_module_import_view.xml 2012-04-25 08:12:50 +0000
+++ openerp/addons/base/module/wizard/base_module_import_view.xml 2012-06-12 12:14:39 +0000
@@ -10,7 +10,7 @@
<form string="Import module">
<group col="8">
<group colspan="3" col="1">
- <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+ <field name="config_logo" widget="image" width="220" height="130" colspan="1"/>
<newline/>
<label width="220" string='This wizard helps you to import a new module to your OpenERP system.
After importing a new module you can install it by clicking on the button "Install" from the form view.'/>
=== modified file 'openerp/addons/base/module/wizard/base_module_update_view.xml'
--- openerp/addons/base/module/wizard/base_module_update_view.xml 2012-04-30 06:04:34 +0000
+++ openerp/addons/base/module/wizard/base_module_update_view.xml 2012-06-12 12:14:39 +0000
@@ -10,7 +10,7 @@
<form string="Update Module List">
<group col="8">
<group colspan="3">
- <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+ <field name="config_logo" widget="image" width="220" height="130" colspan="1"/>
<newline/>
<label colspan="4" width="220" string="This wizard will scan all module repositories on the server side to detect newly added modules as well as any change to existing modules."/>
<label colspan="4" width="220"/>
=== modified file 'openerp/addons/base/module/wizard/base_update_translations_view.xml'
--- openerp/addons/base/module/wizard/base_update_translations_view.xml 2011-07-26 12:37:14 +0000
+++ openerp/addons/base/module/wizard/base_update_translations_view.xml 2012-06-12 12:14:39 +0000
@@ -9,7 +9,7 @@
<form string="Synchronize Terms">
<group col="8">
<group colspan="3">
- <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+ <field name="config_logo" widget="image" width="220" height="130" colspan="1"/>
<newline/>
<label colspan="4" width="220" string="This wizard will detect new terms to translate in the application, so that you can then add translations manually or perform a complete export (as a template for a new language example)."/>
</group>
=== modified file 'openerp/addons/base/publisher_warranty/publisher_warranty_view.xml'
--- openerp/addons/base/publisher_warranty/publisher_warranty_view.xml 2012-04-18 23:26:50 +0000
+++ openerp/addons/base/publisher_warranty/publisher_warranty_view.xml 2012-06-12 12:14:39 +0000
@@ -93,7 +93,7 @@
<form string="Register a Contract">
<group colspan="4" col="8">
<group colspan="1">
- <field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
+ <field name="config_logo" widget="image" width="220" height="130" colspan="1"/>
<newline/>
<label colspan="4" width="220" string="This wizard helps you register a publisher warranty contract in your OpenERP system. After the contract has been registered, you will be able to send issues directly to OpenERP."/>
<label colspan="4" width="220"/>
=== modified file 'openerp/addons/base/res/res_company_view.xml'
--- openerp/addons/base/res/res_company_view.xml 2012-06-09 23:35:49 +0000
+++ openerp/addons/base/res/res_company_view.xml 2012-06-12 12:14:39 +0000
@@ -21,7 +21,7 @@
<form string="Company" version="7.0">
<sheet>
<div class="oe_right oe_form_avatar">
- <field name="logo" nolabel="1" widget="image"/>
+ <field name="logo" widget="image"/>
</div>
<div class="oe_right oe_form_button_box">
<button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print"/>
=== modified file 'openerp/addons/base/res/res_users_view.xml'
--- openerp/addons/base/res/res_users_view.xml 2012-06-09 12:40:45 +0000
+++ openerp/addons/base/res/res_users_view.xml 2012-06-12 12:14:39 +0000
@@ -80,7 +80,7 @@
<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' on_change="onchange_avatar(avatar)" class="oe_form_avatar"/>
</div>
<div class="oe_form_title">
<label for="name" class="oe_form_readonly_hidden"/>
_______________________________________________
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
