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

[MERGE]:merged sgo's branch

Browse Source 
bzr revid: apa@tinyerp.com-20120608102525-z0h8kd9ay0f46iy9
This commit is contained in:
Amit Patel (OpenERP)
2012-06-08 15:55:25 +05:30
parent ddf2f732cc 4b3ffbbed4
commit 042683183d
6 changed files with 11 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_analytic_plans/account_analytic_plans_view.xml
+3 -3
View File
@@ -22,10 +22,10 @@
<field name="type">form</field>
<field name="inherit_id" ref="account.view_move_form"/>
<field name="arch" type="xml">
<xpath expr="/form/notebook/page/field[@name='line_id']/tree/field[@name='analytic_account_id']" position="replace">
<xpath expr="/form/sheet/notebook/page/field[@name='line_id']/tree/field[@name='analytic_account_id']" position="replace">
<field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
</xpath>
<xpath expr="/form/notebook/page/field[@name='line_id']/form/notebook/page/group/field[@name='analytic_account_id']" position="replace">
<xpath expr="/form/sheet/notebook/page/field[@name='line_id']/form/notebook/page/group/group/field[@name='analytic_account_id']" position="replace">
<field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
</xpath>
</field>
@@ -314,7 +314,7 @@
<xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/tree/field[@name='analytic_account_id']" position="replace">
<field name="analytics_id" groups="analytic.group_analytic_accounting"/>
</xpath>
<xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/field[@name='analytic_account_id']" position="replace">
<xpath expr="/form/sheet/notebook/page/field[@name='line_ids']/form/group/field[@name='analytic_account_id']" position="replace">
<field name="analytics_id" groups="analytic.group_analytic_accounting"/>
</xpath>
</field>
addons/account_payment/account_payment_view.xml
+2 -2
View File
@@ -144,11 +144,11 @@
<field colspan="4" name="communication2"/>
<field name="name"/>
<field name="state"/>
<field name="company_id" widget='selection' groups="base.group_multi_company"/>
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
</page>
<page string="Information">
<group col="4" string="General Information"/>
<group col="4" string="General Information">
<label for="amount"/>
<div>
<field name="amount" class="oe_form_inline"/>
addons/document_ftp/res_config_view.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<field name="name">Knowledge Application</field>
<field name="model">knowledge.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="base_setup.view_knowledge_configuration"/>
<field name="inherit_id" ref="knowledge.view_knowledge_configuration"/>
<field name="arch" type="xml">
<field name="module_document_ftp" position="after">
<field name="document_ftp_url" widget="url"/>
addons/l10n_ch/bank_view.xml
+2 -45
View File
@@ -34,27 +34,6 @@
<!-- res.partner.bank in res partner form-->
<!-- Partner -> Bank Details -->
<record model="ir.ui.view" id="l10nch_view_res_partner_bank_hide_f1">
<field name="name">res.partner_bank.form.hide.f1</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_partner_property_form"/>
<field name="arch" type="xml">
<field name="acc_number" position="replace">
</field>
</field>
</record>
<record model="ir.ui.view" id="l10nch_view_res_partner_bank_hide_f2">
<field name="name">res.partner_bank.form.hide.f2</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="account.view_partner_property_form"/>
<field name="arch" type="xml">
<field name="bank" position="replace">
</field>
</field>
</record>
<record model="ir.ui.view" id="l10nch_view_res_partner_bank_add_groups">
<field name="name">res.partner_bank.form.hide.f2</field>
<field name="model">res.partner</field>
@@ -85,28 +64,6 @@
<!-- Sales -> Configuration -> Address Book -> Bank accounts -->
<!-- Invoice -> Bank account -->
<record model="ir.ui.view" id="l10nch_view_res_partner_bank_acc_number_hide_frominvoice">
<field name="name">res.partner_bank.form.hide.acc_number.frominvoice</field>
<field name="model">res.partner.bank</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_bank_form"/>
<field name="arch" type="xml">
<field name="acc_number" position="replace">
</field>
</field>
</record>
<record model="ir.ui.view" id="l10nch_view_res_partner_bank_hide_bank_frominvoice2">
<field name="name">res.partner_bank.form.hide.bank.frominvoice</field>
<field name="model">res.partner.bank</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_bank_form"/>
<field name="arch" type="xml">
<field name="bank" position="replace">
</field>
</field>
</record>
<record model="ir.ui.view" id="l10nch_view_res_partner_bank_from_invoice">
<field name="name">res.partner_bank.form.hide.frominvoice</field>
<field name="model">res.partner.bank</field>
@@ -150,10 +107,10 @@
<record id="l10nch_view_partner_bank_details_list" model="ir.ui.view">
<field name="name">res.partner.form.bank_details.list</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="inherit_id" ref="account.view_partner_property_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
<xpath expr="//page/field[@name='bank_ids']/tree/field[@name='acc_number']" position="before">
<xpath expr="//field[@name='bank_ids']/tree/field[@name='acc_number']" position="before">
<field name="state" />
<field name="bank" />
</xpath>
addons/l10n_fr_rib/bank_view.xml
+2 -2
View File
@@ -9,7 +9,7 @@
<field name="type">form</field>
<field name="arch" type="xml">
<data>
<xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
<xpath expr="//page[@string='Accounting']/group/field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
<newline />
<field name="bank_code" />
<field name="office" />
@@ -17,7 +17,7 @@
<field name="key" />
<newline />
</xpath>
<xpath expr="//page[@string='Accounting']/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
<xpath expr="//page[@string='Accounting']/group/field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
<field name="rib_acc_number"/>
</xpath>
</data>
addons/sale_margin/sale_margin_view.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form" />
<field name="arch" type="xml">
<xpath expr="//div[@class='oe_form_subtotal_footer_separator']" position="after">
<xpath expr="//div[@class='oe_form_subtotal_footer']" position="after">
<div>
<field name="margin"/>
</div>