[IMP] account, product:
account : Improve view for account_invoice_view.xml account : Improve view for product_view.xml product : Improve product category as well as uom view file stock : Improve product inherited view bzr revid: dbr@tinyerp.com-20120622055524-j3erbqup81u72f6f
This commit is contained in:
DBR (OpenERP)
parent
9371f60a47
commit
0b98166e73
|
|
@ -192,15 +192,15 @@
|
|||
<field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
|
||||
<tree string="Invoice lines">
|
||||
<field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
|
||||
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)"/>
|
||||
<field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
|
||||
<field domain="[('type','<>','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
|
||||
<field name="quantity"/>
|
||||
<field name="price_unit"/>
|
||||
<!-- Removed if subtotal is set -->
|
||||
<field name="price_subtotal"/>
|
||||
<field invisible="True" name="name"/>
|
||||
<field invisible="True" name="uos_id"/>
|
||||
<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '<>', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" invisible="1"/>
|
||||
<!-- Removed if subtotal is set -->
|
||||
<field name="name" invisible="1"/>
|
||||
<field name="uos_id" invisible="1"/>
|
||||
</tree>
|
||||
</field>
|
||||
<group>
|
||||
|
|
@ -234,14 +234,17 @@
|
|||
</page>
|
||||
<page string="Other Info">
|
||||
<group col="4">
|
||||
<group>
|
||||
<field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
|
||||
<field name="payment_term" widget="selection"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="user_id"/>
|
||||
<field name="name" invisible="1"/>
|
||||
<newline/>
|
||||
<field name="move_id" groups="account.group_account_user" invisible="1"/>
|
||||
<field name="payment_term" widget="selection"/>
|
||||
<field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Payments">
|
||||
<field name="payment_ids">
|
||||
|
|
@ -249,7 +252,7 @@
|
|||
<field name="date" string="Payment Date"/>
|
||||
<field name="ref"/>
|
||||
<field name="name"/>
|
||||
<field name="amount_currency"/>
|
||||
<field name="amount_currency" string="Amount"/>
|
||||
<field name="currency_id"/>
|
||||
<field name="move_id" invisible="1"/>
|
||||
<field name="journal_id" invisible="1"/>
|
||||
|
|
|
|||
|
|
@ -51,12 +51,14 @@
|
|||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="product.product_category_form_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<form position="inside">
|
||||
<group string="Accounting Properties">
|
||||
<field name="property_account_income_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
<field name="property_account_expense_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
</group>
|
||||
</form>
|
||||
<data>
|
||||
<xpath expr="/form/sheet//group[@name='basic']" position="inside">
|
||||
<group string="Accounting Properties">
|
||||
<field name="property_account_income_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
<field name="property_account_expense_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -34,12 +34,13 @@
|
|||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="product.product_category_form_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<form position="inside">
|
||||
<group>
|
||||
<separator string="Accounting Property" colspan="2"/>
|
||||
<field name="property_account_creditor_price_difference_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
</group>
|
||||
</form>
|
||||
<data>
|
||||
<xpath expr="/form/sheet//group[@name='basic']" position="before">
|
||||
<group string="Accounting Property">
|
||||
<field name="property_account_creditor_price_difference_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
|
|
@ -311,12 +311,15 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Product Categories" version="7.0">
|
||||
<group col="4">
|
||||
<field name="name"/>
|
||||
<field name="parent_id"/>
|
||||
<field name="sequence" invisible="1"/>
|
||||
<field name="type"/>
|
||||
</group>
|
||||
<sheet>
|
||||
<group>
|
||||
<field name="name"/>
|
||||
<field name="parent_id"/>
|
||||
<field name="sequence" invisible="1"/>
|
||||
<field name="type"/>
|
||||
</group>
|
||||
<group name="basic" col="4"/>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -415,9 +418,9 @@
|
|||
</group>
|
||||
<group string="Ratio & Precision">
|
||||
<field name="uom_type" on_change="onchange_type(uom_type)"/>
|
||||
<field name="rounding"/>
|
||||
<field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
|
||||
<label string=" e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
|
||||
<field name="rounding" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
|
||||
<field name="factor" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
|
||||
<label string=" e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
|
||||
<field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
|
||||
<label string=" e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
|
||||
</group>
|
||||
|
|
|
|||
|
|
@ -21,14 +21,16 @@
|
|||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="product.product_category_form_view"/>
|
||||
<field name="arch" type="xml">
|
||||
<form position="inside" version="7.0">
|
||||
<group string="Accounting Stock Properties">
|
||||
<field name="property_stock_account_input_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
<field name="property_stock_account_output_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
<field name="property_stock_valuation_account_id" domain="[('type','<>','view'), ('type','<>','consolidation')]"/>
|
||||
<field name="property_stock_journal"/>
|
||||
</group>
|
||||
</form>
|
||||
<data>
|
||||
<xpath expr="/form/sheet//group[@name='basic']" position="inside">
|
||||
<group string="Accounting Stock Properties">
|
||||
<field name="property_stock_account_input_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
<field name="property_stock_account_output_categ" domain="[('type','<>','view'),('type','<>','consolidation')]"/>
|
||||
<field name="property_stock_valuation_account_id" domain="[('type','<>','view'), ('type','<>','consolidation')]"/>
|
||||
<field name="property_stock_journal"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue