[IMP]account,purchse,warehouse,sale: view improvement in addons modules

bzr revid: rsi@tinyerp.com-20140411131842-9zppvrs2szqa4o47
This commit is contained in:
Rakesh Sindhav (OpenERP) 2014-04-11 18:48:42 +05:30
parent 522d612b8c
commit f081a5e441
11 changed files with 59 additions and 39 deletions

View File

@ -1628,6 +1628,7 @@
<field name="name"/> <field name="name"/>
<field name="active"/> <field name="active"/>
</group> </group>
<label for="note"/>
<field name="note" placeholder="Payment term explanation for the customer..."/> <field name="note" placeholder="Payment term explanation for the customer..."/>
<separator string="Computation"/> <separator string="Computation"/>
<field name="line_ids"/> <field name="line_ids"/>
@ -2444,7 +2445,7 @@
<field name="style_overwrite"/> <field name="style_overwrite"/>
</group> </group>
<notebook> <notebook>
<page string="Report"> <page string="Report" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}">
<group> <group>
<field name="display_detail" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}"/> <field name="display_detail" attrs="{'invisible': [('type','not in',['accounts','account_type'])]}"/>
<field name="account_report_id" attrs="{'invisible': [('type', '!=', 'account_report')]}"/> <field name="account_report_id" attrs="{'invisible': [('type', '!=', 'account_report')]}"/>

View File

@ -43,9 +43,8 @@
<field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/> <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
<field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/> <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
</div> </div>
<field name="use_detailed_pricelist"/>
</group> </group>
<newline/>
<field name="use_detailed_pricelist"/>
</group> </group>
<field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree"> <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
<tree string="Delivery grids"> <tree string="Delivery grids">
@ -142,7 +141,7 @@
</page> </page>
<page string="Destination"> <page string="Destination">
<group string="Countries"> <group string="Countries">
<field name="country_ids"/> <field name="country_ids" nolabel="1"/>
</group> </group>
<group string="States"> <group string="States">
<field colspan="2" name="state_ids" nolabel="1"/> <field colspan="2" name="state_ids" nolabel="1"/>

View File

@ -203,7 +203,7 @@
</record> </record>
<record id="hr_expense_product" model="ir.actions.act_window"> <record id="hr_expense_product" model="ir.actions.act_window">
<field name="name">Products</field> <field name="name">Expense Categories</field>
<field name="res_model">product.product</field> <field name="res_model">product.product</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">kanban,tree,form</field> <field name="view_mode">kanban,tree,form</field>

View File

@ -500,11 +500,15 @@
<field name="name">hr.contribution.register.form</field> <field name="name">hr.contribution.register.form</field>
<field name="model">hr.contribution.register</field> <field name="model">hr.contribution.register</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Contribution"> <form string="Contribution" version="7.0">
<field name="name"/> <group>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <field name="name"/>
<separator string="Description"/> <field name="company_id" groups="base.group_multi_company" widget="selection" class="oe_inline"/>
<field name="note" nolabel="1"/> </group>
<newline/>
<group>
<separator string="Description"/><newline/>
<field name="note" nolabel="1"/></group>
</form> </form>
</field> </field>
</record> </record>

View File

@ -22,11 +22,11 @@
<field name="inherit_id" ref="base.view_partner_bank_form" /> <field name="inherit_id" ref="base.view_partner_bank_form" />
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="acc_number" position="before"> <field name="acc_number" position="before">
<field name="bank_code" /> <field name="bank_code" attrs="{'invisible':[('state','!=','rib')]}"/>
<field name="office" /> <field name="office" attrs="{'invisible':[('state','!=','rib')]}"/>
<newline /> <newline />
<field name="rib_acc_number" /> <field name="rib_acc_number" attrs="{'invisible':[('state','!=','rib')]}"/>
<field name="key" /> <field name="key" attrs="{'invisible':[('state','!=','rib')]}"/>
<newline /> <newline />
</field> </field>
</field> </field>

View File

@ -427,12 +427,16 @@
</header> </header>
<sheet> <sheet>
<group> <group>
<field name='name'/> <group>
<field name='category_id'/> <field name='name'/>
<field name='supplier'/> <field name='category_id'/>
<field name='price'/> </group>
<group>
<field name='supplier'/>
<field name='price'/>
</group>
</group> </group>
<label for='description'/> <separator String='Description'/>
<field name='description'/> <field name='description'/>
</sheet> </sheet>
</form> </form>
@ -461,7 +465,7 @@
<sheet> <sheet>
<group string="Schedule Date"> <group string="Schedule Date">
<group> <group>
<field name="alter_type"/> <field name="alter_type" class="oe_inline"/>
<field name="specific_day" attrs="{'invisible': [('alter_type','!=','specific')], 'required':[('alter_type','=','specific')]}"/> <field name="specific_day" attrs="{'invisible': [('alter_type','!=','specific')], 'required':[('alter_type','=','specific')]}"/>
</group> </group>
</group> </group>

View File

@ -12,15 +12,23 @@
<field name="model">product.pricelist.version</field> <field name="model">product.pricelist.version</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Pricelist Version" version="7.0"> <form string="Pricelist Version" version="7.0">
<group col="4"> <group>
<field name="name"/> <group>
<field name="active"/> <field name="name"/>
<field colspan="4" name="pricelist_id"/> <field name="pricelist_id"/>
<field name="date_start"/> <field name="company_id" groups="base.group_multi_company" widget="selection"/>
<field name="date_end"/> </group>
<field name="company_id" groups="base.group_multi_company" widget="selection"/> <group>
<field name="date_start"/>
<field name="date_end"/>
<field name="active"/>
</group>
</group> </group>
<field name="items_id"/> <notebook>
<page string="Item List">
<field name="items_id"/>
</page>
</notebook>
</form> </form>
</field> </field>
</record> </record>

View File

@ -583,7 +583,7 @@
<field name="name">product.ul.form.view</field> <field name="name">product.ul.form.view</field>
<field name="model">product.ul</field> <field name="model">product.ul</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Packaging" version="7.0"> <form string="Packaging" version="7.0" class="col-md-6">
<group> <group>
<field name="name"/> <field name="name"/>
<field name="type"/> <field name="type"/>

View File

@ -37,15 +37,19 @@
<field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/> <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
</header> </header>
<sheet> <sheet>
<div class="oe_edit_only"> <div class="oe_edit_only pull-left">
<label for="name" class="oe_inline"/> <label for="name" class="oe_inline"/>
<label for="origin" class="oe_inline"/> <h1>
<field name="name" class="oe_inline"/>
</h1>
</div>
<div class="oe_edit_only pull-left">
<label for="origin" class="oe_inline"/>
<h1>
<label string="," attrs="{'invisible':[('origin','=',False)]}"/>
<field name="origin" class="oe_inline" placeholder="e.g. PO0025"/>
</h1>
</div> </div>
<h1>
<field name="name" class="oe_inline"/>
<label string="," attrs="{'invisible':[('origin','=',False)]}"/>
<field name="origin" class="oe_inline" placeholder="e.g. PO0025"/>
</h1>
<group> <group>
<group> <group>
<field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'purchase_requisition.group_purchase_requisition_user', 'purchase.group_purchase_user', 'account.group_account_invoice']}"/> <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'purchase_requisition.group_purchase_requisition_user', 'purchase.group_purchase_user', 'account.group_account_invoice']}"/>

View File

@ -216,7 +216,7 @@
</group> </group>
<group> <group>
<field name="calendar_id"/> <field name="calendar_id"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/> <field name="company_id" widget="selection" groups="base.group_multi_company" attrs="{'invisible':[('calendar_id','=',False)]}"/>
</group> </group>
</group> </group>
<group> <group>

View File

@ -1557,7 +1557,7 @@
<field name="name">stock.incoterms.form</field> <field name="name">stock.incoterms.form</field>
<field name="model">stock.incoterms</field> <field name="model">stock.incoterms</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Incoterms" version="7.0"> <form string="Incoterms" version="7.0" class="col-md-6">
<group> <group>
<field name="name"/> <field name="name"/>
<field name="code"/> <field name="code"/>
@ -1690,7 +1690,7 @@
<field name="name">Stock Journals</field> <field name="name">Stock Journals</field>
<field name="model">stock.journal</field> <field name="model">stock.journal</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Stock Journal" version="7.0"> <form string="Stock Journal" version="7.0" class="col-md-6">
<group> <group>
<field name="name"/> <field name="name"/>
<field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice', 'stock.group_stock_manager']}"/> <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice', 'stock.group_stock_manager']}"/>