From 668b82d0a977024f76419114aa251272da78a555 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 5 Jun 2012 13:38:39 +0200
Subject: [PATCH 1/5] [FIX] point_of_sale: remove the call of the report in the
 pos.payment wizard

bzr revid: stw@openerp.com-20120605113839-c7pb1czizw38epau
---
 addons/point_of_sale/wizard/pos_payment.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index 194428db118..183ccfe32b3 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -70,7 +70,8 @@ class pos_make_payment(osv.osv_memory):
         if order_obj.test_paid(cr, uid, [active_id]):
             wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'pos.order', active_id, 'paid', cr)
-            return self.print_report(cr, uid, ids, context=context)
+            return {'type' : 'ir.actions.act_window_close' }
+         ##self.print_report(cr, uid, ids, context=context)
 
         return self.launch_payment(cr, uid, ids, context=context)
 

From 85aec52251a67992c7792313e16cc1433320bba8 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 5 Jun 2012 14:02:29 +0200
Subject: [PATCH 2/5] [FIX] account: check if the journal exist on the
 account.bank.statement

bzr revid: stw@openerp.com-20120605120229-u37kbjcdp7nbpp6e
---
 addons/account/wizard/pos_box.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addons/account/wizard/pos_box.py b/addons/account/wizard/pos_box.py
index 00a3c404a65..12a606833a1 100644
--- a/addons/account/wizard/pos_box.py
+++ b/addons/account/wizard/pos_box.py
@@ -28,6 +28,10 @@ class CashBox(osv.osv_memory):
     def _run(self, cr, uid, ids, records, context=None):
         for box in self.browse(cr, uid, ids, context=context):
             for record in records:
+                if not record.journal_id:
+                    raise osv.except_osv(_('Error !'),
+                                         _("Please check that the field 'Journal' is set on the Bank Statement"))
+                    
                 if not record.journal_id.internal_account_id:
                     raise osv.except_osv(_('Error !'),
                                          _("Please check that the field 'Internal Transfers Account' is set on the payment method '%s'.") % (record.journal_id.name,))

From d251e07d88d8373c8a3c0108f773df172efbaffa Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Tue, 5 Jun 2012 14:23:14 +0200
Subject: [PATCH 3/5] [IMP] point_of_sale: add a guardian for the
 account.bank.statement

bzr revid: stw@openerp.com-20120605122314-byw2uq6hjlas0052
---
 addons/point_of_sale/wizard/pos_box.py        | 11 ++++-
 .../point_of_sale/wizard/pos_receipt_view.xml | 42 +++++++++----------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/addons/point_of_sale/wizard/pos_box.py b/addons/point_of_sale/wizard/pos_box.py
index b4a87cb0933..a79ab0fa779 100644
--- a/addons/point_of_sale/wizard/pos_box.py
+++ b/addons/point_of_sale/wizard/pos_box.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+
+from tools.translate import _
 from osv import osv, fields
 from account.wizard.pos_box import CashBox
 
@@ -14,7 +16,14 @@ class PosBox(CashBox):
 
         if active_model == 'pos.session':
             records = self.pool.get(active_model).browse(cr, uid, context.get('active_ids', []) or [], context=context)
-            return self._run(cr, uid, ids, [record.cash_register_id for record in records], context=context)
+
+            bank_statements = [record.cash_register_id for record in records if record.cash_register_id]
+
+            if not bank_statements:
+                raise osv.except_osv(_('Error !'),
+                                     _("There is no cash register for this PoS Session"))
+
+            return self._run(cr, uid, ids, bank_statements, context=context)
         else:
             return super(PosBox, self).run(cr, uid, ids, context=context)
 
diff --git a/addons/point_of_sale/wizard/pos_receipt_view.xml b/addons/point_of_sale/wizard/pos_receipt_view.xml
index 0b8acfd8197..5ec8ee9d1ed 100644
--- a/addons/point_of_sale/wizard/pos_receipt_view.xml
+++ b/addons/point_of_sale/wizard/pos_receipt_view.xml
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
+    <data>
+        <!--   Pos Receipt -->
+        <record id="view_pos_receipt" model="ir.ui.view">
+            <field name="name">Receipt</field>
+            <field name="model">pos.receipt</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Receipt :">
+                    <separator string="Print the Receipt of the Sale" colspan="4"/>
+                    <button icon='gtk-cancel' special="cancel"
+                        string="Cancel" />
+                    <button name="print_report" string="Print Receipt"
+                        colspan="1" type="object" icon="gtk-print" />
+                </form>
+            </field>
+        </record>
 
-    <!--   Pos Receipt -->
-
-		<record id="view_pos_receipt" model="ir.ui.view">
-		      <field name="name">Receipt</field>
-		      <field name="model">pos.receipt</field>
-		      <field name="type">form</field>
-		      <field name="arch" type="xml">
-		        <form string="Receipt :">
-            <separator string="Print the Receipt of the Sale" colspan="4"/>
-		          <button icon='gtk-cancel' special="cancel"
-		                  string="Cancel" />
-		          <button name="print_report" string="Print Receipt"
-		                  colspan="1" type="object" icon="gtk-print" />
-		        </form>
-		      </field>
-    	</record>
-
-
-      <record id="action_report_pos_receipt" model="ir.actions.act_window">
+        <record id="action_report_pos_receipt" model="ir.actions.act_window">
             <field name="name">Receipt</field>
             <field name="res_model">pos.receipt</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-             <field name="target">new</field>
+            <field name="target">new</field>
         </record>
-
-</data>
+    </data>
 </openerp>

From bee48de20b67fd885ebe694e3394295eb8942f69 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 7 Jun 2012 14:01:21 +0200
Subject: [PATCH 4/5] [FIX] point_of_sale: Add the 'group_by' field in the view

bzr revid: stw@openerp.com-20120607120121-kh653yprb827izma
---
 addons/point_of_sale/point_of_sale_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index db6cd847753..a320c547353 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -765,6 +765,7 @@
                         <field name="shop_id" widget="selection" />
                         <field name="journal_id" widget="selection" />
                         <field name="sequence_id" readonly="1"/>
+                        <field name="group_by" />
                         <separator string="Available Payment Methods" colspan="4"/>
                         <field name="journal_ids" colspan="4" nolabel="1">
                             <tree string="Journals">

From da5d0d890c098b6c02e26317bf1cfcbe55452489 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stw@openerp.com>
Date: Thu, 7 Jun 2012 15:19:30 +0200
Subject: [PATCH 5/5] [IMP] point_of_sale: Add a photo on the pos category
 object

bzr revid: stw@openerp.com-20120607131930-tmov89slcyucgi15
---
 addons/point_of_sale/point_of_sale.py       | 51 +++++++++++++++++++++
 addons/point_of_sale/point_of_sale_view.xml |  3 ++
 2 files changed, 54 insertions(+)

diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 37b5eaa4e8e..7c4740be19a 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -19,6 +19,8 @@
 #
 ##############################################################################
 import pdb
+import io
+import addons
 
 import time
 from datetime import datetime
@@ -1133,6 +1135,8 @@ class pos_order_line(osv.osv):
 pos_order_line()
 
 class pos_category(osv.osv):
+    PHOTO_SIZE_HEIGHT = 540
+    PHOTO_SIZE_WIDTH = 450
     _name = 'pos.category'
     _description = "Point of Sale Category"
     _order = "sequence, name"
@@ -1150,6 +1154,38 @@ class pos_category(osv.osv):
         (_check_recursion, 'Error ! You cannot create recursive categories.', ['parent_id'])
     ]
 
+    def onchange_photo(self, cr, uid, ids, value, context=None):
+        if not value:
+            return {'value': {'photo_big': value, 'photo': value} }
+        return {
+            'value': {
+                'photo_big': self._photo_resize(cr, uid, value, self.PHOTO_SIZE_HEIGHT, self.PHOTO_SIZE_WIDTH, context=context), 
+                'photo': self._photo_resize(cr, uid, value, context=context)
+            } 
+        }
+    
+    def _set_photo(self, cr, uid, id, name, value, args, context=None):
+        if not value:
+            vals = {'photo_big': value}
+        else:
+            vals = {'photo_big': self._photo_resize(cr, uid, value, self.PHOTO_SIZE_HEIGHT, self.PHOTO_SIZE_WIDTH, context=context)}
+        return self.write(cr, uid, [id], vals, context=context)
+    
+    def _photo_resize(self, cr, uid, photo, heigth=180, width=150, context=None):
+        image_stream = io.BytesIO(photo.decode('base64'))
+        img = Image.open(image_stream)
+        img.thumbnail((heigth, width), Image.ANTIALIAS)
+        img_stream = StringIO.StringIO()
+        img.save(img_stream, "JPEG")
+        return img_stream.getvalue().encode('base64')
+    
+    def _get_photo(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for category in self.browse(cr, uid, ids, context=context):
+            if category.photo_big:
+                result[category.id] = self._photo_resize(cr, uid, category.photo_big, context=context)
+        return result
+
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
@@ -1172,7 +1208,22 @@ class pos_category(osv.osv):
         'parent_id': fields.many2one('pos.category','Parent Category', select=True),
         'child_id': fields.one2many('pos.category', 'parent_id', string='Children Categories'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."),
+        'photo_big': fields.binary('Big-sized employee photo', help="This field holds the photo of the employee. The photo field is used as an interface to access this field. The image is base64 encoded, and PIL-supported. Full-sized photo are however resized to 540x450 px."),
+        'photo': fields.function(_get_photo, fnct_inv=_set_photo, string='Employee photo', type="binary",
+            store = {
+                'hr.employee': (lambda self, cr, uid, ids, c={}: ids, ['photo_big'], 10),
+            }, help="Image used as photo for the employee. It is automatically resized as a 180x150 px image. A larger photo is stored inside the photo_big field."),
     }
+
+    def _default_photo(self, cr, uid, context=None):
+        photo_path = addons.get_module_resource('point_of_sale','images','default_category_photo.png')
+        return self._photo_resize(cr, uid, open(photo_path, 'rb').read().encode('base64'), context=context)
+
+
+    _defaults = {
+        'photo' : _default_photo,
+    }
+
 pos_category()
 
 import io, StringIO
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index a320c547353..527635f2452 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -648,6 +648,9 @@
                         <field name="parent_id"/>
                         <field name="sequence"/>
                     </group>
+                    <group colspan="2" col="1">
+                      <field name="photo" widget='image' nolabel="1" on_change="onchange_photo(photo)"/>
+                    </group>
                 </form>
             </field>
         </record>