[MRG] from upstream

(lp:c2c-addons/6.1  rev 24.1.4)

account_financial_report_webkit/i18n/account_financial_report_webkit.pot

@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-01-20 09:03+0000\n"
-"PO-Revision-Date: 2012-01-20 09:03+0000\n"
+"Project-Id-Version: OpenERP Server 6.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-05-07 07:02+0000\n"
+"PO-Revision-Date: 2012-05-07 07:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -38,8 +38,8 @@ msgstr ""
 
 #. module: account_financial_report_webkit
 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:203
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:223
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:253
+#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:228
+#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:258
 msgid "Cumulated Balance on Account"
 msgstr ""
 
@@ -70,7 +70,7 @@ msgid "Periods Filter:"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:172
+#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:170
 #, python-format
 msgid "No header defined for this Webkit report!"
 msgstr ""
@@ -82,15 +82,18 @@ msgid "Filter has to be in filter date, period, or none"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_trial_balance_menu_webkit
 #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_trial_balance_webkit
 msgid "Trial Balance Webkit"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: constraint:account.account:0
-msgid "Configuration Error! \n"
-"You cannot define children to an account with internal type different of \"View\"! "
+#: field:account.common.balance.report,company_id:0
+#: field:general.ledger.webkit,company_id:0
+#: field:open.invoices.webkit,company_id:0
+#: field:partner.balance.webkit,company_id:0
+#: field:partners.ledger.webkit,company_id:0
+#: field:trial.balance.webkit,company_id:0
+msgid "Company"
 msgstr ""
 
 #. module: account_financial_report_webkit
@@ -121,10 +124,10 @@ msgid "It adds the currency column"
 msgstr ""
 
 #. module: account_financial_report_webkit
+#: code:addons/account_financial_report_webkit/report/common_reports.py:75
 #: selection:open.invoices.webkit,result_selection:0
 #: selection:partner.balance.webkit,result_selection:0
 #: selection:partners.ledger.webkit,result_selection:0
-#: code:addons/account_financial_report_webkit/report/common_reports.py:73
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -157,32 +160,26 @@ msgid "Print only"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: constraint:account.move.line:0
-msgid "You can not create move line on closed account."
-msgstr ""
-
-#. module: account_financial_report_webkit
-#: model:ir.model,name:account_financial_report_webkit.model_account_report_partner_balance_webkit
+#: model:ir.model,name:account_financial_report_webkit.model_partner_balance_webkit
 msgid "Partner Balance Report"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:221
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:230
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:247
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:258
+#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:194
+#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:205
+#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:220
 #, python-format
 msgid "Webkit render"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:167
+#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:165
 #, python-format
 msgid "Error!"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: model:ir.model,name:account_financial_report_webkit.model_account_report_trial_balance_webkit
+#: model:ir.model,name:account_financial_report_webkit.model_trial_balance_webkit
 msgid "Trial Balance Report"
 msgstr ""
 
@@ -192,20 +189,20 @@ msgid "Code"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partners_ledger_menu_webkit
 #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_partners_ledger_webkit
 msgid "Partner Ledger Webkit"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:192
-msgid "Unallocated"
+#: field:account.common.balance.report,display_account:0
+#: field:partner.balance.webkit,display_account:0
+#: field:trial.balance.webkit,display_account:0
+msgid "Display Accounts"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:116
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:112
-msgid "Rec."
+#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:192
+msgid "Unallocated"
 msgstr ""
 
 #. module: account_financial_report_webkit
@@ -215,33 +212,23 @@ msgid "Webkit raise an error"
 msgstr ""
 
 #. module: account_financial_report_webkit
+#: code:addons/account_financial_report_webkit/report/common_reports.py:71
 #: selection:open.invoices.webkit,result_selection:0
 #: selection:partner.balance.webkit,result_selection:0
 #: selection:partners.ledger.webkit,result_selection:0
-#: code:addons/account_financial_report_webkit/report/common_reports.py:69
 #, python-format
 msgid "Receivable Accounts"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_general_ledger_menu_webkit
 #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_general_ledger_webkit
 msgid "General Ledger Webkit"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: field:account.common.balance.report,period_from:0
-#: field:general.ledger.webkit,period_from:0
-#: field:open.invoices.webkit,period_from:0
-#: field:partner.balance.webkit,period_from:0
-#: field:partners.ledger.webkit,period_from:0
-#: field:trial.balance.webkit,period_from:0
-msgid "Start period"
-msgstr ""
-
-#. module: account_financial_report_webkit
-#: model:ir.model,name:account_financial_report_webkit.model_account_report_open_transactions_webkit
-msgid "Open Transactions Report"
+#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:116
+#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:112
+msgid "Rec."
 msgstr ""
 
 #. module: account_financial_report_webkit
@@ -258,6 +245,12 @@ msgstr ""
 msgid "Periods Filter"
 msgstr ""
 
+#. module: account_financial_report_webkit
+#: code:addons/account_financial_report_webkit/report/common_reports.py:313
+#, python-format
+msgid "No period found"
+msgstr ""
+
 #. module: account_financial_report_webkit
 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:38
 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:139
@@ -273,17 +266,12 @@ msgid "Initial Balance"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: field:account.common.balance.report,period_to:0
-#: field:general.ledger.webkit,period_to:0
-#: field:open.invoices.webkit,period_to:0
-#: field:partner.balance.webkit,period_to:0
-#: field:partners.ledger.webkit,period_to:0
-#: field:trial.balance.webkit,period_to:0
-msgid "End period"
+#: constraint:account.move.line:0
+msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal."
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: model:ir.model,name:account_financial_report_webkit.model_account_report_general_ledger_webkit
+#: model:ir.model,name:account_financial_report_webkit.model_general_ledger_webkit
 msgid "General Ledger Report"
 msgstr ""
 
@@ -325,8 +313,9 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: view:partners.ledger.webkit:0
 #: code:addons/account_financial_report_webkit/report/partners_ledger.py:48
+#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partners_ledger_menu_webkit
+#: view:partners.ledger.webkit:0
 #, python-format
 msgid "Partner Ledger"
 msgstr ""
@@ -364,7 +353,7 @@ msgid "Debit"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:173
+#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:171
 #, python-format
 msgid "Please set a header in company settings"
 msgstr ""
@@ -379,13 +368,12 @@ msgid "Time Filters"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:188
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:219
+#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:193
+#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:224
 msgid "Cumulated Balance on Partner"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partner_balance_menu_webkit
 #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_partner_balance_webkit
 msgid "Partner Balance Webkit"
 msgstr ""
@@ -405,13 +393,6 @@ msgstr ""
 msgid "Clearance Date"
 msgstr ""
 
-#. module: account_financial_report_webkit
-#: selection:general.ledger.webkit,display_account:0
-#: code:addons/account_financial_report_webkit/report/common_reports.py:62
-#, python-format
-msgid "With transactions or non zero balance"
-msgstr ""
-
 #. module: account_financial_report_webkit
 #: view:partners.ledger.webkit:0
 msgid "This report allows you to print or generate a pdf of your partner ledger with details of all your payable/receivable account"
@@ -443,7 +424,7 @@ msgstr ""
 
 #. module: account_financial_report_webkit
 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:43
-#: code:addons/account_financial_report_webkit/wizard/balance_common.py:163
+#: code:addons/account_financial_report_webkit/wizard/balance_common.py:151
 #, python-format
 msgid "Dates"
 msgstr ""
@@ -454,8 +435,9 @@ msgid "Code / Ref"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: view:trial.balance.webkit:0
 #: code:addons/account_financial_report_webkit/report/trial_balance.py:49
+#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_trial_balance_menu_webkit
+#: view:trial.balance.webkit:0
 #, python-format
 msgid "Trial Balance"
 msgstr ""
@@ -465,6 +447,25 @@ msgstr ""
 msgid "Dates : "
 msgstr ""
 
+#. module: account_financial_report_webkit
+#: field:account.common.balance.report,comp0_period_to:0
+#: field:account.common.balance.report,comp1_period_to:0
+#: field:account.common.balance.report,comp2_period_to:0
+#: field:account.common.balance.report,period_to:0
+#: field:general.ledger.webkit,period_to:0
+#: field:open.invoices.webkit,period_to:0
+#: field:partner.balance.webkit,comp0_period_to:0
+#: field:partner.balance.webkit,comp1_period_to:0
+#: field:partner.balance.webkit,comp2_period_to:0
+#: field:partner.balance.webkit,period_to:0
+#: field:partners.ledger.webkit,period_to:0
+#: field:trial.balance.webkit,comp0_period_to:0
+#: field:trial.balance.webkit,comp1_period_to:0
+#: field:trial.balance.webkit,comp2_period_to:0
+#: field:trial.balance.webkit,period_to:0
+msgid "End Period"
+msgstr ""
+
 #. module: account_financial_report_webkit
 #: model:ir.model,name:account_financial_report_webkit.model_account_common_balance_report
 msgid "Common Balance Report"
@@ -480,13 +481,19 @@ msgid "Accounts Filter"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: field:account.common.balance.report,chart_account_id:0
-#: field:general.ledger.webkit,chart_account_id:0
-#: field:open.invoices.webkit,chart_account_id:0
-#: field:partner.balance.webkit,chart_account_id:0
-#: field:partners.ledger.webkit,chart_account_id:0
-#: field:trial.balance.webkit,chart_account_id:0
-msgid "Chart of account"
+#: selection:account.common.balance.report,comp0_filter:0
+#: selection:account.common.balance.report,comp1_filter:0
+#: selection:account.common.balance.report,comp2_filter:0
+#: selection:account.common.balance.report,filter:0
+#: selection:partner.balance.webkit,comp0_filter:0
+#: selection:partner.balance.webkit,comp1_filter:0
+#: selection:partner.balance.webkit,comp2_filter:0
+#: selection:partner.balance.webkit,filter:0
+#: selection:trial.balance.webkit,comp0_filter:0
+#: selection:trial.balance.webkit,comp1_filter:0
+#: selection:trial.balance.webkit,comp2_filter:0
+#: selection:trial.balance.webkit,filter:0
+msgid "Opening Only"
 msgstr ""
 
 #. module: account_financial_report_webkit
@@ -513,6 +520,16 @@ msgstr ""
 msgid "With movements"
 msgstr ""
 
+#. module: account_financial_report_webkit
+#: constraint:account.common.balance.report:0
+#: constraint:general.ledger.webkit:0
+#: constraint:open.invoices.webkit:0
+#: constraint:partner.balance.webkit:0
+#: constraint:partners.ledger.webkit:0
+#: constraint:trial.balance.webkit:0
+msgid "The fiscalyear, periods or chart of account chosen have to belong to the same company."
+msgstr ""
+
 #. module: account_financial_report_webkit
 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:109
 #: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:124
@@ -533,26 +550,27 @@ msgstr ""
 #: code:addons/account_financial_report_webkit/report/open_invoices.py:63
 #: code:addons/account_financial_report_webkit/report/partner_balance.py:63
 #: code:addons/account_financial_report_webkit/report/partners_ledger.py:64
-#: code:addons/account_financial_report_webkit/report/profit_loss.py:71
+#: code:addons/account_financial_report_webkit/report/profit_loss.py:68
 #: code:addons/account_financial_report_webkit/report/trial_balance.py:64
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:67
+#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:68
 #, python-format
 msgid "of"
 msgstr ""
 
 #. module: account_financial_report_webkit
+#: code:addons/account_financial_report_webkit/report/common_reports.py:73
 #: selection:open.invoices.webkit,result_selection:0
 #: selection:partner.balance.webkit,result_selection:0
 #: selection:partners.ledger.webkit,result_selection:0
-#: code:addons/account_financial_report_webkit/report/common_reports.py:71
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account_financial_report_webkit
 #: code:addons/account_financial_report_webkit/report/open_invoices.py:48
+#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_open_invoices_menu_webkit
 #: model:ir.actions.report.xml,name:account_financial_report_webkit.account_report_open_invoices_webkit
-#: model:ir.model,name:account_financial_report_webkit.model_account_report_open_invoices_webkit
+#: model:ir.model,name:account_financial_report_webkit.model_open_invoices_webkit
 #, python-format
 msgid "Open Invoices Report"
 msgstr ""
@@ -563,24 +581,31 @@ msgid "Centralized"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: field:account.common.balance.report,display_account:0
 #: field:general.ledger.webkit,display_account:0
-#: field:partner.balance.webkit,display_account:0
-#: field:trial.balance.webkit,display_account:0
 msgid "Display accounts"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: view:account.move.line:0
-msgid "Narration"
+#: constraint:account.account:0
+msgid "Configuration Error! \n"
+"You can not define children to an account with internal type different of \"View\"! "
 msgstr ""
 
 #. module: account_financial_report_webkit
+#: field:account.common.balance.report,comp0_date_from:0
+#: field:account.common.balance.report,comp1_date_from:0
+#: field:account.common.balance.report,comp2_date_from:0
 #: field:account.common.balance.report,date_from:0
 #: field:general.ledger.webkit,date_from:0
 #: field:open.invoices.webkit,date_from:0
+#: field:partner.balance.webkit,comp0_date_from:0
+#: field:partner.balance.webkit,comp1_date_from:0
+#: field:partner.balance.webkit,comp2_date_from:0
 #: field:partner.balance.webkit,date_from:0
 #: field:partners.ledger.webkit,date_from:0
+#: field:trial.balance.webkit,comp0_date_from:0
+#: field:trial.balance.webkit,comp1_date_from:0
+#: field:trial.balance.webkit,comp2_date_from:0
 #: field:trial.balance.webkit,date_from:0
 msgid "Start Date"
 msgstr ""
@@ -600,7 +625,7 @@ msgid "GENERAL LEDGER"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/wizard/profit_loss_wizard.py:131
+#: code:addons/account_financial_report_webkit/wizard/profit_loss_wizard.py:129
 #, python-format
 msgid "Level %s"
 msgstr ""
@@ -634,6 +659,13 @@ msgstr ""
 msgid "Balance C%s"
 msgstr ""
 
+#. module: account_financial_report_webkit
+#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:95
+#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:108
+#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:104
+msgid "Entry"
+msgstr ""
+
 #. module: account_financial_report_webkit
 #: field:account.move.line,last_rec_date:0
 msgid "Last reconciliation date"
@@ -647,8 +679,9 @@ msgid "Filter on partner"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: view:general.ledger.webkit:0
 #: code:addons/account_financial_report_webkit/report/general_ledger.py:47
+#: view:general.ledger.webkit:0
+#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_general_ledger_menu_webkit
 #, python-format
 msgid "General Ledger"
 msgstr ""
@@ -669,6 +702,11 @@ msgstr ""
 msgid "PARTNER BALANCE"
 msgstr ""
 
+#. module: account_financial_report_webkit
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
 #. module: account_financial_report_webkit
 #: help:open.invoices.webkit,partner_ids:0
 #: help:partner.balance.webkit,partner_ids:0
@@ -677,21 +715,30 @@ msgid "Only selected partners will be printed. Leave empty to print all partners
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:167
+#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:165
 #, python-format
 msgid "Webkit Report template not found !"
 msgstr ""
 
 #. module: account_financial_report_webkit
+#: selection:account.common.balance.report,comp0_filter:0
+#: selection:account.common.balance.report,comp1_filter:0
+#: selection:account.common.balance.report,comp2_filter:0
 #: selection:account.common.balance.report,filter:0
+#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:91
+#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:104
+#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:100
 #: selection:general.ledger.webkit,filter:0
 #: selection:open.invoices.webkit,filter:0
+#: selection:partner.balance.webkit,comp0_filter:0
+#: selection:partner.balance.webkit,comp1_filter:0
+#: selection:partner.balance.webkit,comp2_filter:0
 #: selection:partner.balance.webkit,filter:0
 #: selection:partners.ledger.webkit,filter:0
+#: selection:trial.balance.webkit,comp0_filter:0
+#: selection:trial.balance.webkit,comp1_filter:0
+#: selection:trial.balance.webkit,comp2_filter:0
 #: selection:trial.balance.webkit,filter:0
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:91
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:104
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:100
 msgid "Date"
 msgstr ""
 
@@ -702,12 +749,18 @@ msgstr ""
 
 #. module: account_financial_report_webkit
 #: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_financial_report_webkit
+#: view:account.move.line:0
+msgid "Internal Note"
 msgstr ""
 
 #. module: account_financial_report_webkit
 #: constraint:account.common.balance.report:0
 #: constraint:general.ledger.webkit:0
+#: constraint:open.invoices.webkit:0
 #: constraint:partner.balance.webkit:0
 #: constraint:partners.ledger.webkit:0
 #: constraint:trial.balance.webkit:0
@@ -730,19 +783,19 @@ msgid "The code of the account must be unique per company !"
 msgstr ""
 
 #. module: account_financial_report_webkit
+#: model:ir.ui.menu,name:account_financial_report_webkit.menu_account_open_invoices
 #: view:open.invoices.webkit:0
-#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_open_invoices_menu_webkit
 msgid "Open Invoices"
 msgstr ""
 
 #. module: account_financial_report_webkit
 #: selection:account.common.balance.report,target_move:0
+#: code:addons/account_financial_report_webkit/report/common_reports.py:82
 #: selection:general.ledger.webkit,target_move:0
 #: selection:open.invoices.webkit,target_move:0
 #: selection:partner.balance.webkit,target_move:0
 #: selection:partners.ledger.webkit,target_move:0
 #: selection:trial.balance.webkit,target_move:0
-#: code:addons/account_financial_report_webkit/report/common_reports.py:80
 #, python-format
 msgid "All Posted Entries"
 msgstr ""
@@ -751,21 +804,16 @@ msgstr ""
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:87
 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:84
 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:97
-#: code:addons/account_financial_report_webkit/wizard/balance_common.py:156
+#: code:addons/account_financial_report_webkit/wizard/balance_common.py:144
 #, python-format
 msgid "Comparison %s"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: selection:account.common.balance.report,display_account:0
-#: selection:general.ledger.webkit,display_account:0
-#: selection:partner.balance.webkit,display_account:0
-#: selection:trial.balance.webkit,display_account:0
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:61
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:75
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:73
-#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:86
-msgid "All"
+#: code:addons/account_financial_report_webkit/report/open_invoices.py:102
+#: code:addons/account_financial_report_webkit/report/partners_ledger.py:102
+#, python-format
+msgid "No accounts to print."
 msgstr ""
 
 #. module: account_financial_report_webkit
@@ -839,14 +887,15 @@ msgid "Filter by date : no opening balance will be displayed. (opening balance c
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/common_reports.py:313
-#, python-format
-msgid "No period found"
+#: constraint:account.account:0
+msgid "Configuration Error! \n"
+"You can not select an account type with a deferral method different of \"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: view:partner.balance.webkit:0
 #: code:addons/account_financial_report_webkit/report/partner_balance.py:47
+#: model:ir.actions.act_window,name:account_financial_report_webkit.action_account_partner_balance_menu_webkit
+#: view:partner.balance.webkit:0
 #, python-format
 msgid "Partner Balance"
 msgstr ""
@@ -874,24 +923,35 @@ msgid "Dates Filter"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: field:account.common.balance.report,fiscalyear_id:0
-#: field:general.ledger.webkit,fiscalyear_id:0
-#: field:open.invoices.webkit,fiscalyear_id:0
-#: field:partner.balance.webkit,fiscalyear_id:0
-#: field:partners.ledger.webkit,fiscalyear_id:0
-#: field:trial.balance.webkit,fiscalyear_id:0
-msgid "Fiscal year"
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
 msgstr ""
 
 #. module: account_financial_report_webkit
+#: code:addons/account_financial_report_webkit/report/common_reports.py:64
+#: selection:general.ledger.webkit,display_account:0
+#, python-format
+msgid "With transactions or non zero balance"
+msgstr ""
+
+#. module: account_financial_report_webkit
+#: selection:account.common.balance.report,comp0_filter:0
+#: selection:account.common.balance.report,comp1_filter:0
+#: selection:account.common.balance.report,comp2_filter:0
 #: selection:account.common.balance.report,filter:0
+#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:45
+#: code:addons/account_financial_report_webkit/wizard/balance_common.py:156
 #: selection:general.ledger.webkit,filter:0
 #: selection:open.invoices.webkit,filter:0
+#: selection:partner.balance.webkit,comp0_filter:0
+#: selection:partner.balance.webkit,comp1_filter:0
+#: selection:partner.balance.webkit,comp2_filter:0
 #: selection:partner.balance.webkit,filter:0
 #: selection:partners.ledger.webkit,filter:0
+#: selection:trial.balance.webkit,comp0_filter:0
+#: selection:trial.balance.webkit,comp1_filter:0
+#: selection:trial.balance.webkit,comp2_filter:0
 #: selection:trial.balance.webkit,filter:0
-#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:45
-#: code:addons/account_financial_report_webkit/wizard/balance_common.py:168
 #, python-format
 msgid "Periods"
 msgstr ""
@@ -921,11 +981,16 @@ msgid "Unsuported filter"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/common_reports.py:60
+#: code:addons/account_financial_report_webkit/report/common_reports.py:62
 #, python-format
 msgid "All accounts"
 msgstr ""
 
+#. module: account_financial_report_webkit
+#: constraint:account.move.line:0
+msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal."
+msgstr ""
+
 #. module: account_financial_report_webkit
 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:93
 #: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:106
@@ -939,23 +1004,11 @@ msgstr ""
 msgid "No valid filter"
 msgstr ""
 
-#. module: account_financial_report_webkit
-#: model:ir.ui.menu,name:account_financial_report_webkit.menu_account_open_invoices
-msgid "Open Invoices"
-msgstr ""
-
 #. module: account_financial_report_webkit
 #: view:open.invoices.webkit:0
 msgid "Clearance Analysis Options"
 msgstr ""
 
-#. module: account_financial_report_webkit
-#: selection:account.common.balance.report,filter:0
-#: selection:partner.balance.webkit,filter:0
-#: selection:trial.balance.webkit,filter:0
-msgid "Opening Only"
-msgstr ""
-
 #. module: account_financial_report_webkit
 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:97
 #: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:110
@@ -983,18 +1036,24 @@ msgid "This report allows you to print or generate a pdf of your general ledger
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/profit_loss.py:42
+#: code:addons/account_financial_report_webkit/report/profit_loss.py:39
 #, python-format
 msgid "PROFIT AND LOSS"
 msgstr ""
 
 #. module: account_financial_report_webkit
+#: field:account.common.balance.report,chart_account_id:0
 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:27
 #: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:31
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:40
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:28
 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:39
 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:52
+#: field:general.ledger.webkit,chart_account_id:0
+#: field:open.invoices.webkit,chart_account_id:0
+#: field:partner.balance.webkit,chart_account_id:0
+#: field:partners.ledger.webkit,chart_account_id:0
+#: field:trial.balance.webkit,chart_account_id:0
 msgid "Chart of Account"
 msgstr ""
 
@@ -1007,17 +1066,17 @@ msgstr ""
 
 #. module: account_financial_report_webkit
 #: field:account.common.balance.report,target_move:0
-#: field:general.ledger.webkit,target_move:0
-#: field:open.invoices.webkit,target_move:0
-#: field:partner.balance.webkit,target_move:0
-#: field:partners.ledger.webkit,target_move:0
-#: field:trial.balance.webkit,target_move:0
 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:37
 #: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:42
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:51
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:38
 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:49
 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:62
+#: field:general.ledger.webkit,target_move:0
+#: field:open.invoices.webkit,target_move:0
+#: field:partner.balance.webkit,target_move:0
+#: field:partners.ledger.webkit,target_move:0
+#: field:trial.balance.webkit,target_move:0
 msgid "Target Moves"
 msgstr ""
 
@@ -1032,22 +1091,50 @@ msgid "From:"
 msgstr ""
 
 #. module: account_financial_report_webkit
+#: field:account.common.balance.report,comp0_date_to:0
+#: field:account.common.balance.report,comp1_date_to:0
+#: field:account.common.balance.report,comp2_date_to:0
 #: field:account.common.balance.report,date_to:0
 #: field:general.ledger.webkit,date_to:0
 #: field:open.invoices.webkit,date_to:0
+#: field:partner.balance.webkit,comp0_date_to:0
+#: field:partner.balance.webkit,comp1_date_to:0
+#: field:partner.balance.webkit,comp2_date_to:0
 #: field:partner.balance.webkit,date_to:0
 #: field:partners.ledger.webkit,date_to:0
+#: field:trial.balance.webkit,comp0_date_to:0
+#: field:trial.balance.webkit,comp1_date_to:0
+#: field:trial.balance.webkit,comp2_date_to:0
 #: field:trial.balance.webkit,date_to:0
 msgid "End Date"
 msgstr ""
 
+#. module: account_financial_report_webkit
+#: field:account.common.balance.report,comp0_period_from:0
+#: field:account.common.balance.report,comp1_period_from:0
+#: field:account.common.balance.report,comp2_period_from:0
+#: field:account.common.balance.report,period_from:0
+#: field:general.ledger.webkit,period_from:0
+#: field:open.invoices.webkit,period_from:0
+#: field:partner.balance.webkit,comp0_period_from:0
+#: field:partner.balance.webkit,comp1_period_from:0
+#: field:partner.balance.webkit,comp2_period_from:0
+#: field:partner.balance.webkit,period_from:0
+#: field:partners.ledger.webkit,period_from:0
+#: field:trial.balance.webkit,comp0_period_from:0
+#: field:trial.balance.webkit,comp1_period_from:0
+#: field:trial.balance.webkit,comp2_period_from:0
+#: field:trial.balance.webkit,period_from:0
+msgid "Start Period"
+msgstr ""
+
 #. module: account_financial_report_webkit
 #: field:open.invoices.webkit,until_date:0
 msgid "Clearance date"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: model:ir.model,name:account_financial_report_webkit.model_account_report_partners_ledger_webkit
+#: model:ir.model,name:account_financial_report_webkit.model_partners_ledger_webkit
 msgid "Partner Ledger Report"
 msgstr ""
 
@@ -1059,12 +1146,36 @@ msgid "Partners Filters"
 msgstr ""
 
 #. module: account_financial_report_webkit
+#: selection:account.common.balance.report,comp0_filter:0
+#: field:account.common.balance.report,comp0_fiscalyear_id:0
+#: selection:account.common.balance.report,comp1_filter:0
+#: field:account.common.balance.report,comp1_fiscalyear_id:0
+#: selection:account.common.balance.report,comp2_filter:0
+#: field:account.common.balance.report,comp2_fiscalyear_id:0
+#: field:account.common.balance.report,fiscalyear_id:0
 #: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:28
 #: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:32
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:41
 #: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:29
 #: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:40
 #: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:53
+#: field:general.ledger.webkit,fiscalyear_id:0
+#: field:open.invoices.webkit,fiscalyear_id:0
+#: selection:partner.balance.webkit,comp0_filter:0
+#: field:partner.balance.webkit,comp0_fiscalyear_id:0
+#: selection:partner.balance.webkit,comp1_filter:0
+#: field:partner.balance.webkit,comp1_fiscalyear_id:0
+#: selection:partner.balance.webkit,comp2_filter:0
+#: field:partner.balance.webkit,comp2_fiscalyear_id:0
+#: field:partner.balance.webkit,fiscalyear_id:0
+#: field:partners.ledger.webkit,fiscalyear_id:0
+#: selection:trial.balance.webkit,comp0_filter:0
+#: field:trial.balance.webkit,comp0_fiscalyear_id:0
+#: selection:trial.balance.webkit,comp1_filter:0
+#: field:trial.balance.webkit,comp1_fiscalyear_id:0
+#: selection:trial.balance.webkit,comp2_filter:0
+#: field:trial.balance.webkit,comp2_fiscalyear_id:0
+#: field:trial.balance.webkit,fiscalyear_id:0
 msgid "Fiscal Year"
 msgstr ""
 
@@ -1075,10 +1186,16 @@ msgid "Yes"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:95
-#: report:addons/account_financial_report_webkit/report/templates/account_report_open_invoices.mako:108
-#: report:addons/account_financial_report_webkit/report/templates/account_report_partners_ledger.mako:104
-msgid "Entry"
+#: selection:account.common.balance.report,comp0_filter:0
+#: selection:account.common.balance.report,comp1_filter:0
+#: selection:account.common.balance.report,comp2_filter:0
+#: selection:partner.balance.webkit,comp0_filter:0
+#: selection:partner.balance.webkit,comp1_filter:0
+#: selection:partner.balance.webkit,comp2_filter:0
+#: selection:trial.balance.webkit,comp0_filter:0
+#: selection:trial.balance.webkit,comp1_filter:0
+#: selection:trial.balance.webkit,comp2_filter:0
+msgid "No Comparison"
 msgstr ""
 
 #. module: account_financial_report_webkit
@@ -1086,9 +1203,9 @@ msgstr ""
 #: code:addons/account_financial_report_webkit/report/open_invoices.py:63
 #: code:addons/account_financial_report_webkit/report/partner_balance.py:63
 #: code:addons/account_financial_report_webkit/report/partners_ledger.py:64
-#: code:addons/account_financial_report_webkit/report/profit_loss.py:71
+#: code:addons/account_financial_report_webkit/report/profit_loss.py:68
 #: code:addons/account_financial_report_webkit/report/trial_balance.py:64
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:67
+#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:68
 #, python-format
 msgid "Page"
 msgstr ""
@@ -1099,14 +1216,19 @@ msgid "Partners Filter"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/open_invoices.py:102
-#: code:addons/account_financial_report_webkit/report/partners_ledger.py:102
-#, python-format
-msgid "No accounts to print."
+#: selection:account.common.balance.report,display_account:0
+#: report:addons/account_financial_report_webkit/report/templates/account_report_general_ledger.mako:61
+#: report:addons/account_financial_report_webkit/report/templates/account_report_partner_balance.mako:75
+#: report:addons/account_financial_report_webkit/report/templates/account_report_profit_loss.mako:73
+#: report:addons/account_financial_report_webkit/report/templates/account_report_trial_balance.mako:86
+#: selection:general.ledger.webkit,display_account:0
+#: selection:partner.balance.webkit,display_account:0
+#: selection:trial.balance.webkit,display_account:0
+msgid "All"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: code:addons/account_financial_report_webkit/report/profit_loss.py:49
+#: code:addons/account_financial_report_webkit/report/profit_loss.py:46
 #, python-format
 msgid "Profit and Loss"
 msgstr ""
@@ -1125,19 +1247,19 @@ msgstr ""
 
 #. module: account_financial_report_webkit
 #: code:addons/account_financial_report_webkit/report/partners_ledger.py:41
-#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:57
+#: code:addons/account_financial_report_webkit/report/webkit_parser_header_fix.py:58
 #, python-format
 msgid "PARTNER LEDGER"
 msgstr ""
 
 #. module: account_financial_report_webkit
 #: selection:account.common.balance.report,target_move:0
+#: code:addons/account_financial_report_webkit/report/common_reports.py:84
 #: selection:general.ledger.webkit,target_move:0
 #: selection:open.invoices.webkit,target_move:0
 #: selection:partner.balance.webkit,target_move:0
 #: selection:partners.ledger.webkit,target_move:0
 #: selection:trial.balance.webkit,target_move:0
-#: code:addons/account_financial_report_webkit/report/common_reports.py:82
 #, python-format
 msgid "All Entries"
 msgstr ""
@@ -1148,7 +1270,15 @@ msgid "Wrong credit or debit value in accounting entry !"
 msgstr ""
 
 #. module: account_financial_report_webkit
-#: constraint:account.move.line:0
-msgid "You can not create move line on view account."
+#: field:account.common.balance.report,comp0_filter:0
+#: field:account.common.balance.report,comp1_filter:0
+#: field:account.common.balance.report,comp2_filter:0
+#: field:partner.balance.webkit,comp0_filter:0
+#: field:partner.balance.webkit,comp1_filter:0
+#: field:partner.balance.webkit,comp2_filter:0
+#: field:trial.balance.webkit,comp0_filter:0
+#: field:trial.balance.webkit,comp1_filter:0
+#: field:trial.balance.webkit,comp2_filter:0
+msgid "Compare By"
 msgstr ""
 

account_financial_report_webkit/report/open_invoices.py

@@ -22,14 +22,26 @@ import pooler
 
 from collections import defaultdict
 from report import report_sxw
-from osv import osv
-from tools.translate import _
 from datetime import datetime
+from itertools import groupby
+from operator import itemgetter
+from mako.template import Template
+
+from tools.translate import _
 
+from openerp.osv import osv
 from common_partner_reports import CommonPartnersReportHeaderWebkit
 from webkit_parser_header_fix import HeaderFooterTextWebKitParser
+from openerp.addons.report_webkit import report_helper
+import addons
 
 
+def get_mako_template(obj, *args):
+    template_path = addons.get_module_resource(*args)
+    return Template(filename=template_path, input_encoding='utf-8')
+
+report_helper.WebKitHelper.get_mako_template = get_mako_template
+
 class PartnersOpenInvoicesWebkit(report_sxw.rml_parse, CommonPartnersReportHeaderWebkit):
 
     def __init__(self, cursor, uid, name, context):
@@ -65,6 +77,18 @@ class PartnersOpenInvoicesWebkit(report_sxw.rml_parse, CommonPartnersReportHeade
             ],
         })
 
+
+    def _group_lines_by_currency(self, account_br):
+        account_br.grouped_ledger_lines = {}
+        if not account_br.ledger_lines:
+            return
+        for part_id, plane_lines in account_br.ledger_lines.items():
+            account_br.grouped_ledger_lines[part_id] = []
+            plane_lines.sort(key=itemgetter('currency_code'))
+            for curr, lines in  groupby(plane_lines, key=itemgetter('currency_code')):
+                tmp = [x for x in lines]
+                account_br.grouped_ledger_lines[part_id].append((curr, tmp)) #I want to reiter many times
+    
     def set_context(self, objects, data, ids, report_type=None):
         """Populate a ledger_lines attribute on each browse record that will be used
         by mako template"""
@@ -84,6 +108,7 @@ class PartnersOpenInvoicesWebkit(report_sxw.rml_parse, CommonPartnersReportHeade
         result_selection = self._get_form_param('result_selection', data)
         date_until = self._get_form_param('until_date', data)
         chart_account = self._get_chart_account_id_br(data)
+        group_by_currency = self._get_form_param('group_by_currency', data)
 
         if main_filter == 'filter_no' and fiscalyear:
             start_period = self.get_first_fiscalyear_period(fiscalyear)
@@ -129,6 +154,8 @@ class PartnersOpenInvoicesWebkit(report_sxw.rml_parse, CommonPartnersReportHeade
 
             account.partners_order = self._order_partners(ledg_lines_pids, init_bal_lines_pids)
             account.ledger_lines = ledger_lines_memoizer.get(account.id, {})
+            if group_by_currency:
+                self._group_lines_by_currency(account)
             objects.append(account)
 
         self.localcontext.update({

account_financial_report_webkit/report/templates/account_report_open_invoices.mako

@@ -1,4 +1,5 @@
-<!DOCTYPE html SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html SYSTEM
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <style type="text/css">
@@ -19,11 +20,12 @@
         </style>
     </head>
     <body>
-        <%!
-        def amount(text):
-            return text.replace('-', '&#8209;')  # replace by a non-breaking hyphen (it will not word-wrap between hyphen and numbers)
-        %>
-
+ 
+    <% import addons %>        
+    <% template1 = helper.get_mako_template('account_financial_report_webkit','report', 'templates', 'open_invoices_inclusion.mako.html') %>
+    <% context.lookup.put_template('open_invoices_inclusion.mako.html', template1) %>
+    <% template2 = helper.get_mako_template('account_financial_report_webkit','report', 'templates', 'grouped_by_curr_open_invoices_inclusion.mako.html') %>
+    <% context.lookup.put_template('grouped_by_curr_open_invoices_inclusion.mako.html', template2) %>
         <%setLang(user.context_lang)%>
 
         <div class="act_as_table data_table">
@@ -70,181 +72,13 @@
                 <div class="act_as_cell">${ display_target_move(data) }</div>
             </div>
         </div>
-    
-        %for account in objects:
-            %if account.ledger_lines:
-                <%
-                if not account.partners_order:
-                    continue
-                account_total_debit = 0.0
-                account_total_credit = 0.0
-                account_balance_cumul = 0.0
-                account_balance_cumul_curr = 0.0
-                %>
-
-                <div class="account_title bg" style="width: 1080px; margin-top: 20px; font-size: 12px;">${account.code} - ${account.name}</div>
-                
-                %for partner_name, p_id, p_ref, p_name in account.partners_order:
-                <%
-                  total_debit = 0.0
-                  total_credit = 0.0
-                  cumul_balance = 0.0
-                  cumul_balance_curr = 0.0
-
-                  part_cumul_balance = 0.0
-                  part_cumul_balance_curr = 0.0 
-                %>
-                <div class="act_as_table list_table" style="margin-top: 5px;">
-                    <div class="act_as_caption account_title">
-                        ${partner_name or _('No Partner')}
-                    </div>
-                    <div class="act_as_thead">
-                        <div class="act_as_row labels">
-                            ## date
-                            <div class="act_as_cell first_column" style="width: 60px;">${_('Date')}</div>
-                            ## period
-                            <div class="act_as_cell" style="width: 70px;">${_('Period')}</div>
-                            ## move
-                            <div class="act_as_cell" style="width: 70px;">${_('Entry')}</div>
-                            ## journal
-                            <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
-                            ## partner
-                            <div class="act_as_cell" style="width: 60px;">${_('Partner')}</div>
-                            ## label
-                            <div class="act_as_cell" style="width: 255px;">${_('Label')}</div>
-                            ## reconcile
-                            <div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div>
-                            ## maturity
-                            <div class="act_as_cell" style="width: 60px;">${_('Due Date')}</div>
-                            ## debit
-                            <div class="act_as_cell amount" style="width: 80px;">${_('Debit')}</div>
-                            ## credit
-                            <div class="act_as_cell amount" style="width: 80px;">${_('Credit')}</div>
-                            ## balance cumulated
-                            <div class="act_as_cell amount" style="width: 80px;">${_('Cumul. Bal.')}</div>
-                            %if amount_currency(data):
-                                ## currency balance
-                                <div class="act_as_cell amount sep_left" style="width: 80px;">${_('Curr. Balance')}</div>
-                               ## curency code
-                               <div class="act_as_cell amount" style="width: 30px; text-align: right;">${_('Curr.')}</div>
-                            %endif
-                        </div>
-                    </div>
-                    <div class="act_as_tbody">
-                        <%
-                        total_debit = 0.0
-                        total_credit = 0.0
-                        %>
-
-                        %for line in account.ledger_lines.get(p_id, []):
-                          <%
-                          total_debit += line.get('debit') or 0.0
-                          total_credit += line.get('credit') or 0.0
-
-                          label_elements = [line.get('lname') or '']
-                          if line.get('invoice_number'):
-                            label_elements.append("(%s)" % (line['invoice_number'],))
-                          label = ' '.join(label_elements)
-                          %>
-                            <div class="act_as_row lines ${line.get('is_from_previous_periods') and 'open_invoice_previous_line' or ''} ${line.get('is_clearance_line') and 'clearance_line' or ''}">
-                              ## date
-                              <div class="act_as_cell first_column">${formatLang(line.get('ldate') or '', date=True)}</div>
-                              ## period
-                              <div class="act_as_cell">${line.get('period_code') or ''}</div>
-                              ## move
-                              <div class="act_as_cell">${line.get('move_name') or ''}</div>
-                              ## journal
-                              <div class="act_as_cell">${line.get('jcode') or ''}</div>
-                              ## partner
-                              <div class="act_as_cell overflow_ellipsis">${line.get('partner_name') or ''}</div>
-                              ## label
-                              <div class="act_as_cell">${label}</div>
-                              ## reconcile
-                              <div class="act_as_cell">${line.get('rec_name') or ''}</div>
-                              ## maturity date
-                              <div class="act_as_cell">${formatLang(line.get('date_maturity') or '', date=True)}</div>
-                              ## debit
-                              <div class="act_as_cell amount">${formatLang(line.get('debit') or 0.0) | amount }</div>
-                              ## credit
-                              <div class="act_as_cell amount">${formatLang(line.get('credit') or 0.0) | amount }</div>
-                              ## balance cumulated
-                              <% cumul_balance += line.get('balance') or 0.0 %>
-                              <div class="act_as_cell amount" style="padding-right: 1px;">${formatLang(cumul_balance) | amount }</div>
-                              %if amount_currency(data):
-                                  ## currency balance
-                                  <div class="act_as_cell sep_left amount">${formatLang(line.get('amount_currency') or 0.0) | amount }</div>
-                                  ## curency code
-                                  <div class="act_as_cell" style="text-align: right; ">${line.get('currency_code') or ''}</div>
-                              %endif
-                          </div>
-                        %endfor
-                        <div class="act_as_row lines labels">
-                          ## date
-                          <div class="act_as_cell first_column"></div>
-                          ## period
-                          <div class="act_as_cell"></div>
-                          ## move
-                          <div class="act_as_cell"></div>
-                          ## journal
-                          <div class="act_as_cell"></div>
-                          ## partner
-                          <div class="act_as_cell"></div>
-                          ## label
-                          <div class="act_as_cell">${_('Cumulated Balance on Partner')}</div>
-                          ## reconcile
-                          <div class="act_as_cell"></div>
-                          ## maturity date
-                          <div class="act_as_cell"></div>
-                          ## debit
-                          <div class="act_as_cell amount">${formatLang(total_debit) | amount }</div>
-                          ## credit
-                          <div class="act_as_cell amount">${formatLang(total_credit) | amount }</div>
-                          ## balance cumulated
-                          <div class="act_as_cell amount" style="padding-right: 1px;">${formatLang(cumul_balance) | amount }</div>
-                          %if amount_currency(data):
-                              %if account.currency_id:
-                                  ## currency balance
-                                  <div class="act_as_cell sep_left amount" style="padding-right: 1px;">${formatLang(cumul_balance_curr) | amount }</div>
-                              %else:
-                                  <div class="act_as_cell sep_left amount" style="padding-right: 1px;">${ u'-' }</div>
-                              %endif
-                              ## curency code
-                              <div class="act_as_cell" style="text-align: right; ">${ account.currency_id.name if account.currency_id else u'' }</div>
-                          %endif
-                      </div>
-                    </div>
-                </div>
-                <%
-                    account_total_debit += total_debit
-                    account_total_credit += total_credit
-                    account_balance_cumul += cumul_balance
-                    account_balance_cumul_curr += cumul_balance_curr
-                %>
-                %endfor
-                <div class="act_as_table list_table" style="margin-top:5px;">
-                    <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
-                            <div class="act_as_cell first_column" style="width: 330px;">${account.code} - ${account.name}</div>
-                            ## label
-                            <div class="act_as_cell" style="width: 395px;">${_("Cumulated Balance on Account")}</div>
-                            ## debit
-                            <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div>
-                            ## credit
-                            <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_credit) | amount }</div>
-                            ## balance cumulated
-                            <div class="act_as_cell amount" style="width: 80px; ">${ formatLang(account_balance_cumul) | amount }</div>
-                            %if amount_currency(data):
-                                ## currency balance cumulated
-                                %if account.currency_id:
-                                    <div class="act_as_cell amount sep_left" style="width: 80px;">${ formatLang(account_balance_cumul_curr) | amount }</div>
-                                %else:
-                                    <div class="act_as_cell amount sep_left" style="width: 80px; padding-right: 1px;">${ u'-' }</div>
-                                %endif
-                                ## curency code
-                                <div class="act_as_cell amount" style="width: 30px; text-align: right;">${ account.currency_id.name if account.currency_id else u'' }</div>
-                            %endif
-                        </div>
-                    </div>
-                </div>
+        %for acc in objects:
+            %if hasattr(acc, 'grouped_ledger_lines'):
+               <% fl = formatLang %>
+              <%include file="grouped_by_curr_open_invoices_inclusion.mako.html" args="account=acc,formatLang=fl"/>
+            %else:
+               <% fl = formatLang %>
+              <%include file="open_invoices_inclusion.mako.html" args="account=acc,formatLang=fl"/>
             %endif
         %endfor
     </body>

account_financial_report_webkit/report/templates/grouped_by_curr_open_invoices_inclusion.mako.html

@@ -0,0 +1,166 @@
+<%page args="account, formatLang" />
+%if account.grouped_ledger_lines and account.partners_order:
+    <%
+    account_total_debit = 0.0
+    account_total_credit = 0.0
+    account_balance_cumul = 0.0
+    account_balance_cumul_curr = 0.0
+    %>
+   %for partner_name, p_id, p_ref, p_name in account.partners_order:
+    <div class="account_title bg" style="width: 1080px; margin-top:
+      20px; font-size: 12px;">${account.code} - ${account.name} --  ${partner_name or _('No Partner')} </div>
+    
+ 
+
+    %for curr, grouped_lines in account.grouped_ledger_lines.get(p_id, []):
+    <%
+      total_debit = 0.0
+      total_credit = 0.0
+      cumul_balance = 0.0
+      cumul_balance_curr = 0.0
+
+      part_cumul_balance = 0.0
+      part_cumul_balance_curr = 0.0 
+    %>
+    <div class="act_as_table list_table" style="margin-top: 5px;">
+        <div class="act_as_caption account_title">
+           <b>${curr or company.currency_id.name}</b>
+        </div>
+        <div class="act_as_thead">
+            <div class="act_as_row labels">
+                ## date
+                <div class="act_as_cell first_column" style="width: 60px;">${_('Date')}</div>
+                ## period
+                <div class="act_as_cell" style="width: 70px;">${_('Period')}</div>
+                ## move
+                <div class="act_as_cell" style="width: 70px;">${_('Entry')}</div>
+                ## journal
+                <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
+                ## label
+                <div class="act_as_cell" style="width: 255px;">${_('Label')}</div>
+                ## reconcile
+                <div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div>
+                ## maturity
+                <div class="act_as_cell" style="width: 60px;">${_('Due Date')}</div>
+                ## debit
+                <div class="act_as_cell amount" style="width: 80px;">${_('Debit')}</div>
+                ## credit
+                <div class="act_as_cell amount" style="width: 80px;">${_('Credit')}</div>
+                ## balance cumulated
+               <div class="act_as_cell amount" style="width: 80px;">${_('Cumul. Bal.')}</div>
+               ## currency balance
+               <div class="act_as_cell amount sep_left" style="width: 80px;">${_('Curr. Balance')}</div>
+               ## curency code
+               <div class="act_as_cell amount" style="width: 30px; text-align: right;">${_('Curr.')}</div>
+            </div>
+        </div>
+        <div class="act_as_tbody">
+            <%
+            total_debit = 0.0
+            total_credit = 0.0
+            %>
+           <%!
+            def amount(text):
+                return text.replace('-', '&#8209;')  # replace by a non-breaking hyphen (it will not word-wrap between hyphen and numbers)
+            %>
+            %for line in grouped_lines:
+              <%
+              total_debit += line.get('debit') or 0.0
+              total_credit += line.get('credit') or 0.0
+
+              label_elements = [line.get('lname') or '']
+              if line.get('invoice_number'):
+                label_elements.append("(%s)" % (line['invoice_number'],))
+              label = ' '.join(label_elements)
+              %>
+                <div class="act_as_row lines ${line.get('is_from_previous_periods') and 'open_invoice_previous_line' or ''} ${line.get('is_clearance_line') and 'clearance_line' or ''}">
+                  ## date
+                  <div class="act_as_cell first_column">${formatLang(line.get('ldate') or '', date=True)}</div>
+                  ## period
+                  <div class="act_as_cell">${line.get('period_code') or ''}</div>
+                  ## move
+                  <div class="act_as_cell">${line.get('move_name') or ''}</div>
+                  ## journal
+                  <div class="act_as_cell">${line.get('jcode') or ''}</div>
+                  ## label
+                  <div class="act_as_cell">${label}</div>
+                  ## reconcile
+                  <div class="act_as_cell">${line.get('rec_name') or ''}</div>
+                  ## maturity date
+                  <div class="act_as_cell">${formatLang(line.get('date_maturity') or '', date=True)}</div>
+                  ## debit
+                  <div class="act_as_cell amount">${formatLang(line.get('debit') or 0.0) | amount }</div>
+                  ## credit
+                  <div class="act_as_cell amount">${formatLang(line.get('credit') or 0.0) | amount }</div>
+                  ## balance cumulated
+                  <% cumul_balance += line.get('balance') or 0.0 %>
+                  <div class="act_as_cell amount" style="padding-right: 1px;">${formatLang(cumul_balance) | amount }</div>
+                  ## currency balance
+                  <div class="act_as_cell sep_left amount">${formatLang(line.get('amount_currency') or 0.0) | amount }</div>
+                  ## curency code
+                  <div class="act_as_cell" style="text-align: right; ">${line.get('currency_code') or ''}</div>
+              </div>
+            %endfor
+            <div class="act_as_row lines labels">
+              ## date
+              <div class="act_as_cell first_column"></div>
+              ## period
+              <div class="act_as_cell"></div>
+              ## move
+              <div class="act_as_cell"></div>
+              ## journal
+              <div class="act_as_cell"></div>
+              ## label
+              <div class="act_as_cell">${_('Cumulated Balance on Partner')}</div>
+              ## reconcile
+              <div class="act_as_cell"></div>
+              ## maturity date
+              <div class="act_as_cell"></div>
+              ## debit
+              <div class="act_as_cell amount">${formatLang(total_debit) | amount }</div>
+              ## credit
+              <div class="act_as_cell amount">${formatLang(total_credit) | amount }</div>
+              ## balance cumulated
+              <div class="act_as_cell amount" style="padding-right: 1px;">${formatLang(cumul_balance) | amount }</div>
+              %if account.currency_id:
+                  ## currency balance
+                  <div class="act_as_cell sep_left amount" style="padding-right: 1px;">${formatLang(cumul_balance_curr) | amount }</div>
+              %else:
+                  <div class="act_as_cell sep_left amount" style="padding-right: 1px;">${ u'-' }</div>
+              %endif
+              ## curency code
+              <div class="act_as_cell" style="text-align: right; ">${ account.currency_id.name if account.currency_id else u'' }</div>
+          </div>
+        </div>
+    </div>
+    <%
+        account_total_debit += total_debit
+        account_total_credit += total_credit
+        account_balance_cumul += cumul_balance
+        account_balance_cumul_curr += cumul_balance_curr
+    %>
+    %endfor
+%endfor
+       <div class="act_as_table list_table" style="margin-top:5px;">
+        <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
+                <div class="act_as_cell first_column" style="width: 330px;">${account.code} - ${account.name}</div>
+                ## label
+                <div class="act_as_cell" style="width: 395px;">${_("Cumulated Balance on Account")}</div>
+                ## debit
+                <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div>
+                ## credit
+                <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_credit) | amount }</div>
+                ## balance cumulated
+                <div class="act_as_cell amount" style="width: 80px; ">${ formatLang(account_balance_cumul) | amount }</div>
+                ## currency balance cumulated
+                %if account.currency_id:
+                    <div class="act_as_cell amount sep_left" style="width: 80px;">${ formatLang(account_balance_cumul_curr) | amount }</div>
+                %else:
+                    <div class="act_as_cell amount sep_left" style="width: 80px; padding-right: 1px;">${ u'-' }</div>
+                %endif
+                ## curency code
+                <div class="act_as_cell amount" style="width: 30px; text-align: right;">${ account.currency_id.name if account.currency_id else u'' }</div>
+            </div>
+        </div>
+    </div>
+%endif

account_financial_report_webkit/report/templates/open_invoices_inclusion.mako.html

@@ -0,0 +1,176 @@
+<%page args="account, formatLang" />
+%if account.ledger_lines and account.partners_order:
+    <%
+    account_total_debit = 0.0
+    account_total_credit = 0.0
+    account_balance_cumul = 0.0
+    account_balance_cumul_curr = 0.0
+    %>
+
+    <div class="account_title bg" style="width: 1080px; margin-top: 20px; font-size: 12px;">${account.code} - ${account.name}</div>
+    
+    %for partner_name, p_id, p_ref, p_name in account.partners_order:
+    <%
+      total_debit = 0.0
+      total_credit = 0.0
+      cumul_balance = 0.0
+      cumul_balance_curr = 0.0
+
+      part_cumul_balance = 0.0
+      part_cumul_balance_curr = 0.0 
+    %>
+    <div class="act_as_table list_table" style="margin-top: 5px;">
+        <div class="act_as_caption account_title">
+            ${partner_name or _('No Partner')}
+        </div>
+        <div class="act_as_thead">
+            <div class="act_as_row labels">
+                ## date
+                <div class="act_as_cell first_column" style="width: 60px;">${_('Date')}</div>
+                ## period
+                <div class="act_as_cell" style="width: 70px;">${_('Period')}</div>
+                ## move
+                <div class="act_as_cell" style="width: 70px;">${_('Entry')}</div>
+                ## journal
+                <div class="act_as_cell" style="width: 70px;">${_('Journal')}</div>
+                ## partner
+                <div class="act_as_cell" style="width: 60px;">${_('Partner')}</div>
+                ## label
+                <div class="act_as_cell" style="width: 255px;">${_('Label')}</div>
+                ## reconcile
+                <div class="act_as_cell" style="width: 80px;">${_('Rec.')}</div>
+                ## maturity
+                <div class="act_as_cell" style="width: 60px;">${_('Due Date')}</div>
+                ## debit
+                <div class="act_as_cell amount" style="width: 80px;">${_('Debit')}</div>
+                ## credit
+                <div class="act_as_cell amount" style="width: 80px;">${_('Credit')}</div>
+                ## balance cumulated
+                <div class="act_as_cell amount" style="width: 80px;">${_('Cumul. Bal.')}</div>
+                %if amount_currency(data):
+                    ## currency balance
+                    <div class="act_as_cell amount sep_left" style="width: 80px;">${_('Curr. Balance')}</div>
+                   ## curency code
+                   <div class="act_as_cell amount" style="width: 30px; text-align: right;">${_('Curr.')}</div>
+                %endif
+            </div>
+        </div>
+        <div class="act_as_tbody">
+            <%
+            total_debit = 0.0
+            total_credit = 0.0
+            %>
+           <%!
+            def amount(text):
+                return text.replace('-', '&#8209;')  # replace by a non-breaking hyphen (it will not word-wrap between hyphen and numbers)
+            %>
+            %for line in account.ledger_lines.get(p_id, []):
+              <%
+              total_debit += line.get('debit') or 0.0
+              total_credit += line.get('credit') or 0.0
+
+              label_elements = [line.get('lname') or '']
+              if line.get('invoice_number'):
+                label_elements.append("(%s)" % (line['invoice_number'],))
+              label = ' '.join(label_elements)
+              %>
+                <div class="act_as_row lines ${line.get('is_from_previous_periods') and 'open_invoice_previous_line' or ''} ${line.get('is_clearance_line') and 'clearance_line' or ''}">
+                  ## date
+                  <div class="act_as_cell first_column">${formatLang(line.get('ldate') or '', date=True)}</div>
+                  ## period
+                  <div class="act_as_cell">${line.get('period_code') or ''}</div>
+                  ## move
+                  <div class="act_as_cell">${line.get('move_name') or ''}</div>
+                  ## journal
+                  <div class="act_as_cell">${line.get('jcode') or ''}</div>
+                  ## partner
+                  <div class="act_as_cell overflow_ellipsis">${line.get('partner_name') or ''}</div>
+                  ## label
+                  <div class="act_as_cell">${label}</div>
+                  ## reconcile
+                  <div class="act_as_cell">${line.get('rec_name') or ''}</div>
+                  ## maturity date
+                  <div class="act_as_cell">${formatLang(line.get('date_maturity') or '', date=True)}</div>
+                  ## debit
+                  <div class="act_as_cell amount">${formatLang(line.get('debit') or 0.0) | amount }</div>
+                  ## credit
+                  <div class="act_as_cell amount">${formatLang(line.get('credit') or 0.0) | amount }</div>
+                  ## balance cumulated
+                  <% cumul_balance += line.get('balance') or 0.0 %>
+                  <div class="act_as_cell amount" style="padding-right: 1px;">${formatLang(cumul_balance) | amount }</div>
+                  %if amount_currency(data):
+                      ## currency balance
+                      <div class="act_as_cell sep_left amount">${formatLang(line.get('amount_currency') or 0.0) | amount }</div>
+                      ## curency code
+                      <div class="act_as_cell" style="text-align: right; ">${line.get('currency_code') or ''}</div>
+                  %endif
+              </div>
+            %endfor
+            <div class="act_as_row lines labels">
+              ## date
+              <div class="act_as_cell first_column"></div>
+              ## period
+              <div class="act_as_cell"></div>
+              ## move
+              <div class="act_as_cell"></div>
+              ## journal
+              <div class="act_as_cell"></div>
+              ## partner
+              <div class="act_as_cell"></div>
+              ## label
+              <div class="act_as_cell">${_('Cumulated Balance on Partner')}</div>
+              ## reconcile
+              <div class="act_as_cell"></div>
+              ## maturity date
+              <div class="act_as_cell"></div>
+              ## debit
+              <div class="act_as_cell amount">${formatLang(total_debit) | amount }</div>
+              ## credit
+              <div class="act_as_cell amount">${formatLang(total_credit) | amount }</div>
+              ## balance cumulated
+              <div class="act_as_cell amount" style="padding-right: 1px;">${formatLang(cumul_balance) | amount }</div>
+              %if amount_currency(data):
+                  %if account.currency_id:
+                      ## currency balance
+                      <div class="act_as_cell sep_left amount" style="padding-right: 1px;">${formatLang(cumul_balance_curr) | amount }</div>
+                  %else:
+                      <div class="act_as_cell sep_left amount" style="padding-right: 1px;">${ u'-' }</div>
+                  %endif
+                  ## curency code
+                  <div class="act_as_cell" style="text-align: right; ">${ account.currency_id.name if account.currency_id else u'' }</div>
+              %endif
+          </div>
+        </div>
+    </div>
+    <%
+        account_total_debit += total_debit
+        account_total_credit += total_credit
+        account_balance_cumul += cumul_balance
+        account_balance_cumul_curr += cumul_balance_curr
+    %>
+    %endfor
+    <div class="act_as_table list_table" style="margin-top:5px;">
+        <div class="act_as_row labels" style="font-weight: bold; font-size: 12px;">
+                <div class="act_as_cell first_column" style="width: 330px;">${account.code} - ${account.name}</div>
+                ## label
+                <div class="act_as_cell" style="width: 395px;">${_("Cumulated Balance on Account")}</div>
+                ## debit
+                <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_debit) | amount }</div>
+                ## credit
+                <div class="act_as_cell amount" style="width: 80px;">${ formatLang(account_total_credit) | amount }</div>
+                ## balance cumulated
+                <div class="act_as_cell amount" style="width: 80px; ">${ formatLang(account_balance_cumul) | amount }</div>
+                %if amount_currency(data):
+                    ## currency balance cumulated
+                    %if account.currency_id:
+                        <div class="act_as_cell amount sep_left" style="width: 80px;">${ formatLang(account_balance_cumul_curr) | amount }</div>
+                    %else:
+                        <div class="act_as_cell amount sep_left" style="width: 80px; padding-right: 1px;">${ u'-' }</div>
+                    %endif
+                    ## curency code
+                    <div class="act_as_cell amount" style="width: 30px; text-align: right;">${ account.currency_id.name if account.currency_id else u'' }</div>
+                %endif
+            </div>
+        </div>
+    </div>
+%endif

account_financial_report_webkit/wizard/open_invoices_wizard.py

@@ -29,6 +29,7 @@ class AccountReportOpenInvoicesWizard(osv.osv_memory):
     _description = "Open Invoices Report"
 
     _columns = {
+        'group_by_currency':fields.boolean('Group Partner by currency'),
         'until_date': fields.date("Clearance date",
                                   required=True,
                                   help="""The clearance date is essentially a tool used for debtors provisionning calculation.
@@ -36,9 +37,7 @@ class AccountReportOpenInvoicesWizard(osv.osv_memory):
 By default, this date is equal to the the end date (ie: 31/12/2011 if you select fy 2011).
 
 By amending the clearance date, you will be, for instance, able to answer the question : 'based on my last year end debtors open invoices, which invoices are still unpaid today (today is my clearance date)?'
-"""),
-
-    }
+""")}
 
     def _check_until_date(self, cr, uid, ids, context=None):
         def get_key_id(obj, field):
@@ -111,7 +110,7 @@ By amending the clearance date, you will be, for instance, able to answer the qu
         if context is None:
             context = {}
         vals = self.read(cr, uid, ids,
-                         ['until_date',],
+                         ['until_date', 'group_by_currency'],
                          context=context)[0]
         data['form'].update(vals)
         return data

account_financial_report_webkit/wizard/open_invoices_wizard_view.xml

@@ -31,6 +31,7 @@
                         </page>
                         <page string="Layout Options" name="layout_options">
                             <field name="amount_currency"/>
+                            <field name="group_by_currency"/>
                         </page>
                     </page>
                     <page name="filters" position="attributes">