diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index b59df303170..54e0af4ee26 100755 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -51,7 +51,6 @@ class account_analytic_line(osv.osv): context = {} if context.get('from_date',False): args.append(['date', '>=', context['from_date']]) - if context.get('to_date',False): args.append(['date','<=', context['to_date']]) return super(account_analytic_line, self).search(cr, uid, args, offset, limit, diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index f81f8bb4f6b..b5b1082b43d 100755 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:18+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:18+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:45+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:45+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -26,13 +26,13 @@ msgid "Other Configuration" msgstr "" #. module: account -#: code:addons/account/wizard/account_open_closed_fiscalyear.py:0 +#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #, python-format msgid "No journal for ending writing has been defined for the fiscal year" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:506 #, python-format msgid "You cannot remove/deactivate an account which is set as a property to any Partner." msgstr "" @@ -62,7 +62,7 @@ msgid "Residual" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:803 #, python-format msgid "Please define sequence on invoice journal" msgstr "" @@ -123,12 +123,13 @@ msgid "Accounting Entries-" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:1291 #, python-format msgid "You can not delete posted movement: \"%s\"!" msgstr "" #. module: account +#: report:account.invoice:0 #: field:account.invoice.line,origin:0 msgid "Origin" msgstr "" @@ -164,7 +165,7 @@ msgid "If the active field is set to False, it will allow you to hide the paymen msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:1439 #, python-format msgid "Warning!" msgstr "" @@ -190,6 +191,12 @@ msgstr "" msgid "Negative" msgstr "" +#. module: account +#: code:addons/account/wizard/account_move_journal.py:95 +#, python-format +msgid "Journal: %s" +msgstr "" + #. module: account #: help:account.analytic.journal,type:0 msgid "Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type." @@ -207,7 +214,7 @@ msgid "account.tax" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:901 #, python-format msgid "No period defined for this date: %s !\n" "Please create a fiscal year." @@ -230,7 +237,7 @@ msgid "Check this box if you don't want any VAT related to this Tax Code to appe msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:1228 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)" msgstr "" @@ -246,7 +253,7 @@ msgid "Belgian Reports" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:1102 #, python-format msgid "You can not add/modify entries in a closed journal." msgstr "" @@ -284,7 +291,7 @@ msgid "St." msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:547 #, python-format msgid "Invoice line account company does not match with invoice company." msgstr "" @@ -300,7 +307,7 @@ msgid "Installs localized accounting charts to match as closely as possible the msgstr "" #. module: account -#: code:addons/account/wizard/account_move_journal.py:0 +#: code:addons/account/wizard/account_move_journal.py:63 #, python-format msgid "Can't find any account journal of %s type for this company.\n" "\n" @@ -319,11 +326,6 @@ msgstr "" msgid "Purchase Properties" msgstr "" -#. module: account -#: help:account.account.type,sign:0 -msgid "Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts." -msgstr "" - #. module: account #: view:account.installer:0 #: view:account.installer.modules:0 @@ -417,11 +419,6 @@ msgstr "" msgid "The amount expressed in an optional other currency." msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_move_journal_line -msgid "A journal entry consists of several journal items, each of which is either a debit or a credit. OpenERP creates automatically one journal entry per accounting document: invoices, refund, supplier payment, bank statements, etc." -msgstr "" - #. module: account #: help:account.journal.period,state:0 msgid "When journal period is created. The state is 'Draft'. If a report is printed it comes to 'Printed' state. When all transactions are done, it comes in 'Done' state." @@ -456,11 +453,13 @@ msgstr "" #: field:account.move.line,journal_id:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 +#: code:addons/account/account_move_line.py:909 #: view:analytic.entries.report:0 #: field:analytic.entries.report,journal_id:0 #: model:ir.actions.report.xml,name:account.account_journal #: model:ir.model,name:account.model_account_journal #: field:validate.account.move,journal_id:0 +#, python-format msgid "Journal" msgstr "" @@ -519,7 +518,7 @@ msgid "Not reconciled transactions" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:0 +#: code:addons/account/account_cash_statement.py:348 #, python-format msgid "CashBox Balance is not matching with Calculated Balance !" msgstr "" @@ -531,11 +530,6 @@ msgstr "" msgid "Tax Mapping" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_installer_modules -msgid "account.installer.modules" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state @@ -604,8 +598,8 @@ msgid "Tax Code Amount" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/installer.py:0 +#: code:addons/account/account.py:2779 +#: code:addons/account/installer.py:434 #, python-format msgid "SAJ" msgstr "" @@ -637,7 +631,8 @@ msgid "Journal Period" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:675 +#: code:addons/account/account_move_line.py:719 #, python-format msgid "To reconcile the entries company should be the same for all entries" msgstr "" @@ -648,7 +643,9 @@ msgstr "" #: selection:account.common.partner.report,result_selection:0 #: selection:account.partner.balance,result_selection:0 #: selection:account.partner.ledger,result_selection:0 +#: code:addons/account/report/account_partner_balance.py:302 #: model:ir.actions.act_window,name:account.action_aged_receivable +#, python-format msgid "Receivable Accounts" msgstr "" @@ -678,7 +675,7 @@ msgid "Partners Reconciled Today" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:0 +#: code:addons/account/account_bank_statement.py:306 #, python-format msgid "The statement balance is incorrect !\n" "" @@ -696,14 +693,14 @@ msgid "Charts" msgstr "" #. module: account -#: code:addons/account/project/wizard/project_account_analytic_line.py:0 +#: code:addons/account/project/wizard/project_account_analytic_line.py:47 #: model:ir.model,name:account.model_project_account_analytic_line #, python-format msgid "Analytic Entries by line" msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:0 +#: code:addons/account/wizard/account_change_currency.py:39 #, python-format msgid "You can only change currency for Draft Invoice !" msgstr "" @@ -780,7 +777,7 @@ msgid "If checked, the new chart of accounts will not contain this by default." msgstr "" #. module: account -#: code:addons/account/wizard/account_invoice_refund.py:0 +#: code:addons/account/wizard/account_invoice_refund.py:102 #, python-format msgid "Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice" msgstr "" @@ -801,7 +798,7 @@ msgid "Next Partner to reconcile" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:1117 #, python-format msgid "You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !" msgstr "" @@ -857,11 +854,6 @@ msgstr "" msgid "Consolidation" msgstr "" -#. module: account -#: model:account.account.type,name:account.account_type_liability -msgid "Liability" -msgstr "" - #. module: account #: view:account.analytic.line:0 #: view:account.entries.report:0 @@ -923,11 +915,12 @@ msgid "Code" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/account_bank_statement.py:0 -#: code:addons/account/account_move_line.py:0 -#: code:addons/account/invoice.py:0 -#: code:addons/account/wizard/account_use_model.py:0 +#: code:addons/account/account.py:2083 +#: code:addons/account/account_bank_statement.py:350 +#: code:addons/account/account_move_line.py:115 +#: code:addons/account/invoice.py:73 +#: code:addons/account/invoice.py:688 +#: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "No Analytic Journal !" msgstr "" @@ -1045,6 +1038,11 @@ msgstr "" msgid "Credit Centralisation" msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_invoice_tree2 +msgid "With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice from your supplier according to what you purchased or received." +msgstr "" + #. module: account #: view:account.invoice.cancel:0 msgid "Cancel Invoices" @@ -1087,7 +1085,7 @@ msgid "Entry Label" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:976 #, python-format msgid "You can not modify/delete a journal with entries for this period !" msgstr "" @@ -1164,7 +1162,7 @@ msgid "Taxes" msgstr "" #. module: account -#: code:addons/account/wizard/account_report_common.py:0 +#: code:addons/account/wizard/account_report_common.py:120 #, python-format msgid "Select a starting and an ending period" msgstr "" @@ -1179,6 +1177,11 @@ msgstr "" msgid "Search tax template" msgstr "" +#. module: account +#: report:account.invoice:0 +msgid "Your Reference" +msgstr "" + #. module: account #: view:account.move.reconcile:0 #: model:ir.actions.act_window,name:account.action_account_reconcile_select @@ -1221,8 +1224,6 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_partner_all -#: model:ir.ui.menu,name:account.menu_partners -#: model:ir.ui.menu,name:account.menu_partners_partners #: model:ir.ui.menu,name:account.next_id_22 msgid "Partners" msgstr "" @@ -1252,7 +1253,7 @@ msgid "Central Journal" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:1197 #, python-format msgid "You can not use this general account in this journal !" msgstr "" @@ -1318,6 +1319,11 @@ msgstr "" msgid "Total Without Tax" msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_move_journal_line +msgid "A journal entry consists of several journal items, each of which is either a debit or a credit transaction. OpenERP automatically creates one journal entry per accounting document: invoice, refund, supplier payment, bank statements, etc." +msgstr "" + #. module: account #: view:account.entries.report:0 msgid "# of Entries " @@ -1340,17 +1346,12 @@ msgid "Example: at 14 net days 2 percents, remaining amount at 30 days end of mo msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:833 #, python-format msgid "Cannot create the invoice !\n" "The payment term defined gives a computed amount greater than the total invoiced amount." msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_invoice_tree1 -msgid "Customer Invoices allows you create and manage invoices issued to your customers. OpenERP generates draft of invoices automatically so that you only have to confirm them before sending them to your customers." -msgstr "" - #. module: account #: field:account.installer.modules,account_anglo_saxon:0 msgid "Anglo-Saxon Accounting" @@ -1446,6 +1447,11 @@ msgstr "" msgid "Statement lines" msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_bank_statement_tree +msgid "A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card or any other type of financial account. The starting balance will be proposed automatically and the closing balance is to be found on your statement. When you are in the Payment column of a line, you can press F1 to open the reconciliation form." +msgstr "" + #. module: account #: report:account.analytic.account.cost_ledger:0 msgid "Date/Code" @@ -1551,7 +1557,7 @@ msgid "Error! You cannot define overlapping fiscal years" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:751 #, python-format msgid "The account is not defined to be reconciled !" msgstr "" @@ -1582,7 +1588,7 @@ msgid "Receivables & Payables" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:758 #, python-format msgid "You have to provide an account for the write off entry !" msgstr "" @@ -1618,7 +1624,7 @@ msgid "Customer Ref:" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:0 +#: code:addons/account/account_cash_statement.py:328 #, python-format msgid "User %s does not have rights to access %s journal !" msgstr "" @@ -1639,7 +1645,7 @@ msgid "Tax Declaration: Credit Notes" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:499 #, python-format msgid "You cannot deactivate an account that contains account moves." msgstr "" @@ -1655,7 +1661,7 @@ msgid "You can not create move line on closed account." msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:519 #, python-format msgid "You cannot change the type of account from 'Closed' to any other type which contains account entries!" msgstr "" @@ -1729,7 +1735,7 @@ msgid "Analytic account" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:0 +#: code:addons/account/account_bank_statement.py:332 #, python-format msgid "Please verify that an account is defined in the journal." msgstr "" @@ -1903,13 +1909,13 @@ msgid "Pro-forma" msgstr "" #. module: account -#: code:addons/account/installer.py:0 +#: code:addons/account/installer.py:348 #, python-format msgid " Journal" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:1319 #, python-format msgid "There is no default default debit account defined \n" "on journal \"%s\"" @@ -1952,8 +1958,8 @@ msgid "Description" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/installer.py:0 +#: code:addons/account/account.py:2844 +#: code:addons/account/installer.py:498 #, python-format msgid "ECNJ" msgstr "" @@ -1972,7 +1978,7 @@ msgid "Income Account" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:370 #, python-format msgid "There is no Accounting Journal of type Sale/Purchase defined!" msgstr "" @@ -2116,7 +2122,7 @@ msgid "Account Tax Code" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:563 #, python-format msgid "Can't find any account journal of %s type for this company.\n" "\n" @@ -2135,11 +2141,6 @@ msgstr "" msgid "Gives the sequence order when displaying a list of invoice tax." msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_invoice_tree4 -msgid "A supplier refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you." -msgstr "" - #. module: account #: field:account.tax,base_sign:0 #: field:account.tax,ref_base_sign:0 @@ -2184,8 +2185,8 @@ msgid "Account Model Entries" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/installer.py:0 +#: code:addons/account/account.py:2796 +#: code:addons/account/installer.py:454 #, python-format msgid "EXJ" msgstr "" @@ -2232,7 +2233,6 @@ msgid "Error ! You can not create recursive categories." 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 @@ -2262,7 +2262,7 @@ msgid "Accounts" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:369 #, python-format msgid "Configuration Error!" msgstr "" @@ -2280,7 +2280,7 @@ msgid "Date:" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:640 #, python-format msgid "You cannot modify company of this journal as its related record exist in Entry Lines" msgstr "" @@ -2386,11 +2386,6 @@ msgstr "" msgid "Accounting entries" msgstr "" -#. module: account -#: report:account.journal.period.print:0 -msgid "given a period and a journal, the sum of debit will always be equal to the sum of credit, so there is no point to display it" -msgstr "" - #. module: account #: field:account.invoice.line,discount:0 msgid "Discount (%)" @@ -2421,17 +2416,17 @@ msgid "This wizard will create recurring accounting entries" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:1181 #, python-format msgid "No sequence defined on the journal !" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/account_bank_statement.py:0 -#: code:addons/account/account_move_line.py:0 -#: code:addons/account/invoice.py:0 -#: code:addons/account/wizard/account_use_model.py:0 +#: code:addons/account/account.py:2083 +#: code:addons/account/account_bank_statement.py:350 +#: code:addons/account/account_move_line.py:115 +#: code:addons/account/invoice.py:688 +#: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" msgstr "" @@ -2444,6 +2439,7 @@ msgid "Tax codes" msgstr "" #. module: account +#: model:ir.ui.menu,name:account.menu_account_customer #: model:ir.ui.menu,name:account.menu_finance_receivables msgid "Customers" msgstr "" @@ -2465,7 +2461,7 @@ msgid "August" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:0 +#: code:addons/account/account_bank_statement.py:307 #, python-format msgid "The expected balance (%.2f) is different than the computed one. (%.2f)" msgstr "" @@ -2580,7 +2576,7 @@ msgid "Analytic Entries" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:822 #, python-format msgid "No fiscal year defined for this date !\n" "Please create one." @@ -2684,14 +2680,13 @@ msgstr "" #. module: account #: selection:account.account,type:0 #: selection:account.account.template,type:0 -#: model:account.account.type,name:account.account_type_root #: selection:account.entries.report,type:0 msgid "View" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/installer.py:0 +#: code:addons/account/account.py:2906 +#: code:addons/account/installer.py:296 #, python-format msgid "BNK" msgstr "" @@ -2853,7 +2848,7 @@ msgid "Starting Balance" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:1302 #, python-format msgid "No Partner Defined !" msgstr "" @@ -2943,7 +2938,7 @@ msgid "All selected journal entries will be validated and posted. It means you w msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:388 #, python-format msgid "Cannot delete invoice(s) that are already opened or paid !" msgstr "" @@ -2996,13 +2991,13 @@ msgid "Draft Invoice" msgstr "" #. module: account -#: code:addons/account/wizard/account_invoice_state.py:0 +#: code:addons/account/wizard/account_invoice_state.py:68 #, python-format msgid "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:522 #, python-format msgid "You cannot change the type of account from '%s' to '%s' type as it contains account entries!" msgstr "" @@ -3053,8 +3048,8 @@ msgid "Detail" msgstr "" #. module: account -#: model:ir.actions.act_window,help:account.action_invoice_tree2 -msgid "Supplier Invoices allows you to enter and manage invoices issued by your suppliers. OpenERP generates draft of supplier invoices automatically so that you can control what you received from your supplier according to what you purchased or received." +#: field:account.installer,bank_accounts_id:0 +msgid "Your Bank and Cash Accounts" msgstr "" #. module: account @@ -3141,7 +3136,7 @@ msgid "Unreconcile" msgstr "" #. module: account -#: code:addons/account/wizard/account_fiscalyear_close.py:0 +#: code:addons/account/wizard/account_fiscalyear_close.py:79 #, python-format msgid "The journal must have default credit and debit account" msgstr "" @@ -3152,20 +3147,20 @@ msgid "Chart of Accounts Template" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:2095 #, python-format msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n" "Please define partner on it!" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:753 #, python-format msgid "Some entries are already reconciled !" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:1204 #, python-format msgid "You cannot validate a Journal Entry unless all journal items are in same chart of accounts !" msgstr "" @@ -3274,7 +3269,7 @@ msgid "Unit Price" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:1054 #, python-format msgid "Unable to change tax !" msgstr "" @@ -3285,13 +3280,13 @@ msgid "#Entries" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:1440 #, python-format msgid "You selected an Unit of Measure which is not compatible with the product." msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:491 #, python-format msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !" msgstr "" @@ -3335,7 +3330,7 @@ msgid "Effective date" msgstr "" #. module: account -#: code:addons/account/wizard/account_move_bank_reconcile.py:0 +#: code:addons/account/wizard/account_move_bank_reconcile.py:53 #, python-format msgid "Standard Encoding" msgstr "" @@ -3478,8 +3473,10 @@ msgid "Analytic Balance" msgstr "" #. module: account -#: code:addons/account/report/account_balance_sheet.py:0 -#: code:addons/account/report/account_profit_loss.py:0 +#: code:addons/account/report/account_balance_sheet.py:76 +#: code:addons/account/report/account_balance_sheet.py:122 +#: code:addons/account/report/account_profit_loss.py:76 +#: code:addons/account/report/account_profit_loss.py:124 #, python-format msgid "Net Loss" msgstr "" @@ -3533,6 +3530,12 @@ msgstr "" 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" @@ -3560,7 +3563,7 @@ msgid "Acc.Type" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:732 #, python-format msgid "Global taxes defined, but are not in invoice lines !" msgstr "" @@ -3576,6 +3579,11 @@ msgstr "" msgid "Month" msgstr "" +#. module: account +#: field:account.invoice.report,uom_name:0 +msgid "Reference UoM" +msgstr "" + #. module: account #: field:account.account,note:0 #: field:account.account.template,note:0 @@ -3609,7 +3617,7 @@ msgid "All manually created new journal entry are usually in the state 'Unposted msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:0 +#: code:addons/account/account_analytic_line.py:91 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -3647,7 +3655,7 @@ msgid "All Posted Entries" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:0 +#: code:addons/account/account_bank_statement.py:357 #, python-format msgid "Statement %s is confirmed, journal items are created." msgstr "" @@ -3667,13 +3675,18 @@ msgstr "" msgid "Check if you want to display Accounts with 0 balance too." msgstr "" +#. module: account +#: view:account.tax:0 +msgid "Compute Code" +msgstr "" + #. module: account #: view:account.account.template:0 msgid "Default taxes" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:88 #, python-format msgid "Free Reference" msgstr "" @@ -3732,7 +3745,7 @@ msgid "Bank statements are entered in the system." msgstr "" #. module: account -#: code:addons/account/wizard/account_reconcile.py:0 +#: code:addons/account/wizard/account_reconcile.py:133 #, python-format msgid "Reconcile Writeoff" msgstr "" @@ -3744,8 +3757,8 @@ msgid "Maturity date" msgstr "" #. module: account -#: view:account.account.template:0 -msgid "Account Template" +#: view:report.account.receivable:0 +msgid "Accounts by type" msgstr "" #. module: account @@ -3755,7 +3768,7 @@ msgid "Closing Balance" msgstr "" #. module: account -#: code:addons/account/report/common_report_header.py:0 +#: code:addons/account/report/common_report_header.py:92 #, python-format msgid "Not implemented" msgstr "" @@ -3776,8 +3789,8 @@ msgid "Credit Notes" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/wizard/account_use_model.py:0 +#: code:addons/account/account.py:2067 +#: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "Unable to find a valid period !" msgstr "" @@ -3807,11 +3820,6 @@ msgstr "" msgid "Allow Reconciliation" msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_subscription_form -msgid "A recurring entry is a payment related entry that occurs on a recurrent basis from a specific date corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create them in the system in order to automate their entries in the system." -msgstr "" - #. module: account #: view:account.analytic.account:0 msgid "Analytic Account Statistics" @@ -3850,13 +3858,17 @@ msgid "Change" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/account_move_line.py:0 -#: code:addons/account/invoice.py:0 -#: code:addons/account/wizard/account_automatic_reconcile.py:0 -#: code:addons/account/wizard/account_fiscalyear_close.py:0 -#: code:addons/account/wizard/account_move_journal.py:0 -#: code:addons/account/wizard/account_report_aged_partner_balance.py:0 +#: code:addons/account/account.py:1290 +#: code:addons/account/account.py:1318 +#: code:addons/account/account.py:1325 +#: code:addons/account/account_move_line.py:981 +#: code:addons/account/invoice.py:914 +#: code:addons/account/wizard/account_automatic_reconcile.py:152 +#: code:addons/account/wizard/account_fiscalyear_close.py:78 +#: code:addons/account/wizard/account_fiscalyear_close.py:81 +#: code:addons/account/wizard/account_move_journal.py:162 +#: code:addons/account/wizard/account_report_aged_partner_balance.py:57 +#: code:addons/account/wizard/account_report_aged_partner_balance.py:59 #, python-format msgid "UserError" msgstr "" @@ -3925,7 +3937,7 @@ msgstr "" #: selection:account.bank.statement.line,type:0 #: view:account.invoice:0 #: view:account.invoice.report:0 -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:338 #, python-format msgid "Customer" msgstr "" @@ -3941,13 +3953,13 @@ msgid "Cancelled Invoice" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:73 #, python-format msgid "You must define an analytic journal of type '%s' !" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:1397 #, python-format msgid "Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies." msgstr "" @@ -3974,7 +3986,7 @@ msgid "Account Balance -" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:1007 #, python-format msgid "Invoice " msgstr "" @@ -4012,7 +4024,7 @@ msgid "Invoices" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:822 #, python-format msgid "Please verify the price of the invoice !\n" "The real total does not match the computed total." @@ -4090,7 +4102,7 @@ msgstr "" #. module: account #: view:account.move:0 #: view:account.move.line:0 -#: code:addons/account/wizard/account_move_journal.py:0 +#: code:addons/account/wizard/account_move_journal.py:150 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line #: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open #: model:ir.actions.act_window,name:account.act_account_partner_account_move @@ -4123,16 +4135,8 @@ msgid "Third Party (Country)" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/account_cash_statement.py:0 -#: code:addons/account/account_move_line.py:0 -#: code:addons/account/report/common_report_header.py:0 -#: code:addons/account/wizard/account_change_currency.py:0 -#: code:addons/account/wizard/account_move_bank_reconcile.py:0 -#: code:addons/account/wizard/account_open_closed_fiscalyear.py:0 -#: code:addons/account/wizard/account_report_common.py:0 -#, python-format -msgid "Error" +#: model:ir.actions.act_window,help:account.action_invoice_tree4 +msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form." msgstr "" #. module: account @@ -4150,7 +4154,7 @@ msgid "Bank Details" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:738 #, python-format msgid "Taxes missing !" msgstr "" @@ -4203,7 +4207,7 @@ msgid "Check Date not in the Period" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:1210 #, python-format msgid "You can not modify a posted entry of this journal !\n" "You should set the journal to allow cancelling entries if you want to do that." @@ -4220,7 +4224,7 @@ msgid "Child Tax Accounts" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:940 #, python-format msgid "Start period should be smaller then End period" msgstr "" @@ -4277,6 +4281,11 @@ msgstr "" msgid "Payments" msgstr "" +#. module: account +#: view:account.tax:0 +msgid "Reverse Compute Code" +msgstr "" + #. module: account #: field:account.subscription.line,move_id:0 msgid "Entry" @@ -4288,11 +4297,6 @@ msgstr "" msgid "Python Code (reverse)" msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form -msgid "Define your company's fiscal year depending on the period you have chosen to follow. A fiscal year is a 1 year period over which a company budgets its spending. It may run over any period of 12 months. The fiscal year is referred to by the date in which it ends. For example, if a company's fiscal year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011 would be referred to as FY 2011. Not using the actual calendar year gives many companies an advantage, allowing them to close their books at a time which is most convenient for them." -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.action_payment_term_form #: model:ir.ui.menu,name:account.menu_action_payment_term_form @@ -4331,7 +4335,7 @@ msgid "Line 1:" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:1167 #, python-format msgid "Integrity Error !" msgstr "" @@ -4347,7 +4351,7 @@ msgid "month" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:0 +#: code:addons/account/account_bank_statement.py:293 #, python-format msgid "Journal Item \"%s\" is not valid" msgstr "" @@ -4405,13 +4409,12 @@ msgid "UoM" msgstr "" #. module: account -#: code:addons/account/wizard/account_invoice_refund.py:0 +#: code:addons/account/wizard/account_invoice_refund.py:138 #, python-format msgid "No Period found on Invoice!" msgstr "" #. module: account -#: view:account.tax:0 #: view:account.tax.template:0 msgid "Compute Code (if type=code)" msgstr "" @@ -4443,7 +4446,7 @@ msgid "Amount" msgstr "" #. module: account -#: code:addons/account/wizard/account_fiscalyear_close.py:0 +#: code:addons/account/wizard/account_fiscalyear_close.py:41 #, python-format msgid "End of Fiscal Year Entry" msgstr "" @@ -4475,8 +4478,8 @@ msgid "You can not create move line on receivable/payable account without partne msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/wizard/account_use_model.py:0 +#: code:addons/account/account.py:2067 +#: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "No period found !" msgstr "" @@ -4545,8 +4548,9 @@ msgid "Number of days to add before computation of the day of month.If Date=15/0 msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/installer.py:0 +#: code:addons/account/account.py:2896 +#: code:addons/account/installer.py:283 +#: code:addons/account/installer.py:295 #, python-format msgid "Bank Journal " msgstr "" @@ -4572,7 +4576,7 @@ msgid "Start of period" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:1119 #, python-format msgid "You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !" msgstr "" @@ -4592,11 +4596,6 @@ msgstr "" msgid "Analytic Accounting" 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 #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 @@ -4630,9 +4629,14 @@ msgid "End of Year Entries Journal" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:0 -#: code:addons/account/invoice.py:0 -#: code:addons/account/wizard/account_move_journal.py:0 +#: code:addons/account/account_bank_statement.py:331 +#: code:addons/account/invoice.py:423 +#: code:addons/account/invoice.py:523 +#: code:addons/account/invoice.py:538 +#: code:addons/account/invoice.py:546 +#: code:addons/account/invoice.py:563 +#: code:addons/account/invoice.py:1365 +#: code:addons/account/wizard/account_move_journal.py:63 #, python-format msgid "Configuration Error !" msgstr "" @@ -4703,7 +4707,7 @@ msgid "Sort By" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:1326 #, python-format msgid "There is no default default credit account defined \n" "on journal \"%s\"" @@ -4717,7 +4721,7 @@ msgid "Amount Currency" msgstr "" #. module: account -#: code:addons/account/wizard/account_validate_account_move.py:0 +#: code:addons/account/wizard/account_validate_account_move.py:39 #, python-format msgid "Specified Journal does not have any account move entries in draft state for this period" msgstr "" @@ -4839,7 +4843,7 @@ msgid "Generate Opening Entries" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:680 #, python-format msgid "Already Reconciled!" msgstr "" @@ -4873,7 +4877,7 @@ msgstr "" #. module: account #: view:account.move.line.reconcile:0 -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:773 #, python-format msgid "Write-Off" msgstr "" @@ -4888,16 +4892,11 @@ msgstr "" msgid "account.analytic.line.extended" msgstr "" -#. module: account -#: model:account.account.type,name:account.account_type_income -msgid "Income" -msgstr "" - #. module: account #: selection:account.bank.statement.line,type:0 #: view:account.invoice:0 #: view:account.invoice.report:0 -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:340 #, python-format msgid "Supplier" msgstr "" @@ -4912,8 +4911,8 @@ msgid "March" msgstr "" #. module: account -#: view:report.account.receivable:0 -msgid "Accounts by type" +#: view:account.account.template:0 +msgid "Account Template" msgstr "" #. module: account @@ -4936,6 +4935,8 @@ msgstr "" #: selection:account.common.partner.report,result_selection:0 #: selection:account.partner.balance,result_selection:0 #: selection:account.partner.ledger,result_selection:0 +#: code:addons/account/report/account_partner_balance.py:306 +#, python-format msgid "Receivable and Payable Accounts" msgstr "" @@ -4970,6 +4971,11 @@ msgstr "" msgid "From this view, have an analysis of your different financial accounts. The document shows your debit and credit taking in consideration some criteria you can choose by using the search tool." msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_tax_code_list +msgid "The tax code definition depends on the tax declaration of your country. OpenERP allows you to define the tax structure and manage it from this menu. You can define both numeric and alphanumeric tax codes." +msgstr "" + #. module: account #: help:account.partner.reconcile.process,progress:0 msgid "Shows you the progress made today on the reconciliation process. Given by \n" @@ -4996,7 +5002,7 @@ msgid "# of Lines" msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:0 +#: code:addons/account/wizard/account_change_currency.py:60 #, python-format msgid "New currency is not confirured properly !" msgstr "" @@ -5021,13 +5027,14 @@ msgid "Filter by" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:1057 +#: code:addons/account/account_move_line.py:1140 #, python-format msgid "You can not use an inactive account!" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:746 #, python-format msgid "Entries are not of the same account or already reconciled ! " msgstr "" @@ -5055,12 +5062,18 @@ msgid "7" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:0 -#: code:addons/account/invoice.py:0 +#: code:addons/account/account_bank_statement.py:391 +#: code:addons/account/invoice.py:388 #, python-format msgid "Invalid action !" msgstr "" +#. module: account +#: code:addons/account/wizard/account_move_journal.py:102 +#, python-format +msgid "Period: %s" +msgstr "" + #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax_template msgid "Template Tax Fiscal Position" @@ -5111,7 +5124,7 @@ msgid "Multipication factor for Base code" msgstr "" #. module: account -#: code:addons/account/wizard/account_report_common.py:0 +#: code:addons/account/wizard/account_report_common.py:126 #, python-format msgid "not implemented" msgstr "" @@ -5122,7 +5135,7 @@ msgid "Company related to this journal" msgstr "" #. module: account -#: code:addons/account/wizard/account_invoice_state.py:0 +#: code:addons/account/wizard/account_invoice_state.py:44 #, python-format msgid "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!" msgstr "" @@ -5139,11 +5152,6 @@ msgstr "" msgid "Analytic Entries Analysis" msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_bank_statement_tree -msgid "A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card, or any other type of account. Start by encoding the starting and closing balance, then record all lines of your statement. When you are in the Payment column of the a line, you can press F1 to open the reconciliation form." -msgstr "" - #. module: account #: selection:account.aged.trial.balance,direction_selection:0 msgid "Past" @@ -5165,6 +5173,11 @@ msgstr "" msgid "Overdue Payments Message" msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_account_moves_all_a +msgid "This view can be used by accountants in order to quickly record entries in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account. OpenERP will propose to you automatically the Tax related to this account and the counterpart \"Account Payable\"." +msgstr "" + #. module: account #: field:account.entries.report,date_created:0 msgid "Date Created" @@ -5191,7 +5204,7 @@ msgid "As soon as the reconciliation is done, the invoice's state turns to “do msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:1007 #, python-format msgid "is validated." msgstr "" @@ -5256,7 +5269,7 @@ msgid "Companies" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:532 #, python-format msgid "You cannot modify Company of account as its related record exist in Entry Lines" msgstr "" @@ -5355,7 +5368,6 @@ msgstr "" #. module: account #: selection:account.account,type:0 #: selection:account.account.template,type:0 -#: model:account.account.type,name:account.account_type_receivable #: selection:account.entries.report,type:0 msgid "Receivable" msgstr "" @@ -5395,11 +5407,6 @@ msgstr "" msgid "CashBox" msgstr "" -#. module: account -#: model:account.account.type,name:account.account_type_cash_equity -msgid "Equity" -msgstr "" - #. module: account #: selection:account.tax,type:0 msgid "Percentage" @@ -5512,13 +5519,15 @@ msgid "Optional create" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:424 +#: code:addons/account/invoice.py:524 +#: code:addons/account/invoice.py:1366 #, python-format msgid "Can not find account chart for this company, Please Create account." msgstr "" #. module: account -#: code:addons/account/wizard/account_report_aged_partner_balance.py:0 +#: code:addons/account/wizard/account_report_aged_partner_balance.py:59 #, python-format msgid "Enter a Start date !" msgstr "" @@ -5605,6 +5614,7 @@ msgstr "" #: field:account.journal,analytic_journal_id:0 #: model:ir.actions.act_window,name:account.action_account_analytic_journal #: model:ir.actions.report.xml,name:account.analytic_journal_print +#: model:ir.model,name:account.model_account_analytic_journal msgid "Analytic Journal" msgstr "" @@ -5635,7 +5645,7 @@ msgid "Cash Transactions" msgstr "" #. module: account -#: code:addons/account/wizard/account_state_open.py:0 +#: code:addons/account/wizard/account_state_open.py:37 #, python-format msgid "Invoice is already reconciled" msgstr "" @@ -5658,8 +5668,8 @@ msgid "Analytic Entries Statistics" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:0 -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_analytic_line.py:143 +#: code:addons/account/account_move_line.py:831 #, python-format msgid "Entries: " msgstr "" @@ -5670,11 +5680,16 @@ msgid "Create manual recurring entries in a chosen journal." msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:1393 #, python-format msgid "Couldn't create move between different companies" msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_account_type_form +msgid "An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company." +msgstr "" + #. module: account #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree msgid "Bank Reconciliation consists of verifying that your bank statement corresponds with the entries (or records) of that account in your accounting system." @@ -5687,11 +5702,13 @@ msgstr "" #. module: account #: view:account.move.line:0 +#: code:addons/account/account_move_line.py:929 +#, python-format msgid "Total debit" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:724 #, python-format msgid "Entry \"%s\" is not valid !" msgstr "" @@ -5724,7 +5741,7 @@ msgid "Python Code" msgstr "" #. module: account -#: code:addons/account/wizard/account_report_balance_sheet.py:0 +#: code:addons/account/wizard/account_report_balance_sheet.py:72 #, python-format msgid "Please define the Reserve and Profit/Loss account for current user company !" msgstr "" @@ -5750,28 +5767,35 @@ msgid " valuation: percent" msgstr "" #. module: account -#: field:account.installer,bank_accounts_id:0 -msgid "Your Bank and Cash Accounts" -msgstr "" - -#. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/account_analytic_line.py:0 -#: code:addons/account/account_bank_statement.py:0 -#: code:addons/account/account_cash_statement.py:0 -#: code:addons/account/account_move_line.py:0 -#: code:addons/account/invoice.py:0 -#: code:addons/account/wizard/account_invoice_refund.py:0 -#: code:addons/account/wizard/account_use_model.py:0 +#: code:addons/account/account.py:499 +#: code:addons/account/account.py:501 +#: code:addons/account/account.py:822 +#: code:addons/account/account.py:901 +#: code:addons/account/account.py:976 +#: code:addons/account/account.py:1204 +#: code:addons/account/account.py:1210 +#: code:addons/account/account.py:2095 +#: code:addons/account/account.py:2333 +#: code:addons/account/account_analytic_line.py:90 +#: code:addons/account/account_analytic_line.py:99 +#: code:addons/account/account_bank_statement.py:292 +#: code:addons/account/account_bank_statement.py:305 +#: code:addons/account/account_bank_statement.py:345 +#: code:addons/account/account_cash_statement.py:328 +#: code:addons/account/account_cash_statement.py:348 +#: code:addons/account/account_move_line.py:1102 +#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account_move_line.py:1119 +#: code:addons/account/invoice.py:803 +#: code:addons/account/invoice.py:833 +#: code:addons/account/invoice.py:1026 +#: code:addons/account/wizard/account_invoice_refund.py:100 +#: code:addons/account/wizard/account_invoice_refund.py:102 +#: code:addons/account/wizard/account_use_model.py:44 #, python-format msgid "Error !" msgstr "" -#. module: account -#: report:account.journal.period.print:0 -msgid "o.journal_id.currency and formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ o.journal_id.currency and o.journal_id.currency.symbol" -msgstr "" - #. module: account #: view:account.vat.declaration:0 #: model:ir.actions.report.xml,name:account.account_vat_declaration @@ -5826,7 +5850,7 @@ msgid "This report is an analysis done by a partner. It is a PDF report containi msgstr "" #. module: account -#: code:addons/account/wizard/account_validate_account_move.py:0 +#: code:addons/account/wizard/account_validate_account_move.py:61 #, python-format msgid "Selected Entry Lines does not have any account move enties in draft state" msgstr "" @@ -5865,7 +5889,7 @@ msgid "Journal Select" msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:0 +#: code:addons/account/wizard/account_change_currency.py:65 #, python-format msgid "Currnt currency is not confirured properly !" msgstr "" @@ -5926,7 +5950,7 @@ msgid "Select entries" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:2050 #, python-format msgid "You can specify year, month and date in the name of the model using the following labels:\n" "\n" @@ -5954,8 +5978,8 @@ msgid "Child Codes" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 -#: code:addons/account/wizard/account_invoice_refund.py:0 +#: code:addons/account/invoice.py:491 +#: code:addons/account/wizard/account_invoice_refund.py:137 #, python-format msgid "Data Insufficient !" msgstr "" @@ -6000,11 +6024,6 @@ msgstr "" msgid "Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. " msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_account_journal_view -msgid "Here you can personalize and create each view of your financial journals by selecting the fields you want to appear and the sequence they will appear." -msgstr "" - #. module: account #: field:account.invoice,origin:0 #: field:report.invoice.created,origin:0 @@ -6012,8 +6031,8 @@ msgid "Source Document" msgstr "" #. module: account -#: model:ir.actions.act_window,help:account.action_account_period_form -msgid "Here, you can define a period, an interval of time between successive closings of the books of your company. An accounting period typically is a month or a quarter, corresponding to the tax year used by the business. Create and manage them from here and decide whether a period should be left open or closed depending on your company's activities over a specific period." +#: help:account.account.type,sign:0 +msgid "Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts." msgstr "" #. module: account @@ -6036,6 +6055,11 @@ msgstr "" msgid "For taxes of type percentage, enter % ratio between 0-1." msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_subscription_form +msgid "A recurring entry is a miscellaneous entry that occurs on a recurrent basis from a specific date, i.e. corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create such entries to automate the postings in the system." +msgstr "" + #. module: account #: field:account.entries.report,product_uom_id:0 #: view:analytic.entries.report:0 @@ -6043,6 +6067,11 @@ msgstr "" msgid "Product UOM" msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree +msgid "A Cash Register allows you to manage cash entries in your cash journals. This feature provides an easy way to follow up cash payments on a daily basis. You can enter the coins that are in your cash box, and then post entries when money comes in or goes out of the cash box." +msgstr "" + #. module: account #: selection:account.automatic.reconcile,power:0 msgid "9" @@ -6081,7 +6110,7 @@ msgid "Lines" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:539 #, python-format msgid "Can not find account chart for this company in invoice line account, Please Create account." msgstr "" @@ -6101,6 +6130,12 @@ msgstr "" msgid "Are you sure you want to open this invoice ?" msgstr "" +#. module: account +#: code:addons/account/account_move_line.py:889 +#, python-format +msgid "Accounting Entries" +msgstr "" + #. module: account #: field:account.account.template,parent_id:0 msgid "Parent Account Template" @@ -6141,6 +6176,11 @@ msgid "Financial and accounting module that covers:\n" " " msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_account_journal_period_tree +msgid "You can search for individual account entries through useful information. To search for account entries, open a journal, then select a record line." +msgstr "" + #. module: account #: report:account.invoice:0 #: view:account.invoice:0 @@ -6165,11 +6205,6 @@ msgstr "" msgid "Icon" msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree -msgid "Cash Register allows you to manage cash entries in your cash journals." -msgstr "" - #. module: account #: view:account.automatic.reconcile:0 #: view:account.use.model:0 @@ -6177,7 +6212,7 @@ msgid "Ok" msgstr "" #. module: account -#: code:addons/account/report/account_partner_balance.py:0 +#: code:addons/account/report/account_partner_balance.py:115 #, python-format msgid "Unknown Partner" msgstr "" @@ -6207,11 +6242,6 @@ msgstr "" msgid "Ending Date" msgstr "" -#. module: account -#: field:account.invoice.report,uom_name:0 -msgid "Default UoM" -msgstr "" - #. module: account #: field:wizard.multi.charts.accounts,purchase_tax:0 msgid "Default Purchase Tax" @@ -6234,7 +6264,7 @@ msgid "This field is only used if you develop your own module allowing developer msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:938 #, python-format msgid "You should have chosen periods that belongs to the same company" msgstr "" @@ -6297,7 +6327,6 @@ msgid "Use model" msgstr "" #. module: account -#: model:ir.actions.act_window,help:account.action_account_moves_all_a #: model:ir.actions.act_window,help:account.action_account_moves_purchase msgid "This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part \"Account Payable\"." msgstr "" @@ -6329,16 +6358,11 @@ msgid "Sign on Reports" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:0 +#: code:addons/account/account_cash_statement.py:249 #, python-format msgid "You can not have two open register for the same journal" msgstr "" -#. module: account -#: report:account.invoice:0 -msgid "Must be after setLang()" -msgstr "" - #. module: account #: view:account.payment.term.line:0 msgid " day of the month= -1" @@ -6409,14 +6433,14 @@ msgid "This field is used for payable and receivable journal entries. You can pu msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:1197 #, python-format msgid "Bad account !" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/installer.py:0 +#: code:addons/account/account.py:2777 +#: code:addons/account/installer.py:432 #, python-format msgid "Sales Journal" msgstr "" @@ -6427,7 +6451,7 @@ msgid "Invoice Tax" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:1172 #, python-format msgid "No piece number !" msgstr "" @@ -6482,6 +6506,8 @@ msgstr "" #: selection:account.common.partner.report,result_selection:0 #: selection:account.partner.balance,result_selection:0 #: selection:account.partner.ledger,result_selection:0 +#: code:addons/account/report/account_partner_balance.py:304 +#, python-format msgid "Payable Accounts" msgstr "" @@ -6507,7 +6533,6 @@ msgid "Sale Taxes" msgstr "" #. module: account -#: model:account.account.type,name:account.account_type_cash_moves #: selection:account.analytic.journal,type:0 #: selection:account.bank.accounts.wizard,account_type:0 #: selection:account.entries.report,type:0 @@ -6571,13 +6596,13 @@ msgid "Monthly" msgstr "" #. module: account -#: view:account.payment.term.line:0 -msgid " number of days: 14" +#: model:ir.actions.act_window,help:account.action_account_journal_view +msgid "Here you can customize an existing journal view or create a new view. Journal views determine the way you can record entries in your journal. Select the fields you want to appear in a journal and determine the sequence in which they will appear. Then you can create a new journal and link your view to it." msgstr "" #. module: account -#: model:account.account.type,name:account.account_type_asset -msgid "Asset" +#: view:account.payment.term.line:0 +msgid " number of days: 14" msgstr "" #. module: account @@ -6647,9 +6672,17 @@ msgid "Fixed" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/account_move_line.py:0 -#: code:addons/account/invoice.py:0 +#: code:addons/account/account.py:506 +#: code:addons/account/account.py:519 +#: code:addons/account/account.py:522 +#: code:addons/account/account.py:532 +#: code:addons/account/account.py:640 +#: code:addons/account/account.py:927 +#: code:addons/account/account_move_line.py:675 +#: code:addons/account/account_move_line.py:719 +#: code:addons/account/invoice.py:732 +#: code:addons/account/invoice.py:735 +#: code:addons/account/invoice.py:738 #, python-format msgid "Warning !" msgstr "" @@ -6705,13 +6738,13 @@ msgid "Select a currency to apply on the invoice" msgstr "" #. module: account -#: code:addons/account/wizard/account_invoice_refund.py:0 +#: code:addons/account/wizard/account_invoice_refund.py:100 #, python-format msgid "Can not %s draft/proforma/cancel invoice." msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:805 #, python-format msgid "No Invoice Lines !" msgstr "" @@ -6747,12 +6780,7 @@ msgid "Tax Use In" msgstr "" #. module: account -#: model:ir.actions.act_window,help:account.action_account_journal_form -msgid "Create and manage your company's financial journals from this menu. A journal is a business diary in which all financial data related to the day to day business transactions of your company is recorded using double-entry book keeping system. Depending on the nature of its activities and number of daily transactions, a company may keep several types of specialized journals such as a cash journal, purchases journal, and sales journal." -msgstr "" - -#. module: account -#: code:addons/account/account_bank_statement.py:0 +#: code:addons/account/account_bank_statement.py:346 #, python-format msgid "The account entries lines are not in valid state." msgstr "" @@ -6763,7 +6791,7 @@ msgid "Deferral Method" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:377 #, python-format msgid "Invoice '%s' is paid." msgstr "" @@ -6783,11 +6811,6 @@ msgstr "" msgid "Line" 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." @@ -6825,7 +6848,7 @@ msgid "Associated Partner" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:1302 #, python-format msgid "You must first select a partner !" msgstr "" @@ -6853,6 +6876,11 @@ msgstr "" msgid "Invoice's state is Open" msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_tax_code_tree +msgid "The chart of taxes is used to generate your periodical tax statement. You will see the taxes with codes related to your legal statement according to your country." +msgstr "" + #. module: account #: view:account.installer.modules:0 msgid "Add extra Accounting functionalities to the ones already installed." @@ -6882,8 +6910,8 @@ msgid "Choose Fiscal Year" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/installer.py:0 +#: code:addons/account/account.py:2841 +#: code:addons/account/installer.py:495 #, python-format msgid "Purchase Refund Journal" msgstr "" @@ -6925,7 +6953,9 @@ msgstr "" #: view:account.period:0 #: field:account.subscription,period_nbr:0 #: field:account.tax.chart,period_id:0 +#: code:addons/account/account_move_line.py:908 #: field:validate.account.move,period_id:0 +#, python-format msgid "Period" msgstr "" @@ -6975,6 +7005,11 @@ msgstr "" msgid "Tax/Base Amount" msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_invoice_tree3 +msgid "With Customer Refunds you can manage the credit notes for your customers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form." +msgstr "" + #. module: account #: model:ir.actions.act_window,help:account.action_account_vat_declaration msgid "This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter." @@ -7005,13 +7040,13 @@ msgid "Payment" msgstr "" #. module: account -#: model:ir.actions.act_window,help:account.action_account_journal_period_tree -msgid "You can look up individual account entries by searching for useful information. To search for account entries, open a journal, then select a record line." +#: help:account.bs.report,reserve_account_id:0 +msgid "This Account is used for transfering Profit/Loss (Profit: Amount will be added, Loss: Amount will be duducted), which is calculated from Profilt & Loss Report" msgstr "" #. module: account -#: help:product.category,property_account_income_categ:0 -msgid "This account will be used for invoices to value sales for the current product category" +#: 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 @@ -7030,11 +7065,6 @@ msgstr "" msgid "Account Common Report" msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_invoice_tree3 -msgid "This menu helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form." -msgstr "" - #. module: account #: model:process.transition,name:account.process_transition_filestatement0 msgid "Automatic import of the bank sta" @@ -7058,7 +7088,7 @@ msgid "Account Types" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:915 #, python-format msgid "Cannot create invoice move on centralised journal" msgstr "" @@ -7074,7 +7104,7 @@ msgstr "" #: view:account.move.line:0 #: view:account.move.line.reconcile:0 #: view:account.move.line.reconcile.select:0 -#: code:addons/account/wizard/account_move_line_reconcile_select.py:0 +#: code:addons/account/wizard/account_move_line_reconcile_select.py:45 #: model:ir.ui.menu,name:account.periodical_processing_reconciliation #: model:process.node,name:account.process_node_reconciliation0 #: model:process.node,name:account.process_node_supplierreconciliation0 @@ -7112,6 +7142,11 @@ msgstr "" msgid "Filter By" msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_invoice_tree1 +msgid "With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers." +msgstr "" + #. module: account #: view:account.entries.report:0 #: view:board.board:0 @@ -7137,8 +7172,8 @@ msgid "Payment Term Line" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/installer.py:0 +#: code:addons/account/account.py:2794 +#: code:addons/account/installer.py:452 #, python-format msgid "Purchase Journal" msgstr "" @@ -7153,11 +7188,6 @@ msgstr "" msgid "Subtotal" msgstr "" -#. module: account -#: report:account.invoice:0 -msgid "Partner Ref." -msgstr "" - #. module: account #: view:account.vat.declaration:0 msgid "Print Tax Statement" @@ -7178,6 +7208,7 @@ msgid "Due Date" msgstr "" #. module: account +#: model:ir.ui.menu,name:account.menu_account_supplier #: model:ir.ui.menu,name:account.menu_finance_payables msgid "Suppliers" msgstr "" @@ -7219,8 +7250,8 @@ msgid "Fiscalyear Close" msgstr "" #. module: account -#: model:ir.actions.act_window,help:account.action_account_type_form -msgid "An account type is a name or code given to an account that indicates its purpose. For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need to be used for your company management." +#: sql_constraint:account.account:0 +msgid "The code of the account must be unique per company !" msgstr "" #. module: account @@ -7285,11 +7316,6 @@ msgstr "" msgid "Journal Name" 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" -msgstr "" - #. module: account #: help:account.invoice,internal_number:0 msgid "Unique number of the invoice, computed automatically when the invoice is created." @@ -7301,12 +7327,8 @@ msgid "The amount of the voucher must be the same amount as the one on the state msgstr "" #. module: account -#: model:account.account.type,name:account.account_type_expense -msgid "Expense" -msgstr "" - -#. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:1057 +#: code:addons/account/account_move_line.py:1140 #, python-format msgid "Bad account!" msgstr "" @@ -7317,7 +7339,7 @@ msgid "Keep empty for all open fiscal years" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:982 #, python-format msgid "The account move (%s) for centralisation has been confirmed!" msgstr "" @@ -7347,6 +7369,7 @@ msgstr "" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: field:analytic.entries.report,currency_id:0 +#: model:ir.model,name:account.model_res_currency #: field:report.account.sales,currency_id:0 #: field:report.account_type.sales,currency_id:0 #: field:report.invoice.created,currency_id:0 @@ -7363,6 +7386,11 @@ msgstr "" msgid "Accountant validates the accounting entries coming from the invoice." msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form +msgid "Define your company's financial year according to your needs. A financial year is a period at the end of which a company's accounts are made up (usually 12 months). The financial year is usually referred to by the date in which it ends. For example, if a company's financial year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011 would be referred to as FY 2011. You are not obliged to follow the actual calendar year." +msgstr "" + #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open msgid "Reconciled entries" @@ -7424,11 +7452,6 @@ msgstr "" msgid "Reference Type" msgstr "" -#. module: account -#: help:account.bs.report,reserve_account_id:0 -msgid "This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report" -msgstr "" - #. module: account #: view:account.analytic.cost.ledger.journal.report:0 msgid "Cost Ledger for period" @@ -7486,14 +7509,14 @@ msgid "Period from" msgstr "" #. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/installer.py:0 +#: code:addons/account/account.py:2817 +#: code:addons/account/installer.py:476 #, python-format msgid "Sales Refund Journal" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:927 #, python-format msgid "You cannot modify company of this period as its related record exist in Entry Lines" msgstr "" @@ -7540,16 +7563,11 @@ msgid "Purchase Tax(%)" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:805 #, python-format msgid "Please create some invoice lines." msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_tax_code_list -msgid "A tax code is a reference of a tax that will be taken out of a gross income depending on the country and sometimes industry sector. OpenERP allows you to define and manage them from this menu." -msgstr "" - #. module: account #: report:account.overdue:0 msgid "Dear Sir/Madam," @@ -7561,13 +7579,8 @@ msgid "Configure Your Accounting Application" msgstr "" #. module: account -#: model:ir.actions.act_window,help:account.action_account_form -msgid "Create and manage accounts you will need to record financial entries in. Accounts are financial records of your company that register all financial transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor yearly." -msgstr "" - -#. module: account -#: code:addons/account/account.py:0 -#: code:addons/account/installer.py:0 +#: code:addons/account/account.py:2820 +#: code:addons/account/installer.py:479 #, python-format msgid "SCNJ" msgstr "" @@ -7607,7 +7620,7 @@ msgid "Start Period" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:2333 #, python-format msgid "Cannot locate parent code for template account!" msgstr "" @@ -7633,6 +7646,8 @@ msgstr "" #. module: account #: view:account.move.line:0 +#: code:addons/account/account_move_line.py:932 +#, python-format msgid "Total credit" msgstr "" @@ -7642,7 +7657,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. " msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:1026 #, python-format msgid "You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!" msgstr "" @@ -7657,11 +7672,6 @@ msgstr "" msgid "Unpaid" msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_tax_code_tree -msgid "The chart of taxes is used to generate your periodic tax statement. You will see here the taxes with codes related to your legal statement according to your country." -msgstr "" - #. module: account #: report:account.overdue:0 msgid "Document: Customer account statement" @@ -7673,11 +7683,37 @@ msgid "You can not create move line on view account." msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:0 +#: code:addons/account/wizard/account_change_currency.py:71 #, python-format msgid "Current currency is not confirured properly !" msgstr "" +#. module: account +#: code:addons/account/account.py:938 +#: code:addons/account/account.py:940 +#: code:addons/account/account.py:1181 +#: code:addons/account/account.py:1393 +#: code:addons/account/account.py:1397 +#: code:addons/account/account_cash_statement.py:249 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:746 +#: code:addons/account/account_move_line.py:748 +#: code:addons/account/account_move_line.py:751 +#: code:addons/account/account_move_line.py:753 +#: code:addons/account/account_move_line.py:1043 +#: code:addons/account/report/common_report_header.py:92 +#: code:addons/account/wizard/account_change_currency.py:39 +#: code:addons/account/wizard/account_change_currency.py:60 +#: code:addons/account/wizard/account_change_currency.py:65 +#: code:addons/account/wizard/account_change_currency.py:71 +#: code:addons/account/wizard/account_move_bank_reconcile.py:49 +#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 +#: code:addons/account/wizard/account_report_common.py:120 +#: code:addons/account/wizard/account_report_common.py:126 +#, python-format +msgid "Error" +msgstr "" + #. module: account #: view:account.account.template:0 msgid "Receivale Accounts" @@ -7688,11 +7724,6 @@ msgstr "" msgid "Particulars" msgstr "" -#. module: account -#: report:account.invoice:0 -msgid "Document" -msgstr "" - #. module: account #: selection:account.account.type,report_type:0 msgid "Profit & Loss (Income Accounts)" @@ -7762,7 +7793,6 @@ msgstr "" #. module: account #: selection:account.account,type:0 #: selection:account.account.template,type:0 -#: model:account.account.type,name:account.account_type_payable #: selection:account.entries.report,type:0 msgid "Payable" msgstr "" @@ -7791,13 +7821,13 @@ msgid "This view is used by accountants in order to record entries massively in msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:0 +#: code:addons/account/account_bank_statement.py:391 #, python-format msgid "Cannot delete bank statement(s) which are already confirmed !" msgstr "" #. module: account -#: code:addons/account/wizard/account_automatic_reconcile.py:0 +#: code:addons/account/wizard/account_automatic_reconcile.py:152 #, python-format msgid "You must select accounts to reconcile" msgstr "" @@ -7812,6 +7842,11 @@ msgstr "" msgid "Accounting entries are the first input of the reconciliation." msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_account_period_form +msgid "Here you can define a financial period, an interval of time in your company's financial year. An accounting period typically is a month or a quarter. It usually corresponds to the periods of the tax declaration. Create and manage periods from here and decide whether a period should be closed or left open depending on your company's activities over a specific period." +msgstr "" + #. module: account #: report:account.move.voucher:0 msgid "Receiver's Signature" @@ -7840,7 +7875,7 @@ msgid "Move" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:1054 #, python-format msgid "You can not change the tax, you should remove and recreate lines !" msgstr "" @@ -7866,7 +7901,7 @@ msgid "Date of the day" msgstr "" #. module: account -#: code:addons/account/wizard/account_move_bank_reconcile.py:0 +#: code:addons/account/wizard/account_move_bank_reconcile.py:49 #, python-format msgid "You have to define the bank account\n" "in the journal definition for reconciliation." @@ -7889,7 +7924,7 @@ msgid "Consolidated Children" msgstr "" #. module: account -#: code:addons/account/wizard/account_fiscalyear_close.py:0 +#: code:addons/account/wizard/account_fiscalyear_close.py:82 #, python-format msgid "The journal must have centralised counterpart without the Skipping draft state option checked!" msgstr "" @@ -7973,7 +8008,7 @@ msgid "Account Subscription" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:735 #, python-format msgid "Tax base different !\n" "Click on compute to update tax base" @@ -8027,7 +8062,7 @@ msgid "Unreconciled" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:822 #, python-format msgid "Bad total !" msgstr "" @@ -8078,13 +8113,13 @@ msgid "Active" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:372 #, python-format msgid "Unknown Error" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:1167 #, python-format msgid "You cannot validate a non-balanced entry !\n" "Make sure you have configured Payment Term properly !\n" @@ -8159,7 +8194,7 @@ msgid "Journal Entry Model" msgstr "" #. module: account -#: code:addons/account/wizard/account_use_model.py:0 +#: code:addons/account/wizard/account_use_model.py:44 #, python-format msgid "Maturity date of entry line generated by model line '%s' is based on partner payment term!\n" "Please define partner on it!" @@ -8399,8 +8434,12 @@ msgid "Tax Source" msgstr "" #. module: account -#: code:addons/account/report/account_balance_sheet.py:0 -#: code:addons/account/report/account_profit_loss.py:0 +#: code:addons/account/report/account_balance_sheet.py:71 +#: code:addons/account/report/account_balance_sheet.py:116 +#: code:addons/account/report/account_balance_sheet.py:119 +#: code:addons/account/report/account_balance_sheet.py:120 +#: code:addons/account/report/account_profit_loss.py:71 +#: code:addons/account/report/account_profit_loss.py:127 #, python-format msgid "Net Profit" msgstr "" @@ -8416,7 +8455,7 @@ msgid "This is a model for recurring accounting entries" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:0 +#: code:addons/account/account_analytic_line.py:100 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -8455,6 +8494,12 @@ msgstr "" msgid "Total" msgstr "" +#. module: account +#: code:addons/account/wizard/account_move_journal.py:97 +#, python-format +msgid "Journal: All" +msgstr "" + #. module: account #: field:account.account,company_id:0 #: field:account.analytic.journal,company_id:0 @@ -8556,18 +8601,22 @@ msgid "End period" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 -#: code:addons/account/wizard/account_invoice_state.py:0 -#: code:addons/account/wizard/account_report_balance_sheet.py:0 -#: code:addons/account/wizard/account_state_open.py:0 -#: code:addons/account/wizard/account_validate_account_move.py:0 +#: code:addons/account/account_move_line.py:680 +#: code:addons/account/account_move_line.py:758 +#: code:addons/account/wizard/account_invoice_state.py:44 +#: code:addons/account/wizard/account_invoice_state.py:68 +#: code:addons/account/wizard/account_report_balance_sheet.py:72 +#: code:addons/account/wizard/account_state_open.py:37 +#: code:addons/account/wizard/account_validate_account_move.py:39 +#: code:addons/account/wizard/account_validate_account_move.py:61 #, python-format msgid "Warning" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_analytic_journal -msgid "account.analytic.journal" +#: 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 @@ -8635,11 +8684,6 @@ msgstr "" 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." @@ -8651,7 +8695,7 @@ msgid "Recurring" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:748 #, python-format msgid "Entry is already reconciled" msgstr "" @@ -8672,7 +8716,7 @@ msgid "Range" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:1172 #, python-format msgid "Can not create an automatic sequence for this piece !\n" "\n" @@ -8735,7 +8779,7 @@ msgid "Applicability" msgstr "" #. module: account -#: code:addons/account/wizard/account_move_journal.py:0 +#: code:addons/account/wizard/account_move_journal.py:162 #, python-format msgid "This period is already closed !" msgstr "" @@ -8760,6 +8804,11 @@ msgstr "" msgid "Parent Account" msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_account_journal_form +msgid "Create and manage your company's journals from this menu. A journal is used to record transactions of all accounting data related to the day-to-day business of your company using double-entry bookkeeping system. Depending on the nature of its activities and the number of daily transactions, a company may keep several types of specialized journals such as a cash journal, purchase journal, sales journal..." +msgstr "" + #. module: account #: model:ir.model,name:account.model_account_analytic_chart msgid "Account Analytic Chart" @@ -8788,7 +8837,7 @@ msgid "Accounts Mapping" msgstr "" #. module: account -#: code:addons/account/invoice.py:0 +#: code:addons/account/invoice.py:364 #, python-format msgid "Invoice '%s' is waiting for validation." msgstr "" @@ -8803,8 +8852,8 @@ msgid "November" msgstr "" #. module: account -#: sql_constraint:account.account:0 -msgid "The code of the account must be unique per company !" +#: model:ir.model,name:account.model_account_installer_modules +msgid "account.installer.modules" msgstr "" #. module: account @@ -8813,7 +8862,7 @@ msgid "The income or expense account related to the selected product." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:0 +#: code:addons/account/account_move_line.py:1043 #, python-format msgid "The date of your Journal Entry is not in the defined period!" msgstr "" @@ -8922,7 +8971,6 @@ msgstr "" #. module: account #: field:account.aged.trial.balance,result_selection:0 #: field:account.common.partner.report,result_selection:0 -#: report:account.general.ledger:0 #: report:account.partner.balance:0 #: field:account.partner.balance,result_selection:0 #: field:account.partner.ledger,result_selection:0 @@ -9021,14 +9069,19 @@ msgid "Amount currency" msgstr "" #. module: account -#: code:addons/account/wizard/account_report_aged_partner_balance.py:0 +#: code:addons/account/wizard/account_report_aged_partner_balance.py:57 #, python-format msgid "You must enter a period length that cannot be 0 or below !" msgstr "" #. module: account -#: code:addons/account/account.py:0 +#: code:addons/account/account.py:501 #, python-format msgid "You cannot remove an account which has account entries!. " msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_account_form +msgid "Create and manage the accounts you need to record journal entries. An account is part of a ledger allowing your company to register all kinds of debit and credit transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor annually." +msgstr "" + diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index e3232286a80..03056b8d204 100755 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -489,7 +489,7 @@ msgstr "Date de création" #. module: account #: selection:account.journal,type:0 msgid "Purchase Refund" -msgstr "Remboursement d'achat" +msgstr "Avoir fournisseur" #. module: account #: selection:account.journal,type:0 @@ -1632,7 +1632,7 @@ msgstr "Compte fournisseurs débiteurs" #: field:account.tax,account_paid_id:0 #: field:account.tax.template,account_paid_id:0 msgid "Refund Tax Account" -msgstr "Compte de taxe à payer" +msgstr "Compte de taxe pour avoirs" #. module: account #: view:account.bank.statement:0 @@ -9899,7 +9899,7 @@ msgstr "Rechercher une facture" #: view:account.invoice.report:0 #: model:ir.actions.act_window,name:account.action_account_invoice_refund msgid "Refund" -msgstr "Rembourser" +msgstr "Créer un avoir" #. module: account #: field:wizard.multi.charts.accounts,bank_accounts_id:0 diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py index 7084aa8c07f..d525d3a331b 100755 --- a/addons/account/report/__init__.py +++ b/addons/account/report/__init__.py @@ -39,8 +39,6 @@ import account_invoice_report import account_report import account_entries_report import account_analytic_entries_report -#import voucher_print -import account_voucher_print import account_balance_sheet import account_profit_loss diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 00fa1f58ff6..1d8fccc251f 100755 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -20,6 +20,7 @@ ############################################################################## import time + from report import report_sxw from common_report_header import common_report_header diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 8eefe75838f..d2d5883e947 100755 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -80,7 +80,7 @@ - + diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index b904aba298f..53f85dd4860 100755 --- a/addons/account/report/account_general_ledger.py +++ b/addons/account/report/account_general_ledger.py @@ -103,7 +103,9 @@ class general_ledger(report_sxw.rml_parse, common_report_header): def get_children_accounts(self, account): res = [] + currency_obj = self.pool.get('res.currency') ids_acc = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, account.id) + currency = account.currency_id and account.currency_id or account.company_id.currency_id for child_account in self.pool.get('account.account').browse(self.cr, self.uid, ids_acc, context=self.context): sql = """ SELECT count(id) @@ -119,7 +121,7 @@ class general_ledger(report_sxw.rml_parse, common_report_header): res.append(child_account) elif self.display_account == 'bal_solde': if child_account.type != 'view' and num_entry <> 0: - if ( sold_account <> 0.0): + if currency_obj.is_zero(self.cr, self.uid, currency, sold_account) != 0: res.append(child_account) else: res.append(child_account) diff --git a/addons/account/report/account_voucher_print.py b/addons/account/report/account_voucher_print.py deleted file mode 100755 index 912e0794a9c..00000000000 --- a/addons/account/report/account_voucher_print.py +++ /dev/null @@ -1,69 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved -# $Id$ -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import time -from report import report_sxw -from tools import amount_to_text_en - -class report_voucher_move(report_sxw.rml_parse): - def __init__(self, cr, uid, name, context=None): - super(report_voucher_move, self).__init__(cr, uid, name, context=context) - self.localcontext.update({ - 'time': time, - 'convert':self.convert, - 'get_title': self.get_title, - 'debit':self.debit, - 'credit':self.credit, - }) - self.user = uid - - def convert(self, amount): - user_id = self.pool.get('res.users').browse(self.cr, self.user, [self.user])[0] - return amount_to_text_en.amount_to_text(amount, 'en', user_id.company_id.currency_id.name) - - def get_title(self, voucher): - title = '' - if voucher.journal_id: - type = voucher.journal_id.type - title = type[0].swapcase() + type[1:] + " Voucher" - return title - - def debit(self, move_ids): - debit = 0.0 - for move in move_ids: - debit +=move.debit - return debit - - def credit(self, move_ids): - credit = 0.0 - for move in move_ids: - credit +=move.credit - return credit - -report_sxw.report_sxw( - 'report.account.move.voucher', - 'account.move', - 'addons/account/report/account_voucher_print.rml', - parser=report_voucher_move,header="external" -) - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account/report/account_voucher_print.rml b/addons/account/report/account_voucher_print.rml deleted file mode 100755 index 1d8f237c132..00000000000 --- a/addons/account/report/account_voucher_print.rml +++ /dev/null @@ -1,470 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Particulars - - - Debit - - - Credit - - - - - [[ repeatIn(objects,'voucher') ]] - - - - [[ get_title(voucher) ]] - - - - - - - - - - Journal: - - - [[ voucher.journal_id.name ]] - - - Number: - - - [[ voucher.name ]] - - - - - - - State: - - - PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]] - Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]] - Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]] - Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]] - - - Ref. : - - - [[ voucher.ref]] - - - Date: - - - [[ formatLang(voucher.date , date=True) or '' ]] - - - - - - - - - - - - - Particulars - - - Debit - - - Credit - - - - - - -
- [[ repeatIn(voucher.line_id,'line_id') ]] - - - - [[ (line_id.partner_id and line_id.partner_id.name) or 'Account']] - - - [[ formatLang(line_id.debit) ]] - - - [[ formatLang(line_id.credit) ]] - - - - - [[ line_id.account_id.name ]] - - - - - - - - - - - - - - - [[ line_id.name ]]-[[voucher.ref]] - - - - - - - - - - - - - - - - -
- - - - - - - Through : - - - - - - - - - - - - - - - [[ voucher.narration or '']] - - - - - - - - - - - - - - - On Account of : - - - - - - - - - - - - - - - [[ voucher.line_id and voucher.line_id[0].name or removeParentNode('para') ]] - - - - - - - - - - - - - - - Amount (in words) : - - - - - - - - - - - - - - - [[ convert(voucher.amount) ]] - - - - - - - - - - - - - - - - - - - - - - - - - [[ formatLang(debit(voucher.line_id))]] - - - [[ formatLang(credit(voucher.line_id)) ]] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Receiver's Signature - - - - - - - - - - - - - Authorised Signatory - - - - - - - - - diff --git a/addons/account/res_currency.py b/addons/account/res_currency.py index 6ec404edcf4..8c9c6a8b103 100755 --- a/addons/account/res_currency.py +++ b/addons/account/res_currency.py @@ -21,6 +21,7 @@ from osv import osv """Inherit res.currency to handle accounting date values when converting currencies""" + class res_currency_account(osv.osv): _inherit = "res.currency" @@ -41,4 +42,6 @@ class res_currency_account(osv.osv): rate = float(tot2)/float(tot1) return rate -res_currency_account() \ No newline at end of file +res_currency_account() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index 5f429270e29..39ed61cc253 100755 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -16,98 +16,98 @@ Account Entry - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Entry lines - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Journal Period - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Journal multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Analytic journal multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Analytic journal multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Period multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Fiscal year multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Account multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Tax multi-company - ['|',('company_id','=',False),('company_id','=',user.company_id.id)] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Tax code multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Invoice multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Account fiscal Mapping company rule - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Account model company rule - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 83efe67f103..ac6c0833e4d 100755 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -98,6 +98,7 @@ "access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1 "access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1 "access_account_entries_report_user","account.entries.report","model_account_entries_report","account.group_account_user",1,0,0,0 +"access_account_entries_report_invoice","account.entries.report","model_account_entries_report","account.group_account_invoice",1,0,0,0 "access_account_entries_report_employee","account.entries.report employee","model_account_entries_report","base.group_user",1,0,0,0 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1 diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml index 312db44cd0c..d5bb6bada65 100755 --- a/addons/account/test/account_report.yml +++ b/addons/account/test/account_report.yml @@ -28,14 +28,6 @@ (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c')], {}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'account-report_overdue.'+format), 'wb+').write(data) -- - In order to test the PDF reports defined on Account Move, we will print the Voucher Report -- - !python {model: account.move}: | - import netsvc, tools, os - (data, format) = netsvc.LocalService('report.account.move.voucher').create(cr, uid, [ref('account.account_move_0')], {}, {}) - if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'account-voucher-report.'+format), 'wb+').write(data) - Print the Aged Partner Balance Report - @@ -44,7 +36,7 @@ ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')],'active_id':ref('account.chart0')}) data_dict = {'chart_account_id':ref('account.chart0')} from tools import test_reports - test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account') + test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account') - Print the Account Balance Sheet in Horizontal mode - @@ -53,7 +45,7 @@ ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]}) data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True} from tools import test_reports - test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account') + test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account') - Print the Account Balance Sheet in Normal mode - @@ -62,7 +54,7 @@ ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]}) data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False} from tools import test_reports - test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account') + test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account') - Print the Account Balance Report in Normal mode through the wizard - From Account Chart - @@ -157,7 +149,7 @@ ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]}) data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False} from tools import test_reports - test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account') + test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account') - Print the Profit-Loss Report in Horizontal Mode - @@ -166,7 +158,7 @@ ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]}) data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True} from tools import test_reports - test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account') + test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account') - Print the Analytic Balance Report through the wizard - @@ -215,4 +207,4 @@ ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root')]}) data_dict = {} from tools import test_reports - test_reports.try_report_action(cr, uid, 'action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account') + test_reports.try_report_action(cr, uid, 'action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account') diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py index 47f9ac9c2c8..d915a1cd34b 100755 --- a/addons/account/wizard/account_change_currency.py +++ b/addons/account/wizard/account_change_currency.py @@ -72,7 +72,7 @@ class account_change_currency(osv.osv_memory): new_price = (line.price_unit / old_rate ) * rate obj_inv_line.write(cr, uid, [line.id], {'price_unit': new_price}) obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} account_change_currency() diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py index 42383341828..6190f792c7f 100755 --- a/addons/account/wizard/account_fiscalyear_close.py +++ b/addons/account/wizard/account_fiscalyear_close.py @@ -215,7 +215,7 @@ class account_fiscalyear_close(osv.osv_memory): cr.execute('UPDATE account_fiscalyear ' \ 'SET end_journal_period_id = %s ' \ 'WHERE id = %s', (ids[0], old_fyear.id)) - return {} + return {'type': 'ir.actions.act_window_close'} account_fiscalyear_close() diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py index 9a559d039da..abf054746ce 100755 --- a/addons/account/wizard/account_fiscalyear_close_state.py +++ b/addons/account/wizard/account_fiscalyear_close_state.py @@ -57,7 +57,7 @@ class account_fiscalyear_close_state(osv.osv_memory): fy_pool = self.pool.get('account.fiscalyear') fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code fy_pool.log(cr, uid, fy_id, "Fiscal year '%s' is closed, no more modification allowed." % (fy_code)) - return {} + return {'type': 'ir.actions.act_window_close'} account_fiscalyear_close_state() diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py index 2e7a519aa34..7adcb908a34 100755 --- a/addons/account/wizard/account_invoice_state.py +++ b/addons/account/wizard/account_invoice_state.py @@ -43,7 +43,7 @@ class account_invoice_confirm(osv.osv_memory): if record['state'] not in ('draft','proforma','proforma2'): raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!")) wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_open', cr) - return {} + return {'type': 'ir.actions.act_window_close'} account_invoice_confirm() @@ -67,7 +67,7 @@ class account_invoice_cancel(osv.osv_memory): if record['state'] in ('cancel','paid'): raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!")) wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_cancel', cr) - return {} + return {'type': 'ir.actions.act_window_close'} account_invoice_cancel() diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py index 582bbc36619..541e7b2cbdb 100755 --- a/addons/account/wizard/account_open_closed_fiscalyear.py +++ b/addons/account/wizard/account_open_closed_fiscalyear.py @@ -42,7 +42,7 @@ class account_open_closed_fiscalyear(osv.osv_memory): ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)]) if ids_move: cr.execute('delete from account_move where id IN %s', (tuple(ids_move),)) - return {} + return {'type': 'ir.actions.act_window_close'} account_open_closed_fiscalyear() diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py index 3b3acecc389..5b7589d7830 100755 --- a/addons/account/wizard/account_period_close.py +++ b/addons/account/wizard/account_period_close.py @@ -50,7 +50,7 @@ class account_period_close(osv.osv_memory): # Log message for Period for period_id, name in period_pool.name_get(cr, uid, [id]): period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name)) - return {} + return {'type': 'ir.actions.act_window_close'} account_period_close() diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py index f89ffb47a76..8131f6a9668 100755 --- a/addons/account/wizard/account_reconcile.py +++ b/addons/account/wizard/account_reconcile.py @@ -101,7 +101,7 @@ class account_move_line_reconcile(osv.osv_memory): context.update({'stop_reconcile': True}) account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id, period_id, journal_id, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} account_move_line_reconcile() @@ -145,7 +145,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory): if context is None: context = {} account_move_line_obj.reconcile_partial(cr, uid, context['active_ids'], 'manual', context=context) - return {} + return {'type': 'ir.actions.act_window_close'} def trans_rec_reconcile(self, cr, uid, ids, context=None): account_move_line_obj = self.pool.get('account.move.line') @@ -169,7 +169,7 @@ class account_move_line_reconcile_writeoff(osv.osv_memory): context.update({'stop_reconcile': True}) account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id, period_id, journal_id, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} account_move_line_reconcile_writeoff() diff --git a/addons/account/wizard/account_reconcile_partner_process.py b/addons/account/wizard/account_reconcile_partner_process.py index 9f91d1ec2d2..7cfeff70891 100755 --- a/addons/account/wizard/account_reconcile_partner_process.py +++ b/addons/account/wizard/account_reconcile_partner_process.py @@ -83,7 +83,7 @@ class account_partner_reconcile_process(osv.osv_memory): res_partner_obj.write(cr, uid, partner_id[0], {'last_reconciliation_date': time.strftime('%Y-%m-%d')}, context) #TODO: we have to find a way to update the context of the current tab (we could open a new tab with the context but it's not really handy) #TODO: remove that comments when the client side dev is done - return {} + return {'type': 'ir.actions.act_window_close'} _columns = { 'to_reconcile': fields.float('Remaining Partners', readonly=True, help='This is the remaining partners for who you should check if there is something to reconcile or not. This figure already count the current partner as reconciled.'), diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py index 1c3743bf3c7..a72d58dd904 100755 --- a/addons/account/wizard/account_report_account_balance.py +++ b/addons/account/wizard/account_report_account_balance.py @@ -19,8 +19,6 @@ # ############################################################################## -from lxml import etree - from osv import osv class account_balance_report(osv.osv_memory): @@ -38,4 +36,4 @@ class account_balance_report(osv.osv_memory): account_balance_report() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py index 5cb5d52c413..59784e6e15d 100755 --- a/addons/account/wizard/account_report_aged_partner_balance.py +++ b/addons/account/wizard/account_report_aged_partner_balance.py @@ -22,8 +22,6 @@ import time from datetime import datetime from dateutil.relativedelta import relativedelta -from lxml import etree - from osv import osv, fields from tools.translate import _ diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py index 174c172fdaa..b69c6d65d71 100755 --- a/addons/account/wizard/account_report_balance_sheet.py +++ b/addons/account/wizard/account_report_balance_sheet.py @@ -19,8 +19,6 @@ # ############################################################################## -from lxml import etree - from osv import osv, fields from tools.translate import _ @@ -86,4 +84,4 @@ class account_bs_report(osv.osv_memory): account_bs_report() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py index 444d91fa8fd..c526550e789 100755 --- a/addons/account/wizard/account_report_profit_loss.py +++ b/addons/account/wizard/account_report_profit_loss.py @@ -19,8 +19,6 @@ # ############################################################################## -from lxml import etree - from osv import osv, fields class account_pl_report(osv.osv_memory): @@ -60,4 +58,4 @@ class account_pl_report(osv.osv_memory): account_pl_report() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_state_open.py b/addons/account/wizard/account_state_open.py index 2a03a80aefa..81705771d67 100755 --- a/addons/account/wizard/account_state_open.py +++ b/addons/account/wizard/account_state_open.py @@ -37,7 +37,7 @@ class account_state_open(osv.osv_memory): raise osv.except_osv(_('Warning'), _('Invoice is already reconciled')) wf_service = netsvc.LocalService("workflow") res = wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr) - return {} + return {'type': 'ir.actions.act_window_close'} account_state_open() diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py index 3a067b4a598..0e6c38f9d7c 100755 --- a/addons/account/wizard/account_unreconcile.py +++ b/addons/account/wizard/account_unreconcile.py @@ -31,7 +31,7 @@ class account_unreconcile(osv.osv_memory): context = {} if context.get('active_ids', False): obj_move_line._remove_move_reconcile(cr, uid, context['active_ids'], context=context) - return {} + return {'type': 'ir.actions.act_window_close'} account_unreconcile() @@ -46,7 +46,7 @@ class account_unreconcile_reconcile(osv.osv_memory): rec_ids = context['active_ids'] if rec_ids: obj_move_reconcile.unlink(cr, uid, rec_ids, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} account_unreconcile_reconcile() diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py index f840d2b5532..ddcfa2c5353 100755 --- a/addons/account/wizard/account_validate_account_move.py +++ b/addons/account/wizard/account_validate_account_move.py @@ -38,7 +38,7 @@ class validate_account_move(osv.osv_memory): if not ids_move: raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period')) obj_move.button_validate(cr, uid, ids_move, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} validate_account_move() @@ -60,7 +60,7 @@ class validate_account_move_lines(osv.osv_memory): if not move_ids: raise osv.except_osv(_('Warning'), _('Selected Entry Lines does not have any account move enties in draft state')) obj_move.button_validate(cr, uid, move_ids, context) - return {} + return {'type': 'ir.actions.act_window_close'} validate_account_move_lines() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_accountant/i18n/account_accountant.pot b/addons/account_accountant/i18n/account_accountant.pot index d173ea2eaab..8fb73751247 100755 --- a/addons/account_accountant/i18n/account_accountant.pot +++ b/addons/account_accountant/i18n/account_accountant.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:19+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:19+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:46+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot index b32bfc2a40c..38feb5553e5 100755 --- a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot +++ b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:19+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:19+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:46+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -31,16 +31,12 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot." msgstr "" #. module: account_analytic_analysis -#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703 #, python-format msgid "AccessError" msgstr "" -#. module: account_analytic_analysis -#: field:account.analytic.account,ca_theorical:0 -msgid "Theorical Revenue" -msgstr "" - #. module: account_analytic_analysis #: help:account.analytic.account,last_invoice_date:0 msgid "Date of the last invoice created for this analytic account." @@ -69,13 +65,13 @@ msgid "Computed using the formula: Theorial Revenue - Total Costs" msgstr "" #. module: account_analytic_analysis -#: field:account.analytic.account,theorical_margin:0 -msgid "Theorical Margin" +#: field:account.analytic.account,real_margin_rate:0 +msgid "Real Margin Rate (%)" msgstr "" #. module: account_analytic_analysis -#: field:account.analytic.account,real_margin_rate:0 -msgid "Real Margin Rate (%)" +#: field:account.analytic.account,ca_theorical:0 +msgid "Theoretical Revenue" msgstr "" #. module: account_analytic_analysis @@ -108,6 +104,11 @@ msgstr "" msgid "Remaining Hours" msgstr "" +#. module: account_analytic_analysis +#: field:account.analytic.account,theorical_margin:0 +msgid "Theoretical Margin" +msgstr "" + #. module: account_analytic_analysis #: help:account.analytic.account,ca_theorical:0 msgid "Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist." @@ -155,7 +156,8 @@ msgid "Invoiced Amount" msgstr "" #. module: account_analytic_analysis -#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704 #, python-format msgid "You try to bypass an access rule (Document type: %s)." msgstr "" @@ -175,6 +177,11 @@ msgstr "" msgid "Real Margin" msgstr "" +#. module: account_analytic_analysis +#: constraint:account.analytic.account:0 +msgid "Error! The currency has to be the same as the currency of the selected company" +msgstr "" + #. module: account_analytic_analysis #: help:account.analytic.account,ca_invoiced:0 msgid "Total customer invoiced amount for this account." diff --git a/addons/account_analytic_default/i18n/account_analytic_default.pot b/addons/account_analytic_default/i18n/account_analytic_default.pot index f75a5d720e9..4190e00e2d0 100755 --- a/addons/account_analytic_default/i18n/account_analytic_default.pot +++ b/addons/account_analytic_default/i18n/account_analytic_default.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:20+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:20+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:46+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:46+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/account_analytic_plans/i18n/account_analytic_plans.pot b/addons/account_analytic_plans/i18n/account_analytic_plans.pot index a92c5097bbd..73e254d3063 100755 --- a/addons/account_analytic_plans/i18n/account_analytic_plans.pot +++ b/addons/account_analytic_plans/i18n/account_analytic_plans.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:20+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:20+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:47+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:47+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -66,6 +66,12 @@ msgstr "" msgid "Analytic Plan Line" msgstr "" +#. module: account_analytic_plans +#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60 +#, python-format +msgid "User Error" +msgstr "" + #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance msgid "Analytic Plan Instance" @@ -152,7 +158,7 @@ msgid "Sales Order Line" msgstr "" #. module: account_analytic_plans -#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0 +#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47 #: view:analytic.plan.create.model:0 #, python-format msgid "Distribution Model Saved" @@ -174,13 +180,13 @@ msgid "Percentage" msgstr "" #. module: account_analytic_plans -#: code:addons/account_analytic_plans/account_analytic_plans.py:0 +#: code:addons/account_analytic_plans/account_analytic_plans.py:201 #, python-format msgid "A model having this name and code already exists !" msgstr "" #. module: account_analytic_plans -#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0 +#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41 #, python-format msgid "No analytic plan defined !" msgstr "" @@ -198,9 +204,8 @@ msgid "Analytic Plans" msgstr "" #. module: account_analytic_plans -#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0 -#, python-format -msgid "User Error" +#: report:account.analytic.account.crossovered.analytic:0 +msgid "Perc(%)" msgstr "" #. module: account_analytic_plans @@ -264,7 +269,8 @@ msgid "To Date" msgstr "" #. module: account_analytic_plans -#: code:addons/account_analytic_plans/account_analytic_plans.py:0 +#: code:addons/account_analytic_plans/account_analytic_plans.py:321 +#: code:addons/account_analytic_plans/account_analytic_plans.py:462 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" msgstr "" @@ -359,8 +365,9 @@ msgid "Root account of this plan." msgstr "" #. module: account_analytic_plans -#: code:addons/account_analytic_plans/account_analytic_plans.py:0 -#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0 +#: code:addons/account_analytic_plans/account_analytic_plans.py:201 +#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38 +#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41 #, python-format msgid "Error" msgstr "" @@ -376,7 +383,7 @@ msgid "Quantity" msgstr "" #. module: account_analytic_plans -#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0 +#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38 #, python-format msgid "Please put a name and a code before saving the model !" msgstr "" @@ -387,7 +394,8 @@ msgid "Print Crossovered Analytic" msgstr "" #. module: account_analytic_plans -#: code:addons/account_analytic_plans/account_analytic_plans.py:0 +#: code:addons/account_analytic_plans/account_analytic_plans.py:321 +#: code:addons/account_analytic_plans/account_analytic_plans.py:462 #, python-format msgid "No Analytic Journal !" msgstr "" @@ -424,7 +432,7 @@ msgid "Analytic Distribution Lines" msgstr "" #. module: account_analytic_plans -#: code:addons/account_analytic_plans/account_analytic_plans.py:0 +#: code:addons/account_analytic_plans/account_analytic_plans.py:214 #, python-format msgid "The Total Should be Between %s and %s" msgstr "" @@ -501,7 +509,7 @@ msgid "The name of the journal must be unique per company !" msgstr "" #. module: account_analytic_plans -#: code:addons/account_analytic_plans/account_analytic_plans.py:0 +#: code:addons/account_analytic_plans/account_analytic_plans.py:214 #, python-format msgid "Value Error" msgstr "" diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py index 0581197aaca..1cd3022f60b 100755 --- a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py +++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py @@ -53,7 +53,7 @@ class analytic_plan_create_model(osv.osv_memory): 'target': 'new', } else: - return {} + return {'type': 'ir.actions.act_window_close'} analytic_plan_create_model() diff --git a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot index f96013a9b3a..d72d95f22b1 100755 --- a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot +++ b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:21+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:21+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:48+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:48+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,8 +21,8 @@ msgid " Accounting Property" msgstr "" #. module: account_anglo_saxon -#: model:ir.model,name:account_anglo_saxon.model_product_category -msgid "Product Category" +#: sql_constraint:purchase.order:0 +msgid "Order Reference must be unique !" msgstr "" #. module: account_anglo_saxon @@ -50,6 +50,11 @@ msgstr "" msgid "Product Template" msgstr "" +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_product_category +msgid "Product Category" +msgstr "" + #. module: account_anglo_saxon #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information msgid "Stock Accounting for Anglo Saxon countries" diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py index 784dd9367c7..c37a93b4be4 100755 --- a/addons/account_anglo_saxon/invoice.py +++ b/addons/account_anglo_saxon/invoice.py @@ -21,7 +21,7 @@ # ############################################################################## -from osv import fields, osv +from osv import osv class account_invoice_line(osv.osv): _inherit = "account.invoice.line" diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot index e2ea514a5cf..91d987c5d9d 100755 --- a/addons/account_budget/i18n/account_budget.pot +++ b/addons/account_budget/i18n/account_budget.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:21+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:21+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:49+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:49+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -32,13 +32,14 @@ msgid "Budgetary Positions" msgstr "" #. module: account_budget -#: view:account.budget.crossvered.summary.report:0 -msgid "This wizard is used to print summary of budgets" +#: code:addons/account_budget/account_budget.py:119 +#, python-format +msgid "The General Budget '%s' has no Accounts!" msgstr "" #. module: account_budget -#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view -msgid "A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period." +#: report:account.budget:0 +msgid "Printed at:" msgstr "" #. module: account_budget @@ -117,6 +118,16 @@ msgstr "" msgid "Status" msgstr "" +#. module: account_budget +#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view +msgid "A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period." +msgstr "" + +#. module: account_budget +#: view:account.budget.crossvered.summary.report:0 +msgid "This wizard is used to print summary of budgets" +msgstr "" + #. module: account_budget #: report:account.budget:0 #: report:crossovered.budget.report:0 @@ -182,6 +193,7 @@ msgid "Practical Amt" msgstr "" #. module: account_budget +#: view:account.analytic.account:0 #: view:account.budget.post:0 #: view:crossovered.budget:0 #: field:crossovered.budget.lines,practical_amount:0 @@ -201,6 +213,7 @@ msgid "Account Budget report for analytic account" msgstr "" #. module: account_budget +#: view:account.analytic.account:0 #: view:account.budget.post:0 #: view:crossovered.budget:0 #: field:crossovered.budget.lines,theoritical_amount:0 @@ -235,12 +248,7 @@ msgid "Budget" msgstr "" #. module: account_budget -#: report:account.budget:0 -msgid "Printed at:" -msgstr "" - -#. module: account_budget -#: code:addons/account_budget/account_budget.py:0 +#: code:addons/account_budget/account_budget.py:119 #, python-format msgid "Error!" msgstr "" @@ -270,9 +278,8 @@ msgid "Budgets" msgstr "" #. module: account_budget -#: code:addons/account_budget/account_budget.py:0 -#, python-format -msgid "The General Budget '%s' has no Accounts!" +#: constraint:account.analytic.account:0 +msgid "Error! The currency has to be the same as the currency of the selected company" msgstr "" #. module: account_budget diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml index 1fbcd82e86c..1d737d5ddd8 100755 --- a/addons/account_budget/security/account_budget_security.xml +++ b/addons/account_budget/security/account_budget_security.xml @@ -6,21 +6,21 @@ Budget post multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Budget multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Budget lines multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] diff --git a/addons/account_cancel/i18n/account_cancel.pot b/addons/account_cancel/i18n/account_cancel.pot index ed064edbdf1..4348781ba92 100755 --- a/addons/account_cancel/i18n/account_cancel.pot +++ b/addons/account_cancel/i18n/account_cancel.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:22+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:22+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:49+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:49+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/account_chart/i18n/account_chart.pot b/addons/account_chart/i18n/account_chart.pot index bd19519e330..15e00d2923f 100755 --- a/addons/account_chart/i18n/account_chart.pot +++ b/addons/account_chart/i18n/account_chart.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:22+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:22+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:49+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:49+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/account_coda/i18n/account_coda.pot b/addons/account_coda/i18n/account_coda.pot index 899ae288af1..54c1996cf93 100755 --- a/addons/account_coda/i18n/account_coda.pot +++ b/addons/account_coda/i18n/account_coda.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:22+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:22+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:50+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:50+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -68,7 +68,7 @@ msgid "Coda import" msgstr "" #. module: account_coda -#: code:addons/account_coda/account_coda.py:0 +#: code:addons/account_coda/account_coda.py:51 #, python-format msgid "Coda file not found for bank statement !!" msgstr "" @@ -137,7 +137,7 @@ msgid "Open Statements" msgstr "" #. module: account_coda -#: code:addons/account_coda/wizard/account_coda_import.py:0 +#: code:addons/account_coda/wizard/account_coda_import.py:167 #, python-format msgid "The bank account %s is not defined for the partner %s.\n" "" @@ -204,7 +204,7 @@ msgid "Coda Logs" msgstr "" #. module: account_coda -#: code:addons/account_coda/wizard/account_coda_import.py:0 +#: code:addons/account_coda/wizard/account_coda_import.py:311 #, python-format msgid "Result" msgstr "" diff --git a/addons/account_coda/security/account_security.xml b/addons/account_coda/security/account_security.xml index b8fdd32ebe6..3035c8e608b 100755 --- a/addons/account_coda/security/account_security.xml +++ b/addons/account_coda/security/account_security.xml @@ -5,7 +5,7 @@ Account Coda model company rule - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot index 21661cfbf8e..e106adbec1d 100755 --- a/addons/account_followup/i18n/account_followup.pot +++ b/addons/account_followup/i18n/account_followup.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:24+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:24+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:51+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:51+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ msgstr "" "Plural-Forms: \n" #. module: account_followup -#: code:addons/account_followup/wizard/account_followup_print.py:0 +#: code:addons/account_followup/wizard/account_followup_print.py:295 #, python-format msgid "Follwoup Summary" msgstr "" @@ -54,7 +54,7 @@ msgid "Group By..." msgstr "" #. module: account_followup -#: code:addons/account_followup/wizard/account_followup_print.py:0 +#: code:addons/account_followup/wizard/account_followup_print.py:287 #, python-format msgid "\n" "\n" @@ -183,7 +183,7 @@ msgid "Partners" msgstr "" #. module: account_followup -#: code:addons/account_followup/wizard/account_followup_print.py:0 +#: code:addons/account_followup/wizard/account_followup_print.py:138 #, python-format msgid "Invoices Reminder" msgstr "" @@ -369,7 +369,7 @@ msgid "Due" msgstr "" #. module: account_followup -#: code:addons/account_followup/wizard/account_followup_print.py:0 +#: code:addons/account_followup/wizard/account_followup_print.py:56 #, python-format msgid "Select Partners" msgstr "" @@ -430,7 +430,7 @@ msgid "Send email confirmation" msgstr "" #. module: account_followup -#: code:addons/account_followup/wizard/account_followup_print.py:0 +#: code:addons/account_followup/wizard/account_followup_print.py:284 #, python-format msgid "All E-mails have been successfully sent to Partners:.\n" "\n" @@ -615,7 +615,7 @@ msgid "Maturity" msgstr "" #. module: account_followup -#: code:addons/account_followup/wizard/account_followup_print.py:0 +#: code:addons/account_followup/wizard/account_followup_print.py:286 #, python-format msgid "E-Mail not sent to following Partners, Email not available !\n" "\n" diff --git a/addons/account_invoice_layout/i18n/account_invoice_layout.pot b/addons/account_invoice_layout/i18n/account_invoice_layout.pot index f274428d5e0..abd84e47d10 100755 --- a/addons/account_invoice_layout/i18n/account_invoice_layout.pot +++ b/addons/account_invoice_layout/i18n/account_invoice_layout.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:24+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:24+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:51+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:51+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -95,7 +95,7 @@ msgstr "" #. module: account_invoice_layout #: report:account.invoice.layout:0 #: report:notify_account.invoice:0 -msgid "Document" +msgid "Tel. :" msgstr "" #. module: account_invoice_layout @@ -125,8 +125,9 @@ msgid "Product" msgstr "" #. module: account_invoice_layout -#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form -msgid "Write Messages" +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Description" msgstr "" #. module: account_invoice_layout @@ -148,7 +149,6 @@ msgstr "" #. module: account_invoice_layout #: report:account.invoice.layout:0 -#: report:notify_account.invoice:0 msgid "Taxes:" msgstr "" @@ -158,8 +158,8 @@ msgid "Source Account" msgstr "" #. module: account_invoice_layout -#: view:account.invoice.special.msg:0 -msgid "Cancel" +#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form +msgid "Write Messages" msgstr "" #. module: account_invoice_layout @@ -193,19 +193,17 @@ msgstr "" #. module: account_invoice_layout #: report:account.invoice.layout:0 #: report:notify_account.invoice:0 -msgid "Partner Ref." -msgstr "" - -#. module: account_invoice_layout -#: report:account.invoice.layout:0 -#: model:ir.model,name:account_invoice_layout.model_account_invoice -#: report:notify_account.invoice:0 -msgid "Invoice" +msgid "Refund" msgstr "" #. module: account_invoice_layout #: report:account.invoice.layout:0 #: report:notify_account.invoice:0 +msgid "Fax :" +msgstr "" + +#. module: account_invoice_layout +#: report:account.invoice.layout:0 msgid "Total:" msgstr "" @@ -237,9 +235,18 @@ msgid "Amount" msgstr "" #. module: account_invoice_layout -#: report:account.invoice.layout:0 +#: model:notify.message,msg:account_invoice_layout.demo_message1 +msgid "ERP & CRM Solutions..." +msgstr "" + +#. module: account_invoice_layout #: report:notify_account.invoice:0 -msgid "Tel. :" +msgid "Net Total :" +msgstr "" + +#. module: account_invoice_layout +#: report:notify_account.invoice:0 +msgid "Total :" msgstr "" #. module: account_invoice_layout @@ -261,7 +268,7 @@ msgstr "" #. module: account_invoice_layout #: report:account.invoice.layout:0 #: report:notify_account.invoice:0 -msgid "Refund" +msgid "Origin" msgstr "" #. module: account_invoice_layout @@ -274,6 +281,12 @@ msgstr "" msgid "Separator Line" msgstr "" +#. module: account_invoice_layout +#: report:account.invoice.layout:0 +#: report:notify_account.invoice:0 +msgid "Your Reference" +msgstr "" + #. module: account_invoice_layout #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information msgid "Invoices Layout Improvement" @@ -303,7 +316,6 @@ msgstr "" #. module: account_invoice_layout #: report:account.invoice.layout:0 -#: report:notify_account.invoice:0 msgid "Net Total:" msgstr "" @@ -314,13 +326,14 @@ msgstr "" #. module: account_invoice_layout #: report:account.invoice.layout:0 +#: model:ir.model,name:account_invoice_layout.model_account_invoice #: report:notify_account.invoice:0 -msgid "Fax :" +msgid "Invoice" msgstr "" #. module: account_invoice_layout -#: model:notify.message,msg:account_invoice_layout.demo_message1 -msgid "Be Expert with the Experts..." +#: view:account.invoice.special.msg:0 +msgid "Cancel" msgstr "" #. module: account_invoice_layout @@ -334,6 +347,11 @@ msgstr "" msgid "Message" msgstr "" +#. module: account_invoice_layout +#: report:notify_account.invoice:0 +msgid "Taxes :" +msgstr "" + #. module: account_invoice_layout #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form msgid "All Notification Messages" diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot index 0a27f881a59..aa930d5ecf2 100755 --- a/addons/account_payment/i18n/account_payment.pot +++ b/addons/account_payment/i18n/account_payment.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:25+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:25+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:52+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:52+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -246,7 +246,7 @@ msgid "Choose an option for the Payment Order:'Fixed' stands for a date specifie msgstr "" #. module: account_payment -#: code:addons/account_payment/account_move_line.py:0 +#: code:addons/account_payment/account_move_line.py:110 #, python-format msgid "Error !" msgstr "" @@ -394,7 +394,7 @@ msgid "The successor message of Communication." msgstr "" #. module: account_payment -#: code:addons/account_payment/account_move_line.py:0 +#: code:addons/account_payment/account_move_line.py:110 #, python-format msgid "No partner defined on entry line" msgstr "" @@ -450,6 +450,12 @@ msgstr "" msgid "Search" msgstr "" +#. module: account_payment +#: model:ir.actions.report.xml,name:account_payment.payment_order1 +#: model:ir.model,name:account_payment.model_payment_order +msgid "Payment Order" +msgstr "" + #. module: account_payment #: field:payment.line,date:0 msgid "Payment Date" @@ -552,9 +558,8 @@ msgid "Information" msgstr "" #. module: account_payment -#: model:ir.actions.report.xml,name:account_payment.payment_order1 -#: model:ir.model,name:account_payment.model_payment_order -msgid "Payment Order" +#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree +msgid "A payment order is a payment request from your company to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for." msgstr "" #. module: account_payment @@ -662,11 +667,6 @@ msgstr "" msgid "Total" msgstr "" -#. module: account_payment -#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree -msgid "A payment order is a payment request that your company does in order to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for." -msgstr "" - #. module: account_payment #: view:account.payment.make.payment:0 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment diff --git a/addons/account_payment/security/account_payment_security.xml b/addons/account_payment/security/account_payment_security.xml index 5977ea36365..dcd2826a65f 100755 --- a/addons/account_payment/security/account_payment_security.xml +++ b/addons/account_payment/security/account_payment_security.xml @@ -10,7 +10,7 @@ Payment Mode company rule - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py index b8328aee333..eb0d8b21926 100755 --- a/addons/account_payment/wizard/account_payment_order.py +++ b/addons/account_payment/wizard/account_payment_order.py @@ -65,7 +65,7 @@ class payment_order_create(osv.osv_memory): data = self.read(cr, uid, ids, [], context=context)[0] line_ids = data['entries'] if not line_ids: - return {} + return {'type': 'ir.actions.act_window_close'} payment = order_obj.browse(cr, uid, context['active_id'], context=context) t = None @@ -90,7 +90,7 @@ class payment_order_create(osv.osv_memory): 'date': date_to_pay, 'currency': line.invoice and line.invoice.currency_id.id or False, }, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} def search_entries(self, cr, uid, ids, context=None): line_obj = self.pool.get('account.move.line') diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py index 6627ffaa614..ca9311b1f88 100755 --- a/addons/account_payment/wizard/account_payment_pay.py +++ b/addons/account_payment/wizard/account_payment_pay.py @@ -37,7 +37,7 @@ class account_payment_make_payment(osv.osv_memory): # obj_act = self.pool.get('ir.actions.act_window') # order = obj_payment_order.browse(cr, uid, context['active_id'], context) obj_payment_order.set_done(cr, uid, [context['active_id']], context) - return {} + return {'type': 'ir.actions.act_window_close'} # t = order.mode and order.mode.type.code or 'manual' # if t == 'manual': # obj_payment_order.set_done(cr,uid,context['active_id'],context) diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py index f99189a8444..340ab4bcb03 100755 --- a/addons/account_payment/wizard/account_payment_populate_statement.py +++ b/addons/account_payment/wizard/account_payment_populate_statement.py @@ -65,7 +65,7 @@ class account_payment_populate_statement(osv.osv_memory): data = self.read(cr, uid, ids, [], context=context)[0] line_ids = data['lines'] if not line_ids: - return {} + return {'type': 'ir.actions.act_window_close'} statement = statement_obj.browse(cr, uid, context['active_id'], context=context) diff --git a/addons/account_sequence/i18n/account_sequence.pot b/addons/account_sequence/i18n/account_sequence.pot index 4d32e3e4cc2..780ca71b05d 100755 --- a/addons/account_sequence/i18n/account_sequence.pot +++ b/addons/account_sequence/i18n/account_sequence.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:25+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:25+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:52+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:52+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot index d08e78fa72a..69baf8d1bad 100755 --- a/addons/account_voucher/i18n/account_voucher.pot +++ b/addons/account_voucher/i18n/account_voucher.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:26+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:26+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:53+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:53+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgid "Unreconciliation transactions" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:0 +#: code:addons/account_voucher/account_voucher.py:259 #, python-format msgid "Write-Off" msgstr "" @@ -36,6 +36,11 @@ msgstr "" msgid "Open Customer Journal Entries" msgstr "" +#. module: account_voucher +#: view:sale.receipt.report:0 +msgid "Voucher Date" +msgstr "" + #. module: account_voucher #: report:voucher.print:0 msgid "Particulars" @@ -43,11 +48,12 @@ msgstr "" #. module: account_voucher #: view:account.voucher:0 +#: view:sale.receipt.report:0 msgid "Group By..." msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:0 +#: code:addons/account_voucher/account_voucher.py:607 #, python-format msgid "Cannot delete Voucher(s) which are already opened or paid !" msgstr "" @@ -79,13 +85,14 @@ msgid "Bill Payment" msgstr "" #. module: account_voucher -#: field:account.voucher.line,amount_original:0 -msgid "Originial Amount" +#: code:addons/account_voucher/account_voucher.py:753 +#, python-format +msgid "You have to configure account base code and account tax code on the '%s' tax!" msgstr "" #. module: account_voucher #: view:account.statement.from.invoice.lines:0 -#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:0 +#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:182 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines #, python-format msgid "Import Entries" @@ -96,6 +103,11 @@ msgstr "" msgid "Account voucher unreconcile" msgstr "" +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "March" +msgstr "" + #. module: account_voucher #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt msgid "When you sell products to a customer, you can give him a sales receipt or an invoice. When the sales receipt is confirmed, it creates journal items automatically and you can record the customer payment related to this sales receipt." @@ -109,6 +121,8 @@ msgstr "" #. module: account_voucher #: field:account.voucher,company_id:0 #: field:account.voucher.line,company_id:0 +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,company_id:0 msgid "Company" msgstr "" @@ -118,8 +132,8 @@ msgid "Set to Draft" msgstr "" #. module: account_voucher -#: field:account.voucher,comment:0 -msgid "Write-Off Comment" +#: help:account.voucher,reference:0 +msgid "Transaction reference number." msgstr "" #. module: account_voucher @@ -137,6 +151,12 @@ msgstr "" msgid "Validate" msgstr "" +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,day:0 +msgid "Day" +msgstr "" + #. module: account_voucher #: view:account.voucher:0 msgid "Search Vouchers" @@ -144,12 +164,14 @@ msgstr "" #. module: account_voucher #: selection:account.voucher,type:0 +#: selection:sale.receipt.report,type:0 msgid "Purchase" msgstr "" #. module: account_voucher #: field:account.voucher,account_id:0 #: field:account.voucher.line,account_id:0 +#: field:sale.receipt.report,account_id:0 msgid "Account" msgstr "" @@ -163,9 +185,16 @@ msgstr "" msgid "Ok" msgstr "" +#. module: account_voucher +#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all +msgid "From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs." +msgstr "" + #. module: account_voucher #: field:account.voucher,date_due:0 #: field:account.voucher.line,date_due:0 +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,date_due:0 msgid "Due Date" msgstr "" @@ -186,6 +215,7 @@ msgstr "" #. module: account_voucher #: selection:account.voucher,type:0 +#: selection:sale.receipt.report,type:0 msgid "Sale" msgstr "" @@ -217,11 +247,12 @@ msgstr "" #. module: account_voucher #: view:account.voucher:0 -msgid "Bill Information" +msgid "Other Information" msgstr "" #. module: account_voucher #: selection:account.voucher,state:0 +#: selection:sale.receipt.report,state:0 msgid "Cancelled" msgstr "" @@ -257,6 +288,12 @@ msgstr "" msgid "Amount (in words) :" msgstr "" +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,nbr:0 +msgid "# of Voucher Lines" +msgstr "" + #. module: account_voucher #: field:account.voucher.line,account_analytic_id:0 msgid "Analytic Account" @@ -282,9 +319,7 @@ msgstr "" #. module: account_voucher #: view:account.voucher:0 -#: field:account.voucher,partner_id:0 -#: field:account.voucher.line,partner_id:0 -msgid "Partner" +msgid "Paid Amount" msgstr "" #. module: account_voucher @@ -293,18 +328,13 @@ msgid "Import Invoices" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:0 -#, python-format -msgid "You have to configure account base code and account tax code on the '%s' tax!" -msgstr "" - -#. module: account_voucher -#: selection:account.voucher,pay_now:0 -msgid "Pay Later or Group Funds" +#: report:voucher.print:0 +msgid "Account :" msgstr "" #. module: account_voucher #: selection:account.voucher,type:0 +#: selection:sale.receipt.report,type:0 msgid "Receipt" msgstr "" @@ -337,6 +367,7 @@ msgstr "" #. module: account_voucher #: view:account.voucher:0 #: field:account.voucher,state:0 +#: view:sale.receipt.report:0 msgid "State" msgstr "" @@ -345,6 +376,17 @@ msgstr "" msgid "Accounting Voucher Entries" msgstr "" +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,type:0 +msgid "Type" +msgstr "" + +#. module: account_voucher +#: field:account.voucher.unreconcile,remove:0 +msgid "Want to remove accounting entries too ?" +msgstr "" + #. module: account_voucher #: view:account.voucher:0 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open @@ -352,7 +394,7 @@ msgid "Voucher Entries" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:0 +#: code:addons/account_voucher/account_voucher.py:656 #, python-format msgid "Error !" msgstr "" @@ -380,14 +422,19 @@ msgid "Sales Receipt" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:0 +#: code:addons/account_voucher/account_voucher.py:607 #, python-format msgid "Invalid action !" msgstr "" #. module: account_voucher #: view:account.voucher:0 -msgid "Other Information" +msgid "Bill Information" +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "July" msgstr "" #. module: account_voucher @@ -400,15 +447,21 @@ msgstr "" msgid "Tax Amount" msgstr "" +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,due_delay:0 +msgid "Avg. Due Delay" +msgstr "" + #. module: account_voucher #: view:account.invoice:0 -#: code:addons/account_voucher/invoice.py:0 +#: code:addons/account_voucher/invoice.py:32 #, python-format msgid "Pay Invoice" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:0 +#: code:addons/account_voucher/account_voucher.py:753 #, python-format msgid "No Account Base Code and Account Tax Code!" msgstr "" @@ -425,7 +478,11 @@ msgstr "" #. module: account_voucher #: view:account.voucher:0 -msgid "Paid Amount" +#: field:account.voucher,partner_id:0 +#: field:account.voucher.line,partner_id:0 +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,partner_id:0 +msgid "Partner" msgstr "" #. module: account_voucher @@ -439,8 +496,13 @@ msgid "The amount of the voucher must be the same amount as the one on the state msgstr "" #. module: account_voucher -#: selection:account.voucher,pay_now:0 -msgid "Pay Directly" +#: view:account.voucher:0 +msgid "To Review" +msgstr "" + +#. module: account_voucher +#: view:account.voucher:0 +msgid "Expense Lines" msgstr "" #. module: account_voucher @@ -450,8 +512,8 @@ msgid "Invoices" msgstr "" #. module: account_voucher -#: field:account.voucher.unreconcile,remove:0 -msgid "Want to remove accounting entries too ?" +#: selection:sale.receipt.report,month:0 +msgid "December" msgstr "" #. module: account_voucher @@ -460,8 +522,15 @@ msgstr "" msgid "Voucher Lines" msgstr "" +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,month:0 +msgid "Month" +msgstr "" + #. module: account_voucher #: field:account.voucher,currency_id:0 +#: field:sale.receipt.report,currency_id:0 msgid "Currency" msgstr "" @@ -471,20 +540,35 @@ msgid "Payable and Receivables" msgstr "" #. module: account_voucher -#: report:voucher.print:0 -msgid "Account :" +#: selection:account.voucher,pay_now:0 +#: selection:sale.receipt.report,pay_now:0 +msgid "Pay Later or Group Funds" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,user_id:0 +msgid "Salesman" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,delay_to_pay:0 +msgid "Avg. Delay To Pay" msgstr "" #. module: account_voucher #: view:account.voucher:0 #: selection:account.voucher,state:0 +#: view:sale.receipt.report:0 +#: selection:sale.receipt.report,state:0 #: report:voucher.print:0 msgid "Draft" msgstr "" #. module: account_voucher -#: field:account.voucher,type:0 -msgid "Default Type" +#: field:account.voucher,writeoff_acc_id:0 +msgid "Write-Off account" msgstr "" #. module: account_voucher @@ -492,11 +576,22 @@ msgstr "" msgid "Currency:" msgstr "" +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,price_total_tax:0 +msgid "Total With Tax" +msgstr "" + #. module: account_voucher #: report:voucher.print:0 msgid "PRO-FORMA" msgstr "" +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "August" +msgstr "" + #. module: account_voucher #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment msgid "The supplier payment form allows you to track the payment you do to your suppliers. When you select a supplier, the payment method and an amount for the payment, OpenERP will propose to reconcile your payment with the open supplier invoices or bills." @@ -507,6 +602,11 @@ msgstr "" msgid "Total Amount" msgstr "" +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "June" +msgstr "" + #. module: account_voucher #: field:account.voucher.line,type:0 msgid "Cr/Dr" @@ -530,16 +630,18 @@ msgstr "" #. module: account_voucher #: field:account.voucher,date:0 #: field:account.voucher.line,date_original:0 +#: field:sale.receipt.report,date:0 msgid "Date" msgstr "" #. module: account_voucher -#: view:account.voucher:0 -msgid "Post" +#: selection:sale.receipt.report,month:0 +msgid "November" msgstr "" #. module: account_voucher #: view:account.voucher:0 +#: view:sale.receipt.report:0 msgid "Extended Filters..." msgstr "" @@ -559,8 +661,14 @@ msgid "Write-Off Analytic Account" msgstr "" #. module: account_voucher -#: view:account.voucher:0 -msgid "Expense Lines" +#: selection:account.voucher,pay_now:0 +#: selection:sale.receipt.report,pay_now:0 +msgid "Pay Directly" +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "October" msgstr "" #. module: account_voucher @@ -568,6 +676,11 @@ msgstr "" msgid "Previous Payments ?" msgstr "" +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "January" +msgstr "" + #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.action_voucher_list #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher @@ -585,11 +698,16 @@ msgid "Credit" msgstr "" #. module: account_voucher -#: code:addons/account_voucher/account_voucher.py:0 +#: code:addons/account_voucher/account_voucher.py:656 #, python-format msgid "Please define a sequence on the journal !" msgstr "" +#. module: account_voucher +#: view:account.voucher:0 +msgid "Open Supplier Journal Entries" +msgstr "" + #. module: account_voucher #: report:voucher.print:0 msgid "Through :" @@ -602,8 +720,8 @@ msgid "Supplier Payment" msgstr "" #. module: account_voucher -#: help:account.voucher,reference:0 -msgid "Transaction reference number." +#: view:account.voucher:0 +msgid "Post" msgstr "" #. module: account_voucher @@ -611,6 +729,12 @@ msgstr "" msgid "Invoices and outstanding transactions" msgstr "" +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,price_total:0 +msgid "Total Without Tax" +msgstr "" + #. module: account_voucher #: view:account.voucher:0 msgid "Bill Date" @@ -638,8 +762,8 @@ msgid "Bank Statement" msgstr "" #. module: account_voucher -#: view:account.voucher:0 -msgid "To Review" +#: selection:sale.receipt.report,month:0 +msgid "September" msgstr "" #. module: account_voucher @@ -647,6 +771,13 @@ msgstr "" msgid "Sales Information" msgstr "" +#. module: account_voucher +#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all +#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all +#: view:sale.receipt.report:0 +msgid "Sales Receipt Analysis" +msgstr "" + #. module: account_voucher #: field:account.voucher.line,voucher_id:0 #: model:res.request.link,name:account_voucher.req_link_voucher @@ -673,6 +804,8 @@ msgstr "" #. module: account_voucher #: selection:account.voucher,state:0 +#: view:sale.receipt.report:0 +#: selection:sale.receipt.report,state:0 msgid "Pro-forma" msgstr "" @@ -737,10 +870,17 @@ msgstr "" msgid "Canceled" msgstr "" +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "May" +msgstr "" + #. module: account_voucher #: field:account.statement.from.invoice,journal_ids:0 #: view:account.voucher:0 #: field:account.voucher,journal_id:0 +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,journal_id:0 msgid "Journal" msgstr "" @@ -755,6 +895,11 @@ msgstr "" msgid "Credits" msgstr "" +#. module: account_voucher +#: field:account.voucher.line,amount_original:0 +msgid "Original Amount" +msgstr "" + #. module: account_voucher #: report:voucher.print:0 msgid "State:" @@ -766,12 +911,16 @@ msgstr "" #: view:account.voucher:0 #: field:account.voucher,pay_now:0 #: selection:account.voucher,type:0 +#: field:sale.receipt.report,pay_now:0 +#: selection:sale.receipt.report,type:0 msgid "Payment" msgstr "" #. module: account_voucher #: view:account.voucher:0 #: selection:account.voucher,state:0 +#: view:sale.receipt.report:0 +#: selection:sale.receipt.report,state:0 #: report:voucher.print:0 msgid "Posted" msgstr "" @@ -782,8 +931,8 @@ msgid "Customer" msgstr "" #. module: account_voucher -#: field:account.voucher,writeoff_acc_id:0 -msgid "Write-Off account" +#: selection:sale.receipt.report,month:0 +msgid "February" msgstr "" #. module: account_voucher @@ -792,8 +941,18 @@ msgid "Supplier Invoices and Outstanding transactions" msgstr "" #. module: account_voucher -#: view:account.voucher:0 -msgid "Open Supplier Journal Entries" +#: field:account.voucher,comment:0 +msgid "Write-Off Comment" +msgstr "" + +#. module: account_voucher +#: selection:sale.receipt.report,month:0 +msgid "April" +msgstr "" + +#. module: account_voucher +#: field:account.voucher,type:0 +msgid "Default Type" msgstr "" #. module: account_voucher @@ -807,6 +966,11 @@ msgstr "" msgid "Account Entry" msgstr "" +#. module: account_voucher +#: field:sale.receipt.report,state:0 +msgid "Voucher State" +msgstr "" + #. module: account_voucher #: help:account.voucher,date:0 msgid "Effective date for accounting entries" @@ -827,6 +991,17 @@ msgstr "" msgid "Untax Amount" msgstr "" +#. module: account_voucher +#: model:ir.model,name:account_voucher.model_sale_receipt_report +msgid "Sales Receipt Statistics" +msgstr "" + +#. module: account_voucher +#: view:sale.receipt.report:0 +#: field:sale.receipt.report,year:0 +msgid "Year" +msgstr "" + #. module: account_voucher #: view:account.voucher:0 #: field:account.voucher.line,amount_unreconciled:0 diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py index cef854aa953..06511c9a118 100755 --- a/addons/account_voucher/report/account_voucher_sales_receipt.py +++ b/addons/account_voucher/report/account_voucher_sales_receipt.py @@ -17,11 +17,8 @@ # along with this program. If not, see . # ############################################################################## -import time from osv import fields, osv -import pooler -from tools import config import tools class sale_receipt_report(osv.osv): diff --git a/addons/account_voucher/security/account_voucher_security.xml b/addons/account_voucher/security/account_voucher_security.xml index df4e58484b5..d368ab858ed 100755 --- a/addons/account_voucher/security/account_voucher_security.xml +++ b/addons/account_voucher/security/account_voucher_security.xml @@ -5,13 +5,13 @@ Voucher multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Voucher Line multi-company - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py index a75513b02fc..f3ce59f7b0b 100755 --- a/addons/account_voucher/wizard/account_statement_from_invoice.py +++ b/addons/account_voucher/wizard/account_statement_from_invoice.py @@ -39,11 +39,11 @@ class account_statement_from_invoice_lines(osv.osv_memory): context = {} statement_id = context.get('statement_id', False) if not statement_id: - return {} + return {'type': 'ir.actions.act_window_close'} data = self.read(cr, uid, ids, context=context)[0] line_ids = data['line_ids'] if not line_ids: - return {} + return {'type': 'ir.actions.act_window_close'} line_obj = self.pool.get('account.move.line') statement_obj = self.pool.get('account.bank.statement') @@ -115,7 +115,7 @@ class account_statement_from_invoice_lines(osv.osv_memory): 'voucher_id': voucher_id, 'date': time.strftime('%Y-%m-%d'), #time.strftime('%Y-%m-%d'), #line.date_maturity or, }, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} account_statement_from_invoice_lines() diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py index 2bfdfd1ecf8..42a9e1c5ec2 100755 --- a/addons/account_voucher/wizard/account_voucher_unreconcile.py +++ b/addons/account_voucher/wizard/account_voucher_unreconcile.py @@ -55,7 +55,7 @@ class account_voucher_unreconcile(osv.osv_memory): # wf_service = netsvc.LocalService("workflow") # wf_service.trg_validate(uid, 'account.voucher', context.get('active_id'), 'cancel_voucher', cr) - return {} + return {'type': 'ir.actions.act_window_close'} account_voucher_unreconcile() diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot index b7168d550db..19aa2f7a86e 100755 --- a/addons/analytic/i18n/analytic.pot +++ b/addons/analytic/i18n/analytic.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:26+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:26+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:53+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:53+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -166,6 +166,11 @@ msgstr "" msgid "Contact" msgstr "" +#. module: analytic +#: constraint:account.analytic.account:0 +msgid "Error! The currency has to be the same as the currency of the selected company" +msgstr "" + #. module: analytic #: selection:account.analytic.account,state:0 msgid "Cancelled" diff --git a/addons/analytic/security/analytic_security.xml b/addons/analytic/security/analytic_security.xml index dfa8c840bb6..58a687fee1b 100755 --- a/addons/analytic/security/analytic_security.xml +++ b/addons/analytic/security/analytic_security.xml @@ -5,7 +5,7 @@ Analytic multi company rule - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] Useability / Analytic Accounting diff --git a/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot b/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot index b60207b0480..5e03dbc4dc4 100755 --- a/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot +++ b/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:27+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:27+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:54+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:54+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -31,6 +31,11 @@ msgstr "" msgid "Analytic Journal" msgstr "" +#. module: analytic_journal_billing_rate +#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice +msgid "Invoice" +msgstr "" + #. module: analytic_journal_billing_rate #: view:analytic_journal_rate_grid:0 msgid "Billing Rate per Journal for this Analytic Account" @@ -58,8 +63,8 @@ msgid "Analytic Journal Billing Rate, Define the default invoicing rate for a sp msgstr "" #. module: analytic_journal_billing_rate -#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice -msgid "Invoice" +#: constraint:account.analytic.account:0 +msgid "Error! The currency has to be the same as the currency of the selected company" msgstr "" #. module: analytic_journal_billing_rate diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot index ff2e4d75cf5..3a8e9b34445 100755 --- a/addons/analytic_user_function/i18n/analytic_user_function.pot +++ b/addons/analytic_user_function/i18n/analytic_user_function.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:27+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:27+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:54+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:54+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,7 +21,8 @@ msgid "Product" msgstr "" #. module: analytic_user_function -#: code:addons/analytic_user_function/analytic_user_function.py:0 +#: code:addons/analytic_user_function/analytic_user_function.py:96 +#: code:addons/analytic_user_function/analytic_user_function.py:131 #, python-format msgid "Error !" msgstr "" @@ -49,7 +50,13 @@ msgid "User" msgstr "" #. module: analytic_user_function -#: code:addons/analytic_user_function/analytic_user_function.py:0 +#: constraint:account.analytic.account:0 +msgid "Error! The currency has to be the same as the currency of the selected company" +msgstr "" + +#. module: analytic_user_function +#: code:addons/analytic_user_function/analytic_user_function.py:97 +#: code:addons/analytic_user_function/analytic_user_function.py:132 #, python-format msgid "There is no expense account define for this product: \"%s\" (id:%d)" msgstr "" diff --git a/addons/association/i18n/association.pot b/addons/association/i18n/association.pot index 589397256a6..edea687c40c 100755 --- a/addons/association/i18n/association.pot +++ b/addons/association/i18n/association.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:27+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:27+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:54+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:54+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot index 66c5eb6c020..feb73c38a3a 100755 --- a/addons/auction/i18n/auction.pot +++ b/addons/auction/i18n/auction.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:30+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:30+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:57+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:57+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -292,13 +292,13 @@ msgid "Object Image" msgstr "" #. module: auction -#: code:addons/auction/wizard/auction_lots_buyer_map.py:0 +#: code:addons/auction/wizard/auction_lots_buyer_map.py:70 #, python-format msgid "No buyer is set for this lot." msgstr "" #. module: auction -#: code:addons/auction/auction.py:0 +#: code:addons/auction/auction.py:578 #, python-format msgid "The Buyer \"%s\" has no Invoice Address." msgstr "" @@ -373,7 +373,7 @@ msgid "June" msgstr "" #. module: auction -#: code:addons/auction/wizard/auction_catalog_flagey_report.py:0 +#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63 #, python-format msgid "No Lots belong to this Auction Date" msgstr "" @@ -501,7 +501,8 @@ msgid "Payment" msgstr "" #. module: auction -#: code:addons/auction/auction.py:0 +#: code:addons/auction/auction.py:571 +#: code:addons/auction/auction.py:686 #, python-format msgid "The object \"%s\" has no buyer assigned." msgstr "" @@ -644,8 +645,9 @@ msgid "Account tax for seller" msgstr "" #. module: auction -#: code:addons/auction/wizard/auction_lots_invoice.py:0 -#: code:addons/auction/wizard/auction_lots_numerotate.py:0 +#: code:addons/auction/wizard/auction_lots_invoice.py:68 +#: code:addons/auction/wizard/auction_lots_numerotate.py:103 +#: code:addons/auction/wizard/auction_lots_numerotate.py:129 #, python-format msgid "UserError" msgstr "" @@ -691,6 +693,11 @@ msgstr "" msgid "Type" msgstr "" +#. module: auction +#: help:aie.category,child_ids:0 +msgid "children aie category" +msgstr "" + #. module: auction #: help:auction.lots,ach_emp:0 msgid "When state is Taken Away, this field is marked as True" @@ -788,7 +795,7 @@ msgid "(Keep empty for automatic number)" msgstr "" #. module: auction -#: code:addons/auction/auction.py:0 +#: code:addons/auction/auction.py:578 #, python-format msgid "No Invoice Address" msgstr "" @@ -799,7 +806,8 @@ msgid "Bailiffs Listing" msgstr "" #. module: auction -#: code:addons/auction/wizard/auction_lots_numerotate.py:0 +#: code:addons/auction/wizard/auction_lots_numerotate.py:103 +#: code:addons/auction/wizard/auction_lots_numerotate.py:129 #, python-format msgid "This record does not exist !" msgstr "" @@ -1050,15 +1058,19 @@ msgid "Invoice Number" msgstr "" #. module: auction -#: code:addons/auction/wizard/auction_lots_buyer_map.py:0 -#: code:addons/auction/wizard/auction_lots_numerotate.py:0 +#: code:addons/auction/wizard/auction_lots_buyer_map.py:87 +#: code:addons/auction/wizard/auction_lots_numerotate.py:77 +#: code:addons/auction/wizard/auction_lots_numerotate.py:95 +#: code:addons/auction/wizard/auction_lots_numerotate.py:122 +#: code:addons/auction/wizard/auction_lots_numerotate.py:137 +#: code:addons/auction/wizard/auction_lots_numerotate.py:173 #, python-format msgid "Active IDs not Found" msgstr "" #. module: auction -#: code:addons/auction/wizard/auction_aie_send.py:0 -#: code:addons/auction/wizard/auction_aie_send_result.py:0 +#: code:addons/auction/wizard/auction_aie_send.py:167 +#: code:addons/auction/wizard/auction_aie_send_result.py:117 #, python-format msgid "Connection to WWW.Auction-in-Europe.com failed !" msgstr "" @@ -1087,7 +1099,7 @@ msgid "Depositer Inventory" msgstr "" #. module: auction -#: code:addons/auction/auction.py:0 +#: code:addons/auction/auction.py:692 #, python-format msgid "The Buyer has no Invoice Address." msgstr "" @@ -1301,7 +1313,7 @@ msgid "Deposit Date" msgstr "" #. module: auction -#: code:addons/auction/wizard/auction_lots_numerotate.py:0 +#: code:addons/auction/wizard/auction_lots_numerotate.py:145 #, python-format msgid "This lot does not exist !" msgstr "" @@ -1361,7 +1373,7 @@ msgid "Auction Analysis" msgstr "" #. module: auction -#: code:addons/auction/wizard/auction_pay_buy.py:0 +#: code:addons/auction/wizard/auction_pay_buy.py:80 #, python-format msgid "Payment aborted !" msgstr "" @@ -1439,11 +1451,6 @@ msgstr "" msgid "Lot" msgstr "" -#. module: auction -#: help:aie.category,child_ids:0 -msgid "children aie category" -msgstr "" - #. module: auction #: model:ir.model,name:auction.model_auction_artists msgid "auction.artists" @@ -1529,7 +1536,8 @@ msgid "Last exposition date for auction" msgstr "" #. module: auction -#: code:addons/auction/auction.py:0 +#: code:addons/auction/auction.py:571 +#: code:addons/auction/auction.py:686 #, python-format msgid "Missed buyer !" msgstr "" @@ -1545,7 +1553,7 @@ msgid "Auction manager " msgstr "" #. module: auction -#: code:addons/auction/wizard/auction_lots_invoice.py:0 +#: code:addons/auction/wizard/auction_lots_invoice.py:68 #, python-format msgid "Two different buyers for the same invoice !\n" "Please correct this problem before invoicing" @@ -1774,8 +1782,8 @@ msgid "Net revenue" msgstr "" #. module: auction -#: code:addons/auction/wizard/auction_catalog_flagey_report.py:0 -#: code:addons/auction/wizard/auction_pay_buy.py:0 +#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63 +#: code:addons/auction/wizard/auction_pay_buy.py:87 #, python-format msgid "Error!" msgstr "" @@ -1911,7 +1919,7 @@ msgid "Configuration" msgstr "" #. module: auction -#: code:addons/auction/wizard/auction_pay_buy.py:0 +#: code:addons/auction/wizard/auction_pay_buy.py:80 #, python-format msgid "You should pay all the total: \"%.2f\" are missing to accomplish the payment." msgstr "" @@ -2044,7 +2052,7 @@ msgid "Payment Lines" msgstr "" #. module: auction -#: code:addons/auction/auction.py:0 +#: code:addons/auction/auction.py:692 #, python-format msgid "Missed Address !" msgstr "" @@ -2081,10 +2089,10 @@ msgid "Auction Date:" msgstr "" #. module: auction -#: code:addons/auction/wizard/auction_aie_send.py:0 -#: code:addons/auction/wizard/auction_aie_send_result.py:0 -#: code:addons/auction/wizard/auction_lots_buyer_map.py:0 -#: code:addons/auction/wizard/auction_lots_numerotate.py:0 +#: code:addons/auction/wizard/auction_aie_send.py:167 +#: code:addons/auction/wizard/auction_aie_send_result.py:116 +#: code:addons/auction/wizard/auction_lots_buyer_map.py:70 +#: code:addons/auction/wizard/auction_lots_numerotate.py:145 #, python-format msgid "Error" msgstr "" @@ -2167,7 +2175,7 @@ msgid "Objects Description" msgstr "" #. module: auction -#: code:addons/auction/wizard/auction_pay_buy.py:0 +#: code:addons/auction/wizard/auction_pay_buy.py:87 #, python-format msgid "No auction date for \"%s\": Please set one." msgstr "" diff --git a/addons/auction/wizard/auction_aie_send.py b/addons/auction/wizard/auction_aie_send.py index 7c904cf850b..1caec13b852 100755 --- a/addons/auction/wizard/auction_aie_send.py +++ b/addons/auction/wizard/auction_aie_send.py @@ -220,7 +220,7 @@ class auction_lots_send_aie(osv.osv_memory): def send_pdf(self, cr, uid, ids, context=None): threaded_calculation = threading.Thread(target=self._send, args=(cr, uid, ids, context)) threaded_calculation.start() - return {} + return {'type': 'ir.actions.act_window_close'} auction_lots_send_aie() diff --git a/addons/auction/wizard/auction_aie_send_result.py b/addons/auction/wizard/auction_aie_send_result.py index 5b2b4eca7fd..d6102dd0522 100755 --- a/addons/auction/wizard/auction_aie_send_result.py +++ b/addons/auction/wizard/auction_aie_send_result.py @@ -137,7 +137,7 @@ class auction_lots_pay(osv.osv_memory): lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context['active_ids'], ['obj_num','obj_price']) args = pickle.dumps(lots) self._catalog_send(datas['uname'], datas['password'], datas['dates'], args) - return {} + return {'type': 'ir.actions.act_window_close'} auction_lots_pay() diff --git a/addons/auction/wizard/auction_lots_able.py b/addons/auction/wizard/auction_lots_able.py index 369d762727a..8604d691456 100755 --- a/addons/auction/wizard/auction_lots_able.py +++ b/addons/auction/wizard/auction_lots_able.py @@ -41,6 +41,6 @@ class auction_lots_able(osv.osv_memory): if context is None: context = {} self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'ach_emp':True}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_lots_able() diff --git a/addons/auction/wizard/auction_lots_auction_move.py b/addons/auction/wizard/auction_lots_auction_move.py index 97330f922fe..cc698887afd 100755 --- a/addons/auction/wizard/auction_lots_auction_move.py +++ b/addons/auction/wizard/auction_lots_auction_move.py @@ -52,7 +52,7 @@ class auction_lots_auction_move(osv.osv_memory): rec_ids = auction_lots_obj.browse(cr, uid, context.get('active_ids', [])) for current in self.browse(cr, uid, ids, context=context): if not (current.auction_id and len(context.get('active_ids', []))): - return {} + return {'type': 'ir.actions.act_window_close'} for rec in rec_ids: new_id = auction_lot_history_obj.create(cr, uid, { @@ -70,7 +70,7 @@ class auction_lots_auction_move(osv.osv_memory): 'sel_inv_id': None, 'obj_num': None, 'state': 'draft'}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_lots_auction_move() diff --git a/addons/auction/wizard/auction_lots_buyer_map.py b/addons/auction/wizard/auction_lots_buyer_map.py index e50f11fd1ec..436d51a66c7 100755 --- a/addons/auction/wizard/auction_lots_buyer_map.py +++ b/addons/auction/wizard/auction_lots_buyer_map.py @@ -90,7 +90,7 @@ class wiz_auc_lots_buyer_map(osv.osv_memory): for lots in lots_obj.browse(cr, uid, rec_ids, context=context): if lots.ach_login == current.ach_login: lots_obj.write(cr, uid, [lots.id], {'ach_uid': current.ach_uid.id}, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): diff --git a/addons/auction/wizard/auction_lots_cancel.py b/addons/auction/wizard/auction_lots_cancel.py index 62313315bd9..3974241a071 100755 --- a/addons/auction/wizard/auction_lots_cancel.py +++ b/addons/auction/wizard/auction_lots_cancel.py @@ -49,7 +49,7 @@ class auction_lots_cancel(osv.osv): supplier_refund_inv_id = invoice_obj.refund(cr, uid, [lot.ach_inv_id.id]) if lot.sel_inv_id: customer_refund_inv_id = invoice_obj.refund(cr, uid, [lot.sel_inv_id.id]) - return {} + return {'type': 'ir.actions.act_window_close'} _columns = { } diff --git a/addons/auction/wizard/auction_lots_enable.py b/addons/auction/wizard/auction_lots_enable.py index ed6b8950d2e..290664ba697 100755 --- a/addons/auction/wizard/auction_lots_enable.py +++ b/addons/auction/wizard/auction_lots_enable.py @@ -38,6 +38,6 @@ class auction_lots_enable(osv.osv_memory): if context is None: context = {} self.pool.get('auction.lots').write(cr, uid, context.get('active_id',False), {'ach_emp':False}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_lots_enable() diff --git a/addons/auction/wizard/auction_lots_numerotate.py b/addons/auction/wizard/auction_lots_numerotate.py index 0712e21565e..22bdac5a67f 100755 --- a/addons/auction/wizard/auction_lots_numerotate.py +++ b/addons/auction/wizard/auction_lots_numerotate.py @@ -178,7 +178,7 @@ class auction_lots_numerotate(osv.osv_memory): for rec_id in rec_ids: lots_obj.write(cr, uid, [rec_id.id], {'obj_num':nbr}) nbr+=1 - return {} + return {'type': 'ir.actions.act_window_close'} auction_lots_numerotate() diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py index dfad93dc759..b914dd1c643 100755 --- a/addons/auction/wizard/auction_pay_buy.py +++ b/addons/auction/wizard/auction_pay_buy.py @@ -100,7 +100,7 @@ class auction_pay_buy(osv.osv_memory): }) for lot in lots: lot_obj.write(cr, uid, [lot.id], {'statement_id':[(4, new_id)]}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_pay_buy() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py index 7265a4e7f98..77484bbe988 100755 --- a/addons/auction/wizard/auction_pay_sel.py +++ b/addons/auction/wizard/auction_pay_sel.py @@ -52,6 +52,6 @@ class auction_pay_sel(osv.osv_memory): journal_id = datas.get('journal_id', False) if lot.sel_inv_id: p = invoice_obj.pay_and_reconcile(['lot.sel_inv_id.id'], datas['amount'], datas['dest_account_id'], journal_id, account_id, period_id, journal_id, context) - return {} + return {'type': 'ir.actions.act_window_close'} auction_pay_sel() diff --git a/addons/auction/wizard/auction_payer_sel.py b/addons/auction/wizard/auction_payer_sel.py index 808826cfc23..8ad2f5ca019 100755 --- a/addons/auction/wizard/auction_payer_sel.py +++ b/addons/auction/wizard/auction_payer_sel.py @@ -29,7 +29,7 @@ class auction_payer(osv.osv_memory): if context is None: context = {} self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'is_ok':True, 'state':'paid'}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_payer() @@ -50,7 +50,7 @@ class auction_payer_sel(osv.osv_memory): if context is None: context = {} self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'paid_vnd':True}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_payer_sel() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auction/wizard/auction_transfer_unsold_object.py b/addons/auction/wizard/auction_transfer_unsold_object.py index 8bc0cb8cb5b..f593a36de2e 100755 --- a/addons/auction/wizard/auction_transfer_unsold_object.py +++ b/addons/auction/wizard/auction_transfer_unsold_object.py @@ -82,6 +82,6 @@ class auction_transfer_unsold_object(osv.osv): 'ach_inv_id':None, 'sel_inv_id':None, 'state':'draft'}) - return {} + return {'type': 'ir.actions.act_window_close'} auction_transfer_unsold_object() \ No newline at end of file diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py index b744a10b3d9..2f769246bcf 100755 --- a/addons/audittrail/audittrail.py +++ b/addons/audittrail/audittrail.py @@ -20,7 +20,7 @@ ############################################################################## from osv import fields, osv -from osv.osv import osv_pool +from osv.osv import osv_pool, object_proxy from tools.translate import _ import ir import pooler @@ -184,7 +184,7 @@ class audittrail_log_line(osv.osv): audittrail_log_line() -class audittrail_objects_proxy(osv_pool): +class audittrail_objects_proxy(object_proxy): """ Uses Object proxy for auditing changes on object of subscribed Rules""" def get_value_text(self, cr, uid, field_name, values, model, context=None): diff --git a/addons/audittrail/i18n/audittrail.pot b/addons/audittrail/i18n/audittrail.pot index 2ed7f56e9cc..1aa5dbff883 100755 --- a/addons/audittrail/i18n/audittrail.pot +++ b/addons/audittrail/i18n/audittrail.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:30+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:30+0000\n" +"POT-Creation-Date: 2011-01-03 16:56:57+0000\n" +"PO-Revision-Date: 2011-01-03 16:56:57+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgid "Audit Trail" msgstr "" #. module: audittrail -#: code:addons/audittrail/audittrail.py:0 +#: code:addons/audittrail/audittrail.py:81 #, python-format msgid "WARNING: audittrail is not part of the pool" msgstr "" @@ -127,11 +127,6 @@ msgstr "" msgid "Log Lines" msgstr "" -#. module: audittrail -#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree -msgid "Rules" -msgstr "" - #. module: audittrail #: view:audittrail.log:0 #: field:audittrail.log,object_id:0 @@ -161,6 +156,7 @@ msgstr "" #. module: audittrail #: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree +#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree msgid "Audit Rules" msgstr "" @@ -223,7 +219,7 @@ msgid "Log Reads" msgstr "" #. module: audittrail -#: code:addons/audittrail/audittrail.py:0 +#: code:addons/audittrail/audittrail.py:82 #, python-format msgid "Change audittrail depends -- Setting rule as DRAFT" msgstr "" diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot index d2cf7a727e8..09909f467c6 100755 --- a/addons/base_action_rule/i18n/base_action_rule.pot +++ b/addons/base_action_rule/i18n/base_action_rule.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:45+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:45+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:13+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:13+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -71,7 +71,12 @@ msgid "Days" msgstr "" #. module: base_action_rule -#: code:addons/base_action_rule/base_action_rule.py:0 +#: field:base.action.rule,last_run:0 +msgid "Last Run" +msgstr "" + +#. module: base_action_rule +#: code:addons/base_action_rule/base_action_rule.py:313 #, python-format msgid "Error!" msgstr "" @@ -101,11 +106,6 @@ msgstr "" msgid "Check this if you want the rule to send a reminder by email to the partner." msgstr "" -#. module: base_action_rule -#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act -msgid "Create actions automatically triggered based on a user activity in the system.E.g.: an opportunity created by a specific user can be automatically maintained with a specific sales team, or an opportunity which still has status pending after 14 days triggers an automatic reminder email." -msgstr "" - #. module: base_action_rule #: view:base.action.rule:0 msgid "Conditions on Model Partner" @@ -141,6 +141,11 @@ msgstr "" msgid "State" msgstr "" +#. module: base_action_rule +#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act +msgid "Use automated actions to automatically trigger actions for various screens. Example: a lead created by a specific user may be automatically set to a specific sales team, or an opportunity which still has status pending after 14 days might trigger an automatic reminder email." +msgstr "" + #. module: base_action_rule #: help:base.action.rule,act_mail_to_email:0 msgid "Email-id of the persons whom mail is to be sent" @@ -280,7 +285,7 @@ msgid "Active" msgstr "" #. module: base_action_rule -#: code:addons/base_action_rule/base_action_rule.py:0 +#: code:addons/base_action_rule/base_action_rule.py:314 #, python-format msgid "No E-Mail ID Found for your Company address!" msgstr "" diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 0e57c7cfb66..301780282e7 100755 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -1150,8 +1150,9 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ ('weekly', 'Weeks'), ('monthly', 'Months'), ('yearly', 'Years'), ], 'Frequency'), - - 'interval': fields.integer('Interval', help="Repeat every (Days/Week/Month/Year)"), + + 'end_type' : fields.selection([('forever', 'Forever'), ('count', 'Fix amout of times'), ('end_date','End date')], 'Way to end reccurency'), + 'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"), 'count': fields.integer('Repeat', help="Repeat x times"), 'mo': fields.boolean('Mon'), 'tu': fields.boolean('Tue'), @@ -1189,6 +1190,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ return res _defaults = { + 'end_type' : 'forever', 'state': 'tentative', 'class': 'public', 'show_as': 'busy', diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index d7e949b6d06..6fcb8f72f82 100755 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -1,8 +1,7 @@ - - + calendar.attendee.form @@ -348,18 +347,21 @@ - @@ -379,13 +381,13 @@ - + + attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')], + 'invisible' : ['|', ('select1','=','day'), ('rrule_type','!=','monthly')]}" /> + attrs="{'invisible' : ['|', ('select1','=','date'), ('rrule_type','!=','monthly')]}"> \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -60,8 +60,14 @@ msgid "Invited User" msgstr "" #. module: base_calendar -#: view:base.calendar.set.exrule:0 -msgid "Select range to Exclude" +#: view:calendar.attendee:0 +msgid "Invitation" +msgstr "" + +#. module: base_calendar +#: help:calendar.event,recurrency:0 +#: help:calendar.todo,recurrency:0 +msgid "Recurrent Meeting" msgstr "" #. module: base_calendar @@ -96,12 +102,6 @@ msgstr "" msgid "Fourth" msgstr "" -#. module: base_calendar -#: help:calendar.event,count:0 -#: help:calendar.todo,count:0 -msgid "Repeat max that times" -msgstr "" - #. module: base_calendar #: field:calendar.event,show_as:0 #: field:calendar.todo,show_as:0 @@ -125,11 +125,8 @@ msgid "Public" msgstr "" #. module: base_calendar -#: selection:calendar.alarm,trigger_interval:0 -#: selection:calendar.event,freq:0 -#: selection:calendar.todo,freq:0 -#: selection:res.alarm,trigger_interval:0 -msgid "Hours" +#: view:calendar.event:0 +msgid " " msgstr "" #. module: base_calendar @@ -140,7 +137,7 @@ msgid "March" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0 +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90 #, python-format msgid "Warning !" msgstr "" @@ -179,8 +176,8 @@ msgid "Indicats whether the favor of a reply is requested" msgstr "" #. module: base_calendar -#: field:calendar.alarm,alarm_id:0 -msgid "Basic Alarm" +#: model:ir.model,name:base_calendar.model_ir_attachment +msgid "ir.attachment" msgstr "" #. module: base_calendar @@ -189,9 +186,8 @@ msgid "The users that the original request was delegated to" msgstr "" #. module: base_calendar -#: view:calendar.attendee:0 -#: field:calendar.attendee,delegated_to:0 -msgid "Delegated To" +#: field:calendar.attendee,ref:0 +msgid "Event Ref" msgstr "" #. module: base_calendar @@ -213,11 +209,6 @@ msgstr "" msgid "Tue" msgstr "" -#. module: base_calendar -#: model:ir.model,name:base_calendar.model_ir_attachment -msgid "ir.attachment" -msgstr "" - #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 #: selection:calendar.event,rrule_type:0 @@ -225,6 +216,12 @@ msgstr "" msgid "Yearly" msgstr "" +#. module: base_calendar +#: selection:calendar.alarm,trigger_related:0 +#: selection:res.alarm,trigger_related:0 +msgid "The event ends" +msgstr "" + #. module: base_calendar #: selection:base.calendar.set.exrule,byday:0 #: selection:calendar.event,byday:0 @@ -257,9 +254,11 @@ msgid "Invitation Detail" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:0 -#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:0 -#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0 +#: code:addons/base_calendar/base_calendar.py:1354 +#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96 +#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143 +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128 +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136 #, python-format msgid "Error!" msgstr "" @@ -270,13 +269,8 @@ msgid "Chair Person" msgstr "" #. module: base_calendar -#: view:calendar.event:0 -msgid "Exclude range" -msgstr "" - -#. module: base_calendar -#: view:calendar.event:0 -msgid "Select data for Custom Rule" +#: selection:calendar.alarm,action:0 +msgid "Procedure" msgstr "" #. module: base_calendar @@ -287,8 +281,6 @@ msgstr "" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 -#: selection:calendar.event,freq:0 -#: selection:calendar.todo,freq:0 #: selection:res.alarm,trigger_interval:0 msgid "Minutes" msgstr "" @@ -314,9 +306,10 @@ msgid "Secondly" msgstr "" #. module: base_calendar -#: selection:calendar.alarm,trigger_related:0 -#: selection:res.alarm,trigger_related:0 -msgid "The event ends" +#: field:calendar.alarm,event_date:0 +#: field:calendar.attendee,event_date:0 +#: view:calendar.event:0 +msgid "Event Date" msgstr "" #. module: base_calendar @@ -331,8 +324,12 @@ msgid "Provide external email address who will receive this invitation." msgstr "" #. module: base_calendar -#: help:calendar.attendee,partner_id:0 -msgid "Partner related to contact" +#: model:ir.module.module,description:base_calendar.module_meta_information +msgid "Full featured calendar system that supports:\n" +" - Calendar of events\n" +" - Alerts (create requests)\n" +" - Recurring events\n" +" - Invitations to people" msgstr "" #. module: base_calendar @@ -357,12 +354,6 @@ msgstr "" msgid "Optional Participation" msgstr "" -#. module: base_calendar -#: help:calendar.event,interval:0 -#: help:calendar.todo,interval:0 -msgid "Repeat every x" -msgstr "" - #. module: base_calendar #: field:calendar.event,date_deadline:0 #: field:calendar.todo,date_deadline:0 @@ -370,14 +361,17 @@ msgid "Deadline" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:0 +#: code:addons/base_calendar/base_calendar.py:385 +#: code:addons/base_calendar/base_calendar.py:1090 +#: code:addons/base_calendar/base_calendar.py:1092 #, python-format msgid "Warning!" msgstr "" #. module: base_calendar -#: view:base.calendar.set.exrule:0 -msgid "_Cancel" +#: help:calendar.event,active:0 +#: help:calendar.todo,active:0 +msgid "If the active field is set to true, it will allow you to hide the event alarm information without removing it." msgstr "" #. module: base_calendar @@ -394,13 +388,25 @@ msgid "Organizer" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:0 +#: view:calendar.attendee:0 +#: view:calendar.event:0 +#: field:calendar.event,user_id:0 +#: field:calendar.todo,user_id:0 +msgid "Responsible" +msgstr "" + +#. module: base_calendar #: view:calendar.event:0 #: model:res.request.link,name:base_calendar.request_link_meeting -#, python-format msgid "Event" msgstr "" +#. module: base_calendar +#: help:calendar.event,edit_all:0 +#: help:calendar.todo,edit_all:0 +msgid "Edit all Occurrences of recurrent Meeting." +msgstr "" + #. module: base_calendar #: selection:calendar.alarm,trigger_occurs:0 #: selection:res.alarm,trigger_occurs:0 @@ -448,6 +454,11 @@ msgstr "" msgid "Invite Type" msgstr "" +#. module: base_calendar +#: help:calendar.attendee,partner_id:0 +msgid "Partner related to contact" +msgstr "" + #. module: base_calendar #: view:res.alarm:0 msgid "Reminder details" @@ -496,8 +507,9 @@ msgid "Run" msgstr "" #. module: base_calendar -#: model:ir.model,name:base_calendar.model_calendar_alarm -msgid "Event alarm information" +#: field:calendar.event,exdate:0 +#: field:calendar.todo,exdate:0 +msgid "Exception Date/Times" msgstr "" #. module: base_calendar @@ -514,9 +526,8 @@ msgid "Repeat Until" msgstr "" #. module: base_calendar -#: selection:calendar.event,freq:0 -#: selection:calendar.todo,freq:0 -msgid "Seconds" +#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view +msgid "Create specific calendar alarms that may be assigned to calendar events or meetings." msgstr "" #. module: base_calendar @@ -535,6 +546,11 @@ msgstr "" msgid "Caldav URL" msgstr "" +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +msgid "Select range to Exclude" +msgstr "" + #. module: base_calendar #: field:calendar.event,recurrent_uid:0 #: field:calendar.todo,recurrent_uid:0 @@ -576,6 +592,11 @@ msgstr "" msgid "Participation required" msgstr "" +#. module: base_calendar +#: view:base.calendar.set.exrule:0 +msgid "_Cancel" +msgstr "" + #. module: base_calendar #: field:calendar.event,create_date:0 #: field:calendar.todo,create_date:0 @@ -596,7 +617,7 @@ msgid "Daily" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:0 +#: code:addons/base_calendar/base_calendar.py:385 #, python-format msgid "Can not Duplicate" msgstr "" @@ -700,6 +721,12 @@ msgstr "" msgid "Individual" msgstr "" +#. module: base_calendar +#: help:calendar.event,count:0 +#: help:calendar.todo,count:0 +msgid "Repeat x times" +msgstr "" + #. module: base_calendar #: field:calendar.alarm,user_id:0 msgid "Owner" @@ -755,7 +782,8 @@ msgid "Group" msgstr "" #. module: base_calendar -#: view:calendar.event:0 +#: field:calendar.event,edit_all:0 +#: field:calendar.todo,edit_all:0 msgid "Edit All" msgstr "" @@ -777,7 +805,15 @@ msgid "Fri" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:0 +#: selection:calendar.alarm,trigger_interval:0 +#: selection:calendar.event,freq:0 +#: selection:calendar.todo,freq:0 +#: selection:res.alarm,trigger_interval:0 +msgid "Hours" +msgstr "" + +#. module: base_calendar +#: code:addons/base_calendar/base_calendar.py:1092 #, python-format msgid "Count can not be Negative" msgstr "" @@ -814,6 +850,11 @@ msgstr "" msgid "Invitation From" msgstr "" +#. module: base_calendar +#: view:calendar.event:0 +msgid "End of recurrency" +msgstr "" + #. module: base_calendar #: view:calendar.event:0 #: field:calendar.event.edit.all,alarm_id:0 @@ -847,6 +888,8 @@ msgstr "" #. module: base_calendar #: field:calendar.alarm,repeat:0 +#: field:calendar.event,count:0 +#: field:calendar.todo,count:0 #: field:res.alarm,repeat:0 msgid "Repeat" msgstr "" @@ -885,10 +928,8 @@ msgid "June" msgstr "" #. module: base_calendar -#: field:calendar.alarm,event_date:0 -#: field:calendar.attendee,event_date:0 -#: view:calendar.event:0 -msgid "Event Date" +#: field:calendar.alarm,alarm_id:0 +msgid "Basic Alarm" msgstr "" #. module: base_calendar @@ -940,8 +981,6 @@ msgstr "" #. module: base_calendar #: field:base.calendar.set.exrule,count:0 -#: field:calendar.event,count:0 -#: field:calendar.todo,count:0 msgid "Count" msgstr "" @@ -1006,7 +1045,7 @@ msgid "Wednesday" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/base_calendar.py:0 +#: code:addons/base_calendar/base_calendar.py:1090 #, python-format msgid "Interval can not be Negative" msgstr "" @@ -1026,8 +1065,8 @@ msgid "Active" msgstr "" #. module: base_calendar -#: view:calendar.attendee:0 -msgid "Invitation" +#: view:calendar.event:0 +msgid "Choose day in the month where repeat the meeting" msgstr "" #. module: base_calendar @@ -1057,8 +1096,9 @@ msgid "Participation role for the calendar user" msgstr "" #. module: base_calendar -#: field:calendar.attendee,ref:0 -msgid "Event Ref" +#: view:calendar.attendee:0 +#: field:calendar.attendee,delegated_to:0 +msgid "Delegated To" msgstr "" #. module: base_calendar @@ -1071,6 +1111,11 @@ msgstr "" msgid "Search Events" msgstr "" +#. module: base_calendar +#: view:calendar.event:0 +msgid "Recurrency Option" +msgstr "" + #. module: base_calendar #: selection:base.calendar.set.exrule,freq:0 #: selection:calendar.event,rrule_type:0 @@ -1080,8 +1125,6 @@ msgstr "" #. module: base_calendar #: help:calendar.alarm,active:0 -#: help:calendar.event,active:0 -#: help:calendar.todo,active:0 #: help:res.alarm,active:0 msgid "If the active field is set to true, it will allow you to hide the event alarm information without removing it." msgstr "" @@ -1129,6 +1172,12 @@ msgstr "" msgid "Done" msgstr "" +#. module: base_calendar +#: help:calendar.event,interval:0 +#: help:calendar.todo,interval:0 +msgid "Repeat every (Days/Week/Month/Year)" +msgstr "" + #. module: base_calendar #: view:base_calendar.invite.attendee:0 #: field:base_calendar.invite.attendee,user_ids:0 @@ -1137,7 +1186,6 @@ msgstr "" #. module: base_calendar #: view:base.calendar.set.exrule:0 -#: view:calendar.event:0 msgid "of" msgstr "" @@ -1160,11 +1208,6 @@ msgstr "" msgid "Tuesday" msgstr "" -#. module: base_calendar -#: selection:calendar.alarm,action:0 -msgid "Procedure" -msgstr "" - #. module: base_calendar #: help:calendar.alarm,description:0 msgid "Provides a more complete description of the calendar component, than that provided by the \"SUMMARY\" property" @@ -1196,15 +1239,12 @@ msgid "Tentative" msgstr "" #. module: base_calendar -#: view:calendar.attendee:0 -#: view:calendar.event:0 -#: field:calendar.event,user_id:0 -#: field:calendar.todo,user_id:0 -msgid "Responsible" +#: field:calendar.event,recurrency:0 +#: field:calendar.todo,recurrency:0 +msgid "Recurrent" msgstr "" #. module: base_calendar -#: view:calendar.event:0 #: field:calendar.event,rrule_type:0 #: field:calendar.todo,rrule_type:0 msgid "Recurrency" @@ -1223,12 +1263,6 @@ msgstr "" msgid "Thursday" msgstr "" -#. module: base_calendar -#: selection:calendar.event,rrule_type:0 -#: selection:calendar.todo,rrule_type:0 -msgid "Custom" -msgstr "" - #. module: base_calendar #: field:calendar.event,exrule:0 #: field:calendar.todo,exrule:0 @@ -1259,8 +1293,9 @@ msgid "Month" msgstr "" #. module: base_calendar -#: selection:base_calendar.invite.attendee,type:0 -msgid "External Email" +#: view:base_calendar.invite.attendee:0 +#: view:calendar.event:0 +msgid "Invite People" msgstr "" #. module: base_calendar @@ -1319,12 +1354,6 @@ msgstr "" msgid "ir.values" msgstr "" -#. module: base_calendar -#: view:base_calendar.invite.attendee:0 -#: view:calendar.event:0 -msgid "Invite People" -msgstr "" - #. module: base_calendar #: model:ir.model,name:base_calendar.model_ir_model msgid "Objects" @@ -1344,12 +1373,8 @@ msgid "Sat" msgstr "" #. module: base_calendar -#: model:ir.module.module,description:base_calendar.module_meta_information -msgid "Full featured calendar system that supports:\n" -" - Calendar of events\n" -" - Alerts (create requests)\n" -" - Recurring events\n" -" - Invitations to people" +#: view:calendar.event:0 +msgid "Choose day where repeat the meeting" msgstr "" #. module: base_calendar @@ -1392,9 +1417,8 @@ msgid "Name" msgstr "" #. module: base_calendar -#: field:calendar.event,exdate:0 -#: field:calendar.todo,exdate:0 -msgid "Exception Date/Times" +#: model:ir.model,name:base_calendar.model_calendar_alarm +msgid "Event alarm information" msgstr "" #. module: base_calendar @@ -1411,7 +1435,7 @@ msgid "Alarm" msgstr "" #. module: base_calendar -#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0 +#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90 #, python-format msgid "Please Apply Recurrency before applying Exception Rule." msgstr "" @@ -1421,6 +1445,11 @@ msgstr "" msgid "Sent By User" msgstr "" +#. module: base_calendar +#: view:calendar.event:0 +msgid "Repeat interval" +msgstr "" + #. module: base_calendar #: selection:base.calendar.set.exrule,month_list:0 #: selection:calendar.event,month_list:0 @@ -1428,6 +1457,11 @@ msgstr "" msgid "April" msgstr "" +#. module: base_calendar +#: view:calendar.event:0 +msgid "Recurrency period" +msgstr "" + #. module: base_calendar #: field:base.calendar.set.exrule,week_list:0 #: field:calendar.event,week_list:0 @@ -1548,8 +1582,8 @@ msgid "Duration" msgstr "" #. module: base_calendar -#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view -msgid "Create specific calendar alarms that can be assigned to calendar events or meetings." +#: selection:base_calendar.invite.attendee,type:0 +msgid "External Email" msgstr "" #. module: base_calendar diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py index 48f39e609f9..ea4d5aca85f 100755 --- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py +++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py @@ -68,7 +68,7 @@ send an Email to Invited Person') model = False context_id = context and context.get('active_id', False) or False if not context or not context.get('model'): - return {} + return {'type': 'ir.actions.act_window_close'} else: model = context.get('model') @@ -89,7 +89,7 @@ send an Email to Invited Person') if context_id: ref = {'ref': '%s,%s' % (model, base_calendar.base_calendar_id2real_id(context_id))} else: - return {} + return {'type': 'ir.actions.act_window_close'} if type == 'internal': if not datas.get('user_ids'): @@ -144,7 +144,7 @@ send an Email to Invited Person') att_obj._send_mail(cr, uid, attendees, mail_to, \ email_from = current_user.user_email or tools.config.get('email_from', False)) - return {} + return {'type': 'ir.actions.act_window_close'} def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv): diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule.py b/addons/base_calendar/wizard/base_calendar_set_exrule.py index 4f5d57235e5..80fe1e44720 100755 --- a/addons/base_calendar/wizard/base_calendar_set_exrule.py +++ b/addons/base_calendar/wizard/base_calendar_set_exrule.py @@ -150,7 +150,7 @@ class base_calendar_set_exrule(osv.osv_memory): + enddate + monthstring + yearstring model_obj.write(cr, uid, ex_id,{'exrule': exrule_string}) - return {} + return {'type': 'ir.actions.act_window_close'} _defaults = { 'freq': lambda *x: 'None', diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py index a9b0a9f347e..23f67f579f2 100755 --- a/addons/base_calendar/wizard/calendar_event_edit_all.py +++ b/addons/base_calendar/wizard/calendar_event_edit_all.py @@ -78,7 +78,7 @@ class calendar_event_edit_all(osv.osv_memory): model = context.get('model', False) model_obj = self.pool.get(model) model_obj.modify_all(cr, uid, [context_id], datas, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} _name = "calendar.event.edit.all" _description = "Calendar Edit all event" diff --git a/addons/base_contact/i18n/base_contact.pot b/addons/base_contact/i18n/base_contact.pot index 054498cbe45..b859c06339c 100755 --- a/addons/base_contact/i18n/base_contact.pot +++ b/addons/base_contact/i18n/base_contact.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:47+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:47+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:15+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:15+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py index 259404dc95b..486f52cea02 100755 --- a/addons/base_crypt/crypt.py +++ b/addons/base_crypt/crypt.py @@ -40,9 +40,7 @@ from random import seed, sample from string import letters, digits from osv import fields,osv import pooler -import tools from tools.translate import _ -from service import security magic_md5 = '$1$' diff --git a/addons/base_crypt/i18n/base_crypt.pot b/addons/base_crypt/i18n/base_crypt.pot old mode 100755 new mode 100644 index d62691cb699..60b8263732d --- a/addons/base_crypt/i18n/base_crypt.pot +++ b/addons/base_crypt/i18n/base_crypt.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 5.0.6\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2009-11-26 09:12:09+0000\n" -"PO-Revision-Date: 2009-11-26 09:12:09+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:15+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:15+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,22 +16,49 @@ msgstr "" "Plural-Forms: \n" #. module: base_crypt -#: model:ir.module.module,description:base_crypt.module_meta_information -msgid "Module for password encryption." +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" msgstr "" #. module: base_crypt -#: constraint:ir.ui.view:0 -msgid "Invalid XML for View Architecture!" +#: model:ir.model,name:base_crypt.model_res_users +msgid "res.users" +msgstr "" + +#. module: base_crypt +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "" + +#. module: base_crypt +#: code:addons/base_crypt/crypt.py:134 +#, python-format +msgid "Please specify the password !" msgstr "" #. module: base_crypt #: model:ir.module.module,shortdesc:base_crypt.module_meta_information -msgid "Base" +msgid "Base - Password Encryption" msgstr "" #. module: base_crypt -#: field:res.users,input_pw:0 -msgid "Password" +#: code:addons/base_crypt/crypt.py:134 +#, python-format +msgid "Error" +msgstr "" + +#. module: base_crypt +#: model:ir.module.module,description:base_crypt.module_meta_information +msgid "This module replaces the cleartext password in the database with a password hash,\n" +"preventing anyone from reading the original password.\n" +"For your existing user base, the removal of the cleartext passwords occurs the first time\n" +"a user logs into the database, after installing base_crypt.\n" +"After installing this module it won't be possible to recover a forgotten password for your\n" +"users, the only solution is for an admin to set a new password.\n" +"\n" +"Note: installing this module does not mean you can ignore basic security measures,\n" +"as the password is still transmitted unencrypted on the network (by the client),\n" +"unless you are using a secure protocol such as XML-RPCS.\n" +" " msgstr "" diff --git a/addons/base_iban/i18n/base_iban.pot b/addons/base_iban/i18n/base_iban.pot index f63798c1745..a0b53f32715 100755 --- a/addons/base_iban/i18n/base_iban.pot +++ b/addons/base_iban/i18n/base_iban.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:48+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:48+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:16+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:16+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgid "Create IBAN bank accounts" msgstr "" #. module: base_iban -#: code:addons/base_iban/base_iban.py:0 +#: code:addons/base_iban/base_iban.py:120 #, python-format msgid "The IBAN does not seems to be correct. You should have entered something like this %s" msgstr "" @@ -51,21 +51,13 @@ msgstr "" msgid "bic" msgstr "" -#. module: base_iban -#: model:ir.module.module,description:base_iban.module_meta_information -msgid "\n" -"This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity\n" -"\n" -" " -msgstr "" - #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field msgid "iban" msgstr "" #. module: base_iban -#: code:addons/base_iban/base_iban.py:0 +#: code:addons/base_iban/base_iban.py:121 #, python-format msgid "The IBAN is invalid, It should begin with the country code" msgstr "" @@ -80,6 +72,14 @@ msgstr "" msgid "IBAN Account" msgstr "" +#. module: base_iban +#: model:ir.module.module,description:base_iban.module_meta_information +msgid "\n" +"This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity.\n" +"\n" +" " +msgstr "" + #. module: base_iban #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field msgid "acc_number" diff --git a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot b/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot index 3a2ad652ffe..1f7c11bc02b 100755 --- a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot +++ b/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:48+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:48+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:16+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:16+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph.py b/addons/base_module_doc_rst/wizard/generate_relation_graph.py index 7b04f183129..9f789f0cc7a 100755 --- a/addons/base_module_doc_rst/wizard/generate_relation_graph.py +++ b/addons/base_module_doc_rst/wizard/generate_relation_graph.py @@ -35,7 +35,7 @@ def _get_graph(self, cr, uid, datas, context=None): module_data = mod_obj.get_relation_graph(cr, uid, module.name, context=context) if module_data['module_file']: mod_obj.write(cr, uid, [module.id], {'file_graph': module_data['module_file']}, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} class create_graph(wizard.interface): states = { diff --git a/addons/base_module_quality/i18n/base_module_quality.pot b/addons/base_module_quality/i18n/base_module_quality.pot index 1ddd822cdc7..209c3b44e68 100755 --- a/addons/base_module_quality/i18n/base_module_quality.pot +++ b/addons/base_module_quality/i18n/base_module_quality.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:48+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:48+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:17+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:17+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,20 +16,21 @@ msgstr "" "Plural-Forms: \n" #. module: base_module_quality -#: code:addons/base_module_quality/object_test/object_test.py:0 -#: code:addons/base_module_quality/pep8_test/pep8_test.py:0 +#: code:addons/base_module_quality/object_test/object_test.py:187 +#: code:addons/base_module_quality/object_test/object_test.py:204 +#: code:addons/base_module_quality/pep8_test/pep8_test.py:274 #, python-format msgid "Suggestion" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/base_module_quality.py:0 +#: code:addons/base_module_quality/base_module_quality.py:100 #, python-format msgid "Programming Error" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/method_test/method_test.py:0 +#: code:addons/base_module_quality/method_test/method_test.py:31 #, python-format msgid "Method Test" msgstr "" @@ -40,7 +41,7 @@ msgid "Base module quality - To check the quality of other modules" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/object_test/object_test.py:0 +#: code:addons/base_module_quality/object_test/object_test.py:34 #, python-format msgid "\n" "Test checks for fields, views, security rules, dependancy level\n" @@ -48,7 +49,7 @@ msgid "\n" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:127 #, python-format msgid "O(n) or worst" msgstr "" @@ -59,54 +60,58 @@ msgid "Skipped" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/method_test/method_test.py:0 +#: code:addons/base_module_quality/method_test/method_test.py:46 #, python-format msgid "Module has no objects" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:49 #, python-format msgid "Speed Test" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/terp_test/terp_test.py:0 +#: code:addons/base_module_quality/terp_test/terp_test.py:54 #, python-format msgid "The module does not contain the __openerp__.py file" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/method_test/method_test.py:0 -#: code:addons/base_module_quality/object_test/object_test.py:0 -#: code:addons/base_module_quality/pep8_test/pep8_test.py:0 -#: code:addons/base_module_quality/speed_test/speed_test.py:0 -#: code:addons/base_module_quality/terp_test/terp_test.py:0 -#: code:addons/base_module_quality/workflow_test/workflow_test.py:0 +#: code:addons/base_module_quality/method_test/method_test.py:82 +#: code:addons/base_module_quality/object_test/object_test.py:187 +#: code:addons/base_module_quality/object_test/object_test.py:204 +#: code:addons/base_module_quality/pep8_test/pep8_test.py:274 +#: code:addons/base_module_quality/speed_test/speed_test.py:144 +#: code:addons/base_module_quality/speed_test/speed_test.py:151 +#: code:addons/base_module_quality/terp_test/terp_test.py:132 +#: code:addons/base_module_quality/workflow_test/workflow_test.py:143 #, python-format msgid "Object Name" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/method_test/method_test.py:0 +#: code:addons/base_module_quality/method_test/method_test.py:54 +#: code:addons/base_module_quality/method_test/method_test.py:61 +#: code:addons/base_module_quality/method_test/method_test.py:68 #, python-format msgid "Ok" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/terp_test/terp_test.py:0 +#: code:addons/base_module_quality/terp_test/terp_test.py:34 #, python-format msgid "This test checks if the module satisfies the current coding standard used by OpenERP." msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/wizard/quality_save_report.py:0 +#: code:addons/base_module_quality/wizard/quality_save_report.py:46 #, python-format msgid "No report to save!" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/object_test/object_test.py:0 +#: code:addons/base_module_quality/object_test/object_test.py:177 #, python-format msgid "Result of dependancy in %" msgstr "" @@ -117,19 +122,19 @@ msgid "The test will be completed only if the module is installed or if the test msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/pylint_test/pylint_test.py:0 +#: code:addons/base_module_quality/pylint_test/pylint_test.py:99 #, python-format msgid "Result (/10)" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/terp_test/terp_test.py:0 +#: code:addons/base_module_quality/terp_test/terp_test.py:33 #, python-format msgid "Terp Test" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/object_test/object_test.py:0 +#: code:addons/base_module_quality/object_test/object_test.py:33 #, python-format msgid "Object Test" msgstr "" @@ -140,38 +145,38 @@ msgid "Save Report" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/wizard/module_quality_check.py:0 +#: code:addons/base_module_quality/wizard/module_quality_check.py:46 #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id #, python-format msgid "Quality Check" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:128 #, python-format msgid "Not Efficient" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/wizard/quality_save_report.py:0 +#: code:addons/base_module_quality/wizard/quality_save_report.py:46 #, python-format msgid "Warning" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/unit_test/unit_test.py:0 +#: code:addons/base_module_quality/unit_test/unit_test.py:35 #, python-format msgid "Unit Test" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:151 #, python-format msgid "Reading Complexity" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/pep8_test/pep8_test.py:0 +#: code:addons/base_module_quality/pep8_test/pep8_test.py:267 #, python-format msgid "Result of pep8_test in %" msgstr "" @@ -182,7 +187,7 @@ msgid "State" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/unit_test/unit_test.py:0 +#: code:addons/base_module_quality/unit_test/unit_test.py:50 #, python-format msgid "Module does not have 'unit_test/test.py' file" msgstr "" @@ -193,7 +198,7 @@ msgid "Ponderation" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/object_test/object_test.py:0 +#: code:addons/base_module_quality/object_test/object_test.py:177 #, python-format msgid "Result of Security in %" msgstr "" @@ -204,25 +209,25 @@ msgid "Some tests are more critical than others, so they have a bigger weight in msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:120 #, python-format msgid "No enough data" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/terp_test/terp_test.py:0 +#: code:addons/base_module_quality/terp_test/terp_test.py:132 #, python-format msgid "Result (/1)" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:151 #, python-format msgid "N (Number of Records)" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:133 #, python-format msgid "No data" msgstr "" @@ -238,13 +243,13 @@ msgid "Save report" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/workflow_test/workflow_test.py:0 +#: code:addons/base_module_quality/workflow_test/workflow_test.py:34 #, python-format msgid "This test checks where object has workflow or not on it if there is a state field and several buttons on it and also checks validity of workflow xml file" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/structure_test/structure_test.py:0 +#: code:addons/base_module_quality/structure_test/structure_test.py:151 #, python-format msgid "Result in %" msgstr "" @@ -255,14 +260,14 @@ msgid "Standard entries" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/pep8_test/pep8_test.py:0 -#: code:addons/base_module_quality/pylint_test/pylint_test.py:0 +#: code:addons/base_module_quality/pep8_test/pep8_test.py:58 +#: code:addons/base_module_quality/pylint_test/pylint_test.py:88 #, python-format msgid "No python file found" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:144 #: view:module.quality.check:0 #: view:module.quality.detail:0 #, python-format @@ -285,20 +290,20 @@ msgid "Note" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:85 #, python-format msgid "O(1) means that the number of SQL requests to read the object does not depand on the number of objects we are reading. This feature is mostly wished.\n" "" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/terp_test/terp_test.py:0 +#: code:addons/base_module_quality/terp_test/terp_test.py:120 #, python-format msgid "__openerp__.py file" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/unit_test/unit_test.py:0 +#: code:addons/base_module_quality/unit_test/unit_test.py:70 #, python-format msgid "Status" msgstr "" @@ -310,7 +315,7 @@ msgid "Tests" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:50 #, python-format msgid "\n" "This test checks the speed of the module. Note that at least 5 demo data is needed in order to run it.\n" @@ -319,13 +324,13 @@ msgid "\n" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/pylint_test/pylint_test.py:0 +#: code:addons/base_module_quality/pylint_test/pylint_test.py:71 #, python-format msgid "Unable to parse the result. Check the details." msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/structure_test/structure_test.py:0 +#: code:addons/base_module_quality/structure_test/structure_test.py:33 #, python-format msgid "\n" "This test checks if the module satisfy tiny structure\n" @@ -333,50 +338,53 @@ msgid "\n" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/structure_test/structure_test.py:0 -#: code:addons/base_module_quality/workflow_test/workflow_test.py:0 +#: code:addons/base_module_quality/structure_test/structure_test.py:151 +#: code:addons/base_module_quality/workflow_test/workflow_test.py:136 #, python-format msgid "Module Name" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/unit_test/unit_test.py:0 +#: code:addons/base_module_quality/unit_test/unit_test.py:56 #, python-format msgid "Error! Module is not properly loaded/installed" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:115 +#: code:addons/base_module_quality/speed_test/speed_test.py:116 #, python-format msgid "Error in Read method" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:138 #, python-format msgid "Score is below than minimal score(%s%%)" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:151 #, python-format msgid "N/2" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/method_test/method_test.py:0 +#: code:addons/base_module_quality/method_test/method_test.py:57 +#: code:addons/base_module_quality/method_test/method_test.py:64 +#: code:addons/base_module_quality/method_test/method_test.py:71 #, python-format msgid "Exception" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/base_module_quality.py:0 +#: code:addons/base_module_quality/base_module_quality.py:100 #, python-format msgid "Test Is Not Implemented" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:151 #, python-format msgid "N" msgstr "" @@ -387,32 +395,32 @@ msgid "Report Save" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/structure_test/structure_test.py:0 +#: code:addons/base_module_quality/structure_test/structure_test.py:172 #, python-format msgid "Feedback about structure of module" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:73 #, python-format msgid "Given module has no objects.Speed test can work only when new objects are created in the module along with demo data" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/pylint_test/pylint_test.py:0 +#: code:addons/base_module_quality/pylint_test/pylint_test.py:32 #, python-format msgid "This test uses Pylint and checks if the module satisfies the coding standard of Python. See http://www.logilab.org/project/name/pylint for further info.\n" " " msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/workflow_test/workflow_test.py:0 +#: code:addons/base_module_quality/workflow_test/workflow_test.py:143 #, python-format msgid "Feed back About Workflow of Module" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/workflow_test/workflow_test.py:0 +#: code:addons/base_module_quality/workflow_test/workflow_test.py:129 #, python-format msgid "No Workflow define" msgstr "" @@ -428,7 +436,7 @@ msgid "Cancel" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/pep8_test/pep8_test.py:0 +#: code:addons/base_module_quality/pep8_test/pep8_test.py:32 #, python-format msgid "\n" "PEP-8 Test , copyright of py files check, method can not call from loops\n" @@ -441,13 +449,13 @@ msgid "Final Score (%)" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/pylint_test/pylint_test.py:0 +#: code:addons/base_module_quality/pylint_test/pylint_test.py:61 #, python-format msgid "Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:125 #, python-format msgid "Efficient" msgstr "" @@ -458,13 +466,13 @@ msgid "Rated Module" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/workflow_test/workflow_test.py:0 +#: code:addons/base_module_quality/workflow_test/workflow_test.py:33 #, python-format msgid "Workflow Test" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/unit_test/unit_test.py:0 +#: code:addons/base_module_quality/unit_test/unit_test.py:36 #, python-format msgid "\n" "This test checks the Unit Test(PyUnit) Cases of the module. Note that 'unit_test/test.py' is needed in module.\n" @@ -473,7 +481,7 @@ msgid "\n" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/method_test/method_test.py:0 +#: code:addons/base_module_quality/method_test/method_test.py:32 #, python-format msgid "\n" "This test checks if the module classes are raising exception when calling basic methods or not.\n" @@ -486,43 +494,43 @@ msgid "Details" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:119 #, python-format msgid "Warning! Not enough demo data" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/pylint_test/pylint_test.py:0 +#: code:addons/base_module_quality/pylint_test/pylint_test.py:31 #, python-format msgid "Pylint Test" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/pep8_test/pep8_test.py:0 +#: code:addons/base_module_quality/pep8_test/pep8_test.py:31 #, python-format msgid "PEP-8 Test" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/object_test/object_test.py:0 +#: code:addons/base_module_quality/object_test/object_test.py:187 #, python-format msgid "Field name" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:151 #, python-format msgid "1" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:132 #, python-format msgid "Warning! Object has no demo data" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/terp_test/terp_test.py:0 +#: code:addons/base_module_quality/terp_test/terp_test.py:140 #, python-format msgid "Tag Name" msgstr "" @@ -560,8 +568,8 @@ msgid "Name" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/object_test/object_test.py:0 -#: code:addons/base_module_quality/workflow_test/workflow_test.py:0 +#: code:addons/base_module_quality/object_test/object_test.py:177 +#: code:addons/base_module_quality/workflow_test/workflow_test.py:136 #, python-format msgid "Result of views in %" msgstr "" @@ -577,25 +585,25 @@ msgid "Save report as .html format" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/base_module_quality.py:0 +#: code:addons/base_module_quality/base_module_quality.py:269 #, python-format msgid "The module has to be installed before running this test." msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:0 +#: code:addons/base_module_quality/speed_test/speed_test.py:123 #, python-format msgid "O(1)" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/object_test/object_test.py:0 +#: code:addons/base_module_quality/object_test/object_test.py:177 #, python-format msgid "Result of fields in %" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/unit_test/unit_test.py:0 +#: code:addons/base_module_quality/unit_test/unit_test.py:70 #: view:module.quality.detail:0 #: field:module.quality.detail,summary:0 #, python-format @@ -603,20 +611,20 @@ msgid "Summary" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/pylint_test/pylint_test.py:0 -#: code:addons/base_module_quality/structure_test/structure_test.py:0 +#: code:addons/base_module_quality/pylint_test/pylint_test.py:99 +#: code:addons/base_module_quality/structure_test/structure_test.py:172 #, python-format msgid "File Name" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/pep8_test/pep8_test.py:0 +#: code:addons/base_module_quality/pep8_test/pep8_test.py:274 #, python-format msgid "Line number" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/structure_test/structure_test.py:0 +#: code:addons/base_module_quality/structure_test/structure_test.py:32 #, python-format msgid "Structure Test" msgstr "" @@ -627,7 +635,7 @@ msgid "Quality" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/terp_test/terp_test.py:0 +#: code:addons/base_module_quality/terp_test/terp_test.py:140 #, python-format msgid "Feed back About terp file of Module" msgstr "" diff --git a/addons/base_module_record/i18n/base_module_record.pot b/addons/base_module_record/i18n/base_module_record.pot index 364cefca5ab..c2c33c6be93 100755 --- a/addons/base_module_record/i18n/base_module_record.pot +++ b/addons/base_module_record/i18n/base_module_record.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:49+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:49+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:17+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:17+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -202,7 +202,7 @@ msgid "Export Customizations As Data File" msgstr "" #. module: base_module_record -#: code:addons/base_module_record/wizard/base_module_save.py:0 +#: code:addons/base_module_record/wizard/base_module_save.py:129 #, python-format msgid "Error" msgstr "" diff --git a/addons/base_module_record/wizard/base_module_record_data.py b/addons/base_module_record/wizard/base_module_record_data.py index 8071a01ab11..fa9c8a6826e 100755 --- a/addons/base_module_record/wizard/base_module_record_data.py +++ b/addons/base_module_record/wizard/base_module_record_data.py @@ -100,7 +100,7 @@ def _record_objects(self, cr, uid, data, context): for s_id in search_ids: args=(cr.dbname,uid,obj_name,'copy',s_id,{},context) mod.recording_data.append(('query',args, {}, s_id)) - return {} + return {'type': 'ir.actions.act_window_close'} def _check(self, cr, uid, data, context): pool = pooler.get_pool(cr.dbname) diff --git a/addons/base_module_record/wizard/base_module_record_objects.py b/addons/base_module_record/wizard/base_module_record_objects.py index 065e69c171b..9b92a751cdc 100755 --- a/addons/base_module_record/wizard/base_module_record_objects.py +++ b/addons/base_module_record/wizard/base_module_record_objects.py @@ -90,7 +90,7 @@ def _record_objects(self, cr, uid, data, context): for s_id in search_ids: args=(cr.dbname,uid,obj_name,'copy',s_id,{},context) mod.recording_data.append(('query',args, {}, s_id)) - return {} + return {'type': 'ir.actions.act_window_close'} def inter_call(self,cr,uid,data,context): res=base_module_save._create_module(self,cr, uid, data, context) diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py index 663df95047b..773458fe3cb 100755 --- a/addons/base_report_creator/base_report_creator.py +++ b/addons/base_report_creator/base_report_creator.py @@ -196,7 +196,6 @@ class report_creator(osv.osv): res = super(report_creator, self).read(cr, user, ids, fields, context, load) if (not context) or 'report_id' not in context: return res - ctx = context or {} wp = '' for data in res: if not data.get('sql_query'): diff --git a/addons/base_report_creator/i18n/base_report_creator.pot b/addons/base_report_creator/i18n/base_report_creator.pot index c51b850f21c..903773f74f4 100755 --- a/addons/base_report_creator/i18n/base_report_creator.pot +++ b/addons/base_report_creator/i18n/base_report_creator.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:49+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:49+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:17+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:17+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -47,7 +47,7 @@ msgid "Graph Mode" msgstr "" #. module: base_report_creator -#: code:addons/base_report_creator/base_report_creator.py:0 +#: code:addons/base_report_creator/base_report_creator.py:321 #, python-format msgid "These is/are model(s) (%s) in selection which is/are not related to any other model" msgstr "" @@ -116,7 +116,7 @@ msgid "Custom Reports" msgstr "" #. module: base_report_creator -#: code:addons/base_report_creator/base_report_creator.py:0 +#: code:addons/base_report_creator/base_report_creator.py:321 #, python-format msgid "No Related Models!!" msgstr "" diff --git a/addons/base_report_creator/wizard/report_menu_create.py b/addons/base_report_creator/wizard/report_menu_create.py index efa61c556d1..f209bd05526 100755 --- a/addons/base_report_creator/wizard/report_menu_create.py +++ b/addons/base_report_creator/wizard/report_menu_create.py @@ -49,7 +49,7 @@ class report_menu_create(osv.osv_memory): if context_id: data = self.browse(cr, uid, ids, context=context) if not data: - return {} + return {'type': 'ir.actions.act_window_close'} data = data[0] board = obj_board.browse(cr, uid, context_id, context=context) @@ -77,7 +77,7 @@ class report_menu_create(osv.osv_memory): 'action': 'ir.actions.act_window, ' + str(action_id) }, context=context) obj_board.write(cr, uid, context_id, {'menu_id': menu_id}) - return {} + return {'type': 'ir.actions.act_window_close'} report_menu_create() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_creator/wizard/wiz_set_filter_fields.py b/addons/base_report_creator/wizard/wiz_set_filter_fields.py index dc7c977e694..0903f968eea 100755 --- a/addons/base_report_creator/wizard/wiz_set_filter_fields.py +++ b/addons/base_report_creator/wizard/wiz_set_filter_fields.py @@ -145,7 +145,7 @@ def _set_filter_value(self, cr, uid, data, context): 'condition' : form_data['condition'] } pooler.get_pool(cr.dbname).get('base_report_creator.report.filter').create(cr,uid,create_dict,context) - return {} + return {'type': 'ir.actions.act_window_close'} def _set_form_value(self, cr, uid, data, context): field_id = data['form']['field_id'] @@ -199,7 +199,7 @@ def _set_operator(self, cr, uid, data, context): elif field.ttype in ('boolean', 'selection'): operator.append(('=','Equals')) operator.append(('<>','Not Equals')) - return {} + return {'type': 'ir.actions.act_window_close'} class set_filter_fields(wizard.interface): states = { diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py index 9d39bba8a61..88f4d9d5a81 100755 --- a/addons/base_report_designer/__openerp__.py +++ b/addons/base_report_designer/__openerp__.py @@ -36,8 +36,7 @@ upload the report using the same wizard. 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base'], - 'init_xml': ['security/base_report_security.xml', - 'wizard/base_report_design_view.xml'], + 'init_xml': ['wizard/base_report_design_view.xml'], 'update_xml': ['base_report_designer_installer.xml'], 'demo_xml': [], 'installable': True, diff --git a/addons/base_report_designer/i18n/base_report_designer.pot b/addons/base_report_designer/i18n/base_report_designer.pot index 8caa4b3ec9e..950ea864077 100755 --- a/addons/base_report_designer/i18n/base_report_designer.pot +++ b/addons/base_report_designer/i18n/base_report_designer.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:50+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:50+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:18+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:18+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py index 77314929269..4819007f1d0 100755 --- a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py +++ b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py @@ -344,7 +344,6 @@ if __name__ == "__main__": parser.error("incorrect number of arguments") import sys - import StringIO fname = sys.argv[1] f = fname diff --git a/addons/base_report_designer/plugin/openerp_report_designer.zip b/addons/base_report_designer/plugin/openerp_report_designer.zip index 50524b2e60d..47ca560e47d 100755 Binary files a/addons/base_report_designer/plugin/openerp_report_designer.zip and b/addons/base_report_designer/plugin/openerp_report_designer.zip differ diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py index 123be9b9bc2..3cf759e7ada 100755 --- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py +++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py @@ -140,28 +140,16 @@ class ServerParameter( unohelper.Base, XJobExecutor ): ErrorDialog("Connection Refuse...","Please enter valid Login/Password") self.win.endExecute() try: - - ids = self.sock.execute(sDatabase,UID,sPassword, 'res.groups' , 'search', [('name','=','OpenOfficeReportDesigner')]) ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')]) - dict_groups =self.sock.execute(sDatabase, UID,sPassword, 'res.groups' , 'read',ids,['users']) except : import traceback,sys info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback)) self.logobj.log_write('ServerParameter', LOG_ERROR, info) - if not len(ids) : - ErrorDialog("Group Not Found!!! Create a group named \n\n"'"OpenOfficeReportDesigner"'" \n\n ","","Group Name Error") - self.logobj.log_write('Group Error',LOG_WARNING, ':Create a group OpenOfficeReportDesigner using database %s' % (sDatabase)) - self.win.endExecute() if not len(ids_module): ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error") self.logobj.log_write('Module Not Found',LOG_WARNING, ':base_report_designer not install in database %s' % (sDatabase)) self.win.endExecute() - - if UID not in dict_groups[0]['users']: - ErrorDialog("Connection Refuse...","You have not access these Report Designer") - self.logobj.log_write('Connection Refuse',LOG_WARNING, " Not Access Report Designer ") - self.win.endExecute() else: desktop=getDesktop() doc = desktop.getCurrentComponent() diff --git a/addons/base_report_designer/security/base_report_security.xml b/addons/base_report_designer/security/base_report_security.xml deleted file mode 100755 index bd3854ebdba..00000000000 --- a/addons/base_report_designer/security/base_report_security.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot index fe053c831df..de0ad85ba99 100755 --- a/addons/base_setup/i18n/base_setup.pot +++ b/addons/base_setup/i18n/base_setup.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:50+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:50+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:18+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:18+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -86,7 +86,7 @@ msgid "Helps you handle your accounting needs, if you are not an accountant, we msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:0 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" "" diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py index c7478801598..f5c8c8d09a6 100755 --- a/addons/base_setup/todo.py +++ b/addons/base_setup/todo.py @@ -171,7 +171,7 @@ class res_currency(osv.osv): if isinstance(ids, (int, long)): ids = [ids] reads = self.read(cr, uid, ids, ['name','symbol'], context, load='_classic_write') - return [(x['id'], tools.ustr(x['name']) + ' (' + tools.ustr(x['symbol']) + ')') for x in reads] + return [(x['id'], tools.ustr(x['name']) + (x['symbol'] and (' (' + tools.ustr(x['symbol']) + ')') or '')) for x in reads] res_currency() diff --git a/addons/base_synchro/i18n/base_synchro.pot b/addons/base_synchro/i18n/base_synchro.pot index 39cd7a700e6..748f2eb8c9b 100755 --- a/addons/base_synchro/i18n/base_synchro.pot +++ b/addons/base_synchro/i18n/base_synchro.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:51+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:51+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:19+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:19+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/base_tools/i18n/base_tools.pot b/addons/base_tools/i18n/base_tools.pot index f6e7b0230d3..923e474412d 100755 --- a/addons/base_tools/i18n/base_tools.pot +++ b/addons/base_tools/i18n/base_tools.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:51+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:51+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:19+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:19+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/base_vat/i18n/base_vat.pot b/addons/base_vat/i18n/base_vat.pot index 74687ff0de1..71b0c9d3c10 100755 --- a/addons/base_vat/i18n/base_vat.pot +++ b/addons/base_vat/i18n/base_vat.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:51+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:51+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:19+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:19+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ msgstr "" "Plural-Forms: \n" #. module: base_vat -#: code:addons/base_vat/base_vat.py:0 +#: code:addons/base_vat/base_vat.py:87 #, python-format msgid "The Vat does not seems to be correct. You should have entered something like this %s" msgstr "" @@ -42,7 +42,7 @@ msgid "Error ! You can not create recursive associated members." msgstr "" #. module: base_vat -#: code:addons/base_vat/base_vat.py:0 +#: code:addons/base_vat/base_vat.py:88 #, python-format msgid "The VAT is invalid, It should begin with the country code" msgstr "" diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot index f5555892a60..347e9d22436 100755 --- a/addons/board/i18n/board.pot +++ b/addons/board/i18n/board.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:52+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:52+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:20+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:20+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -49,7 +49,7 @@ msgid "Latest Connections" msgstr "" #. module: board -#: code:addons/board/wizard/board_menu_create.py:0 +#: code:addons/board/wizard/board_menu_create.py:45 #, python-format msgid "User Error!" msgstr "" @@ -377,7 +377,7 @@ msgid "Dashboard View" msgstr "" #. module: board -#: code:addons/board/wizard/board_menu_create.py:0 +#: code:addons/board/wizard/board_menu_create.py:46 #, python-format msgid "Please Insert Dashboard View(s) !" msgstr "" diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv index 1b0abd337c7..1909601eb00 100755 --- a/addons/board/security/ir.model.access.csv +++ b/addons/board/security/ir.model.access.csv @@ -4,5 +4,6 @@ "access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1 "access_board_note","board.note","model_board_note","base.group_user",1,1,1,1 "access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1 +"access_res_log_report","res.log.report","model_res_log_report","base.group_user",1,1,1,1 "access_res_log_report_system","res.log.report system","model_res_log_report",base.group_system,1,0,0,0 "access_res_log_report_erp_manager","res.log.report erp_manager","model_res_log_report",base.group_erp_manager,1,0,0,0 diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py index 2b688962265..10d4d80a7f3 100755 --- a/addons/board/wizard/board_menu_create.py +++ b/addons/board/wizard/board_menu_create.py @@ -78,7 +78,7 @@ class board_menu_create(osv.osv_memory): 'action': 'ir.actions.act_window,' + str(action_id) }, context=context) #End Loop - return {} + return {'type': 'ir.actions.act_window_close'} _name = "board.menu.create" _description = "Menu Create" diff --git a/addons/caldav/i18n/caldav.pot b/addons/caldav/i18n/caldav.pot index 4ee66ba785a..76186a5f033 100755 --- a/addons/caldav/i18n/caldav.pot +++ b/addons/caldav/i18n/caldav.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:54+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:54+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:21+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:21+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -80,7 +80,7 @@ msgid "Ok" msgstr "" #. module: caldav -#: code:addons/caldav/calendar.py:0 +#: code:addons/caldav/calendar.py:861 #, python-format msgid "Please provide proper configuration of \"%s\" in Calendar Lines" msgstr "" @@ -91,14 +91,15 @@ msgid "File name" msgstr "" #. module: caldav -#: code:addons/caldav/wizard/calendar_event_subscribe.py:0 +#: code:addons/caldav/wizard/calendar_event_subscribe.py:59 #, python-format msgid "Error!" msgstr "" #. module: caldav -#: code:addons/caldav/calendar.py:0 -#: code:addons/caldav/wizard/calendar_event_import.py:0 +#: code:addons/caldav/calendar.py:772 +#: code:addons/caldav/calendar.py:861 +#: code:addons/caldav/wizard/calendar_event_import.py:63 #, python-format msgid "Warning !" msgstr "" @@ -114,7 +115,7 @@ msgid "Use the field" msgstr "" #. module: caldav -#: code:addons/caldav/calendar.py:0 +#: code:addons/caldav/calendar.py:772 #, python-format msgid "Can not create line \"%s\" more than once" msgstr "" @@ -173,18 +174,13 @@ msgstr "" msgid "Type" msgstr "" -#. module: caldav -#: field:basic.calendar,description:0 -msgid "description" -msgstr "" - #. module: caldav #: help:calendar.event.export,name:0 msgid "Save in .ics format" msgstr "" #. module: caldav -#: code:addons/caldav/calendar.py:0 +#: code:addons/caldav/calendar.py:1275 #, python-format msgid "Error !" msgstr "" @@ -256,13 +252,12 @@ msgid "Calendar" msgstr "" #. module: caldav -#: code:addons/caldav/calendar.py:0 -#, python-format -msgid "Please install python-vobject from http://vobject.skyhouseconsulting.com/" +#: view:basic.calendar:0 +msgid "Todo" msgstr "" #. module: caldav -#: code:addons/caldav/wizard/calendar_event_import.py:0 +#: code:addons/caldav/wizard/calendar_event_import.py:63 #, python-format msgid "Invalid format of the ics, file can not be imported" msgstr "" @@ -296,7 +291,7 @@ msgid "Calendar Collections" msgstr "" #. module: caldav -#: code:addons/caldav/calendar.py:0 +#: code:addons/caldav/calendar.py:798 #: sql_constraint:basic.calendar.alias:0 #, python-format msgid "The same filename cannot apply to two records!" @@ -320,13 +315,18 @@ msgstr "" msgid "Collection" msgstr "" +#. module: caldav +#: field:basic.calendar,write_date:0 +msgid "Write Date" +msgstr "" + #. module: caldav #: sql_constraint:document.directory:0 msgid "The directory name must be unique !" msgstr "" #. module: caldav -#: code:addons/caldav/wizard/calendar_event_subscribe.py:0 +#: code:addons/caldav/wizard/calendar_event_subscribe.py:59 #, python-format msgid "Please provide Proper URL !" msgstr "" @@ -389,6 +389,7 @@ msgstr "" #. module: caldav #: view:basic.calendar:0 +#: field:basic.calendar,description:0 msgid "Description" msgstr "" @@ -403,13 +404,14 @@ msgid "Mapping" msgstr "" #. module: caldav -#: view:calendar.event.import:0 -msgid "_Import" +#: code:addons/caldav/wizard/calendar_event_import.py:86 +#, python-format +msgid "Import Sucessful" msgstr "" #. module: caldav -#: field:basic.calendar,write_date:0 -msgid "Modifided Date" +#: view:calendar.event.import:0 +msgid "_Import" msgstr "" #. module: caldav @@ -451,7 +453,7 @@ msgid "basic.calendar.alarm" msgstr "" #. module: caldav -#: code:addons/caldav/calendar.py:0 +#: code:addons/caldav/calendar.py:1275 #, python-format msgid "Attendee must have an Email Id" msgstr "" @@ -462,7 +464,7 @@ msgid "Export .ics File" msgstr "" #. module: caldav -#: code:addons/caldav/calendar.py:0 +#: code:addons/caldav/calendar.py:41 #, python-format msgid "vobject Import Error!" msgstr "" @@ -493,8 +495,9 @@ msgid "Color" msgstr "" #. module: caldav -#: view:basic.calendar:0 -msgid "Todo" +#: code:addons/caldav/calendar.py:41 +#, python-format +msgid "Please install python-vobject from http://vobject.skyhouseconsulting.com/" msgstr "" #. module: caldav diff --git a/addons/claim_from_delivery/i18n/claim_from_delivery.pot b/addons/claim_from_delivery/i18n/claim_from_delivery.pot index 833d0530e69..9fad6a894ab 100755 --- a/addons/claim_from_delivery/i18n/claim_from_delivery.pot +++ b/addons/claim_from_delivery/i18n/claim_from_delivery.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2010-12-21 19:43:54+0000\n" -"PO-Revision-Date: 2010-12-21 19:43:54+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:21+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:21+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index fc2b38dcfb1..f8cf6b39930 100755 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -125,7 +125,7 @@ class crm_lead(crm_case, osv.osv): 'channel_id': fields.many2one('res.partner.canal', 'Channel'), 'contact_name': fields.char('Contact Name', size=64), - 'partner_name': fields.char("Customer Name", size=64), + 'partner_name': fields.char("Customer Name", size=64,help='The name of the future partner that will be created while converting the into opportunity'), 'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."), 'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."), 'type':fields.selection([ diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 20d8bbfbe31..f5e960dc0d4 100755 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -57,8 +57,8 @@ help="Convert to Opportunity" icon="gtk-go-forward" type="object"/> - +