From d88b10fd071206a570d282645f139d5093b6ff1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 29 Jan 2014 17:32:59 +0100
Subject: [PATCH 1/2] [IMP] hw_escpos: moved list of supported printers to a
 separate file

bzr revid: fva@openerp.com-20140129163259-xdarcaw4qcqprvt6
---
 addons/hw_escpos/controllers/main.py         | 12 ++++--------
 addons/hw_escpos/escpos/__init__.py          |  2 +-
 addons/hw_escpos/escpos/supported_devices.py | 10 ++++++++++
 3 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 addons/hw_escpos/escpos/supported_devices.py

diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py
index 81ae2b436c3..5b42e97b442 100644
--- a/addons/hw_escpos/controllers/main.py
+++ b/addons/hw_escpos/controllers/main.py
@@ -21,6 +21,7 @@ except ImportError:
 from openerp.tools.translate import _
 from .. import escpos
 from ..escpos import printer
+from ..escpos import supported_devices
 from PIL import Image
 
 from openerp import http
@@ -35,21 +36,16 @@ class EscposDriver(Thread):
         self.queue = Queue()
         self.status = {'status':'connecting', 'messages':[]}
 
-        self.supported_printers = [
-            { 'vendor' : 0x04b8, 'product' : 0x0e03, 'name' : 'Epson TM-T20' },
-            { 'vendor' : 0x04b8, 'product' : 0x0202, 'name' : 'Epson TM-T70' },
-        ]
-
-    def connected_usb_devices(self,devices):
+    def connected_usb_devices(self):
         connected = []
-        for device in devices:
+        for device in supported_devices.device_list:
             if usb.core.find(idVendor=device['vendor'], idProduct=device['product']) != None:
                 connected.append(device)
         return connected
     
     def get_escpos_printer(self):
         try:
-            printers = self.connected_usb_devices(self.supported_printers)
+            printers = self.connected_usb_devices()
             if len(printers) > 0:
                 self.set_status('connected','Connected to '+printers[0]['name'])
                 return escpos.printer.Usb(printers[0]['vendor'], printers[0]['product'])
diff --git a/addons/hw_escpos/escpos/__init__.py b/addons/hw_escpos/escpos/__init__.py
index 22a5af61029..3fdeddee28b 100644
--- a/addons/hw_escpos/escpos/__init__.py
+++ b/addons/hw_escpos/escpos/__init__.py
@@ -1 +1 @@
-__all__ = ["constants","escpos","exceptions","printer"]
+__all__ = ["constants","escpos","exceptions","printer","supported_devices"]
diff --git a/addons/hw_escpos/escpos/supported_devices.py b/addons/hw_escpos/escpos/supported_devices.py
new file mode 100644
index 00000000000..2c6a6be2d07
--- /dev/null
+++ b/addons/hw_escpos/escpos/supported_devices.py
@@ -0,0 +1,10 @@
+#!/usr/bin/python
+
+# This is a list of esc/pos compatible usb printers. The vendor and product ids can be found by
+# typing lsusb in a linux terminal, this will give you the ids in the form ID VENDOR:PRODUCT
+
+device_list = [
+    { 'vendor' : 0x04b8, 'product' : 0x0e03, 'name' : 'Epson TM-T20' },
+    { 'vendor' : 0x04b8, 'product' : 0x0202, 'name' : 'Epson TM-T70' },
+]
+

From 947fe0da240d08650ce2348c22569b571be4a33c Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Wed, 29 Jan 2014 19:52:29 +0100
Subject: [PATCH 2/2] [FIX] calendar: use correct xmlid

bzr revid: chs@openerp.com-20140129185229-d75g5fsv77468tih
---
 addons/calendar/calendar_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/calendar_view.xml
index 93649d046a1..01c4b596592 100644
--- a/addons/calendar/calendar_view.xml
+++ b/addons/calendar/calendar_view.xml
@@ -313,7 +313,7 @@
         <field name="name">Meetings</field>
         <field name="res_model">calendar.event</field>
         <field name="view_mode">form,calendar,tree,gantt</field>
-        <field name="view_id" ref="action_view_calendar_event_form"/>        
+        <field name="view_id" ref="view_calendar_event_form"/>        
     </record>