Skip to content

Commit

Permalink
Port almost all modules to v10 (OCA#305)
Browse files Browse the repository at this point in the history
Port almost all modules to v10

* Update to EPC Rulebook v9.2 that start to apply on 2016-11-20 (bug OCA#300)
  • Loading branch information
Alexis de Lattre authored and etobella committed Nov 7, 2017
1 parent fa9f411 commit bede872
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 45 deletions.
2 changes: 1 addition & 1 deletion account_payment_partner/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Invoices without any payment mode are displayed to.

.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:alt: Try me on Runbot
:target: https://runbot.odoo-community.org/runbot/173/9.0
:target: https://runbot.odoo-community.org/runbot/173/10.0

Known issues / Roadmap
======================
Expand Down
6 changes: 3 additions & 3 deletions account_payment_partner/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

{
'name': 'Account Payment Partner',
'version': '9.0.1.0.0',
'version': '10.0.1.0.0',
'category': 'Banking addons',
'license': 'AGPL-3',
'summary': 'Adds payment mode on partners and invoices',
'author': "Akretion, "
"Serv. Tecnol. Avanzados - Pedro M. Baeza, "
"Tecnativa, "
"Odoo Community Association (OCA)",
'website': 'https://github.com/OCA/bank-payment',
'depends': ['account_payment_mode'],
Expand All @@ -21,5 +21,5 @@
'views/report_invoice.xml',
],
'demo': ['demo/partner_demo.xml'],
'installable': False,
'installable': True,
}
7 changes: 3 additions & 4 deletions account_payment_partner/demo/partner_demo.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo noupdate="1">

<openerp>
<data noupdate="1">

<record id="default_supplier_payment_mode_id" model="ir.property" forcecreate="True">
<field name="name">Default Supplier Payment Mode</field>
Expand All @@ -21,5 +20,5 @@
<field name="company_id" ref="base.main_company"/>
</record>

</data>
</openerp>

</odoo>
2 changes: 1 addition & 1 deletion account_payment_partner/models/account_invoice.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# © 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from openerp import models, fields, api
from odoo import models, fields, api


class AccountInvoice(models.Model):
Expand Down
2 changes: 1 addition & 1 deletion account_payment_partner/models/account_move_line.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# © 2016 Akretion (http://www.akretion.com/)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from openerp import models, fields
from odoo import models, fields


class AccountMoveLine(models.Model):
Expand Down
2 changes: 1 addition & 1 deletion account_payment_partner/models/res_partner.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# © 2014 Serv. Tecnol. Avanzados - Pedro M. Baeza
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).

from openerp import models, fields, api
from odoo import models, fields, api


class ResPartner(models.Model):
Expand Down
6 changes: 2 additions & 4 deletions account_payment_partner/views/account_invoice_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
-->

<odoo>
<data>

<record id="view_account_invoice_filter" model="ir.ui.view">
<field name="name">account_payment_partner.account_invoice_search</field>
Expand All @@ -25,7 +24,7 @@
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_form" />
<field name="arch" type="xml">
<field name="partner_bank_id" position="after">
<field name="payment_term_id" position="after">
<field name="payment_mode_id"
domain="[('payment_type', '=', 'inbound')]"
widget="selection"/>
Expand All @@ -43,7 +42,7 @@
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_supplier_form" />
<field name="arch" type="xml">
<field name="partner_bank_id" position="before">
<field name="payment_term_id" position="after">
<field name="payment_mode_id"
domain="[('payment_type', '=', 'outbound')]"
widget="selection"/>
Expand Down Expand Up @@ -81,5 +80,4 @@
</record>


</data>
</odoo>
12 changes: 5 additions & 7 deletions account_payment_partner/views/account_move_line.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>

<!--
Copyright (C) 2016 Akretion (http://www.akretion.com/)
@author Alexis de Lattre <[email protected]>
The licence is in the file __openerp__.py
© 2016 Akretion (http://www.akretion.com/)
@author Alexis de Lattre <[email protected]>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->

<openerp>
<data>
<odoo>


<record id="view_move_line_form" model="ir.ui.view">
Expand All @@ -24,5 +23,4 @@
</record>


</data>
</openerp>
</odoo>
32 changes: 16 additions & 16 deletions account_payment_partner/views/report_invoice.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<template id="report_invoice_payment_mode" inherit_id="account.report_invoice_document">
<xpath expr="//p[@t-if='o.payment_term_id']" position="after">
<p t-if="o.payment_mode_id.note">
<strong>Payment Mode:</strong>
<span t-field="o.payment_mode_id.note" />
</p>
<p t-if="o.partner_bank_id">
<strong>Bank Account:</strong>
<span t-field="o.partner_bank_id.acc_number" />
</p>
</xpath>
</template>
</data>
</openerp>
<odoo>

<template id="report_invoice_payment_mode" inherit_id="account.report_invoice_document">
<xpath expr="//p[@t-if='o.payment_term_id']" position="after">
<p t-if="o.payment_mode_id.note">
<strong>Payment Mode:</strong>
<span t-field="o.payment_mode_id.note" />
</p>
<p t-if="o.partner_bank_id">
<strong>Bank Account:</strong>
<span t-field="o.partner_bank_id.acc_number" />
</p>
</xpath>
</template>

</odoo>
12 changes: 5 additions & 7 deletions account_payment_partner/views/res_partner_view.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2014-2016 Akretion (http://www.akretion.com/)
@author Alexis de Lattre <[email protected]>
The licence is in the file __openerp__.py
© 2014-2016 Akretion (http://www.akretion.com/)
@author Alexis de Lattre <[email protected]>
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
-->

<openerp>
<data>
<odoo>


<record id="view_partner_property_form" model="ir.ui.view">
Expand All @@ -24,5 +23,4 @@
</record>


</data>
</openerp>
</odoo>

0 comments on commit bede872

Please sign in to comment.