Merge cd29f1a814 into abad347945

pos_autoreconcile/README.rst

@@ -34,6 +34,9 @@ closing a session.
 
 Module also grants access rights for POS users to create reconciliation records
 
+Module also allows to configure a write-off account for writing differences
+between order total and paid amount.
+
 Installation
 ============
 
@@ -78,6 +81,7 @@ Contributors
 ------------
 
 * Andrius Preimantas <andrius@versada.lt>
+* Jacques-Etienne Baudoux <je@bcim.be>
 
 Maintainer
 ----------

pos_autoreconcile/__openerp__.py

@@ -22,7 +22,7 @@
 
 {
     'name': 'POS Autoreconcile',
-    'version': '8.0.0.1.0',
+    'version': '8.0.0.2.0',
     'author': 'Versada UAB,Odoo Community Association (OCA)',
     'category': 'Point Of Sale',
     'website': 'http://www.versada.lt',
@@ -31,6 +31,7 @@
     ],
     'data': [
         'security/ir.model.access.csv',
+        'views/pos_config.xml',
     ],
     'installable': True,
     'application': False,

pos_autoreconcile/model/point_of_sale.py

@@ -20,7 +20,15 @@
 #
 ##############################################################################
 
-from openerp import models
+from openerp import models, fields
+
+
+class PosConfig(models.Model):
+    _inherit = 'pos.config'
+
+    writeoff_account_id = fields.Many2one(
+        'account.account', 'Write-Off Account',
+        domain=[('type', '<>', 'view'), ('type', '<>', 'closed')])
 
 
 class POSOrder(models.Model):
@@ -68,7 +76,15 @@ class POSOrder(models.Model):
         for key, value in grouped_data.iteritems():
             if not value:
                 continue
-            self.pool.get('account.move.line').reconcile_partial(
-                cr, uid, value)
-
+            if not session.config_id.writeoff_account_id:
+                self.pool.get('account.move.line').reconcile_partial(
+                    cr, uid, value)
+            else:
+                period = self.pool['account.move'].browse(
+                    cr, uid, move_id).period_id
+                self.pool.get('account.move.line').reconcile(
+                    cr, uid, value,
+                    writeoff_acc_id=session.config_id.writeoff_account_id.id,
+                    writeoff_period_id=period.id,
+                    writeoff_journal_id=order.sale_journal.id)
         return to_ret

pos_autoreconcile/views/pos_config.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <record model="ir.ui.view" id="view_pos_config_form">
+        <field name="name">POS Auto Reconcile</field>
+        <field name="model">pos.config</field>
+        <field name="inherit_id" ref="point_of_sale.view_pos_config_form"/>
+        <field name="arch" type="xml">
+            <field name="group_by" position="after">
+                <field name="writeoff_account_id"/>
+            </field>
+        </field>
+    </record>
+</data>
+</openerp>