Merge lp:~invitu/openobject-addons/trunk-point_of_sale_select_customer into lp:openobject-addons

[invitu]

[point_of_sale] allows customer selection in pos (inspired by Michael Telahun Makonnen's work)

[lp:~invitu/openobject-addons/trunk-point_of_sale_select_customer]

8977. By invitu on 2013-11-17

[IMP] allows customer selection in pos (inspired by Michael Telahun Makonnen's work)

Unmerged revisions

8977. By invitu on 2013-11-17

[IMP] allows customer selection in pos (inspired by Michael Telahun Makonnen's work)

8976. By invitu on 2013-11-16

[IMP] Convert to task button is back in project issue form view

=== modified file 'plugin_outlook/i18n/et.po'
--- plugin_outlook/i18n/et.po	2013-09-12 06:40:18 +0000
+++ plugin_outlook/i18n/et.po	2013-11-17 01:16:28 +0000
@@ -27,7 +27,7 @@
 msgid "Download and install the plug-in"
 msgstr ""
 
-#. module: plugin_outlook
+#. mdule: plugin_outlook
 #: model:ir.model,name:plugin_outlook.model_outlook_installer
 msgid "outlook.installer"
 msgstr "outlook.installer"

=== modified file 'point_of_sale/point_of_sale.py'
--- point_of_sale/point_of_sale.py	2013-10-18 12:58:18 +0000
+++ point_of_sale/point_of_sale.py	2013-11-17 01:16:28 +0000
@@ -48,7 +48,7 @@
     _columns = {
         'name' : fields.char('Point of Sale Name', size=32, select=1,
              required=True, help="An internal identification of the point of sale"),
-        'journal_ids' : fields.many2many('account.journal', 'pos_config_journal_rel', 
+        'journal_ids' : fields.many2many('account.journal', 'pos_config_journal_rel',
              'pos_config_id', 'journal_id', 'Available Payment Methods',
              domain="[('journal_user', '=', True ), ('type', 'in', ['bank', 'cash'])]",),
         'warehouse_id' : fields.many2one('stock.warehouse', 'Warehouse',
@@ -202,7 +202,7 @@
                                     readonly=True,
                                     states={'opening_control' : [('readonly', False)]}
                                    ),
-        'start_at' : fields.datetime('Opening Date', readonly=True), 
+        'start_at' : fields.datetime('Opening Date', readonly=True),
         'stop_at' : fields.datetime('Closing Date', readonly=True),
 
         'state' : fields.selection(POS_SESSION_STATE, 'Status',
@@ -221,10 +221,10 @@
                                              type='many2one', relation='account.bank.statement',
                                              string='Cash Register', store=True),
 
-        'opening_details_ids' : fields.related('cash_register_id', 'opening_details_ids', 
+        'opening_details_ids' : fields.related('cash_register_id', 'opening_details_ids',
                 type='one2many', relation='account.cashbox.line',
                 string='Opening Cash Control'),
-        'details_ids' : fields.related('cash_register_id', 'details_ids', 
+        'details_ids' : fields.related('cash_register_id', 'details_ids',
                 type='one2many', relation='account.cashbox.line',
                 string='Cash Control'),
 
@@ -419,7 +419,7 @@
                         raise osv.except_osv( _('Error!'),
                             _("Your ending balance is too different from the theoretical cash closing (%.2f), the maximum allowed is: %.2f. You can contact your manager to force it.") % (st.difference, st.journal_id.amount_authorized_diff))
                 if (st.journal_id.type not in ['bank', 'cash']):
-                    raise osv.except_osv(_('Error!'), 
+                    raise osv.except_osv(_('Error!'),
                         _("The type of the journal for your payment method should be bank or cash "))
                 if st.difference and st.journal_id.cash_control == True:
                     if st.difference > 0.0:
@@ -503,14 +503,13 @@
             to_invoice = tmp_order['to_invoice']
             order = tmp_order['data']
 
-
             order_id = self.create(cr, uid, {
                 'name': order['name'],
                 'user_id': order['user_id'] or False,
                 'session_id': order['pos_session_id'],
                 'lines': order['lines'],
                 'pos_reference':order['name'],
-                'partner_id': order['partner_id'] or False
+                'partner_id': order['partner_id'] if 'partner_id' in order else False
             }, context)
             for payments in order['statement_ids']:
                 payment = payments[2]
@@ -630,7 +629,7 @@
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, states={'draft': [('readonly', False)]}, readonly=True),
         'partner_id': fields.many2one('res.partner', 'Customer', change_default=True, select=1, states={'draft': [('readonly', False)], 'paid': [('readonly', False)]}),
 
-        'session_id' : fields.many2one('pos.session', 'Session', 
+        'session_id' : fields.many2one('pos.session', 'Session',
                                         #required=True,
                                         select=1,
                                         domain="[('state', '=', 'opened')]",
@@ -659,7 +658,7 @@
         return session_ids and session_ids[0] or False
 
     def _default_pricelist(self, cr, uid, context=None):
-        session_ids = self._default_session(cr, uid, context) 
+        session_ids = self._default_session(cr, uid, context)
         if session_ids:
             session_record = self.pool.get('pos.session').browse(cr, uid, session_ids, context=context)
             return session_record.config_id.pricelist_id and session_record.config_id.pricelist_id.id or False
@@ -668,7 +667,7 @@
     _defaults = {
         'user_id': lambda self, cr, uid, context: uid,
         'state': 'draft',
-        'name': '/', 
+        'name': '/',
         'date_order': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'nb_print': 0,
         'session_id': _default_session,
@@ -737,7 +736,7 @@
                 }, context=context)
                 if line.qty < 0:
                     location_id, output_id = output_id, location_id
-            
+
             picking_obj.signal_button_confirm(cr, uid, [picking_id])
             picking_obj.force_assign(cr, uid, [picking_id], context)
         return True
@@ -813,7 +812,7 @@
         """Create a copy of order  for refund order"""
         clone_list = []
         line_obj = self.pool.get('pos.order.line')
-        
+
         for order in self.browse(cr, uid, ids, context=context):
             current_session_ids = self.pool.get('pos.session').search(cr, uid, [
                 ('state', '!=', 'closed'),
@@ -1030,8 +1029,8 @@
                 else:
                     grouped_data[key].append(values)
 
-            #because of the weird way the pos order is written, we need to make sure there is at least one line, 
-            #because just after the 'for' loop there are references to 'line' and 'income_account' variables (that 
+            #because of the weird way the pos order is written, we need to make sure there is at least one line,
+            #because just after the 'for' loop there are references to 'line' and 'income_account' variables (that
             #are set inside the for loop)
             #TOFIX: a deep refactoring of this method (and class!) is needed in order to get rid of this stupid hack
             assert order.lines, _('The POS order must have lines when calling this method')
@@ -1292,7 +1291,7 @@
         for obj in self.browse(cr, uid, ids, context=context):
             result[obj.id] = tools.image_get_resized_images(obj.image)
         return result
-    
+
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
 
@@ -1302,7 +1301,7 @@
         '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."),
-        
+
         # NOTE: there is no 'default image', because by default we don't show thumbnails for categories. However if we have a thumbnail
         # for at least one category, then we display a default image on the other, so that the buttons have consistent styling.
         # In this case, the default image is set by the js code.
@@ -1364,7 +1363,7 @@
     _columns = {
         'income_pdt': fields.boolean('Point of Sale Cash In', help="Check if, this is a product you can use to put cash into a statement for the point of sale backend."),
         'expense_pdt': fields.boolean('Point of Sale Cash Out', help="Check if, this is a product you can use to take cash from a statement for the point of sale backend, example: money lost, transfer to bank, etc."),
-        'available_in_pos': fields.boolean('Available in the Point of Sale', help='Check if you want this product to appear in the Point of Sale'), 
+        'available_in_pos': fields.boolean('Available in the Point of Sale', help='Check if you want this product to appear in the Point of Sale'),
         'pos_categ_id': fields.many2one('pos.category','Point of Sale Category',
             help="These products belong to those categories that are used to group similar products and are specific to the Point of Sale."),
         'to_weight' : fields.boolean('To Weight', help="Check if the product should be weighted (mainly used with self check-out interface)."),

=== modified file 'point_of_sale/static/src/css/pos.css'
--- point_of_sale/static/src/css/pos.css	2013-11-12 14:04:57 +0000
+++ point_of_sale/static/src/css/pos.css	2013-11-17 01:16:28 +0000
@@ -208,6 +208,15 @@
             box-shadow: 0px 1px 2px rgb(63, 66, 139) inset;
 }
 
+.point-of-sale #rightheader .customername{
+    float:right;
+    color:#DDD;
+    font-size:16px;
+    margin-right:32px;
+    margin-top:10px;
+    font-style:italic;
+}
+
 /*  c) The session buttons */
 
 .point-of-sale #rightheader .header-button{
@@ -1379,6 +1388,162 @@
     line-height:180px;
 }
 
+.point-of-sale .modal-dialog .popup-selection{
+    position: absolute;
+    left:30%;
+    top:10%;
+    width: 700px;
+    height:70%;
+    padding:10px;
+    padding-top:20px;
+    text-align:left;
+    font-size:14px;
+    font-weight:bold;
+    background-color: #F0EEEE;
+    border-radius: 4px;
+    box-shadow: 0px -1px white, 0px 1px white, 0px 4px #949494, 0px 10px 20px rgba(0, 0, 0, 0.3);
+    z-index:1200;
+}
+
+.point-of-sale .popup-selection .button{
+    float:right;
+    width: 110px;
+    height: 40px;
+    line-height:40px;
+    text-align:center;
+    margin:3px;
+    margin-top:10px;
+    margin-right:50px;
+
+    font-size:   14px;
+    font-weight: bold;
+
+    cursor: pointer;
+
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+
+    background: #e2e2e2;
+    background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+    background:    -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:     -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:         linear-gradient(#f0f0f0, #e2e2e2);
+    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+    -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+    box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+}
+.point-of-sale .popup-selection .button:hover {
+    color: white;
+    background: #7f82ac;
+    border: 1px solid #7f82ac;
+    background: -webkit-linear-gradient(#9d9fc5, #7f82ac);
+    background:    -moz-linear-gradient(#9d9fc5, #7f82ac);
+    background:     -ms-linear-gradient(#9d9fc5, #7f82ac);
+    background:         linear-gradient(#9d9fc5, #7f82ac);
+
+    -webkit-transition-property: background, border;
+    -webkit-transition-duration: 0.2s;
+    -webkit-transition-timing-function: ease-out;
+}
+
+/*  customer selection */
+
+#customer-cancel {
+    position: absolute;
+    left: 10px;
+    bottom: 10px;
+}
+
+.point-of-sale .customer-list-container {
+    position: absolute;
+    top:70px;
+    left:5px;
+    right:5px;
+    bottom: 70px;
+    text-align: left;
+    overflow: auto;
+}
+
+.point-of-sale .customer-list-scroller {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+    width:98%;
+}
+
+.customer-list-scroller ol {
+    list-style: none;
+}
+
+.customer-list-scroller ol li { }
+
+.customer-list-scroller ol li a {
+    display:block;
+    text-decoration:none;
+    color:#000000;
+    background-color:#FFFFFF;
+    line-height:20px;
+    border-bottom-style:solid;
+    border-bottom-width:1px;
+    border-bottom-color:#CCCCCC;
+    padding-left:10px;
+    cursor:pointer;
+}
+
+.customer-list-scroller ol li a:hover {
+    color:#FFFFFF;
+    background-image:url(/point_of_sale/static/src/img/hover.png);
+    background-repeat:repeat-x;
+}
+
+.point-of-sale .customer {
+    width: 100%;
+}
+
+.point-of-sale .customer a {
+    width: 100%;
+}
+
+.point-of-sale .customer .customer-field {
+    width: 130px;
+    padding: 5px;
+    margin: 5px;
+}
+
+.point-of-sale .customer .customer-name{
+    width: 200px;
+    padding: 5px;
+    margin: 5px;
+}
+
+.point-of-sale .customer .customer-phone {
+    width: 50px;
+    padding: 5px;
+    margin: 5px;
+}
+
+.point-of-sale .customer-searchbox {
+    right: 2px;
+}
+.point-of-sale .customer-searchbox input {
+    width: 130px;
+    border-radius: 11px;
+    border: 1px solid #cecbcb;
+    padding: 3px 19px;
+    margin: 6px;
+    background: url("../img/search.png") no-repeat 5px;
+    background-color: white;
+}
+.point-of-sale .customer-search-clear {
+    postion: absolute;
+    top: 11px;
+    right: 600px;
+    cursor: pointer;
+    display: none;
+}
+
+
 /*  ********* The ScrollBarWidget  ********* */
 
 .point-of-sale .scrollbar{  

=== added file 'point_of_sale/static/src/img/hover.png'
Binary files point_of_sale/static/src/img/hover.png	1970-01-01 00:00:00 +0000 and point_of_sale/static/src/img/hover.png	2013-11-17 01:16:28 +0000 differ
=== modified file 'point_of_sale/static/src/js/db.js'
--- point_of_sale/static/src/js/db.js	2013-09-23 14:51:39 +0000
+++ point_of_sale/static/src/js/db.js	2013-11-17 01:16:28 +0000
@@ -55,6 +55,7 @@
             this.packagings_by_id = {};
             this.packagings_by_product_id = {};
             this.packagings_by_ean13 = {};
+            this.customer_list_search_strings = '';
         },
         /* returns the category object from its id. If you pass a list of id as parameters, you get
          * a list of category objects. 
@@ -216,6 +217,35 @@
                 }
             }
         },
+        _customer_search_string: function(customer){
+            var str = '' + customer.id + ':' + customer.name;
+            if(customer.vat){
+                str += '|' + customer.vat;
+            }
+            if(customer.email){
+                str += '|' + customer.email;
+            }
+            if(customer.phone){
+                str += '|' + customer.phone;
+            }
+            if(customer.mobile){
+                str += '|' + customer.mobile;
+            }
+            return str + '\n';
+        },
+        add_customers: function(customers){
+            var stored_customers = this.load('customers',{}); 
+
+            if(!customers instanceof Array){
+                customers = [customers];
+            }
+            for(var i = 0, len = customers.length; i < len; i++){
+                var c = customers[i];
+                this.customer_list_search_strings += this._customer_search_string(c);
+                stored_customers[c.id] = c;
+            }
+            this.save('customers',stored_customers);
+        },
         /* removes all the data from the database. TODO : being able to selectively remove data */
         clear: function(stores){
             for(var i = 0, len = arguments.length; i < len; i++){
@@ -258,6 +288,17 @@
             }
             return list;
         },
+        get_customer_by_id: function(id){
+            return this.load('customers',{})[id];
+        },
+        get_all_customers: function(){
+            list = [];
+            stored_customers = this.load('customers',{});
+            for (var i in stored_customers) {
+                list.push(stored_customers[i]);
+            }
+            return list;
+        },
         /* returns a list of products with :
          * - a category that is or is a child of category_id,
          * - a name, package or ean13 containing the query (case insensitive) 
@@ -276,6 +317,23 @@
             }
             return results;
         },
+        /* returns a list of customers with :
+         *           * - a name, TIN, email, or phone/mobile containing the query (case insensitive) 
+         *            */
+        search_customers: function(query){
+            var re = RegExp("([0-9]+):.*?"+query,"gi");
+            var results = [];
+            for(var i = 0; i < this.limit; i++){
+                r = re.exec(this.customer_list_search_strings);
+                if(r){
+                    var id = Number(r[1]);
+                    results.push(this.get_customer_by_id(id));
+                }else{
+                    break;
+                }
+            }
+            return results;
+        },
         add_order: function(order){
             var order_id = order.uid;
             var orders  = this.load('orders',[]);

=== modified file 'point_of_sale/static/src/js/models.js'
--- point_of_sale/static/src/js/models.js	2013-09-23 17:13:10 +0000
+++ point_of_sale/static/src/js/models.js	2013-11-17 01:16:28 +0000
@@ -26,7 +26,7 @@
             this.proxy = new module.ProxyDevice();              // used to communicate to the hardware devices via a local proxy
             this.proxy_queue = new module.JobQueue();         // used to prevent parallels communications to the proxy
             this.db = new module.PosLS();                       // a database used to store the products and categories
-            this.db.clear('products','categories');
+            this.db.clear('products','categories','customers');
             this.debug = jQuery.deparam(jQuery.param.querystring()).debug !== undefined;    //debug mode 
 
             // default attributes values. If null, it will be loaded below.
@@ -44,6 +44,7 @@
                 'orders':           new module.OrderCollection(),
                 //this is the product list as seen by the product list widgets, it will change based on the category filters
                 'products':         new module.ProductCollection(), 
+                'customers':        new module.CustomerCollection(),
                 'cashRegisters':    null, 
 
                 'bank_statements':  null,
@@ -135,6 +136,10 @@
                 }).then(function(partners){
                     self.set('partner_list',partners);
 
+                    return self.fetch('res.partner', ['name','vat','email','phone','mobile'], [['customer', '=', true]]);
+                }).then(function(customers){
+                    self.db.add_customers(customers);
+
                     return self.fetch('account.tax', ['amount', 'price_include', 'type']);
                 }).then(function(taxes){
                     self.set('taxes', taxes);
@@ -866,7 +871,7 @@
             this.get('paymentLines').each(function(paymentline){
                 paymentlines.push(paymentline.export_for_printing());
             });
-            var client  = this.get('client');
+            var client  = this.pos.get('selectedOrder').get('client');
             var cashier = this.pos.get('cashier') || this.pos.get('user');
             var company = this.pos.get('company');
             var shop    = this.pos.get('shop');
@@ -883,7 +888,7 @@
                 total_discount: this.getDiscountTotal(),
                 change: this.getChange(),
                 name : this.getName(),
-                client: client ? client.name : null ,
+                client: client ? client : null ,
                 invoice_id: null,   //TODO
                 cashier: cashier ? cashier.name : null,
                 date: { 
@@ -919,6 +924,7 @@
             (this.get('paymentLines')).each(_.bind( function(item) {
                 return paymentLines.push([0, 0, item.export_as_JSON()]);
             }, this));
+            var client = this.pos.get('selectedOrder').get('client');
             return {
                 name: this.getName(),
                 amount_paid: this.getPaidTotal(),
@@ -928,7 +934,7 @@
                 lines: orderLines,
                 statement_ids: paymentLines,
                 pos_session_id: this.pos.get('pos_session').id,
-                partner_id: this.get_client() ? this.get_client().id : false,
+                partner_id: client ? client.id : undefined,
                 user_id: this.pos.get('cashier') ? this.pos.get('cashier').id : this.pos.get('user').id,
                 uid: this.uid,
             };
@@ -1019,4 +1025,12 @@
             this.set({buffer:'0'});
         },
     });
+
+    module.Customer = Backbone.Model.extend({
+    });
+
+    module.CustomerCollection = Backbone.Collection.extend({
+        model: module.Customer,
+    });
+
 }

=== modified file 'point_of_sale/static/src/js/screens.js'
--- point_of_sale/static/src/js/screens.js	2013-11-12 15:10:41 +0000
+++ point_of_sale/static/src/js/screens.js	2013-11-17 01:16:28 +0000
@@ -284,8 +284,10 @@
                 this.pos_widget.client_button.hide();
             }
             if(this.cashier_mode){
+                this.pos_widget.select_customer_button.show();
                 this.pos_widget.close_button.show();
             }else{
+                this.pos_widget.select_customer_button.hide();
                 this.pos_widget.close_button.hide();
             }
             
@@ -784,10 +786,13 @@
             this.user = this.pos.get('user');
             this.company = this.pos.get('company');
             this.shop_obj = this.pos.get('shop');
+            this.client = null;
+
         },
         renderElement: function() {
             this._super();
             this.pos.bind('change:selectedOrder', this.change_selected_order, this);
+            this.pos.get('selectedOrder').bind('change:client', this.change_client, this);
             this.change_selected_order();
         },
         show: function(){
@@ -850,6 +855,10 @@
             this.currentPaymentLines.bind('all', this.refresh, this);
             this.refresh();
         },
+        change_client: function() {
+            this.client = this.pos.get('selectedOrder').get('client');
+            this.refresh();
+        },
         refresh: function() {
             this.currentOrder = this.pos.get('selectedOrder');
             $('.pos-receipt-container', this.$el).html(QWeb.render('PosTicket',{widget:this}));
@@ -874,53 +883,53 @@
             var self = this;
 
             if( this.pos.iface_cashdrawer && this.pos.get('selectedOrder').get('paymentLines').find(                function(pl){ return pl.cashregister.get('journal').type === 'cash'; })){
-                    this.pos.proxy.open_cashbox();
+                this.pos.proxy.open_cashbox();
             }
 
             this.set_numpad_state(this.pos_widget.numpad.state);
-            
-            this.add_action_button({
-                    label: _t('Back'),
-                    icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
-                    click: function(){  
-                        _.each(self.paymentlinewidgets, function(widget){
-                            if( widget.payment_line.get_amount() === 0 ){
-                                widget.payment_line.destroy();
-                            }
-                        });
-                        self.pos_widget.screen_selector.set_current_screen(self.back_screen);
-                    },
-                });
-
-            this.add_action_button({
-                    label: _t('Validate'),
-                    name: 'validation',
-                    icon: '/point_of_sale/static/src/img/icons/png48/validate.png',
-                    click: function(){
-                        self.validateCurrentOrder();
-                    },
-                });
-           
+
+            this.add_action_button({
+                label: _t('Back'),
+                icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
+                click: function(){  
+                    _.each(self.paymentlinewidgets, function(widget){
+                        if( widget.payment_line.get_amount() === 0 ){
+                            widget.payment_line.destroy();
+                        }
+                    });
+                    self.pos_widget.screen_selector.set_current_screen(self.back_screen);
+                },
+            });
+
+            this.add_action_button({
+                label: _t('Validate'),
+                name: 'validation',
+                icon: '/point_of_sale/static/src/img/icons/png48/validate.png',
+                click: function(){
+                    self.validateCurrentOrder();
+                },
+            });
+
             if(this.pos.iface_invoicing){
                 this.add_action_button({
-                        label: 'Invoice',
-                        name: 'invoice',
-                        icon: '/point_of_sale/static/src/img/icons/png48/invoice.png',
-                        click: function(){
-                            self.validateCurrentOrder({invoice: true});
-                        },
-                    });
+                    label: 'Invoice',
+                    name: 'invoice',
+                    icon: '/point_of_sale/static/src/img/icons/png48/invoice.png',
+                    click: function(){
+                        self.validateCurrentOrder({invoice: true});
+                    },
+                });
             }
 
             if( this.pos.iface_cashdrawer ){
                 this.add_action_button({
-                        label: _t('Cash'),
-                        name: 'cashbox',
-                        icon: '/point_of_sale/static/src/img/open-cashbox.png',
-                        click: function(){
-                            self.pos.proxy.open_cashbox();
-                        },
-                    });
+                    label: _t('Cash'),
+                    name: 'cashbox',
+                    icon: '/point_of_sale/static/src/img/open-cashbox.png',
+                    click: function(){
+                        self.pos.proxy.open_cashbox();
+                    },
+                });
             }
 
             this.updatePaymentSummary();
@@ -966,12 +975,12 @@
 
             }else{
                 this.pos.push_order(currentOrder) 
-                if(this.pos.iface_print_via_proxy){
-                    this.pos.proxy.print_receipt(currentOrder.export_for_printing());
-                    this.pos.get('selectedOrder').destroy();    //finish order and go back to scan screen
-                }else{
-                    this.pos_widget.screen_selector.set_current_screen(this.next_screen);
-                }
+                    if(this.pos.iface_print_via_proxy){
+                        this.pos.proxy.print_receipt(currentOrder.export_for_printing());
+                        this.pos.get('selectedOrder').destroy();    //finish order and go back to scan screen
+                    }else{
+                        this.pos_widget.screen_selector.set_current_screen(this.next_screen);
+                    }
             }
         },
         bindPaymentLineEvents: function() {
@@ -1004,7 +1013,7 @@
         addPaymentLine: function(newPaymentLine) {
             var self = this;
             var l = new module.PaymentlineWidget(this, {
-                    payment_line: newPaymentLine,
+                payment_line: newPaymentLine,
             });
             l.on('delete_payment_line', self, function(r) {
                 self.deleteLine(r);
@@ -1023,14 +1032,14 @@
                 this.paymentlinewidgets[i].destroy();
             }
             this.paymentlinewidgets = [];
-            
+
             this.currentPaymentLines.each(_.bind( function(paymentLine) {
                 this.addPaymentLine(paymentLine);
             }, this));
             this.updatePaymentSummary();
         },
         deleteLine: function(lineWidget) {
-        	this.currentPaymentLines.remove([lineWidget.payment_line]);
+            this.currentPaymentLines.remove([lineWidget.payment_line]);
             lineWidget.destroy();
         },
         updatePaymentSummary: function() {
@@ -1047,30 +1056,104 @@
             if(currentOrder.selected_orderline === undefined){
                 remaining = 1;  // What is this ? 
             }
-                
+
             if(this.pos_widget.action_bar){
                 this.pos_widget.action_bar.set_button_disabled('validation', remaining > 0.000001);
                 this.pos_widget.action_bar.set_button_disabled('invoice', remaining > 0.000001);
             }
         },
         set_numpad_state: function(numpadState) {
-        	if (this.numpadState) {
-        		this.numpadState.unbind('set_value', this.set_value);
-        		this.numpadState.unbind('change:mode', this.setNumpadMode);
-        	}
-        	this.numpadState = numpadState;
-        	if (this.numpadState) {
-        		this.numpadState.bind('set_value', this.set_value, this);
-        		this.numpadState.bind('change:mode', this.setNumpadMode, this);
-        		this.numpadState.reset();
-        		this.setNumpadMode();
-        	}
-        },
-    	setNumpadMode: function() {
-    		this.numpadState.set({mode: 'payment'});
-    	},
+            if (this.numpadState) {
+                this.numpadState.unbind('set_value', this.set_value);
+                this.numpadState.unbind('change:mode', this.setNumpadMode);
+            }
+            this.numpadState = numpadState;
+            if (this.numpadState) {
+                this.numpadState.bind('set_value', this.set_value, this);
+                this.numpadState.bind('change:mode', this.setNumpadMode, this);
+                this.numpadState.reset();
+                this.setNumpadMode();
+            }
+        },
+        setNumpadMode: function() {
+            this.numpadState.set({mode: 'payment'});
+        },
         set_value: function(val) {
-        	this.currentPaymentLines.last().set_amount(val);
-        },
-    });
+            this.currentPaymentLines.last().set_amount(val);
+        },
+    });
+    module.SelectCustomerPopupWidget = module.PopUpWidget.extend({
+        template:'SelectCustomerPopupWidget',
+
+        start: function(){
+            this._super();
+            var self = this;
+            this.customer_list_widget = new module.CustomerListWidget(this,{
+                click_customer_action: function(customer){
+                    this.pos.get('selectedOrder').set_client(customer);
+                    this.pos_widget.customername.refresh();
+                    this.pos_widget.screen_selector.set_current_screen('products');
+                },
+            });
+        },
+
+        show: function(){
+            this._super();
+            var self = this;
+            this.renderElement();
+
+            this.customer_list_widget.replace($('.placeholder-CustomerListWidget'));
+
+            this.$('.button.cancel').off('click').click(function(){
+                self.pos_widget.screen_selector.set_current_screen('products');
+            });
+
+            this.customer_search();
+        },
+
+        // Customer search filter
+        customer_search: function(){
+            var self = this;
+
+            // find all products belonging to the current category
+            var customers = this.pos.db.get_all_customers();
+            self.pos.get('customers').reset(customers);
+
+            // filter customers according to the search string
+            this.$('.customer-searchbox input').keyup(function(event){
+                query = $(this).val().toLowerCase();
+                if(query){
+                    var customers = self.pos.db.search_customers(query);
+                    self.pos.get('customers').reset(customers);
+                    self.$('.customer-search-clear').fadeIn();
+                    if(event.keyCode == 13){
+                        var c = null;
+                        if(customers.length == 1){
+                            c = self.pos.get('customers').get(customers[0]);
+                        }
+                        if(c !== null){
+                            self.pos_widget.select_customer_popup.customer_list_widget.click_customer_action(c);
+                            self.$('.customer-search-clear').trigger('click');
+                        }
+                    }
+                }else{
+                    var customers = self.pos.db.get_all_customers();
+                    self.pos.get('customers').reset(customers);
+                    self.$('.customer-search-clear').fadeOut();
+                }
+            });
+
+            this.$('.customer-searchbox input').click(function(){}); //Why ???
+
+            //reset the search when clicking on reset
+            this.$('.customer-search-clear').click(function(){
+                var customers = self.pos.db.get_all_customers();
+                self.pos.get('customers').reset(customers);
+                self.$('.customer-searchbox input').val('').focus();
+                self.$('.customer-search-clear').fadeOut();
+            });
+        },
+
+    });
+
 }

=== modified file 'point_of_sale/static/src/js/widgets.js'
--- point_of_sale/static/src/js/widgets.js	2013-11-12 16:05:34 +0000
+++ point_of_sale/static/src/js/widgets.js	2013-11-17 01:16:28 +0000
@@ -672,6 +672,27 @@
         },
     });
 
+    module.CustomernameWidget = module.PosBaseWidget.extend({
+        template: 'CustomernameWidget',
+        init: function(parent, options){
+            var options = options || {};
+            this._super(parent,options);
+            this.pos.bind('change:selectedOrder', this.renderElement, this);
+        },
+        refresh: function(){
+            this.renderElement();
+        },
+        get_name: function(){
+            var user;
+            customer = this.pos.get('selectedOrder').get_client();
+            if(customer){
+                return customer.name;
+            }else{
+                return "";
+            }
+        },
+    });
+
     module.HeaderButtonWidget = module.PosBaseWidget.extend({
         template: 'HeaderButtonWidget',
         init: function(parent, options){
@@ -961,6 +982,9 @@
             this.error_invoice_transfer_popup = new module.ErrorInvoiceTransferPopupWidget(this, {});
             this.error_invoice_transfer_popup.appendTo($('.point-of-sale'));
 
+            this.select_customer_popup = new module.SelectCustomerPopupWidget(this, {});
+            this.select_customer_popup.appendTo($('.point-of-sale'));
+
             // --------  Misc ---------
 
             this.notification = new module.SynchNotificationWidget(this,{});
@@ -1001,7 +1025,15 @@
             });
             this.client_button.appendTo(this.$('#rightheader'));
 
-            
+            this.select_customer_button = new module.HeaderButtonWidget(this,{
+                label:'Select Customer',
+                action: function(){ self.screen_selector.show_popup('select-customer'); },
+            });
+            this.select_customer_button.appendTo(this.$('#rightheader'));
+
+            this.customername = new module.CustomernameWidget(this,{});
+            this.customername.appendTo(this.$('#rightheader'));
+
             // --------  Screen Selector ---------
 
             this.screen_selector = new module.ScreenSelector({
@@ -1024,6 +1056,7 @@
                     'choose-receipt': this.choose_receipt_popup,
                     'error-no-client': this.error_no_client_popup,
                     'error-invoice-transfer': this.error_invoice_transfer_popup,
+                    'select-customer': this.select_customer_popup,
                 },
                 default_client_screen: 'welcome',
                 default_cashier_screen: 'products',
@@ -1133,4 +1166,59 @@
             this._super();
         }
     });
+    module.CustomerWidget = module.PosBaseWidget.extend({
+        template: 'CustomerWidget',
+        init: function(parent, options) {
+            this._super(parent,options);
+            this.model = options.model;
+            this.click_customer_action = options.click_customer_action;
+        },
+        renderElement: function() {
+            this._super();
+            var self = this;
+            $("a", this.$el).click(function(e){
+                if(self.click_customer_action){
+                    self.click_customer_action(self.model.toJSON());
+                }
+            });
+        },
+    });
+
+    module.CustomerListWidget = module.ScreenWidget.extend({
+        template:'CustomerListWidget',
+        init: function(parent, options) {
+            var self = this;
+            this._super(parent,options);
+            this.model = options.model;
+            this.customer_list = [];
+            this.next_screen = options.next_screen || false;
+            this.click_customer_action = options.click_customer_action;
+
+            var customers = self.pos.db.get_all_customers();
+            self.pos.get('customers').reset(customers);
+            this.pos.get('customers').bind('reset', function(){
+                self.renderElement();
+            });
+        },
+        renderElement: function() {
+            var self = this;
+            this._super();
+            this.customer_list = [];
+
+            this.pos.get('customers')
+                .chain()
+                .map(function(customer) {
+                    var customer = new module.CustomerWidget(self, {
+                        model: customer,
+                        next_screen: 'products',
+                        click_customer_action: self.click_customer_action,
+                    })
+                    self.customer_list.push(customer);
+                    return customer;
+                })
+            .invoke('appendTo', this.$('.customer-list'));
+
+        },
+    });
+
 }

=== modified file 'point_of_sale/static/src/xml/pos.xml'
--- point_of_sale/static/src/xml/pos.xml	2013-11-12 14:04:57 +0000
+++ point_of_sale/static/src/xml/pos.xml	2013-11-17 01:16:28 +0000
@@ -582,6 +582,12 @@
         </span>
     </t>
 
+    <t t-name="CustomernameWidget">
+        <span class="customername">
+            <t t-esc="widget.get_name()" />
+        </span>
+    </t>
+
     <t t-name="PosTicket">
         <div class="pos-sale-ticket">
             
@@ -589,9 +595,18 @@
                 Date.CultureInfo.formatPatterns.longTime)"/> <t t-esc="widget.currentOrder.attributes.name"/></div>
             <br />
             <t t-esc="widget.company.name"/><br />
+            <t t-if="widget.company.vat">
+                TIN: <t t-esc="widget.company.vat"/><br />
+            </t>
             Phone: <t t-esc="widget.company.phone || ''"/><br />
             User: <t t-esc="widget.user.name"/><br />
             Shop: <t t-esc="widget.shop_obj.name"/><br />
+            <t t-if="widget.client">
+                Customer: <t t-esc="widget.client.name"/><br />
+                <t t-if="widget.client.vat">
+                    Customer TIN: <t t-esc="widget.client.vat"/><br />                    
+                </t>
+            </t>
             <br />
             <table>
                 <colgroup>
@@ -780,5 +795,67 @@
             <p class="close_button">close</p>
         </div>
     </t>
+    <t t-name="CustomerListWidget">
+        <div class='customer-list-container'>
+            <div class="customer-list-scroller">
+                <ol id="customers-screen-ol" class="customer-list">
+                </ol>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="SelectCustomerPopupWidget">
+        <div class="modal-dialog">
+            <div class="popup-selection">
+                <div class="customer-title">
+                    Customer Selection
+                </div>
+
+                <div class="customer-searchbox">
+                    <input placeholder="Search Customers" />
+                    <img class="customer-search-clear" src="/point_of_sale/static/src/img/search_reset.gif" />
+                </div>
+
+                <div class="content-container">
+                    <span class="placeholder-CustomerListWidget" />
+                </div>
+
+                <div id="customer-cancel" class = "button cancel">
+                    Cancel
+                </div>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="CustomerWidget">
+        <li class='customer'>
+            <a href="#">
+                <span class="customer-field customer-name">
+                    <t t-esc="widget.model.get('name')"/>
+                </span>
+                <span class="customer-field">
+                    <t t-if="widget.model.get('vat')">
+                        <t t-esc="widget.model.get('vat')"/>
+                    </t>
+                </span>
+                <span class="customer-field">
+                    <t t-if="widget.model.get('email')">
+                        <t t-esc="widget.model.get('email')"/>
+                    </t>
+                </span>
+                <span class="customer-field customer-phone">
+                    <t t-if="widget.model.get('phone')">
+                        <t t-esc="widget.model.get('phone')"/>
+                    </t>
+                </span>
+                <span class="customer-field customer-phone">
+                    <t t-if="widget.model.get('mobile')">
+                        <t t-esc="widget.model.get('mobile')"/>
+                    </t>
+                </span>
+            </a>
+        </li>
+    </t>
+
 
 </templates>

=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml	2013-10-17 11:35:03 +0000
+++ project_issue/project_issue_view.xml	2013-11-17 01:16:28 +0000
@@ -81,6 +81,8 @@
                             <label for="task_id" groups="base.group_user"/>
                             <div groups="base.group_user">
                                 <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/>
+                                <button string="Convert To Task" name="convert_issue_task" icon="gtk-index" type="object"
+                                    attrs="{'invisible':[('task_id','!=',False)]}" />
                                 <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}" class="oe_inline"/>
                             </div>
                         </group>