[MERGE] some pos improvements
bzr revid: fva@openerp.com-20120903125943-x1unw8rmtlw1fpgs
This commit is contained in:
commit
fab8fe4f26
|
@ -92,7 +92,8 @@ Main features:
|
|||
'static/src/js/main.js',
|
||||
],
|
||||
'css': [
|
||||
'static/src/css/pos.css',
|
||||
'static/src/css/pos.css', # this is the default css with hover effects
|
||||
#'static/src/css/pos_nohover.css', # this css has no hover effects (for resistive touchscreens)
|
||||
'static/src/css/keyboard.css'
|
||||
],
|
||||
'qweb': ['static/src/xml/pos.xml'],
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -47,6 +47,7 @@ TODO AUG 20
|
|||
v supprimer l'écran
|
||||
v bloquer sur l'impression
|
||||
v L'impression est foireuse
|
||||
- description_sales
|
||||
|
||||
* CLIENT
|
||||
v create a new branch
|
||||
|
|
|
@ -143,7 +143,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
|
|||
return fetch(
|
||||
'product.product',
|
||||
['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type'],
|
||||
[['pos_categ_id','!=', false]],
|
||||
[['pos_categ_id','!=', false],['sale_ok','=',true]],
|
||||
{pricelist: self.get('shop').pricelist_id[0]} // context for price
|
||||
);
|
||||
}).pipe(function(products){
|
||||
|
|
Loading…
Reference in New Issue