From dab31d0989b1320aa08a1d876f4a9c4c5cb1c7b6 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Wed, 5 Jun 2013 17:44:55 +0200
Subject: [PATCH 1/9] [ADD] Boilerplate

---
 account_banking_aggregate_payment/__init__.py |  1 +
 .../__openerp__.py                            | 38 +++++++++++++++++++
 .../data/payment_mode_type.xml                | 37 ++++++++++++++++++
 .../model/payment_mode.py                     | 34 +++++++++++++++++
 .../view/payment_mode.xml                     | 25 ++++++++++++
 5 files changed, 135 insertions(+)
 create mode 100644 account_banking_aggregate_payment/__init__.py
 create mode 100644 account_banking_aggregate_payment/__openerp__.py
 create mode 100644 account_banking_aggregate_payment/data/payment_mode_type.xml
 create mode 100644 account_banking_aggregate_payment/model/payment_mode.py
 create mode 100644 account_banking_aggregate_payment/view/payment_mode.xml

diff --git a/account_banking_aggregate_payment/__init__.py b/account_banking_aggregate_payment/__init__.py
new file mode 100644
index 000000000..16e8b082f
--- /dev/null
+++ b/account_banking_aggregate_payment/__init__.py
@@ -0,0 +1 @@
+import model
diff --git a/account_banking_aggregate_payment/__openerp__.py b/account_banking_aggregate_payment/__openerp__.py
new file mode 100644
index 000000000..1d0a2513e
--- /dev/null
+++ b/account_banking_aggregate_payment/__openerp__.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2013 Therp BV (<http://therp.nl>).
+#
+#    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': 'Account Banking Aggregate Payment',
+    'version': '0.1.136',
+    'license': 'GPL-3',
+    'author': 'Therp BV',
+    'website': 'https://launchpad.net/banking-addons',
+    'category': 'Banking addons',
+    'depends': ['account_banking'],
+    'data': [
+        'view/payment_mode.xml',
+        'data/payment_mode_type.xml',
+        ],
+    },
+    'description': '''
+    Allows for aggregating several payments on a single partner 
+    ''',
+    'active': False,
+}
diff --git a/account_banking_aggregate_payment/data/payment_mode_type.xml b/account_banking_aggregate_payment/data/payment_mode_type.xml
new file mode 100644
index 000000000..945621a49
--- /dev/null
+++ b/account_banking_aggregate_payment/data/payment_mode_type.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="payment.mode.type"
+                id="type_all">
+            <field name="name">Aggregate payment order for all accounts</field>
+            <field name="code">AGG_ALL</field>
+            <field name="suitable_bank_types"
+                   eval="[(6, 0, (ref('base_iban.bank_iban'),
+                                  ref('base.bank_normal')))]" />
+	    <field name="ir_model_id"
+                   ref="model_banking_export_aggregate"/>
+        </record>
+
+        <record model="payment.mode.type"
+                id="type_iban">
+            <field name="name">Aggregate payment order for IBAN accounts</field>
+            <field name="code">AGG_IBAN</field>
+            <field name="suitable_bank_types"
+                   eval="[(6, 0, (ref('base_iban.bank_iban')))]" />
+	    <field name="ir_model_id"
+                   ref="model_banking_export_aggregate"/>
+        </record>
+
+        <record model="payment.mode.type"
+                id="type_dmst">
+            <field name="name">Aggregate payment order for domestic accounts</field>
+            <field name="code">AGG_DMST</field>
+            <field name="suitable_bank_types"
+                   eval="[(6, 0, (ref('base.bank_normal')))]" />
+	    <field name="ir_model_id"
+                   ref="model_banking_export_aggregate"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/account_banking_aggregate_payment/model/payment_mode.py b/account_banking_aggregate_payment/model/payment_mode.py
new file mode 100644
index 000000000..cb7ae692c
--- /dev/null
+++ b/account_banking_aggregate_payment/model/payment_mode.py
@@ -0,0 +1,34 @@
+o# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2013 Therp BV (<http://therp.nl>).
+#
+#    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 orm, fields
+
+
+class payment_mode(orm.Model):
+    _inherit = "payment.mode"
+    _columns = {
+        'aggregate_partner_id': fields.many2one(
+            'res.partner', 'Aggregate partner id',
+            ),
+        'chained_mode_id': fields.many2one(
+            'payment.mode', 'Chained payment mode'),
+        }
+
diff --git a/account_banking_aggregate_payment/view/payment_mode.xml b/account_banking_aggregate_payment/view/payment_mode.xml
new file mode 100644
index 000000000..5871a2b36
--- /dev/null
+++ b/account_banking_aggregate_payment/view/payment_mode.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_payment_mode_form" model="ir.ui.view">
+            <field name="name">Adaptations for aggregate payment modes</field>
+            <field name="model">payment.mode</field>
+            <field name="inherit_id"
+                   ref="account_payment.view_payment_mode_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="type" position="after">
+                    <group attributes="{'invisible': [
+                        ('type', 'not in', (
+                            %('account_banking_aggregate_payment.type_iban')d,
+                            %('account_banking_aggregate_payment.type_all')d,
+                            %('account_banking_aggregate_payment.type_dmst')d
+                            ))]}">
+                        <field name="aggregate_partner_id" />
+                        <field name="chained_mode_id" />
+                    </group>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

From 4cbf57ffae557f64b5312ccf623ce6020a893e03 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Wed, 5 Jun 2013 19:46:26 +0200
Subject: [PATCH 2/9] [ADD] Full move creation and reconciliation

---
 .../model/export_aggregate.py                 | 236 ++++++++++++++++++
 .../model/payment_mode.py                     |   2 +-
 2 files changed, 237 insertions(+), 1 deletion(-)
 create mode 100644 account_banking_aggregate_payment/model/export_aggregate.py

diff --git a/account_banking_aggregate_payment/model/export_aggregate.py b/account_banking_aggregate_payment/model/export_aggregate.py
new file mode 100644
index 000000000..fb77f105d
--- /dev/null
+++ b/account_banking_aggregate_payment/model/export_aggregate.py
@@ -0,0 +1,236 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    This module copyright (C) 2013 Therp BV (<http://therp.nl>).
+#
+#    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 orm, fields
+from openerp.tools.translate import _
+from openerp import netsvc
+
+class banking_export_aggregate(orm.TransientModel):
+    _name = 'banking.export.aggregate'
+    _columns = {
+        'payment_order_id': fields.many2one(
+            'payment.order', 'Payment order'),
+        'reference': fields.char(
+            'Reference', size=24),
+        }
+
+    def reconcile_lines(self, cr, uid, move_line_ids, context=None):
+        """
+        Reconcile move lines lines, really. Talk about core functionality
+        """
+        reconcile_obj = self.pool.get('account.move.reconcile')
+        account_move_line_obj = self.pool.get('account.move.line')
+        currency_obj = self.pool.get('res.currency')
+        lines = account_move_line_obj.browse(cr, uid, move_line_ids, context=context)
+
+        for line in lines[1:]:
+            if line.account_id != lines[0].account_id:
+                raise orm.except_orm(
+                    _('Error'),
+                    _('Cannot reconcile between different accounts'))
+
+        if any(lines, 
+               lambda line: line.reconcile_id and line.reconcile_id.line_id):
+            raise orm.except_orm(
+                _('Error'),
+                _('Line is already fully reconciled'))
+            
+        currency = lines[0].company_id.currency_id
+
+        partials = []
+        line_ids = []
+        for line in lines:
+            if line.id not in line_ids:
+                line_ids.append(line.id)
+            if line.reconcile_partial_id:
+                line_ids += line.reconcile_partial_id.line_partial_ids
+                if line.reconcile_partial_id.id not in partials:
+                    partials.append(line.reconcile_partial_id.id)
+
+        total = account_move_line_obj.get_balance(cr, uid, line_ids)
+        is_zero = currency_obj.is_zero(cr, uid, currency, total)
+
+        vals = {
+            'type': 'auto',
+            'line_id': is_zero and [(6, 0, line_ids)] or [(6, 0, [])],
+            'line_partial_ids': is_zero and [(6, 0, [])] or [(6, 0, line_ids)],
+            }
+
+        if partials:
+            if len(partials) > 1:
+                reconcile_obj.unlink(
+                    cr, uid, partials[1:], context=context)
+            reconcile_obj.write(
+                cr, uid, partials[0],
+                vals, context=context)
+        else:
+            reconcile_obj.create(
+                cr, uid, vals, context=context)
+
+        for line_id in line_ids:
+            netsvc.LocalService("workflow").trg_trigger(
+                uid, 'account.move.line', line_id, cr)
+        return True
+
+    def create_aggregate_order(self, cr, uid, ids, context=None):
+        wiz = self.browse(cr, uid, ids[0], context=context)
+        account_move_line_obj = self.pool.get('account.move.line')
+        account_move_obj = self.pool.get('account.move')
+        payment_order_obj = self.pool.get('payment.order')
+        payment_order_line_obj = self.pool.get('payment.order.line')
+        payment_order_ids = context.get('active_ids', [])
+        if not payment_order_ids:
+            raise orm.except_orm(
+                _('Error'),
+                _('Please select a payment order'))
+        if len(payment_order_ids) > 1:
+            raise orm.except_orm(
+                _('Error'),
+                _('This operation can only be performed on a single payment order'))
+        order = payment_order_obj.browse(
+            cr, uid, payment_order_ids[0], context=context)
+        if not (order.mode.transfer_journal_id and
+                order.mode.transfer_account_id):
+            raise orm.except_orm(
+                _('Error'),
+                _('Transfer journal or account are not filled '
+                  'in on the payment mode'))
+
+        move_id = account_move_obj.create(cr, uid, {
+                'journal_id': order.mode.transfer_journal_id.id,
+                'name': 'Aggregate Payment Order', # TODO: get order reference or number
+                'reference': 'AGG', # TODO get order reference number or number
+                }, context=context)
+
+        counter_move_line_ids = []
+        for line in order.line_ids:
+            # basic checks
+            if not line.move_line_id:
+                raise orm.except_orm(
+                    _('Error'),
+                    _('No move line provided for line %s') % line.name)
+            if line.move_line_id.reconcile_id:
+                raise orm.except_orm(
+                    _('Error'),
+                    _('Move line %s has already been paid/reconciled') % 
+                    line.move_line_id.name
+                    )
+
+            # TODO: take multicurrency into account
+            
+            # create the move line on the transfer account
+            vals = {
+                'name': 'Aggregate payment for %s' % (
+                    line.move_line_id.invoice and 
+                    line.move_line_id.invoice.number or 
+                    line.move_line_id.name),
+                'move_id': move_id,
+                'partner_id': line.partner_id and line.partner_id.id or False,
+                'account_id': order.mode.transfer_account_id.id,
+                'credit': line.amount,
+                'debit': 0.0,
+                'date': fields.date.context_today(self, cr, uid, context=context),
+                }
+            counter_move_line_id = account_move_line_obj.create(
+                cr, uid, vals, context=context)
+            counter_move_line_ids.append(counter_move_line_id)
+
+            # create the debit move line on the receivable account
+            vals.update({
+                    'account_id': line.move_line_id.account_id.id,
+                    'credit': 0.0,
+                    'debit': line.amount,
+                    })               
+            reconcile_move_line_id = account_move_line_obj.create(
+                cr, uid, vals, context=context)
+                
+            self.reconcile_lines(
+                cr, uid, [reconcile_move_line_id, counter_move_line_id],
+                context=context)
+
+        total = account_move_line_obj.get_balance(
+            cr, uid, counter_move_line_ids)
+
+        vals = {
+            'name': 'Aggregate payment for %s' % (
+                line.move_line_id.invoice and 
+                line.move_line_id.invoice.number or 
+                line.move_line_id.name),
+            'move_id': move_id,
+            'partner_id': order.mode.aggregate_partner_id.id,
+            'account_id': order.mode.transfer_account_id.id,
+            'credit': 0.0,
+            'debit': total,
+            'date': fields.date.context_today(self, cr, uid, context=context),
+            }
+        aggregate_move_line_id = account_move_line_obj.create(
+            cr, uid, vals, context=context)
+
+        self.reconcile_lines(
+            cr, uid, counter_move_line_ids + [aggregate_move_line_id],
+            context=context)
+
+        # create the credit move line on the aggregate partner
+        vals.update({
+                'account_id': order.mode.aggregate_partner_id.property_account_payable.id,
+                'partner_id': order.mode.aggregate_partner_id.id,
+                'credit': total,
+                'debit': 0.0,
+                })               
+
+        payable_move_line = account_move_line_obj.browse(
+            cr, uid,
+            account_move_line_obj.create(
+                cr, uid, vals, context=context),
+            context=context)
+
+        account_move_obj.post(cr, uid, [move_id], context=context)
+
+        wf_service = netsvc.LocalService('workflow')
+        wf_service.trg_validate(uid, 'payment.order', order.id, 'sent', cr)
+        wf_service.trg_validate(uid, 'payment.order', order.id, 'done', cr)
+        order.refresh()
+        if order.state != 'done':
+            raise orm.except_orm(
+                _('Error'),
+                _('Payment order workflow does not go into state "done"'))
+
+        payment_order_id = payment_order_obj.create(
+            cr, uid, {
+                'company_id': order.company_id.id,
+                'mode': order.mode.aggregate_mode_id.id,
+                }, context=context)
+
+        payment_order_line_obj.create(cr, uid,{
+                'move_line_id': payable_move_line.id,
+                'amount_currency': payable_move_line.amount_to_pay,
+                'bank_id': line2bank.get(line.id), # TODO line2bank get it from account_banking
+                'order_id': payment_order_id,
+                'partner_id': order.mode.aggregate_partner_id.id,
+                'communication': False,
+                'communication2': payable_move_line.ref,
+                'state': 'normal',
+                'date': False,
+                'currency': (line.journal_id.currency.id or
+                             line.journal_id.company_id.currency_id.id),
+                }, context=context)
+
+        return ### act_window to payment order{'type': 'ir.actions.act_window_close'}
diff --git a/account_banking_aggregate_payment/model/payment_mode.py b/account_banking_aggregate_payment/model/payment_mode.py
index cb7ae692c..dc4bf21e8 100644
--- a/account_banking_aggregate_payment/model/payment_mode.py
+++ b/account_banking_aggregate_payment/model/payment_mode.py
@@ -1,4 +1,4 @@
-o# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution

From 9d03729edf9d7763069d765e9c20d8a87e75b43d Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Thu, 6 Jun 2013 22:57:50 +0200
Subject: [PATCH 3/9] [ADD] Finish core code and views

---
 .../__openerp__.py                            |  6 ++-
 .../model/__init__.py                         |  2 +
 .../model/export_aggregate.py                 | 41 ++++++++++++++++---
 .../view/export_aggregate.xml                 | 24 +++++++++++
 4 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 account_banking_aggregate_payment/model/__init__.py
 create mode 100644 account_banking_aggregate_payment/view/export_aggregate.xml

diff --git a/account_banking_aggregate_payment/__openerp__.py b/account_banking_aggregate_payment/__openerp__.py
index 1d0a2513e..65ff1b329 100644
--- a/account_banking_aggregate_payment/__openerp__.py
+++ b/account_banking_aggregate_payment/__openerp__.py
@@ -28,11 +28,15 @@
     'depends': ['account_banking'],
     'data': [
         'view/payment_mode.xml',
+        'view/export_aggregate.xml',
         'data/payment_mode_type.xml',
         ],
     },
     'description': '''
-    Allows for aggregating several payments on a single partner 
+    Allows for aggregating several payments on a single partner by
+    reconciling the payment lines in a payment order of this type
+    with a single line on the partner, then proceeds to create a new
+    order of a user chosen type with only this line in it.
     ''',
     'active': False,
 }
diff --git a/account_banking_aggregate_payment/model/__init__.py b/account_banking_aggregate_payment/model/__init__.py
new file mode 100644
index 000000000..94bbdd9f5
--- /dev/null
+++ b/account_banking_aggregate_payment/model/__init__.py
@@ -0,0 +1,2 @@
+import payment_mode
+import export_aggregate
diff --git a/account_banking_aggregate_payment/model/export_aggregate.py b/account_banking_aggregate_payment/model/export_aggregate.py
index fb77f105d..4454a344c 100644
--- a/account_banking_aggregate_payment/model/export_aggregate.py
+++ b/account_banking_aggregate_payment/model/export_aggregate.py
@@ -27,11 +27,28 @@ class banking_export_aggregate(orm.TransientModel):
     _name = 'banking.export.aggregate'
     _columns = {
         'payment_order_id': fields.many2one(
-            'payment.order', 'Payment order'),
+            'payment.order', 'Payment order',
+            required=True),
         'reference': fields.char(
             'Reference', size=24),
         }
 
+    def create(self, cr, uid, vals, context=None):
+        if context is None:
+            context = {}
+        if not vals.get('payment_order_id'):
+            if not context.get('active_ids'):
+                raise orm.except_orm(
+                    _('Error'),
+                    _('Please select a payment order'))
+            if len(context['active_ids']) > 1:
+                raise orm.except_orm(
+                    _('Error'),
+                    _('Please only select a single payment order'))
+            vals['payment_order_id'] = context['active_ids'][0]
+        return self.create(
+            cr, uid, vals, context=context)
+
     def reconcile_lines(self, cr, uid, move_line_ids, context=None):
         """
         Reconcile move lines lines, really. Talk about core functionality
@@ -116,8 +133,8 @@ class banking_export_aggregate(orm.TransientModel):
 
         move_id = account_move_obj.create(cr, uid, {
                 'journal_id': order.mode.transfer_journal_id.id,
-                'name': 'Aggregate Payment Order', # TODO: get order reference or number
-                'reference': 'AGG', # TODO get order reference number or number
+                'name': 'Aggregate Payment Order %s' % order.reference,
+                'reference': order.reference,
                 }, context=context)
 
         counter_move_line_ids = []
@@ -219,10 +236,13 @@ class banking_export_aggregate(orm.TransientModel):
                 'mode': order.mode.aggregate_mode_id.id,
                 }, context=context)
 
+        lines2bank = payment_order_line_obj.line2bank(
+            cr, uid, [payable_move_line.id], order.mode.id, context)
+
         payment_order_line_obj.create(cr, uid,{
                 'move_line_id': payable_move_line.id,
                 'amount_currency': payable_move_line.amount_to_pay,
-                'bank_id': line2bank.get(line.id), # TODO line2bank get it from account_banking
+                'bank_id': lines2bank.get(payable_move_line.id),
                 'order_id': payment_order_id,
                 'partner_id': order.mode.aggregate_partner_id.id,
                 'communication': False,
@@ -233,4 +253,15 @@ class banking_export_aggregate(orm.TransientModel):
                              line.journal_id.company_id.currency_id.id),
                 }, context=context)
 
-        return ### act_window to payment order{'type': 'ir.actions.act_window_close'}
+        return {
+            'name': payment_order_obj._description,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': payment_order_obj._name,
+            'domain': [],
+            'context': context,
+            'type': 'ir.actions.act_window',
+            'target': 'current',
+            'res_id': payment_order_id,
+            'nodestroy': True,
+            }
diff --git a/account_banking_aggregate_payment/view/export_aggregate.xml b/account_banking_aggregate_payment/view/export_aggregate.xml
new file mode 100644
index 000000000..9a0a16be7
--- /dev/null
+++ b/account_banking_aggregate_payment/view/export_aggregate.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="banking_export_aggregate_view" model="ir.ui.view">
+            <field name="name">Export aggregate payment order</field>
+            <field name="model">banking.export.aggregate</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Export aggregate payment order">
+                    <label string="Please confirm this aggregate export"/>
+                    <button icon="gtk-close"
+                            special="cancel"
+                            string="Cancel"
+                            />
+                    <button icon="gtk-ok"
+                            string="Create" 
+                            name="create_aggregate_order"
+                            type="object"
+                            />
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>

From 6ddabb84d76183cfce3d2d213615cd5d840253df Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Thu, 6 Jun 2013 23:22:37 +0200
Subject: [PATCH 4/9] [FIX] Module installation fixes

---
 account_banking_aggregate_payment/__openerp__.py          | 5 ++---
 .../data/payment_mode_type.xml                            | 4 ++--
 account_banking_aggregate_payment/view/payment_mode.xml   | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/account_banking_aggregate_payment/__openerp__.py b/account_banking_aggregate_payment/__openerp__.py
index 65ff1b329..7fd9d7616 100644
--- a/account_banking_aggregate_payment/__openerp__.py
+++ b/account_banking_aggregate_payment/__openerp__.py
@@ -25,13 +25,12 @@
     'author': 'Therp BV',
     'website': 'https://launchpad.net/banking-addons',
     'category': 'Banking addons',
-    'depends': ['account_banking'],
+    'depends': ['account_direct_debit'],
     'data': [
+        'data/payment_mode_type.xml',
         'view/payment_mode.xml',
         'view/export_aggregate.xml',
-        'data/payment_mode_type.xml',
         ],
-    },
     'description': '''
     Allows for aggregating several payments on a single partner by
     reconciling the payment lines in a payment order of this type
diff --git a/account_banking_aggregate_payment/data/payment_mode_type.xml b/account_banking_aggregate_payment/data/payment_mode_type.xml
index 945621a49..793aab521 100644
--- a/account_banking_aggregate_payment/data/payment_mode_type.xml
+++ b/account_banking_aggregate_payment/data/payment_mode_type.xml
@@ -18,7 +18,7 @@
             <field name="name">Aggregate payment order for IBAN accounts</field>
             <field name="code">AGG_IBAN</field>
             <field name="suitable_bank_types"
-                   eval="[(6, 0, (ref('base_iban.bank_iban')))]" />
+                   eval="[(6, 0, (ref('base_iban.bank_iban'),))]" />
 	    <field name="ir_model_id"
                    ref="model_banking_export_aggregate"/>
         </record>
@@ -28,7 +28,7 @@
             <field name="name">Aggregate payment order for domestic accounts</field>
             <field name="code">AGG_DMST</field>
             <field name="suitable_bank_types"
-                   eval="[(6, 0, (ref('base.bank_normal')))]" />
+                   eval="[(6, 0, (ref('base.bank_normal'),))]" />
 	    <field name="ir_model_id"
                    ref="model_banking_export_aggregate"/>
         </record>
diff --git a/account_banking_aggregate_payment/view/payment_mode.xml b/account_banking_aggregate_payment/view/payment_mode.xml
index 5871a2b36..ec5ae8022 100644
--- a/account_banking_aggregate_payment/view/payment_mode.xml
+++ b/account_banking_aggregate_payment/view/payment_mode.xml
@@ -9,11 +9,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="type" position="after">
-                    <group attributes="{'invisible': [
+                    <group attrs="{'invisible': [
                         ('type', 'not in', (
-                            %('account_banking_aggregate_payment.type_iban')d,
-                            %('account_banking_aggregate_payment.type_all')d,
-                            %('account_banking_aggregate_payment.type_dmst')d
+                            %(account_banking_aggregate_payment.type_iban)d,
+                            %(account_banking_aggregate_payment.type_all)d,
+                            %(account_banking_aggregate_payment.type_dmst)d
                             ))]}">
                         <field name="aggregate_partner_id" />
                         <field name="chained_mode_id" />

From 6b949ba5585016195fb704ecac78ec791cb3127a Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Fri, 7 Jun 2013 00:09:50 +0200
Subject: [PATCH 5/9] [FIX] Fixes from testing

---
 .../model/export_aggregate.py                 | 33 ++++++++++---------
 .../view/payment_mode.xml                     |  5 +--
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/account_banking_aggregate_payment/model/export_aggregate.py b/account_banking_aggregate_payment/model/export_aggregate.py
index 4454a344c..bc69c541b 100644
--- a/account_banking_aggregate_payment/model/export_aggregate.py
+++ b/account_banking_aggregate_payment/model/export_aggregate.py
@@ -46,7 +46,7 @@ class banking_export_aggregate(orm.TransientModel):
                     _('Error'),
                     _('Please only select a single payment order'))
             vals['payment_order_id'] = context['active_ids'][0]
-        return self.create(
+        return super(banking_export_aggregate, self).create(
             cr, uid, vals, context=context)
 
     def reconcile_lines(self, cr, uid, move_line_ids, context=None):
@@ -64,8 +64,8 @@ class banking_export_aggregate(orm.TransientModel):
                     _('Error'),
                     _('Cannot reconcile between different accounts'))
 
-        if any(lines, 
-               lambda line: line.reconcile_id and line.reconcile_id.line_id):
+        if any([line.reconcile_id and line.reconcile_id.line_id
+                for line in lines]):
             raise orm.except_orm(
                 _('Error'),
                 _('Line is already fully reconciled'))
@@ -112,7 +112,7 @@ class banking_export_aggregate(orm.TransientModel):
         account_move_line_obj = self.pool.get('account.move.line')
         account_move_obj = self.pool.get('account.move')
         payment_order_obj = self.pool.get('payment.order')
-        payment_order_line_obj = self.pool.get('payment.order.line')
+        payment_order_line_obj = self.pool.get('payment.line')
         payment_order_ids = context.get('active_ids', [])
         if not payment_order_ids:
             raise orm.except_orm(
@@ -180,7 +180,7 @@ class banking_export_aggregate(orm.TransientModel):
                 cr, uid, vals, context=context)
                 
             self.reconcile_lines(
-                cr, uid, [reconcile_move_line_id, counter_move_line_id],
+                cr, uid, [reconcile_move_line_id, line.move_line_id.id],
                 context=context)
 
         total = account_move_line_obj.get_balance(
@@ -194,8 +194,8 @@ class banking_export_aggregate(orm.TransientModel):
             'move_id': move_id,
             'partner_id': order.mode.aggregate_partner_id.id,
             'account_id': order.mode.transfer_account_id.id,
-            'credit': 0.0,
-            'debit': total,
+            'debit': total < 0 and -total or 0.0,
+            'credit': total >= 0 and total or 0.0,
             'date': fields.date.context_today(self, cr, uid, context=context),
             }
         aggregate_move_line_id = account_move_line_obj.create(
@@ -209,8 +209,8 @@ class banking_export_aggregate(orm.TransientModel):
         vals.update({
                 'account_id': order.mode.aggregate_partner_id.property_account_payable.id,
                 'partner_id': order.mode.aggregate_partner_id.id,
-                'credit': total,
-                'debit': 0.0,
+                'debit': total >= 0 and total or 0.0,
+                'credit': total < 0 and -total or 0.0,
                 })               
 
         payable_move_line = account_move_line_obj.browse(
@@ -233,10 +233,10 @@ class banking_export_aggregate(orm.TransientModel):
         payment_order_id = payment_order_obj.create(
             cr, uid, {
                 'company_id': order.company_id.id,
-                'mode': order.mode.aggregate_mode_id.id,
+                'mode': order.mode.chained_mode_id.id,
                 }, context=context)
 
-        lines2bank = payment_order_line_obj.line2bank(
+        lines2bank = account_move_line_obj.line2bank(
             cr, uid, [payable_move_line.id], order.mode.id, context)
 
         payment_order_line_obj.create(cr, uid,{
@@ -245,12 +245,13 @@ class banking_export_aggregate(orm.TransientModel):
                 'bank_id': lines2bank.get(payable_move_line.id),
                 'order_id': payment_order_id,
                 'partner_id': order.mode.aggregate_partner_id.id,
-                'communication': False,
-                'communication2': payable_move_line.ref,
-                'state': 'normal',
+                'communication': payable_move_line.ref,
+                'communication2': False,
+                'state': 'structured',
                 'date': False,
-                'currency': (line.journal_id.currency.id or
-                             line.journal_id.company_id.currency_id.id),
+                'currency': (
+                    line.move_line_id.journal_id.currency.id or
+                    line.move_line_id.journal_id.company_id.currency_id.id),
                 }, context=context)
 
         return {
diff --git a/account_banking_aggregate_payment/view/payment_mode.xml b/account_banking_aggregate_payment/view/payment_mode.xml
index ec5ae8022..8504027b3 100644
--- a/account_banking_aggregate_payment/view/payment_mode.xml
+++ b/account_banking_aggregate_payment/view/payment_mode.xml
@@ -5,11 +5,12 @@
             <field name="name">Adaptations for aggregate payment modes</field>
             <field name="model">payment.mode</field>
             <field name="inherit_id"
-                   ref="account_payment.view_payment_mode_form"/>
+                   ref="account_banking.view_payment_mode_form_inherit"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="type" position="after">
-                    <group attrs="{'invisible': [
+                    <group colspan="4" string="Chaining order"
+                           attrs="{'invisible': [
                         ('type', 'not in', (
                             %(account_banking_aggregate_payment.type_iban)d,
                             %(account_banking_aggregate_payment.type_all)d,

From 478eee5206c10b435ac4b66acc7ca6c676be1ed4 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Thu, 13 Jun 2013 20:40:03 +0200
Subject: [PATCH 6/9] [IMP] Usability

---
 .../data/payment_mode_type.xml                | 27 ++---------
 .../model/export_aggregate.py                 | 29 ++++++-----
 .../model/payment_mode.py                     |  7 +--
 .../view/payment_mode.xml                     | 48 ++++++++++++++-----
 4 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/account_banking_aggregate_payment/data/payment_mode_type.xml b/account_banking_aggregate_payment/data/payment_mode_type.xml
index 793aab521..564b9744c 100644
--- a/account_banking_aggregate_payment/data/payment_mode_type.xml
+++ b/account_banking_aggregate_payment/data/payment_mode_type.xml
@@ -3,35 +3,14 @@
     <data>
 
         <record model="payment.mode.type"
-                id="type_all">
-            <field name="name">Aggregate payment order for all accounts</field>
-            <field name="code">AGG_ALL</field>
+                id="type_aggregate">
+            <field name="name">Aggregate payment order</field>
+            <field name="code">AGGR</field>
             <field name="suitable_bank_types"
                    eval="[(6, 0, (ref('base_iban.bank_iban'),
                                   ref('base.bank_normal')))]" />
 	    <field name="ir_model_id"
                    ref="model_banking_export_aggregate"/>
         </record>
-
-        <record model="payment.mode.type"
-                id="type_iban">
-            <field name="name">Aggregate payment order for IBAN accounts</field>
-            <field name="code">AGG_IBAN</field>
-            <field name="suitable_bank_types"
-                   eval="[(6, 0, (ref('base_iban.bank_iban'),))]" />
-	    <field name="ir_model_id"
-                   ref="model_banking_export_aggregate"/>
-        </record>
-
-        <record model="payment.mode.type"
-                id="type_dmst">
-            <field name="name">Aggregate payment order for domestic accounts</field>
-            <field name="code">AGG_DMST</field>
-            <field name="suitable_bank_types"
-                   eval="[(6, 0, (ref('base.bank_normal'),))]" />
-	    <field name="ir_model_id"
-                   ref="model_banking_export_aggregate"/>
-        </record>
-
     </data>
 </openerp>
diff --git a/account_banking_aggregate_payment/model/export_aggregate.py b/account_banking_aggregate_payment/model/export_aggregate.py
index bc69c541b..45c1cd8ef 100644
--- a/account_banking_aggregate_payment/model/export_aggregate.py
+++ b/account_banking_aggregate_payment/model/export_aggregate.py
@@ -23,6 +23,7 @@ from openerp.osv import orm, fields
 from openerp.tools.translate import _
 from openerp import netsvc
 
+
 class banking_export_aggregate(orm.TransientModel):
     _name = 'banking.export.aggregate'
     _columns = {
@@ -51,7 +52,7 @@ class banking_export_aggregate(orm.TransientModel):
 
     def reconcile_lines(self, cr, uid, move_line_ids, context=None):
         """
-        Reconcile move lines lines, really. Talk about core functionality
+        Reconcile move lines lines, really. ERP core functionality.
         """
         reconcile_obj = self.pool.get('account.move.reconcile')
         account_move_line_obj = self.pool.get('account.move.line')
@@ -121,15 +122,12 @@ class banking_export_aggregate(orm.TransientModel):
         if len(payment_order_ids) > 1:
             raise orm.except_orm(
                 _('Error'),
-                _('This operation can only be performed on a single payment order'))
+                _('This operation can only be performed on a single '
+                  'payment order'))
+
+        today = fields.date.context_today(self, cr, uid, context=context)
         order = payment_order_obj.browse(
             cr, uid, payment_order_ids[0], context=context)
-        if not (order.mode.transfer_journal_id and
-                order.mode.transfer_account_id):
-            raise orm.except_orm(
-                _('Error'),
-                _('Transfer journal or account are not filled '
-                  'in on the payment mode'))
 
         move_id = account_move_obj.create(cr, uid, {
                 'journal_id': order.mode.transfer_journal_id.id,
@@ -151,7 +149,7 @@ class banking_export_aggregate(orm.TransientModel):
                     line.move_line_id.name
                     )
 
-            # TODO: take multicurrency into account
+            # TODO: take multicurrency into account?
             
             # create the move line on the transfer account
             vals = {
@@ -164,7 +162,7 @@ class banking_export_aggregate(orm.TransientModel):
                 'account_id': order.mode.transfer_account_id.id,
                 'credit': line.amount,
                 'debit': 0.0,
-                'date': fields.date.context_today(self, cr, uid, context=context),
+                'date': today,
                 }
             counter_move_line_id = account_move_line_obj.create(
                 cr, uid, vals, context=context)
@@ -187,7 +185,7 @@ class banking_export_aggregate(orm.TransientModel):
             cr, uid, counter_move_line_ids)
 
         vals = {
-            'name': 'Aggregate payment for %s' % (
+            'name': _('Aggregate payment for %s') % (
                 line.move_line_id.invoice and 
                 line.move_line_id.invoice.number or 
                 line.move_line_id.name),
@@ -196,11 +194,13 @@ class banking_export_aggregate(orm.TransientModel):
             'account_id': order.mode.transfer_account_id.id,
             'debit': total < 0 and -total or 0.0,
             'credit': total >= 0 and total or 0.0,
-            'date': fields.date.context_today(self, cr, uid, context=context),
+            'date': today,
             }
         aggregate_move_line_id = account_move_line_obj.create(
             cr, uid, vals, context=context)
 
+        account_move_obj.post(cr, uid, [move_id], context=context)
+
         self.reconcile_lines(
             cr, uid, counter_move_line_ids + [aggregate_move_line_id],
             context=context)
@@ -219,7 +219,6 @@ class banking_export_aggregate(orm.TransientModel):
                 cr, uid, vals, context=context),
             context=context)
 
-        account_move_obj.post(cr, uid, [move_id], context=context)
 
         wf_service = netsvc.LocalService('workflow')
         wf_service.trg_validate(uid, 'payment.order', order.id, 'sent', cr)
@@ -245,10 +244,10 @@ class banking_export_aggregate(orm.TransientModel):
                 'bank_id': lines2bank.get(payable_move_line.id),
                 'order_id': payment_order_id,
                 'partner_id': order.mode.aggregate_partner_id.id,
-                'communication': payable_move_line.ref,
+                'communication': (payable_move_line.ref or '').replace('/', ''),
                 'communication2': False,
                 'state': 'structured',
-                'date': False,
+                'date': today,
                 'currency': (
                     line.move_line_id.journal_id.currency.id or
                     line.move_line_id.journal_id.company_id.currency_id.id),
diff --git a/account_banking_aggregate_payment/model/payment_mode.py b/account_banking_aggregate_payment/model/payment_mode.py
index dc4bf21e8..8ca89b604 100644
--- a/account_banking_aggregate_payment/model/payment_mode.py
+++ b/account_banking_aggregate_payment/model/payment_mode.py
@@ -26,9 +26,10 @@ class payment_mode(orm.Model):
     _inherit = "payment.mode"
     _columns = {
         'aggregate_partner_id': fields.many2one(
-            'res.partner', 'Aggregate partner id',
+            'res.partner', 'Aggregate payment beneficiary',
+            help="The single partner on the chained payment order",
             ),
         'chained_mode_id': fields.many2one(
-            'payment.mode', 'Chained payment mode'),
+            'payment.mode', 'Chained payment mode',
+            help="The payment type of the chained payment order"),
         }
-
diff --git a/account_banking_aggregate_payment/view/payment_mode.xml b/account_banking_aggregate_payment/view/payment_mode.xml
index 8504027b3..dafa1f7ff 100644
--- a/account_banking_aggregate_payment/view/payment_mode.xml
+++ b/account_banking_aggregate_payment/view/payment_mode.xml
@@ -5,21 +5,47 @@
             <field name="name">Adaptations for aggregate payment modes</field>
             <field name="model">payment.mode</field>
             <field name="inherit_id"
-                   ref="account_banking.view_payment_mode_form_inherit"/>
+                   ref="account_direct_debit.view_payment_mode_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <field name="type" position="after">
-                    <group colspan="4" string="Chaining order"
-                           attrs="{'invisible': [
-                        ('type', 'not in', (
-                            %(account_banking_aggregate_payment.type_iban)d,
-                            %(account_banking_aggregate_payment.type_all)d,
-                            %(account_banking_aggregate_payment.type_dmst)d
-                            ))]}">
-                        <field name="aggregate_partner_id" />
-                        <field name="chained_mode_id" />
+                <field name="payment_term_ids" position="after">
+                    <group colspan="2" col="2" string="Chaining order"
+                           attrs="{
+                           'invisible': [
+                                 ('type', '!=',
+                           %(account_banking_aggregate_payment.type_aggregate)d
+                           )]}">
+                        <field name="aggregate_partner_id"
+                               attrs="{'required': [
+                                 ('type', '=',
+                                 %(account_banking_aggregate_payment.type_aggregate)d
+                                 )]}"
+                               />
+                        <field name="chained_mode_id"
+                               attrs="{'required': [
+                                 ('type', '=',
+                                 %(account_banking_aggregate_payment.type_aggregate)d
+                                 )]}"
+                               />
                     </group>
                 </field>
+
+                <field name="transfer_account_id" position="attributes">
+                       <attribute name="attrs">{
+                              'required': [
+                                  ('type', '=',
+                            %(account_banking_aggregate_payment.type_aggregate)d
+                            )]}</attribute>
+                </field>
+
+                <field name="transfer_journal_id" position="attributes">
+                       <attribute name="attrs">{
+                              'required': [
+                                  ('type', '=',
+                            %(account_banking_aggregate_payment.type_aggregate)d
+                            )]}</attribute>
+                </field>
+
             </field>
         </record>
     </data>

From b58d7e230a4044ea61a989502d81d3b8de2ff5b6 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Thu, 13 Jun 2013 21:19:08 +0200
Subject: [PATCH 7/9] [FIX] Clean up references in move lines and payment
 orders

---
 .../model/export_aggregate.py                 | 22 ++++++++--------
 .../view/export_aggregate.xml                 | 26 ++++++++++++-------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/account_banking_aggregate_payment/model/export_aggregate.py b/account_banking_aggregate_payment/model/export_aggregate.py
index 45c1cd8ef..8ae010ed6 100644
--- a/account_banking_aggregate_payment/model/export_aggregate.py
+++ b/account_banking_aggregate_payment/model/export_aggregate.py
@@ -131,8 +131,7 @@ class banking_export_aggregate(orm.TransientModel):
 
         move_id = account_move_obj.create(cr, uid, {
                 'journal_id': order.mode.transfer_journal_id.id,
-                'name': 'Aggregate Payment Order %s' % order.reference,
-                'reference': order.reference,
+                'ref': _('Aggregate Payment Order %s') % order.reference,
                 }, context=context)
 
         counter_move_line_ids = []
@@ -153,10 +152,10 @@ class banking_export_aggregate(orm.TransientModel):
             
             # create the move line on the transfer account
             vals = {
-                'name': 'Aggregate payment for %s' % (
+                'name': _('Transit %s') % (
                     line.move_line_id.invoice and 
                     line.move_line_id.invoice.number or 
-                    line.move_line_id.name),
+                    line.move_line_id.ref),
                 'move_id': move_id,
                 'partner_id': line.partner_id and line.partner_id.id or False,
                 'account_id': order.mode.transfer_account_id.id,
@@ -170,6 +169,10 @@ class banking_export_aggregate(orm.TransientModel):
 
             # create the debit move line on the receivable account
             vals.update({
+                    'name': _('Reconciliation %s') % (
+                        line.move_line_id.invoice and 
+                        line.move_line_id.invoice.number or 
+                        line.move_line_id.name),
                     'account_id': line.move_line_id.account_id.id,
                     'credit': 0.0,
                     'debit': line.amount,
@@ -185,10 +188,7 @@ class banking_export_aggregate(orm.TransientModel):
             cr, uid, counter_move_line_ids)
 
         vals = {
-            'name': _('Aggregate payment for %s') % (
-                line.move_line_id.invoice and 
-                line.move_line_id.invoice.number or 
-                line.move_line_id.name),
+            'name': _('Transit reconciliation'),
             'move_id': move_id,
             'partner_id': order.mode.aggregate_partner_id.id,
             'account_id': order.mode.transfer_account_id.id,
@@ -199,14 +199,13 @@ class banking_export_aggregate(orm.TransientModel):
         aggregate_move_line_id = account_move_line_obj.create(
             cr, uid, vals, context=context)
 
-        account_move_obj.post(cr, uid, [move_id], context=context)
-
         self.reconcile_lines(
             cr, uid, counter_move_line_ids + [aggregate_move_line_id],
             context=context)
 
         # create the credit move line on the aggregate partner
         vals.update({
+                'name': _('Amount payable'),
                 'account_id': order.mode.aggregate_partner_id.property_account_payable.id,
                 'partner_id': order.mode.aggregate_partner_id.id,
                 'debit': total >= 0 and total or 0.0,
@@ -219,6 +218,7 @@ class banking_export_aggregate(orm.TransientModel):
                 cr, uid, vals, context=context),
             context=context)
 
+        account_move_obj.post(cr, uid, [move_id], context=context)
 
         wf_service = netsvc.LocalService('workflow')
         wf_service.trg_validate(uid, 'payment.order', order.id, 'sent', cr)
@@ -244,7 +244,7 @@ class banking_export_aggregate(orm.TransientModel):
                 'bank_id': lines2bank.get(payable_move_line.id),
                 'order_id': payment_order_id,
                 'partner_id': order.mode.aggregate_partner_id.id,
-                'communication': (payable_move_line.ref or '').replace('/', ''),
+                'communication': order.reference.replace('/', ''),
                 'communication2': False,
                 'state': 'structured',
                 'date': today,
diff --git a/account_banking_aggregate_payment/view/export_aggregate.xml b/account_banking_aggregate_payment/view/export_aggregate.xml
index 9a0a16be7..3429db046 100644
--- a/account_banking_aggregate_payment/view/export_aggregate.xml
+++ b/account_banking_aggregate_payment/view/export_aggregate.xml
@@ -7,16 +7,22 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Export aggregate payment order">
-                    <label string="Please confirm this aggregate export"/>
-                    <button icon="gtk-close"
-                            special="cancel"
-                            string="Cancel"
-                            />
-                    <button icon="gtk-ok"
-                            string="Create" 
-                            name="create_aggregate_order"
-                            type="object"
-                            />
+                    <label string="When you confirm this order, the total
+                                   amount will be made payable to the partner
+                                   that has been set on the payment mode. A
+                                   new payment order will open in your screen
+                                   with this one payment."/>
+                    <group col="2" colspan="1">
+                        <button icon="gtk-close"
+                                special="cancel"
+                                string="Cancel"
+                                />
+                        <button icon="gtk-ok"
+                                string="Create" 
+                                name="create_aggregate_order"
+                                type="object"
+                                />
+                    </group>
                 </form>
             </field>
         </record>

From 7bfc51b2d57e9d0e181a0c974322c22a763dd8bf Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Thu, 13 Jun 2013 21:56:28 +0200
Subject: [PATCH 8/9] [IMP] Module description [ADD] Translation

---
 .../__openerp__.py                            |  16 +-
 .../data/payment_mode_type.xml                |   2 +-
 .../account_banking_aggregate_payment.pot     | 175 ++++++++++++++++++
 account_banking_aggregate_payment/i18n/nl.po  | 170 +++++++++++++++++
 .../model/export_aggregate.py                 |   5 +-
 .../view/payment_mode.xml                     |   2 +-
 6 files changed, 362 insertions(+), 8 deletions(-)
 create mode 100644 account_banking_aggregate_payment/i18n/account_banking_aggregate_payment.pot
 create mode 100644 account_banking_aggregate_payment/i18n/nl.po

diff --git a/account_banking_aggregate_payment/__openerp__.py b/account_banking_aggregate_payment/__openerp__.py
index 7fd9d7616..7c4253c6e 100644
--- a/account_banking_aggregate_payment/__openerp__.py
+++ b/account_banking_aggregate_payment/__openerp__.py
@@ -32,10 +32,18 @@
         'view/export_aggregate.xml',
         ],
     'description': '''
-    Allows for aggregating several payments on a single partner by
-    reconciling the payment lines in a payment order of this type
-    with a single line on the partner, then proceeds to create a new
-    order of a user chosen type with only this line in it.
+    This module allows for aggregating payments for various creditors
+    and making them payable to a single partner. This is practiced in
+    certain purchasing consortia.
+
+    After collection of the payable invoices on a payment order of type
+    'Aggregate payment', the move lines in the payment order are
+    reconciled by a move on a transit account, the total amount of which
+    is then transferred onto the designated partner's account payable
+    (upon confirmation of the aggregate payment order).
+
+    The payment order wizard then proceeds to create a new payment order
+    of a user chosen payment mode with only the aggregate move line in it.
     ''',
     'active': False,
 }
diff --git a/account_banking_aggregate_payment/data/payment_mode_type.xml b/account_banking_aggregate_payment/data/payment_mode_type.xml
index 564b9744c..cb0c2d4fd 100644
--- a/account_banking_aggregate_payment/data/payment_mode_type.xml
+++ b/account_banking_aggregate_payment/data/payment_mode_type.xml
@@ -4,7 +4,7 @@
 
         <record model="payment.mode.type"
                 id="type_aggregate">
-            <field name="name">Aggregate payment order</field>
+            <field name="name">Aggregate payment</field>
             <field name="code">AGGR</field>
             <field name="suitable_bank_types"
                    eval="[(6, 0, (ref('base_iban.bank_iban'),
diff --git a/account_banking_aggregate_payment/i18n/account_banking_aggregate_payment.pot b/account_banking_aggregate_payment/i18n/account_banking_aggregate_payment.pot
new file mode 100644
index 000000000..37a66c393
--- /dev/null
+++ b/account_banking_aggregate_payment/i18n/account_banking_aggregate_payment.pot
@@ -0,0 +1,175 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_banking_aggregate_payment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-13 19:35+0000\n"
+"PO-Revision-Date: 2013-06-13 19:35+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: account_banking_aggregate_payment
+#: view:payment.mode:0
+msgid "Aggregate payment"
+msgstr "Aggregate payment"
+
+#. module: account_banking_aggregate_payment
+#: view:banking.export.aggregate:0
+msgid "Create"
+msgstr "Create"
+
+#. module: account_banking_aggregate_payment
+#: help:payment.mode,aggregate_partner_id:0
+msgid "The single partner on the chained payment order"
+msgstr "The single partner on the chained payment order"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:134
+#, python-format
+msgid "Aggregate Payment Order %s"
+msgstr "Aggregate Payment Order %s"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:230
+#, python-format
+msgid "Payment order workflow does not go into state \"done\""
+msgstr "Payment order workflow does not go into state \"done\""
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:143
+#, python-format
+msgid "No move line provided for line %s"
+msgstr "No move line provided for line %s"
+
+#. module: account_banking_aggregate_payment
+#: model:ir.model,name:account_banking_aggregate_payment.model_payment_mode
+msgid "Payment Mode"
+msgstr "Payment Mode"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:48
+#, python-format
+msgid "Please only select a single payment order"
+msgstr "Please only select a single payment order"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:147
+#, python-format
+msgid "Move line %s has already been paid/reconciled"
+msgstr "Move line %s has already been paid/reconciled"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:44
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:121
+#, python-format
+msgid "Please select a payment order"
+msgstr "Please select a payment order"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:125
+#, python-format
+msgid "This operation can only be performed on a single payment order"
+msgstr "This operation can only be performed on a single payment order"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:155
+#, python-format
+msgid "Transit %s"
+msgstr "Transit %s"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:191
+#, python-format
+msgid "Transit reconciliation"
+msgstr "Transit reconciliation"
+
+#. module: account_banking_aggregate_payment
+#: view:banking.export.aggregate:0
+msgid "Export aggregate payment order"
+msgstr "Export aggregate payment order"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:208
+#, python-format
+msgid "Amount payable"
+msgstr "Amount payable"
+
+#. module: account_banking_aggregate_payment
+#: field:payment.mode,aggregate_partner_id:0
+msgid "Aggregate payment beneficiary"
+msgstr "Aggregate payment beneficiary"
+
+#. module: account_banking_aggregate_payment
+#: help:payment.mode,chained_mode_id:0
+msgid "The payment type of the chained payment order"
+msgstr "The payment type of the chained payment order"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:43
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:47
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:65
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:71
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:120
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:124
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:142
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:146
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:229
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: account_banking_aggregate_payment
+#: model:ir.model,name:account_banking_aggregate_payment.model_banking_export_aggregate
+msgid "Execute aggregate payment"
+msgstr "Execute aggregate payment"
+
+#. module: account_banking_aggregate_payment
+#: view:banking.export.aggregate:0
+msgid "When you confirm this order, the total                                    amount will be made payable to the partner                                    that has been set on the payment mode. A                                    new payment order will open in your screen                                    with this one payment."
+msgstr "When you confirm this order, the total                                    amount will be made payable to the partner                                    that has been set on the payment mode. A                                    new payment order will open in your screen                                    with this one payment."
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:172
+#, python-format
+msgid "Reconciliation %s"
+msgstr "Reconciliation %s"
+
+#. module: account_banking_aggregate_payment
+#: field:banking.export.aggregate,reference:0
+msgid "Reference"
+msgstr "Reference"
+
+#. module: account_banking_aggregate_payment
+#: field:banking.export.aggregate,payment_order_id:0
+msgid "Payment order"
+msgstr "Payment order"
+
+#. module: account_banking_aggregate_payment
+#: field:payment.mode,chained_mode_id:0
+msgid "Chained payment mode"
+msgstr "Chained payment mode"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:66
+#, python-format
+msgid "Cannot reconcile between different accounts"
+msgstr "Cannot reconcile between different accounts"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:72
+#, python-format
+msgid "Line is already fully reconciled"
+msgstr "Line is already fully reconciled"
+
+#. module: account_banking_aggregate_payment
+#: view:banking.export.aggregate:0
+msgid "Cancel"
+msgstr "Cancel"
+
diff --git a/account_banking_aggregate_payment/i18n/nl.po b/account_banking_aggregate_payment/i18n/nl.po
new file mode 100644
index 000000000..2e5c67431
--- /dev/null
+++ b/account_banking_aggregate_payment/i18n/nl.po
@@ -0,0 +1,170 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_banking_aggregate_payment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-13 19:35+0000\n"
+"PO-Revision-Date: 2013-06-13 19:35+0000\n"
+"Last-Translator: <stefan@therp.nl>\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: account_banking_aggregate_payment
+#: view:payment.mode:0
+msgid "Aggregate payment"
+msgstr "Verzamelbetaalopdracht"
+
+#. module: account_banking_aggregate_payment
+#: view:banking.export.aggregate:0
+msgid "Create"
+msgstr "Aanmaken"
+
+#. module: account_banking_aggregate_payment
+#: help:payment.mode,aggregate_partner_id:0
+msgid "The single partner on the chained payment order"
+msgstr "De relatie die geldt als crediteur van het verzameld bedrag"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:134
+#, python-format
+msgid "Aggregate Payment Order %s"
+msgstr "Verzamelbetaling %s"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:230
+#, python-format
+msgid "Payment order workflow does not go into state \"done\""
+msgstr "De workflow van de betaalopdracht komt niet in de status \"verwerkt\""
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:143
+#, python-format
+msgid "No move line provided for line %s"
+msgstr "Er is geen boeking voor regel %s"
+
+#. module: account_banking_aggregate_payment
+#: model:ir.model,name:account_banking_aggregate_payment.model_payment_mode
+msgid "Payment Mode"
+msgstr "Betaalwijze"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:48
+#, python-format
+msgid "Please only select a single payment order"
+msgstr "Er kan maar één betaalopdracht worden geselecteerd"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:147
+#, python-format
+msgid "Move line %s has already been paid/reconciled"
+msgstr "Boekingsregel %s is al afgeletterd"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:44
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:121
+#, python-format
+msgid "Please select a payment order"
+msgstr "Selecteer alstublieft een betaalopdracht"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:125
+#, python-format
+msgid "This operation can only be performed on a single payment order"
+msgstr "Deze bewerking kan alleen worden uitgevoerd op een enkele betaalopdracht"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:155
+#, python-format
+msgid "Transit %s"
+msgstr "Tussenboeking %s"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:191
+#, python-format
+msgid "Transit reconciliation"
+msgstr "Aflettering tussenboeking"
+
+#. module: account_banking_aggregate_payment
+#: view:banking.export.aggregate:0
+msgid "Export aggregate payment order"
+msgstr "Verwerken een verzamelbetalingsopdracht"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:208
+#, python-format
+msgid "Amount payable"
+msgstr "Verschuldigd bedrag"
+
+#. module: account_banking_aggregate_payment
+#: field:payment.mode,aggregate_partner_id:0
+msgid "Aggregate payment beneficiary"
+msgstr "Begunstigde van de verzamelbetaling"
+
+#. module: account_banking_aggregate_payment
+#: help:payment.mode,chained_mode_id:0
+msgid "The payment type of the chained payment order"
+msgstr "De betaalwijze van de gekoppelde betaalopdracht"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:43
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:47
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:65
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:71
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:120
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:124
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:142
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:146
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:229
+#, python-format
+msgid "Error"
+msgstr "Fout"
+
+#. module: account_banking_aggregate_payment
+#: model:ir.model,name:account_banking_aggregate_payment.model_banking_export_aggregate
+msgid "Execute aggregate payment"
+msgstr "Verzamelbetaling boeken"
+
+#. module: account_banking_aggregate_payment
+#: view:banking.export.aggregate:0
+msgid "When you confirm this order, the total                                    amount will be made payable to the partner                                    that has been set on the payment mode. A                                    new payment order will open in your screen                                    with this one payment."
+msgstr "Als u deze betaalopdracht bevestigd, dan wordt het totaalbedrag betaalbaar gemaakt aan de relatie die op de betaalwijze aangegeven staat. In het scherm wordt een nieuwe betaalopdracht geopend met alleen dit totaalbedrag."
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:172
+#, python-format
+msgid "Reconciliation %s"
+msgstr "Aflettering %s"
+
+#. module: account_banking_aggregate_payment
+#: field:banking.export.aggregate,payment_order_id:0
+msgid "Payment order"
+msgstr "Betaalopdracht"
+
+#. module: account_banking_aggregate_payment
+#: field:payment.mode,chained_mode_id:0
+msgid "Chained payment mode"
+msgstr "Gekoppelde betaalwijze"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:66
+#, python-format
+msgid "Cannot reconcile between different accounts"
+msgstr "Kan niet afletteren tussen verschillende grootboekrekeningen"
+
+#. module: account_banking_aggregate_payment
+#: code:addons/account_banking_aggregate_payment/model/export_aggregate.py:72
+#, python-format
+msgid "Line is already fully reconciled"
+msgstr "De regel is al afgeletterd"
+
+#. module: account_banking_aggregate_payment
+#: view:banking.export.aggregate:0
+msgid "Cancel"
+msgstr "Annuleer"
+
diff --git a/account_banking_aggregate_payment/model/export_aggregate.py b/account_banking_aggregate_payment/model/export_aggregate.py
index 8ae010ed6..be1c245f7 100644
--- a/account_banking_aggregate_payment/model/export_aggregate.py
+++ b/account_banking_aggregate_payment/model/export_aggregate.py
@@ -26,12 +26,13 @@ from openerp import netsvc
 
 class banking_export_aggregate(orm.TransientModel):
     _name = 'banking.export.aggregate'
+    _description = 'Execute aggregate payment order'
+    _rec_name = 'payment_order_id'
+
     _columns = {
         'payment_order_id': fields.many2one(
             'payment.order', 'Payment order',
             required=True),
-        'reference': fields.char(
-            'Reference', size=24),
         }
 
     def create(self, cr, uid, vals, context=None):
diff --git a/account_banking_aggregate_payment/view/payment_mode.xml b/account_banking_aggregate_payment/view/payment_mode.xml
index dafa1f7ff..854d0b1f9 100644
--- a/account_banking_aggregate_payment/view/payment_mode.xml
+++ b/account_banking_aggregate_payment/view/payment_mode.xml
@@ -9,7 +9,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="payment_term_ids" position="after">
-                    <group colspan="2" col="2" string="Chaining order"
+                    <group colspan="2" col="2" string="Aggregate payment"
                            attrs="{
                            'invisible': [
                                  ('type', '!=',

From 9276cf41e924938782df0390dfd2ac6311356ba5 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Thu, 13 Jun 2013 22:04:56 +0200
Subject: [PATCH 9/9] [FIX] License and expected revision number, uneven
 spacing in xml

---
 account_banking_aggregate_payment/__openerp__.py             | 4 ++--
 account_banking_aggregate_payment/data/payment_mode_type.xml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/account_banking_aggregate_payment/__openerp__.py b/account_banking_aggregate_payment/__openerp__.py
index 7c4253c6e..fff16c8ac 100644
--- a/account_banking_aggregate_payment/__openerp__.py
+++ b/account_banking_aggregate_payment/__openerp__.py
@@ -20,8 +20,8 @@
 ##############################################################################
 {
     'name': 'Account Banking Aggregate Payment',
-    'version': '0.1.136',
-    'license': 'GPL-3',
+    'version': '0.1.173',
+    'license': 'AGPL-3',
     'author': 'Therp BV',
     'website': 'https://launchpad.net/banking-addons',
     'category': 'Banking addons',
diff --git a/account_banking_aggregate_payment/data/payment_mode_type.xml b/account_banking_aggregate_payment/data/payment_mode_type.xml
index cb0c2d4fd..6d88152f6 100644
--- a/account_banking_aggregate_payment/data/payment_mode_type.xml
+++ b/account_banking_aggregate_payment/data/payment_mode_type.xml
@@ -12,5 +12,6 @@
 	    <field name="ir_model_id"
                    ref="model_banking_export_aggregate"/>
         </record>
+
     </data>
 </openerp>