[FIX] account: update report .sxw and pot

bzr revid: xal@openerp.com-20121023131930-b08dzf5bi6q1hm6w

diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index b4e5248..139d02f 100644 (file)
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 12:28+0000\n"
-"PO-Revision-Date: 2012-10-08 12:28+0000\n"
+"POT-Creation-Date: 2012-10-23 11:48+0000\n"
+"PO-Revision-Date: 2012-10-23 11:48+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -642,7 +642,7 @@ msgstr ""
 #: selection:account.partner.ledger,result_selection:0
 #: code:addons/account/report/account_aged_partner_balance.py:372
 #: code:addons/account/report/account_partner_balance.py:297
-#: code:addons/account/report/account_partner_ledger.py:394
+#: code:addons/account/report/account_partner_ledger.py:395
 #: model:ir.actions.act_window,name:account.action_aged_receivable
 #, python-format
 msgid "Receivable Accounts"
@@ -690,6 +690,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
 msgid "Percent"
 msgstr ""
 
@@ -1652,6 +1653,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -2149,11 +2151,6 @@ msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
 
 #. module: account
-#: constraint:res.partner.bank:0
-msgid "The RIB and/or IBAN is not valid"
-msgstr ""
-
-#. module: account
 #: view:product.category:0
 msgid "Accounting Properties"
 msgstr ""
@@ -2261,11 +2258,6 @@ msgid "Account Entry"
 msgstr ""
 
 #. module: account
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
 msgstr ""
@@ -2469,7 +2461,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2636,11 +2627,6 @@ msgid "Accounting entries"
 msgstr ""
 
 #. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
-#. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
 msgstr ""
@@ -3174,11 +3160,6 @@ msgid "VAT:"
 msgstr ""
 
 #. module: account
-#: constraint:account.invoice:0
-msgid "Invalid BBA Structured Communication !"
-msgstr ""
-
-#. module: account
 #: help:account.analytic.line,amount_currency:0
 msgid "The amount expressed in the related account currency if not equal to the company one."
 msgstr ""
@@ -3394,6 +3375,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3425,6 +3407,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
 #: code:addons/account/report/account_journal.py:195
 #: code:addons/account/report/account_journal.py:198
 #: code:addons/account/report/common_report_header.py:97
@@ -3446,7 +3430,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3892,12 +3875,6 @@ msgid "Cancel the Selected Invoices"
 msgstr ""
 
 #. module: account
-#: help:product.category,property_account_income_categ:0
-#: help:product.template,property_account_income:0
-msgid "This account will be used to value outgoing stock for the current product category using sale price"
-msgstr ""
-
-#. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "3"
 msgstr ""
@@ -4093,6 +4070,11 @@ msgid "Statement from invoice or payment"
 msgstr ""
 
 #. module: account
+#: help:product.template,property_account_expense:0
+msgid "This account will be used for invoices instead of the default one to value expenses for the current product"
+msgstr ""
+
+#. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
 msgstr ""
@@ -5055,7 +5037,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5183,7 +5164,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5209,8 +5189,6 @@ msgstr ""
 #: field:account.invoice.line,quantity:0
 #: field:account.model.line,quantity:0
 #: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,unit_amount:0
 #: field:report.account.sales,quantity:0
@@ -5301,7 +5279,6 @@ msgstr ""
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Fixed Amount"
 msgstr ""
 
@@ -5345,7 +5322,6 @@ msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
-#: help:account.tax.template,type:0
 msgid "The computation method for the tax amount."
 msgstr ""
 
@@ -5446,7 +5422,7 @@ msgstr ""
 #: selection:account.partner.ledger,result_selection:0
 #: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
-#: code:addons/account/report/account_partner_ledger.py:398
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5538,11 +5514,6 @@ msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
 
 #. module: account
-#: field:account.bank.statement.line,date:0
-msgid "Entry Date"
-msgstr ""
-
-#. module: account
 #: code:addons/account/account_move_line.py:1170
 #: code:addons/account/account_move_line.py:1253
 #, python-format
@@ -5931,12 +5902,13 @@ msgstr ""
 
 #. module: account
 #: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
 msgid "Percentage"
 msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -5984,6 +5956,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6531,12 +6504,6 @@ msgid "Account tax chart"
 msgstr ""
 
 #. module: account
-#: constraint:res.partner.bank:0
-msgid "\n"
-"Please define BIC/Swift code on bank for bank type IBAN Account to make valid payments"
-msgstr ""
-
-#. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 #: report:account.central.journal:0
@@ -6647,7 +6614,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7174,7 +7141,7 @@ msgstr ""
 #: selection:account.partner.ledger,result_selection:0
 #: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
-#: code:addons/account/report/account_partner_ledger.py:396
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
@@ -7367,6 +7334,11 @@ msgid "Partner Ledger"
 msgstr ""
 
 #. module: account
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: account
 #: code:addons/account/account.py:629
 #: code:addons/account/account.py:642
 #: code:addons/account/account.py:645
@@ -7524,6 +7496,11 @@ msgid "Error ! You can not create recursive Tax Codes."
 msgstr ""
 
 #. module: account
+#: help:product.template,property_account_income:0
+msgid "This account will be used for invoices instead of the default one to value sales for the current product"
+msgstr ""
+
+#. module: account
 #: help:account.journal,group_invoice_lines:0
 msgid "If this box is checked, the system will try to group the accounting lines when generating them from invoices."
 msgstr ""
@@ -7792,8 +7769,8 @@ msgid "Ending Balance"
 msgstr ""
 
 #. module: account
-#: help:account.move.line,blocked:0
-msgid "You can check this box to mark this journal item as a litigation with the associated partner"
+#: help:product.category,property_account_income_categ:0
+msgid "This account will be used for invoices to value sales for the current product category"
 msgstr ""
 
 #. module: account
@@ -7896,6 +7873,7 @@ msgstr ""
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8061,8 +8039,10 @@ msgid "Accounts Allowed (empty for no control)"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Template Account Fiscal Mapping"
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
 msgstr ""
 
 #. module: account
@@ -8109,13 +8089,13 @@ msgid "Invoicing & Payments"
 msgstr ""
 
 #. module: account
-#: help:account.invoice,internal_number:0
-msgid "Unique number of the invoice, computed automatically when the invoice is created."
+#: help:account.move.line,blocked:0
+msgid "You can check this box to mark this journal item as a litigation with the associated partner"
 msgstr ""
 
 #. module: account
-#: constraint:account.bank.statement.line:0
-msgid "The amount of the voucher must be the same amount as the one on the statement line"
+#: help:account.invoice,internal_number:0
+msgid "Unique number of the invoice, computed automatically when the invoice is created."
 msgstr ""
 
 #. module: account
@@ -8264,6 +8244,11 @@ msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference_type:0
+msgid "Reference Type"
+msgstr ""
+
+#. module: account
 #: view:account.move:0
 #: field:account.move,narration:0
 #: view:account.move.line:0
@@ -8636,7 +8621,6 @@ msgid "Here you can define a financial period, an interval of time in your compa
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9444,12 +9428,6 @@ msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: account
-#: help:product.category,property_account_expense_categ:0
-#: help:product.template,property_account_expense:0
-msgid "This account will be used to value outgoing stock for the current product category using cost price"
-msgstr ""
-
-#. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Chart of Accounts from a Chart Template"
 msgstr ""
@@ -9526,6 +9504,11 @@ msgid "Invoice Lines"
 msgstr ""
 
 #. module: account
+#: help:product.category,property_account_expense_categ:0
+msgid "This account will be used for invoices to value expenses for the current product category"
+msgstr ""
+
+#. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
 msgstr ""
@@ -9995,10 +9978,8 @@ msgid "Usually 1 or -1."
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
-#: model:ir.actions.act_window,name:account.action_account_analytic_chart
-#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
-msgid "Chart of Analytic Accounts"
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Template Account Fiscal Mapping"
 msgstr ""
 
 #. module: account
@@ -10007,6 +9988,11 @@ msgid "Expense Account on Product Template"
 msgstr ""
 
 #. module: account
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: account
 #: help:accounting.report,label_filter:0
 msgid "This label will be displayed on report to show the balance computed for the given comparison filter."
 msgstr ""

diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index a6b41d3..8fcb41d 100644 (file)
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -355,7 +355,7 @@
           <para style="terp_tblheader_General_Centre">Journals</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]]</para>
+          <para style="terp_tblheader_General_Centre">Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Partner's</para>
@@ -377,7 +377,7 @@
           <para style="terp_default_Centre_8">[[', '.join([ lt or '' for lt in get_journal(data) ]) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]]</para>
+          <para style="terp_default_Centre_8">[[ data['form']['filter'] in ('filter_no','unreconciled') and get_filter(data) or removeParentNode('para') ]]</para>
           <blockTable colWidths="58.0,58.0" style="Table7">[[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]]
             <tr>
               <td>

diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index e015fc2..f06e24f 100644 (file)
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-08 12:28+0000\n"
-"PO-Revision-Date: 2012-10-08 12:28+0000\n"
+"POT-Creation-Date: 2012-10-23 11:49+0000\n"
+"PO-Revision-Date: 2012-10-23 11:49+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -172,11 +172,9 @@ msgid "You cannot validate leaves for employee %s: too few remaining days (%s)."
 msgstr ""
 
 #. module: hr_holidays
-#: help:hr.holidays,state:0
-msgid "The state is set to 'Draft', when a holiday request is created.            \n"
-"The state is 'Waiting Approval', when holiday request is confirmed by user.            \n"
-"The state is 'Refused', when holiday request is refused by manager.            \n"
-"The state is 'Approved', when holiday request is approved by manager."
+#: code:addons/hr_holidays/report/holidays_summary_report.py:120
+#, python-format
+msgid "Confirmed and Validated"
 msgstr ""
 
 #. module: hr_holidays
@@ -276,8 +274,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr ""
 
@@ -390,6 +390,14 @@ msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
+#: help:hr.holidays,state:0
+msgid "The state is set to 'Draft', when a holiday request is created.            \n"
+"The state is 'Waiting Approval', when holiday request is confirmed by user.            \n"
+"The state is 'Refused', when holiday request is refused by manager.            \n"
+"The state is 'Approved', when holiday request is approved by manager."
+msgstr ""
+
+#. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "You have to select an employee or a category"
 msgstr ""
@@ -651,9 +659,11 @@ msgid "This color will be used in the leaves summary located in Reporting\\Leave
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
 #: view:hr.holidays:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""