pre-commit update

This commit is contained in:
OCA-git-bot
2020-03-14 11:49:26 +01:00
committed by Marçal Isern
parent 0f23ec3a97
commit 8dc82f7f1e
6 changed files with 132 additions and 111 deletions

View File

@@ -1,24 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo noupdate="1">
<record id="default_supplier_payment_mode_id" model="ir.property" forcecreate="True">
<field name="name">Default Supplier Payment Mode</field>
<field name="fields_id"
search="[('model','=','res.partner'),('name','=','supplier_payment_mode_id')]"/>
<field name="value"
eval="'account.payment.mode,'+str(ref('account_payment_mode.payment_mode_outbound_ct1'))"/>
<field name="company_id" ref="base.main_company"/>
</record>
<record id="default_customer_payment_mode_id" model="ir.property" forcecreate="True">
<field name="name">Default Customer Payment Mode</field>
<field name="fields_id"
search="[('model','=','res.partner'),('name','=','customer_payment_mode_id')]"/>
<field name="value"
eval="'account.payment.mode,'+str(ref('account_payment_mode.payment_mode_inbound_ct1'))"/>
<field name="company_id" ref="base.main_company"/>
</record>
<record
id="default_supplier_payment_mode_id"
model="ir.property"
forcecreate="True"
>
<field name="name">Default Supplier Payment Mode</field>
<field
name="fields_id"
search="[('model','=','res.partner'),('name','=','supplier_payment_mode_id')]"
/>
<field
name="value"
eval="'account.payment.mode,'+str(ref('account_payment_mode.payment_mode_outbound_ct1'))"
/>
<field name="company_id" ref="base.main_company" />
</record>
<record
id="default_customer_payment_mode_id"
model="ir.property"
forcecreate="True"
>
<field name="name">Default Customer Payment Mode</field>
<field
name="fields_id"
search="[('model','=','res.partner'),('name','=','customer_payment_mode_id')]"
/>
<field
name="value"
eval="'account.payment.mode,'+str(ref('account_payment_mode.payment_mode_inbound_ct1'))"
/>
<field name="company_id" ref="base.main_company" />
</record>
</odoo>

View File

@@ -1,25 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<!--
Copyright 2016 Akretion (http://www.akretion.com/)
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-->
<odoo>
<record id="view_move_line_form" model="ir.ui.view">
<field name="name">account_payment_partner.move_line_form</field>
<field name="model">account.move.line</field>
<field name="inherit_id" ref="account.view_move_line_form" />
<field name="arch" type="xml">
<xpath expr="//group[@groups='analytic.group_analytic_accounting,analytic.group_analytic_tags']" position="after">
<group name="payments" string="Payments">
<field name="payment_mode_id" widget="selection"/>
</group>
</xpath>
</field>
</record>
<record id="view_move_line_form" model="ir.ui.view">
<field name="name">account_payment_partner.move_line_form</field>
<field name="model">account.move.line</field>
<field name="inherit_id" ref="account.view_move_line_form" />
<field name="arch" type="xml">
<xpath
expr="//group[@groups='analytic.group_analytic_accounting,analytic.group_analytic_tags']"
position="after"
>
<group name="payments" string="Payments">
<field name="payment_mode_id" widget="selection" />
</group>
</xpath>
</field>
</record>
</odoo>

View File

@@ -1,58 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<!--
Copyright 2014-16 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->
<odoo>
<record id="view_account_invoice_filter" model="ir.ui.view">
<field name="name">account_payment_partner.account_invoice_search</field>
<field name="model">account.move</field>
<field name="inherit_id" ref="account.view_account_invoice_filter"/>
<field name="inherit_id" ref="account.view_account_invoice_filter" />
<field name="arch" type="xml">
<filter name="status" position="after">
<filter string="Payment Mode" name="payment_mode_groupby"
context="{'group_by': 'payment_mode_id'}"/>
<filter
string="Payment Mode"
name="payment_mode_groupby"
context="{'group_by': 'payment_mode_id'}"
/>
</filter>
</field>
</record>
<record id="view_move_form" model="ir.ui.view">
<field name="name">account_payment_partner.view_move_form</field>
<field name="model">account.move</field>
<field name="inherit_id" ref="account.view_move_form"/>
<field name="inherit_id" ref="account.view_move_form" />
<field name="arch" type="xml">
<xpath expr="//div[field[@name='invoice_payment_term_id']]" position="after">
<field name="payment_mode_id"
domain="[('payment_type', '=', payment_mode_filter_type_domain), ('company_id', '=', company_id)]"
widget="selection"
attrs="{'readonly': [('state', '!=', 'draft')]}"
invisible="context.get('default_type') not in ('out_invoice','out_refund','in_invoice','in_refund')"/>
<field name="commercial_partner_id" invisible="1"/>
<field name="bank_account_required" invisible="1"/>
<field name="payment_mode_filter_type_domain" invisible="1"/>
<field name="partner_bank_filter_type_domain" invisible="1"/>
<xpath
expr="//div[field[@name='invoice_payment_term_id']]"
position="after"
>
<field
name="payment_mode_id"
domain="[('payment_type', '=', payment_mode_filter_type_domain), ('company_id', '=', company_id)]"
widget="selection"
attrs="{'readonly': [('state', '!=', 'draft')]}"
invisible="context.get('default_type') not in ('out_invoice','out_refund','in_invoice','in_refund')"
/>
<field name="commercial_partner_id" invisible="1" />
<field name="bank_account_required" invisible="1" />
<field name="payment_mode_filter_type_domain" invisible="1" />
<field name="partner_bank_filter_type_domain" invisible="1" />
</xpath>
<field name="invoice_partner_bank_id" position="attributes">
<attribute name="domain">[('partner_id', '=', partner_bank_filter_type_domain),
<attribute
name="domain"
>[('partner_id', '=', partner_bank_filter_type_domain),
'|',('company_id', '=', company_id),('company_id', '=', False)]</attribute>
<attribute name="attrs">{'required': [('bank_account_required', '=', True)], 'readonly': [('state', '!=', 'draft')]}</attribute>
<attribute name="context">{'default_partner_id':commercial_partner_id}</attribute>
<attribute
name="attrs"
>{'required': [('bank_account_required', '=', True)], 'readonly': [('state', '!=', 'draft')]}</attribute>
<attribute
name="context"
>{'default_partner_id':commercial_partner_id}</attribute>
</field>
</field>
</record>
<record id="view_invoice_tree" model="ir.ui.view">
<field name="name">account_payment_partner.view_invoice_tree</field>
<field name="model">account.move</field>
<field name="inherit_id" ref="account.view_invoice_tree"/>
<field name="inherit_id" ref="account.view_invoice_tree" />
<field name="arch" type="xml">
<field name="amount_residual_signed" position="after">
<field name="payment_mode_id"/>
<field name="payment_mode_id" />
</field>
</field>
</record>
</odoo>

View File

@@ -1,24 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright 2018 Carlos Dauden - Tecnativa <carlos.dauden@tecnativa.com>
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
<odoo>
<record id="account_payment_mode_form" model="ir.ui.view">
<field name="model">account.payment.mode</field>
<field name="inherit_id" ref="account_payment_mode.account_payment_mode_form"/>
<field name="arch" type="xml">
<group name="note" position="before">
<group string="Show bank account in invoice report">
<group>
<field name="show_bank_account"/>
<field name="show_bank_account_from_journal"
attrs="{'invisible': [('show_bank_account', '=', 'no')]}"/>
<field name="show_bank_account_chars" string="# of chars"
attrs="{'invisible': [('show_bank_account', 'not in', ['first', 'last'])]}"/>
<record id="account_payment_mode_form" model="ir.ui.view">
<field name="model">account.payment.mode</field>
<field name="inherit_id" ref="account_payment_mode.account_payment_mode_form" />
<field name="arch" type="xml">
<group name="note" position="before">
<group string="Show bank account in invoice report">
<group>
<field name="show_bank_account" />
<field
name="show_bank_account_from_journal"
attrs="{'invisible': [('show_bank_account', '=', 'no')]}"
/>
<field
name="show_bank_account_chars"
string="# of chars"
attrs="{'invisible': [('show_bank_account', 'not in', ['first', 'last'])]}"
/>
</group>
</group>
</group>
</group>
</field>
</record>
</field>
</record>
</odoo>

View File

@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<template id="report_invoice_payment_mode" inherit_id="account.report_invoice_document">
<template
id="report_invoice_payment_mode"
inherit_id="account.report_invoice_document"
>
<xpath expr="//p[@t-if='o.invoice_payment_term_id']" position="after">
<p t-if="o.payment_mode_id.note">
<strong>Payment Mode:</strong>
@@ -11,20 +13,25 @@
<p t-foreach="o.partner_banks_to_show()" t-as="partner_bank">
<strong>Bank Account:</strong>
<t t-if="partner_bank.bank_id">
<t t-esc="partner_bank.bank_id.name + ('' if not partner_bank.bank_id.bic else ' (' + partner_bank.bank_id.bic + ')')" />
<t
t-esc="partner_bank.bank_id.name + ('' if not partner_bank.bank_id.bic else ' (' + partner_bank.bank_id.bic + ')')"
/>
</t>
<t t-if="o.payment_mode_id.show_bank_account == 'full'">
<span t-field="partner_bank.acc_number"/>
<span t-field="partner_bank.acc_number" />
</t>
<t t-elif="o.payment_mode_id.show_bank_account == 'first'">
<span t-esc="partner_bank.acc_number[:o.payment_mode_id.show_bank_account_chars] + '*' * (len(partner_bank.acc_number) - o.payment_mode_id.show_bank_account_chars)"/>
<span
t-esc="partner_bank.acc_number[:o.payment_mode_id.show_bank_account_chars] + '*' * (len(partner_bank.acc_number) - o.payment_mode_id.show_bank_account_chars)"
/>
</t>
<t t-elif="o.payment_mode_id.show_bank_account == 'last'">
<span t-esc="'*' * (len(partner_bank.acc_number) - o.payment_mode_id.show_bank_account_chars) + partner_bank.acc_number[-o.payment_mode_id.show_bank_account_chars:]"/>
<span
t-esc="'*' * (len(partner_bank.acc_number) - o.payment_mode_id.show_bank_account_chars) + partner_bank.acc_number[-o.payment_mode_id.show_bank_account_chars:]"
/>
</t>
</p>
</t>
</xpath>
</template>
</odoo>

View File

@@ -1,25 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<!--
Copyright 2014-2016 Akretion (http://www.akretion.com/)
License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-->
<odoo>
<record id="view_partner_property_form" model="ir.ui.view">
<field name="name">account_partner_payment.partner_form</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="account.view_partner_property_form" />
<field name="arch" type="xml">
<field name="property_payment_term_id" position="after">
<field name="customer_payment_mode_id" widget="selection"/>
<record id="view_partner_property_form" model="ir.ui.view">
<field name="name">account_partner_payment.partner_form</field>
<field name="model">res.partner</field>
<field name="inherit_id" ref="account.view_partner_property_form" />
<field name="arch" type="xml">
<field name="property_payment_term_id" position="after">
<field name="customer_payment_mode_id" widget="selection" />
</field>
<field name="property_supplier_payment_term_id" position="after">
<field name="supplier_payment_mode_id" widget="selection" />
</field>
</field>
<field name="property_supplier_payment_term_id" position="after">
<field name="supplier_payment_mode_id" widget="selection"/>
</field>
</field>
</record>
</record>
</odoo>