Merge lp:~mmakonnen/openobject-addons/point_of_sale_enhanced-70 into lp:openobject-addons

[Mauricio Matute]

Unmerged revisions

8522. By Michael Telahun Makonnen on 2013-01-09

In point_of_sale module add ability to select customer from the POS screen

Add a button in the upper right header which, when clicked, pops up a
dialog box to select a customer. You can search for a customer by
name, tin no, email, phone or mobile.

Currently doesn't support adding a new customer from this screen. You
will have to leave the POS and add the customer in the normal way.

8521. By Michael Telahun Makonnen on 2013-01-07

Add a keypad input device to the point of sale

It uses the numeric keypad on the keyboard to mimic the keypad found on
most cash registers. The numbers are used to match a product by its code,
and the non-numeric keys are used as modifiers:
'/' - X Quantity
'*' - AMT Manual Price Override
'-' - % - Discount %
'+' - PLU (Product Code)
Keyboard "Back Space" and "Delete" keys may be used to clear the buffer.

It may be useful to tape over the modifier keys with the appropriate
symbols to make it easier for the cashiers to get used to it.

Implementation Notes:
---------------------
  - By necessity the product code may contain only numeric identifiers
  - Doesn't emulate VOID key (using Enter key would interfere with
    bar code reader)
  - Doesn't emulate surcharge key (% +)

Some examples of usage showing what the operation would look like
on a regular Cash Register and using the numeric keypad:

1. Add a product
   (code: 100, quantity: 1, Price:list price, no discount)
    Cash Register: 100 [PLU]
    Numeric Keypad: 100 +

2. Add 9 pieces of a product
   (code: 102, quantity: 9, Price: list price, no discount)
    Cash Register: 9 [ X ] 102 [PLU]
    Numeric Keypad: 9 / 102 +

3. Add 3 pieces of a product and set the price at 9.99
   (code: 450, quantity: 3, Price: 9.99, no discount)
    Cash Register: 3 [ X ] 9.99 [AMT] 450 [PLU]
    Numeric Keypad: 3 / 9.99 * 450 +

4. Add 5 pieces of a product, set price to 23.50, and discount it by 10%
   (code: 300, quantity: 5, price: 23.50, discount: 10%)
    Cash Register: 5 [ X ] 23.50 [AMT] 10 [% -] 300 [PLU]
    Numeric Keypad: 5 / 23.50 * 10 - 300 +

8520. By Michael Telahun Makonnen on 2013-01-02

POS: When we hit [Enter] in the search box add the product with the matching product code

The previous commit only added the product if it was the only one returned by the search.
Now, it will search the list of matched products for one with the same exact
product code as the search term. If it finds a match it will add it to the order.

8519. By Michael Telahun Makonnen on 2013-01-02

POS: hitting [Enter] in the search field will add the product to the order

8518. By Michael Telahun Makonnen on 2013-01-02

In POS allow searching by product code as well

8517. By Michael Telahun Makonnen on 2013-01-01

In the POS module show the product code before the price

If you have a lot of similarly (identicaly) named products it becomes difficult to
tell them apart in the POS unless you can also see their code.

=== modified file 'point_of_sale/controllers/main.py'
--- point_of_sale/controllers/main.py	2013-10-22 17:06:59 +0000
+++ point_of_sale/controllers/main.py	2013-11-11 21:43:26 +0000
@@ -89,8 +89,29 @@
         """
         print 'scan_item_error_unrecognized: ' + str(ean)
 
+<<<<<<< TREE
     @http.route('/pos/help_needed', type='json', auth='admin')
     def help_needed(self):
+=======
+    @openerp.addons.web.http.jsonrequest
+    def keypad_item_success(self, request, data):
+        """
+        A product has been entered by keypad with success
+        """
+        print 'keypad_item_success: ' + str(data)
+        return 
+
+    @openerp.addons.web.http.jsonrequest
+    def keypad_item_error_unrecognized(self, request, data):
+        """
+        A product has been entered by keypad without success
+        """
+        print 'keypad_item_error_unrecognized: ' + str(data)
+        return 
+
+    @openerp.addons.web.http.jsonrequest
+    def help_needed(self, request):
+>>>>>>> MERGE-SOURCE
         """
         The user wants an help (ex: light is on)
         """
 
=== 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-11 21:43:26 +0000
@@ -502,15 +502,24 @@
         for tmp_order in orders:
             to_invoice = tmp_order['to_invoice']
             order = tmp_order['data']
-
-
+<<<<<<< TREE
+
+
+=======
+            partner_id = order['partner_id'] if 'partner_id' in order else False
+>>>>>>> MERGE-SOURCE
             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'],
+<<<<<<< TREE
                 'pos_reference':order['name'],
                 'partner_id': order['partner_id'] or False
+=======
+                'pos_reference':order['name'],
+                'partner_id':partner_id,
+>>>>>>> MERGE-SOURCE
             }, context)
             for payments in order['statement_ids']:
                 payment = payments[2]
 
=== modified file 'point_of_sale/static/src/css/pos.css'
--- point_of_sale/static/src/css/pos.css	2013-09-17 10:19:10 +0000
+++ point_of_sale/static/src/css/pos.css	2013-11-11 21:43:26 +0000
@@ -205,6 +205,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{
@@ -605,6 +614,15 @@
     max-width:  120px;
 }
 
+.point-of-sale .product .code-tag {
+    position: absolute;
+    top: 2px;
+    left: 2px;
+    vertical-align: top;
+    line-height: 13px;
+    padding: 2px 5px;
+}
+
 .point-of-sale .product .price-tag {
     position: absolute;
     top: 2px;
@@ -1373,6 +1391,161 @@
     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-11 21:43:26 +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-11 21:43:26 +0000
@@ -54,7 +54,11 @@
             this.category_search_string = {};
             this.packagings_by_id = {};
             this.packagings_by_product_id = {};
+<<<<<<< TREE
             this.packagings_by_ean13 = {};
+=======
+            this.customer_list_search_strings = '';
+>>>>>>> MERGE-SOURCE
         },
         /* returns the category object from its id. If you pass a list of id as parameters, you get
          * a list of category objects. 
@@ -151,9 +155,15 @@
             if(product.ean13){
                 str += '|' + product.ean13;
             }
+<<<<<<< TREE
             if(product.default_code){
                 str += '|' + product.default_code;
             }
+=======
+            if(product.code){
+                str += '|' + product.code;
+            }
+>>>>>>> MERGE-SOURCE
             var packagings = this.packagings_by_product_id[product.id] || [];
             for(var i = 0; i < packagings.length; i++){
                 str += '|' + packagings[i].ean;
@@ -216,6 +226,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++){
@@ -245,9 +284,20 @@
             }
             return undefined;
         },
+<<<<<<< TREE
         get_product_by_reference: function(ref){
             return this.product_by_reference[ref];
         },
+=======
+        get_product_by_code: function(code){
+            var products = this.load('products', {});
+            for(var i in products){
+                if(products[i] && products[i].code === code){
+                    return products[i];
+                }
+            }
+        },
+>>>>>>> MERGE-SOURCE
         get_product_by_category: function(category_id){
             var product_ids  = this.product_by_category_id[category_id];
             var list = [];
@@ -258,6 +308,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 +337,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/devices.js'
--- point_of_sale/static/src/js/devices.js	2013-09-24 11:07:01 +0000
+++ point_of_sale/static/src/js/devices.js	2013-11-11 21:43:26 +0000
@@ -156,6 +156,18 @@
             return this.message('scan_item_error_unrecognized',{ean: ean});
         },
 
+        //a product has been entered by keypad and recognized with success
+        // data is a parsed {product.code,qty,price} object
+        keypad_item_success: function(data){
+            return this.message('keypad_item_success',{data: data});
+        },
+
+        // a product has been entered by keypad but not recognized
+        // data is a parsed {product.code,qty,price} object
+        keypad_item_error_unrecognized: function(data){
+            return this.message('keypad_item_error_unrecognized',{data: data});
+        },
+        
         //the client is asking for help
         help_needed: function(){
             return this.message('help_needed');
@@ -600,5 +612,172 @@
             $('body').off('keypress', this.handler)
         },
     });
+    
+    // this module mimics a keypad-only cash register. Use connect() and 
+    // disconnect() to activate and deactivate it. Use set_action_callback to
+    // tell it what to do when the cashier enters product data(qty, price, etc).
+    module.Keypad = instance.web.Class.extend({
+        init: function(attributes){
+            this.pos = attributes.pos;
+            this.action_callback = undefined;
+            this.saved_callback_stack = [];
+        },
+
+        save_callback: function(){
+            this.saved_callback_stack.push(this.action_callback);
+        },
+
+        restore_callback: function(){
+            if (this.saved_callback_stack.length > 0) {
+                this.action_callback = this.saved_callback_stack.pop();
+            }
+        },
+
+        set_action_callback: function(callback){
+            this.action_callback = callback
+        },
+
+        //remove action callback
+        reset_action_callback: function(){
+            this.action_callback = undefined;
+        },
+        
+        reset_parse_result: function(parse_result) {
+            parse_result.code = 0;
+            parse_result.qty = 0;
+            parse_result.priceOverride = false;
+            parse_result.price = 0.00;
+            parse_result.discount = 0.00;
+            parse_result.void_last_line = false;
+        },
+        
+        copy_parse_result: function(src) {
+            var dst = {
+                code:          null,
+                qty:           1,
+                priceOverride: false,
+                price:         0.00,
+                discount:      0.00,
+                void_last_line: false,
+            };
+            dst.code = src.code;
+            dst.qty = src.qty;
+            dst.priceOverride = src.priceOverride;
+            dst.price = src.price;
+            dst.discount = src.discount;
+            dst.void_last_line = src.void_last_line;
+            return dst;
+        },
+
+        // starts catching keyboard events and tries to interpret keystrokes, 
+        // calling the callback when needed.
+        connect: function(){
+            var self = this;
+            var KC_PLU = 107;      // KeyCode: Product Code (Keypad '+')
+            var KC_QTY = 111;      // KeyCode: Quantity (Keypad '/')
+            var KC_AMT = 106;      // KeyCode: Price (Keypad '*')
+            var KC_DISC = 109;     // KeyCode: Discount Percentage [0..100] (Keypad '-')
+            var KC_VOID = 13;      // KeyCode: Void current line (Keyboard/Keypad Enter key)
+            var KC_CLR1 = 46;      // KeyCode: Clear last line of order (Keyboard Delete key)
+            var KC_CLR2 = 8;       // KeyCode: Clear current line (Keyboard Backspace key)
+            var codeNumbers = [];
+            var codeChars = [];
+            var parse_result = {
+                code:          null,
+                qty:           1,
+                priceOverride: false,
+                price:         0.00,
+                discount:      0.00,
+                void_last_line: false,
+            };
+            var kc_lookup = {
+                96: '0',
+                97: '1',
+                98: '2',
+                99: '3',
+                100: '4',
+                101: '5',
+                102: '6',
+                103: '7',
+                104: '8',
+                105: '9',
+                106: '*',
+                107: '+',
+                109: '-',
+                110: '.',
+                111: '/',
+            };
+
+            // Catch keyup events anywhere in the POS interface.  Barcode reader also does this, but won't interfere
+            // because it looks for a specific timing between keyup events. On the plus side this should mean that you
+            // can use both the keypad and the barcode reader during the same session (but for separate order lines).
+            // This could be useful in cases where the scanner can't read the barcode.
+            $('body').delegate('','keyup', function (e){
+                console.log('keyup:'+String.fromCharCode(e.keyCode)+' '+e.keyCode,e);
+                //We only care about numbers and modifiers
+                token = e.keyCode;                
+                if ((token >= 96 && token <= 111) || token === KC_PLU || token === KC_QTY || token === KC_AMT) {
+
+                    if (token === KC_PLU) {
+                        parse_result.code = codeChars.join('');
+                        var res = self.copy_parse_result(parse_result);
+                        codeNumbers = [];
+                        codeChars = [];
+                        self.reset_parse_result(parse_result);
+                        console.log('PLU token: code:'+res.code+', qty:'+res.qty+', price:'+res.price+', discount:'+res.discount);
+                        self.action_callback(res);
+                    } else if (token === KC_QTY) {
+                        parse_result.qty = parseInt(codeChars.join(''));
+                        codeNumbers = [];
+                        codeChars = [];
+                        console.log('QTY token: qty:'+parse_result.qty);
+                    } else if (token === KC_AMT) {
+                        parse_result.price = parseFloat(codeChars.join('')).toFixed(2);
+                        parse_result.priceOverride = true;
+                        codeNumbers = [];
+                        codeChars = [];
+                        console.log('AMT token: price:'+parse_result.price);
+                    } else if (token === KC_DISC) {
+                        parse_result.discount = parseFloat(codeChars.join(''));
+                        codeNumbers = [];
+                        codeChars = [];
+                        console.log('DISC token: discount:'+parse_result.discount);
+                    } else {
+                        codeNumbers.push(token - 48);
+                        codeChars.push(kc_lookup[token]);
+                    }
+                } else if (token === KC_VOID) {
+                    /*
+                     * This is commented out for now. We don't want to interfere with
+                     * the 'Enter' keycode used by the barcode reader to signify a scan.
+                     */
+                    // Void the last line of the order only if there isn't another line in pregress.
+//                    if (codeNumbers.length === 0) {
+//                        parse_result.void_last_line = true;
+//                        var res = self.copy_parse_result(parse_result);
+//                        codeNumbers = [];
+//                        codeChars = [];
+//                        self.reset_parse_result(parse_result);
+//                        console.log('VOID token:'+res.void_last_line);
+//                        self.action_callback(res);
+//                    }
+                } else {
+                    // For now pressing Backspace or Delete just defaults to doing nothing.
+                    // In the future we might want it to display a popup or something.
+                    if (token === KC_CLR1 || token === KC_CLR2) {
+                        ;
+                    }
+                    codeNumbers = [];
+                    codeChars = [];
+                    self.reset_parse_result(parse_result);
+                }
+            });
+        },
+
+        // stops catching keyboard events 
+        disconnect: function(){
+            $('body').undelegate('', 'keyup')
+        },
+    });
 
 }
 
=== 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-11 21:43:26 +0000
@@ -23,11 +23,18 @@
             this.flush_mutex = new $.Mutex();                   // used to make sure the orders are sent to the server once at time
 
             this.barcode_reader = new module.BarcodeReader({'pos': this});  // used to read barcodes
+            this.keypad = new module.Keypad({'pos': this});     // used to simulate a cash register keypad
             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
+<<<<<<< TREE
             this.db.clear('products','categories');
             this.debug = jQuery.deparam(jQuery.param.querystring()).debug !== undefined;    //debug mode 
+=======
+            this.db.clear('products','categories','customers');
+            this.debug = jQuery.deparam(jQuery.param.querystring()).debug !== undefined;    //debug mode
+
+>>>>>>> MERGE-SOURCE
 
             // default attributes values. If null, it will be loaded below.
             this.set({
@@ -44,6 +51,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 +143,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);
@@ -187,7 +199,11 @@
 
                     return self.fetch(
                         'product.product', 
+<<<<<<< TREE
                         ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'default_code',
+=======
+                        ['name', 'code', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 
+>>>>>>> MERGE-SOURCE
                          'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
                         [['sale_ok','=',true],['available_in_pos','=',true]],
                         {pricelist: self.get('pricelist').id} // context for price
@@ -450,6 +466,46 @@
             }
             return true;
         },
+
+        keypad_enter_product: function(parsed_data){
+            var self = this;
+            var doMerge = true;
+            var product = this.db.get_product_by_code(parsed_data.code);
+            var selectedOrder = this.get('selectedOrder');
+
+            if (parsed_data.void_last_line) {
+                line = selectedOrder.getLastOrderline();
+                if (line) {
+                    line.set_quantity(Number.NaN);
+                }
+                return true;
+            }
+            
+            if (!product){
+                return false;
+            }
+            
+            if (parsed_data.discount > 0) {
+                doMerge = false;
+            }
+            
+            if (!parsed_data.priceOverride) {
+                parsed_data.price = product.price;
+            }
+
+//            if (product.get('to_weight') && self.pos.iface_electronic_scale) {
+//                self.pos_widget.screen_selector.set_current_screen(self.scale_screen, {product: product});
+//            } else {
+                selectedOrder.addProduct(new module.Product(product), { quantity: parsed_data.qty,
+                                                                        price: parsed_data.price,
+                                                                        merge: doMerge});
+//            }
+            if (!doMerge){
+                selectedOrder.selected_orderline.set_discount(parsed_data.discount);
+            }
+            self.get('products').reset(product);
+            return true;
+        },
     });
 
     module.CashRegister = Backbone.Model.extend({
@@ -866,7 +922,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 +939,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 +975,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 +985,11 @@
                 lines: orderLines,
                 statement_ids: paymentLines,
                 pos_session_id: this.pos.get('pos_session').id,
+<<<<<<< TREE
                 partner_id: this.get_client() ? this.get_client().id : false,
+=======
+                partner_id: client ? client.id : undefined,
+>>>>>>> MERGE-SOURCE
                 user_id: this.pos.get('cashier') ? this.pos.get('cashier').id : this.pos.get('user').id,
                 uid: this.uid,
             };
@@ -1019,4 +1080,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-09-23 14:51:39 +0000
+++ point_of_sale/static/src/js/screens.js	2013-11-11 21:43:26 +0000
@@ -223,6 +223,20 @@
             }
         },
 
+        // what happens when a product is entered by keypad emulator : 
+        // it will add the product to the order.
+        keypad_product_action: function(data){
+            var self = this;
+            if(self.pos.keypad_enter_product(data)){
+                self.pos.proxy.keypad_item_success(data);
+            }else{
+                self.pos.proxy.keypad_item_error_unrecognized(data);
+                if(self.product_error_popup && self.pos_widget.screen_selector.get_user_mode() === 'cashier'){
+                    self.pos_widget.screen_selector.show_popup(self.product_error_popup);
+                }
+            }
+        },
+
         // shows an action bar on the screen. The actionbar is automatically shown when you add a button
         // with add_action_button()
         show_action_bar: function(){
@@ -283,9 +297,15 @@
             }else{
                 this.pos_widget.client_button.hide();
             }
+<<<<<<< TREE
             if(this.cashier_mode){
+=======
+            if(cashier_mode){
+                this.pos_widget.select_customer_button.show();
+>>>>>>> MERGE-SOURCE
                 this.pos_widget.close_button.show();
             }else{
+                this.pos_widget.select_customer_button.hide();
                 this.pos_widget.close_button.hide();
             }
             
@@ -297,11 +317,16 @@
                 'client' : self.barcode_client_action ?  function(code){ self.barcode_client_action(code);  } : undefined ,
                 'discount': self.barcode_discount_action ? function(code){ self.barcode_discount_action(code); } : undefined,
             });
+            
+            this.pos.keypad.set_action_callback(function(data){ self.keypad_product_action(data); });
         },
 
         // this method is called when the screen is closed to make place for a new screen. this is a good place
         // to put your cleanup stuff as it is guaranteed that for each show() there is one and only one close()
         close: function(){
+            if(this.pos.keypad){
+                this.pos.keypad.reset_action_callback();
+            }
             if(this.pos.barcode_reader){
                 this.pos.barcode_reader.reset_action_callbacks();
             }
@@ -401,6 +426,7 @@
             this._super();
             this.pos.proxy.help_needed();
             this.pos.proxy.scan_item_error_unrecognized();
+            this.pos.proxy.keypad_item_error_unrecognized();
 
             this.pos.barcode_reader.save_callbacks();
             this.pos.barcode_reader.reset_action_callbacks();
@@ -411,6 +437,8 @@
                     self.pos_widget.screen_selector.set_user_mode('cashier');
                 },
             });
+            this.pos.keypad.save_callback();
+            this.pos.keypad.reset_action_callback();
             this.$('.footer .button').off('click').click(function(){
                 self.pos_widget.screen_selector.close_popup();
             });
@@ -418,6 +446,7 @@
         close:function(){
             this._super();
             this.pos.proxy.help_canceled();
+            this.pos.keypad.restore_callback();
             this.pos.barcode_reader.restore_callbacks();
         },
     });
@@ -784,10 +813,12 @@
             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 +881,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}));
@@ -1062,4 +1097,82 @@
         	this.currentPaymentLines.last().set_amount(val);
         },
     });
+<<<<<<< TREE
+=======
+    
+    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();
+            });
+        },
+
+    });
+
+>>>>>>> MERGE-SOURCE
 }
 
=== modified file 'point_of_sale/static/src/js/widgets.js'
--- point_of_sale/static/src/js/widgets.js	2013-10-09 13:29:44 +0000
+++ point_of_sale/static/src/js/widgets.js	2013-11-11 21:43:26 +0000
@@ -561,10 +561,15 @@
             self.pos.get('products').reset(products);
 
             // filter the products according to the search string
+<<<<<<< TREE
             this.$('.searchbox input').keyup(function(event){
                 console.log('event',event);
+=======
+            this.$('.searchbox input').keyup(function(event){
+>>>>>>> MERGE-SOURCE
                 query = $(this).val().toLowerCase();
                 if(query){
+<<<<<<< TREE
                     if(event.which === 13){
                         if( self.pos.get('products').size() === 1 ){
                             self.pos.get('selectedOrder').addProduct(self.pos.get('products').at(0));
@@ -575,6 +580,30 @@
                         self.pos.get('products').reset(products);
                         self.$('.search-clear').fadeIn();
                     }
+=======
+                    var products = self.pos.db.search_product_in_category(self.category.id, query);
+                    self.pos.get('products').reset(products);
+                    self.$('.search-clear').fadeIn();
+                    if(event.keyCode == 13){
+                        var p = null;
+                        if(products.length > 1){
+                            i = 0;
+                            while(i < products.length){
+                                if (products[i].code == query){
+                                    p = self.pos.get('products').get(products[i]);
+                                    break;
+                                }
+                                i++;
+                            }
+                        }else if(products.length == 1){
+                            p = self.pos.get('products').get(products[0]);
+                        }
+                        if(p !== null){
+                            self.pos_widget.product_screen.product_list_widget.click_product_action(p);
+                            self.$('.search-clear').trigger('click');
+                        }
+                    }
+>>>>>>> MERGE-SOURCE
                 }else{
                     var products = self.pos.db.get_product_by_category(self.category.id);
                     self.pos.get('products').reset(products);
@@ -666,6 +695,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){
@@ -874,6 +924,8 @@
 
 
                 self.pos.barcode_reader.connect();
+                
+                self.pos.keypad.connect();
 
                 instance.webclient.set_content_full_screen(true);
 
@@ -948,6 +1000,9 @@
 
             this.error_negative_price_popup = new module.ErrorNegativePricePopupWidget(this, {});
             this.error_negative_price_popup.appendTo($('.point-of-sale'));
+            
+            this.select_customer_popup = new module.SelectCustomerPopupWidget(this, {});
+            this.select_customer_popup.appendTo($('.point-of-sale'));
 
             this.error_no_client_popup = new module.ErrorNoClientPopupWidget(this, {});
             this.error_no_client_popup.appendTo($('.point-of-sale'));
@@ -995,6 +1050,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 ---------
 
@@ -1016,8 +1080,12 @@
                     'error-session': this.error_session_popup,
                     'error-negative-price': this.error_negative_price_popup,
                     'choose-receipt': this.choose_receipt_popup,
+<<<<<<< TREE
                     'error-no-client': this.error_no_client_popup,
                     'error-invoice-transfer': this.error_invoice_transfer_popup,
+=======
+                    'select-customer': this.select_customer_popup,
+>>>>>>> MERGE-SOURCE
                 },
                 default_client_screen: 'welcome',
                 default_cashier_screen: 'products',
@@ -1097,6 +1165,7 @@
         },
         close: function() {
             var self = this;
+<<<<<<< TREE
 
             function close(){
                 return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_client_pos_menu']], ['res_id']).pipe(
@@ -1120,6 +1189,19 @@
             }else{
                 return close();
             }
+=======
+            this.pos.barcode_reader.disconnect();
+            this.pos.keypad.disconnect();
+            return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_client_pos_menu']], ['res_id']).pipe(
+                    _.bind(function(res) {
+                return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {
+                    var action = result;
+                    action.context = _.extend(action.context || {}, {'cancel_action': {type: 'ir.actions.client', tag: 'reload'}});
+                    //self.destroy();
+                    this.do_action(action);
+                }, this));
+            }, this));
+>>>>>>> MERGE-SOURCE
         },
         destroy: function() {
             this.pos.destroy();
@@ -1127,4 +1209,60 @@
             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-09-23 14:51:39 +0000
+++ point_of_sale/static/src/xml/pos.xml	2013-11-11 21:43:26 +0000
@@ -404,7 +404,14 @@
             <a href="#">
                 <div class="product-img">
                     <img src='' /> <!-- the product thumbnail -->
+<<<<<<< TREE
                     <t t-if="!product.get('to_weight')">
+=======
+                    <span class="code-tag">
+                        <t t-esc="widget.model.get('code')"/>
+                    </span>
+                    <t t-if="!widget.model.get('to_weight')">
+>>>>>>> MERGE-SOURCE
                         <span class="price-tag">
                             <t t-esc="widget.format_currency(product.get('price'))"/>
                         </span>
@@ -582,6 +589,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 +602,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>
@@ -781,4 +803,66 @@
         </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>