diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 6a2bf7ff0ea..c1f787f5d80 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -472,6 +472,7 @@ class account_bank_statement_line(osv.osv): required=True), 'statement_id': fields.many2one('account.bank.statement', 'Statement', select=True, required=True, ondelete='cascade'), + 'journal_id': fields.related('statement_id', 'journal_id', type='many2one', relation='account.journal', string='Journal', store=True, readonly=True), 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'), 'move_ids': fields.many2many('account.move', 'account_bank_statement_line_move_rel', 'statement_line_id','move_id', diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index 226e78ccef6..2768fd83019 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -212,25 +212,12 @@ class account_cash_statement(osv.osv): def create(self, cr, uid, vals, context=None): if self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context).type == 'cash': - open_close = self._get_cash_open_close_box_lines(cr, uid, context) - if vals.get('starting_details_ids', False): - for start in vals.get('starting_details_ids'): - dict_val = start[2] - for end in open_close['end']: - if end[2]['pieces'] == dict_val['pieces']: - end[2]['number'] += dict_val['number'] - vals.update({ -# 'ending_details_ids': open_close['start'], - 'starting_details_ids': open_close['end'] - }) - else: - vals.update({ - 'ending_details_ids': False, - 'starting_details_ids': False - }) - res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context) - self.write(cr, uid, [res_id], {}) - return res_id + amount_total = 0.0 + for line in vals.get('starting_details_ids',[]): + if line and len(line)==3 and line[2]: + amount_total+= line[2]['pieces'] * line[2]['number'] + vals.update(balance_start= amount_total) + return super(account_cash_statement, self).create(cr, uid, vals, context=context) def write(self, cr, uid, ids, vals, context=None): """ diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index 84caa890b79..16b72a9b81d 100644 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-02-18 23:14+0000\n" -"Last-Translator: GaCriv \n" +"PO-Revision-Date: 2012-02-22 13:44+0000\n" +"Last-Translator: Pierre Burnier \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-19 05:42+0000\n" -"X-Generator: Launchpad (build 14814)\n" +"X-Launchpad-Export-Date: 2012-02-23 04:39+0000\n" +"X-Generator: Launchpad (build 14855)\n" #. module: account #: code:addons/account/account_move_line.py:1200 @@ -6134,7 +6134,7 @@ msgstr "Avoirs clients" #. module: account #: field:account.account,foreign_balance:0 msgid "Foreign Balance" -msgstr "" +msgstr "Solde extérieur" #. module: account #: field:account.journal.period,name:0 @@ -6666,7 +6666,7 @@ msgstr "Lecture seule" #. module: account #: view:account.payment.term.line:0 msgid " Valuation: Balance" -msgstr "" +msgstr " valorisation : Solde" #. module: account #: field:account.invoice.line,uos_id:0 @@ -8040,7 +8040,7 @@ msgstr "Erreur! Vous ne pouvez pas créer de catégories récursives" #. module: account #: help:account.model.line,quantity:0 msgid "The optional quantity on entries." -msgstr "" +msgstr "La quantité optionnelle sur les écritures." #. module: account #: view:account.financial.report:0 @@ -8599,7 +8599,7 @@ msgstr "Montant" #. module: account #: view:account.payment.term.line:0 msgid " Valuation: Percent" -msgstr "" +msgstr " Valorisation : Pourcentage" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree3 @@ -8739,7 +8739,7 @@ msgstr "Types de compte" #. module: account #: view:account.payment.term.line:0 msgid " Value amount: n.a" -msgstr "" +msgstr " Montant : n.a" #. module: account #: view:account.automatic.reconcile:0 diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po index d268a7b4077..75193819d87 100644 --- a/addons/account/i18n/nl.po +++ b/addons/account/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-02-20 09:28+0000\n" +"PO-Revision-Date: 2012-02-21 15:56+0000\n" "Last-Translator: Erwin \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 05:55+0000\n" +"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" "X-Generator: Launchpad (build 14838)\n" #. module: account @@ -687,7 +687,7 @@ msgstr "SAJ" #: view:account.period:0 #: view:account.period.close:0 msgid "Close Period" -msgstr "Sluit periode" +msgstr "Afsluit periode" #. module: account #: model:ir.model,name:account.model_account_common_partner_report @@ -953,7 +953,7 @@ msgstr "Belastingstructuur" #. module: account #: view:account.fiscalyear:0 msgid "Create 3 Months Periods" -msgstr "Creëer 3 maands Periodes" +msgstr "Maak 3 maandelijkse periodes" #. module: account #: report:account.overdue:0 @@ -1007,7 +1007,7 @@ msgstr "Consolidatie" #: model:account.financial.report,name:account.account_financial_report_liability0 #: model:account.financial.report,name:account.account_financial_report_liabilitysum0 msgid "Liability" -msgstr "Verantwoordelijkheid" +msgstr "Passiva" #. module: account #: view:account.entries.report:0 @@ -1255,7 +1255,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form msgid "Tax Code Templates" -msgstr "Belastingtemplates" +msgstr "Belastingcode sjablonen" #. module: account #: view:account.invoice.cancel:0 @@ -1278,7 +1278,7 @@ msgstr "Belastingen gebruikt bij inkopen" #: field:account.tax.template,tax_code_id:0 #: model:ir.model,name:account.model_account_tax_code msgid "Tax Code" -msgstr "Belastingpercentage" +msgstr "Belastingcode" #. module: account #: field:account.account,currency_mode:0 @@ -1581,7 +1581,7 @@ msgstr "Een tijdelijke tabel gebruikt voor de dashboard-weergave" #: model:ir.actions.act_window,name:account.action_invoice_tree4 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4 msgid "Supplier Refunds" -msgstr "Credit inkoopfactuur" +msgstr "Credit inkoopfacturen" #. module: account #: selection:account.account,type:0 @@ -1860,7 +1860,7 @@ msgstr "Voorlopige overzicht" #. module: account #: view:account.tax:0 msgid "Tax Declaration: Credit Notes" -msgstr "Belastingaangifte: Creditnota's" +msgstr "Belastingaangifte: Credit facturen" #. module: account #: field:account.move.line.reconcile,credit:0 @@ -2497,7 +2497,7 @@ msgstr "Afletteren per relatie" #: field:account.tax,tax_code_id:0 #: view:account.tax.code:0 msgid "Account Tax Code" -msgstr "Belasting code" +msgstr "Belastingcode" #. module: account #: code:addons/account/account_invoice.py:572 @@ -2521,7 +2521,7 @@ msgstr "30% voorschot, 30 dagen einde maand" #. module: account #: view:account.entries.report:0 msgid "Unreconciled entries" -msgstr "Niet afgeletterde boekingen" +msgstr "Onafgeletterde boekingen" #. module: account #: field:account.invoice.tax,base_code_id:0 @@ -2540,7 +2540,7 @@ msgstr "Bepaalt de volgorde bij afbeelden lijst van factuur belasting." #: field:account.tax.template,base_sign:0 #: field:account.tax.template,ref_base_sign:0 msgid "Base Code Sign" -msgstr "Basis code" +msgstr "Basiscode teken (+/-)" #. module: account #: view:account.vat.declaration:0 @@ -2768,7 +2768,7 @@ msgstr "Betaald/Afgeletterd" #: field:account.tax,ref_base_code_id:0 #: field:account.tax.template,ref_base_code_id:0 msgid "Refund Base Code" -msgstr "Creditnota-code" +msgstr "Credit basiscode" #. module: account #: selection:account.tax.template,applicable_type:0 @@ -4079,7 +4079,7 @@ msgstr "Weergave rekeningen" #. module: account #: view:account.state.open:0 msgid "(Invoice should be unreconciled if you want to open it)" -msgstr "(Factuur mag niet verrekend zijn als u deze wilt openen)" +msgstr "(Factuur mag niet afgeletterd zijn als u deze wilt openen)" #. module: account #: field:account.chart,period_from:0 @@ -4281,7 +4281,7 @@ msgstr "Notitie" #. module: account #: selection:account.financial.report,sign:0 msgid "Reverse balance sign" -msgstr "" +msgstr "Balans +/- teken omdraaien" #. module: account #: view:account.analytic.account:0 @@ -4308,7 +4308,7 @@ msgstr "Belastingregels" #. module: account #: field:account.tax,base_code_id:0 msgid "Account Base Code" -msgstr "" +msgstr "Basiscode" #. module: account #: code:addons/account/account_analytic_line.py:93 @@ -4387,7 +4387,7 @@ msgstr "Einde van boekjaar" #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing msgid "Periodical Processing" -msgstr "Periodieke Verwerking" +msgstr "Periodieke verwerking" #. module: account #: constraint:account.analytic.line:0 @@ -4528,6 +4528,8 @@ msgstr "Verrekening toestaan" msgid "" "You can not modify company of this period as some journal items exists." msgstr "" +"Het si niet mogelijk het bedrijf te wijzen van deze periode om reeds " +"journaalposten bestaan." #. module: account #: view:account.analytic.account:0 @@ -4700,7 +4702,7 @@ msgstr "Niet-afgeletterde transacties" #: field:account.tax,ref_tax_code_id:0 #: field:account.tax.template,ref_tax_code_id:0 msgid "Refund Tax Code" -msgstr "Te ontvangen belasting code" +msgstr "Credit belastingcode" #. module: account #: view:validate.account.move:0 @@ -4801,6 +4803,9 @@ msgid "" "account if this is a Customer Invoice or Supplier Refund, otherwise a " "Partner bank account number." msgstr "" +"Bankrekeningnummer waarop de factuur wordt betaald. Een bedrijfsbankrekening " +"als dit een klant- of leveranciersfactuur is, anders een relatie " +"bankrekeningnummer." #. module: account #: view:account.state.open:0 @@ -4853,7 +4858,7 @@ msgstr "" #: code:addons/account/account.py:923 #, python-format msgid "Opening Period" -msgstr "Openingspriode" +msgstr "Openingsperiode" #. module: account #: view:account.move:0 @@ -4950,6 +4955,9 @@ msgid "" "To print an analytics (or costs) journal for a given period. The report give " "code, move name, account number, general amount and analytic amount." msgstr "" +"Om een kostenplaats af te drukken voor een bepaalde periode. Het rapport " +"geeft de code, de mutatienaam, rekening en het algemene bedrag en het " +"kostenplaatstbedrag weer." #. module: account #: sql_constraint:account.invoice:0 @@ -4997,7 +5005,7 @@ msgstr "Mutaties" #. module: account #: view:report.hr.timesheet.invoice.journal:0 msgid "Sale journal in this month" -msgstr "" +msgstr "Verkoopdag boekregels in deze maand" #. module: account #: model:ir.actions.act_window,name:account.action_account_vat_declaration @@ -5314,7 +5322,7 @@ msgstr "Belasting over onderliggende" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax_template msgid "Template Tax Fiscal Position" -msgstr "" +msgstr "Sjabloon belasting fiscale positie" #. module: account #: field:account.journal,update_posted:0 @@ -5433,14 +5441,14 @@ msgstr "Kostenplaatsen" #: field:account.partner.ledger,initial_balance:0 #: field:account.report.general.ledger,initial_balance:0 msgid "Include Initial Balances" -msgstr "" +msgstr "Inclusief eerste balans" #. module: account #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 #: selection:report.invoice.created,type:0 msgid "Customer Refund" -msgstr "Creditering verkoopfactuur" +msgstr "Credit verkoopfactuur" #. module: account #: constraint:account.move:0 @@ -5454,7 +5462,7 @@ msgstr "" #: field:account.tax.template,ref_tax_sign:0 #: field:account.tax.template,tax_sign:0 msgid "Tax Code Sign" -msgstr "Belastingcode" +msgstr "Belastingcode teken (+/-)" #. module: account #: model:ir.model,name:account.model_report_invoice_created @@ -5592,7 +5600,7 @@ msgstr "Aantal" #. module: account #: view:account.move.line:0 msgid "Number (Move)" -msgstr "" +msgstr "Nummer (mutatie)" #. module: account #: view:analytic.entries.report:0 @@ -5696,12 +5704,12 @@ msgstr "Geldig t/m" #. module: account #: view:account.journal:0 msgid "Invoicing Data" -msgstr "Facturatie data" +msgstr "Facturatie gegevens" #. module: account #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile msgid "Account Automatic Reconcile" -msgstr "" +msgstr "Rekening automatisch afletteren" #. module: account #: view:account.move:0 @@ -5757,7 +5765,7 @@ msgstr "Subrekeningen" #: code:addons/account/account_move_line.py:1214 #, python-format msgid "Move name (id): %s (%s)" -msgstr "" +msgstr "Mutatienaam (id): %s (%s)" #. module: account #: view:account.move.line.reconcile:0 @@ -5879,6 +5887,9 @@ msgid "" "Shows you the progress made today on the reconciliation process. Given by \n" "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)" msgstr "" +"Geeft de voortgang van vandaag weer van het afletteren. Berekend door \n" +"Relaties vandaag afgeletterd \\ (Relaties nog te doen + Relaties vandaag " +"gedaan)" #. module: account #: help:account.payment.term.line,value:0 @@ -5948,7 +5959,7 @@ msgstr "Mutaties zijn niet van dezelfde rekening of zijn al afgeletterd ! " #. module: account #: help:account.bank.statement,balance_end:0 msgid "Balance as calculated based on Starting Balance and transaction lines" -msgstr "" +msgstr "Balans berekend op basis van d openingsbalans en de transactieregels" #. module: account #: code:addons/account/wizard/account_change_currency.py:64 @@ -6035,7 +6046,7 @@ msgstr "Naam dagboekperiode" #. module: account #: field:account.invoice.tax,factor_base:0 msgid "Multipication factor for Base code" -msgstr "" +msgstr "Vermenigvuldigingsfactor voor basiscode" #. module: account #: code:addons/account/wizard/account_report_common.py:150 @@ -6073,7 +6084,7 @@ msgstr "Opmerking fiscale positie :" #: model:ir.actions.act_window,name:account.action_analytic_entries_report #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report msgid "Analytic Entries Analysis" -msgstr "" +msgstr "Kostenplaatsanalyse" #. module: account #: selection:account.aged.trial.balance,direction_selection:0 @@ -6087,6 +6098,9 @@ msgid "" "You can not define children to an account with internal type different of " "\"View\"! " msgstr "" +"Configuratiefout! \n" +"Het is alleen mogelijk om een onderliggende rekeningen te definiëren bij een " +"rekening van het \"Aanzicht\"! " #. module: account #: help:res.partner.bank,journal_id:0 @@ -6094,6 +6108,8 @@ msgid "" "This journal will be created automatically for this bank account when you " "save the record" msgstr "" +"Dit grootboek wordt automatisch aangemaakt voor deze bankrekening wanneer u " +"deze regel opslaat" #. module: account #: view:account.analytic.line:0 @@ -6114,6 +6130,11 @@ msgid "" "line of the expense account. OpenERP will propose to you automatically the " "Tax related to this account and the counterpart \"Account Payable\"." msgstr "" +"Deze weergave kan worden gebruikt door accountants om snel journaalposten te " +"registreren in OpenERP. Indien u een leveranciersfactuur wilt registreren, " +"start dan met het registreren van een regel voor kostenrekening. OpenERP zal " +"vervolgens automatisch de belasting, gerelateerd aan deze rekening " +"voorstellen, alsmede de tegenrekening \"Te betalen\"." #. module: account #: field:account.entries.report,date_created:0 @@ -6136,6 +6157,8 @@ msgid "" "As soon as the reconciliation is done, the invoice's state turns to “done” " "(i.e. paid) in the system." msgstr "" +"Zodra het afletteren gereed is, wordt de factuurstatus gewijzigd in " +"\"Gereed\" (Betaald)." #. module: account #: view:account.chart.template:0 @@ -6146,7 +6169,7 @@ msgstr "Hoofd rekening" #. module: account #: field:res.partner,last_reconciliation_date:0 msgid "Latest Reconciliation Date" -msgstr "" +msgstr "Laatste datum van afletteren" #. module: account #: model:ir.model,name:account.model_account_analytic_line @@ -6329,6 +6352,7 @@ msgstr "Standaard credit grootboekrekening" #: help:account.analytic.line,currency_id:0 msgid "The related account currency if not equal to the company one." msgstr "" +"De valuta van de rekening is niet gelijk aan de valuta van het bedrijf." #. module: account #: view:account.analytic.account:0 @@ -6353,7 +6377,7 @@ msgstr "Percentage" #. module: account #: selection:account.report.general.ledger,sortby:0 msgid "Journal & Partner" -msgstr "" +msgstr "Dagboek & Relatie" #. module: account #: field:account.automatic.reconcile,power:0 @@ -6387,7 +6411,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_partner_reconcile msgid "Reconciliation: Go to Next Partner" -msgstr "" +msgstr "Afletteren: Ga naar de volgende relatie" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance @@ -6436,6 +6460,10 @@ msgid "" "year. Note that you can run this wizard many times for the same fiscal year: " "it will simply replace the old opening entries with the new ones." msgstr "" +"Deze wizard zal de eindejaar journaalposten genereren voor het geselecteerde " +"fiscale jaar. Het is mogelijk deze wizard meerdere malen te starten voor " +"hetzelfde fiscale jaar. Het programma zal simpelweg de oude opening " +"vervangen door de nieuwe." #. module: account #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash @@ -6468,6 +6496,8 @@ msgid "" "You cannot change the owner company of an account that already contains " "journal items." msgstr "" +"Het is niet mogelijk om het bedrijf wat eigenaar is van de rekening te " +"wijzigen. Dit omdat er al journaalposten aanwezig zijn." #. module: account #: code:addons/account/wizard/account_report_aged_partner_balance.py:58 @@ -6529,7 +6559,7 @@ msgstr "Alleen Lezen" #. module: account #: view:account.payment.term.line:0 msgid " Valuation: Balance" -msgstr "" +msgstr " Waardering: Balans" #. module: account #: field:account.invoice.line,uos_id:0 @@ -6571,6 +6601,8 @@ msgstr "Kostenplaats dagboek" #, python-format msgid "You can not desactivate an account that contains some journal items." msgstr "" +"Het is niet mogelijk om een rekening te deactiveren als er al journaalposten " +"aanwezig zijn." #. module: account #: view:account.entries.report:0 @@ -6664,6 +6696,13 @@ msgid "" "account. From this view, you can create and manage the account types you " "need for your company." msgstr "" +"Een categorie van een grootboekrekeningen wordt gebruikt om te bepalen hoe " +"een rekening wordt gebruikt bij een dagboek. De afsluitmethode van een " +"categorie bepaald de verwerking van de jaarlijkse afsluiting. Rapporten " +"zoals de balans en de winst&verlies rekening gebruiken de categorie " +")Winst/verlies of balans). Bijvoorbeeld, de categoriesoort kan zijn " +"gekoppeld aan een activa rekening, kostenrekening of een te betalen " +"rekening. In dit scherm kunt u de categorieën aanmaken of wijzigen." #. module: account #: selection:account.account.type,report_type:0 @@ -6735,7 +6774,7 @@ msgstr "Python Code" #. module: account #: view:account.entries.report:0 msgid "Journal Entries with period in current period" -msgstr "" +msgstr "Journaalposten met een periode in de huidige periode" #. module: account #: help:account.journal,update_posted:0 @@ -6743,6 +6782,8 @@ msgid "" "Check this box if you want to allow the cancellation the entries related to " "this journal or of the invoice related to this journal" msgstr "" +"Vink deze optie aan als u het annuleren van journaalposten van dit dagboek " +"of van de gerelateerde factuur, wilt toestaan" #. module: account #: view:account.fiscalyear.close:0 @@ -6800,7 +6841,7 @@ msgstr "Financiële rapport stijl" #. module: account #: selection:account.financial.report,sign:0 msgid "Preserve balance sign" -msgstr "" +msgstr "Behoud het balans +/- teken" #. module: account #: view:account.vat.declaration:0 @@ -6938,7 +6979,7 @@ msgstr "" #. module: account #: view:account.journal.select:0 msgid "Journal Select" -msgstr "" +msgstr "Selecteer dagboek" #. module: account #: view:account.bank.statement:0 @@ -7046,6 +7087,14 @@ msgid "" "\n" "e.g. My model on %(date)s" msgstr "" +"Het is mogelijk om jaar, maand en datum te specificeren in de naam van het " +"model. Maak gebruik van de volgende labels:\n" +"\n" +"%(year)s: Voor het jaar\n" +"%(month)s: Voor de maand\n" +"%(date)s: Voor de huidige datum\n" +"\n" +"e.g. My model on %(date)s" #. module: account #: model:ir.actions.act_window,name:account.action_aged_income @@ -7156,7 +7205,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled #, python-format msgid "Unreconciled Entries" -msgstr "On afgeletterde posten" +msgstr "Onafgeletterde posten" #. module: account #: model:ir.ui.menu,name:account.menu_menu_Bank_process @@ -7266,7 +7315,7 @@ msgstr "" #. module: account #: field:account.chart.template,property_account_expense_opening:0 msgid "Opening Entries Expense Account" -msgstr "" +msgstr "Opening kostenrekening" #. module: account #: code:addons/account/account_move_line.py:999 @@ -7387,7 +7436,7 @@ msgstr "Standaard inkoop belastigen" #. module: account #: field:account.chart.template,property_account_income_opening:0 msgid "Opening Entries Income Account" -msgstr "" +msgstr "Openingsboekingen voor de inkomsten rekening" #. module: account #: view:account.bank.statement:0 @@ -7409,7 +7458,7 @@ msgstr "" #: code:addons/account/account.py:1088 #, python-format msgid "You should have chosen periods that belongs to the same company" -msgstr "" +msgstr "U moet periodes kiezen welke behoren tot hetzelfde bedrijf" #. module: account #: model:ir.actions.act_window,name:account.action_review_payment_terms_installer @@ -7535,7 +7584,7 @@ msgstr "" #. module: account #: model:account.account.type,name:account.data_account_type_view msgid "Root/View" -msgstr "Root/View" +msgstr "Basis/Weergave" #. module: account #: code:addons/account/account.py:3121 @@ -7615,7 +7664,7 @@ msgstr "Foute rekening !" #: code:addons/account/account.py:3108 #, python-format msgid "Sales Journal" -msgstr "Verkoopdagboek" +msgstr "Verkoop dagboek" #. module: account #: code:addons/account/wizard/account_move_journal.py:104 @@ -7701,7 +7750,7 @@ msgstr "Annuleer de geselecteerde facturen" msgid "" "This field is used to generate legal reports: profit and loss, balance sheet." msgstr "" -"Dit veld wordt gebruikt om wettelijke raporrten te genereren, zoals winst & " +"Dit veld wordt gebruikt om wettelijke raporten te genereren, zoals winst & " "verlies en de balans." #. module: account @@ -7871,6 +7920,11 @@ msgid "" "in which they will appear. Then you can create a new journal and link your " "view to it." msgstr "" +"Hier kunt u een bestaande dagboekweergave aanmaken of wijzigen. Een " +"dagboekweergave bepaald de manier waarop uw boekingen kunt kanen in uw " +"dagboek. Selecteer de velden welke in uw dagboek moeten worden weergegeven " +"en bepaal de volgorde van weergave. Vervolgens kunt u een nieuw dagboek " +"aanmaken en deze koppelen aan de weergave." #. module: account #: model:account.account.type,name:account.data_account_type_asset @@ -7966,7 +8020,7 @@ msgstr "Waarschuwing!" #. module: account #: field:account.entries.report,move_line_state:0 msgid "State of Move Line" -msgstr "" +msgstr "Status van de mutatie" #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile @@ -8007,7 +8061,7 @@ msgstr "Relatie" #. module: account #: help:account.change.currency,currency_id:0 msgid "Select a currency to apply on the invoice" -msgstr "" +msgstr "selectere een valuta. welke wordt toegepast op de factuur" #. module: account #: code:addons/account/account.py:3446 @@ -8015,6 +8069,7 @@ msgstr "" msgid "" "The bank account defined on the selected chart of accounts hasn't a code." msgstr "" +"De bankrekening gedefinieerd op het geselecteerde schema heeft geen code" #. module: account #: code:addons/account/wizard/account_invoice_refund.py:108 @@ -8094,7 +8149,7 @@ msgstr "" #. module: account #: field:account.account.type,close_method:0 msgid "Deferral Method" -msgstr "Deferral Method" +msgstr "Afsluitmethode" #. module: account #: code:addons/account/account_invoice.py:379 @@ -8126,6 +8181,8 @@ msgstr "" msgid "" "Check this box if this account allows reconciliation of journal items." msgstr "" +"Vink deze optie aan als de rekening het afletteren van journaalposten " +"toestaat" #. module: account #: help:account.period,state:0 @@ -8232,7 +8289,7 @@ msgstr "Kies een boekjaar" #: code:addons/account/account.py:3111 #, python-format msgid "Purchase Refund Journal" -msgstr "Inkoopretouren dagboek" +msgstr "Credit inkoopfacturen dagboek" #. module: account #: help:account.tax.template,amount:0 @@ -8351,7 +8408,7 @@ msgstr "Fiscale situatie sjablonen" #. module: account #: view:account.entries.report:0 msgid "Int.Type" -msgstr "" +msgstr "Int.Type" #. module: account #: field:account.move.line,tax_amount:0 @@ -8443,7 +8500,7 @@ msgstr "Letter deels af" #. module: account #: model:ir.model,name:account.model_account_analytic_inverted_balance msgid "Account Analytic Inverted Balance" -msgstr "" +msgstr "Geïnverteerde kostenplaats balans" #. module: account #: model:ir.model,name:account.model_account_common_report @@ -8528,7 +8585,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_fiscalyear_close_state msgid "Fiscalyear Close state" -msgstr "" +msgstr "Fiscale jaar afgesloten" #. module: account #: field:account.invoice.refund,journal_id:0 @@ -8606,12 +8663,12 @@ msgstr "Betalingsconditie regel" #: code:addons/account/account.py:3109 #, python-format msgid "Purchase Journal" -msgstr "Inkoopdagboek" +msgstr "Inkoop dagboek" #. module: account #: view:account.invoice.refund:0 msgid "Refund Invoice: Creates the refund invoice, ready for editing." -msgstr "" +msgstr "Credit factuur: Maakt een credit factuur aan, gereed voor bewerking" #. module: account #: field:account.invoice.line,price_subtotal:0 @@ -8679,7 +8736,7 @@ msgstr "Afsluiten fiscaal jaaar" #. module: account #: sql_constraint:account.account:0 msgid "The code of the account must be unique per company !" -msgstr "" +msgstr "De code van de rekening moet uniek zijn per bedrijf!" #. module: account #: view:account.invoice:0 @@ -8791,7 +8848,7 @@ msgstr "" #: model:account.account.type,name:account.data_account_type_expense #: model:account.financial.report,name:account.account_financial_report_expense0 msgid "Expense" -msgstr "Uitgave" +msgstr "Kosten" #. module: account #: help:account.chart,fiscalyear:0 @@ -8856,12 +8913,13 @@ msgstr "Valuta" #: help:account.bank.statement.line,sequence:0 msgid "" "Gives the sequence order when displaying a list of bank statement lines." -msgstr "" +msgstr "Geeft de volgorde weer, bij de weergave van bankafschriftregels." #. module: account #: model:process.transition,note:account.process_transition_validentries0 msgid "Accountant validates the accounting entries coming from the invoice." msgstr "" +"Accountants accordeert de financiële boekingen komende van de factuur." #. module: account #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form @@ -8874,6 +8932,13 @@ msgid "" "would be referred to as FY 2011. You are not obliged to follow the actual " "calendar year." msgstr "" +"Definieer naar behoefte de boekjaren van uw bedrijf. Een financieel jaar is " +"een periode waarop aan het einde de bedrijfsresultaten worden opgemaakt " +"(normaliter 12 maanden). Als men refereert naar het financiële jaar, dan is " +"dit het jaar waarin deze eindigt. Bijvoorbeeld: Als het financiële jaar van " +"een bedrijf eindigt op 30 november 2011, dan wordt bij alles tussen 1 " +"december 2010 en 30 november 2011 gerefereerd aan het financiële jaar 2011. " +"Het is niet verplicht om een kalenderjaar te volgen." #. module: account #: view:account.entries.report:0 @@ -8900,7 +8965,7 @@ msgstr "Forceer periode" #. module: account #: model:ir.model,name:account.model_account_partner_balance msgid "Print Account Partner Balance" -msgstr "" +msgstr "Afdrukken relatie rekeningen balans" #. module: account #: help:account.financial.report,sign:0 @@ -8911,6 +8976,12 @@ msgid "" "accounts that are typically more credited than debited and that you would " "like to print as positive amounts in your reports; e.g.: Income account." msgstr "" +"Voor rekeningen welke normaliter meer debet zijn dan credit en welke u " +"afgedrukt wilt hebben als negatief bedrag in uw rapporten, dient u het +/- " +"teken van de balans om te draaien. Bijvoorbeeld voor de kostenrekening. " +"Hetzelfde geld voor rekeningen welke normaliter meer credit zijn dan debet " +"en welke u wilt afdrukken als positief bedrag in uw rapporten, bijvoorbeeld " +"de inkomsten rekening." #. module: account #: field:res.partner,contract_ids:0 @@ -8935,7 +9006,7 @@ msgstr "Openingsbalans" #. module: account #: model:process.transition,note:account.process_transition_customerinvoice0 msgid "Draft invoices are checked, validated and printed." -msgstr "" +msgstr "Concept facturen zijn gecontroleerd, geaccordeerd en afgedrukt" #. module: account #: help:account.chart.template,property_reserve_and_surplus_account:0 @@ -8952,7 +9023,7 @@ msgstr "" #: code:addons/account/account_invoice.py:808 #, python-format msgid "Please define sequence on the journal related to this invoice." -msgstr "" +msgstr "Geef de volgorde weer bij het dagboek gerelateerd aan deze factuur." #. module: account #: view:account.move:0 @@ -8970,7 +9041,7 @@ msgstr "Verkopen dit jaar per type" #. module: account #: view:account.analytic.cost.ledger.journal.report:0 msgid "Cost Ledger for period" -msgstr "" +msgstr "Kosten grootboek voor periode" #. module: account #: help:account.tax,child_depend:0 @@ -9005,7 +9076,7 @@ msgstr "" #: field:account.move.line,amount_residual:0 #: field:account.move.line,amount_residual_currency:0 msgid "Residual Amount" -msgstr "" +msgstr "Restbedrag" #. module: account #: field:account.invoice,move_lines:0 @@ -9040,7 +9111,7 @@ msgstr "Periode van" #: code:addons/account/account.py:3110 #, python-format msgid "Sales Refund Journal" -msgstr "Verkoopretouren dagboek" +msgstr "Credit verkoopfacturen dagboek" #. module: account #: view:account.move:0 @@ -9103,7 +9174,7 @@ msgstr "Details weergeven" #: code:addons/account/account.py:3118 #, python-format msgid "SCNJ" -msgstr "" +msgstr "SCNJ" #. module: account #: model:process.transition,note:account.process_transition_analyticinvoice0 @@ -9111,6 +9182,8 @@ msgid "" "Analytic costs (timesheets, some purchased products, ...) come from analytic " "accounts. These generate draft invoices." msgstr "" +"Kosten (urenstaten, sommige inkoopproducten, ...) komen van kostenplaatsen. " +"Deze genereren concept facturen." #. module: account #: help:account.journal,view_id:0 @@ -9196,6 +9269,7 @@ msgstr "Totaal credit" #: model:process.transition,note:account.process_transition_suppliervalidentries0 msgid "Accountant validates the accounting entries coming from the invoice. " msgstr "" +"Accountants accorderen de financiële boekingen, komende vanaf de factuur. " #. module: account #: report:account.overdue:0 @@ -9230,11 +9304,15 @@ msgid "" "partially. You can easily generate refunds and reconcile them directly from " "the invoice form." msgstr "" +"Met credit inkoopfacturen kunt u credit facturen, welke u ontvangt van uw " +"leverancier, beheren. Een credit factuur is een factuur welke een eerdere " +"factuur gedeeltelijk of geheel crediteert. U kunt eenvoudig credit facturen " +"genereren en deze afletteren vanuit het inkoopfactuur scherm." #. module: account #: view:account.account.template:0 msgid "Receivale Accounts" -msgstr "" +msgstr "Te ontvangen rekening" #. module: account #: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree @@ -9291,7 +9369,7 @@ msgstr "Afsluit methode" #: model:account.account.type,name:account.data_account_type_payable #: selection:account.entries.report,type:0 msgid "Payable" -msgstr "te betalen" +msgstr "Te betalen" #. module: account #: view:report.account.sales:0 @@ -9347,6 +9425,12 @@ msgid "" "closed or left open depending on your company's activities over a specific " "period." msgstr "" +"Hier kunt u een financiële periode definiëren (een interval in tijd in uw " +"bedrijfs financiële jaar). Een boekhoudkundige periode is normaliter een " +"maand of een kwartaal. Het komt normaliter overeen met de periode van " +"belastingaangifte. Maak en beheer periodes vanuit dit scherm en bepaal of " +"een periode moet worden afgesloten of open moet blijven. Dit is afhankelijk " +"van uw bedrijfsactiviteiten over een specifieke periode." #. module: account #: report:account.third_party_ledger:0 @@ -9381,12 +9465,12 @@ msgstr "" #. module: account #: view:analytic.entries.report:0 msgid "Analytic Entries of last 365 days" -msgstr "" +msgstr "Kostenplaatsboekingen over ed afgelopen 365 dagen" #. module: account #: report:account.central.journal:0 msgid "A/C No." -msgstr "" +msgstr "A/C Nr." #. module: account #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement @@ -9397,7 +9481,7 @@ msgstr "Bankafschriften" #: help:account.addtmpl.wizard,cparent_id:0 msgid "" "Creates an account with the selected template under this existing parent." -msgstr "" +msgstr "Maakt een onderliggende rekening aan met het geselecteerde sjabloon." #. module: account #: selection:account.model.line,date_maturity:0 @@ -9481,6 +9565,7 @@ msgid "" "No opening/closing period defined, please create one to set the initial " "balance!" msgstr "" +"Geen opening/afsluit periode gedefinieerd. Maak deze aan in de eerste balans!" #. module: account #: report:account.account.balance:0 @@ -9529,6 +9614,11 @@ msgid "" "journals. Select 'Opening/Closing Situation' for entries generated for new " "fiscal years." msgstr "" +"Selecteer 'Verkoop' voor klant factuur dagboeken. Selecteer 'Inkoop' voor " +"leveranciersfacturen dagboeken. selecteer 'Kas' of 'Bank' voor dagboeken, " +"welke worden gebruikt in klant en leveranciers betalingen. Selecteer " +"'Normaaal' voor diverse verwerkingen. Selecteer 'Opening/Afsluit situatie' " +"voor boekingen gegenereerd in het nieuwe fiscale jaar." #. module: account #: model:ir.model,name:account.model_account_subscription @@ -9594,7 +9684,7 @@ msgstr "Concept-facturen" #: view:account.entries.report:0 #: view:account.move.line:0 msgid "Unreconciled" -msgstr "Unreconciled" +msgstr "Onafgeletterd" #. module: account #: code:addons/account/account_invoice.py:828 @@ -9605,7 +9695,7 @@ msgstr "Fout totaal !" #. module: account #: field:account.journal,sequence_id:0 msgid "Entry Sequence" -msgstr "Boekstukreeks" +msgstr "Dagboek reeks" #. module: account #: model:ir.actions.act_window,help:account.action_account_period_tree @@ -9733,11 +9823,15 @@ msgid "" "You can not select an account type with a deferral method different of " "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! " msgstr "" +"Configuratie fout! \n" +"Het is niet mogelijk een rekening te selecteren met een afsluitmethode van " +"het type \"Onafgeletterd\" voor rekeningen van het type \"Te betalen/Te " +"ontvangen\"! " #. module: account #: view:account.model:0 msgid "Journal Entry Model" -msgstr "" +msgstr "Journaalpost model" #. module: account #: code:addons/account/wizard/account_use_model.py:44 @@ -9828,7 +9922,7 @@ msgstr "Winst (verlies) te rapoprteren" #. module: account #: view:account.move.line.reconcile.select:0 msgid "Open for Reconciliation" -msgstr "" +msgstr "Open om af te letteren" #. module: account #: field:account.account,parent_left:0 @@ -9876,6 +9970,9 @@ msgid "" "and is the process of transferring debit and credit amounts from a journal " "of original entry to a ledger book." msgstr "" +"Het controleren van journaalposten wordt ook wel 'Grootboek boeken' genoemd " +"en is het verwerken van de debet en credit boekingsbedragen van een dagboek " +"naar een grootboek." #. module: account #: help:account.bank.statement,state:0 @@ -10108,7 +10205,7 @@ msgstr "Bedrijf" #. module: account #: model:ir.ui.menu,name:account.menu_action_subscription_form msgid "Define Recurring Entries" -msgstr "" +msgstr "Definieer terugkerende boekingen" #. module: account #: field:account.entries.report,date_maturity:0 @@ -10131,7 +10228,7 @@ msgstr "" #. module: account #: view:account.fiscalyear:0 msgid "Create Monthly Periods" -msgstr "Creëer maandelijkse Periodes" +msgstr "Maak maandelijkse periodes" #. module: account #: field:account.tax.code.template,sign:0 @@ -10217,12 +10314,12 @@ msgstr "Factuurstatus is 'Gereed'" #. module: account #: model:ir.model,name:account.model_report_account_sales msgid "Report of the Sales by Account" -msgstr "" +msgstr "Rapport van verkopen per rekening" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account msgid "Accounts Fiscal Position" -msgstr "" +msgstr "Rekening fiscale positie" #. module: account #: report:account.invoice:0 @@ -10342,7 +10439,7 @@ msgstr "Boekhoudgegevens" #. module: account #: view:account.tax.code.template:0 msgid "Account Tax Code Template" -msgstr "Belastingrekening code sjabloon" +msgstr "Belastingcode sjabloon" #. module: account #: model:process.node,name:account.process_node_manually0 @@ -10423,6 +10520,13 @@ msgid "" "may keep several types of specialized journals such as a cash journal, " "purchase journal, sales journal..." msgstr "" +"Maak en beheer uw bedrijfs dagboeken vanuit dit menu. Een dagboek wordt " +"gebruikt om transacties van alle boekhoudkundige gegevens met betrekking tot " +"de dagelijkse bedrijfsvoering met behulp van een dubbel boekhouden-systeem " +"vast te leggen. Afhankelijk van de aard van haar activiteiten en het aantal " +"dagelijkse transacties, kan een bedrijf meerdere verschillende soorten van " +"gespecialiseerde dagboeken voeren, zoals een kasboek, inkoopboek, " +"verkoopboek ..." #. module: account #: view:account.payment.term:0 @@ -10490,12 +10594,12 @@ msgstr "November" #: selection:account.invoice.refund,filter_refund:0 msgid "Modify: refund invoice, reconcile and create a new draft invoice" msgstr "" +"Bewerken: Crediteer factuur, afletteren en maak een nieuwe concept factuur" #. module: account #: help:account.invoice.line,account_id:0 msgid "The income or expense account related to the selected product." -msgstr "" -"De inkomsten of uitgaven rekening gerelateerd aan het gekozen produkt." +msgstr "De inkomsten of kostenrekening gerelateerd aan het gekozen produkt." #. module: account #: field:account.subscription,period_total:0 @@ -10840,7 +10944,7 @@ msgstr "Kostenplaatsenrekeningschema" #. module: account #: field:account.chart.template,property_account_expense:0 msgid "Expense Account on Product Template" -msgstr "Uitgaven rekening op product sjabloon" +msgstr "Kostenrekening op product sjabloon" #. module: account #: help:accounting.report,label_filter:0 diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 12e1689f8ac..ae43e0a54d2 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 05:55+0000\n" +"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" "X-Generator: Launchpad (build 14838)\n" #. module: account diff --git a/addons/account_analytic_analysis/i18n/gu.po b/addons/account_analytic_analysis/i18n/gu.po new file mode 100644 index 00000000000..16197e71402 --- /dev/null +++ b/addons/account_analytic_analysis/i18n/gu.po @@ -0,0 +1,375 @@ +# Gujarati translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:35+0000\n" +"PO-Revision-Date: 2012-02-21 11:46+0000\n" +"Last-Translator: Satish Vagadia \n" +"Language-Team: Gujarati \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" +"X-Generator: Launchpad (build 14838)\n" + +#. module: account_analytic_analysis +#: field:account.analytic.account,revenue_per_hour:0 +msgid "Revenue per Time (real)" +msgstr "સમય દીઠ આવક (અસલ)" + +#. module: account_analytic_analysis +#: help:account.analytic.account,remaining_ca:0 +msgid "Computed using the formula: Max Invoice Price - Invoiced Amount." +msgstr "" +"આ સૂત્રની મદદથી થયેલી ગણતરી : ભરતિયાની અધિકતમ કિંમત - ભરતિયાની મૂળ રકમ" + +#. module: account_analytic_analysis +#: help:account.analytic.account,last_worked_date:0 +msgid "Date of the latest work done on this account." +msgstr "આ ખાતા પર થયેલા કામની છેલ્લી તારીખ" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "" +"The contracts to be renewed because the deadline is passed or the working " +"hours are higher than the allocated hours" +msgstr "" +"કરારનુ નવીનીકરણ કરવામાં આવશે કારણ કે છેલ્લી તારીખ પસાર થઈ ગયી છે અથવા " +"કામકાજના કાલાકો ફાળવવામાં આવેલા કાલાકો કરતા વધારે છે" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Pending contracts to renew with your customer" +msgstr "તમારા ગ્રાહકોના નવીનીકરણ કરવામાં બાકી રહેલા કરારો" + +#. module: account_analytic_analysis +#: help:account.analytic.account,hours_qtt_non_invoiced:0 +msgid "" +"Number of time (hours/days) (from journal of type 'general') that can be " +"invoiced if you invoice based on analytic account." +msgstr "" +"સમય અંક (કલાકો/દિવસો) ('જનરલ'-સામાન્ય રોજમેળ હિસાબ માંથી) કે જે ભરતિયામાં " +"સમાવી શકો છો જો તમે વિશ્લેષણાત્મક ખાતા આધારિત ભરતિયુ બનાવો" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Analytic Accounts with a past deadline in one month." +msgstr "એક મહિનામાં છેલ્લી તારીખ સાથેના વિશ્લેષણાત્મક ખાતાઓ" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Group By..." +msgstr "ગ્રુપ દ્વારા..." + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "End Date" +msgstr "અંતિમ તારીખ" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Create Invoice" +msgstr "ભરતિયુ બનાવો" + +#. module: account_analytic_analysis +#: field:account.analytic.account,last_invoice_date:0 +msgid "Last Invoice Date" +msgstr "ભરતિયાની છેલ્લી તારીખ" + +#. module: account_analytic_analysis +#: help:account.analytic.account,theorical_margin:0 +msgid "Computed using the formula: Theorial Revenue - Total Costs" +msgstr "આ સૂત્રની મદદથી થયેલી ગણતરી : સૈદ્ધાંતિક આવક - કુલ ખર્ચ" + +#. module: account_analytic_analysis +#: help:account.analytic.account,hours_quantity:0 +msgid "" +"Number of time you spent on the analytic account (from timesheet). It " +"computes quantities on all journal of type 'general'." +msgstr "" +"વિશ્લેષણાત્મક ખાતા ઉપર તમે ખર્ચેલો સમય અંક (સમયપત્રક માંથી). તે 'જનરલ'-" +"સામાન્ય રોજમેળ હિસાબના બધા ભાગોમાંથી ગણતરી કરેલ છે." + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Contracts in progress" +msgstr "ચાલુ કરારો" + +#. module: account_analytic_analysis +#: field:account.analytic.account,is_overdue_quantity:0 +msgid "Overdue Quantity" +msgstr "ચડત જથ્થો" + +#. module: account_analytic_analysis +#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue +msgid "" +"You will find here the contracts to be renewed because the deadline is " +"passed or the working hours are higher than the allocated hours. OpenERP " +"automatically sets these analytic accounts to the pending state, in order to " +"raise a warning during the timesheets recording. Salesmen should review all " +"pending accounts and reopen or close the according to the negotiation with " +"the customer." +msgstr "" +"અહીં એવા કરારો મળશે કે જેનુ નવીનીકરણ કરવામાં બાકી છે કારણ કે છેલ્લી તારીખ " +"પસાર થઈ ગયી છે અથવા કામકાજના કાલાકો ફાળવવામાં આવેલા કાલાકો કરતા વધારે છે. " +"સમયપત્રક બનાવતી વખતે ચેતવણી આપવા માટે, OpenERP આવા વિશ્લેષણાત્મક ખાતાઓને " +"આપોઆપ અનિર્ણીત સ્થિતિ માં સુયોજિત કરશે. વેચાણકર્તાએ અનિર્ણીત ખાતાઓનું " +"પુનરવલોકન કરવું જોઇએ અને ગ્રાહક સાથેના વાટાઘાટ અનુસાર ખાતાને ફરીથી ચાલુ " +"કરવું અથવા બંધ કરવું જોઈએ." + +#. module: account_analytic_analysis +#: field:account.analytic.account,ca_theorical:0 +msgid "Theoretical Revenue" +msgstr "સૈદ્ધાંતિક આવક" + +#. module: account_analytic_analysis +#: field:account.analytic.account,hours_qtt_non_invoiced:0 +msgid "Uninvoiced Time" +msgstr "ભરતિયુ ન કરેલો સમય" + +#. module: account_analytic_analysis +#: help:account.analytic.account,last_worked_invoiced_date:0 +msgid "" +"If invoice from the costs, this is the date of the latest work or cost that " +"have been invoiced." +msgstr "" +"જો ભરતિયુ ખર્ચમાંથી હોય તો આ તાજેતરમાં થયેલા કામની કે ભરતિયુ થયેલા ખર્ચ ની " +"તારીખ છે." + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "To Renew" +msgstr "નવીનીકરણ માટે" + +#. module: account_analytic_analysis +#: field:account.analytic.account,last_worked_date:0 +msgid "Date of Last Cost/Work" +msgstr "ખર્ચ/કામ ની છેલ્લી તારીખ" + +#. module: account_analytic_analysis +#: field:account.analytic.account,hours_qtt_invoiced:0 +msgid "Invoiced Time" +msgstr "ભરતિયાનો સમય" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "" +"A contract in OpenERP is an analytic account having a partner set on it." +msgstr "OpenERPમાં કરાર એટલે કે વિશ્લેષણાત્મક ખાતું જેમાં સહ-ભાગીદાર હોય." + +#. module: account_analytic_analysis +#: field:account.analytic.account,remaining_hours:0 +msgid "Remaining Time" +msgstr "બાકી રહેલ સમય" + +#. module: account_analytic_analysis +#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue +#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue +msgid "Contracts to Renew" +msgstr "નવીનીકરણ માટેના કરારો" + +#. module: account_analytic_analysis +#: field:account.analytic.account,theorical_margin:0 +msgid "Theoretical Margin" +msgstr "સૈદ્ધાંતિક ગાળો" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid " +1 Month" +msgstr " +1 મહિનો" + +#. 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." +msgstr "" +"પરિયોજના ઉપર થયેલા તમારા ખર્ચ દ્વારા, આવક શું હોય શકે જો આ બધો ખર્ચ " +"ભરતિયામાં રાબેતા મુજબ વેચાણ કિંમત ભાવપત્રકમાંથી લેવાયેલ હોય." + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Pending" +msgstr "બાકી" + +#. module: account_analytic_analysis +#: field:account.analytic.account,ca_to_invoice:0 +msgid "Uninvoiced Amount" +msgstr "ભરતિયુ ન કરેલી રકમ" + +#. module: account_analytic_analysis +#: help:account.analytic.account,real_margin:0 +msgid "Computed using the formula: Invoiced Amount - Total Costs." +msgstr "આ સૂત્રની મદદથી થયેલી ગણતરી : ભરતિયાની મૂળ રકમ - કુલ ખર્ચ" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Parent" +msgstr "" + +#. module: account_analytic_analysis +#: field:account.analytic.account,user_ids:0 +#: field:account_analytic_analysis.summary.user,user:0 +msgid "User" +msgstr "વપરાશકર્તા" + +#. module: account_analytic_analysis +#: help:account.analytic.account,real_margin_rate:0 +msgid "Computes using the formula: (Real Margin / Total Costs) * 100." +msgstr "આ સૂત્રની મદદથી થયેલી ગણતરી : (અસલ ગાળો - કુલ ખર્ચ) *100" + +#. module: account_analytic_analysis +#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user +msgid "Hours Summary by User" +msgstr "વપરાશકર્તા મુજબ સારાંશ કલાકો" + +#. module: account_analytic_analysis +#: field:account.analytic.account,ca_invoiced:0 +msgid "Invoiced Amount" +msgstr "ભરતિયાની રકમ ભરતિયાની રકમ ભરતિયાની રકમ" + +#. module: account_analytic_analysis +#: field:account.analytic.account,last_worked_invoiced_date:0 +msgid "Date of Last Invoiced Cost" +msgstr "છેલ્લા ભરતિયાના ખર્ચ ની તારીખ" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Contract" +msgstr "કરાર" + +#. module: account_analytic_analysis +#: field:account.analytic.account,real_margin_rate:0 +msgid "Real Margin Rate (%)" +msgstr "અસલ ગાળાનો દર" + +#. module: account_analytic_analysis +#: field:account.analytic.account,real_margin:0 +msgid "Real Margin" +msgstr "વાસ્તવિક ગાળો" + +#. module: account_analytic_analysis +#: help:account.analytic.account,ca_invoiced:0 +msgid "Total customer invoiced amount for this account." +msgstr "આ ખાતાની કુલ ગ્રાહક ભરતિયાની રકમ" + +#. module: account_analytic_analysis +#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month +msgid "Hours summary by month" +msgstr "મહિના મુજબ સારાંશ કલાકો" + +#. module: account_analytic_analysis +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "ત્રુટિ! તમે અંદરોઅંદર વિશ્લેષણાત્મક ખાતાઓ ન બનાવી શકો." + +#. module: account_analytic_analysis +#: field:account.analytic.account,remaining_ca:0 +msgid "Remaining Revenue" +msgstr "બાકીની આવક" + +#. module: account_analytic_analysis +#: help:account.analytic.account,remaining_hours:0 +msgid "Computed using the formula: Maximum Time - Total Time" +msgstr "આ સૂત્રની મદદથી થયેલી ગણતરી : અધિકતમ સમય- કુલ સમય" + +#. module: account_analytic_analysis +#: help:account.analytic.account,hours_qtt_invoiced:0 +msgid "" +"Number of time (hours/days) that can be invoiced plus those that already " +"have been invoiced." +msgstr "" +"સમય અંક (કલાકો/દિવસો) કે જે ભરતિયામાં સમાવી શકો છો અને જેનો ભરતિયામાં સમાવેશ " +"કરી ચૂક્યા છો." + +#. module: account_analytic_analysis +#: help:account.analytic.account,ca_to_invoice:0 +msgid "" +"If invoice from analytic account, the remaining amount you can invoice to " +"the customer based on the total costs." +msgstr "" +"જો ભરતિયુ વિશ્લેષણાત્મક ખાતામાંથી હોય તો, બાકીની આવકનુ તમે ગ્રાહકને કુલ ખર્ચ " +"પ્રમાણેનું ભરતિયુ બનાવી શકો છો." + +#. module: account_analytic_analysis +#: help:account.analytic.account,revenue_per_hour:0 +msgid "Computed using the formula: Invoiced Amount / Total Time" +msgstr "આ સૂત્રની મદદથી થયેલી ગણતરી : ભરતિયાની મૂળ રકમ / કુલ સમય" + +#. module: account_analytic_analysis +#: field:account.analytic.account,total_cost:0 +msgid "Total Costs" +msgstr "કુલ ખર્ચ" + +#. module: account_analytic_analysis +#: field:account.analytic.account,month_ids:0 +#: field:account_analytic_analysis.summary.month,month:0 +msgid "Month" +msgstr "મહિનો" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +#: field:account_analytic_analysis.summary.month,account_id:0 +#: field:account_analytic_analysis.summary.user,account_id:0 +#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account +msgid "Analytic Account" +msgstr "વિશ્લેષણાત્મક ખાતું" + +#. module: account_analytic_analysis +#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all +#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all +msgid "Contracts" +msgstr "કરારો" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Manager" +msgstr "સંચાલક" + +#. module: account_analytic_analysis +#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all +#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all +msgid "All Uninvoiced Entries" +msgstr "કુલ બિનભરતિયા નોંધ" + +#. module: account_analytic_analysis +#: help:account.analytic.account,last_invoice_date:0 +msgid "If invoice from the costs, this is the date of the latest invoiced." +msgstr "જો ભરતિયુ ખર્ચમાંથી હોય તો, આ છેલ્લા ભરતિયાની તારીખ" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Associated Partner" +msgstr "સહ -ભાગીદાર" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Open" +msgstr "ખૂલેલુ" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "Contracts that are not assigned to an account manager." +msgstr "કરારો કે જે ખાતા સંચાલક ને સોંપાયેલ નથી." + +#. module: account_analytic_analysis +#: field:account.analytic.account,hours_quantity:0 +#: field:account_analytic_analysis.summary.month,unit_amount:0 +#: field:account_analytic_analysis.summary.user,unit_amount:0 +msgid "Total Time" +msgstr "કુલ સમય" + +#. module: account_analytic_analysis +#: help:account.analytic.account,total_cost:0 +msgid "" +"Total of costs for this account. It includes real costs (from invoices) and " +"indirect costs, like time spent on timesheets." +msgstr "" +"આ ખાતાનો કુલ ખર્ચ. આમાં વાસ્તવિક ખર્ચ (ભરતિયા માંથી) અને અપ્રત્યક્ષ ખર્ચ " +"જેવા કે સમયપત્રક પર ખર્ચેલો સમય નો સમાવેશ થાય છે." diff --git a/addons/account_analytic_analysis/i18n/pt_BR.po b/addons/account_analytic_analysis/i18n/pt_BR.po index 774e04100e6..fd656baa08e 100644 --- a/addons/account_analytic_analysis/i18n/pt_BR.po +++ b/addons/account_analytic_analysis/i18n/pt_BR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 05:55+0000\n" +"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" "X-Generator: Launchpad (build 14838)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_plans/i18n/pt_BR.po b/addons/account_analytic_plans/i18n/pt_BR.po index d6fdffbf99a..8968d765d66 100644 --- a/addons/account_analytic_plans/i18n/pt_BR.po +++ b/addons/account_analytic_plans/i18n/pt_BR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 05:55+0000\n" +"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" "X-Generator: Launchpad (build 14838)\n" #. module: account_analytic_plans diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py index 1aa1cd808c1..6fb51bbc4aa 100644 --- a/addons/account_bank_statement_extensions/account_bank_statement.py +++ b/addons/account_bank_statement_extensions/account_bank_statement.py @@ -112,7 +112,6 @@ class account_bank_statement_line(osv.osv): help="Code to identify transactions belonging to the same globalisation level within a batch payment"), 'globalisation_amount': fields.related('globalisation_id', 'amount', type='float', relation='account.bank.statement.line.global', string='Glob. Amount', readonly=True), - 'journal_id': fields.related('statement_id', 'journal_id', type='many2one', relation='account.journal', string='Journal', store=True, readonly=True), 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed')], 'State', required=True, readonly=True), 'counterparty_name': fields.char('Counterparty Name', size=35), @@ -134,4 +133,4 @@ class account_bank_statement_line(osv.osv): account_bank_statement_line() -# 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_bank_statement_extensions/i18n/fr.po b/addons/account_bank_statement_extensions/i18n/fr.po index ca45c707d7b..bf6f290649e 100644 --- a/addons/account_bank_statement_extensions/i18n/fr.po +++ b/addons/account_bank_statement_extensions/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-02-13 20:55+0000\n" +"PO-Revision-Date: 2012-02-21 13:52+0000\n" "Last-Translator: t.o \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-14 05:46+0000\n" -"X-Generator: Launchpad (build 14781)\n" +"X-Launchpad-Export-Date: 2012-02-22 04:58+0000\n" +"X-Generator: Launchpad (build 14838)\n" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 @@ -109,7 +109,7 @@ msgstr "" #. module: account_bank_statement_extensions #: view:confirm.statement.line:0 msgid "Confirm Lines" -msgstr "" +msgstr "Confirmer les lignes" #. module: account_bank_statement_extensions #: code:addons/account_bank_statement_extensions/account_bank_statement.py:130 @@ -139,7 +139,7 @@ msgstr "" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 msgid "Credit Transactions." -msgstr "" +msgstr "Transactions au crédit" #. module: account_bank_statement_extensions #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line @@ -149,7 +149,7 @@ msgstr "" #. module: account_bank_statement_extensions #: field:account.bank.statement.line,counterparty_number:0 msgid "Counterparty Number" -msgstr "" +msgstr "N° contrepartie" #. module: account_bank_statement_extensions #: view:account.bank.statement.line.global:0 @@ -176,7 +176,7 @@ msgstr "Date" #: view:account.bank.statement.line:0 #: field:account.bank.statement.line,globalisation_amount:0 msgid "Glob. Amount" -msgstr "" +msgstr "Montant total" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 @@ -218,6 +218,7 @@ msgstr "" #: view:cancel.statement.line:0 msgid "Are you sure you want to cancel the selected Bank Statement lines ?" msgstr "" +"Êtes vous sûr de vouloir annuler les lignes de relevé sélectionnées ?" #. module: account_bank_statement_extensions #: report:bank.statement.balance.report:0 @@ -257,7 +258,7 @@ msgstr "Compte fin." #. module: account_bank_statement_extensions #: field:account.bank.statement.line,counterparty_currency:0 msgid "Counterparty Currency" -msgstr "" +msgstr "Devise de la contrepartie" #. module: account_bank_statement_extensions #: field:account.bank.statement.line,counterparty_bic:0 @@ -313,7 +314,7 @@ msgstr "Code" #. module: account_bank_statement_extensions #: field:account.bank.statement.line,counterparty_name:0 msgid "Counterparty Name" -msgstr "" +msgstr "Nom de la contrepartie" #. module: account_bank_statement_extensions #: field:account.bank.statement.line.global,name:0 @@ -350,7 +351,7 @@ msgstr "" #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line #: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line msgid "Bank Statement Lines" -msgstr "" +msgstr "Lignes de relevé bancaire" #. module: account_bank_statement_extensions #: view:account.bank.statement.line.global:0 diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py index 8376d7ebc9d..126027a41a7 100644 --- a/addons/account_coda/__openerp__.py +++ b/addons/account_coda/__openerp__.py @@ -26,52 +26,47 @@ "category": 'Accounting & Finance', "complexity": "normal", "description": ''' - Module to import CODA bank statements. +Module to import CODA bank statements. +====================================== - Supported are CODA flat files in V2 format from Belgian bank accounts. - - CODA v1 support. - - CODA v2.2 support. - - Foreign Currency support. - - Support for all data record types (0, 1, 2, 3, 4, 8, 9). - - Parsing & logging of all Transaction Codes and Structured Format Communications. - - Automatic Financial Journal assignment via CODA configuration parameters. - - Support for multiple Journals per Bank Account Number. - - Support for multiple statements from different bank accounts in a single CODA file. - - Support for 'parsing only' CODA Bank Accounts (defined as type='info' in the CODA Bank Account configuration records). - - Multi-language CODA parsing, parsing configuration data provided for EN, NL, FR. +Supported are CODA flat files in V2 format from Belgian bank accounts. +* CODA v1 support. +* CODA v2.2 support. +* Foreign Currency support. +* Support for all data record types (0, 1, 2, 3, 4, 8, 9). +* Parsing & logging of all Transaction Codes and Structured Format Communications. +* Automatic Financial Journal assignment via CODA configuration parameters. +* Support for multiple Journals per Bank Account Number. +* Support for multiple statements from different bank accounts in a single CODA file. +* Support for 'parsing only' CODA Bank Accounts (defined as type='info' in the CODA Bank Account configuration records). +* Multi-language CODA parsing, parsing configuration data provided for EN, NL, FR. - The machine readable CODA Files are parsed and stored in human readable format in CODA Bank Statements. - Also Bank Statements are generated containing a subset of the CODA information (only those transaction lines - that are required for the creation of the Financial Accounting records). - The CODA Bank Statement is a 'read-only' object, hence remaining a reliable representation of the original CODA file - whereas the Bank Statement will get modified as required by accounting business processes. +The machine readable CODA Files are parsed and stored in human readable format in CODA Bank Statements. +Also Bank Statements are generated containing a subset of the CODA information (only those transaction lines +that are required for the creation of the Financial Accounting records). +The CODA Bank Statement is a 'read-only' object, hence remaining a reliable representation of the original CODA file +whereas the Bank Statement will get modified as required by accounting business processes. - CODA Bank Accounts configured as type 'Info' will only generate CODA Bank Statements. +CODA Bank Accounts configured as type 'Info' will only generate CODA Bank Statements. - A removal of one object in the CODA processing results in the removal of the associated objects. - The removal of a CODA File containing multiple Bank Statements will also remove those associated - statements. +A removal of one object in the CODA processing results in the removal of the associated objects. +The removal of a CODA File containing multiple Bank Statements will also remove those associated +statements. - The following reconciliation logic has been implemented in the CODA processing: - 1) The Company's Bank Account Number of the CODA statement is compared against the Bank Account Number field - of the Company's CODA Bank Account configuration records (whereby bank accounts defined in type='info' configuration records are ignored). - If this is the case an 'internal transfer' transaction is generated using the 'Internal Transfer Account' field of the CODA File Import wizard. - 2) As a second step the 'Structured Communication' field of the CODA transaction line is matched against - the reference field of in- and outgoing invoices (supported : Belgian Structured Communication Type). - 3) When the previous step doesn't find a match, the transaction counterparty is located via the - Bank Account Number configured on the OpenERP Customer and Supplier records. - 4) In case the previous steps are not successful, the transaction is generated by using the 'Default Account - for Unrecognized Movement' field of the CODA File Import wizard in order to allow further manual processing. +The following reconciliation logic has been implemented in the CODA processing: +1) The Company's Bank Account Number of the CODA statement is compared against the Bank Account Number field of the Company's CODA Bank Account configuration records (whereby bank accounts defined in type='info' configuration records are ignored). If this is the case an 'internal transfer' transaction is generated using the 'Internal Transfer Account' field of the CODA File Import wizard. +2) As a second step the 'Structured Communication' field of the CODA transaction line is matched against the reference field of in- and outgoing invoices (supported : Belgian Structured Communication Type). +3) When the previous step doesn't find a match, the transaction counterparty is located via the Bank Account Number configured on the OpenERP Customer and Supplier records. +4) In case the previous steps are not successful, the transaction is generated by using the 'Default Account for Unrecognized Movement' field of the CODA File Import wizard in order to allow further manual processing. - In stead of a manual adjustment of the generated Bank Statements, you can also re-import the CODA - after updating the OpenERP database with the information that was missing to allow automatic reconciliation. +In stead of a manual adjustment of the generated Bank Statements, you can also re-import the CODA +after updating the OpenERP database with the information that was missing to allow automatic reconciliation. - Remark on CODA V1 support: - In some cases a transaction code, transaction category or structured communication code has been given a new or clearer description in CODA V2. - The description provided by the CODA configuration tables is based upon the CODA V2.2 specifications. - If required, you can manually adjust the descriptions via the CODA configuration menu. - - ''', +Remark on CODA V1 support: +In some cases a transaction code, transaction category or structured communication code has been given a new or clearer description in CODA V2. +The description provided by the CODA configuration tables is based upon the CODA V2.2 specifications. +If required, you can manually adjust the descriptions via the CODA configuration menu. +''', "images" : ["images/coda_logs.jpeg","images/import_coda_logs.jpeg"], "depends": ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'], "demo_xml": [], diff --git a/addons/account_followup/i18n/pt_BR.po b/addons/account_followup/i18n/pt_BR.po index a2605b6b9f9..edb2d38bd0f 100644 --- a/addons/account_followup/i18n/pt_BR.po +++ b/addons/account_followup/i18n/pt_BR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 05:55+0000\n" +"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" "X-Generator: Launchpad (build 14838)\n" #. module: account_followup diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py index 32ab6fb4eaa..83c179801ab 100644 --- a/addons/account_payment/__openerp__.py +++ b/addons/account_payment/__openerp__.py @@ -26,13 +26,16 @@ "category": "Accounting & Finance", 'complexity': "easy", "description": """ -Module to manage invoice payment. -================================= +Module to manage the payment of your supplier invoices. +======================================================= -This module provides : ----------------------- -* a more efficient way to manage invoice payment. -* a basic mechanism to easily plug various automated payment. +This module allows you to create and manage your payment orders, with purposes to +* serve as base for an easy plug-in of various automated payment mechanisms. +* provide a more efficient way to manage invoice payment. + +Warning: +-------- +The confirmation of a payment order does _not_ create accounting entries, it just records the fact that you gave your payment order to your bank. The booking of your order must be encoded as usual through a bank statement. Indeed, it's only when you get the confirmation from your bank that your order has been accepted that you can book it in your accounting. To help you with that operation, you have a new option to import payment orders as bank statement lines. """, 'images': ['images/payment_mode.jpeg','images/payment_order.jpeg'], 'depends': ['account','account_voucher'], diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index 1a8d3680f5f..241bd23d5bb 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -294,7 +294,7 @@
- + - + diff --git a/addons/auth_openid/i18n/fr.po b/addons/auth_openid/i18n/fr.po new file mode 100644 index 00000000000..ca4f6039db4 --- /dev/null +++ b/addons/auth_openid/i18n/fr.po @@ -0,0 +1,112 @@ +# French translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 01:37+0100\n" +"PO-Revision-Date: 2012-02-22 10:02+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-02-23 04:39+0000\n" +"X-Generator: Launchpad (build 14855)\n" + +#. #-#-#-#-# auth_openid.pot (OpenERP Server 6.1rc1) #-#-#-#-# +#. module: auth_openid +#. #-#-#-#-# auth_openid.pot.web (PROJECT VERSION) #-#-#-#-# +#. openerp-web +#: view:res.users:0 +#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12 +msgid "OpenID" +msgstr "" + +#. #-#-#-#-# auth_openid.pot (OpenERP Server 6.1rc1) #-#-#-#-# +#. module: auth_openid +#. #-#-#-#-# auth_openid.pot.web (PROJECT VERSION) #-#-#-#-# +#. openerp-web +#: field:res.users,openid_url:0 +#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47 +msgid "OpenID URL" +msgstr "" + +#. module: auth_openid +#: help:res.users,openid_email:0 +msgid "Used for disambiguation in case of a shared OpenID URL" +msgstr "" + +#. module: auth_openid +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "" + +#. module: auth_openid +#: field:res.users,openid_email:0 +msgid "OpenID Email" +msgstr "" + +#. module: auth_openid +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "" + +#. module: auth_openid +#: field:res.users,openid_key:0 +msgid "OpenID Key" +msgstr "" + +#. module: auth_openid +#: model:ir.model,name:auth_openid.model_res_users +msgid "res.users" +msgstr "" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8 +msgid "Password" +msgstr "" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9 +#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10 +msgid "Google" +msgstr "" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10 +msgid "Google Apps" +msgstr "" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11 +msgid "Launchpad" +msgstr "" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20 +msgid "Google Apps Domain:" +msgstr "" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24 +msgid "Username:" +msgstr "" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28 +msgid "OpenID URL:" +msgstr "" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35 +msgid "Google Apps Domain" +msgstr "" + +#. openerp-web +#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41 +msgid "Username" +msgstr "" diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po index 0a78ba0d76d..7b51b7b456a 100644 --- a/addons/base_setup/i18n/fr.po +++ b/addons/base_setup/i18n/fr.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2011-11-07 12:49+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-02-21 14:02+0000\n" +"Last-Translator: GaCriv \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-09 06:16+0000\n" -"X-Generator: Launchpad (build 14763)\n" +"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" +"X-Generator: Launchpad (build 14838)\n" #. module: base_setup #: field:user.preferences.config,menu_tips:0 msgid "Display Tips" -msgstr "" +msgstr "Afficher les astuces" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -34,17 +34,17 @@ msgstr "" #. module: base_setup #: selection:product.installer,customers:0 msgid "Create" -msgstr "" +msgstr "Créer" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Member" -msgstr "" +msgstr "Membre" #. module: base_setup #: field:migrade.application.installer.modules,sync_google_contact:0 msgid "Sync Google Contact" -msgstr "" +msgstr "Synchroniser les contacts Google" #. module: base_setup #: help:user.preferences.config,context_tz:0 @@ -52,6 +52,9 @@ msgid "" "Set default for new user's timezone, used to perform timezone conversions " "between the server and the client." msgstr "" +"Définir le fuseau horaire par défaut pour un nouvel utilisateur, utilisé " +"pour effectuer des conversions de fuseau horaire entre le serveur et le " +"client." #. module: base_setup #: selection:product.installer,customers:0 @@ -61,7 +64,7 @@ msgstr "" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Donor" -msgstr "" +msgstr "Donateur" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_base_setup_company @@ -75,21 +78,25 @@ msgid "" "printed on your reports. You can click on the button 'Preview Header' in " "order to check the header/footer of PDF documents." msgstr "" +"Complétez avec les informations de votre société (adresse, logo, comptes " +"bancaires) pour qu'elles figurent sur vos états. Vous pouvez cliquer sur le " +"bouton 'Prévisualiser l'entête' pour vérifier les entêtes et pieds de pages " +"de vos documents PDF." #. module: base_setup #: field:product.installer,customers:0 msgid "Customers" -msgstr "" +msgstr "Clients" #. module: base_setup #: selection:user.preferences.config,view:0 msgid "Extended" -msgstr "" +msgstr "Étendue" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Patient" -msgstr "" +msgstr "Patient" #. module: base_setup #: model:ir.actions.act_window,help:base_setup.action_import_create_installer @@ -98,6 +105,9 @@ msgid "" "you can import your existing partners by CSV spreadsheet from \"Import " "Data\" wizard" msgstr "" +"Créez ou importez manuellement les clients et leurs contacts à partir de ce " +"formulaire. Vous pouvez aussi les importer avec des fichiers au format CSV " +"avec le bouton \"Importer des données\"" #. module: base_setup #: view:user.preferences.config:0 @@ -112,12 +122,12 @@ msgstr "" #. module: base_setup #: help:migrade.application.installer.modules,import_saleforce:0 msgid "For Import Saleforce" -msgstr "" +msgstr "Pour importer à partir de Saleforce" #. module: base_setup #: help:migrade.application.installer.modules,quickbooks_ippids:0 msgid "For Quickbooks Ippids" -msgstr "" +msgstr "Pour Quickbooks Ippids" #. module: base_setup #: help:user.preferences.config,view:0 @@ -126,6 +136,10 @@ msgid "" "simplified interface, which has less features but is easier. You can always " "switch later from the user preferences." msgstr "" +"Si vous utilisez OpenERP pour la première fois, nous vous encourageons à " +"utiliser l'interface simplifiée, qui a moins de fonctionnalités mais qui est " +"plus facile. Vous pourrez basculer plus tard via les préférences de " +"l'utilisateur." #. module: base_setup #: view:base.setup.terminology:0 @@ -136,7 +150,7 @@ msgstr "res_config_contents" #. module: base_setup #: field:user.preferences.config,view:0 msgid "Interface" -msgstr "" +msgstr "Interface" #. module: base_setup #: model:ir.model,name:base_setup.model_migrade_application_installer_modules @@ -158,12 +172,12 @@ msgstr "" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Customer" -msgstr "" +msgstr "Client" #. module: base_setup #: field:user.preferences.config,context_lang:0 msgid "Language" -msgstr "" +msgstr "Langue" #. module: base_setup #: help:user.preferences.config,context_lang:0 @@ -172,6 +186,10 @@ msgid "" "available. If you want to Add new Language, you can add it from 'Load an " "Official Translation' wizard from 'Administration' menu." msgstr "" +"Paramétrez la langue par défaut de toute l'interface utilisateurs si les " +"traductions sont disponibles. Si vous souhaitez ajouter une nouvelle langue, " +"vous pouvez le faire à partir du menu configuration puis \"Charger une " +"traduction officielle\"." #. module: base_setup #: view:user.preferences.config:0 @@ -180,16 +198,19 @@ msgid "" "ones. Afterwards, users are free to change those values on their own user " "preference form." msgstr "" +"Cela va régler les préférences par défaut pour les nouveaux utilisateurs et " +"mettre à jour toutes celles déjà existantes. Ensuite, les utilisateurs " +"pourront changer ces valeurs à partir de leurs propres préférences." #. module: base_setup #: field:base.setup.terminology,partner:0 msgid "How do you call a Customer" -msgstr "" +msgstr "Comment appelez-vous un client" #. module: base_setup #: field:migrade.application.installer.modules,quickbooks_ippids:0 msgid "Quickbooks Ippids" -msgstr "" +msgstr "Quickbooks Ippids" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -204,12 +225,12 @@ msgstr "" #. module: base_setup #: field:user.preferences.config,context_tz:0 msgid "Timezone" -msgstr "" +msgstr "Fuseau horaire" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form msgid "Use another word to say \"Customer\"" -msgstr "" +msgstr "Utiliser un autre mot pour dire \"client\"" #. module: base_setup #: model:ir.model,name:base_setup.model_base_setup_terminology @@ -243,7 +264,7 @@ msgstr "" #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_import_create_installer msgid "Create or Import Customers" -msgstr "" +msgstr "Créer ou importer des clients" #. module: base_setup #: field:migrade.application.installer.modules,import_sugarcrm:0 @@ -253,12 +274,12 @@ msgstr "" #. module: base_setup #: help:product.installer,customers:0 msgid "Import or create customers" -msgstr "" +msgstr "Créer ou importer des clients" #. module: base_setup #: selection:user.preferences.config,view:0 msgid "Simplified" -msgstr "" +msgstr "Simplifiée" #. module: base_setup #: help:migrade.application.installer.modules,import_sugarcrm:0 @@ -268,7 +289,7 @@ msgstr "" #. module: base_setup #: selection:base.setup.terminology,partner:0 msgid "Partner" -msgstr "" +msgstr "Partenaire" #. module: base_setup #: view:base.setup.terminology:0 diff --git a/addons/board/i18n/es_CL.po b/addons/board/i18n/es_CL.po index 6af5e2d2615..c849fcb10bd 100644 --- a/addons/board/i18n/es_CL.po +++ b/addons/board/i18n/es_CL.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2011-10-03 16:58+0000\n" +"PO-Revision-Date: 2012-02-21 07:20+0000\n" "Last-Translator: David Acevedo Toledo \n" "Language-Team: Spanish (Chile) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-09 06:41+0000\n" -"X-Generator: Launchpad (build 14763)\n" +"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" +"X-Generator: Launchpad (build 14838)\n" #. module: board #: view:res.log.report:0 @@ -192,7 +192,7 @@ msgstr "Octubre" #. module: board #: model:ir.model,name:board.model_board_board_line msgid "Board Line" -msgstr "Línea tablero" +msgstr "Línea del tablero" #. module: board #: field:board.menu.create,menu_parent_id:0 @@ -225,8 +225,8 @@ msgid "" "Gives the sequence order when displaying a list of " "board lines." msgstr "" -"Indica el orden de secuencia cuando se muestra una lista de líneas de " -"tablero." +"Indica el orden de la secuencia cuando se muestre una lista de líneas de " +"tableros." #. module: board #: selection:res.log.report,month:0 diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po index 355bf894795..d38ef967ccf 100644 --- a/addons/crm/i18n/pt_BR.po +++ b/addons/crm/i18n/pt_BR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 05:54+0000\n" +"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" "X-Generator: Launchpad (build 14838)\n" #. module: crm diff --git a/addons/crm_todo/i18n/fr.po b/addons/crm_todo/i18n/fr.po new file mode 100644 index 00000000000..000c231c8ca --- /dev/null +++ b/addons/crm_todo/i18n/fr.po @@ -0,0 +1,95 @@ +# French translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-02-22 09:08+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-02-23 04:39+0000\n" +"X-Generator: Launchpad (build 14855)\n" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_project_task +msgid "Task" +msgstr "" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Timebox" +msgstr "" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For cancelling the task" +msgstr "" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! Task end-date must be greater then task start-date" +msgstr "" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_crm_lead +msgid "crm.lead" +msgstr "" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Next" +msgstr "" + +#. module: crm_todo +#: model:ir.actions.act_window,name:crm_todo.crm_todo_action +#: model:ir.ui.menu,name:crm_todo.menu_crm_todo +msgid "My Tasks" +msgstr "" + +#. module: crm_todo +#: view:crm.lead:0 +#: field:crm.lead,task_ids:0 +msgid "Tasks" +msgstr "" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Done" +msgstr "" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! You cannot create recursive tasks." +msgstr "" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Cancel" +msgstr "" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Extra Info" +msgstr "" + +#. module: crm_todo +#: field:project.task,lead_id:0 +msgid "Lead / Opportunity" +msgstr "" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For changing to done state" +msgstr "" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Previous" +msgstr "" diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js index 0f59768bc4e..a93086bdcaa 100644 --- a/addons/edi/static/src/js/edi.js +++ b/addons/edi/static/src/js/edi.js @@ -142,8 +142,8 @@ openerp.edi.EdiImport = openerp.web.OldWidget.extend({ }, destroy_content: function() { - _.each(_.clone(this.widget_children), function(el) { - el.stop(); + _.each(_.clone(this.getChildren()), function(el) { + el.destroy(); }); this.$element.children().remove(); }, diff --git a/addons/edi/static/src/xml/edi.xml b/addons/edi/static/src/xml/edi.xml index 9378e12525c..1f27c49ccdd 100644 --- a/addons/edi/static/src/xml/edi.xml +++ b/addons/edi/static/src/xml/edi.xml @@ -3,7 +3,7 @@
- + diff --git a/addons/fetchmail/i18n/el.po b/addons/fetchmail/i18n/el.po index 147baee737e..09a5daac061 100644 --- a/addons/fetchmail/i18n/el.po +++ b/addons/fetchmail/i18n/el.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2011-08-23 14:49+0000\n" -"Last-Translator: Tryfon Farmakakis \n" +"PO-Revision-Date: 2012-02-22 23:50+0000\n" +"Last-Translator: emmsarris \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-09 06:58+0000\n" -"X-Generator: Launchpad (build 14763)\n" +"X-Launchpad-Export-Date: 2012-02-24 04:47+0000\n" +"X-Generator: Launchpad (build 14860)\n" #. module: fetchmail #: selection:fetchmail.server,state:0 @@ -60,7 +60,7 @@ msgstr "" #. module: fetchmail #: field:fetchmail.server,priority:0 msgid "Server Priority" -msgstr "" +msgstr "Προτεραιότητα Διακομιστή" #. module: fetchmail #: field:fetchmail.server,state:0 @@ -91,7 +91,7 @@ msgstr "" #. module: fetchmail #: view:fetchmail.server:0 msgid "POP/IMAP Servers" -msgstr "" +msgstr "Διακομιστές POP/IMAP" #. module: fetchmail #: selection:fetchmail.server,type:0 @@ -106,7 +106,7 @@ msgstr "" #. module: fetchmail #: model:ir.model,name:fetchmail.model_fetchmail_server msgid "POP/IMAP Server" -msgstr "" +msgstr "Διακομιστής POP/IMAP" #. module: fetchmail #: view:fetchmail.server:0 @@ -261,7 +261,7 @@ msgstr "" #. module: fetchmail #: field:fetchmail.server,type:0 msgid "Server Type" -msgstr "" +msgstr "Τύπος Διακομιστή" #. module: fetchmail #: view:fetchmail.server:0 @@ -309,7 +309,7 @@ msgstr "Μη Επιβεβαιωμένο" #. module: fetchmail #: selection:fetchmail.server,type:0 msgid "POP Server" -msgstr "" +msgstr "Διακομιστής POP" #. module: fetchmail #: view:mail.message:0 diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po index cf36bd42e0e..f0adc0438bf 100644 --- a/addons/hr/i18n/de.po +++ b/addons/hr/i18n/de.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-02-08 09:14+0000\n" +"PO-Revision-Date: 2012-02-22 23:51+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-09 06:42+0000\n" -"X-Generator: Launchpad (build 14763)\n" +"X-Launchpad-Export-Date: 2012-02-24 04:47+0000\n" +"X-Generator: Launchpad (build 14860)\n" #. module: hr #: model:process.node,name:hr.process_node_openerpuser0 @@ -357,7 +357,7 @@ msgstr "hr.department" #. module: hr #: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer msgid "Create your Employees" -msgstr "LegenSie Ihre Mitarbieter an" +msgstr "Legen Sie Ihre Mitarbeiter an" #. module: hr #: field:hr.employee.category,name:0 diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po index 628f2649f8e..d52460ed66d 100644 --- a/addons/hr_holidays/i18n/de.po +++ b/addons/hr_holidays/i18n/de.po @@ -7,15 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-02-16 09:04+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-02-22 23:52+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-17 05:00+0000\n" -"X-Generator: Launchpad (build 14814)\n" +"X-Launchpad-Export-Date: 2012-02-24 04:47+0000\n" +"X-Generator: Launchpad (build 14860)\n" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 @@ -516,7 +515,7 @@ msgstr "Schwarz" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal msgid "Allocate Leaves for Employees" -msgstr "Zuteilung der Urlaub für Mitarbeiter" +msgstr "Zuteilung der Urlaube je Mitarbeiter" #. module: hr_holidays #: field:resource.calendar.leaves,holiday_id:0 diff --git a/addons/import_base/i18n/nl.po b/addons/import_base/i18n/nl.po new file mode 100644 index 00000000000..e7a36bd4448 --- /dev/null +++ b/addons/import_base/i18n/nl.po @@ -0,0 +1,106 @@ +# Dutch translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-02-21 18:42+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-02-22 04:58+0000\n" +"X-Generator: Launchpad (build 14838)\n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:434 +#, python-format +msgid "Import failed due to an unexpected error" +msgstr "Import is mislukt door een onverwachte fout" + +#. module: import_base +#: code:addons/import_base/import_framework.py:461 +#, python-format +msgid "started at %s and finished at %s \n" +msgstr "gestart op %s en geëindigd op %s \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:448 +#, python-format +msgid "Import of your data finished at %s" +msgstr "Import van uw gegevens geëindigd op %s" + +#. module: import_base +#: code:addons/import_base/import_framework.py:463 +#, python-format +msgid "" +"but failed, in consequence no data were imported to keep database " +"consistency \n" +" error : \n" +msgstr "" +"maar mislukt, waardoor geen gegevens zijn geïmporteerd, zodat de database " +"consistent blijft \n" +" fout: \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:477 +#, python-format +msgid "" +"The import of data \n" +" instance name : %s \n" +msgstr "" +"De import van gegevens \n" +"\n" +" instantie naam: %s \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:470 +#, python-format +msgid "%s has been successfully imported from %s %s, %s \n" +msgstr "%s is succesvol geïmporteerd van %s %s, %s \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:447 +#, python-format +msgid "Data Import failed at %s due to an unexpected error" +msgstr "Gegevens import mislukt op %s door een onverwachte fout" + +#. module: import_base +#: code:addons/import_base/import_framework.py:436 +#, python-format +msgid "Import finished, notification email sended" +msgstr "Import beëindigd. Notificatie e-mail is verzonden" + +#. module: import_base +#: code:addons/import_base/import_framework.py:190 +#, python-format +msgid "%s is not a valid model name" +msgstr "%s is geen geldige model naam" + +#. module: import_base +#: model:ir.ui.menu,name:import_base.menu_import_crm +msgid "Import" +msgstr "Importeren" + +#. module: import_base +#: code:addons/import_base/import_framework.py:467 +#, python-format +msgid "with no warning" +msgstr "met geen waarsschuwing" + +#. module: import_base +#: code:addons/import_base/import_framework.py:469 +#, python-format +msgid "with warning : %s" +msgstr "met waarschuwing: %s" + +#. module: import_base +#: code:addons/import_base/import_framework.py:191 +#, python-format +msgid " fields imported : " +msgstr " velden geïmporteerd: " diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py index aa6ff0a2db8..aa45834bb38 100644 --- a/addons/knowledge/__openerp__.py +++ b/addons/knowledge/__openerp__.py @@ -29,7 +29,7 @@ 'complexity': "easy", "description": """ Installer for knowledge-based Hidden. -==================================== +===================================== Makes the Knowledge Application Configuration available from where you can install document and Wiki based Hidden. diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 3de4d700885..8b89b61801f 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -443,7 +443,8 @@ class mail_message(osv.osv): if 'text/html' in msg.get('content-type', ''): msg['body_html'] = body msg['subtype'] = 'html' - body = tools.html2plaintext(body) + if body: + body = tools.html2plaintext(body) msg['body_text'] = tools.ustr(body, encoding) attachments = [] diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po index 76d36bf2ea2..ad5714895cb 100644 --- a/addons/mrp/i18n/de.po +++ b/addons/mrp/i18n/de.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:49+0000\n" -"PO-Revision-Date: 2012-02-08 09:35+0000\n" +"PO-Revision-Date: 2012-02-22 07:45+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-09 06:02+0000\n" -"X-Generator: Launchpad (build 14763)\n" +"X-Launchpad-Export-Date: 2012-02-23 04:38+0000\n" +"X-Generator: Launchpad (build 14855)\n" #. module: mrp #: view:mrp.routing.workcenter:0 @@ -1214,7 +1214,7 @@ msgid "" "materials." msgstr "" "Arbeitspläne ermöglichen die Anlage und Verwaltung einzelner Arbeitsgänge, " -"nach denen an Arbeitsplätzen ein Proukt gefertigt wird. Sie werden mit " +"nach denen an Arbeitsplätzen ein Produkt gefertigt wird. Sie werden mit " "Stücklisten verknüpft, die das benötigte Material bestimmen." #. module: mrp diff --git a/addons/pad_project/i18n/nl.po b/addons/pad_project/i18n/nl.po new file mode 100644 index 00000000000..1e23b4c7a05 --- /dev/null +++ b/addons/pad_project/i18n/nl.po @@ -0,0 +1,38 @@ +# Dutch translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-02-21 18:58+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-02-22 04:58+0000\n" +"X-Generator: Launchpad (build 14838)\n" + +#. module: pad_project +#: constraint:project.task:0 +msgid "Error ! Task end-date must be greater then task start-date" +msgstr "Fout! Einddatum van de taak moet voorbij de begindatum liggen" + +#. module: pad_project +#: model:ir.model,name:pad_project.model_project_task +msgid "Task" +msgstr "Taak" + +#. module: pad_project +#: view:project.task:0 +msgid "Pad" +msgstr "Pad" + +#. module: pad_project +#: constraint:project.task:0 +msgid "Error ! You cannot create recursive tasks." +msgstr "Fout! U kunt geen recursieve taken aanmaken." diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs index cf1578d903b..b5bc2fc4472 100644 --- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs +++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs @@ -144,7 +144,16 @@ namespace OpenERPOutlookPlugin OpenERPConnect openerp_connect = openerp_outlook.Connection; ArrayList args = new ArrayList(); Hashtable vals = new Hashtable(); - string email = Tools.GetHeader(mail); //TODO: Outlook.MailItem Should be Converted into MIME Message + string email; + if (Tools.GetHeader(mail)!= null) + { + email = Tools.GetHeader(mail); //TODO: Outlook.MailItem Should be Converted into MIME Message + } + else + { + email = ""; + } + args.Add(model); args.Add(email.ToString()); args.Add(thread_id); diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj index 8fbcb0a2ec4..6fdd26b35d0 100644 --- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj +++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj @@ -44,6 +44,7 @@ false true AllRules.ruleset + AnyCPU false @@ -241,12 +242,6 @@ - - - {8E62B8DF-E3A2-4429-A820-FB8A31C2EB00} - OpenERPClient - - False @@ -264,6 +259,12 @@ true + + + {8E62B8DF-E3A2-4429-A820-FB8A31C2EB00} + OpenERPClient + + diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi index 45f2d7cd6f4..a31471c28ba 100644 Binary files a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi and b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi differ diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi index 7e15551928c..87cac88be70 100644 Binary files a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi and b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi differ diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index 2445e4be10a..4a88ce3cc16 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -622,7 +622,6 @@ account_bank_statement() class account_bank_statement_line(osv.osv): _inherit = 'account.bank.statement.line' _columns= { - 'journal_id': fields.related('statement_id','journal_id','name', store=True, string='Journal', type='char', size=64), 'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'), } account_bank_statement_line() diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml index d86d27e04dd..1e4b2ec7c35 100644 --- a/addons/point_of_sale/point_of_sale_demo.xml +++ b/addons/point_of_sale/point_of_sale_demo.xml @@ -108,7 +108,7 @@ - Cash Journal - (test) + diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 4c2c0fec15c..c2f150f04f3 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -1117,7 +1117,7 @@ openerp.point_of_sale = function(db) { this.order = options.order; this.shop = options.shop; this.order.bind('destroy', _.bind( function() { - return this.stop(); + this.destroy(); }, this)); this.shop.bind('change:selectedOrder', _.bind( function(shop) { var selectedOrder; @@ -1384,7 +1384,7 @@ openerp.point_of_sale = function(db) { }, this)); }, this)); }, - stop: function() { + destroy: function() { $('.oe_footer').show(); $('.oe_toggle_secondary_menu').show(); pos = undefined; diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po index 8c4ec2d7034..b9b7380b863 100644 --- a/addons/product/i18n/nl.po +++ b/addons/product/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2012-02-20 13:15+0000\n" +"PO-Revision-Date: 2012-02-21 15:40+0000\n" "Last-Translator: Erwin \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 05:55+0000\n" +"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" "X-Generator: Launchpad (build 14838)\n" #. module: product @@ -592,7 +592,7 @@ msgstr "Prijsberekening" #. module: product #: model:res.groups,name:product.group_uos msgid "Product UoS View" -msgstr "Product voorraadmaateenheid aanzicht" +msgstr "Weergeven voorraadmaateenheid" #. module: product #: field:product.template,purchase_ok:0 @@ -1171,7 +1171,7 @@ msgstr "Bovenliggende" #. module: product #: view:product.product:0 msgid "To Sell" -msgstr "Te verkopen" +msgstr "Verkoop product" #. module: product #: help:product.product,outgoing_qty:0 diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py index cf3545b2628..54e101df38c 100644 --- a/addons/profile_tools/__openerp__.py +++ b/addons/profile_tools/__openerp__.py @@ -29,7 +29,7 @@ 'complexity': "easy", "description": """ Installer for extra Hidden like lunch, survey, idea, share, etc. -=============================================================== +================================================================ Makes the Extra Hidden Configuration available from where you can install modules like share, lunch, pad, idea, survey and subscription. diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po index a36a04d3d48..c09610c09a5 100644 --- a/addons/purchase/i18n/pt_BR.po +++ b/addons/purchase/i18n/pt_BR.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-02-19 15:20+0000\n" -"Last-Translator: Rafael Sales - http://www.tompast.com.br \n" +"PO-Revision-Date: 2012-02-21 16:16+0000\n" +"Last-Translator: Luciano Schirmer (IG-Tech) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-20 05:39+0000\n" -"X-Generator: Launchpad (build 14833)\n" +"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" +"X-Generator: Launchpad (build 14838)\n" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -46,7 +46,7 @@ msgstr "Local Destino" #: code:addons/purchase/purchase.py:236 #, python-format msgid "In order to delete a purchase order, it must be cancelled first!" -msgstr "" +msgstr "Um pedido de compra deve ser cancelado antes de ser apagado!" #. module: purchase #: help:purchase.report,date:0 @@ -90,7 +90,7 @@ msgstr "" #. module: purchase #: view:purchase.order:0 msgid "Approved purchase order" -msgstr "" +msgstr "Pedido de compra aprovado" #. module: purchase #: view:purchase.order:0 field:purchase.order,partner_id:0 @@ -1552,7 +1552,7 @@ msgstr "Endereço Entrega Esperado:" #. module: purchase #: view:stock.picking:0 msgid "Journal" -msgstr "" +msgstr "Diário" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index a3135935045..3d909c1085e 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -163,7 +163,7 @@ class purchase_order(osv.osv): 'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, change_default=True), 'partner_address_id':fields.many2one('res.partner.address', 'Address', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},domain="[('partner_id', '=', partner_id)]"), - 'dest_address_id':fields.many2one('res.partner.address', 'Destination Address', domain="[('partner_id', '!=', False)]", + 'dest_address_id':fields.many2one('res.partner.address', 'Customer Address (Direct Delivery)', domain="[('partner_id', '!=', False)]", states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="Put an address if you want to deliver directly from the supplier to the customer." \ "In this case, it will remove the warehouse link and set the customer location." diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py index 481c92ee536..f0559d8800c 100644 --- a/addons/report_designer/__openerp__.py +++ b/addons/report_designer/__openerp__.py @@ -29,7 +29,7 @@ "category": "Tools", "description": """ Installer for reporting Hidden. -============================== +=============================== Makes the Reporting Hidden Configuration available from where you can install modules like base_report_designer and base_report_creator. diff --git a/addons/sale/i18n/es_CL.po b/addons/sale/i18n/es_CL.po index 15cbacc809f..9611d2fd2b6 100644 --- a/addons/sale/i18n/es_CL.po +++ b/addons/sale/i18n/es_CL.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2011-12-15 21:29+0000\n" -"Last-Translator: Francisco Reyes Acuña \n" +"PO-Revision-Date: 2012-02-21 07:26+0000\n" +"Last-Translator: felipemolinam \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-09 06:28+0000\n" -"X-Generator: Launchpad (build 14763)\n" +"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" +"X-Generator: Launchpad (build 14838)\n" #. module: sale #: field:sale.config.picking_policy,timesheet:0 @@ -51,7 +51,7 @@ msgstr "" #. module: sale #: help:sale.order,partner_shipping_id:0 msgid "Shipping address for current sales order." -msgstr "Dirección de envío para el pedido de venta actual." +msgstr "Dirección de envío para la actual orden de venta" #. module: sale #: field:sale.advance.payment.inv,qtty:0 report:sale.order:0 @@ -94,7 +94,7 @@ msgstr "IVA" #. module: sale #: model:process.node,note:sale.process_node_saleorderprocurement0 msgid "Drives procurement orders for every sales order line." -msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta." +msgstr "Genera órdenes de abastecimiento para cada línea de orden de venta." #. module: sale #: view:sale.report:0 field:sale.report,analytic_account_id:0 @@ -223,7 +223,7 @@ msgstr "Cantidades ordenadas" #. module: sale #: view:sale.report:0 msgid "Sales by Salesman" -msgstr "Ventas por comercial" +msgstr "Ventas por Ejecutivo" #. module: sale #: field:sale.order.line,move_ids:0 @@ -233,7 +233,7 @@ msgstr "Movimientos de inventario" #. module: sale #: field:sale.order,name:0 field:sale.order.line,order_id:0 msgid "Order Reference" -msgstr "Referencia del pedido" +msgstr "Referencia de pedido" #. module: sale #: view:sale.order:0 @@ -252,7 +252,7 @@ msgid "" "pick' or 'Invoice on order after delivery'." msgstr "" "La factura se crea de forma automática si la política de facturación es " -"\"Facturar desde el albarán\" o \"Facturar pedido después del envío\"." +"\"Facturar desde bodega\" o \"Facturar pedido después del envío\"." #. module: sale #: field:sale.config.picking_policy,task_work:0 @@ -301,7 +301,7 @@ msgstr "Empaquetado" #. module: sale #: model:process.transition,name:sale.process_transition_saleinvoice0 msgid "From a sales order" -msgstr "Desde un pedido de venta" +msgstr "Desde Orden de Venta" #. module: sale #: field:sale.shop,name:0 @@ -382,7 +382,7 @@ msgstr "Junio" #: code:addons/sale/sale.py:617 #, python-format msgid "Could not cancel this sales order !" -msgstr "¡No se puede cancelar este pedido de venta!" +msgstr "¡No es posible cancelar esta orden de venta!" #. module: sale #: model:ir.model,name:sale.model_sale_report @@ -412,7 +412,7 @@ msgstr "Presupuestos" #. module: sale #: help:sale.order,pricelist_id:0 msgid "Pricelist for current sales order." -msgstr "Tarifa para el pedido de venta actual." +msgstr "Tarifa para Orden de Venta actual" #. module: sale #: report:sale.order:0 @@ -1073,7 +1073,7 @@ msgstr "Total impuestos incluidos" #. module: sale #: model:process.transition,name:sale.process_transition_packing0 msgid "Create Pick List" -msgstr "Crear albarán" +msgstr "Crear guía de despacho" #. module: sale #: view:sale.report:0 @@ -1110,7 +1110,7 @@ msgstr "Volver a Crear factura" #: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice #: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice msgid "Deliveries to Invoice" -msgstr "Albaranes a facturar" +msgstr "Guías de despacho a facturar" #. module: sale #: selection:sale.order,state:0 selection:sale.report,state:0 @@ -1425,7 +1425,7 @@ msgstr "" #. module: sale #: view:sale.order:0 msgid "Recreate Packing" -msgstr "Recrear albarán" +msgstr "Regenerar guía de despacho" #. module: sale #: view:sale.order:0 field:sale.order.line,property_ids:0 @@ -1530,8 +1530,8 @@ msgstr "El importe sin impuestos." #, python-format msgid "You must first cancel all picking attached to this sales order." msgstr "" -"Debe primero cancelar todos los albaranes relacionados con este pedido de " -"venta." +"Debe primero cancelar todas las guías de despacho relacionadas con este " +"pedido de venta." #. module: sale #: model:ir.model,name:sale.model_sale_advance_payment_inv @@ -1626,6 +1626,10 @@ msgid "" "generates an invoice or a delivery order as soon as it is confirmed by the " "salesman." msgstr "" +"En función del control de facturación de los pedidos de venta, la factura " +"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un " +"pedido de venta puede generar una factura o una guía de despacho tan pronto " +"como sea confirmado por el comercial." #. module: sale #: code:addons/sale/sale.py:1251 @@ -1735,8 +1739,8 @@ msgstr "" msgid "" "This is a list of picking that has been generated for this sales order." msgstr "" -"Esta es la lista de albaranes que han sido generados para este pedido de " -"venta." +"Esta es la lista de guías de despacho que han sido generados para este " +"pedido de venta." #. module: sale #: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0 @@ -1810,10 +1814,10 @@ msgid "" "parts to the sales order. There is 1 pick list by sales order line which " "evolves with the availability of parts." msgstr "" -"El albarán se crea tan pronto como se confirma el pedido de venta, a la vez " -"que la orden de abastecimiento. Representa la asignación de los componentes " -"del pedido de venta. Hay un albarán por línea del pedido de venta que " -"evoluciona con la disponibilidad de los componentes." +"La guía de despacho se crea tan pronto como se confirma el pedido de venta, " +"a la vez que la orden de abastecimiento. Representa la asignación de los " +"componentes del pedido de venta. Hay una guía de despacho por línea del " +"pedido de venta que evoluciona con la disponibilidad de los componentes." #. module: sale #: selection:sale.order.line,state:0 @@ -2003,7 +2007,7 @@ msgstr "El importe de los impuestos." #. module: sale #: view:sale.order:0 msgid "Packings" -msgstr "Albaranes" +msgstr "Guías de despacho" #. module: sale #: view:sale.order.line:0 @@ -2253,7 +2257,7 @@ msgstr "Año" #. module: sale #: selection:sale.config.picking_policy,order_policy:0 msgid "Invoice Based on Deliveries" -msgstr "Facturar desde albaranes" +msgstr "Facturar desde guías de despacho" #~ msgid "Allows you to compute delivery costs on your quotations." #~ msgstr "Le permite calcular los costos de envío en sus presupuestos." diff --git a/addons/sale/i18n/es_CR.po b/addons/sale/i18n/es_CR.po index 0f7f0e59f10..ccbc55e3218 100644 --- a/addons/sale/i18n/es_CR.po +++ b/addons/sale/i18n/es_CR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 05:55+0000\n" +"X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n" "X-Generator: Launchpad (build 14838)\n" "Language: \n" diff --git a/addons/sale_order_dates/i18n/es_CR.po b/addons/sale_order_dates/i18n/es_CR.po index a81d2cc0901..22a94fc8d63 100644 --- a/addons/sale_order_dates/i18n/es_CR.po +++ b/addons/sale_order_dates/i18n/es_CR.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 05:56+0000\n" +"X-Launchpad-Export-Date: 2012-02-22 04:58+0000\n" "X-Generator: Launchpad (build 14838)\n" "Language: es\n" diff --git a/addons/share/i18n/es_CR.po b/addons/share/i18n/es_CR.po index 62022929fe0..a0fbfaaeaf8 100644 --- a/addons/share/i18n/es_CR.po +++ b/addons/share/i18n/es_CR.po @@ -8,41 +8,41 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-02-17 00:34+0000\n" -"Last-Translator: Carlos Vásquez (CLEARCORP) " -"\n" +"PO-Revision-Date: 2012-02-23 05:16+0000\n" +"Last-Translator: Freddy Gonzalez \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-18 04:59+0000\n" -"X-Generator: Launchpad (build 14814)\n" +"X-Launchpad-Export-Date: 2012-02-24 04:47+0000\n" +"X-Generator: Launchpad (build 14860)\n" "Language: es\n" #. module: share #: field:share.wizard,embed_option_title:0 msgid "Display title" -msgstr "" +msgstr "Título de la pantalla" #. module: share #: view:share.wizard:0 msgid "Access granted!" -msgstr "" +msgstr "Acceso garantizado" #. module: share #: field:share.wizard,user_type:0 msgid "Sharing method" -msgstr "" +msgstr "Compartir el método" #. module: share #: view:share.wizard:0 msgid "Share with these people (one e-mail per line)" msgstr "" +"Compartir con estas personas (un mensaje de correo electrónico por línea)" #. module: share #: field:share.wizard,name:0 msgid "Share Title" -msgstr "" +msgstr "Compartir el título" #. module: share #: model:ir.module.category,name:share.module_category_share @@ -52,19 +52,21 @@ msgstr "Compartir" #. module: share #: field:share.wizard,share_root_url:0 msgid "Share Access URL" -msgstr "" +msgstr "Compartir acceso URL" #. module: share #: code:addons/share/wizard/share_wizard.py:782 #, python-format msgid "You may use your current login (%s) and password to view them.\n" msgstr "" +"Usted puede usar su nombre de usuario actual (%s) y la contraseña para " +"verlos.\n" #. module: share #: code:addons/share/wizard/share_wizard.py:601 #, python-format msgid "(Modified)" -msgstr "" +msgstr "(Modificado)" #. module: share #: code:addons/share/wizard/share_wizard.py:769 @@ -73,6 +75,8 @@ msgid "" "The documents are not attached, you can view them online directly on my " "OpenERP server at:" msgstr "" +"Los documentos no se adjuntan, puede verlos en línea directamente en mi " +"servidor de OpenERP en:" #. module: share #: code:addons/share/wizard/share_wizard.py:579 @@ -90,13 +94,15 @@ msgstr "Compartir URL" #: code:addons/share/wizard/share_wizard.py:776 #, python-format msgid "These are your credentials to access this protected area:\n" -msgstr "" +msgstr "Estas son sus credenciales para acceder a esta área protegida:\n" #. module: share #: code:addons/share/wizard/share_wizard.py:643 #, python-format msgid "You must be a member of the Share/User group to use the share wizard" msgstr "" +"Usted debe ser un miembro del grupo Compartir / usuario para utilizar el " +"asistente de cuota de" #. module: share #: view:share.wizard:0 @@ -112,7 +118,7 @@ msgstr "Compartir" #: code:addons/share/wizard/share_wizard.py:551 #, python-format msgid "(Duplicated for modified sharing permissions)" -msgstr "" +msgstr "(Duplicados de permisos de uso compartido modificados)" #. module: share #: help:share.wizard,domain:0 @@ -127,7 +133,7 @@ msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!" #. module: share #: model:ir.model,name:share.model_ir_model_access msgid "ir.model.access" -msgstr "" +msgstr "ir.modelo.acceso" #. module: share #: view:share.wizard:0 @@ -143,13 +149,13 @@ msgstr "Nombre de usuario" #. module: share #: view:share.wizard:0 msgid "Sharing Options" -msgstr "" +msgstr "Opciones de compartición" #. module: share #: code:addons/share/wizard/share_wizard.py:765 #, python-format msgid "Hello," -msgstr "" +msgstr "Hola," #. module: share #: view:share.wizard:0 @@ -160,7 +166,7 @@ msgstr "Cerrar" #: code:addons/share/wizard/share_wizard.py:640 #, python-format msgid "Action and Access Mode are required to create a shared access" -msgstr "" +msgstr "Acción y modo de acceso es necesario para crear un acceso compartido" #. module: share #: view:share.wizard:0 @@ -178,6 +184,8 @@ msgid "" "The documents have been automatically added to your current OpenERP " "documents.\n" msgstr "" +"Los documentos se han añadido automáticamente a los documentos actuales de " +"OpenERP.\n" #. module: share #: view:share.wizard:0 @@ -208,11 +216,13 @@ msgstr "" #: help:share.wizard,name:0 msgid "Title for the share (displayed to users as menu and shortcut name)" msgstr "" +"Título de la cuota (que se muestra a los usuarios como el menú y el nombre " +"del acceso directo)" #. module: share #: view:share.wizard:0 msgid "Options" -msgstr "" +msgstr "Opciones" #. module: share #: view:res.groups:0 @@ -227,6 +237,9 @@ msgid "" "Sales, HR, etc.)\n" "It is open source and can be found on http://www.openerp.com." msgstr "" +"OpenERP es un potente y fácil de usar de aplicaciones empresariales (CRM, " +"ventas, recursos humanos, etc)\n" +"Es de código abierto y se puede encontrar en http://www.openerp.com." #. module: share #: field:share.wizard,action_id:0 @@ -236,7 +249,7 @@ msgstr "Acción a compartir" #. module: share #: view:share.wizard:0 msgid "Optional: include a personal message" -msgstr "" +msgstr "Opcional: incluir un mensaje personal" #. module: share #: field:res.users,share:0 @@ -248,11 +261,13 @@ msgstr "Usuario compartición" #, python-format msgid "Please indicate the emails of the persons to share with, one per line" msgstr "" +"Por favor, indique los correos electrónicos de las personas con quien " +"compartir, uno por línea" #. module: share #: field:share.wizard,embed_code:0 field:share.wizard.result.line,user_id:0 msgid "unknown" -msgstr "" +msgstr "Desconocido" #. module: share #: help:res.groups,share:0 @@ -299,12 +314,13 @@ msgstr "" #: code:addons/share/wizard/share_wizard.py:767 #, python-format msgid "I've shared %s with you!" -msgstr "" +msgstr "¡He compartido% s con usted!" #. module: share #: help:share.wizard,share_root_url:0 msgid "Main access page for users that are granted shared access" msgstr "" +"Página de acceso principal para los usuarios que tienen acceso compartido" #. module: share #: sql_constraint:res.groups:0 @@ -314,7 +330,7 @@ msgstr "¡El nombre del grupo debe ser único!" #. module: share #: model:res.groups,name:share.group_share_user msgid "User" -msgstr "" +msgstr "Usuario" #. module: share #: view:res.groups:0 @@ -336,7 +352,7 @@ msgstr "" #. module: share #: view:share.wizard:0 msgid "Use this link" -msgstr "" +msgstr "Use este enlace" #. module: share #: code:addons/share/wizard/share_wizard.py:779 @@ -363,12 +379,13 @@ msgstr "Acceso copiado para compartición" #. module: share #: model:ir.actions.act_window,name:share.action_share_wizard_step1 msgid "Share your documents" -msgstr "" +msgstr "Comparte tus documentos" #. module: share #: view:share.wizard:0 msgid "Or insert the following code where you want to embed your documents" msgstr "" +"O bien, introduzca el siguiente código donde desea incrustar los documentos" #. module: share #: view:share.wizard:0 @@ -376,6 +393,8 @@ msgid "" "An e-mail notification with instructions has been sent to the following " "people:" msgstr "" +"Una notificación por correo electrónico con las instrucciones que ha sido " +"enviado a las siguientes personas:" #. module: share #: model:ir.model,name:share.model_share_wizard_result_line @@ -391,23 +410,25 @@ msgstr "" #. module: share #: field:share.wizard,view_type:0 msgid "Current View Type" -msgstr "" +msgstr "Tipo de vista actual" #. module: share #: selection:share.wizard,access_mode:0 msgid "Can view" -msgstr "" +msgstr "Puede Ver" #. module: share #: selection:share.wizard,access_mode:0 msgid "Can edit" -msgstr "" +msgstr "Puede Editar" #. module: share #: help:share.wizard,message:0 msgid "" "An optional personal message, to be included in the e-mail notification." msgstr "" +"Un mensaje personal opcional, que se incluirá en la notificación por correo " +"electrónico." #. module: share #: model:ir.model,name:share.model_res_users @@ -419,7 +440,7 @@ msgstr "res.usuarios" #: code:addons/share/wizard/share_wizard.py:635 #, python-format msgid "Sharing access could not be created" -msgstr "" +msgstr "El acceso compartido, no se pudo crear" #. module: share #: help:res.users,share:0 @@ -441,7 +462,7 @@ msgstr "Asistente de compartición" #: code:addons/share/wizard/share_wizard.py:740 #, python-format msgid "Shared access created!" -msgstr "" +msgstr "¡Acceso compartido creado!" #. module: share #: model:res.groups,comment:share.group_share_user @@ -450,6 +471,10 @@ msgid "" "Members of this groups have access to the sharing wizard, which allows them " "to invite external users to view or edit some of their documents." msgstr "" +"\n" +"Los miembros de este grupo tienen acceso al Asistente para compartir, lo que " +"les permite invitar a usuarios externos para ver o editar algunas de sus " +"documentos." #. module: share #: model:ir.model,name:share.model_res_groups @@ -466,23 +491,23 @@ msgstr "Contraseña" #. module: share #: field:share.wizard,new_users:0 msgid "Emails" -msgstr "" +msgstr "Correos electrónicos" #. module: share #: field:share.wizard,embed_option_search:0 msgid "Display search view" -msgstr "" +msgstr "Mostrar Vista de búsqueda" #. module: share #: code:addons/share/wizard/share_wizard.py:197 #, python-format msgid "No e-mail address configured" -msgstr "" +msgstr "No hay dirección de correo electrónico configurado" #. module: share #: field:share.wizard,message:0 msgid "Personal Message" -msgstr "" +msgstr "Mensaje personal" #. module: share #: code:addons/share/wizard/share_wizard.py:763 @@ -497,7 +522,7 @@ msgstr "" #. module: share #: field:share.wizard.result.line,login:0 msgid "Login" -msgstr "" +msgstr "Iniciar sesión" #. module: share #: view:res.users:0 @@ -512,7 +537,7 @@ msgstr "Modo de acceso" #. module: share #: view:share.wizard:0 msgid "Sharing: preparation" -msgstr "" +msgstr "Compartir: la preparación" #. module: share #: code:addons/share/wizard/share_wizard.py:198 @@ -521,21 +546,24 @@ msgid "" "You must configure your e-mail address in the user preferences before using " "the Share button." msgstr "" +"Usted debe configurar su dirección de correo electrónico en las preferencias " +"del usuario antes de utilizar el botón Compartir." #. module: share #: help:share.wizard,access_mode:0 msgid "Access rights to be granted on the shared documents." msgstr "" +"Los derechos de acceso que se conceden en los documentos compartidos." #. openerp-web #: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:8 msgid "Link or embed..." -msgstr "" +msgstr "Vincular o incrustar ......" #. openerp-web #: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:9 msgid "Share with..." -msgstr "" +msgstr "Compartir con ..." #~ msgid "Read & Write" #~ msgstr "Lectura y escritura" diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js index 05f45aaef42..a4dfba12e28 100644 --- a/addons/share/static/src/js/share.js +++ b/addons/share/static/src/js/share.js @@ -2,7 +2,7 @@ openerp.share = function(session) { function launch_wizard(self, view, user_type) { - var action = view.widget_parent.action; + var action = view.getParent().action; var Share = new session.web.DataSet(self, 'share.wizard', view.dataset.get_context()); var domain = new session.web.CompoundDomain(view.dataset.domain); if (view.fields_view.type == 'form') { @@ -57,7 +57,7 @@ session.web.Sidebar = session.web.Sidebar.extend({ }); }, on_sidebar_click_share: function(item) { - var view = this.widget_parent + var view = this.getParent() launch_wizard(this, view); }, }); diff --git a/addons/stock/i18n/es_CL.po b/addons/stock/i18n/es_CL.po index 085266f9aec..253ca4bb449 100644 --- a/addons/stock/i18n/es_CL.po +++ b/addons/stock/i18n/es_CL.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2011-10-05 16:52+0000\n" +"PO-Revision-Date: 2012-02-21 08:03+0000\n" "Last-Translator: Francisco Reyes Acuña \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-09 06:01+0000\n" -"X-Generator: Launchpad (build 14763)\n" +"X-Launchpad-Export-Date: 2012-02-22 04:56+0000\n" +"X-Generator: Launchpad (build 14838)\n" #. module: stock #: field:product.product,track_outgoing:0 @@ -134,7 +134,7 @@ msgstr "" #. module: stock #: view:stock.picking:0 msgid "Picking list" -msgstr "Albarán" +msgstr "Guía de despacho" #. module: stock #: report:lot.stock.overview:0 report:lot.stock.overview_all:0 @@ -203,7 +203,7 @@ msgstr "" #: code:addons/stock/stock.py:2516 #, python-format msgid "Missing partial picking data for move #%s" -msgstr "Faltan datos del albarán parcial para el movimiento #%s" +msgstr "Faltan datos de la guía de despacho parcial para el movimiento #%s" #. module: stock #: model:ir.actions.server,name:stock.action_partial_move_server @@ -241,9 +241,9 @@ msgid "" "if you really want to change it ' # 'for " "this product: \"%s\" (id: %d)" msgstr "" -"La línea de movimiento actual ya está asignada a un albarán, elimínela " -"primero si realmente quiere cambiarla ' # 'para este este producto: \"%s\" " -"(id: %d)" +"La línea de movimiento actual ya está asignada a una guía de despacho, " +"elimínela primero si realmente quiere cambiarla ' # 'para este este " +"producto: \"%s\" (id: %d)" #. module: stock #: selection:stock.picking,invoice_state:0 @@ -309,8 +309,8 @@ msgstr "" #, python-format msgid "You cannot cancel picking because stock move is in done state !" msgstr "" -"¡No puede cancelar el albarán porqué el movimiento de stock está en estado " -"realizado!" +"¡No puede cancelar la guiá de despacho porqué el movimiento de stock está en " +"estado realizado!" #. module: stock #: code:addons/stock/stock.py:2337 code:addons/stock/stock.py:2379 @@ -548,7 +548,7 @@ msgstr "" #: model:ir.ui.menu,name:stock.menu_action_picking_tree6 #: field:stock.picking,move_lines:0 msgid "Internal Moves" -msgstr "Albaranes internos" +msgstr "Guías de despacho internas" #. module: stock #: field:stock.move,location_dest_id:0 @@ -1413,7 +1413,7 @@ msgstr "" #, python-format msgid "You may only return pickings that are Confirmed, Available or Done!" msgstr "" -"¡Sólo puede devolver albaranes que estén confirmados, disponibles o " +"¡Sólo puede devolver guiás de despacho que estén confirmados, disponibles o " "realizados!" #. module: stock @@ -1429,7 +1429,7 @@ msgstr "Revisiones de lote de producción" #. module: stock #: view:stock.picking:0 msgid "Internal Picking List" -msgstr "Albarán interno" +msgstr "Guía de despacho interna" #. module: stock #: selection:report.stock.inventory,state:0 @@ -1486,7 +1486,7 @@ msgstr "" #. module: stock #: report:stock.picking.list:0 msgid "Picking List:" -msgstr "Albarán:" +msgstr "Guía de despacho:" #. module: stock #: field:stock.inventory,date:0 field:stock.move,create_date:0 @@ -1684,8 +1684,8 @@ msgid "" "If this picking was split this field links to the picking that contains the " "other part that has been processed already." msgstr "" -"Si este albarán se dividió, este campo enlaza con el albarán que contiene la " -"otra parte que ya ha sido procesada." +"Si esta guía de despacho se dividió, este campo enlaza con la guía de " +"despacho que contiene la otra parte que ya ha sido procesada." #. module: stock #: model:ir.model,name:stock.model_report_stock_inventory @@ -1871,7 +1871,7 @@ msgstr "Productos de desecho" #: code:addons/stock/stock.py:1157 #, python-format msgid "You cannot remove the picking which is in %s state !" -msgstr "¡No puede eliminar el albarán que está en estado %s!" +msgstr "¡No puede eliminar la guía de despacho que está en estado %s!" #. module: stock #: view:stock.inventory.line.split:0 view:stock.move.consume:0 @@ -1883,7 +1883,7 @@ msgstr "Cancelar" #: model:ir.actions.act_window,name:stock.act_stock_return_picking #: model:ir.model,name:stock.model_stock_return_picking msgid "Return Picking" -msgstr "Devolver albarán" +msgstr "Devolver guía de despacho" #. module: stock #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0 @@ -2215,7 +2215,7 @@ msgstr "Documento" #. module: stock #: view:stock.picking:0 msgid "Input Picking List" -msgstr "Albarán de entrada" +msgstr "Guía de despacho de entrada" #. module: stock #: field:stock.move,product_uom:0 field:stock.partial.move.line,product_uom:0 @@ -2391,7 +2391,7 @@ msgstr "Operación prohibida" #. module: stock #: help:stock.picking,min_date:0 msgid "Expected date for the picking to be processed" -msgstr "Fecha prevista para procesar el albarán." +msgstr "Fecha prevista para procesar el guía de despacho." #. module: stock #: code:addons/stock/product.py:435 @@ -2504,7 +2504,7 @@ msgstr "Inventario" #. module: stock #: model:ir.model,name:stock.model_stock_picking msgid "Picking List" -msgstr "Albarán" +msgstr "LIsta de guías de despacho" #. module: stock #: sql_constraint:stock.production.lot:0 @@ -2939,7 +2939,8 @@ msgstr "Fecha realización" msgid "" "Please put a partner on the picking list if you want to generate invoice." msgstr "" -"Por favor indique una empresa en el albarán si desea generar factura." +"Por favor indique una empresa en la guía de despacho si desea generar una " +"factura." #. module: stock #: selection:stock.move,priority:0 diff --git a/addons/stock/i18n/es_CR.po b/addons/stock/i18n/es_CR.po index 8feaf19cd2d..bf6488b4b24 100644 --- a/addons/stock/i18n/es_CR.po +++ b/addons/stock/i18n/es_CR.po @@ -7,15 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-02-17 00:34+0000\n" -"Last-Translator: Carlos Vásquez (CLEARCORP) " -"\n" +"PO-Revision-Date: 2012-02-23 05:47+0000\n" +"Last-Translator: Freddy Gonzalez \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-18 04:57+0000\n" -"X-Generator: Launchpad (build 14814)\n" +"X-Launchpad-Export-Date: 2012-02-24 04:47+0000\n" +"X-Generator: Launchpad (build 14860)\n" "Language: \n" #. module: stock @@ -26,7 +25,7 @@ msgstr "Lotes de seguimiento en salida" #. module: stock #: model:ir.model,name:stock.model_stock_move_split_lines msgid "Stock move Split lines" -msgstr "" +msgstr "Stock se líneas se mueven en división" #. module: stock #: help:product.category,property_stock_account_input_categ:0 @@ -37,6 +36,12 @@ msgid "" "value for all products in this category. It can also directly be set on each " "product" msgstr "" +"Cuando se realiza en tiempo real de valuación de inventarios, artículos de " +"revistas de contraparte para todos los movimientos de stock entrantes serán " +"publicados en esta cuenta, a menos que exista un conjunto de valoración " +"específica de la cuenta en la ubicación de origen. Este es el valor por " +"defecto para todos los productos de esta categoría. También puede " +"directamente establecer en cada producto" #. module: stock #: field:stock.location,chained_location_id:0 @@ -79,7 +84,7 @@ msgstr "Número de revisión" #. module: stock #: view:stock.move:0 msgid "Orders processed Today or planned for Today" -msgstr "" +msgstr "Hoy en día los pedidos procesados ​​o previstas para hoy" #. module: stock #: view:stock.partial.move.line:0 view:stock.partial.picking:0 @@ -91,7 +96,7 @@ msgstr "Movimientos productos" #. module: stock #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action msgid "UoM Categories" -msgstr "" +msgstr "Categorías UdM" #. module: stock #: model:ir.actions.act_window,name:stock.action_stock_move_report @@ -131,7 +136,7 @@ msgstr "" #: code:addons/stock/wizard/stock_change_product_qty.py:87 #, python-format msgid "Quantity cannot be negative." -msgstr "" +msgstr "Cantidad no puede ser negativa." #. module: stock #: view:stock.picking:0 @@ -193,13 +198,13 @@ msgstr "Diario de inventario" #. module: stock #: view:report.stock.inventory:0 view:report.stock.move:0 msgid "Current month" -msgstr "" +msgstr "Mes actual" #. module: stock #: code:addons/stock/wizard/stock_move.py:222 #, python-format msgid "Unable to assign all lots to this move!" -msgstr "" +msgstr "¡No se puede asignar todos los lotes de este movimiento!" #. module: stock #: code:addons/stock/stock.py:2516 @@ -222,18 +227,18 @@ msgstr "¡No puede eliminar ningún registro!" #. module: stock #: view:stock.picking:0 msgid "Delivery orders to invoice" -msgstr "" +msgstr "Órdenes de entrega de la factura" #. module: stock #: view:stock.picking:0 msgid "Assigned Delivery Orders" -msgstr "" +msgstr "Asignación de órdenes de entrega" #. module: stock #: field:stock.partial.move.line,update_cost:0 #: field:stock.partial.picking.line,update_cost:0 msgid "Need cost update" -msgstr "" +msgstr "Necesita actualización de costos" #. module: stock #: code:addons/stock/wizard/stock_splitinto.py:49 @@ -304,7 +309,7 @@ msgstr "" #. module: stock #: view:stock.partial.move:0 view:stock.partial.picking:0 msgid "_Validate" -msgstr "" +msgstr "_Validar" #. module: stock #: code:addons/stock/stock.py:1149 @@ -345,6 +350,9 @@ msgid "" "Can not create Journal Entry, Input Account defined on this product and " "Valuation account on category of this product are same." msgstr "" +"No se puede crear entrada del diario, cuenta de entrada se define en esta " +"cuenta los productos y Valoración de la categoría de este producto son los " +"mismos." #. module: stock #: selection:stock.return.picking,invoice_state:0 @@ -354,7 +362,7 @@ msgstr "No facturación" #. module: stock #: view:stock.move:0 msgid "Stock moves that have been processed" -msgstr "" +msgstr "Movimientos de stock que se han procesado" #. module: stock #: model:ir.model,name:stock.model_stock_production_lot @@ -376,7 +384,7 @@ msgstr "Movimientos para este paquete" #. module: stock #: view:stock.picking:0 msgid "Incoming Shipments Available" -msgstr "" +msgstr "Envíos entrantes disponibles" #. module: stock #: selection:report.stock.inventory,location_type:0 @@ -474,7 +482,7 @@ msgstr "Dividir en" #. module: stock #: view:stock.location:0 msgid "Internal Locations" -msgstr "" +msgstr "Ubicaciones Internas" #. module: stock #: field:stock.move,price_currency_id:0 @@ -560,7 +568,7 @@ msgstr "Ubicación destino" #. module: stock #: model:ir.model,name:stock.model_stock_partial_move_line msgid "stock.partial.move.line" -msgstr "" +msgstr "stock.partial.move.line" #. module: stock #: code:addons/stock/stock.py:760 @@ -616,7 +624,7 @@ msgstr "Ubicación / Producto" #. module: stock #: field:stock.move,address_id:0 msgid "Destination Address " -msgstr "" +msgstr "Dirección de destino " #. module: stock #: code:addons/stock/stock.py:1333 @@ -664,6 +672,12 @@ msgid "" "queries regarding your account, please contact us.\n" "Thank you in advance.\n" msgstr "" +"Nuestros registros indican que los siguientes pagos siguen siendo debidos. " +"Si la cantidad\n" +"ya ha sido pagada, por favor ignore este aviso. Sin embargo, si usted tiene " +"cualquiera\n" +"consultas sobre su cuenta, póngase en contacto con nosotros.\n" +"Gracias de antemano.\n" #. module: stock #: view:stock.inventory:0 @@ -678,11 +692,15 @@ msgid "" "according to the original purchase order. You can validate the shipment " "totally or partially." msgstr "" +"Los envíos entrantes es la lista de todas las órdenes que recibe de sus " +"proveedores. Un envío entrante contiene una lista de productos que se " +"reciban de acuerdo con la orden de compra original. Puede validar el envío " +"total o parcialmente." #. module: stock #: field:stock.move.split.lines,wizard_exist_id:0 msgid "Parent Wizard (for existing lines)" -msgstr "" +msgstr "Asistente de Padres (para las líneas existentes)" #. module: stock #: view:stock.move:0 view:stock.picking:0 @@ -696,6 +714,8 @@ msgid "" "There is no inventory Valuation account defined on the product category: " "\"%s\" (id: %d)" msgstr "" +"No hay ninguna cuenta de evaluación de inventario definido en la categoría " +"de producto: \"%s\" (id:% d)" #. module: stock #: view:report.stock.move:0 @@ -753,7 +773,7 @@ msgstr "Destinatario" #. module: stock #: model:stock.location,name:stock.location_refrigerator msgid "Refrigerator" -msgstr "" +msgstr "Refrigerador" #. module: stock #: model:ir.actions.act_window,name:stock.action_location_tree @@ -789,7 +809,7 @@ msgstr "Procesar albarán" #. module: stock #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "¡La referencia debe ser única por compañía!" #. module: stock #: code:addons/stock/product.py:417 @@ -816,7 +836,7 @@ msgstr "" #: code:addons/stock/product.py:75 #, python-format msgid "Valuation Account is not specified for Product Category: %s" -msgstr "" +msgstr "Cuenta de valuación no se especifica la categoría del producto:%s" #. module: stock #: field:stock.move,move_dest_id:0 @@ -890,7 +910,7 @@ msgstr "Cambiar cantidad producto" #. module: stock #: field:report.stock.inventory,month:0 msgid "unknown" -msgstr "" +msgstr "Desconocido" #. module: stock #: model:ir.model,name:stock.model_stock_inventory_merge @@ -950,7 +970,7 @@ msgstr "Buscar paquete" #. module: stock #: view:stock.picking:0 msgid "Pickings already processed" -msgstr "" +msgstr "Ganancias ya procesadas" #. module: stock #: field:stock.partial.move.line,currency:0 @@ -967,7 +987,7 @@ msgstr "Diario" #: code:addons/stock/stock.py:1345 #, python-format msgid "is scheduled %s." -msgstr "" +msgstr "Está previsto%s." #. module: stock #: help:stock.picking,location_id:0 @@ -993,7 +1013,7 @@ msgstr "Tiempo inicial de ejecución (días)" #. module: stock #: model:ir.model,name:stock.model_stock_partial_move msgid "Partial Move Processing Wizard" -msgstr "" +msgstr "Mover de procesamiento parcial Asistente" #. module: stock #: model:ir.actions.act_window,name:stock.act_stock_product_location_open @@ -1032,7 +1052,7 @@ msgstr "" #. module: stock #: view:stock.picking:0 msgid "Confirmed Pickings" -msgstr "" +msgstr "Ganancias confirmadas" #. module: stock #: field:stock.location,stock_virtual:0 @@ -1048,7 +1068,7 @@ msgstr "Vista" #. module: stock #: view:report.stock.inventory:0 view:report.stock.move:0 msgid "Last month" -msgstr "" +msgstr "Último mes" #. module: stock #: field:stock.location,parent_left:0 @@ -1058,13 +1078,13 @@ msgstr "Padre izquierdo" #. module: stock #: field:product.category,property_stock_valuation_account_id:0 msgid "Stock Valuation Account" -msgstr "" +msgstr "Valore de cuenta de evaluación" #. module: stock #: code:addons/stock/stock.py:1349 #, python-format msgid "is waiting." -msgstr "" +msgstr "esta esperando." #. module: stock #: constraint:product.product:0 @@ -1176,6 +1196,8 @@ msgid "" "In order to cancel this inventory, you must first unpost related journal " "entries." msgstr "" +"Para cancelar este inventario, primero debe Quitar la asociación de revistas " +"relacionadas con las entradas." #. module: stock #: field:stock.picking,date_done:0 @@ -1189,11 +1211,13 @@ msgid "" "The uom rounding does not allow you to ship \"%s %s\", only roundings of " "\"%s %s\" is accepted by the uom." msgstr "" +"El redondeo de la UOM no le permite enviar \"%s%s\", redondeos sólo de " +"\"%s%s\" es aceptado por la UOM." #. module: stock #: view:stock.move:0 msgid "Stock moves that are Available (Ready to process)" -msgstr "" +msgstr "Se mueve de archivo que están disponibles (listo para procesar)" #. module: stock #: report:stock.picking.list:0 @@ -1258,7 +1282,7 @@ msgstr "Ubicaciones de empresas" #. module: stock #: view:report.stock.inventory:0 view:report.stock.move:0 msgid "Current year" -msgstr "" +msgstr "Año actual" #. module: stock #: view:report.stock.inventory:0 view:report.stock.move:0 @@ -1315,7 +1339,7 @@ msgstr "Albarán:" #. module: stock #: selection:stock.move,state:0 msgid "Waiting Another Move" -msgstr "" +msgstr "Esperando mover otro" #. module: stock #: help:product.template,property_stock_production:0 @@ -1331,7 +1355,7 @@ msgstr "" #. module: stock #: view:product.product:0 msgid "Expected Stock Variations" -msgstr "" +msgstr "Esperados variaciones de las existencias" #. module: stock #: help:stock.move,price_unit:0 @@ -1408,7 +1432,7 @@ msgstr "Desde" #. module: stock #: view:stock.picking:0 msgid "Incoming Shipments already processed" -msgstr "" +msgstr "Envíos entrantes ya procesados" #. module: stock #: code:addons/stock/wizard/stock_return_picking.py:99 @@ -1463,7 +1487,7 @@ msgstr "Tipo" #. module: stock #: view:stock.picking:0 msgid "Available Pickings" -msgstr "" +msgstr "Ganancias disponible" #. module: stock #: model:stock.location,name:stock.stock_location_5 @@ -1473,7 +1497,7 @@ msgstr "Proveedores TI genéricos" #. module: stock #: view:stock.move:0 msgid "Stock to be receive" -msgstr "" +msgstr "Archivo que se reciben" #. module: stock #: help:stock.location,valuation_out_account_id:0 @@ -1484,6 +1508,12 @@ msgid "" "the generic Stock Output Account set on the product. This has no effect for " "internal locations." msgstr "" +"Se utiliza para la valoración de inventario en tiempo real. Cuando se está " +"en una ubicación virtual (tipo interno no), esta cuenta se utiliza para " +"mantener el valor de los productos que se mueven fuera de este lugar y en " +"una ubicación interna, en lugar de la Cuenta de la salida genérica " +"establecida en el producto. Esto no tiene efecto para las ubicaciones de " +"internos." #. module: stock #: report:stock.picking.list:0 @@ -1527,7 +1557,7 @@ msgstr "Sólo puede eliminar movimientos borrador." #. module: stock #: model:ir.model,name:stock.model_stock_inventory_line_split_lines msgid "Inventory Split lines" -msgstr "" +msgstr "Lineas de inventario dividido" #. module: stock #: model:ir.actions.report.xml,name:stock.report_location_overview @@ -1544,6 +1574,8 @@ msgstr "Información general" #: view:report.stock.inventory:0 msgid "Analysis including future moves (similar to virtual stock)" msgstr "" +"El análisis incluye los movimientos futuros (similares a las existencias " +"virtual)" #. module: stock #: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0 @@ -1577,7 +1609,7 @@ msgstr "Fecha orden" #: code:addons/stock/wizard/stock_change_product_qty.py:88 #, python-format msgid "INV: %s" -msgstr "" +msgstr "INV: %s" #. module: stock #: view:stock.location:0 field:stock.location,location_id:0 @@ -1696,7 +1728,7 @@ msgstr "Estadísticas de stock" #. module: stock #: view:report.stock.move:0 msgid "Month Planned" -msgstr "" +msgstr "Mes Planeado" #. module: stock #: field:product.product,track_production:0 @@ -1706,12 +1738,12 @@ msgstr "Lotes seguimiento de fabricación" #. module: stock #: view:stock.picking:0 msgid "Is a Back Order" -msgstr "" +msgstr "Es un pedido pendiente" #. module: stock #: field:stock.location,valuation_out_account_id:0 msgid "Stock Valuation Account (Outgoing)" -msgstr "" +msgstr "Existencia de cuenta de evaluación (de salida)" #. module: stock #: model:ir.actions.act_window,name:stock.act_product_stock_move_open @@ -1752,7 +1784,7 @@ msgstr "Movimientos creados" #. module: stock #: field:stock.location,valuation_in_account_id:0 msgid "Stock Valuation Account (Incoming)" -msgstr "" +msgstr "Existencia de cuenta de evaluación (entrante)" #. module: stock #: model:stock.location,name:stock.stock_location_14 @@ -1804,6 +1836,11 @@ msgid "" "specific valuation account set on the destination location. When not set on " "the product, the one from the product category is used." msgstr "" +"Cuando se realiza en tiempo real de valuación de inventarios, artículos de " +"revistas de contraparte para todos los movimientos de valores de salida se " +"publicará en esta cuenta, a menos que exista un conjunto de valoración " +"específica de la cuenta en la ubicación de destino. Cuando no se establece " +"en el producto, la una de la categoría de producto se utiliza." #. module: stock #: view:report.stock.move:0 diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po index 878b6e7b3f4..95be6ee67ce 100644 --- a/addons/stock/i18n/nl.po +++ b/addons/stock/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-02-20 13:51+0000\n" +"PO-Revision-Date: 2012-02-21 15:51+0000\n" "Last-Translator: Erwin \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-21 05:54+0000\n" +"X-Launchpad-Export-Date: 2012-02-22 04:56+0000\n" "X-Generator: Launchpad (build 14838)\n" #. module: stock @@ -2705,7 +2705,7 @@ msgstr "" #. module: stock #: model:stock.location,name:stock.stock_location_company msgid "Your Company" -msgstr "uw bedrijf" +msgstr "Uw bedrijf" #. module: stock #: constraint:stock.move:0 diff --git a/addons/stock_planning/i18n/es_CR.po b/addons/stock_planning/i18n/es_CR.po index 30ad8477427..f4fc0a732f3 100644 --- a/addons/stock_planning/i18n/es_CR.po +++ b/addons/stock_planning/i18n/es_CR.po @@ -8,15 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2012-02-17 00:37+0000\n" -"Last-Translator: Carlos Vásquez (CLEARCORP) " -"\n" +"PO-Revision-Date: 2012-02-22 22:27+0000\n" +"Last-Translator: Freddy Gonzalez \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-02-18 04:59+0000\n" -"X-Generator: Launchpad (build 14814)\n" +"X-Launchpad-Export-Date: 2012-02-23 04:39+0000\n" +"X-Generator: Launchpad (build 14855)\n" "Language: es\n" #. module: stock_planning @@ -173,6 +172,10 @@ msgid "" "are independent of financial periods. If you need periods other than day-, " "week- or month-based, you may also add then manually." msgstr "" +"Este asistente le ayuda con la creación de periodos de planificación de " +"acciones. Estos períodos son independientes de los ejercicios económicos. Si " +"necesita otros períodos de día, semana o mes base, también se puede añadir a " +"continuación de forma manual." #. module: stock_planning #: view:stock.period.createlines:0 @@ -198,6 +201,7 @@ msgstr "Todos los productos con previsión" #: help:stock.planning,maximum_op:0 msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse" msgstr "" +"Cantidad máxima fijada en las Reglas mínimas para el archivo de almacenes" #. module: stock_planning #: view:stock.sale.forecast:0 @@ -210,6 +214,9 @@ msgid "" "Check to make procurement to stock location of selected warehouse. If not " "selected procurement will be made into input location of warehouse." msgstr "" +"Verifique que las adquisiciones de valores a la ubicación del almacén " +"seleccionado. Si no se selecciona la contratación se hará en el lugar de " +"entrada del almacén." #. module: stock_planning #: help:stock.planning,already_in:0 @@ -414,6 +421,17 @@ msgid "" " \n" " Stock Simulation: %s Minimum stock: %s" msgstr "" +" Contratación creada por MPS para el usuario:% s Fecha de creación:% s\n" +" Para el periodo de:% s\n" +" acuerdo con el estado:\n" +" Pronóstico de almacén:% s\n" +" Stock inicial:% s\n" +" Planificación de salida:% s programa En: %s\n" +" Ya de salida:% s ya se encuentran en: %s\n" +" Confirmado salida:% s Confirmado En: %s\n" +" Planeado Antes:% s Confirmado En Antes: %s\n" +" Se espera de salida: Izquierda entrante%s : %s\n" +" Simulación de archivo: Stock mínimo de%s: %s" #. module: stock_planning #: code:addons/stock_planning/stock_planning.py:626 @@ -460,7 +478,7 @@ msgstr "Cantidad stock un día antes del periodo actual." #. module: stock_planning #: view:stock.planning:0 msgid "Procurement history" -msgstr "" +msgstr "Historia de Contratación" #. module: stock_planning #: help:stock.planning,product_uom:0 @@ -468,6 +486,9 @@ msgid "" "Unit of Measure used to show the quantities of stock calculation.You can use " "units from default category or from second category (UoS category)." msgstr "" +"Unidad de medida utilizada para mostrar las cantidades de existencias " +"calculation.You puede utilizar unidades de la categoría por defecto o de " +"segunda categoría (categoría EES)." #. module: stock_planning #: view:stock.period.createlines:0 @@ -481,6 +502,9 @@ msgid "" "account periods. You can use wizard for creating periods and review them " "here." msgstr "" +"Períodos de archivo se utilizan para la planificación de acciones. Períodos " +"de archivo son independientes de los períodos de la cuenta. Usted puede " +"utilizar el asistente para la creación de periodos y revisar aquí." #. module: stock_planning #: view:stock.planning:0 @@ -511,6 +535,8 @@ msgstr "Previsión de la compañía" #: help:stock.planning,minimum_op:0 msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse" msgstr "" +"La cantidad mínima establecida en las Reglas mínimas para el archivo de " +"almacenes" #. module: stock_planning #: view:stock.sale.forecast:0 @@ -546,7 +572,7 @@ msgstr "" #: code:addons/stock_planning/stock_planning.py:146 #, python-format msgid "Cannot delete a validated sales forecast!" -msgstr "" +msgstr "¡No se puede eliminar una previsión de ventas validado!" #. module: stock_planning #: field:stock.sale.forecast,analyzed_period5_per_company:0 @@ -561,7 +587,7 @@ msgstr "UdM de producto" #. module: stock_planning #: field:stock.sale.forecast,analyzed_period1_per_company:0 msgid "This Company Period1" -msgstr "" +msgstr "Esta compañía periodo1" #. module: stock_planning #: field:stock.sale.forecast,analyzed_period2_per_company:0 @@ -607,7 +633,7 @@ msgstr "Salidas planificadas" #. module: stock_planning #: field:stock.sale.forecast,product_qty:0 msgid "Forecast Quantity" -msgstr "" +msgstr "Pronóstico de cantidad" #. module: stock_planning #: view:stock.planning:0 @@ -638,6 +664,9 @@ msgid "" "Unit of Measure used to show the quantities of stock calculation.You can use " "units form default category or from second category (UoS category)." msgstr "" +"Unidad de medida utilizada para mostrar las cantidades de existencias " +"calculation.You puede utilizar unidades forman categoría por defecto o de " +"segunda categoría (categoría EES)." #. module: stock_planning #: view:stock.planning:0 @@ -660,7 +689,7 @@ msgstr "" #. module: stock_planning #: view:stock.period:0 msgid "Current Periods" -msgstr "" +msgstr "Períodos actuales" #. module: stock_planning #: view:stock.planning:0 @@ -671,7 +700,7 @@ msgstr "Suministro interno" #: code:addons/stock_planning/stock_planning.py:724 #, python-format msgid "%s Pick List %s (%s, %s) %s %s \n" -msgstr "" +msgstr "%s lista de selección%s (%s,%s)%s%s \n" #. module: stock_planning #: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form @@ -712,6 +741,9 @@ msgid "" "warehouse, so you don't have to create them one by one. The wizard doesn't " "duplicate lines if they already exist for this selection." msgstr "" +"Este asistente ayuda a crear líneas de MPS de planificación para un período " +"determinado seleccionado y el almacén, por lo que no tiene que crearlos uno " +"por uno. El asistente no duplicar líneas, si ya existen para esta selección." #. module: stock_planning #: field:stock.planning,outgoing:0 @@ -753,7 +785,7 @@ msgstr "Almacén origen" #. module: stock_planning #: help:stock.sale.forecast,product_qty:0 msgid "Forecast Product quantity." -msgstr "" +msgstr "Pronóstico de cantidad del producto." #. module: stock_planning #: field:stock.planning,stock_supply_location:0 @@ -781,7 +813,7 @@ msgstr "" #: code:addons/stock_planning/stock_planning.py:702 #, python-format msgid "MPS(%s) %s" -msgstr "" +msgstr "MPS (%s)%s" #. module: stock_planning #: field:stock.planning,already_in:0 @@ -803,6 +835,11 @@ msgid "" "manual procurement with this forecast when some periods are exceptional for " "usual minimum stock rules." msgstr "" +"Esta previsión cantidad de ventas es una indicación de Stock Planner para " +"hacer compras de forma manual o automática para complementar las " +"adquisiciones. Puede utilizar la contratación manual con esta previsión, " +"cuando algunos períodos son excepcionales para las reglas usuales de " +"existencias mínimas." #. module: stock_planning #: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form @@ -818,6 +855,17 @@ msgid "" "can trigger the procurement of what is missing to reach your desired " "quantities" msgstr "" +"El programa de adquisiciones maestro puede ser el principal motor para la " +"reposición de almacén, o puede complementar la programación automática de " +"planificación de necesidades (normas mínimas de derechos, etc.)\n" +"Cada línea MPS le da una visión pre-computados de las cantidades que entran " +"y salen de un determinado producto durante un período determinado archivo en " +"un almacén determinado, sobre la base de los niveles de stock actuales y " +"futuras,\n" +"así como los movimientos de stock planificadas. Las cantidades previstas se " +"puede modificar de forma manual, y cuando esté satisfecho con el resultado " +"(simulado) la cantidad de archivo, puede desencadenar la adquisición de lo " +"que falta para llegar a sus cantidades deseadas" #. module: stock_planning #: code:addons/stock_planning/stock_planning.py:685 @@ -836,6 +884,16 @@ msgid "" " Expected Out: %s Incoming Left: %s \n" " Stock Simulation: %s Minimum stock: %s " msgstr "" +"Elige creado a partir de MPS por el usuario:%s Fecha de creación:%s\n" +"Para el periodo de:%s en función del estado:\n" +" Pronóstico de almacén:%s\n" +" Stock inicial:%s\n" +" Planificación de salida:%s programa En:%s\n" +" Ya de salida:%s ya se encuentran en:%s\n" +" Confirmado salida:% s Confirmado En:% s\n" +" Planeado Antes:% s Confirmado En Antes:% s\n" +" Se espera de salida: Izquierda entrante% s:% s\n" +" Simulación de archivo: Stock mínimo de% s:% s " #. module: stock_planning #: field:stock.planning,period_id:0 @@ -884,7 +942,7 @@ msgstr "Periodos" #. module: stock_planning #: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines msgid "Create Stock Periods" -msgstr "" +msgstr "Crear períodos de stocks" #. module: stock_planning #: view:stock.period:0 @@ -953,6 +1011,10 @@ msgid "" "supply will be made from Output location of Supply Warehouse. Used in " "'Supply from Another Warehouse' with Supply Warehouse." msgstr "" +"Verifique que el suministro procedente de la ubicación de archivo de almacén " +"de suministros. Si está desactivado el suministro se hará desde la ubicación " +"de salida del almacén de suministros. Se utiliza en \"El suministro de otro " +"almacén\" con almacén de suministros." #. module: stock_planning #: field:stock.sale.forecast,create_uid:0 @@ -985,6 +1047,8 @@ msgid "" "Warehouse used as source in supply pick move created by 'Supply from Another " "Warehouse'." msgstr "" +"Almacén utilizado como fuente de suministro de selección se mueven creado " +"por 'El suministro de otro almacén." #. module: stock_planning #: model:ir.model,name:stock_planning.model_stock_planning @@ -1005,7 +1069,7 @@ msgstr "" #: code:addons/stock_planning/stock_planning.py:661 #, python-format msgid "%s Procurement (%s, %s) %s %s \n" -msgstr "" +msgstr "%s Contratación(% s,% s)%s%s \n" #. module: stock_planning #: field:stock.sale.forecast,analyze_company:0 @@ -1066,7 +1130,7 @@ msgstr "Fecha inicial para el periodo planificado." #: view:stock.period:0 #: view:stock.period.createlines:0 msgid "Stock Periods" -msgstr "" +msgstr "Periodos de Stock" #. module: stock_planning #: view:stock.planning:0 @@ -1108,7 +1172,7 @@ msgstr "UdM" #. module: stock_planning #: view:stock.period:0 msgid "Closed Periods" -msgstr "" +msgstr "Periodos cerrados" #. module: stock_planning #: view:stock.planning:0 @@ -1160,7 +1224,7 @@ msgstr "" #: code:addons/stock_planning/stock_planning.py:631 #, python-format msgid "MPS planning for %s" -msgstr "" +msgstr "MPS planeado para %s" #. module: stock_planning #: field:stock.planning,stock_start:0 @@ -1199,7 +1263,7 @@ msgstr "Muestra quién creó esta previsión, o quién la validó." #. module: stock_planning #: field:stock.sale.forecast,analyzed_team_id:0 msgid "Sales Team" -msgstr "" +msgstr "Equipo de ventas" #. module: stock_planning #: help:stock.planning,incoming_left:0 @@ -1220,6 +1284,9 @@ msgid "" "difference between Planned Out and Confirmed Out. For current period Already " "Out is also calculated" msgstr "" +"Cantidad esperada que en el período seleccionado, además de salida " +"confirmada. Como diferencia entre planificado y confirmada de salida. Para " +"el período actual ya de salida se calcula también" #. module: stock_planning #: view:stock.sale.forecast:0 @@ -1233,6 +1300,9 @@ msgid "" "you only have to fill in the forecast quantities. The wizard doesn't " "duplicate the line when another one exist for the same selection." msgstr "" +"Este asistente ayuda a crear muchas líneas de pronóstico a la vez. Después " +"de su creación sólo tiene que rellenar las cantidades previstas. El " +"asistente no duplicar la línea cuando otro existe para la misma selección." #~ msgid "Create Stock and Sales Periods" #~ msgstr "Crear periodos de stock y ventas" diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py index 07aa7136ea3..f8733a7b261 100644 --- a/addons/users_ldap/__openerp__.py +++ b/addons/users_ldap/__openerp__.py @@ -55,7 +55,7 @@ servers supporting it, by enabling the TLS option in the LDAP configuration. For further options configuring the LDAP settings, refer to the -ldap.conf manpage :manpage:`ldap.conf(5)`. +ldap.conf manpage: manpage:`ldap.conf(5)`. Security Considerations +++++++++++++++++++++++ diff --git a/addons/web_livechat/static/src/js/web_livechat.js b/addons/web_livechat/static/src/js/web_livechat.js index 6351ddb2d5c..4ddc93e3e6e 100644 --- a/addons/web_livechat/static/src/js/web_livechat.js +++ b/addons/web_livechat/static/src/js/web_livechat.js @@ -89,7 +89,7 @@ openerp.web.Header.include({ this._super(); this.update_promise.then(function() { if (self.livechat) { - self.livechat.stop(); + self.livechat.destroy(); } self.livechat = new openerp.web_livechat.Livechat(self); self.livechat.prependTo(self.$element.find('div.header_corner')); diff --git a/addons/web_uservoice/static/src/js/web_uservoice.js b/addons/web_uservoice/static/src/js/web_uservoice.js index b4b63584ca5..4871fb80c9d 100644 --- a/addons/web_uservoice/static/src/js/web_uservoice.js +++ b/addons/web_uservoice/static/src/js/web_uservoice.js @@ -71,7 +71,7 @@ instance.web.Header.include({ this._super(); this.update_promise.then(function() { if (self.uservoice) { - self.uservoice.stop(); + self.uservoice.destroy(); } self.uservoice = new instance.web_uservoice.UserVoice(self); self.uservoice.prependTo(self.$element.find('div.header_corner'));