diff --git a/base_transaction_id/README.rst b/base_transaction_id/README.rst index 9ea40ae0..811b82d9 100644 --- a/base_transaction_id/README.rst +++ b/base_transaction_id/README.rst @@ -1,15 +1,15 @@ .. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :target: https://www.gnu.org/licenses/agpl :alt: License: AGPL-3 ============================================ -Base transaction id for financial institutes +Base transaction ID for financial institutes ============================================ -Adds transaction id to invoice and sale models and views. +Adds transaction ID to invoice and sale models and views. -On Sales order, you can specify the transaction ID used -for the payment and it will be propagated to the invoice (even if made from packing). +On Sales order, you can specify the transaction ID used for the payment and it +will be propagated to the invoice (even if made from packing). This is mostly used for e-commerce handling. You can then add a mapping on that SO field to save the e-commerce financial @@ -22,9 +22,9 @@ Bug Tracker =========== Bugs are tracked on `GitHub Issues -`_. In case of trouble, please +`_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed feedback. +help us smash it by providing detailed and welcomed feedback. Credits ======= @@ -36,9 +36,11 @@ Contributors * Joël Grand-Guillaume * Alexandre Fayolle * Guewen Baconnier -* Pedro Baeza * Lorenzo Battistini +Do not contact contributors directly about support or help with technical issues. + + Maintainer ---------- diff --git a/base_transaction_id/__init__.py b/base_transaction_id/__init__.py index cde864ba..0650744f 100644 --- a/base_transaction_id/__init__.py +++ b/base_transaction_id/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import models diff --git a/base_transaction_id/__manifest__.py b/base_transaction_id/__manifest__.py index a6ae14ca..46105bcd 100644 --- a/base_transaction_id/__manifest__.py +++ b/base_transaction_id/__manifest__.py @@ -1,15 +1,14 @@ -# -*- coding: utf-8 -* -# © 2012 Yannick Vaucher, Camptocamp SA +# Copyright 2012 Yannick Vaucher, Camptocamp SA # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -{'name': 'Base transaction id for financial institutes', - 'version': '10.0.1.0.0', +{'name': 'Base transaction ID for financial institutes', + 'version': '11.0.1.0.0', 'author': "Camptocamp,Odoo Community Association (OCA)", 'maintainer': 'Camptocamp', 'category': 'Hidden/Dependency', 'depends': [ 'sale', ], - 'website': 'https://www.odoo-community.org/', + 'website': 'https://github.com/OCA/account-reconcile', 'data': [ 'views/invoice.xml', 'views/sale.xml', diff --git a/base_transaction_id/i18n/base_transaction_id.pot b/base_transaction_id/i18n/base_transaction_id.pot deleted file mode 100644 index cfcc1fe9..00000000 --- a/base_transaction_id/i18n/base_transaction_id.pot +++ /dev/null @@ -1,58 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * base_transaction_id -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-09 07:37+0000\n" -"PO-Revision-Date: 2014-10-09 07:37+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: base_transaction_id -#: model:ir.model,name:base_transaction_id.model_account_invoice -msgid "Invoice" -msgstr "" - -#. module: base_transaction_id -#: model:ir.model,name:base_transaction_id.model_account_move_line -msgid "Journal Items" -msgstr "" - -#. module: base_transaction_id -#: model:ir.model,name:base_transaction_id.model_stock_picking -msgid "Picking List" -msgstr "" - -#. module: base_transaction_id -#: model:ir.model,name:base_transaction_id.model_sale_order -msgid "Sales Order" -msgstr "" - -#. module: base_transaction_id -#: field:account.invoice,transaction_id:0 -#: field:sale.order,transaction_id:0 -msgid "Transaction ID" -msgstr "" - -#. module: base_transaction_id -#: help:account.invoice,transaction_id:0 -msgid "Transaction ID from the financial institute" -msgstr "" - -#. module: base_transaction_id -#: field:account.move.line,transaction_ref:0 -msgid "Transaction Ref." -msgstr "" - -#. module: base_transaction_id -#: help:sale.order,transaction_id:0 -msgid "Transaction id from the financial institute" -msgstr "" - diff --git a/base_transaction_id/models/__init__.py b/base_transaction_id/models/__init__.py index f4d17648..9ddf32e7 100644 --- a/base_transaction_id/models/__init__.py +++ b/base_transaction_id/models/__init__.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*# -*- coding: utf-8 -*- -# © 2012-2015 Yannick Vaucher (Camptocamp) -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from . import invoice from . import sale from . import account_move diff --git a/base_transaction_id/models/account_bank_statement_line.py b/base_transaction_id/models/account_bank_statement_line.py index b2a4ff93..98f7ac07 100644 --- a/base_transaction_id/models/account_bank_statement_line.py +++ b/base_transaction_id/models/account_bank_statement_line.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# © 2016 Yannick Vaucher (Camptocamp SA) +# Copyright 2016 Yannick Vaucher (Camptocamp SA) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import api, models @@ -10,7 +9,8 @@ class AccountBankStatementLine(models.Model): @api.multi def get_reconciliation_proposition(self, excluded_ids=None): - """ Look for transaction_ref to give them as proposition move line """ + """Look for transaction_ref to give them as proposition move line.""" + self.ensure_one() if self.name: # If the transaction has no partner, look for match in payable and # receivable account anyway diff --git a/base_transaction_id/models/account_move.py b/base_transaction_id/models/account_move.py index acc9223b..50ad6c19 100644 --- a/base_transaction_id/models/account_move.py +++ b/base_transaction_id/models/account_move.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# © 2014 Guewen Baconnier (Camptocamp) +# Copyright 2014 Guewen Baconnier (Camptocamp) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import models, fields, api from odoo.osv import expression @@ -36,7 +35,7 @@ class AccountMoveLine(models.Model): @api.model def domain_move_lines_for_reconciliation(self, excluded_ids=None, str=False): - """ Add transaction_ref in search of move lines""" + """Add transaction_ref in search of move lines.""" _super = super(AccountMoveLine, self) _get_domain = _super.domain_move_lines_for_reconciliation domain = _get_domain(excluded_ids=excluded_ids, str=str) diff --git a/base_transaction_id/models/invoice.py b/base_transaction_id/models/invoice.py index 17bd98d1..c8e87901 100644 --- a/base_transaction_id/models/invoice.py +++ b/base_transaction_id/models/invoice.py @@ -1,6 +1,5 @@ -# -*- coding: utf-8 -*- -# © 2011-2012 Nicolas Bessi (Camptocamp) -# © 2012-2015 Yannick Vaucher (Camptocamp) +# Copyright 2011-2012 Nicolas Bessi (Camptocamp) +# Copyright 2012-2015 Yannick Vaucher (Camptocamp) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import models, fields, api @@ -16,9 +15,9 @@ class AccountInvoice(models.Model): @api.multi def finalize_invoice_move_lines(self, move_lines): - """ Propagate the transaction_id from the invoice to the move lines. + """Propagate the transaction_id from the invoice to the move lines. - The transaction id is written on the move lines only if the account is + The transaction ID is written on the move lines only if the account is the same than the invoice's one. """ move_lines = super(AccountInvoice, self).finalize_invoice_move_lines( diff --git a/base_transaction_id/models/sale.py b/base_transaction_id/models/sale.py index 938e3c73..329cd21b 100644 --- a/base_transaction_id/models/sale.py +++ b/base_transaction_id/models/sale.py @@ -1,6 +1,5 @@ -# -*- coding: utf-8 -*- -# © 2011-2012 Nicolas Bessi (Camptocamp) -# © 2012-2015 Yannick Vaucher (Camptocamp) +# Copyright 2011-2012 Nicolas Bessi (Camptocamp) +# Copyright 2012-2015 Yannick Vaucher (Camptocamp) from odoo import models, fields, api @@ -16,7 +15,7 @@ class SaleOrder(models.Model): @api.multi def _prepare_invoice(self): - """ Propagate the transaction_id from the sale order to the invoice """ + """Propagate the transaction_id from the sale order to the invoice.""" invoice_vals = super(SaleOrder, self)._prepare_invoice() invoice_vals['transaction_id'] = self.transaction_id return invoice_vals diff --git a/base_transaction_id/views/account_move_line.xml b/base_transaction_id/views/account_move_line.xml index f2ad3d09..632153ca 100644 --- a/base_transaction_id/views/account_move_line.xml +++ b/base_transaction_id/views/account_move_line.xml @@ -5,7 +5,7 @@ account.move.line - + diff --git a/base_transaction_id/views/invoice.xml b/base_transaction_id/views/invoice.xml index ba27b5c5..7c07a52e 100644 --- a/base_transaction_id/views/invoice.xml +++ b/base_transaction_id/views/invoice.xml @@ -6,7 +6,9 @@ account.invoice - + +