odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] point_of_sale: detailed tax report on receipt 

bzr revid: fva@openerp.com-20140106135119-cnhopx3nie7f0r8h
This commit is contained in:
Frédéric van der Essen 2014-01-06 14:51:19 +01:00
parent 96dd2211c9
commit 643bb8566c
3 changed files with 66 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/point_of_sale/static/src/css/pos.css
View File

@ -589,7 +589,6 @@ td {
line-height: 24px;
border-radius: 3px;
cursor: pointer;
border: 1px solid #cacaca;
@ -882,6 +881,9 @@ td {
border-radius: 3px;
overflow: hidden;
}
.pos .pos-sale-ticket pre{
font-family: "Inconsolata";
}
.pos .pos-sale-ticket .emph{
font-size: 20px;
margin:5px;

37
addons/point_of_sale/static/src/js/models.js
View File

@ -47,6 +47,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
this.units = [];
this.units_by_id = {};
this.pricelist = null;
window.posmodel = this;
// these dynamic attributes can be watched for change by other models or widgets
this.set({
@ -121,7 +122,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
}).then(function(partners){
self.partners = partners;
return self.fetch('account.tax', ['amount', 'price_include', 'type']);
return self.fetch('account.tax', ['name','amount', 'price_include', 'type']);
}).then(function(taxes){
self.taxes = taxes;
@ -598,6 +599,9 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
get_tax: function(){
return this.get_all_prices().tax;
},
get_tax_details: function(){
return this.get_all_prices().taxDetails;
},
get_all_prices: function(){
var self = this;
var currency_rounding = this.pos.currency.rounding;
@ -609,6 +613,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
var taxes_ids = product.taxes_id;
var taxes = self.pos.taxes;
var taxtotal = 0;
var taxdetail = {};
_.each(taxes_ids, function(el) {
var tax = _.detect(taxes, function(t) {return t.id === el;});
if (tax.price_include) {
@ -623,6 +628,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
tmp = round_pr(tmp,currency_rounding);
taxtotal += tmp;
totalNoTax -= tmp;
taxdetail[tax.id] = tmp;
} else {
var tmp;
if (tax.type === "percent") {
@ -635,12 +641,14 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
tmp = round_pr(tmp,currency_rounding);
taxtotal += tmp;
totalTax += tmp;
taxdetail[tax.id] = tmp;
}
});
return {
"priceWithTax": totalTax,
"priceWithoutTax": totalNoTax,
"tax": taxtotal,
"taxDetails": taxdetail,
};
},
});
@ -795,6 +803,32 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
return sum + orderLine.get_tax();
}), 0);
},
getTaxDetails: function(){
var details = {};
var fulldetails = [];
var taxes_by_id = {};
for(var i = 0; i < this.pos.taxes.length; i++){
taxes_by_id[this.pos.taxes[i].id] = this.pos.taxes[i];
}
this.get('orderLines').each(function(line){
var ldetails = line.get_tax_details();
for(var id in ldetails){
if(ldetails.hasOwnProperty(id)){
details[id] = (details[id] || 0) + ldetails[id];
}
}
});
for(var id in details){
if(details.hasOwnProperty(id)){
fulldetails.push({amount: details[id], tax: taxes_by_id[id]});
}
}
return fulldetails;
},
getPaidTotal: function() {
return (this.get('paymentLines')).reduce((function(sum, paymentLine) {
return sum + paymentLine.get_amount();
@ -866,6 +900,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
total_tax: this.getTax(),
total_paid: this.getPaidTotal(),
total_discount: this.getDiscountTotal(),
tax_details: this.getTaxDetails(),
change: this.getChange(),
name : this.getName(),
client: client ? client.name : null ,

40
addons/point_of_sale/static/src/xml/pos.xml
View File

@ -636,18 +636,32 @@
</table>
<br />
<table>
<tr><td>Subtotal:</td><td class="pos-right-align">
<t t-esc="widget.format_currency(order.getSubtotal())"/>
</td></tr>
<tr><td>Tax:</td><td class="pos-right-align">
<t t-esc="widget.format_currency(order.getTax())"/>
</td></tr>
<tr><td>Discount:</td><td class="pos-right-align">
<t t-esc="widget.format_currency(order.getDiscountTotal())"/>
</td></tr>
<tr class="emph"><td>Total:</td><td class="pos-right-align">
<t t-esc="widget.format_currency(order.getTotalTaxIncluded())"/>
</td></tr>
<tr>
<td>Subtotal:</td>
<td class="pos-right-align">
<t t-esc="widget.format_currency(order.getSubtotal())"/>
</td>
</tr>
<t t-foreach="order.getTaxDetails()" t-as="taxdetail">
<tr>
<td><t t-esc="taxdetail.tax.name" /></td>
<td class="pos-right-align">
<t t-esc="widget.format_currency(taxdetail.amount)" />
</td>
</tr>
</t>
<tr>
<td>Discount:</td>
<td class="pos-right-align">
<t t-esc="widget.format_currency(order.getDiscountTotal())"/>
</td>
</tr>
<tr class="emph">
<td>Total:</td>
<td class="pos-right-align">
<t t-esc="widget.format_currency(order.getTotalTaxIncluded())"/>
</td>
</tr>
</table>
<br />
<table>
@ -663,7 +677,7 @@
<br />
<table>
<tr><td>Change:</td><td class="pos-right-align">
<t t-esc="widget.format_currency(order.getPaidTotal() - order.getTotalTaxIncluded())"/>
<t t-esc="widget.format_currency(order.getChange())"/>
</td></tr>
</table>
<t t-if="widget.pos.config.receipt_footer">