Merge lp:~openerp-dev/openobject-addons/trunk-bug-1115325-ishwar into lp:openobject-addons

[Ishwar Malvi(OpenERP)]

Hello,

      I have fixed a problem of pos : pos was taking company currency instead of pricelist currency

Thanks,
Ishwar Malvi

Unmerged revisions

8617. By Ishwar Malvi(OpenERP) on 2013-03-28

[MERGE] with trunk

8616. By Ishwar Malvi(OpenERP) on 2013-03-14

[FIX] point_of_sale : POS is taking company currency instead of pricelist currency

=== modified file 'point_of_sale/static/src/js/models.js'
--- point_of_sale/static/src/js/models.js	2013-01-28 17:18:00 +0000
+++ point_of_sale/static/src/js/models.js	2013-03-28 06:48:23 +0000
@@ -49,6 +49,7 @@
                 'nbr_pending_operations': 0,    
 
                 'currency':         {symbol: '$', position: 'after'},
+                'pricelist_currency': null,
                 'shop':             null, 
                 'company':          null,
                 'user':             null,   // the user that loaded the pos
@@ -94,7 +95,11 @@
         // loads all the needed data on the sever. returns a deferred indicating when all the data has loaded. 
         load_server_data: function(){
             var self = this;
-
+            
+             var pricelists = self.fetch('product.pricelist', ['currency_id'],[['write_uid','=',this.session.uid]]).then(function(_pricelists){
+            	self.set("pricelist_currency", _pricelists[0]);
+            });
+            
             var loaded = self.fetch('res.users',['name','company_id'],[['id','=',this.session.uid]]) 
                 .then(function(users){
                     self.set('user',users[0]);
@@ -118,7 +123,7 @@
                 }).then(function(company_partners){
                     self.get('company').contact_address = company_partners[0].contact_address;
 
-                    return self.fetch('res.currency',['symbol','position','rounding','accuracy'],[['id','=',self.get('company').currency_id[0]]]);
+                    return self.fetch('res.currency',['symbol','position','rounding','accuracy'],[['id','=',self.get('pricelist_currency').currency_id[0]]]);
                 }).then(function(currencies){
                     console.log('Currency:',currencies[0]);
                     self.set('currency',currencies[0]);