summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorVandan Shah <vas@odoo.com>2018-03-20 10:29:29 +0000
committerMohammed Shekha <msh@openerp.com>2019-04-19 13:42:45 +0000
commita57863f5a41b8896e9c8358bdb0a305a2e259dfc (patch)
tree80bdc69b474ab4db8e802f136b64951ac607aa20 /addons
parentd2ed8576081e9e774384618e4b17cd8a494ea765 (diff)
[IMP] *: use 'o_row' instead of 'oe_inline'
This will fix UI glitch for fields added in form view side by side to get fields on same line and also to get space between two fields use o_row oe_inline is used to put two elements on same line but it is used mostly where 1 element is field and second one is static string maybe in span, oe_inline on two field creates glitch in UI, to have two fields or divs on same line we should use o_row class, o_row class meant to do that task-31003
Diffstat (limited to 'addons')
-rw-r--r--addons/account/views/account_invoice_view.xml6
-rw-r--r--addons/calendar/views/calendar_views.xml6
-rw-r--r--addons/hr_expense/views/hr_expense_views.xml2
-rw-r--r--addons/hr_recruitment/views/hr_recruitment_views.xml16
-rw-r--r--addons/membership/views/product_views.xml6
-rw-r--r--addons/product/views/product_views.xml12
-rw-r--r--addons/purchase/views/purchase_views.xml13
-rw-r--r--addons/resource/views/resource_views.xml6
-rw-r--r--addons/sale/views/sale_views.xml6
-rw-r--r--addons/stock/wizard/product_replenish_views.xml7
-rw-r--r--addons/website_forum/views/forum.xml4
11 files changed, 41 insertions, 43 deletions
diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml
index 44c8caf9a85..1076f3892fd 100644
--- a/addons/account/views/account_invoice_view.xml
+++ b/addons/account/views/account_invoice_view.xml
@@ -89,9 +89,9 @@
widget="many2one_barcode"
/>
<label for="quantity"/>
- <div>
- <field name="quantity" class="oe_inline"/>
- <field name="uom_id" class="oe_inline" groups="uom.group_uom"/>
+ <div class="o_row">
+ <field name="quantity"/>
+ <field name="uom_id" groups="uom.group_uom"/>
</div>
<field name="price_unit"/>
<field name="discount" groups="base.group_no_one"/>
diff --git a/addons/calendar/views/calendar_views.xml b/addons/calendar/views/calendar_views.xml
index e106534bdac..76be748d098 100644
--- a/addons/calendar/views/calendar_views.xml
+++ b/addons/calendar/views/calendar_views.xml
@@ -45,9 +45,9 @@
</group>
<group>
<label for="duration"/>
- <div>
- <field name="duration" class="oe_inline"/>
- <field name="interval" class="oe_inline ml8"/>
+ <div class="o_row">
+ <field name="duration"/>
+ <field name="interval"/>
</div>
</group>
</group>
diff --git a/addons/hr_expense/views/hr_expense_views.xml b/addons/hr_expense/views/hr_expense_views.xml
index 68af3e16f22..b251cc961be 100644
--- a/addons/hr_expense/views/hr_expense_views.xml
+++ b/addons/hr_expense/views/hr_expense_views.xml
@@ -81,7 +81,7 @@
/>
<field name="unit_amount" required="1" widget="monetary" options="{'currency_field': 'currency_id'}"/>
<label for="quantity"/>
- <div>
+ <div class="o_row">
<field name="quantity" class="oe_inline"/>
<field name="product_uom_id" required="1" widget="selection" class="oe_inline" groups="uom.group_uom"/>
</div>
diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml
index b2f81225d04..7e772b2e8ec 100644
--- a/addons/hr_recruitment/views/hr_recruitment_views.xml
+++ b/addons/hr_recruitment/views/hr_recruitment_views.xml
@@ -150,16 +150,16 @@
</group>
<group string="Contract">
<label for="salary_expected"/>
- <div>
- <field name="salary_expected" class="oe_inline"/>
- <span class="oe_inline" attrs="{'invisible':[('salary_expected_extra','=',False)]}"> + </span>
- <field name="salary_expected_extra" class="oe_inline" placeholder="Extra advantages..."/>
+ <div class="o_row">
+ <field name="salary_expected"/>
+ <span attrs="{'invisible':[('salary_expected_extra','=',False)]}"> + </span>
+ <field name="salary_expected_extra" placeholder="Extra advantages..."/>
</div>
<label for="salary_proposed"/>
- <div>
- <field name="salary_proposed" class="oe_inline"/>
- <span class="oe_inline" attrs="{'invisible':[('salary_proposed_extra','=',False)]}"> + </span>
- <field name="salary_proposed_extra" class="oe_inline" placeholder="Extra advantages..."/>
+ <div class="o_row">
+ <field name="salary_proposed"/>
+ <span attrs="{'invisible':[('salary_proposed_extra','=',False)]}"> + </span>
+ <field name="salary_proposed_extra" placeholder="Extra advantages..."/>
</div>
<field name="availability"/>
<field name="emp_id" invisible="1"/>
diff --git a/addons/membership/views/product_views.xml b/addons/membership/views/product_views.xml
index 8eff46f2414..8c63f5747d5 100644
--- a/addons/membership/views/product_views.xml
+++ b/addons/membership/views/product_views.xml
@@ -90,9 +90,9 @@
</group>
<group name="membership_details">
<label for="membership_date_from" string="Membership Duration"/>
- <div>
- <field name="membership_date_from" required="1" class="oe_inline"/> -
- <field name="membership_date_to" required="1" class="oe_inline"/>
+ <div class="o_row">
+ <field name="membership_date_from" required="1"/> -
+ <field name="membership_date_to" required="1"/>
</div>
<field name="list_price" string="Membership Fee"/>
<field
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index cac587a3fa7..0811731697d 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -633,16 +633,16 @@
<group string="Price List">
<field name="product_tmpl_id" string="Product" invisible="context.get('visible_product_tmpl_id', True)"/>
<label for="min_qty"/>
- <div>
- <field name="min_qty" class="oe_inline"/>
- <field name="product_uom" class="oe_inline" groups="uom.group_uom"/>
+ <div class="o_row">
+ <field name="min_qty"/>
+ <field name="product_uom" groups="uom.group_uom"/>
</div>
<label for="price"/>
- <div>
- <field name="price" class="oe_inline"/><field name="currency_id" class="oe_inline" groups="base.group_multi_currency"/>
+ <div class="o_row">
+ <field name="price"/><field name="currency_id" groups="base.group_multi_currency"/>
</div>
<label for="date_start" string="Validity"/>
- <div><field name="date_start" class="oe_inline"/> to <field name="date_end" class="oe_inline"/></div>
+ <div class="o_row"><field name="date_start"/> to <field name="date_end"/></div>
</group>
<group string="Other Information" groups="base.group_multi_company">
<field name="company_id" options="{'no_create': True}"/>
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index 9809112d2f7..8c1e37a7c3f 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -214,10 +214,9 @@
widget="many2one_barcode"
/>
<label for="product_qty"/>
- <div>
- <field name="product_qty" class="oe_inline"/>
- <span class="oe_inline">&#160;</span>
- <field name="product_uom" groups="uom.group_uom" class="oe_inline"/>
+ <div class="o_row">
+ <field name="product_qty"/>
+ <field name="product_uom" groups="uom.group_uom"/>
</div>
<field name="price_unit"/>
</group>
@@ -466,9 +465,9 @@
<group>
<field name="product_id" readonly="1"/>
<label for="product_qty"/>
- <div>
- <field name="product_qty" readonly="1" class="oe_inline"/>
- <field name="product_uom" readonly="1" groups="uom.group_uom" class="oe_inline"/>
+ <div class="o_row">
+ <field name="product_qty" readonly="1"/>
+ <field name="product_uom" readonly="1" groups="uom.group_uom"/>
</div>
<field name="price_unit"/>
</group>
diff --git a/addons/resource/views/resource_views.xml b/addons/resource/views/resource_views.xml
index 6aad1b44489..575ead61752 100644
--- a/addons/resource/views/resource_views.xml
+++ b/addons/resource/views/resource_views.xml
@@ -213,9 +213,9 @@
<field name="date_to"/>
<field name="dayofweek"/>
<label for="hour_from" string="Hours"/>
- <div>
- <field name="hour_from" widget="float_time" class="oe_inline"/> -
- <field name="hour_to" widget="float_time" class="oe_inline"/>
+ <div class="o_row">
+ <field name="hour_from" widget="float_time"/> -
+ <field name="hour_to" widget="float_time"/>
</div>
<field name="day_period"/>
</group>
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index aa66a20017e..51491aac778 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -313,15 +313,15 @@
<field name="price_tax" invisible="1"/>
<field name="price_subtotal" invisible="1"/>
<label for="product_uom_qty"/>
- <div>
+ <div class="o_row">
<field
context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'uom':product_uom, 'uom_qty_change':True, 'company_id': parent.company_id}"
- name="product_uom_qty" class="oe_inline"/>
+ name="product_uom_qty"/>
<field
name="product_uom"
force_save="1"
groups="uom.group_uom"
- class="oe_inline oe_no_button"
+ class="oe_no_button"
attrs="{
'readonly': [('state', 'in', ('sale', 'done', 'cancel'))],
'required': [('display_type', '=', False)],
diff --git a/addons/stock/wizard/product_replenish_views.xml b/addons/stock/wizard/product_replenish_views.xml
index c66d8da5922..70d6af9778a 100644
--- a/addons/stock/wizard/product_replenish_views.xml
+++ b/addons/stock/wizard/product_replenish_views.xml
@@ -18,12 +18,11 @@
attrs="{'readonly': [('product_has_variants', '=', False)]}"/>
<field name="product_uom_category_id" invisible="1"/>
<label for="quantity"/>
- <div>
- <field name="quantity" class="oe_inline"/>
+ <div class="o_row">
+ <field name="quantity" />
<field name="product_uom_id"
domain="[('category_id', '=', product_uom_category_id)]"
- groups="uom.group_uom"
- class="oe_inline"/>
+ groups="uom.group_uom"/>
</div>
<field name="date_planned"/>
<field name="warehouse_id"
diff --git a/addons/website_forum/views/forum.xml b/addons/website_forum/views/forum.xml
index cb6eebb7400..9005963d2db 100644
--- a/addons/website_forum/views/forum.xml
+++ b/addons/website_forum/views/forum.xml
@@ -45,8 +45,8 @@
<group string="Orders">
<field name="default_order"/>
<label for="relevancy_post_vote" string="Relevance Computation" groups="base.group_no_one"/>
- <div groups="base.group_no_one">
- (votes - 1) ** <field name="relevancy_post_vote" class="oe_inline"/> / (days + 2) ** <field name="relevancy_time_decay" class="oe_inline"/>
+ <div groups="base.group_no_one" class="o_row">
+ (votes - 1) ** <field name="relevancy_post_vote"/> / (days + 2) ** <field name="relevancy_time_decay"/>
</div>
</group>
</page>