@@ -73,7 +73,6 @@
-
@@ -184,16 +183,16 @@
[[taxes(l)]]
|
- [[ formatLang(l.qty) ]] [[l.product_id.uom_id.name]]
+ [[ formatLang(l.qty) ]]
|
- [[ formatLang(l.price_unit) ]]
+ [[ formatLang(l.price_unit) ]] [[o.pricelist_id.currency_id. symbol ]]
|
[[ formatLang(l.discount) ]]
|
- [[ formatLang(l.price_subtotal) ]][[o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(l.price_subtotal) ]] [[o.pricelist_id.currency_id. symbol ]]
|
@@ -221,7 +220,7 @@
- Net Total :
+ Net Total
|
[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]
@@ -249,7 +248,7 @@
|
- Taxes :
+ Taxes
|
[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
@@ -277,7 +276,7 @@
|
- Total :
+ Total
|
[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
index a88813fac1f..3c93c9731a1 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -133,7 +133,7 @@
-
+
Product
@@ -154,7 +154,7 @@
[[ repeatIn(pos_payment_user(data['form']), 'line_ids') ]]
-
+
|
[[ line_ids['name'] ]]
@@ -169,12 +169,12 @@
[[ formatLang(line_ids['price_unit']) ]]
|
- [[ formatLang(line_ids['total']) ]]
+ [[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]
|
-
+
|
@@ -192,10 +192,10 @@
|
- Total
+ Total:
|
- [[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]]
+ [[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]
|
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
index 44fa3bf60cc..ff6ebc3132c 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.rml
@@ -125,7 +125,7 @@
|
- [[ get_journal_amt(o)[1] ]]
+ [[ get_journal_amt(o)[0] ]] : [[ get_journal_amt(o)[1] ]]
diff --git a/addons/point_of_sale/report/pos_sales_user_today.rml b/addons/point_of_sale/report/pos_sales_user_today.rml
index 16c8f6f0b38..52ac1eb6f49 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today.rml
@@ -54,8 +54,9 @@
-
-
+
+
+
@@ -98,7 +99,10 @@
- Todays Sales By User
+ Today's Sales By User
+
+
+
|
@@ -134,7 +138,7 @@
Date Order
|
- User
+ User
|
State
diff --git a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
index c483fa80a65..d0499f1743b 100644
--- a/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
+++ b/addons/point_of_sale/report/pos_sales_user_today_current_user.rml
@@ -109,7 +109,7 @@
- Sales By Current User(Todays)
+ Today's Sales By Current User
@@ -175,7 +175,7 @@
[[ formatLang(line_ids['qty']) ]]
|
- [[ formatLang(line_ids['total']) ]]
+ [[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]
|
@@ -194,7 +194,7 @@
[[ formatLang((get_data_current_user_qty(user))) ]]
|
- [[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]]
+ [[ formatLang((get_data_current_user_tot(user))) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]
|
diff --git a/addons/point_of_sale/statement_report.xml b/addons/point_of_sale/statement_report.xml
index fb1be16419e..a81d51a2679 100644
--- a/addons/point_of_sale/statement_report.xml
+++ b/addons/point_of_sale/statement_report.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/addons/point_of_sale/test/pos_report.yml b/addons/point_of_sale/test/pos_report.yml
index 08052356104..2fe288c2df1 100644
--- a/addons/point_of_sale/test/pos_report.yml
+++ b/addons/point_of_sale/test/pos_report.yml
@@ -7,12 +7,26 @@
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-details_summary report'+format), 'wb+').write(data)
+
+-
+ I open the register.
+-
+ !record {model: pos.open.statement, id: pos_open_statement_0}:
+ {}
+-
+ I open the statement.
+-
+ !python {model: pos.open.statement}: |
+ self.open_statement(cr, uid, [ref("pos_open_statement_0")], {"lang": "en_US", "active_model":
+ "ir.ui.menu", "active_ids": [ref("point_of_sale.menu_open_statement")], "tz":
+ False, "active_id": ref("point_of_sale.menu_open_statement"), })
-
In order to test the PDF reports defined on a Point Of Sale, we will print a POS Invoice Report
-
!python {model: pos.order}: |
import netsvc, tools, os
- (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+ data_dict = {'model':'ir.ui.menu', 'form':{'invoice_wanted': 1, 'journal':pos_open_statement_0,}}
+ (data, format) = netsvc.LocalService('report.pos.invoice').create(cr, uid, [ref('point_of_sale.order_pos1')], data_dict, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-invoice report'+format), 'wb+').write(data)
@@ -52,7 +66,7 @@
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt without reimbursement report'+format), 'wb+').write(data)
-
- In order to test the PDF reports defined on a Point Of Sale, we will print a POS Payment Report Report
+ In order to test the PDF reports defined on a Point Of Sale, we will print a POS Payment Report
-
!python {model: ir.ui.menu}: |
import netsvc, tools, os, time
@@ -84,6 +98,13 @@
balance_end_real: 0.0
date: '2010-05-19'
journal_id: account_journal_cash0
+ line_ids:
+ - name: statement
+ date: "2010-10-13"
+ type: customer
+ account_id: account_account_sales0
+ amount: 100
+ partner_id: base.res_partner_agrolait
period_id: account.period_5
state: 'draft'
-
@@ -133,7 +154,7 @@
-
!python {model: pos.order}: |
import netsvc, tools, os, time
- (data, format) = netsvc.LocalService('report.pos.payment.report').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
+ (data, format) = netsvc.LocalService('report.pos.payment.report').create(cr, uid, [ref('point_of_sale.pos_order_pos0')], {}, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-payment_report'+format), 'wb+').write(data)
-
@@ -152,4 +173,4 @@
import netsvc, tools, os, time
(data, format) = netsvc.LocalService('report.pos.sales.user.today.current.user').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
if tools.config['test_report_directory']:
- file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_today_current_user_report'+format), 'wb+').write(data)
\ No newline at end of file
+ file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-sales_today_current_user_report'+format), 'wb+').write(data)