From ce3a161ec0f11ec9579ff83c9c18377ae00e0d4c Mon Sep 17 00:00:00 2001
From: Olivier Laurent <olt@tinyerp.com>
Date: Tue, 16 Jun 2009 10:31:39 +0200
Subject: [PATCH] [FIX] point_of_sale: invoice report should use the
 account.invoice object

bzr revid: olt@tinyerp.com-20090616083139-ab7k5446kmwtzz59
---
 addons/point_of_sale/pos_report.xml        |  2 +-
 addons/point_of_sale/report/pos_invoice.py | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/point_of_sale/pos_report.xml b/addons/point_of_sale/pos_report.xml
index bf569ed759f..c9956c2c029 100644
--- a/addons/point_of_sale/pos_report.xml
+++ b/addons/point_of_sale/pos_report.xml
@@ -17,7 +17,7 @@
       model="pos.order"
       name="pos.invoice"
       auto="False"
-      rml="point_of_sale/report/pos_invoice.rml"
+      rml="account/report/invoice.rml"
        />
 
     <report
diff --git a/addons/point_of_sale/report/pos_invoice.py b/addons/point_of_sale/report/pos_invoice.py
index e7d34f517e9..0a6bf9d28ed 100644
--- a/addons/point_of_sale/report/pos_invoice.py
+++ b/addons/point_of_sale/report/pos_invoice.py
@@ -22,22 +22,29 @@
 
 import time
 from report import report_sxw
+from osv import osv
+from tools.translate import _
 
 
 class pos_invoice(report_sxw.rml_parse):
+
     def __init__(self, cr, uid, name, context):
         super(pos_invoice, self).__init__(cr, uid, name, context)
         self.localcontext.update({
             'time': time,
         })
-        
-    def set_context(self, objects, data, ids, report_type = None):
-        super(pos_invoice, self).set_context(objects, data, ids, report_type)
+
+    def preprocess(self, objects, data, ids):
+        super(pos_invoice, self).preprocess(objects, data, ids)
         iids = []
         nids = []
+
         for order in objects:
             order.write({'nb_print': order.nb_print + 1})
+
             if order.invoice_id and order.invoice_id not in iids:
+                if not order.invoice_id:
+                    raise osv.except_osv(_('Error !'), _('Please create an invoice for this sale.'))
                 iids.append(order.invoice_id)
                 nids.append(order.invoice_id.id)
         self.cr.commit()
@@ -48,7 +55,5 @@ class pos_invoice(report_sxw.rml_parse):
         self.localcontext['data'] = data
         self.localcontext['objects'] = iids
 
-report_sxw.report_sxw('report.pos.invoice', 'pos.order', 'account/report/invoice.rml', parser= pos_invoice)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+report_sxw.report_sxw('report.pos.invoice', 'pos.order', 'addons/point_of_sale/report/pos_invoice.rml', parser= pos_invoice)