pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]:improved code

Browse Source 
bzr revid: apa@tinyerp.com-20121015091953-sxj42qdvfui7v6vk
This commit is contained in:
Amit Patel
2012-10-15 14:49:53 +05:30
parent aca92d1c4c 7ef13b6e8f
commit e0765e20c6
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/static/src/js/devices.js
+1 -1
View File
@@ -196,7 +196,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
* {
* quantity: (number) the number of items, or the weight,
* unit_name: (string) the name of the item's unit (kg, dozen, ...)
* list_price: (number) the price of one unit of the item before discount
* price: (number) the price of one unit of the item before discount
* discount: (number) the discount on the product in % [0,100]
* product_name: (string) the name of the product
* price_with_tax: (number) the price paid for this orderline, tax included
addons/point_of_sale/static/src/js/models.js
+5 -5
View File
@@ -387,11 +387,11 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
return this.product;
},
// return the base price of this product (for this orderline)
get_list_price: function(){
get_price: function(){
return this.price;
},
// changes the base price of the product for this orderline
set_list_price: function(price){
set_price: function(price){
this.price = price;
this.trigger('change');
},
@@ -425,7 +425,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
export_as_JSON: function() {
return {
qty: this.get_quantity(),
price_unit: this.get_list_price(),
price_unit: this.get_price(),
discount: this.get_discount(),
product_id: this.get_product().get('id'),
};
@@ -435,7 +435,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
return {
quantity: this.get_quantity(),
unit_name: this.get_unit().name,
list_price: this.get_list_price(),
price: this.get_price(),
discount: this.get_discount(),
product_name: this.get_product().get('name'),
price_with_tax : this.get_price_with_tax(),
@@ -580,7 +580,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
line.set_quantity(options.quantity);
}
if(options.price !== undefined){
line.set_list_price(options.price);
line.set_price(options.price);
}
var last_orderline = this.getLastOrderline();
addons/point_of_sale/static/src/js/widgets.js
+2 -2
View File
@@ -186,8 +186,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
order.getSelectedLine().set_quantity(val);
}else if( mode === 'discount'){
order.getSelectedLine().set_discount(val);
}else if( mode === 'list_price'){
order.getSelectedLine().set_list_price(val);
}else if( mode === 'price'){
order.getSelectedLine().set_price(val);
}
} else {
this.pos.get('selectedOrder').destroy();
addons/point_of_sale/static/src/xml/pos.xml
+3 -3
View File
@@ -74,7 +74,7 @@
<button class="input-button number-char">7</button>
<button class="input-button number-char">8</button>
<button class="input-button number-char">9</button>
<button class="mode-button" data-mode='list_price'>Price</button>
<button class="mode-button" data-mode='price'>Price</button>
<br />
<button class="input-button" id="numpad-minus" >+/-</button>
<button class="input-button number-char">0</button>
@@ -490,7 +490,7 @@
</em>
<t t-esc="widget.model.get_unit().name" />
at
<t t-esc="widget.format_currency(widget.model.get_list_price())" />
<t t-esc="widget.format_currency(widget.model.get_price())" />
/
<t t-esc="widget.model.get_unit().name" />
</li>
@@ -558,7 +558,7 @@
<t t-esc="order.get_quantity().toFixed(0)"/>
</td>
<td class="pos-right-align">
<t t-esc="widget.format_currency(order.get_list_price() * (1 - order.get_discount()/100) * order.get_quantity().toFixed(2))"/>
<t t-esc="widget.format_currency(order.get_price() * (1 - order.get_discount()/100) * order.get_quantity().toFixed(2))"/>
</td>
</tr>
</table>