Merge lp:~elbati/account-payment/adding_account_voucher_supplier_invoice_number_7 into lp:~account-payment-team/account-payment/7.0

[Lorenzo Battistini]

[Stefan Rijnhart (Opener) (stefan-opener)]

Looks good, functionally. I am just wondering, why did you include the whole test suite of the voucher module, given that this module hardly influences any calculation or move line creation?

Nit: l.2866 could be kept at < 80 chars

review: Needs Information

[lp:~elbati/account-payment/adding_account_voucher_supplier_invoice_number_7]

100. By Lorenzo Battistini on 2013-05-25

[fix] line length

[Lorenzo Battistini (elbati)]

On 05/24/2013 07:12 PM, Stefan Rijnhart (Therp) wrote:
> Looks good, functionally. I am just wondering, why did you include the whole test suite of the voucher module, given that this module hardly influences any calculation or move line creation?

To be sure this module does not influence any calculation or move line
creation :-)

Anyway, I can remove some of them, if unnecessary.

> Nit: l.2866 could be kept at < 80 chars
>

Done

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks! In that case, it would probably be best if the tests were removed.

review: Needs Fixing

[lp:~elbati/account-payment/adding_account_voucher_supplier_invoice_number_7]

101. By Lorenzo Battistini on 2013-05-30

[del] useless tests

102. By Lorenzo Battistini on 2013-05-30

[add] not working purchase voucher

103. By Lorenzo Battistini on 2013-05-31

[fix] supplier invoice creation test

104. By Lorenzo Battistini on 2013-05-31

[imp] test checking supplier_invoice_number

[Lorenzo Battistini (elbati)]

On 05/26/2013 07:39 PM, Stefan Rijnhart (Therp) wrote:
> Thanks! In that case, it would probably be best if the tests were removed.

Removed.
I kept and improved (testing supplier_invoice_number field) the supplier
payment one.

[Stefan Rijnhart (Opener) (stefan-opener)]

Thanks!

review: Approve

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve

=== added directory 'account_voucher_supplier_invoice_number'
=== added file 'account_voucher_supplier_invoice_number/AUTHORS.txt'
--- account_voucher_supplier_invoice_number/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ account_voucher_supplier_invoice_number/AUTHORS.txt	2013-05-31 08:44:26 +0000
@@ -0,0 +1,1 @@
+Lorenzo Battistini <[e-mail]>
 
=== added file 'account_voucher_supplier_invoice_number/__init__.py'
--- account_voucher_supplier_invoice_number/__init__.py	1970-01-01 00:00:00 +0000
+++ account_voucher_supplier_invoice_number/__init__.py	2013-05-31 08:44:26 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import voucher
 
=== added file 'account_voucher_supplier_invoice_number/__openerp__.py'
--- account_voucher_supplier_invoice_number/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_voucher_supplier_invoice_number/__openerp__.py	2013-05-31 08:44:26 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': "Supplier invoice number in payment vouchers",
+    'version': '0.1',
+    'category': 'Accounting & Finance',
+    'description': """
+This module adds the supplier invoice number to (Supplier Payment) voucher lines. So that it's more easy to find the right invoice we are going to pay.
+""",
+    'author': 'Agile Business Group',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends" : ['account_voucher'],
+    "data" : [
+        'voucher_view.xml',
+        ],
+    'test' : [
+        'test/purchase_payment.yml',
+    ],
+    "demo" : [],
+    "active": False,
+    "installable": True
+}
 
=== added directory 'account_voucher_supplier_invoice_number/test'
=== added file 'account_voucher_supplier_invoice_number/test/purchase_payment.yml'
--- account_voucher_supplier_invoice_number/test/purchase_payment.yml	1970-01-01 00:00:00 +0000
+++ account_voucher_supplier_invoice_number/test/purchase_payment.yml	2013-05-31 08:44:26 +0000
@@ -0,0 +1,63 @@
+-
+  Create an invoice for the partner Seagate with amount 450.0
+-
+  !python {model: account.invoice}: |
+    context.update({'type': 'in_invoice'})
+-
+  !record {model: account.invoice, id: account_invoice_0}:
+    account_id: account.a_pay
+    company_id: base.main_company
+    currency_id: base.EUR
+    supplier_invoice_number: '2013/003864'
+    invoice_line:
+      - account_id: account.a_expense
+        name: '[PCSC234] PC Assemble SC234'
+        price_unit: 450.0
+        quantity: 1.0
+        product_id: product.product_product_3
+        uos_id: product.product_uom_unit
+    journal_id: account.expenses_journal
+    partner_id: base.res_partner_19
+
+-
+  I check that the invoice is in draft state
+-
+  !assert {model: account.invoice, id: account_invoice_0}:
+    - state == 'draft'
+
+-
+  I make the invoice in Open state
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_0}
+
+-
+  I will create and post an account voucher of amount 450.0 for the partner Seagate.
+-
+  !python {model: account.voucher}: |
+    import netsvc
+    vals = {}
+    res = self.onchange_partner_id(cr, uid, [], ref("base.res_partner_19"), ref('account.bank_journal'), 0.0, 1, ttype='payment', date=False)
+    vals = {
+        'account_id': ref('account.cash'),
+        'amount': 450.0,
+        'company_id': ref('base.main_company'),
+        'journal_id': ref('account.bank_journal'),
+        'partner_id': ref('base.res_partner_19'),
+        'period_id': ref('account.period_8'),
+        'type': 'payment',
+    }
+    if not res['value']['line_dr_ids']:
+      res['value']['line_dr_ids'] = [{'type': 'dr', 'account_id': ref('account.a_pay'),}]
+    res['value']['line_dr_ids'][0]['amount'] = 450.0
+    vals['line_dr_ids'] = [(0,0,i) for i in res['value']['line_dr_ids']]
+    id = self.create(cr, uid, vals)
+    voucher = self.browse(cr, uid, id)
+    assert (voucher.state=='draft'), "Voucher is not in draft state"
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'account.voucher', voucher.id, 'proforma_voucher', cr)
+    assert (voucher.line_ids[0].supplier_invoice_number == '2013/003864'), 'wrong supplier_invoice_number'
+-
+  Finally i will Confirm the state of the invoice is paid
+-
+  !assert {model: account.invoice, id: account_invoice_0}:
+    - state == 'paid'
 
=== added file 'account_voucher_supplier_invoice_number/voucher.py'
--- account_voucher_supplier_invoice_number/voucher.py	1970-01-01 00:00:00 +0000
+++ account_voucher_supplier_invoice_number/voucher.py	2013-05-31 08:44:26 +0000
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2013 Agile Business Group sagl
+#    (<http://www.agilebg.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import fields, orm
+from tools.translate import _
+
+class voucher_line(orm.Model):
+    _inherit = 'account.voucher.line'
+    
+    def get_suppl_inv_num(self, cr, uid, move_line_id, context=None):
+        move_line = self.pool.get('account.move.line').browse(cr, uid, move_line_id, context)
+        return (move_line.invoice and move_line.invoice.supplier_invoice_number or '')
+    
+    def _get_supplier_invoice_number(self, cr, uid, ids, name, args, context=None):
+        res={}
+        for line in self.browse(cr, uid, ids, context):
+            res[line.id] = ''
+            if line.move_line_id:
+                res[line.id] = self.get_suppl_inv_num(cr, uid,
+                    line.move_line_id.id, context=context)
+        return res
+    
+    _columns = {
+        'supplier_invoice_number': fields.function(_get_supplier_invoice_number,
+            type='char', size=64, string="Supplier Invoice Number"),
+        }
+
+class voucher(orm.Model):
+    _inherit = 'account.voucher'
+    
+    def recompute_voucher_lines(self, cr, uid, ids, partner_id, journal_id, price,
+        currency_id, ttype, date, context=None):
+        res = super(voucher,self).recompute_voucher_lines(cr, uid, ids, partner_id,
+            journal_id, price,
+            currency_id, ttype, date, context=context)
+        line_obj = self.pool.get('account.voucher.line')
+        if res.get('value') and res['value'].get('line_cr_ids'):
+            for vals in res['value']['line_cr_ids']:
+                if vals.get('move_line_id'):
+                    vals['supplier_invoice_number'] = line_obj.get_suppl_inv_num(
+                        cr, uid, vals['move_line_id'], context=context)
+        if res.get('value') and res['value'].get('line_dr_ids'):
+            for vals in res['value']['line_dr_ids']:
+                if vals.get('move_line_id'):
+                    vals['supplier_invoice_number'] = line_obj.get_suppl_inv_num(
+                        cr, uid, vals['move_line_id'], context=context)
+        return res
 
=== added file 'account_voucher_supplier_invoice_number/voucher_view.xml'
--- account_voucher_supplier_invoice_number/voucher_view.xml	1970-01-01 00:00:00 +0000
+++ account_voucher_supplier_invoice_number/voucher_view.xml	2013-05-31 08:44:26 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+        <!-- Supplier Payment -->
+        <record model="ir.ui.view" id="view_vendor_payment_form">
+            <field name="name">account.voucher.payment.form</field>
+            <field name="model">account.voucher</field>
+            <field name="inherit_id" ref="account_voucher.view_vendor_payment_form"></field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_dr_ids']/tree/field[@name='move_line_id']" position="after">
+                    <field name="supplier_invoice_number" />
+                </xpath>
+                <xpath expr="/form/sheet/notebook/page/field[@name='line_cr_ids']/tree/field[@name='move_line_id']" position="after">
+                    <field name="supplier_invoice_number" />
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>