diff --git a/addons/point_of_sale/pos_demo.xml b/addons/point_of_sale/pos_demo.xml index 80ba3d24397..913a2907e03 100644 --- a/addons/point_of_sale/pos_demo.xml +++ b/addons/point_of_sale/pos_demo.xml @@ -1,7 +1,140 @@ - + + POS/019 + POS/019 + SAJ/2010/010 + + + + + + none + + open + out_invoice + SAJ/2010/010 + + + + / + 2010-10-07 + + + + + + Invoice from POS: POS/019 + + + + + [PC1] Basic PC + + + + + + + + + + + + + 2011-04-07 + + + 2010-10-07 16:53:11 + + + + + + paid + + + 2010-10-07 + POS/019 + tax_excluded + + + + + + + 10 + open + + + + 2010-10-07 + + + + + general + + + + Cash Journal - (test) + + 2010-10-07 + + + + Payment POS/019 + + + + + POS/019 + + 2010-10-07 16:53:46 + + direct + + POS notes + done + out + 2010-10-07 16:53:46 + 2010-10-07 16:33:30 + OUT/00019 + none + 2010-10-07 16:53:46 + + + POS/019 + + + + + + 1 + + + done + + 2010-10-07 16:33:30 + 2010-10-07 16:33:30 + Stock move (POS 12) + + + 2010-10-07 16:53:46 + + + + + No Discount + + + + + + Order Line/07 + + diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml index c576828cac1..66579ca6eaa 100644 --- a/addons/point_of_sale/report/account_statement.rml +++ b/addons/point_of_sale/report/account_statement.rml @@ -101,6 +101,7 @@ + @@ -140,17 +141,11 @@ - - - - - - Statement - + - + @@ -213,7 +208,7 @@ [[ formatLang(statement.date,date=True) ]] - [[ formatLang(statement.closing_date,date=True) ]] + [[ formatLang(statement.closing_date,date=True) or '' ]] [[ formatLang(statement.balance_start)]] [[ company.currency_id.symbol ]] @@ -229,7 +224,7 @@ - + Name @@ -242,7 +237,7 @@ - + [[ repeatIn(statement.line_ids,'line_ids') and ' ' or removeParentNode('blockTable') ]] @@ -257,7 +252,7 @@ - + @@ -268,7 +263,7 @@ Total : - [[ formatLang(get_total(statement.line_ids)) ]] [[ company.currency_id.symbol ]] + [[ formatLang(get_total(statement.line_ids)) ]] [[ company.currency_id.symbol ]] diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml index 658e7e958b9..f8381c76741 100644 --- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml +++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml @@ -1,6 +1,6 @@ -