pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge lp:~openerp-dev/openobject-addons/trunk-addons9-accounting-apa-account-configuration-aja

Browse Source 
bzr revid: jam@tinyerp.com-20120913103300-c84d7fk6rymygdod
This commit is contained in:
Jigar Amin - OpenERP
2012-09-13 16:03:00 +05:30
parent e300d74b77 930d5ce977
commit 3deede1faf
2 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_view.xml
+6 -5
View File
@@ -1728,8 +1728,10 @@
<field name="model">account.payment.term.line</field>
<field name="arch" type="xml">
<form string="Payment Term" version="7.0">
<field name="name"/>
<field name="sequence"/>
<group>
<field name="name"/>
<field name="sequence"/>
</group>
<group>
<group string="Amount Computation">
<field name="value"/>
@@ -1777,12 +1779,11 @@
<field name="model">account.payment.term</field>
<field name="arch" type="xml">
<form string="Payment Term" version="7.0">
<group>
<group col="4" colspan="4">
<field name="name"/>
<field name="active"/>
</group>
<separator string="Description on Invoices"/>
<field name="note"/>
<field name="note" placeholder="Description on Invoices"/>
<separator string="Computation"/>
<field name="line_ids"/>
</form>
addons/account/partner_view.xml
+33 -24
View File
@@ -7,34 +7,43 @@
<field name="model">account.fiscal.position</field>
<field name="arch" type="xml">
<form string="Fiscal Position">
<group col="4">
<group col="4" colspan="4">
<field name="name"/>
<field name="active"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<separator string="Mapping"/>
<field name="tax_ids" widget="one2many_list">
<tree string="Tax Mapping" editable="bottom">
<field name="tax_src_id" domain="[('parent_id','=',False)]"/>
<field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
</tree>
<form string="Tax Mapping">
<field name="tax_src_id" domain="[('parent_id','=',False)]"/>
<field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
</form>
</field>
<field name="account_ids" widget="one2many_list">
<tree string="Account Mapping" editable="bottom">
<field name="account_src_id"/>
<field name="account_dest_id"/>
</tree>
<form string="Account Mapping">
<field name="account_src_id"/>
<field name="account_dest_id"/>
</form>
</field>
<separator string="Notes"/>
<field name="note"/>
<group col="4" colspan="4">
<group col="4" colspan="4">
<group string="Account Mapping">
<field name="account_ids" widget="one2many_list" nolabel="1">
<tree string="Account Mapping" editable="bottom" >
<field name="account_src_id"/>
<field name="account_dest_id"/>
</tree>
<form string="Account Mapping">
<field name="account_src_id"/>
<field name="account_dest_id"/>
</form>
</field>
</group>
<group string="Tax Mapping">
<field name="tax_ids" widget="one2many_list" nolabel="1">
<tree string="Tax Mapping" editable="bottom" >
<field name="tax_src_id" domain="[('parent_id','=',False)]"/>
<field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
</tree>
<form string="Tax Mapping">
<field name="tax_src_id" domain="[('parent_id','=',False)]"/>
<field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
</form>
</field>
</group>
</group>
</group>
<separator string="Notes"/>
<group col="4" colspan="4">
<field name="note" nolabel="1"/>
</group>
</form>
</field>
</record>