[Merge] Merge with main addons.
bzr revid: mdi@tinyerp.com-20120903130743-2en32n3zo73n19dj
This commit is contained in:
Divyesh Makwana (Open ERP)
@@ -10,10 +10,6 @@
|
||||
date_to: !eval time.strftime('%Y-%m-11 19:00:00')
|
||||
employee_id: hr.employee_fp
|
||||
type: remove
|
||||
-
|
||||
I confirmed the holiday request by clicking on "Confirm" button.
|
||||
-
|
||||
!workflow {model: hr.holidays, action: confirm, ref: hr_holidays_employee1_cl}
|
||||
-
|
||||
I find a small mistake on my leave request to I click on "Refuse" button to correct a mistake.
|
||||
-
|
||||
|
||||
@@ -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'],
|
||||
|
||||
@@ -1072,12 +1072,14 @@
|
||||
-webkit-transition-timing-function: ease-out;
|
||||
}
|
||||
|
||||
.point-of-sale .pos-actionbar .button.disabled{
|
||||
color:#AAA;
|
||||
.point-of-sale .pos-actionbar .button.disabled *{
|
||||
opacity: 0.5;
|
||||
}
|
||||
.point-of-sale .pos-actionbar .button.disabled:hover{
|
||||
border: 1px solid #cacaca;
|
||||
border-radius: 4px;
|
||||
color: #555;
|
||||
cursor: default;
|
||||
|
||||
background: #e2e2e2;
|
||||
background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -47,11 +47,12 @@ TODO AUG 20
|
||||
v supprimer l'écran
|
||||
v bloquer sur l'impression
|
||||
v L'impression est foireuse
|
||||
- description_sales
|
||||
|
||||
* CLIENT
|
||||
- create a new branch
|
||||
v create a new branch
|
||||
- Self-checkout welcome screen
|
||||
- removal of products for the root category
|
||||
~ removal of products for the root category
|
||||
- Terminal de payement
|
||||
- Code à barres
|
||||
- Vidanges
|
||||
|
||||
@@ -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){
|
||||
|
||||
@@ -735,11 +735,14 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
|
||||
|
||||
this.validate_button = this.add_action_button({
|
||||
label: 'Validate',
|
||||
name: 'validation',
|
||||
icon: '/point_of_sale/static/src/img/icons/png48/validate.png',
|
||||
click: function(){
|
||||
self.validateCurrentOrder();
|
||||
},
|
||||
});
|
||||
|
||||
this.updatePaymentSummary();
|
||||
},
|
||||
close: function(){
|
||||
this._super();
|
||||
@@ -806,6 +809,9 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
|
||||
this.$('#payment-paid-total').html(paidTotal.toFixed(2));
|
||||
this.$('#payment-remaining').html(remaining.toFixed(2));
|
||||
this.$('#payment-change').html(change.toFixed(2));
|
||||
if(this.pos_widget.action_bar){
|
||||
this.pos_widget.action_bar.set_button_disabled('validation', remaining > 0);
|
||||
}
|
||||
},
|
||||
set_numpad_state: function(numpadState) {
|
||||
if (this.numpadState) {
|
||||
|
||||
@@ -370,14 +370,21 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
|
||||
this.label = options.label || 'button';
|
||||
this.rightalign = options.rightalign || false;
|
||||
this.click_action = options.click;
|
||||
this.disabled = options.disabled || false;
|
||||
if(options.icon){
|
||||
this.icon = options.icon;
|
||||
this.template = this.icon_template;
|
||||
}
|
||||
},
|
||||
set_disabled: function(disabled){
|
||||
if(this.disabled != disabled){
|
||||
this.disabled = !!disabled;
|
||||
this.renderElement();
|
||||
}
|
||||
},
|
||||
renderElement: function(){
|
||||
this._super();
|
||||
if(this.click_action){
|
||||
if(this.click_action && !this.disabled){
|
||||
this.$el.click(_.bind(this.click_action, this));
|
||||
}
|
||||
},
|
||||
@@ -388,12 +395,12 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
|
||||
init: function(parent, options){
|
||||
this._super(parent,options);
|
||||
this.button_list = [];
|
||||
this.fake_buttons = {};
|
||||
this.buttons = {};
|
||||
this.visibility = {};
|
||||
},
|
||||
set_element_visible: function(element, visible, action){
|
||||
if(visible != this.visibility[element]){
|
||||
this.visibility[element] = visible;
|
||||
this.visibility[element] = !!visible;
|
||||
if(visible){
|
||||
this.$('.'+element).show();
|
||||
}else{
|
||||
@@ -401,14 +408,22 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
|
||||
}
|
||||
}
|
||||
if(visible && action){
|
||||
this.action[element] = action;
|
||||
this.$('.'+element).off('click').click(action);
|
||||
}
|
||||
},
|
||||
set_button_disabled: function(name, disabled){
|
||||
var b = this.buttons[name];
|
||||
if(b){
|
||||
b.set_disabled(disabled);
|
||||
}
|
||||
},
|
||||
destroy_buttons:function(){
|
||||
for(var i = 0; i < this.button_list.length; i++){
|
||||
this.button_list[i].destroy();
|
||||
}
|
||||
this.button_list = [];
|
||||
this.buttons = {};
|
||||
return this;
|
||||
},
|
||||
get_button_count: function(){
|
||||
@@ -417,6 +432,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
|
||||
add_new_button: function(button_options){
|
||||
var button = new module.ActionButtonWidget(this,button_options);
|
||||
this.button_list.push(button);
|
||||
if(button_options.name){
|
||||
this.buttons[button_options.name] = button;
|
||||
}
|
||||
button.appendTo(this.$('.pos-actionbar-button-list'));
|
||||
return button;
|
||||
},
|
||||
|
||||
@@ -540,7 +540,7 @@
|
||||
</t>
|
||||
|
||||
<t t-name="ActionButtonWidget">
|
||||
<li t-att-class=" 'button '+ (widget.rightalign ? 'rightalign ' : '')">
|
||||
<li t-att-class=" 'button '+ (widget.rightalign ? 'rightalign ' : '') + (widget.disabled ? 'disabled ' : '')">
|
||||
<div class='label'>
|
||||
<t t-esc="widget.label" />
|
||||
</div>
|
||||
@@ -548,7 +548,7 @@
|
||||
</t>
|
||||
|
||||
<t t-name="ActionButtonWidgetWithIcon">
|
||||
<li t-att-class=" 'button '+ (widget.rightalign ? 'rightalign ' : '')">
|
||||
<li t-att-class=" 'button '+ (widget.rightalign ? 'rightalign ' : '') + (widget.disabled ? 'disabled ' : '')">
|
||||
<div class='icon'>
|
||||
<img t-att-src="widget.icon" />
|
||||
<div class='iconlabel'><t t-esc="widget.label" /></div>
|
||||
|
||||
@@ -218,7 +218,7 @@
|
||||
<field name="name">project.project.kanban</field>
|
||||
<field name="model">project.project</field>
|
||||
<field name="arch" type="xml">
|
||||
<kanban>
|
||||
<kanban version="7.0" class="oe_background_grey">
|
||||
<field name="effective_hours"/>
|
||||
<field name="planned_hours"/>
|
||||
<field name="name"/>
|
||||
|
||||
Reference in New Issue
Block a user