Skip to content

Commit

Permalink
[MIG] base_transaction_id: Migrated to 10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
leemannd committed Jan 3, 2017
1 parent 1903c69 commit f35785e
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 71 deletions.
2 changes: 1 addition & 1 deletion base_transaction_id/__init__.py
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*# -*- coding: utf-8 -*-
# © 2012-2015 Yannick Vaucher (Camptocamp)
# © 2012-2016 Yannick Vaucher (Camptocamp SA)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from . import models
6 changes: 2 additions & 4 deletions base_transaction_id/__manifest__.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*# -*- coding: utf-8 -*-
# © 2012 Yannick Vaucher (Camptocamp)
# © 2012 - 2016 Yannick Vaucher, Camptocamp SA
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{'name': 'Base transaction id for financial institutes',
'version': '9.0.1.0.0',
'version': '10.0.1.0.0',
'author': "Camptocamp,Odoo Community Association (OCA)",
'maintainer': 'Camptocamp',
'category': 'Hidden/Dependency',
Expand All @@ -19,9 +19,7 @@
'views/account_move_line.xml',
'views/base_transaction_id.xml',
],
'test': [],
'installable': False,
'images': [],
'auto_install': False,
'license': 'AGPL-3',
}
4 changes: 2 additions & 2 deletions base_transaction_id/models/account_bank_statement_line.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# © 2016 Yannick Vaucher (Camptocamp)
# © 2016 Yannick Vaucher (Camptocamp SA)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from openerp import api, models
from odoo import api, models


class AccountBankStatementLine(models.Model):
Expand Down
4 changes: 2 additions & 2 deletions base_transaction_id/models/account_move.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
# © 2014 Guewen Baconnier (Camptocamp)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from openerp import models, fields, api
from openerp.osv import expression
from odoo import models, fields, api
from odoo.osv import expression


class AccountMoveLine(models.Model):
Expand Down
2 changes: 1 addition & 1 deletion base_transaction_id/models/invoice.py
Expand Up @@ -2,7 +2,7 @@
# © 2011-2012 Nicolas Bessi (Camptocamp)
# © 2012-2015 Yannick Vaucher (Camptocamp)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from openerp import models, fields, api
from odoo import models, fields, api


class AccountInvoice(models.Model):
Expand Down
2 changes: 1 addition & 1 deletion base_transaction_id/models/sale.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# © 2011-2012 Nicolas Bessi (Camptocamp)
# © 2012-2015 Yannick Vaucher (Camptocamp)
from openerp import models, fields, api
from odoo import models, fields, api


class SaleOrder(models.Model):
Expand Down
26 changes: 12 additions & 14 deletions base_transaction_id/views/account_move_line.xml
@@ -1,15 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="0">
<record id="view_move_line_form" model="ir.ui.view">
<field name="name">account.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="//field[@name='reconciled']/.." position="after">
<field name="transaction_ref"/>
</xpath>
</field>
</record>
</data>
</openerp>
<odoo>
<record id="view_move_line_form" model="ir.ui.view">
<field name="name">account.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="//field[@name='reconciled']/.." position="after">
<field name="transaction_ref"/>
</xpath>
</field>
</record>
</odoo>
17 changes: 7 additions & 10 deletions base_transaction_id/views/base_transaction_id.xml
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<template id="assets_backend" name="account assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<script type="text/javascript" src="/base_transaction_id/static/src/js/account_widgets.js"></script>
</xpath>
</template>
</data>
</openerp>

<odoo>
<template id="assets_backend" name="account assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<script type="text/javascript" src="/base_transaction_id/static/src/js/account_widgets.js"></script>
</xpath>
</template>
</odoo>
42 changes: 20 additions & 22 deletions base_transaction_id/views/invoice.xml
@@ -1,26 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record model="ir.ui.view" id="invoice_view_custom">
<field name="name">customer.invoice.transaction.inherit</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_form"/>
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="transaction_id"/>
</field>
<odoo>
<record model="ir.ui.view" id="invoice_view_custom">
<field name="name">customer.invoice.transaction.inherit</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_form"/>
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="transaction_id"/>
</field>
</record>
</field>
</record>

<record model="ir.ui.view" id="invoice_tree_custom">
<field name="name">account.invoice.tree.inherit</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_tree"/>
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="transaction_id"/>
</field>
<record model="ir.ui.view" id="invoice_tree_custom">
<field name="name">account.invoice.tree.inherit</field>
<field name="model">account.invoice</field>
<field name="inherit_id" ref="account.invoice_tree"/>
<field name="arch" type="xml">
<field name="origin" position="after">
<field name="transaction_id"/>
</field>
</record>
</data>
</openerp>
</field>
</record>
</odoo>
28 changes: 14 additions & 14 deletions base_transaction_id/views/sale.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record id="view_order_form_transaction" model="ir.ui.view">
<field name="name">sale.order.form.transaction</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<group name="sale_pay" position="inside">
<field name="transaction_id"/>
</group>
</field>
</record>
</data>
</openerp>
<odoo>

<record id="view_order_form" model="ir.ui.view">
<field name="name">base_transaction_id.sale.order.form</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<group name="sale_pay" position="inside">
<field name="transaction_id"/>
</group>
</field>
</record>

</odoo>

0 comments on commit f35785e

Please sign in to comment.