diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 019af2cdef5..7fffc4f07d4 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -141,7 +141,7 @@ for a particular financial year and for preparation of vouchers there is a modul
'project/analytic_account_demo.xml',
'demo/account_minimal.xml',
'demo/account_invoice_demo.xml',
-# 'account_unit_test.xml',
+ 'account_unit_test.xml',
],
'test': [
'test/account_customer_invoice.yml',
diff --git a/addons/account/account.py b/addons/account/account.py
index 42211939894..37f6d96eee1 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -75,8 +75,8 @@ class account_payment_term(osv.osv):
amount = value
result = []
obj_precision = self.pool.get('decimal.precision')
+ prec = obj_precision.precision_get(cr, uid, 'Account')
for line in pt.line_ids:
- prec = obj_precision.precision_get(cr, uid, 'Account')
if line.value == 'fixed':
amt = round(line.value_amount, prec)
elif line.value == 'procent':
@@ -92,19 +92,20 @@ class account_payment_term(osv.osv):
next_date += relativedelta(day=line.days2, months=1)
result.append( (next_date.strftime('%Y-%m-%d'), amt) )
amount -= amt
- return result
-account_payment_term()
+ amount = reduce(lambda x,y: x+y[1], result, 0.0)
+ dist = round(value-amount, prec)
+ if dist:
+ result.append( (time.strftime('%Y-%m-%d'), dist) )
+ return result
class account_payment_term_line(osv.osv):
_name = "account.payment.term.line"
_description = "Payment Term Line"
_columns = {
- 'name': fields.char('Line Name', size=32, required=True),
- 'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"),
'value': fields.selection([('procent', 'Percent'),
('balance', 'Balance'),
- ('fixed', 'Fixed Amount')], 'Valuation',
+ ('fixed', 'Fixed Amount')], 'Computation',
required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be treated."""),
'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."),
@@ -115,10 +116,10 @@ class account_payment_term_line(osv.osv):
}
_defaults = {
'value': 'balance',
- 'sequence': 5,
+ 'days': 30,
'days2': 0,
}
- _order = "sequence"
+ _order = "value desc,days"
def _check_percent(self, cr, uid, ids, context=None):
obj = self.browse(cr, uid, ids[0], context=context)
@@ -1082,7 +1083,7 @@ class account_journal_period(osv.osv):
'journal_id': fields.many2one('account.journal', 'Journal', required=True, ondelete="cascade"),
'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"),
'icon': fields.function(_icon_get, string='Icon', type='char', size=32),
- 'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."),
+ 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the journal period without removing it."),
'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', required=True, readonly=True,
help='When journal period is created. The status is \'Draft\'. If a report is printed it comes to \'Printed\' status. When all transactions are done, it comes in \'Done\' status.'),
'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 070c0a3ce81..d4efb5c8914 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -80,8 +80,11 @@ class account_invoice(osv.osv):
def _reconciled(self, cr, uid, ids, name, args, context=None):
res = {}
- for id in ids:
- res[id] = self.test_paid(cr, uid, [id])
+ wf_service = netsvc.LocalService("workflow")
+ for inv in self.browse(cr, uid, ids, context=context):
+ res[inv.id] = self.test_paid(cr, uid, [inv.id])
+ if not res[inv.id] and inv.state == 'paid':
+ wf_service.trg_validate(uid, 'account.invoice', inv.id, 'open_test', cr)
return res
def _get_reference_type(self, cr, uid, context=None):
@@ -1159,7 +1162,7 @@ class account_invoice(osv.osv):
return map(lambda x: (0,0,x), lines)
def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
- invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id', 'company_id'])
+ invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id', 'company_id', 'user_id', 'fiscal_position'])
obj_invoice_line = self.pool.get('account.invoice.line')
obj_invoice_tax = self.pool.get('account.invoice.tax')
obj_journal = self.pool.get('account.journal')
@@ -1208,7 +1211,8 @@ class account_invoice(osv.osv):
})
# take the id part of the tuple returned for many2one fields
for field in ('partner_id', 'company_id',
- 'account_id', 'currency_id', 'payment_term', 'journal_id'):
+ 'account_id', 'currency_id', 'payment_term', 'journal_id',
+ 'user_id', 'fiscal_position'):
invoice[field] = invoice[field] and invoice[field][0]
# create the new invoice
new_ids.append(self.create(cr, uid, invoice))
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 905b1e00607..99a071a1a1b 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -443,9 +443,9 @@ class account_move_line(osv.osv):
'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),
'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
- 'reconcile': fields.function(_get_reconcile, type='char', string='Reconcile'),
+ 'reconcile': fields.function(_get_reconcile, type='char', string='Reconcile Ref'),
'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')),
- 'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
+ 'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount in Currency', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
'journal_id': fields.related('move_id', 'journal_id', string='Journal', type='many2one', relation='account.journal', required=True, select=True,
@@ -456,7 +456,7 @@ class account_move_line(osv.osv):
store = {
'account.move': (_get_move_lines, ['period_id'], 20)
}),
- 'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"),
+ 'blocked': fields.boolean('No Follow-up', help="You can check this box to mark this journal item as a litigation with the associated partner"),
'partner_id': fields.many2one('res.partner', 'Partner', select=1, ondelete='restrict'),
'date_maturity': fields.date('Due date', select=True ,help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."),
'date': fields.related('move_id','date', string='Effective date', type='date', required=True, select=True,
@@ -856,7 +856,12 @@ class account_move_line(osv.osv):
if r[0][1] != None:
raise osv.except_osv(_('Error!'), _('Some entries are already reconciled.'))
- if (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
+ if context.get('fy_closing'):
+ # We don't want to generate any write-off when being called from the
+ # wizard used to close a fiscal year (and it doesn't give us any
+ # writeoff_acc_id).
+ pass
+ elif (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \
(account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))):
if not writeoff_acc_id:
raise osv.except_osv(_('Warning!'), _('You have to provide an account for the write off/exchange difference entry.'))
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 6d3519cc461..401f569c74e 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1549,10 +1549,8 @@
account.payment.term.line
-
-
-
+
@@ -1563,37 +1561,20 @@
account.payment.term.line
@@ -1616,7 +1597,7 @@
-
+
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 97bea14c1f2..f8a0fcdfcaa 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -10,17 +10,33 @@
-
- 30 Days End of Month
- 30 Days End of Month
+
+ Immediate Payment
+ Immediate Payment
-
- 30 Days End of Month
+
+
+ Immediate Payment
balance
-
-
-
+
+
+
+
+
+
+ 15 Days
+ 15 Days
+
+
+
+ 15 Days
+ balance
+
+
+
+
+
Payment Term
6
@@ -30,6 +46,7 @@
30 Net Days
30 Net Days
+
30 Net Days
balance
@@ -37,28 +54,7 @@
-
-
- 30% Advance End 30 Days
- 30% Advance End 30 Days
-
-
- 30% Advance
- procent
-
-
-
-
-
-
-
- Remaining Balance
- balance
-
-
-
-
-
+
diff --git a/addons/account/demo/account_demo.xml b/addons/account/demo/account_demo.xml
index 8b0f026c9f0..6918ad44702 100644
--- a/addons/account/demo/account_demo.xml
+++ b/addons/account/demo/account_demo.xml
@@ -127,6 +127,41 @@
+
+
+
+
+ 30 Days End of Month
+ 30 Days End of Month
+
+
+ 30 Days End of Month
+ balance
+
+
+
+
+
+
+ 30% Advance End 30 Days
+ 30% Advance End 30 Days
+
+
+ 30% Advance
+ procent
+
+
+
+
+
+
+
+ Remaining Balance
+ balance
+
+
+
+
diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index 7cc4f4978f7..c4b0c8103f1 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -29,8 +29,9 @@
Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}
+ ${object.partner_id.lang}
+
Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
@@ -49,7 +50,7 @@
% endif
- % if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'):
+ % if object.company_id.paypal_account and object.type in ('out_invoice'):
<%
comp_name = quote(object.company_id.name)
inv_number = quote(object.number)
@@ -73,7 +74,7 @@
-
+
${object.company_id.name}
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 4e3759713c4..a5a3ef57009 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-05 22:09+0000\n"
+"PO-Revision-Date: 2012-12-08 10:58+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org)
\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-12-06 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
"X-Generator: Launchpad (build 16341)\n"
#. module: account
@@ -1930,7 +1930,7 @@ msgstr "Geschäftsjahr Sequenz"
#. module: account
#: field:account.config.settings,group_analytic_accounting:0
msgid "Analytic accounting"
-msgstr ""
+msgstr "Buchen von Kostenstellen"
#. module: account
#: report:account.overdue:0
@@ -4041,6 +4041,11 @@ msgid ""
"You can create one in the menu: \n"
"Configuration/Journals/Journals."
msgstr ""
+"Es kann kein Buchungsjournal, mit dem %s Typ für dieses Unternehmens "
+"gefunden werden.\n"
+"\n"
+"Sie können ein neues Buchungsjournal in folgendem Menü erstellen:\n"
+"Finanzen / Konfiguration / Einstellungen / Buchungsjournale"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -7496,6 +7501,8 @@ msgid ""
"You cannot provide a secondary currency if it is the same than the company "
"one."
msgstr ""
+"Sie können keine weitere Währung verwalten, wenn diese identisch mit Ihrer "
+"Hauswährung ist."
#. module: account
#: code:addons/account/account_invoice.py:1321
@@ -9891,7 +9898,7 @@ msgstr "Gültig ab"
#. module: account
#: field:account.cashbox.line,pieces:0
msgid "Unit of Currency"
-msgstr ""
+msgstr "Währungseinheit"
#. module: account
#: code:addons/account/account.py:3137
@@ -10019,6 +10026,16 @@ msgid ""
"related journal entries may or may not be reconciled. \n"
"* The 'Cancelled' status is used when user cancel invoice."
msgstr ""
+" * Der \"Entwurf\"-Status wird verwendet, wenn ein Benutzer eine Rechnung "
+"erstellt, aber noch nicht gebucht hat.\n"
+"* Der \"Pro-forma\" Status wird nach dessen Auswahl angezeigt, es wird aber "
+"noch keine Rechnungsnummer vergeben. \n"
+"* Die Rechnung ist im \"Offen\" Status, wenn Sie gebucht wurde, dadurch eine "
+"Rechnungsnummer bekommen hat, aber noch nicht vom Kunden bezahlt wurde. \n"
+"* Der\"Bezahlt\"-Status wird automatisch vergeben, wenn die offene Rechnung "
+"vom Kunden bezahlt wurde.\n"
+"* Eine Anzeige im \"Abgebrochen\"-Status erfolgt immer dann, wenn die "
+"Rechnung storniert wurde."
#. module: account
#: field:account.period,date_stop:0
@@ -10038,7 +10055,7 @@ msgstr "Finanz Reports"
#. module: account
#: model:account.account.type,name:account.account_type_liability_view1
msgid "Liability View"
-msgstr ""
+msgstr "Passiva Ansicht"
#. module: account
#: report:account.account.balance:0
@@ -10086,7 +10103,7 @@ msgstr "Firmenreferenzen Partner"
#. module: account
#: view:account.invoice:0
msgid "Ask Refund"
-msgstr ""
+msgstr "Gutschrift anfragen"
#. module: account
#: view:account.move.line:0
@@ -10127,12 +10144,12 @@ msgstr "Forderungskonten"
#. module: account
#: field:account.config.settings,purchase_refund_sequence_prefix:0
msgid "Supplier credit note sequence"
-msgstr ""
+msgstr "Nummernfolge Lieferantengutschrift"
#. module: account
#: field:account.config.settings,purchase_sequence_next:0
msgid "Next supplier invoice number"
-msgstr ""
+msgstr "Nächste Eingangsrechnung"
#. module: account
#: help:account.config.settings,module_account_payment:0
@@ -10144,6 +10161,12 @@ msgid ""
"payments.\n"
" This installs the module account_payment."
msgstr ""
+"Sie können Zahlungsaufträge erstellen und verwalten , um\n"
+" * diese als Grundlage für externe Erweiterungen zur "
+"Automatisierung von Zahlungen zu nutzen. \n"
+" * dadurch den Rechnungsausgleich von Lieferanten und "
+"andere Kreditoren durchzuführen.\n"
+" Es erfolgt eine Installation des Moduls account_payment."
#. module: account
#: xsl:account.transfer:0
@@ -10162,6 +10185,7 @@ msgstr "Bankauszüge"
#, python-format
msgid "To reconcile the entries company should be the same for all entries."
msgstr ""
+"Das Unternehmen sollte für alle auszugleichenden Buchungen identisch sein."
#. module: account
#: field:account.account,balance:0
@@ -10241,7 +10265,7 @@ msgstr "Filter nach"
#: field:account.cashbox.line,number_closing:0
#: field:account.cashbox.line,number_opening:0
msgid "Number of Units"
-msgstr ""
+msgstr "Stückzahl"
#. module: account
#: model:process.node,note:account.process_node_manually0
@@ -10266,12 +10290,12 @@ msgstr "Buchung"
#: code:addons/account/wizard/account_period_close.py:51
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Diese Aktion ist fehlerhaft!"
#. module: account
#: view:account.bank.statement:0
msgid "Date / Period"
-msgstr ""
+msgstr "Datum / Periode"
#. module: account
#: report:account.central.journal:0
@@ -10421,6 +10445,8 @@ msgid ""
"Credit note base on this type. You can not Modify and Cancel if the invoice "
"is already reconciled"
msgstr ""
+"Gutschrift für diesen Typ. Es können keine Änderungen oder Stornierungen "
+"vorgenommen werden, wenn die Rechnungen bereits ausgeglichen wurde."
#. module: account
#: report:account.account.balance:0
@@ -10464,7 +10490,7 @@ msgstr "Fälligkeitsdatum"
#: code:addons/account/account.py:1459
#, python-format
msgid " Centralisation"
-msgstr ""
+msgstr " Zusammenfassung"
#. module: account
#: help:account.journal,type:0
@@ -10548,7 +10574,7 @@ msgstr "Rechnungsentwürfe"
#: view:cash.box.in:0
#: model:ir.actions.act_window,name:account.action_cash_box_in
msgid "Put Money In"
-msgstr ""
+msgstr "Zahle Geld ein"
#. module: account
#: selection:account.account.type,close_method:0
@@ -10609,7 +10635,7 @@ msgstr "Abrechnen von Analyt. Buchungen"
#. module: account
#: view:account.installer:0
msgid "Configure your Fiscal Year"
-msgstr ""
+msgstr "Konfiguration Geschäftsjahr"
#. module: account
#: field:account.period,name:0
@@ -10623,6 +10649,8 @@ msgid ""
"Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' "
"or 'Done' state."
msgstr ""
+"Die ausgewählten Rechnungen können im Status \"abgebrochen\" oder "
+"\"bezahlt\" nicht mehr storniert werden."
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -10657,6 +10685,10 @@ msgid ""
"some non legal fields or you must unconfirm the journal entry first.\n"
"%s."
msgstr ""
+"Sie können keine Änderung bereits erfolgter Buchungen vornehmen. Lediglich "
+"unkritische Informationen können ohne weiteres geändert werden, ansonsten "
+"ist zunächst die zugrunde liegende Buchung zu stornieren.\n"
+"%s."
#. module: account
#: help:account.config.settings,module_account_budget:0
@@ -10667,6 +10699,15 @@ msgid ""
"analytic account.\n"
" This installs the module account_budget."
msgstr ""
+"Definieren Sie Ihre Kostenstellen und budgetieren Sie die dort relevanten "
+"Erfolgskonten.\n"
+" Sobald Sie die Vorlagen für Ihre anstehenden "
+"Budgetplanungen erstellt haben ,\n"
+" können Ihre verantwortlichen Projektmanager die geplante "
+"Beträge für Ihre Kostenstellen\n"
+" differenziert nach Erfolgs- und Kostenkonten aufteilen.\n"
+" Zu diesem Zweck installieren Sie hier das Modul "
+"account_budget."
#. module: account
#: help:res.partner,property_account_payable:0
@@ -10721,12 +10762,12 @@ msgstr "Haben"
#. module: account
#: view:account.invoice:0
msgid "Draft Invoice "
-msgstr ""
+msgstr "Entwurf Rechnung "
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Cancel: create credit note and reconcile"
-msgstr ""
+msgstr "Abbrechen: Erstelle Gutschrift und Ausgleich"
#. module: account
#: model:ir.ui.menu,name:account.menu_account_general_journal
@@ -10742,7 +10783,7 @@ msgstr "Wiederkehrende Buchungen Journal"
#: code:addons/account/account.py:1058
#, python-format
msgid "Start period should precede then end period."
-msgstr ""
+msgstr "Start Periode die auf die Ende Periode folgen soll."
#. module: account
#: field:account.invoice,number:0
@@ -10827,7 +10868,7 @@ msgstr "Gewinn & Verlust Übertrag"
#: code:addons/account/account_invoice.py:368
#, python-format
msgid "There is no Sale/Purchase Journal(s) defined."
-msgstr ""
+msgstr "Es wurde noch kein Journal für Verkauf / Einkauf angelegt."
#. module: account
#: view:account.move.line.reconcile.select:0
@@ -10905,7 +10946,7 @@ msgstr "Kontotyp"
#. module: account
#: field:account.subscription.generate,date:0
msgid "Generate Entries Before"
-msgstr ""
+msgstr "Buchungspositionen vorab erstellen"
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -11005,6 +11046,8 @@ msgstr "Status"
#: help:product.template,property_account_income:0
msgid "This account will be used to value outgoing stock using sale price."
msgstr ""
+"Dieses Konto wird für abgehende Bestände mit dem Verkaufspreis bewertet und "
+"gebucht."
#. module: account
#: field:account.invoice,check_total:0
@@ -11027,12 +11070,12 @@ msgstr "Bruttobetrag"
#: code:addons/account/wizard/account_invoice_refund.py:109
#, python-format
msgid "Cannot %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Entwurf / Proforma / Abgebrochen Rechnungen können nicht %s werden."
#. module: account
#: field:account.tax,account_analytic_paid_id:0
msgid "Refund Tax Analytic Account"
-msgstr ""
+msgstr "Kostenstelle für Steuer der Gutschrift"
#. module: account
#: view:account.move.bank.reconcile:0
@@ -11099,7 +11142,7 @@ msgstr "Fälligkeitsdatum"
#: field:cash.box.in,name:0
#: field:cash.box.out,name:0
msgid "Reason"
-msgstr ""
+msgstr "Begründung"
#. module: account
#: selection:account.partner.ledger,filter:0
@@ -11157,7 +11200,7 @@ msgstr "Konten ohne Buchung? "
#: code:addons/account/account_move_line.py:1046
#, python-format
msgid "Unable to change tax!"
-msgstr ""
+msgstr "Eine Änderung der Steuer ist nicht möglich"
#. module: account
#: constraint:account.bank.statement:0
@@ -11189,6 +11232,9 @@ msgid ""
"customer. The tool search can also be used to personalise your Invoices "
"reports and so, match this analysis to your needs."
msgstr ""
+"Durch diesen Bericht erhalten Sie einen Überblick über die Abrechnungen "
+"Ihrer Kunden. Das Suche + Filter Tool kann zur weiteren auf Ihre Bedürfnisse "
+"angepassten Analyse angepasst werden."
#. module: account
#: view:account.partner.reconcile.process:0
@@ -11209,7 +11255,7 @@ msgstr "Status der Rechnung ist 'Erledigt'"
#. module: account
#: field:account.config.settings,module_account_followup:0
msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "Verwalten Sie Zahlungserinnerungen"
#. module: account
#: model:ir.model,name:account.model_report_account_sales
@@ -11285,7 +11331,7 @@ msgstr "Debitoren"
#: code:addons/account/account_move_line.py:776
#, python-format
msgid "Already reconciled."
-msgstr ""
+msgstr "Bereits ausgeglichen."
#. module: account
#: selection:account.model.line,date_maturity:0
@@ -11361,6 +11407,7 @@ msgstr "Gruppiere je Monat des Rechnungsdatums"
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)."
msgstr ""
+"Es wurde kein Ertragskonto für dieses Produkt definiert: \"%s\" (Kürzel: %d)."
#. module: account
#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -11423,6 +11470,8 @@ msgid ""
"The selected unit of measure is not compatible with the unit of measure of "
"the product."
msgstr ""
+"Die ausgewählte Mengeneinheit ist nicht mit derjenigen für das Produkt "
+"kompatibel."
#. module: account
#: view:account.fiscal.position:0
@@ -11446,6 +11495,17 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Klicken Sie um neue Steuern zu definieren.\n"
+" p>\n"
+" Je nach Land, ist eine Steuer in der Regel ein Wert in "
+"Ihrer \n"
+" Umsatzsteuererklärung. OpenERP ermöglicht die Definition\n"
+" von Steuerstrukturen, damit sämtliche Steuerberechnungen \n"
+" und Buchungen dann in einer oder mehrerer Positionen für \n"
+" die Voranmeldung bzw. Steuererklärung auftauchen.\n"
+" p>\n"
+" "
#. module: account
#: selection:account.entries.report,month:0
@@ -11472,6 +11532,22 @@ msgid ""
"
\n"
" "
msgstr ""
+"\n"
+" Wählen Sie Periode und Journal für Ihre Buchungen.\n"
+" p>\n"
+" Diese Ansicht kann von Wirtschaftsprüfern und "
+"Steuerberatern genutzt werden, \n"
+" um schnellstmöglich Buchungen in OpenERP von außen "
+"einzugeben. Wenn Sie eine \n"
+" Lieferantenrechnung erfassen, beginnen Sie normalerweise "
+"mit der Eingabe des \n"
+" Aufwandskontos für eine Rechnung. OpenERP wird Ihnen aus "
+"dem Kontext des\n"
+" Produkts dann automatisch eine Steuer vorschlagen sowie das "
+"Gegenkonto für die \n"
+" \"Kreditoren\".\n"
+" p>\n"
+" "
#. module: account
#: help:account.invoice.line,account_id:0
@@ -11481,7 +11557,7 @@ msgstr "Aufwand- und Erlöskonto des Produktes"
#. module: account
#: view:account.config.settings:0
msgid "Install more chart templates"
-msgstr ""
+msgstr "Installieren Sie weitere Kontenpläne"
#. module: account
#: report:account.general.journal:0
@@ -11529,6 +11605,8 @@ msgid ""
"You cannot remove/deactivate an account which is set on a customer or "
"supplier."
msgstr ""
+"Sie können keine Konten deaktivieren, die bereits einem Kunden oder "
+"Lieferanten zugewiesen wurden."
#. module: account
#: model:ir.model,name:account.model_validate_account_move_lines
@@ -11540,6 +11618,8 @@ msgstr "Verbuche Buchungszeilen"
msgid ""
"The fiscal position will determine taxes and accounts used for the partner."
msgstr ""
+"Die Steuerzuordnung steuert die zu benutzenden Steuern und Konten für den "
+"Partner."
#. module: account
#: model:process.node,note:account.process_node_supplierpaidinvoice0
@@ -11573,6 +11653,7 @@ msgstr "Manuelle Berechnung Steuer"
#, python-format
msgid "The payment term of supplier does not have a payment term line."
msgstr ""
+"Die Zahlungsbedingung für die Lieferantenrechnung hat keine Zahlungsposition."
#. module: account
#: field:account.account,parent_right:0
@@ -11585,7 +11666,7 @@ msgstr "Oberkonto Rechts"
#: code:addons/account/static/src/js/account_move_reconciliation.js:80
#, python-format
msgid "Never"
-msgstr ""
+msgstr "Niemals"
#. module: account
#: model:ir.model,name:account.model_account_addtmpl_wizard
@@ -11606,7 +11687,7 @@ msgstr "Partner"
#. module: account
#: field:account.account,note:0
msgid "Internal Notes"
-msgstr ""
+msgstr "Interne Hinweise"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear
@@ -11639,7 +11720,7 @@ msgstr "Buchungsvorlage"
#: code:addons/account/account_cash_statement.py:292
#, python-format
msgid "Loss"
-msgstr ""
+msgstr "Verlust"
#. module: account
#: selection:account.entries.report,month:0
@@ -11665,7 +11746,7 @@ msgstr ""
#: view:account.bank.statement:0
#: help:account.cashbox.line,number_closing:0
msgid "Closing Unit Numbers"
-msgstr ""
+msgstr "Abschluss Bankauszug"
#. module: account
#: field:account.bank.accounts.wizard,bank_account_id:0
@@ -11731,7 +11812,7 @@ msgstr ""
#. module: account
#: selection:account.config.settings,tax_calculation_rounding_method:0
msgid "Round per line"
-msgstr ""
+msgstr "Runden per Zeile"
#. module: account
#: help:account.move.line,amount_residual_currency:0
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 27801a0da69..ab240056600 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,15 +7,15 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 20:35+0000\n"
+"PO-Revision-Date: 2012-12-07 15:21+0000\n"
"Last-Translator: Frederic Clementi - Camptocamp.com "
"\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-12-04 05:21+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account
#: code:addons/account/wizard/account_fiscalyear_close.py:41
@@ -184,7 +184,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:30
#, python-format
msgid "Reconcile"
-msgstr "Lettrer"
+msgstr "Let."
#. module: account
#: field:account.bank.statement,name:0
@@ -988,12 +988,12 @@ msgstr ""
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "J.C./Move name"
-msgstr "J.C. / Nom du mouvement"
+msgstr "J.C. / description de l'écriture"
#. module: account
#: view:account.account:0
msgid "Account Code and Name"
-msgstr ""
+msgstr "Code et Nom du Compte"
#. module: account
#: model:mail.message.subtype,name:account.mt_invoice_new
@@ -2993,7 +2993,7 @@ msgstr "Relevés"
#. module: account
#: report:account.analytic.account.journal:0
msgid "Move Name"
-msgstr "Nom de la transaction"
+msgstr "Description de l'écriture"
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
@@ -3008,7 +3008,7 @@ msgstr "Ligne d'écriture lettrée (écriture d'écart)"
#: field:account.move.line,account_tax_id:0
#: view:account.tax:0
msgid "Tax"
-msgstr "Impôts et taxes"
+msgstr "Taxes"
#. module: account
#: view:account.analytic.account:0
@@ -4350,7 +4350,7 @@ msgstr ""
#: field:account.move.reconcile,name:0
#: field:account.subscription,name:0
msgid "Name"
-msgstr "Nom"
+msgstr "Decription"
#. module: account
#: code:addons/account/installer.py:94
@@ -4918,7 +4918,7 @@ msgstr "Nom du compte"
#. module: account
#: help:account.fiscalyear.close,report_name:0
msgid "Give name of the new entries"
-msgstr "Indique le nom à donner aux nouvelles écritures"
+msgstr "Indique la description à donner aux nouvelles écritures"
#. module: account
#: model:ir.model,name:account.model_account_invoice_report
@@ -4982,12 +4982,12 @@ msgstr "Le nom de la période doit être unique par société!"
#. module: account
#: help:wizard.multi.charts.accounts,currency_id:0
msgid "Currency as per company's country."
-msgstr ""
+msgstr "Devise selon le pays de la société"
#. module: account
#: view:account.tax:0
msgid "Tax Computation"
-msgstr ""
+msgstr "Calcul des taxes"
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -6246,7 +6246,7 @@ msgstr "Comptes fils"
#: code:addons/account/account_move_line.py:1107
#, python-format
msgid "Move name (id): %s (%s)"
-msgstr "Nom du mouvement (id): %s (%s)"
+msgstr "Description de l'écriture (id): %s (%s)"
#. module: account
#: view:account.move.line.reconcile:0
@@ -6258,7 +6258,7 @@ msgstr "Ajustement"
#. module: account
#: field:res.partner,debit:0
msgid "Total Payable"
-msgstr "Total à payer"
+msgstr "Total dû"
#. module: account
#: model:account.account.type,name:account.data_account_type_income
@@ -7850,7 +7850,7 @@ msgstr ""
#. module: account
#: field:account.fiscalyear.close,report_name:0
msgid "Name of new entries"
-msgstr "Nom des nouvelles écritures"
+msgstr "Description des nouvelles écritures"
#. module: account
#: view:account.use.model:0
@@ -7865,7 +7865,7 @@ msgstr ""
#. module: account
#: help:account.config.settings,currency_id:0
msgid "Main currency of the company."
-msgstr ""
+msgstr "Devise de a société"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reports
@@ -8843,7 +8843,7 @@ msgstr ""
#: field:account.move.line,reconcile_partial_id:0
#: view:account.move.line.reconcile:0
msgid "Partial Reconcile"
-msgstr "Rapprochement partiel"
+msgstr "Let.P"
#. module: account
#: model:ir.model,name:account.model_account_analytic_inverted_balance
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 1e822b5817e..4324e492364 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-06 00:09+0000\n"
+"PO-Revision-Date: 2012-12-09 23:36+0000\n"
"Last-Translator: Sergio Corato \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-12-06 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n"
"X-Generator: Launchpad (build 16341)\n"
#. module: account
@@ -305,6 +305,9 @@ msgid ""
"sales, purchase, expense, contra, etc.\n"
" This installs the module account_voucher."
msgstr ""
+"Include tutte le funzioni basilari per le registrazioni dei pagamenti per "
+"banca, cassa, vendite, acquisti, costi, contra, ecc.\n"
+" Installa il modulo account_voucher."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -481,6 +484,14 @@ msgid ""
"this box, you will be able to do invoicing & payments,\n"
" but not accounting (Journal Items, Chart of Accounts, ...)"
msgstr ""
+"Permette di gestire le immobilizzazioni possedute da un'azienda o da una "
+"persona.\n"
+" Tiene traccia del deprezzamento di queste immobilizzazioni, e "
+"crea movimenti contabili per queste righe di ammortamento.\n"
+" Installa il modulo account_asset. Se non viene selezionata "
+"questa casella, sarà possibile effettuare fatture e pagamenti,\n"
+" ma non contabilizzarli (Registrazioni nel Sezionale, Piano "
+"dei Conti, ...)"
#. module: account
#. openerp-web
@@ -509,6 +520,17 @@ msgid ""
"should choose 'Round per line' because you certainly want the sum of your "
"tax-included line subtotals to be equal to the total amount with taxes."
msgstr ""
+"Se è selezionato 'Arrotondamento per Riga' : per ogni imposta, l'ammontare "
+"dell'imposta sarà prima calcolato e arrotondato per ogni riga di Ordine "
+"d'aquisto/Ordine di vendita/fattura e poi questi ammontari arrotondati "
+"saranno sommati, formando quindi l'ammontare totale per quella tassa. Se è "
+"selezionato 'Arrotondamento sul Totale': per ogni imposta, il totale "
+"dell'imposta sarà calcolato per ogni riga di Ordine d'aquisto/Ordine di "
+"vendita/fattura, poi questi ammontari saranno sommati e infine questo somma "
+"totale sarà arrotondata. Se le vendite vengono effettuate con l'imposta "
+"compresa, sarebbe meglio selezionare 'Arrotondamento per riga' perchè "
+"l'ammontare totale dei sub-totali delle righe compreso l'imposta sarà uguale "
+"al totale imposte comprese."
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1207,6 +1229,20 @@ msgid ""
"
\n"
" "
msgstr ""
+"\n"
+" Clicca per aggiungere un conto.\n"
+"
\n"
+" Quando si fanno operazioni multi-valuta, è possibile perdere "
+"o\n"
+" guadagnare degli importi a causa della variazione del tasso "
+"di cambio.\n"
+" Questo menu dà una previsione del Guadagno o Perdita "
+"realizzato se\n"
+" queste operazioni fossero concluse oggi. Solo per conti che "
+"hanno\n"
+" una valuta secondaria.\n"
+"
\n"
+" "
#. module: account
#: field:account.bank.accounts.wizard,acc_name:0
@@ -1895,7 +1931,7 @@ msgstr ""
"dell'imposta sarà prima calcolato e arrotondato per ogni riga di Ordine "
"d'aquisto/Ordine di vendita/fattura e poi questi ammontari arrotondati "
"saranno sommati, formando quindi l'ammontare totale per quella tassa. Se è "
-"selezionato 'Arrotondamento Globale': per ogni imposta, il totale "
+"selezionato 'Arrotondamento sul Totale': per ogni imposta, il totale "
"dell'imposta sarà calcolato per ogni riga di Ordine d'aquisto/Ordine di "
"vendita/fattura, poi questi ammontari saranno sommati e infine questo somma "
"totale sarà arrotondata. Se le vendite vengono effettuate con l'imposta "
@@ -2039,6 +2075,108 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+"\\n\n"
+"
\\n\n"
+"\\n\n"
+"
Buongiorno${object.partner_id.name and ' ' or "
+"''}${object.partner_id.name or ''},
\\n\n"
+"\\n\n"
+"
E' disponibile una nuova fattura:
\\n\n"
+" \\n\n"
+"
\\n\n"
+" RIFERIMENTO \\n\n"
+" Numero fattura: ${object.number} \\"
+"n\n"
+" Totale fattura: ${object.amount_total} "
+"${object.currency_id.name} \\n\n"
+" Data fattura: ${object.date_invoice} \\n\n"
+" % if object.origin:\\n\n"
+" Rif. ordine: ${object.origin} \\n\n"
+" % endif\\n\n"
+" % if object.user_id:\\n\n"
+" Vs. contatto: ${object.user_id.name} \\n\n"
+" % endif\\n\n"
+"
\\n\n"
+" \\n\n"
+" % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\\n\n"
+" <% \\n\n"
+" comp_name = quote(object.company_id.name)\\n\n"
+" inv_number = quote(object.number)\\n\n"
+" paypal_account = quote(object.company_id.paypal_account)\\n\n"
+" inv_amount = quote(str(object.residual))\\n\n"
+" cur_name = quote(object.currency_id.name)\\n\n"
+" paypal_url = \\\"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s&"
+"\\\" \\\\\\n\n"
+" \\"
+"\"invoice=%s&amount=%s¤cy_code=%s&button_subtype=services&a"
+"mp;no_note=1&bn=OpenERP_Invoice_PayNow_%s\\\" % \\\\\\n\n"
+" "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\\n\n"
+" %>\\n\n"
+"
\\n\n"
+"
E' possibile anche pagare direttamente con Paypal:
\\n\n"
+"
\\n\n"
+" \\n\n"
+" \\n\n"
+" % endif\\n\n"
+" \\n\n"
+"
\\n\n"
+"
Per qualsiasi informazione, non esitate a contattarci.
\\n\n"
+"
Grazie per aver scelto ${object.company_id.name or 'us'}!
\\n\n"
+"
\\n\n"
+"
\\n\n"
+"
\\n\n"
+"
\\n\n"
+" ${object.company_id.name} \\n\n"
+" \\n\n"
+"
\\n\n"
+"
\\n\n"
+" % if object.company_id.street:\\n\n"
+" ${object.company_id.street} \\n\n"
+" % endif\\n\n"
+" % if object.company_id.street2:\\n\n"
+" ${object.company_id.street2} \\n\n"
+" % endif\\n\n"
+" % if object.company_id.city or object.company_id.zip:\\n\n"
+" ${object.company_id.zip} ${object.company_id.city} \\n\n"
+" % endif\\n\n"
+" % if object.company_id.country_id:\\n\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''} \\n\n"
+" % endif\\n\n"
+" \\n\n"
+" % if object.company_id.phone:\\n\n"
+"
\\n\n"
+" Tel.: ${object.company_id.phone}\\n\n"
+"
\\n\n"
+" % endif\\n\n"
+" % if object.company_id.website:\\n\n"
+"
\\n\n"
+" %endif\\n\n"
+"
\\n\n"
+"
\\n\n"
+"
\\n\n"
+" "
#. module: account
#: field:account.tax.code,sum:0
@@ -2407,7 +2545,7 @@ msgstr "Chiusura Anno Fiscale"
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
#, python-format
msgid "Journal :"
-msgstr ""
+msgstr "Sezionale :"
#. module: account
#: sql_constraint:account.fiscal.position.tax:0
@@ -3032,7 +3170,7 @@ msgstr "Movimento contabile di riconciliazione (storno)"
#: field:account.move.line,account_tax_id:0
#: view:account.tax:0
msgid "Tax"
-msgstr "Tassa"
+msgstr "Imposta"
#. module: account
#: view:account.analytic.account:0
@@ -3272,12 +3410,14 @@ msgid ""
"Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
"Forma' state."
msgstr ""
+"La fattura(/e) selezionata non possono essere confermate perché non sono in "
+"stato 'Bozza' o 'Proforma'."
#. module: account
#: code:addons/account/account.py:1056
#, python-format
msgid "You should choose the periods that belong to the same company."
-msgstr ""
+msgstr "I periodi dovrebbero appartenere alla stessa azienda."
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -3290,7 +3430,7 @@ msgstr "Vendite per conto"
#: code:addons/account/account.py:1406
#, python-format
msgid "You cannot delete a posted journal entry \"%s\"."
-msgstr ""
+msgstr "Non è possibile cancellare una registrazione contabilizzata \"%s\"."
#. module: account
#: view:account.invoice:0
@@ -3317,6 +3457,8 @@ msgid ""
"This journal already contains items, therefore you cannot modify its company "
"field."
msgstr ""
+"Questo sezionale contiene già registrazioni, perciò non è possibile "
+"modificare i campi aziendali."
#. module: account
#: code:addons/account/account.py:408
@@ -3325,6 +3467,8 @@ msgid ""
"You need an Opening journal with centralisation checked to set the initial "
"balance."
msgstr ""
+"E' necessario un Sezionale di apertura configurato con la centralizzazione "
+"per configurare il saldo iniziale."
#. module: account
#: model:ir.actions.act_window,name:account.action_tax_code_list
@@ -3362,7 +3506,7 @@ msgstr "Agosto"
#. module: account
#: field:accounting.report,debit_credit:0
msgid "Display Debit/Credit Columns"
-msgstr ""
+msgstr "Visualizza colonne Debito/Credito"
#. module: account
#: selection:account.entries.report,month:0
@@ -3397,7 +3541,7 @@ msgstr "Solo Un Piano dei Conti Disponibile"
#: field:product.category,property_account_expense_categ:0
#: field:product.template,property_account_expense:0
msgid "Expense Account"
-msgstr "Bilancio spese"
+msgstr "Conto di Costo"
#. module: account
#: field:account.bank.statement,message_summary:0
@@ -4057,6 +4201,10 @@ msgid ""
"You cannot modify a posted entry of this journal.\n"
"First you should set the journal to allow cancelling entries."
msgstr ""
+"Non è possibile modificare una registrazione contabilizzata in questo "
+"sezionale.\n"
+"Prima è necessario configurare il sezionale per permettere l'eliminazione "
+"delle registrazioni."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
@@ -4081,6 +4229,8 @@ msgid ""
"There is no fiscal year defined for this date.\n"
"Please create one from the configuration of the accounting menu."
msgstr ""
+"Non c'è alcun anno fiscale definito per questa data.\n"
+"Crearne uno dalla configurazione del menu contabilità."
#. module: account
#: view:account.addtmpl.wizard:0
@@ -4392,12 +4542,12 @@ msgstr "Nessuna azienda non configurata !"
#. module: account
#: field:res.company,expects_chart_of_accounts:0
msgid "Expects a Chart of Accounts"
-msgstr ""
+msgstr "Necessario un Piano dei Conti"
#. module: account
#: model:mail.message.subtype,name:account.mt_invoice_paid
msgid "paid"
-msgstr ""
+msgstr "pagato"
#. module: account
#: field:account.move.line,date:0
@@ -4408,7 +4558,7 @@ msgstr "Data effettiva"
#: code:addons/account/wizard/account_fiscalyear_close.py:100
#, python-format
msgid "The journal must have default credit and debit account."
-msgstr ""
+msgstr "Il sezionale deve avere un conto di credito e di debito di default."
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_tree
@@ -4420,11 +4570,13 @@ msgstr "Configurazione conti bancari"
#: selection:account.invoice.refund,filter_refund:0
msgid "Modify: create credit note, reconcile and create a new draft invoice"
msgstr ""
+"Modificare: crea una nota di credito, riconcilia e crea una nuova bozza di "
+"fattura"
#. module: account
#: xsl:account.transfer:0
msgid "Partner ID"
-msgstr ""
+msgstr "Partner ID"
#. module: account
#: help:account.bank.statement,message_ids:0
@@ -5415,7 +5567,7 @@ msgstr "Scritture da rivedere"
#. module: account
#: selection:res.company,tax_calculation_rounding_method:0
msgid "Round Globally"
-msgstr "Arrotonda Globalmente"
+msgstr "Arrotondamento sul Totale"
#. module: account
#: field:account.bank.statement,message_comment_ids:0
@@ -5510,7 +5662,7 @@ msgstr ""
#. module: account
#: model:res.groups,name:account.group_account_manager
msgid "Financial Manager"
-msgstr ""
+msgstr "Manager Finanziario"
#. module: account
#: field:account.journal,group_invoice_lines:0
@@ -5544,6 +5696,9 @@ msgid ""
"If you do not check this box, you will be able to do invoicing & payments, "
"but not accounting (Journal Items, Chart of Accounts, ...)"
msgstr ""
+"Se questa casella non è selezionata, sarà possibile creare fatture e "
+"pagamenti, ma non contabilizzarli (Registrazioni nel sezionale, Piani dei "
+"Conti, ...)"
#. module: account
#: view:account.period:0
@@ -5577,6 +5732,8 @@ msgid ""
"There is no period defined for this date: %s.\n"
"Please create one."
msgstr ""
+"Non c'è alcun periodo definito per questa data: %s.\n"
+"Crearne uno."
#. module: account
#: help:account.tax,price_include:0
@@ -5705,7 +5862,7 @@ msgstr "Anno"
#. module: account
#: help:account.invoice,sent:0
msgid "It indicates that the invoice has been sent."
-msgstr ""
+msgstr "Indica che la fattura è stata spedita."
#. module: account
#: view:account.payment.term.line:0
@@ -5725,11 +5882,14 @@ msgid ""
"Put a sequence in the journal definition for automatic numbering or create a "
"sequence manually for this piece."
msgstr ""
+"Non è possibile creare una sequenza automatica per questo codice.\n"
+"Inserire una sequenza nella configurazione del sezionale per la numerazione "
+"automatica o creare una sequenza manualmente per questo codice."
#. module: account
#: view:account.invoice:0
msgid "Pro Forma Invoice "
-msgstr ""
+msgstr "Fattura Proforma "
#. module: account
#: selection:account.subscription,period_type:0
@@ -5795,6 +5955,8 @@ msgstr "Codice calcolo (se tipo=codice)"
msgid ""
"Cannot find a chart of accounts for this company, you should create one."
msgstr ""
+"Non è possibile trovare un piano dei conti per questa azienda, è necessario "
+"crearne uno."
#. module: account
#: selection:account.analytic.journal,type:0
@@ -5854,6 +6016,8 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Gestisce il sommario (numero di messaggi, ...) di Chatter. Questo sommario è "
+"direttamente in html così da poter essere inserito nelle viste kanban."
#. module: account
#: field:account.tax,child_depend:0
@@ -5917,13 +6081,15 @@ msgstr "account.installer"
#. module: account
#: view:account.invoice:0
msgid "Recompute taxes and total"
-msgstr ""
+msgstr "Ricalcola imposte e totale"
#. module: account
#: code:addons/account/account.py:1097
#, python-format
msgid "You cannot modify/delete a journal with entries for this period."
msgstr ""
+"Non è possibile modificare/eliminare un sezionale che ha registrazioni in "
+"questo periodo."
#. module: account
#: field:account.tax.template,include_base_amount:0
@@ -5933,7 +6099,7 @@ msgstr "Incluso nell'imponibile"
#. module: account
#: field:account.invoice,supplier_invoice_number:0
msgid "Supplier Invoice Number"
-msgstr ""
+msgstr "Numero Fattura Fornitore"
#. module: account
#: help:account.payment.term.line,days:0
@@ -5955,6 +6121,8 @@ msgstr "Calcolo ammontare"
#, python-format
msgid "You can not add/modify entries in a closed period %s of journal %s."
msgstr ""
+"Non è possibile aggiungere/modificare registrazioni in un periodo chiuso %s "
+"del sezionale %s."
#. module: account
#: view:account.journal:0
@@ -5979,7 +6147,7 @@ msgstr "Inizio Periodo"
#. module: account
#: model:account.account.type,name:account.account_type_asset_view1
msgid "Asset View"
-msgstr ""
+msgstr "Vista Immobilizzazioni"
#. module: account
#: model:ir.model,name:account.model_account_common_account_report
@@ -6055,12 +6223,12 @@ msgstr "Registrazioni di sezionale di fine anno"
#. module: account
#: view:account.invoice:0
msgid "Draft Refund "
-msgstr ""
+msgstr "Bozza Rimborso "
#. module: account
#: view:cash.box.in:0
msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Compilare questo form se viene immesso contante nel registro cassa:"
#. module: account
#: field:account.payment.term.line,value_amount:0
@@ -6143,7 +6311,7 @@ msgstr "Importo valuta"
#. module: account
#: selection:res.company,tax_calculation_rounding_method:0
msgid "Round per Line"
-msgstr ""
+msgstr "Arrotondamento per Riga"
#. module: account
#: report:account.analytic.account.balance:0
@@ -6200,7 +6368,7 @@ msgstr ""
#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
#, python-format
msgid "You must set a period length greater than 0."
-msgstr ""
+msgstr "E' necessario impostare una durata del periodo maggiore di 0."
#. module: account
#: view:account.fiscal.position.template:0
@@ -6211,7 +6379,7 @@ msgstr "Modelli di \"posizioni fiscali\""
#. module: account
#: view:account.invoice:0
msgid "Draft Refund"
-msgstr ""
+msgstr "Bozza Rimborso"
#. module: account
#: view:account.analytic.chart:0
@@ -6249,6 +6417,8 @@ msgstr "Riconcilia Con Storno"
#: constraint:account.move.line:0
msgid "You cannot create journal items on an account of type view."
msgstr ""
+"Non è possibile creare registrazioni nel sezionale con un conto di tipo "
+"vista."
#. module: account
#: selection:account.payment.term.line,value:0
@@ -6262,6 +6432,8 @@ msgstr "Importo fissato"
#, python-format
msgid "You cannot change the tax, you should remove and recreate lines."
msgstr ""
+"Non è possibile cambiare l'imposta, è necessario rimuoverla e ricreare le "
+"righe."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -6386,7 +6558,7 @@ msgstr "Corrispondenza imposte"
#. module: account
#: view:account.config.settings:0
msgid "Select Company"
-msgstr ""
+msgstr "Selezionare Azienda"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_state_open
@@ -6460,7 +6632,7 @@ msgstr "# di Linee"
#. module: account
#: view:account.invoice:0
msgid "(update)"
-msgstr ""
+msgstr "(aggiornare)"
#. module: account
#: field:account.aged.trial.balance,filter:0
@@ -6587,7 +6759,7 @@ msgstr "Azienda collegata a questo sezionale."
#. module: account
#: help:account.config.settings,group_multi_currency:0
msgid "Allows you multi currency environment"
-msgstr ""
+msgstr "Permette una gestione multivaluta"
#. module: account
#: view:account.subscription:0
@@ -6670,7 +6842,7 @@ msgstr "Voce conto analitico"
#. module: account
#: model:ir.ui.menu,name:account.menu_action_model_form
msgid "Models"
-msgstr ""
+msgstr "Modelli"
#. module: account
#: code:addons/account/account_invoice.py:1090
@@ -6679,6 +6851,8 @@ msgid ""
"You cannot cancel an invoice which is partially paid. You need to "
"unreconcile related payment entries first."
msgstr ""
+"Non è possibile eliminare una fattura che è parzialmente pagata. E' "
+"necessario prima annullare la riconciliazione dei relativi pagamenti."
#. module: account
#: field:product.template,taxes_id:0
@@ -6763,7 +6937,7 @@ msgstr "Mostra semplicemente i sottoconti"
#. module: account
#: view:account.config.settings:0
msgid "Bank & Cash"
-msgstr ""
+msgstr "Banca e Cassa"
#. module: account
#: help:account.fiscalyear.close.state,fy_id:0
@@ -6849,13 +7023,15 @@ msgstr "Crediti"
#. module: account
#: constraint:account.move.line:0
msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Non è possibile creare registrazioni contabili su conti chiusi."
#. module: account
#: code:addons/account/account_invoice.py:594
#, python-format
msgid "Invoice line account's company and invoice's compnay does not match."
msgstr ""
+"Il conto dell'azienda delle righe della fattura non coincide con l'azienda "
+"emittente la fattura."
#. module: account
#: view:account.invoice:0
@@ -6876,7 +7052,7 @@ msgstr "La valuta del conto non e' eguale a quella dell'azienda."
#: code:addons/account/installer.py:48
#, python-format
msgid "Custom"
-msgstr ""
+msgstr "Personalizzazioni"
#. module: account
#: view:account.analytic.account:0
@@ -6887,7 +7063,7 @@ msgstr "Correnti"
#: code:addons/account/account_invoice.py:1305
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
+msgstr "La fattura '%s' è parzialmente pagata: %s%s di %s%s (%s%s residuo)."
#. module: account
#: field:account.journal,cashbox_line_ids:0
@@ -6903,7 +7079,7 @@ msgstr "Capitale"
#. module: account
#: field:account.journal,internal_account_id:0
msgid "Internal Transfers Account"
-msgstr ""
+msgstr "Conto Trasferimenti Interni"
#. module: account
#: code:addons/account/wizard/pos_box.py:33
@@ -6920,7 +7096,7 @@ msgstr "Percentuale"
#. module: account
#: selection:account.config.settings,tax_calculation_rounding_method:0
msgid "Round globally"
-msgstr ""
+msgstr "Arrotondamento sul Totale"
#. module: account
#: selection:account.report.general.ledger,sortby:0
@@ -6952,7 +7128,7 @@ msgstr "Numero fattura"
#. module: account
#: field:account.bank.statement,difference:0
msgid "Difference"
-msgstr ""
+msgstr "Differenza"
#. module: account
#: help:account.tax,include_base_amount:0
@@ -7021,12 +7197,12 @@ msgstr ""
#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
#, python-format
msgid "User Error!"
-msgstr ""
+msgstr "Errore Utente!"
#. module: account
#: view:account.open.closed.fiscalyear:0
msgid "Discard"
-msgstr ""
+msgstr "Annulla"
#. module: account
#: selection:account.account,type:0
@@ -7044,7 +7220,7 @@ msgstr "Voci Giornale Analitico"
#. module: account
#: field:account.config.settings,has_default_company:0
msgid "Has default company"
-msgstr ""
+msgstr "Ha un'azienda di default"
#. module: account
#: view:account.fiscalyear.close:0
@@ -7193,6 +7369,8 @@ msgid ""
"Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
"2%."
msgstr ""
+"Le percentuali delle Righe delle Condizioni di Pagamento devono essere "
+"comprese tra 0 e 1, esempio: 0.02 per 2%."
#. module: account
#: report:account.invoice:0
@@ -7213,7 +7391,7 @@ msgstr "Conto Categoria Costi"
#. module: account
#: sql_constraint:account.tax:0
msgid "Tax Name must be unique per company!"
-msgstr ""
+msgstr "Il nome dell'imposta deve essere unico per azienda!"
#. module: account
#: view:account.bank.statement:0
@@ -7253,12 +7431,14 @@ msgid ""
"You cannot provide a secondary currency if it is the same than the company "
"one."
msgstr ""
+"Non è possibile indicare una valuta secondaria se è la stessa di quella "
+"principale."
#. module: account
#: code:addons/account/account_invoice.py:1321
#, python-format
msgid "Customer invoice"
-msgstr ""
+msgstr "Fattura cliente"
#. module: account
#: selection:account.account.type,report_type:0
@@ -7294,7 +7474,7 @@ msgid ""
"This account will be used instead of the default one as the receivable "
"account for the current partner"
msgstr ""
-"Qiesto conto verra' usato al posto del default come conto per incassi dal "
+"Questo conto verrà usato invece del default come conto incassi per il "
"partner corrente"
#. module: account
@@ -7343,13 +7523,13 @@ msgstr "Conto Economico"
#. module: account
#: field:account.bank.statement,total_entry_encoding:0
msgid "Total Transactions"
-msgstr ""
+msgstr "Transazioni Totali"
#. module: account
#: code:addons/account/account.py:635
#, python-format
msgid "You cannot remove an account that contains journal items."
-msgstr ""
+msgstr "Non è possibile eliminare un conto con registrazioni contabili."
#. module: account
#: code:addons/account/account_move_line.py:1095
@@ -7393,7 +7573,7 @@ msgstr "Manuale"
#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
#, python-format
msgid "You must set a start date."
-msgstr ""
+msgstr "E' necessario impostare una data iniziale."
#. module: account
#: view:account.automatic.reconcile:0
@@ -7442,7 +7622,7 @@ msgstr "Registrazioni Sezionale"
#: code:addons/account/wizard/account_invoice_refund.py:147
#, python-format
msgid "No period found on the invoice."
-msgstr ""
+msgstr "Nessun periodo trovato nella fattura."
#. module: account
#: help:account.partner.ledger,page_split:0
@@ -7488,6 +7668,8 @@ msgstr "Tutte le registrazioni"
#: constraint:account.move.reconcile:0
msgid "You can only reconcile journal items with the same partner."
msgstr ""
+"E' possibile solo riconciliare registrazioni contabili con lo stesso "
+"partnere."
#. module: account
#: view:account.journal.select:0
@@ -7601,7 +7783,7 @@ msgstr ""
#. module: account
#: field:account.config.settings,module_account_voucher:0
msgid "Manage customer payments"
-msgstr ""
+msgstr "Gestione pagamenti clienti"
#. module: account
#: help:report.invoice.created,origin:0
@@ -7620,6 +7802,8 @@ msgid ""
"Error!\n"
"The start date of a fiscal year must precede its end date."
msgstr ""
+"Errore!\n"
+"La data iniziale di un anno fiscale deve precedere quella finale."
#. module: account
#: view:account.tax.template:0
@@ -7635,7 +7819,7 @@ msgstr "Fatture Clienti"
#. module: account
#: view:account.tax:0
msgid "Misc"
-msgstr ""
+msgstr "Varie"
#. module: account
#: view:account.analytic.line:0
@@ -7700,6 +7884,7 @@ msgstr "Documento di origine"
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
msgstr ""
+"Non c'è un conto di costo definito per questo prodotto: \"%s\" (id:%d)."
#. module: account
#: constraint:account.account:0
@@ -7717,7 +7902,7 @@ msgstr "Report contabile"
#. module: account
#: field:account.analytic.line,currency_id:0
msgid "Account Currency"
-msgstr ""
+msgstr "Conto Valuta"
#. module: account
#: report:account.invoice:0
@@ -7731,6 +7916,8 @@ msgid ""
"You can not delete an invoice which is not cancelled. You should refund it "
"instead."
msgstr ""
+"Non è possibile eliminare una fattura che non è annullata. E' necessario "
+"creare invece una nota di credito."
#. module: account
#: help:account.tax,amount:0
@@ -7782,7 +7969,7 @@ msgstr "Movimenti aperti su conto di spesa"
#. module: account
#: view:account.invoice:0
msgid "Customer Reference"
-msgstr ""
+msgstr "Riferimento cliente"
#. module: account
#: field:account.account.template,parent_id:0
@@ -7839,7 +8026,7 @@ msgstr "Raggruppare per anno data fattura"
#. module: account
#: field:account.config.settings,purchase_tax_rate:0
msgid "Purchase tax (%)"
-msgstr ""
+msgstr "Imposta sugli acquisti (%)"
#. module: account
#: help:res.partner,credit:0
@@ -7905,7 +8092,7 @@ msgstr "Movimenti Aperti Conto di Ricavo"
#. module: account
#: field:account.config.settings,group_proforma_invoices:0
msgid "Allow pro-forma invoices"
-msgstr ""
+msgstr "Consentire fatture proforma"
#. module: account
#: view:account.bank.statement:0
@@ -7936,12 +8123,12 @@ msgstr "Crea registrazioni"
#. module: account
#: model:ir.model,name:account.model_cash_box_out
msgid "cash.box.out"
-msgstr ""
+msgstr "cash.box.out"
#. module: account
#: help:account.config.settings,currency_id:0
msgid "Main currency of the company."
-msgstr ""
+msgstr "Valuta principale di questa azienda."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reports
@@ -7969,7 +8156,7 @@ msgstr "Sezionale Contabile"
#. module: account
#: field:account.config.settings,tax_calculation_rounding_method:0
msgid "Tax calculation rounding method"
-msgstr ""
+msgstr "Metodo di arrotondamento delle imposte"
#. module: account
#: model:process.node,name:account.process_node_paidinvoice0
@@ -8021,6 +8208,8 @@ msgid ""
"There is no default credit account defined \n"
"on journal \"%s\"."
msgstr ""
+"Non c'è un conto di credito di default definito \n"
+"nel sezionale \"%s\"."
#. module: account
#: view:account.invoice.line:0
@@ -8184,6 +8373,8 @@ msgid ""
"This date will be used as the invoice date for credit note and period will "
"be chosen accordingly!"
msgstr ""
+"Questa data sarà usata come data fattura per la nota di credito e il periodo "
+"sarà scelto di conseguenza!"
#. module: account
#: view:product.template:0
@@ -8197,6 +8388,8 @@ msgid ""
"You have to set a code for the bank account defined on the selected chart of "
"accounts."
msgstr ""
+"E' necessario selezionare un codice per il conto bancario definito sul piano "
+"dei conti selezionato."
#. module: account
#: model:ir.ui.menu,name:account.menu_manual_reconcile
@@ -8278,7 +8471,7 @@ msgstr "Codice"
#. module: account
#: field:account.config.settings,sale_refund_sequence_prefix:0
msgid "Credit note sequence"
-msgstr ""
+msgstr "Sequenza note di credito"
#. module: account
#: model:ir.actions.act_window,name:account.action_validate_account_move
@@ -8292,7 +8485,7 @@ msgstr "Conferma le scritture contabili"
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralised Counterpart"
-msgstr ""
+msgstr "Contropartita Centralizzata"
#. module: account
#: selection:account.bank.statement.line,type:0
@@ -8348,7 +8541,7 @@ msgstr "Sequenza"
#. module: account
#: field:account.config.settings,paypal_account:0
msgid "Paypal account"
-msgstr ""
+msgstr "Conto Paypal"
#. module: account
#: selection:account.print.journal,sort_selection:0
@@ -8367,11 +8560,13 @@ msgid ""
"Error!\n"
"You cannot create recursive accounts."
msgstr ""
+"Errore!\n"
+"Non è possibile creare conti ricorsivi."
#. module: account
#: model:ir.model,name:account.model_cash_box_in
msgid "cash.box.in"
-msgstr ""
+msgstr "cash.box.in"
#. module: account
#: help:account.invoice,move_id:0
@@ -8381,7 +8576,7 @@ msgstr "Collegamento alle voci del sezionale generate automaticamente."
#. module: account
#: model:ir.model,name:account.model_account_config_settings
msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
#. module: account
#: selection:account.config.settings,period:0
@@ -8404,7 +8599,7 @@ msgstr "Saldo Calcolato"
#: code:addons/account/static/src/js/account_move_reconciliation.js:89
#, python-format
msgid "You must choose at least one record."
-msgstr ""
+msgstr "E' necessario selezionare almeno un record."
#. module: account
#: field:account.account,parent_id:0
@@ -8479,7 +8674,7 @@ msgstr "Mastro del partner"
#: code:addons/account/account_invoice.py:1340
#, python-format
msgid "%s
cancelled ."
-msgstr ""
+msgstr "%s
annullato ."
#. module: account
#: code:addons/account/account.py:652
@@ -8493,12 +8688,12 @@ msgstr "Attenzione !"
#: help:account.bank.statement,message_unread:0
#: help:account.invoice,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se selezionato, nuovi messaggi richiedono la tua attenzione"
#. module: account
#: field:res.company,tax_calculation_rounding_method:0
msgid "Tax Calculation Rounding Method"
-msgstr ""
+msgstr "Metodo di Arrotondamento calcolo Imposte"
#. module: account
#: field:account.entries.report,move_line_state:0
@@ -8620,6 +8815,7 @@ msgstr "Bilancio Analitico Invertito -"
msgid ""
"Is this reconciliation produced by the opening of a new fiscal year ?."
msgstr ""
+"La riconciliazione è prodotto dall'apertura di un nuovo anno fiscale ?."
#. module: account
#: view:account.analytic.line:0
@@ -8693,7 +8889,7 @@ msgstr "Registro Costi"
#. module: account
#: view:account.config.settings:0
msgid "No Fiscal Year Defined for This Company"
-msgstr ""
+msgstr "Nessun Anno Fiscale Definito per Questa Azienda"
#. module: account
#: view:account.invoice:0
@@ -8724,7 +8920,7 @@ msgstr "Sezionale Note di Credito Fornitori"
#: code:addons/account/account.py:1292
#, python-format
msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "E' necessario definire una sequenza per il sezionale."
#. module: account
#: help:account.tax.template,amount:0
@@ -8753,6 +8949,9 @@ msgid ""
"recalls.\n"
" This installs the module account_followup."
msgstr ""
+"Consente di automatizzare le lettere per le fatture non pagate, non richiami "
+"multi-livello.\n"
+" Installa il modulo account_followup."
#. module: account
#: field:account.automatic.reconcile,period_id:0
@@ -8797,12 +8996,12 @@ msgstr "Totale imponibile"
#: code:addons/account/wizard/account_report_common.py:153
#, python-format
msgid "Select a starting and an ending period."
-msgstr ""
+msgstr "Selezionare un periodo iniziale e uno finale."
#. module: account
#: field:account.config.settings,sale_sequence_next:0
msgid "Next invoice number"
-msgstr ""
+msgstr "Numero di fattura successivo"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
@@ -8951,7 +9150,7 @@ msgstr "Import automatico dei movimenti bancari"
#: code:addons/account/account_invoice.py:370
#, python-format
msgid "Unknown Error!"
-msgstr ""
+msgstr "Errore Sconosciuto!"
#. module: account
#: model:ir.model,name:account.model_account_move_bank_reconcile
@@ -8961,7 +9160,7 @@ msgstr "Riconciliazione movimenti bancari"
#. module: account
#: view:account.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Conferma"
#. module: account
#: field:account.financial.report,account_type_ids:0
@@ -8977,6 +9176,8 @@ msgid ""
"You cannot use this general account in this journal, check the tab 'Entry "
"Controls' on the related journal."
msgstr ""
+"Non è possibile usare questo conto generale in questo sezionale, controllare "
+"la sezione 'Voci di controllo' nel relativo sezionale."
#. module: account
#: view:account.payment.term.line:0
@@ -9189,6 +9390,8 @@ msgstr "Il codice del conto deve essere unico per ogni azienda!"
#: help:product.template,property_account_expense:0
msgid "This account will be used to value outgoing stock using cost price."
msgstr ""
+"Questo conto sarà utilizzato per valutare le merci in uscita utilizzando il "
+"prezzo di costo."
#. module: account
#: view:account.invoice:0
@@ -9226,7 +9429,7 @@ msgstr "Conti consentiti (vuoto per non effettuare nessun controllo)"
#. module: account
#: field:account.config.settings,sale_tax_rate:0
msgid "Sales tax (%)"
-msgstr ""
+msgstr "Imposta sulle vendite (%)"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -9292,6 +9495,8 @@ msgid ""
"This allows you to check writing and printing.\n"
" This installs the module account_check_writing."
msgstr ""
+"Permette di verificare la scrittura e la stampa.\n"
+" Installa il modulo account_check_writing."
#. module: account
#: model:res.groups,name:account.group_account_invoice
@@ -9369,6 +9574,9 @@ msgid ""
"created. If you leave that field empty, it will use the same journal as the "
"current invoice."
msgstr ""
+"E' possibile selezionare qui il sezionale da utilizzare per le note di "
+"credito che saranno create. Se questa casella viene lasciata vuota, verrà "
+"utilizzato lo stesso sezionale della fattura corrente."
#. module: account
#: help:account.bank.statement.line,sequence:0
@@ -9401,7 +9609,7 @@ msgstr "Modello errato !"
#: view:account.tax.code.template:0
#: view:account.tax.template:0
msgid "Tax Template"
-msgstr ""
+msgstr "Modello Imposta"
#. module: account
#: field:account.invoice.refund,period:0
@@ -9421,6 +9629,10 @@ msgid ""
"some non legal fields or you must unreconcile first.\n"
"%s."
msgstr ""
+"Non è possibile fare questa modifica su una registrazione riconciliata. E' "
+"possibile cambiare solo alcuni campi non fiscali, altrimenti è necessario "
+"prima annullare la riconciliazione.\n"
+"%s."
#. module: account
#: help:account.financial.report,sign:0
@@ -9467,7 +9679,7 @@ msgstr "Le Bozze di fatture sono marcate, convalidate e stampate."
#: field:account.bank.statement,message_is_follower:0
#: field:account.invoice,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "E' un Follower"
#. module: account
#: view:account.move:0
@@ -9747,7 +9959,7 @@ msgstr "Aziende collegate al Partner"
#. module: account
#: view:account.invoice:0
msgid "Ask Refund"
-msgstr ""
+msgstr "Richiesta Rimborso"
#. module: account
#: view:account.move.line:0
@@ -9789,12 +10001,12 @@ msgstr "Conti di Credito"
#. module: account
#: field:account.config.settings,purchase_refund_sequence_prefix:0
msgid "Supplier credit note sequence"
-msgstr ""
+msgstr "Sequenza nota di credito fornitore"
#. module: account
#: field:account.config.settings,purchase_sequence_next:0
msgid "Next supplier invoice number"
-msgstr ""
+msgstr "Numero fattura fornitore successivo"
#. module: account
#: help:account.config.settings,module_account_payment:0
@@ -9824,6 +10036,8 @@ msgstr "Estratti Conto Bancari"
#, python-format
msgid "To reconcile the entries company should be the same for all entries."
msgstr ""
+"Per riconciliare le registrazioni l'azienda dovrebbe essere la stessa per "
+"tutte le registrazioni."
#. module: account
#: field:account.account,balance:0
@@ -9901,7 +10115,7 @@ msgstr "Filtra per"
#: field:account.cashbox.line,number_closing:0
#: field:account.cashbox.line,number_opening:0
msgid "Number of Units"
-msgstr ""
+msgstr "Numero di Unità"
#. module: account
#: model:process.node,note:account.process_node_manually0
@@ -9926,12 +10140,12 @@ msgstr "Movimento contabile"
#: code:addons/account/wizard/account_period_close.py:51
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Azione non valida!"
#. module: account
#: view:account.bank.statement:0
msgid "Date / Period"
-msgstr ""
+msgstr "Data / Periodo"
#. module: account
#: report:account.central.journal:0
@@ -9950,11 +10164,14 @@ msgid ""
"The period is invalid. Either some periods are overlapping or the period's "
"dates are not matching the scope of the fiscal year."
msgstr ""
+"Errore!\n"
+"Il periodo non è valido. Alcuni periodi sono sovrapposti o le date del "
+"periodo non sono all'interno dell'anno fiscale."
#. module: account
#: report:account.overdue:0
msgid "There is nothing due with this customer."
-msgstr ""
+msgstr "Non c'è alcun credito scaduto verso questo cliente."
#. module: account
#: help:account.tax,account_paid_id:0
@@ -9974,7 +10191,7 @@ msgstr "Crea un conto con il template selezionato sotto il mastro esistente."
#. module: account
#: report:account.invoice:0
msgid "Source"
-msgstr ""
+msgstr "Origine"
#. module: account
#: selection:account.model.line,date_maturity:0
@@ -9997,11 +10214,13 @@ msgid ""
"This field contains the information related to the numbering of the journal "
"entries of this journal."
msgstr ""
+"Questo campo contiene le informazioni relative alla numerazione delle "
+"registrazioni di questo sezionale."
#. module: account
#: field:account.invoice,sent:0
msgid "Sent"
-msgstr ""
+msgstr "Spedito"
#. module: account
#: view:account.unreconcile.reconcile:0
@@ -10017,7 +10236,7 @@ msgstr "Report Comune"
#: field:account.config.settings,default_sale_tax:0
#: field:account.config.settings,sale_tax:0
msgid "Default sale tax"
-msgstr ""
+msgstr "Imposta sulle vendite di default"
#. module: account
#: report:account.overdue:0
@@ -10028,7 +10247,7 @@ msgstr "Saldo:"
#: code:addons/account/account.py:1542
#, python-format
msgid "Cannot create moves for different companies."
-msgstr ""
+msgstr "Non è possibile creare movimenti per diverse aziende."
#. module: account
#: view:account.invoice.report:0
@@ -10104,7 +10323,7 @@ msgstr "Periodo finale"
#. module: account
#: model:account.account.type,name:account.account_type_expense_view1
msgid "Expense View"
-msgstr ""
+msgstr "Vista Costi"
#. module: account
#: field:account.move.line,date_maturity:0
@@ -10115,7 +10334,7 @@ msgstr "Data scadenza"
#: code:addons/account/account.py:1459
#, python-format
msgid " Centralisation"
-msgstr ""
+msgstr " Centralizzazione"
#. module: account
#: help:account.journal,type:0
@@ -10480,7 +10699,7 @@ msgstr "Utile (Perdita) da visualizzare"
#: code:addons/account/account_invoice.py:368
#, python-format
msgid "There is no Sale/Purchase Journal(s) defined."
-msgstr ""
+msgstr "Non c'è un Sezionale(/i) di Vendita/Acquisto definito."
#. module: account
#: view:account.move.line.reconcile.select:0
@@ -10683,7 +10902,7 @@ msgstr "Totale"
#: code:addons/account/wizard/account_invoice_refund.py:109
#, python-format
msgid "Cannot %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Non è possibile %s una fattura bozza/proforma/annullata."
#. module: account
#: field:account.tax,account_analytic_paid_id:0
@@ -10812,7 +11031,7 @@ msgstr "Conti vuoti ? "
#: code:addons/account/account_move_line.py:1046
#, python-format
msgid "Unable to change tax!"
-msgstr ""
+msgstr "Impossibile cambiare l'imposta!"
#. module: account
#: constraint:account.bank.statement:0
@@ -11396,7 +11615,7 @@ msgstr ""
#. module: account
#: selection:account.config.settings,tax_calculation_rounding_method:0
msgid "Round per line"
-msgstr "Arrotonda per riga"
+msgstr "Arrotondamento per Riga"
#. module: account
#: help:account.move.line,amount_residual_currency:0
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 74fca69af53..95069e431dc 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-01 16:00+0000\n"
-"Last-Translator: Thomas Pot (Open2bizz)
\n"
+"PO-Revision-Date: 2012-12-09 19:02+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) \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-12-04 05:21+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#, python-format
#~ msgid "Integrity Error !"
@@ -30,13 +30,13 @@ msgstr "Betaling (administratief)"
msgid ""
"An account fiscal position could be defined only once time on same accounts."
msgstr ""
-"Een fiscale positie kan maar één keer worden gedefinieerd voro dezelfde "
+"Een fiscale positie kan maar één keer worden gedefinieerd voor dezelfde "
"rekening."
#. module: account
#: view:account.unreconcile:0
msgid "Unreconciliate Transactions"
-msgstr "Afletteren transactief ongedaan maken"
+msgstr "Afletteren transacties ongedaan maken"
#. module: account
#: help:account.tax.code,sequence:0
@@ -502,7 +502,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
#, python-format
msgid "Period :"
-msgstr ""
+msgstr "Periode:"
#. module: account
#: field:account.account.template,chart_template_id:0
@@ -974,6 +974,8 @@ msgid ""
"Print Report with the currency column if the currency differs from the "
"company currency."
msgstr ""
+"Print de rapportage met de valuta kolom als de valuta afwijkt van de "
+"bedrijfsvaluta"
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -1077,6 +1079,8 @@ msgid ""
"You cannot validate this journal entry because account \"%s\" does not "
"belong to chart of accounts \"%s\"."
msgstr ""
+"U kunt deze journaalpost niet valideren omdat rekening \"%s\" niet tot het "
+"rekeningschema \"%s\" behoort."
#. module: account
#: view:validate.account.move:0
@@ -1094,7 +1098,7 @@ msgstr "Totaalbedrag"
#. module: account
#: help:account.invoice,supplier_invoice_number:0
msgid "The reference of this invoice as provided by the supplier."
-msgstr ""
+msgstr "De referentie van deze factuur zoals opgegeven door de leverancier"
#. module: account
#: selection:account.account,type:0
@@ -1270,6 +1274,8 @@ msgstr "Crediteer "
#: help:account.config.settings,company_footer:0
msgid "Bank accounts as printed in the footer of each printed document"
msgstr ""
+"Rekeninginformatie die afgedrukt wordt in de voettekst van ieder afgedrukt "
+"document"
#. module: account
#: view:account.tax:0
@@ -1496,7 +1502,7 @@ msgstr "Niveau"
#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice."
-msgstr ""
+msgstr "U kunt alleen de valuta wijzigen van een voorlopige factuur"
#. module: account
#: report:account.invoice:0
@@ -1617,7 +1623,7 @@ msgstr "Debiteuren"
#: code:addons/account/account.py:767
#, python-format
msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopie)"
#. module: account
#: selection:account.balance.report,display_account:0
@@ -2125,7 +2131,7 @@ msgstr "Klant ref:"
#: help:account.tax.template,ref_tax_code_id:0
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the tax declaration."
-msgstr ""
+msgstr "Gebruik deze code voor de belastingaangifte"
#. module: account
#: help:account.period,special:0
@@ -2292,6 +2298,18 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Klik om een bankafschrift te registreren.\n"
+"
\n"
+" Een bankafschrift is een samenvatting van alle financiele "
+"transacties\n"
+" van een bankrekening gedurende een bepaalde periode.\n"
+" U ontvangt deze periodieke van uw bank.\n"
+"
\n"
+" Met OpenERP kunt u de bankafschriften direct afletteren\n"
+" met de gerelateerde in- en verkoopfacturen.\n"
+"
\n"
+" "
#. module: account
#: field:account.config.settings,currency_id:0
@@ -2381,7 +2399,7 @@ msgstr "Afsluiten boekjaar"
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
#, python-format
msgid "Journal :"
-msgstr ""
+msgstr "Dagboek:"
#. module: account
#: sql_constraint:account.fiscal.position.tax:0
@@ -7290,7 +7308,7 @@ msgstr "Behoud het balans +/- teken"
#: model:ir.actions.report.xml,name:account.account_vat_declaration
#: model:ir.ui.menu,name:account.menu_account_vat_declaration
msgid "Taxes Report"
-msgstr "Belastingen rapport"
+msgstr "BTW aangifte"
#. module: account
#: selection:account.journal.period,state:0
@@ -10658,7 +10676,7 @@ msgstr "Vervaldatum"
#: field:cash.box.in,name:0
#: field:cash.box.out,name:0
msgid "Reason"
-msgstr ""
+msgstr "Reden"
#. module: account
#: selection:account.partner.ledger,filter:0
@@ -10839,7 +10857,7 @@ msgstr "Debiteuren"
#: code:addons/account/account_move_line.py:776
#, python-format
msgid "Already reconciled."
-msgstr ""
+msgstr "Al afgeletterd"
#. module: account
#: selection:account.model.line,date_maturity:0
@@ -11138,7 +11156,7 @@ msgstr "Rechts bovenliggende"
#: code:addons/account/static/src/js/account_move_reconciliation.js:80
#, python-format
msgid "Never"
-msgstr ""
+msgstr "Nooit"
#. module: account
#: model:ir.model,name:account.model_account_addtmpl_wizard
@@ -11159,7 +11177,7 @@ msgstr "Relaties"
#. module: account
#: field:account.account,note:0
msgid "Internal Notes"
-msgstr ""
+msgstr "Interne notities"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear
@@ -11192,7 +11210,7 @@ msgstr "Administratiemodel"
#: code:addons/account/account_cash_statement.py:292
#, python-format
msgid "Loss"
-msgstr ""
+msgstr "Verlies"
#. module: account
#: selection:account.entries.report,month:0
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index d5f9538df77..8791f550fc9 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-01 18:30+0000\n"
+"PO-Revision-Date: 2012-12-10 00:34+0000\n"
"Last-Translator: Dusan Laznik \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-12-04 05:25+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -386,7 +386,7 @@ msgstr ""
#: view:account.invoice.report:0
#: field:account.invoice.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Prodajalec"
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@@ -452,7 +452,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
#, python-format
msgid "Period :"
-msgstr ""
+msgstr "Obdobje:"
#. module: account
#: field:account.account.template,chart_template_id:0
@@ -1108,7 +1108,7 @@ msgstr "Oznaka"
#. module: account
#: view:account.config.settings:0
msgid "Features"
-msgstr ""
+msgstr "Možnosti"
#. module: account
#: code:addons/account/account.py:2293
@@ -1189,7 +1189,7 @@ msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Refund "
-msgstr ""
+msgstr "Dobropis "
#. module: account
#: help:account.config.settings,company_footer:0
@@ -1329,7 +1329,7 @@ msgstr "Izhodna tečajna lista"
#. module: account
#: field:account.config.settings,chart_template_id:0
msgid "Template"
-msgstr ""
+msgstr "Predloga"
#. module: account
#: selection:account.analytic.journal,type:0
@@ -1542,7 +1542,7 @@ msgstr "Konto terjatev"
#: code:addons/account/account.py:767
#, python-format
msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopija)"
#. module: account
#: selection:account.balance.report,display_account:0
@@ -1611,7 +1611,7 @@ msgstr "Preskoči stanje \"Osnutek\" za ročno vnašanje"
#: code:addons/account/wizard/account_report_common.py:159
#, python-format
msgid "Not implemented."
-msgstr ""
+msgstr "Ni vgrajeno."
#. module: account
#: view:account.invoice.refund:0
@@ -1698,7 +1698,7 @@ msgstr "Neobdavčeno"
#. module: account
#: view:account.journal:0
msgid "Advanced Settings"
-msgstr ""
+msgstr "Napredne nastavitve"
#. module: account
#: view:account.bank.statement:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 77efde5acd5..65c83ae19f2 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 16:27+0000\n"
-"Last-Translator: ccdos \n"
+"PO-Revision-Date: 2012-12-09 04:42+0000\n"
+"Last-Translator: sum1201 \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-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -104,6 +104,8 @@ msgid ""
"Error!\n"
"You cannot create recursive account templates."
msgstr ""
+"错误!\n"
+"您不能创建重复的帐户模板。"
#. module: account
#. openerp-web
@@ -192,6 +194,12 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+"点击添加一个会计期间.\n"
+"
\n"
+"会计期间通常是一个月或一个季度。它通常对应纳税申报的期间。\n"
+"
\n"
+" "
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -440,7 +448,7 @@ msgstr ""
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
#, python-format
msgid "Period :"
-msgstr ""
+msgstr "时间:"
#. module: account
#: field:account.account.template,chart_template_id:0
@@ -603,7 +611,7 @@ msgstr "没有什么被核销"
#. module: account
#: field:account.config.settings,decimal_precision:0
msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "日记帐分录小数精度"
#. module: account
#: selection:account.config.settings,period:0
@@ -722,7 +730,7 @@ msgstr "账簿的会计期间"
#: constraint:account.move:0
msgid ""
"You cannot create more than one move per period on a centralized journal."
-msgstr ""
+msgstr "在每个会计期间,你不可以创建1个以上的总分类凭证"
#. module: account
#: help:account.tax,account_analytic_paid_id:0
@@ -1137,7 +1145,7 @@ msgstr "科目名称"
#. module: account
#: field:account.journal,with_last_closing_balance:0
msgid "Opening With Last Closing Balance"
-msgstr "用末期的期终余额打开"
+msgstr "用上个期末余额作期初"
#. module: account
#: help:account.tax.code,notprintable:0
@@ -1401,7 +1409,7 @@ msgstr "级别"
#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice."
-msgstr ""
+msgstr "您只能修改发票草稿的货币。"
#. module: account
#: report:account.invoice:0
@@ -1959,7 +1967,7 @@ msgstr "Pending Accounts"
#. module: account
#: view:account.open.closed.fiscalyear:0
msgid "Cancel Fiscal Year Opening Entries"
-msgstr ""
+msgstr "取消财务年度未结案分录"
#. module: account
#: report:account.journal.period.print.sale.purchase:0
@@ -2288,7 +2296,7 @@ msgstr "关闭财政年度"
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
#, python-format
msgid "Journal :"
-msgstr ""
+msgstr "流水帐"
#. module: account
#: sql_constraint:account.fiscal.position.tax:0
@@ -2995,7 +3003,7 @@ msgstr "单号"
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Purchase Tax"
-msgstr ""
+msgstr "购置税"
#. module: account
#: help:account.move.line,tax_code_id:0
@@ -3089,7 +3097,7 @@ msgstr "沟通类型"
#. module: account
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "帐户和帐期必须属于同一家公司。"
#. module: account
#: field:account.invoice.line,discount:0
@@ -3117,7 +3125,7 @@ msgstr "补差额金额"
#: field:account.bank.statement,message_unread:0
#: field:account.invoice,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "未读消息"
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:44
diff --git a/addons/account/partner.py b/addons/account/partner.py
index ce3ac41e756..346cc38f5df 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -135,18 +135,23 @@ class res_partner(osv.osv):
return []
having_values = tuple(map(itemgetter(2), args))
where = ' AND '.join(
- map(lambda x: '(SUM(debit-credit) %(operator)s %%s)' % {
+ map(lambda x: '(SUM(bal2) %(operator)s %%s)' % {
'operator':x[1]},args))
query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
- cr.execute(('SELECT partner_id FROM account_move_line l '\
- 'WHERE account_id IN '\
- '(SELECT id FROM account_account '\
- 'WHERE type=%s AND active) '\
- 'AND reconcile_id IS NULL '\
- 'AND '+query+' '\
- 'AND partner_id IS NOT NULL '\
- 'GROUP BY partner_id HAVING '+where),
- (type,) + having_values)
+ cr.execute(('SELECT pid AS partner_id, SUM(bal2) FROM ' \
+ '(SELECT CASE WHEN bal IS NOT NULL THEN bal ' \
+ 'ELSE 0.0 END AS bal2, p.id as pid FROM ' \
+ '(SELECT (debit-credit) AS bal, partner_id ' \
+ 'FROM account_move_line l ' \
+ 'WHERE account_id IN ' \
+ '(SELECT id FROM account_account '\
+ 'WHERE type=%s AND active) ' \
+ 'AND reconcile_id IS NULL ' \
+ 'AND '+query+') AS l ' \
+ 'RIGHT JOIN res_partner p ' \
+ 'ON p.id = partner_id ) AS pl ' \
+ 'GROUP BY pid HAVING ' + where),
+ (type,) + having_values)
res = cr.fetchall()
if not res:
return [('id','=','0')]
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index a70fdf38f3c..44d53839700 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -4,6 +4,7 @@
product.normal.form.inherit
product.product
+ 5
diff --git a/addons/account/report/account_financial_report.py b/addons/account/report/account_financial_report.py
index b06aadce212..3898158c457 100644
--- a/addons/account/report/account_financial_report.py
+++ b/addons/account/report/account_financial_report.py
@@ -56,7 +56,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header):
for report in self.pool.get('account.financial.report').browse(self.cr, self.uid, ids2, context=data['form']['used_context']):
vals = {
'name': report.name,
- 'balance': report.balance,
+ 'balance': report.balance * report.sign,
'type': 'report',
'level': bool(report.style_overwrite) and report.style_overwrite or report.level,
'account_type': report.type =='sum' and 'view' or False, #used to underline the financial report balances
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 82619f49c3c..d6cc784c767 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -48,6 +48,7 @@ class report_account_receivable(osv.osv):
_order = 'name desc'
def init(self, cr):
+ tools.drop_view_if_exists(cr, 'report_account_receivable')
cr.execute("""
create or replace view report_account_receivable as (
select
@@ -183,6 +184,7 @@ class report_invoice_created(osv.osv):
_order = 'create_date'
def init(self, cr):
+ tools.drop_view_if_exists(cr, 'report_invoice_created')
cr.execute("""create or replace view report_invoice_created as (
select
inv.id as id, inv.name as name, inv.type as type,
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 814dbea6fac..533170cf4a4 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -36,7 +36,7 @@ class account_invoice_refund(osv.osv_memory):
'period': fields.many2one('account.period', 'Force period'),
'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the credit note that will be created. If you leave that field empty, it will use the same journal as the current invoice.'),
'description': fields.char('Reason', size=128, required=True),
- 'filter_refund': fields.selection([('refund', 'Create a draft credit note'), ('cancel', 'Cancel: create credit note and reconcile'),('modify', 'Modify: create credit note, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Credit note base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
+ 'filter_refund': fields.selection([('refund', 'Create a draft refund'), ('cancel', 'Cancel: create refund and reconcile'),('modify', 'Modify: create refund, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Refund base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
}
def _get_journal(self, cr, uid, context=None):
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 3945a6f57e6..49c1550ad01 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -40,7 +40,7 @@
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index b84c35ba243..f5b465222f1 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -23,6 +23,7 @@ import time
from lxml import etree
from openerp.osv import fields, osv
+from openerp.osv.orm import setup_modifiers
from openerp.tools.translate import _
class account_common_report(osv.osv_memory):
@@ -67,16 +68,16 @@ class account_common_report(osv.osv_memory):
(_check_company_id, 'The fiscalyear, periods or chart of account chosen have to belong to the same company.', ['chart_account_id','fiscalyear_id','period_from','period_to']),
]
-
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
if context is None:context = {}
res = super(account_common_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False)
- if context.get('active_model', False) == 'account.account' and view_id:
+ if context.get('active_model', False) == 'account.account':
doc = etree.XML(res['arch'])
nodes = doc.xpath("//field[@name='chart_account_id']")
for node in nodes:
node.set('readonly', '1')
node.set('help', 'If you print the report from Account list/form view it will not consider Charts of account')
+ setup_modifiers(node, res['fields']['chart_account_id'])
res['arch'] = etree.tostring(doc)
return res
@@ -121,8 +122,8 @@ class account_common_report(osv.osv_memory):
now = time.strftime('%Y-%m-%d')
company_id = False
ids = context.get('active_ids', [])
- if ids:
- company_id = self.browse(cr, uid, ids[0], context=context).company_id.id
+ if ids and context.get('active_model') == 'account.account':
+ company_id = self.pool.get('account.account').browse(cr, uid, ids[0], context=context).company_id.id
fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, [('date_start', '<', now), ('date_stop', '>', now), ('company_id', '=', company_id)], limit=1)
return fiscalyears and fiscalyears[0] or False
diff --git a/addons/account_accountant/i18n/hr.po b/addons/account_accountant/i18n/hr.po
index da83a8c12c9..8886a91875a 100644
--- a/addons/account_accountant/i18n/hr.po
+++ b/addons/account_accountant/i18n/hr.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2011-01-17 00:02+0000\n"
+"PO-Revision-Date: 2012-12-09 19:38+0000\n"
"Last-Translator: Goran Kliska \n"
"Language-Team: Croatian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
msgid "Open Accounting Menu"
-msgstr ""
+msgstr "Otvori izbornik računovodstvo"
#~ msgid ""
#~ "\n"
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 53ebf225de1..5ff15c09076 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -45,7 +45,7 @@ Adds menu to show relevant information to each manager.You can also view the rep
'css': [
'static/src/css/analytic.css'
],
- 'demo': [],
+ 'demo': ['analytic_account_demo.xml'],
'installable': True,
'auto_install': False,
}
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 9eb8fe90895..368dd7f3b65 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -8,7 +8,7 @@
form
tree,form
[('invoice_id','=',False)]
- {'search_default_to_invoice': 1}
+ {'search_default_to_invoice': 1, 'search_default_sales': 1}
@@ -34,7 +34,7 @@
-
+
diff --git a/addons/account_analytic_analysis/analytic_account_demo.xml b/addons/account_analytic_analysis/analytic_account_demo.xml
new file mode 100644
index 00000000000..f721fc1459d
--- /dev/null
+++ b/addons/account_analytic_analysis/analytic_account_demo.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+ True
+ 1200
+ True
+
+
+ 100000
+
+
+
+
+
+
+
+
+
+ 100
+
+
+
+
+ True
+ 500
+ True
+
+ 50000
+
+
+
+
+
+
+
+
+ True
+ True
+ 100
+
+
+
+
+
+
+
diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index 5f1fd8a54e8..0b0894681b8 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/i18n/de.po
@@ -7,14 +7,15 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-08 08:41+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp \n"
+"PO-Revision-Date: 2012-12-06 21:29+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -24,17 +25,17 @@ msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Group By..."
-msgstr "Gruppiere nach..."
+msgstr "Gruppierung ..."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "To Invoice"
-msgstr ""
+msgstr "Abrechenbar"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Remaining"
-msgstr ""
+msgstr "Verbleibend"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -58,7 +59,7 @@ msgstr "vorheriger Arbeitstag"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_to_invoice:0
msgid "Uninvoiced Amount"
-msgstr "Nicht berechnete Beträge"
+msgstr "Abrechenbarer Betrag"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -69,56 +70,58 @@ msgid ""
"to\n"
" define the customer invoice price rate."
msgstr ""
+"Die abzurechnenden Arbeitsstunden werden gemäß der Preisliste des Vertrags "
+"für das beim Mitarbeiter hinterlegte Produkt berechnet."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "⇒ Invoice"
-msgstr ""
+msgstr "=> Rechnung"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_invoiced:0
msgid "Invoiced Amount"
-msgstr "Rechnungsbetrag"
+msgstr "Abgerechnet"
#. module: account_analytic_analysis
#: field:account.analytic.account,last_worked_invoiced_date:0
msgid "Date of Last Invoiced Cost"
-msgstr "Datum letzte Berechnung"
+msgstr "Datum der letzten Abrechnung"
#. module: account_analytic_analysis
#: help:account.analytic.account,fix_price_to_invoice:0
msgid "Sum of quotations for this contract."
-msgstr ""
+msgstr "Summe abzurechnende Beträge"
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_invoiced:0
msgid "Total customer invoiced amount for this account."
-msgstr "Gesamtbetrag Kundenrechnungen für dieses Konto"
+msgstr "Bereits abgerechnete Beträge"
#. module: account_analytic_analysis
#: help:account.analytic.account,timesheet_ca_invoiced:0
msgid "Sum of timesheet lines invoiced for this contract."
-msgstr ""
+msgstr "Summe abgerechneter Arbeitszeiten"
#. module: account_analytic_analysis
#: help:account.analytic.account,revenue_per_hour:0
msgid "Computed using the formula: Invoiced Amount / Total Time"
-msgstr "Berechnet als: Verrechneter Betrag / Gesamt Zeit"
+msgstr "Berechnungsformel: Abgerechnete Beträge / Abgerechnete Stunden"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Contracts not assigned"
-msgstr ""
+msgstr "Nicht unterzeichnete Verträge"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Partner"
-msgstr ""
+msgstr "Kunde"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Contracts that are not assigned to an account manager."
-msgstr "Verträge, die keinem Account Manager zugeordnet sind."
+msgstr "Verträge ohne verantwortlichen Mitarbeiter"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
@@ -138,11 +141,25 @@ msgid ""
"
\n"
" "
msgstr ""
+"\n"
+" Klicken Sie um neuen Vertrag anzulegen.\n"
+"
\n"
+" Sie finden hier die zu verlängernden Verträge, bei denen "
+"entweder das terminierte Vertragsende\n"
+" bereits überschritten wurde oder die geleistete Arbeitszeit "
+"nicht mehr durch die vertraglich vereinbarte abrechenbare Arbeitszeit "
+"abgedeckt wird.\n"
+"
\n"
+" OpenERP versetzt automatisch die zu erneuernden Verträge in "
+"den Status Wiedervorlage. Nach der Erneuerung einer Vereinbarung sollte der "
+"Verkäufer den alten Vertrag entweder abschließen oder erneuern. \n"
+"
\n"
+" "
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "End Date"
-msgstr "Enddatum"
+msgstr "Ende Datum"
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -156,12 +173,12 @@ msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_hours_to_invoice:0
msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
-msgstr ""
+msgstr "Berechnungsformel: Maximale Zeit - Abgerechnete Zeit"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Expected"
-msgstr ""
+msgstr "Geplant"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -174,7 +191,7 @@ msgstr "Analytisches Konto"
#. module: account_analytic_analysis
#: help:account.analytic.account,theorical_margin:0
msgid "Computed using the formula: Theoretical Revenue - Total Costs"
-msgstr ""
+msgstr "Berechnungsformel: Geplanter Umsatz - Gesamte Kosten"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_invoiced:0
@@ -204,7 +221,7 @@ msgstr "Marge (%)"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_hours:0
msgid "Computed using the formula: Maximum Time - Total Worked Time"
-msgstr ""
+msgstr "Berechnungsformel: Maximale Zeit - Geleistete Zeit"
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_quantity:0
@@ -224,17 +241,17 @@ msgstr ""
#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
msgid "Template of Contract"
-msgstr ""
+msgstr "Vertragsvorlage"
#. module: account_analytic_analysis
#: model:res.groups,name:account_analytic_analysis.group_template_required
msgid "Mandatory use of templates in contracts"
-msgstr ""
+msgstr "Vertragsvorlage ist verbindlich"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_quantity:0
msgid "Total Worked Time"
-msgstr ""
+msgstr "Gesamte Arbeitszeit"
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin:0
@@ -244,18 +261,17 @@ msgstr "Realisierte Marge"
#. module: account_analytic_analysis
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
msgid "Hours summary by month"
-msgstr "Stundenanzahl pro Monat"
+msgstr "Stunden pro Monat"
#. module: account_analytic_analysis
#: help:account.analytic.account,real_margin_rate:0
msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
-msgstr ""
-"Berechnung nutzt diese Formel: (absolute Gewinnspanne / Gesamtkosten) * 100"
+msgstr "Berechnungsformel: (Marge / Gesamte Kosten) * 100"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "or view"
-msgstr ""
+msgstr "oder Ansicht"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -272,7 +288,7 @@ msgstr "Monat"
#: 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 "Time & Materials to Invoice"
-msgstr ""
+msgstr "Abrechenbare Zeiten & Sachaufwendungen"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
@@ -283,12 +299,12 @@ msgstr "Verträge"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Start Date"
-msgstr ""
+msgstr "Start Datum"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Invoiced"
-msgstr ""
+msgstr "Abgerechnet"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -296,8 +312,8 @@ msgid ""
"The contracts to be renewed because the deadline is passed or the working "
"hours are higher than the allocated hours"
msgstr ""
-"Der Vertrag muss erneuert werden, das die Frist abgelaufen ist oder die "
-"geplanten Stunden überschritten sind"
+"Zu erneuernde Verträge, aufgrund Laufzeitende oder Überschreitung der "
+"vereinbarten Stunden"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -307,7 +323,7 @@ msgstr "Verträge, die zu erneuern sind"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Timesheets"
-msgstr ""
+msgstr "Stundenzettel"
#. module: account_analytic_analysis
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
@@ -328,7 +344,7 @@ msgstr "Überfällige Mengen"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_theorical:0
@@ -349,13 +365,12 @@ msgstr "Ein Vertrag ist ein Analyse Konto mit Partner"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
msgid "Sales Orders"
-msgstr ""
+msgstr "Aufträge"
#. 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 ""
-"Wenn Kosten verrechnet werden, dann ist dies das Datum der letzten Rechnung."
+msgstr "Letztmaliges Datum der Kostenabrechnung"
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_theorical:0
@@ -364,9 +379,8 @@ msgid ""
"if all these costs have been invoiced at the normal sale price provided by "
"the pricelist."
msgstr ""
-"Ausgehend von den entstandenen Projektkosten. Welcher Erlös wäre erzielt "
-"worden, wenn diese Kosten auf der Basis der normalen Preisliste des Verkaufs "
-"abgerechnet worden wären."
+"Theoretischer Erlös, wenn alle Kosten auf Basis der \"Allgemeinen "
+"Preisliste\" abgerechnet worden wären."
#. module: account_analytic_analysis
#: field:account.analytic.account,user_ids:0
@@ -387,6 +401,16 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Klicken Sie zur Erstellung einer Vertragsvorlage.\n"
+"
\n"
+" Vorlagen sind vordefinierte Verträge für Projekte, aus "
+"denen zur schnellen\n"
+"und einfachen Erstellung neuer Vereinbarungen, die zugrundeliegenden "
+"Einstellungen und Konditionen\n"
+"übernommen werden.\n"
+"
\n"
+" "
#. module: account_analytic_analysis
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -404,6 +428,8 @@ msgid ""
"Allows you to set the template field as required when creating an analytic "
"account or a contract."
msgstr ""
+"Bei Erstellung eines Vertrags oder Projekt ist die Verwendung einer Vorlage "
+"verpflichtend."
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_qtt_invoiced:0
@@ -434,16 +460,28 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Klicken Sie zur Erstellung eines Vertrags.\n"
+"
\n"
+" Setzen Sie Verträge ein, um hierüber Aufgaben, Vorfälle, "
+"Stundenzettel oder Abrechnungen \n"
+" geleisteter Arbeitszeiten, Personalspesen und/oder "
+"Verkaufsaufträge zu verfolgen. OpenERP\n"
+" überwacht dabei automatisch, ob Verträge erneuert werden "
+"müssen und benachrichtigt den\n"
+" zugewiesenen Verkäufer.\n"
+"
\n"
+" "
#. module: account_analytic_analysis
#: field:account.analytic.account,toinvoice_total:0
msgid "Total to Invoice"
-msgstr ""
+msgstr "Gesamt Abrechnungsbetrag"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Sale Orders"
-msgstr ""
+msgstr "Verkaufsaufträge"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -453,18 +491,18 @@ msgstr "Offen"
#. module: account_analytic_analysis
#: field:account.analytic.account,invoiced_total:0
msgid "Total Invoiced"
-msgstr ""
+msgstr "Abgerechneter Betrag"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_ca:0
msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
msgstr ""
-"Berechnet auf Basis der Formel: Max. Einkaufspreis - Abgerechneter Betrag"
+"Berechnungsformel: Geplanter Abrechnungsbetrag - Abgerechneter Betrag"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Responsible"
-msgstr ""
+msgstr "Projektleiter"
#. module: account_analytic_analysis
#: field:account.analytic.account,last_invoice_date:0
@@ -484,16 +522,25 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Sie finden hier die aufgezeichneten Stundenzettel und "
+"eingekauften Sachmittel, \n"
+" die für diesen Vertrag abgerechnet werden können. Für neue "
+"abzurechnende\n"
+" Arbeitszeiten sollten Sie das Menü für die Stundenzettel "
+"benutzen.\n"
+"
\n"
+" "
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_non_invoiced:0
msgid "Uninvoiced Time"
-msgstr "nicht verrechnete Zeit"
+msgstr "Nicht abgerechnete Zeit"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Invoicing"
-msgstr "Eingangsrechnung"
+msgstr "Abrechnung"
#. module: account_analytic_analysis
#: field:account.analytic.account,total_cost:0
@@ -507,6 +554,10 @@ msgid ""
"remaining subtotals which, in turn, are computed as the maximum between "
"'(Estimation - Invoiced)' and 'To Invoice' amounts"
msgstr ""
+"Insgesamt verbleibender Abrechnungsbetrag für diesen Vertrag. Der Betrag "
+"errechnet sich aus der Summe der Einzelpositionen, sowie im Umkehrschluss "
+"aus dem Maximalbetrag der Differenz 'Geplant - Abgerechnet' und "
+"'Abzurechnen'."
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
@@ -517,7 +568,7 @@ msgstr "Zu erneuernde Verträge"
#. module: account_analytic_analysis
#: help:account.analytic.account,toinvoice_total:0
msgid " Sum of everything that could be invoiced for this contract."
-msgstr ""
+msgstr " Summe abzurechnender Beträge für diesen Vertrag"
#. module: account_analytic_analysis
#: field:account.analytic.account,theorical_margin:0
@@ -527,22 +578,22 @@ msgstr "Theoretische Marge"
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_total:0
msgid "Total Remaining"
-msgstr ""
+msgstr "Summe verbleibende Abrechnung"
#. module: account_analytic_analysis
#: help:account.analytic.account,real_margin:0
msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr "Berechnet durch die Formel: Rechnungsbetrag - Gesamt Kosten."
+msgstr "Berechnungsformel: Rechnungsbetrag - Gesamt Kosten."
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_est:0
msgid "Estimation of Hours to Invoice"
-msgstr ""
+msgstr "Geplante abzurechnende Stunden"
#. module: account_analytic_analysis
#: field:account.analytic.account,fix_price_invoices:0
msgid "Fixed Price"
-msgstr ""
+msgstr "Festpreis"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_worked_date:0
@@ -557,12 +608,12 @@ msgstr ""
#. module: account_analytic_analysis
#: field:sale.config.settings,group_template_required:0
msgid "Mandatory use of templates."
-msgstr ""
+msgstr "Zwingende Nutzung von Vorlagen"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Contracts Having a Partner"
-msgstr ""
+msgstr "Verträge mit Kunden"
#. module: account_analytic_analysis
#: help:account.analytic.account,total_cost:0
@@ -577,7 +628,7 @@ msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,est_total:0
msgid "Total Estimation"
-msgstr ""
+msgstr "Erwartete Gesamtabrechnung"
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_ca:0
@@ -605,16 +656,18 @@ msgstr "Gesamtzeit"
msgid ""
"the field template of the analytic accounts and contracts will be required."
msgstr ""
+"ein Auswahl für die Projekt Vorlage und Vertragseinstellungen sind "
+"erforderlich"
#. module: account_analytic_analysis
#: field:account.analytic.account,invoice_on_timesheets:0
msgid "On Timesheets"
-msgstr ""
+msgstr "auf Stundenzettel"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Total"
-msgstr ""
+msgstr "Gesamt"
#~ msgid ""
#~ "Number of hours that can be invoiced plus those that already have been "
diff --git a/addons/account_analytic_analysis/i18n/it.po b/addons/account_analytic_analysis/i18n/it.po
index 2dcf15f669b..641209e35ce 100644
--- a/addons/account_analytic_analysis/i18n/it.po
+++ b/addons/account_analytic_analysis/i18n/it.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-08-16 09:05+0000\n"
-"Last-Translator: gagarin \n"
+"PO-Revision-Date: 2012-12-09 13:20+0000\n"
+"Last-Translator: Davide Corio - agilebg.com \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-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "No order to invoice, create"
-msgstr ""
+msgstr "Nessun ordine da fatturare, crealo"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -29,12 +29,12 @@ msgstr "Raggruppa per..."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "To Invoice"
-msgstr ""
+msgstr "Da fatturare"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Remaining"
-msgstr ""
+msgstr "Rimanenti"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -73,7 +73,7 @@ msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "⇒ Invoice"
-msgstr ""
+msgstr "⇒ Fattura"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_invoiced:0
@@ -88,7 +88,7 @@ msgstr "Data dell'ultimo costo fatturato"
#. module: account_analytic_analysis
#: help:account.analytic.account,fix_price_to_invoice:0
msgid "Sum of quotations for this contract."
-msgstr ""
+msgstr "Somma dei preventivi di questo contratto."
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_invoiced:0
@@ -98,7 +98,7 @@ msgstr "Importo totale fatture cliente per questo conto"
#. module: account_analytic_analysis
#: help:account.analytic.account,timesheet_ca_invoiced:0
msgid "Sum of timesheet lines invoiced for this contract."
-msgstr ""
+msgstr "Somma delle linee timesheet fatturate di questo contratto."
#. module: account_analytic_analysis
#: help:account.analytic.account,revenue_per_hour:0
@@ -108,12 +108,12 @@ msgstr "Calcolato usando la formula: Fatturato / Tempo Totale"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Contracts not assigned"
-msgstr ""
+msgstr "Contratti non assegnati"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Partner"
-msgstr ""
+msgstr "Partner"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -156,12 +156,12 @@ msgstr ""
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_hours_to_invoice:0
msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
-msgstr ""
+msgstr "Calcolato usando la formula: Tempo Massimo - Totale Tempo Fatturato"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Expected"
-msgstr ""
+msgstr "Atteso"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -174,7 +174,7 @@ msgstr "Contabilità Analitica"
#. module: account_analytic_analysis
#: help:account.analytic.account,theorical_margin:0
msgid "Computed using the formula: Theoretical Revenue - Total Costs"
-msgstr ""
+msgstr "Calcolato usando la formula: Ricavo Teorico - Totale Costi"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_invoiced:0
@@ -195,6 +195,8 @@ msgid ""
"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
"'normal','template'])]}"
msgstr ""
+"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', "
+"'normal','template'])]}"
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin_rate:0
@@ -204,7 +206,7 @@ msgstr "Tasso di margine reale (%)"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_hours:0
msgid "Computed using the formula: Maximum Time - Total Worked Time"
-msgstr ""
+msgstr "Calcolato usando la formula: Tempo Massimo - Totale Tempo Lavorato"
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_quantity:0
@@ -218,23 +220,23 @@ msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Nothing to invoice, create"
-msgstr ""
+msgstr "Niente da fatturare, crealo"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
msgid "Template of Contract"
-msgstr ""
+msgstr "Modello Contratto"
#. module: account_analytic_analysis
#: model:res.groups,name:account_analytic_analysis.group_template_required
msgid "Mandatory use of templates in contracts"
-msgstr ""
+msgstr "Utilizzo dei template obbligatorio nei contratti"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_quantity:0
msgid "Total Worked Time"
-msgstr ""
+msgstr "Totale Tempo Lavorato"
#. module: account_analytic_analysis
#: field:account.analytic.account,real_margin:0
@@ -255,7 +257,7 @@ msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "or view"
-msgstr ""
+msgstr "o vista"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -272,7 +274,7 @@ msgstr "Mese"
#: 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 "Time & Materials to Invoice"
-msgstr ""
+msgstr "Tempo & Materiali da Fatturare"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
@@ -283,12 +285,12 @@ msgstr "Contratti"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Start Date"
-msgstr ""
+msgstr "Data Inizio"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Invoiced"
-msgstr ""
+msgstr "Fatturato"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -307,13 +309,13 @@ msgstr "Contratti in sospeso da rinnovare con il cliente"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Timesheets"
-msgstr ""
+msgstr "Timesheets"
#. module: account_analytic_analysis
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
#, python-format
msgid "Sale Order Lines of %s"
-msgstr ""
+msgstr "Linee Ordine di Vendita di %s"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -328,7 +330,7 @@ msgstr "Quantità Scadute"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Status"
-msgstr ""
+msgstr "Stato"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_theorical:0
@@ -350,7 +352,7 @@ msgstr ""
#. module: account_analytic_analysis
#: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
msgid "Sales Orders"
-msgstr ""
+msgstr "Ordini di Vendita"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_invoice_date:0
@@ -404,6 +406,8 @@ msgid ""
"Allows you to set the template field as required when creating an analytic "
"account or a contract."
msgstr ""
+"Consente di impostare il campo modello come obbligatorio durante la "
+"creazione di un conto analitico o di un contratto."
#. module: account_analytic_analysis
#: help:account.analytic.account,hours_qtt_invoiced:0
@@ -436,12 +440,12 @@ msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,toinvoice_total:0
msgid "Total to Invoice"
-msgstr ""
+msgstr "Totale da Fatturare"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Sale Orders"
-msgstr ""
+msgstr "Ordini di Vendita"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -451,7 +455,7 @@ msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,invoiced_total:0
msgid "Total Invoiced"
-msgstr ""
+msgstr "Totale Fatturato"
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_ca:0
@@ -462,7 +466,7 @@ msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Responsible"
-msgstr ""
+msgstr "Responsabile"
#. module: account_analytic_analysis
#: field:account.analytic.account,last_invoice_date:0
@@ -516,6 +520,7 @@ msgstr "Contratti da Rinnovare"
#: help:account.analytic.account,toinvoice_total:0
msgid " Sum of everything that could be invoiced for this contract."
msgstr ""
+" Somma di tutto quello che può essere fatturato per questo contratto."
#. module: account_analytic_analysis
#: field:account.analytic.account,theorical_margin:0
@@ -525,7 +530,7 @@ msgstr "Margine teorico"
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_total:0
msgid "Total Remaining"
-msgstr ""
+msgstr "Totale Rimanente"
#. module: account_analytic_analysis
#: help:account.analytic.account,real_margin:0
@@ -535,12 +540,12 @@ msgstr "Calcolato utilizzando la formula: importo fatturato - totale costi"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_qtt_est:0
msgid "Estimation of Hours to Invoice"
-msgstr ""
+msgstr "Stima delle Ore da Fatturare"
#. module: account_analytic_analysis
#: field:account.analytic.account,fix_price_invoices:0
msgid "Fixed Price"
-msgstr ""
+msgstr "Prezzo Fisso"
#. module: account_analytic_analysis
#: help:account.analytic.account,last_worked_date:0
@@ -550,17 +555,17 @@ msgstr "Data dell'ultimo lavoro fatto su questo conto."
#. module: account_analytic_analysis
#: model:ir.model,name:account_analytic_analysis.model_sale_config_settings
msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
#. module: account_analytic_analysis
#: field:sale.config.settings,group_template_required:0
msgid "Mandatory use of templates."
-msgstr ""
+msgstr "Uso dei modelli obbligatorio"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Contracts Having a Partner"
-msgstr ""
+msgstr "Contratti con Partner"
#. module: account_analytic_analysis
#: help:account.analytic.account,total_cost:0
@@ -574,7 +579,7 @@ msgstr ""
#. module: account_analytic_analysis
#: field:account.analytic.account,est_total:0
msgid "Total Estimation"
-msgstr ""
+msgstr "Stima Totale"
#. module: account_analytic_analysis
#: field:account.analytic.account,remaining_ca:0
@@ -601,16 +606,17 @@ msgstr "Durata totale"
msgid ""
"the field template of the analytic accounts and contracts will be required."
msgstr ""
+"il campo modello dei conti analitici e dei contratti sarà obbligatorio."
#. module: account_analytic_analysis
#: field:account.analytic.account,invoice_on_timesheets:0
msgid "On Timesheets"
-msgstr ""
+msgstr "Su Timesheets"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Total"
-msgstr ""
+msgstr "Totale"
#~ msgid "Computed using the formula: Theorial Revenue - Total Costs"
#~ msgstr "Calcolato utilizzando la formula: Reddito teorico - costi totali"
diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po
index fa4c27ef43f..c97598df0fe 100644
--- a/addons/account_analytic_default/i18n/de.po
+++ b/addons/account_analytic_default/i18n/de.po
@@ -7,31 +7,32 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-01-13 19:25+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp \n"
+"PO-Revision-Date: 2012-12-06 22:26+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_analytic_default
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
msgid "Analytic Rules"
-msgstr "Analytische Kontierungsrichtlinie"
+msgstr "Kostenstellen Kontierungsregeln"
#. module: account_analytic_default
#: view:account.analytic.default:0
msgid "Group By..."
-msgstr "Gruppierung..."
+msgstr "Gruppierung ..."
#. module: account_analytic_default
#: help:account.analytic.default,date_stop:0
msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Vorgabe für Ende Datum der Kostenstelle"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -50,6 +51,9 @@ msgid ""
"default (e.g. create new customer invoice or Sale order if we select this "
"partner, it will automatically take this as an analytic account)"
msgstr ""
+"Wählen Sie einen Partner aus, der bereits eine spezifizierte Kostenstelle "
+"hat (z.B. durch neu definierte Ausgangsrechnung oder einen Verkaufsauftrag "
+"bei einer Auswahl des unterzuordnenden Partners)"
#. module: account_analytic_default
#: view:account.analytic.default:0
@@ -60,7 +64,7 @@ msgstr "Produkt"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_analytic_default
msgid "Analytic Distribution"
-msgstr "Analytische Verrechnung"
+msgstr "Kostenstellen Distribution"
#. module: account_analytic_default
#: view:account.analytic.default:0
@@ -86,18 +90,21 @@ msgid ""
"default (e.g. create new customer invoice or Sale order if we select this "
"product, it will automatically take this as an analytic account)"
msgstr ""
+"Wählen Sie ein Produkt mit hinterlegter Standard Kostenstelle (z.B. bei der "
+"Erstellung einer Ausgangsrechnung oder eines Angebots wird bei der Auswahl "
+"des Produkts eine automatische Erkennung der Kostenstelle gestartet)."
#. module: account_analytic_default
#: field:account.analytic.default,date_stop:0
msgid "End Date"
-msgstr "Endedatum"
+msgstr "Ende Datum"
#. module: account_analytic_default
#: view:account.analytic.default:0
#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
msgid "Analytic Defaults"
-msgstr "Analytische Buchungsvorlage"
+msgstr "Kostenstellen Buchungsvorlage"
#. module: account_analytic_default
#: field:account.analytic.default,sequence:0
@@ -111,12 +118,16 @@ msgid ""
"default (e.g. create new customer invoice or Sale order if we select this "
"company, it will automatically take this as an analytic account)"
msgstr ""
+"Wählen Sie ein Unternehmen mit hinterlegter Standard Kostenstelle (z.B. bei "
+"der Erstellung einer Ausgangsrechnung oder eines Angebots wird bei der "
+"Auswahl des Unternehmens eine automatische Erkennung der Kostenstelle "
+"gestartet)."
#. module: account_analytic_default
#: help:account.analytic.default,user_id:0
msgid ""
"Select a user which will use analytic account specified in analytic default."
-msgstr ""
+msgstr "Wählen Sie einen Benutzer mit der hinterlegten Standard Kostenstelle"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_invoice_line
@@ -127,17 +138,17 @@ msgstr "Rechnungszeile"
#: view:account.analytic.default:0
#: field:account.analytic.default,analytic_id:0
msgid "Analytic Account"
-msgstr "Analytische Konten"
+msgstr "Kostenstelle"
#. module: account_analytic_default
#: help:account.analytic.default,date_start:0
msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "Standard Start Datum für Kostenstelle"
#. module: account_analytic_default
#: view:account.analytic.default:0
msgid "Accounts"
-msgstr "Konten"
+msgstr "Kostenstellen"
#. module: account_analytic_default
#: view:account.analytic.default:0
@@ -154,9 +165,7 @@ msgstr "Start Datum"
#: help:account.analytic.default,sequence:0
msgid ""
"Gives the sequence order when displaying a list of analytic distribution"
-msgstr ""
-"Zeigt eine Liste analytischer Konten, in der Reihenfolge wie von Ihnen "
-"festgelegt."
+msgstr "Zeigt eine Liste mit Kostenstellen"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_sale_order_line
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index 44a0658b311..5defd9b28f1 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.po
@@ -7,14 +7,15 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-10-12 23:19+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp \n"
+"PO-Revision-Date: 2012-12-06 22:38+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account4_ids:0
@@ -48,7 +49,7 @@ msgstr "Anteil (%)"
#: code:addons/account_analytic_plans/account_analytic_plans.py:234
#, python-format
msgid "The total should be between %s and %s."
-msgstr ""
+msgstr "Die Summe sollte zwischen %s und %s sein."
#. module: account_analytic_plans
#: view:account.analytic.plan:0
@@ -131,7 +132,7 @@ msgstr "Zeige keine leeren Zeilen"
#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
#, python-format
msgid "There are no analytic lines related to account %s."
-msgstr ""
+msgstr "Es gibt keine Kostenstellen Buchungen für das Konto %s."
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account3_ids:0
@@ -142,7 +143,7 @@ msgstr "Konto3 ID"
#: view:account.crossovered.analytic:0
#: view:analytic.plan.create.model:0
msgid "or"
-msgstr ""
+msgstr "oder"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
@@ -281,7 +282,7 @@ msgstr "Bankauszug Buchungen"
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Fehler !"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@@ -297,7 +298,7 @@ msgstr "Druck Kreuzanalyse"
#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
#, python-format
msgid "User Error!"
-msgstr ""
+msgstr "Benutzerfehler !"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account6_ids:0
@@ -316,6 +317,7 @@ msgstr "Analytisches Journal"
#, python-format
msgid "Please put a name and a code before saving the model."
msgstr ""
+"Bitte tragen Sie eine Bezeichnung und ein Kürzel vor dem Speichern ein."
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@@ -347,7 +349,7 @@ msgstr "Journal"
#: code:addons/account_analytic_plans/account_analytic_plans.py:486
#, python-format
msgid "You have to define an analytic journal on the '%s' journal."
-msgstr ""
+msgstr "Sie müssen eine Kostenstelle für das Journal '%s' eintragen"
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:342
@@ -375,7 +377,7 @@ msgstr "Rechnungszeile"
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
msgid "There is no analytic plan defined."
-msgstr ""
+msgstr "Es existieren Kostenstellen und ein Plan"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
@@ -402,7 +404,7 @@ msgstr "Analytische Verrechnung"
#: code:addons/account_analytic_plans/account_analytic_plans.py:221
#, python-format
msgid "A model with this name and code already exists."
-msgstr ""
+msgstr "Ein Modul mit ähnlichem Name und Kürzel existiert bereits."
#. module: account_analytic_plans
#: help:account.analytic.plan.line,root_analytic_id:0
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 03181cac92f..4a90944aa96 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -41,8 +41,8 @@ class account_asset_category(osv.osv):
'company_id': fields.many2one('res.company', 'Company', required=True),
'method': fields.selection([('linear','Linear'),('degressive','Degressive')], 'Computation Method', required=True, help="Choose the method to use to compute the amount of depreciation lines.\n"\
" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" \
- " * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"),
- 'method_number': fields.integer('Number of Depreciations'),
+ " * Degressive: Calculated on basis of: Residual Value * Degressive Factor"),
+ 'method_number': fields.integer('Number of Depreciations', help="The number of depreciations needed to depreciate your asset"),
'method_period': fields.integer('Period Length', help="State here the time between 2 depreciations, in months", required=True),
'method_progress_factor': fields.float('Degressive Factor'),
'method_time': fields.selection([('number','Number of Depreciations'),('end','Ending Date')], 'Time Method', required=True,
@@ -222,6 +222,15 @@ class account_asset_asset(osv.osv):
else:
val['currency_id'] = company.currency_id.id
return {'value': val}
+
+ def onchange_purchase_salvage_value(self, cr, uid, ids, purchase_value, salvage_value, context=None):
+ val = {}
+ for asset in self.browse(cr, uid, ids, context=context):
+ if purchase_value:
+ val['value_residual'] = purchase_value - salvage_value
+ if salvage_value:
+ val['value_residual'] = purchase_value - salvage_value
+ return {'value': val}
_columns = {
'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
@@ -243,9 +252,9 @@ class account_asset_asset(osv.osv):
'partner_id': fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}),
'method': fields.selection([('linear','Linear'),('degressive','Degressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose the method to use to compute the amount of depreciation lines.\n"\
" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" \
- " * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"),
- 'method_number': fields.integer('Number of Depreciations', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"),
- 'method_period': fields.integer('Number of Months in a Period', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="State here the time during 2 depreciations, in months"),
+ " * Degressive: Calculated on basis of: Residual Value * Degressive Factor"),
+ 'method_number': fields.integer('Number of Depreciations', readonly=True, states={'draft':[('readonly',False)]}, help="The number of depreciations needed to depreciate your asset"),
+ 'method_period': fields.integer('Number of Months in a Period', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="The amount of time between two depreciations, in months"),
'method_end': fields.date('Ending Date', readonly=True, states={'draft':[('readonly',False)]}),
'method_progress_factor': fields.float('Degressive Factor', readonly=True, states={'draft':[('readonly',False)]}),
'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'),
@@ -359,8 +368,8 @@ class account_asset_depreciation_line(osv.osv):
'sequence': fields.integer('Sequence', required=True),
'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'),
- 'amount': fields.float('Depreciation Amount', digits_compute=dp.get_precision('Account'), required=True),
- 'remaining_value': fields.float('Amount to Depreciate', digits_compute=dp.get_precision('Account'),required=True),
+ 'amount': fields.float('Current Depreciation', digits_compute=dp.get_precision('Account'), required=True),
+ 'remaining_value': fields.float('Next Period Depreciation', digits_compute=dp.get_precision('Account'),required=True),
'depreciated_value': fields.float('Amount Already Depreciated', required=True),
'depreciation_date': fields.date('Depreciation Date', select=1),
'move_id': fields.many2one('account.move', 'Depreciation Entry'),
@@ -460,7 +469,7 @@ class account_asset_history(osv.osv):
help="The method to use to compute the dates and number of depreciation lines.\n"\
"Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n" \
"Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."),
- 'method_number': fields.integer('Number of Depreciations'),
+ 'method_number': fields.integer('Number of Depreciations', help="The number of depreciations needed to depreciate your asset"),
'method_period': fields.integer('Period Length', help="Time in month between two depreciations"),
'method_end': fields.date('Ending date'),
'note': fields.text('Note'),
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 520ee733e73..c4cb17bded3 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -108,8 +108,8 @@
-
-
+
+
diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po
index 0fa2625a99e..daf6bdb23fd 100755
--- a/addons/account_asset/i18n/de.po
+++ b/addons/account_asset/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-05-10 17:36+0000\n"
-"Last-Translator: Ferdinand-camptocamp \n"
+"PO-Revision-Date: 2012-12-06 23:48+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_asset
#: view:account.asset.asset:0
@@ -156,7 +157,7 @@ msgstr "Abschreibungs Datum"
#. module: account_asset
#: constraint:account.asset.asset:0
msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Anlagengegenstände definieren."
#. module: account_asset
#: field:asset.asset.report,posted_value:0
@@ -201,7 +202,7 @@ msgstr "# der Abschreibungsbuchungen"
#. module: account_asset
#: field:account.asset.asset,method_period:0
msgid "Number of Months in a Period"
-msgstr ""
+msgstr "Anzahl Monate in Perioden"
#. module: account_asset
#: view:asset.asset.report:0
@@ -389,7 +390,7 @@ msgstr "Zeit Methode"
#: view:asset.depreciation.confirmation.wizard:0
#: view:asset.modify:0
msgid "or"
-msgstr ""
+msgstr "oder"
#. module: account_asset
#: field:account.asset.asset,note:0
@@ -446,12 +447,17 @@ msgid ""
"You can manually close an asset when the depreciation is over. If the last "
"line of depreciation is posted, the asset automatically goes in that status."
msgstr ""
+"Wenn eine Anlage angelegt wird, ist der Status \"Entwurf\". Nach Bestätigung "
+"der Anlage wird dies aktiv und Abschreibungen können verbucht werden. Sie "
+"können die Anlage automatisch schließen, wenn die Abschreibungen vorbei "
+"sind. Nach Verbuchung der letzen Abschreibung wird die Anlage automatisch "
+"geschlossen."
#. module: account_asset
#: field:account.asset.asset,state:0
#: field:asset.asset.report,state:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: account_asset
#: field:account.asset.asset,partner_id:0
@@ -498,7 +504,7 @@ msgstr "Berechnen"
#. module: account_asset
#: view:account.asset.history:0
msgid "Asset History"
-msgstr ""
+msgstr "Historie Anlagegegüter"
#. module: account_asset
#: field:asset.asset.report,name:0
@@ -619,7 +625,7 @@ msgstr "Abzuschreibender Betrag"
#. module: account_asset
#: field:account.asset.asset,name:0
msgid "Asset Name"
-msgstr ""
+msgstr "Anlagegut Bezeichnung"
#. module: account_asset
#: field:account.asset.category,open_asset:0
@@ -670,11 +676,16 @@ msgid ""
" \n"
" "
msgstr ""
+"Über diesen Report erhalten Sie einen Überblick über alle Abschreibungen. "
+"Die Suche kann auch zur \n"
+"individuellen und persönlichen Auswertung über das Anlagevermögen benutzt "
+"werden.\n"
+" "
#. module: account_asset
#: field:account.asset.asset,purchase_value:0
msgid "Gross Value"
-msgstr ""
+msgstr "Brutto Erlös"
#. module: account_asset
#: field:account.asset.category,name:0
diff --git a/addons/account_asset/i18n/it.po b/addons/account_asset/i18n/it.po
index a117c70b422..2bd5f5ddc7b 100644
--- a/addons/account_asset/i18n/it.po
+++ b/addons/account_asset/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-30 00:08+0000\n"
+"PO-Revision-Date: 2012-12-09 22:00+0000\n"
"Last-Translator: Sergio Corato \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_asset
#: view:account.asset.asset:0
@@ -87,7 +87,7 @@ msgstr "Azienda"
#. module: account_asset
#: view:asset.modify:0
msgid "Modify"
-msgstr ""
+msgstr "Modifica"
#. module: account_asset
#: selection:account.asset.asset,state:0
@@ -112,7 +112,7 @@ msgstr "Analisi Immobilizzazioni"
#. module: account_asset
#: field:asset.modify,name:0
msgid "Reason"
-msgstr ""
+msgstr "Causale"
#. module: account_asset
#: field:account.asset.asset,method_progress_factor:0
@@ -189,7 +189,7 @@ msgstr "Note"
#. module: account_asset
#: field:account.asset.depreciation.line,move_id:0
msgid "Depreciation Entry"
-msgstr ""
+msgstr "Riga Ammortamento"
#. module: account_asset
#: view:asset.asset.report:0
@@ -223,7 +223,7 @@ msgstr "Riferimento"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Account Asset"
-msgstr ""
+msgstr "Conto Immobilizzazione"
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
@@ -336,7 +336,7 @@ msgstr "Immobilizzazioni in stato \"chiuso\""
#. module: account_asset
#: field:account.asset.asset,parent_id:0
msgid "Parent Asset"
-msgstr ""
+msgstr "Immobilizzazione Padre"
#. module: account_asset
#: view:account.asset.history:0
@@ -362,7 +362,7 @@ msgstr ""
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_move_line
msgid "Journal Items"
-msgstr ""
+msgstr "Voci Sezionale"
#. module: account_asset
#: field:asset.asset.report,unposted_value:0
diff --git a/addons/account_asset/i18n/zh_CN.po b/addons/account_asset/i18n/zh_CN.po
index a3c6589613e..3cae4c25678 100644
--- a/addons/account_asset/i18n/zh_CN.po
+++ b/addons/account_asset/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-05-10 17:45+0000\n"
-"Last-Translator: 开阖软件 Jeff Wang \n"
+"PO-Revision-Date: 2012-12-07 15:37+0000\n"
+"Last-Translator: ccdos \n"
"Language-Team: Chinese (Simplified) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_asset
#: view:account.asset.asset:0
@@ -153,7 +153,7 @@ msgstr "折旧日期"
#. module: account_asset
#: constraint:account.asset.asset:0
msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "错误!你不能创建循环的固定资产."
#. module: account_asset
#: field:asset.asset.report,posted_value:0
@@ -198,7 +198,7 @@ msgstr "折旧行编号"
#. module: account_asset
#: field:account.asset.asset,method_period:0
msgid "Number of Months in a Period"
-msgstr ""
+msgstr "在一个周期内的月数"
#. module: account_asset
#: view:asset.asset.report:0
@@ -441,7 +441,7 @@ msgstr ""
#: field:account.asset.asset,state:0
#: field:asset.asset.report,state:0
msgid "Status"
-msgstr ""
+msgstr "状态"
#. module: account_asset
#: field:account.asset.asset,partner_id:0
@@ -488,7 +488,7 @@ msgstr "计算"
#. module: account_asset
#: view:account.asset.history:0
msgid "Asset History"
-msgstr ""
+msgstr "资产历史"
#. module: account_asset
#: field:asset.asset.report,name:0
@@ -607,7 +607,7 @@ msgstr "要折旧的金额"
#. module: account_asset
#: field:account.asset.asset,name:0
msgid "Asset Name"
-msgstr ""
+msgstr "资产名称"
#. module: account_asset
#: field:account.asset.category,open_asset:0
@@ -662,7 +662,7 @@ msgstr ""
#. module: account_asset
#: field:account.asset.asset,purchase_value:0
msgid "Gross Value"
-msgstr ""
+msgstr "总值"
#. module: account_asset
#: field:account.asset.category,name:0
@@ -708,7 +708,7 @@ msgstr "新建固定资产会计凭证"
#. module: account_asset
#: field:account.asset.depreciation.line,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "编号"
#. module: account_asset
#: help:account.asset.category,method_period:0
diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml
index 1c7f3458441..bb848e6db5d 100644
--- a/addons/account_asset/wizard/account_asset_change_duration_view.xml
+++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml
@@ -8,12 +8,17 @@
@@ -28,10 +30,9 @@
-
+
-
-
+
@@ -43,29 +44,7 @@
-
- Search
- res.partner
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Manual Follow-Ups
@@ -73,7 +52,7 @@
res.partner
form
tree,form
- {}
+ [('payment_amount_due', '>', 0.0)]
{'Followupfirst':True, 'search_default_todo': True}
@@ -88,9 +67,9 @@
+ help="Print overdue payments report independent of follow-up line" attrs="{'invisible':[('payment_amount_due', '<=', 0.0)]}" />
+ help="If not specified by the latest follow-up level, it will send from the default email template" attrs="{'invisible':[('payment_amount_due', '<=', 0.0)]}"/>
The , the latest payment follow-up
@@ -105,22 +84,22 @@
help="Click to mark the action as done." class="oe_link"
attrs="{'invisible':[('payment_next_action_date','=', False)]}"
groups="base.group_partner_manager"/>
-
+
-
+
Below is the history of the transactions of this
- customer. You can set an invoice in litigation in
- order to not include it in the next payment
- follow-ups.
+ customer. You can check "No Follow-up" in
+ order to exclude it from the next follow-up actions.
+
-
+
diff --git a/addons/account_followup/account_followup_data.xml b/addons/account_followup/account_followup_data.xml
index ce2df1d03d6..62ea7bce9c6 100644
--- a/addons/account_followup/account_followup_data.xml
+++ b/addons/account_followup/account_followup_data.xml
@@ -5,69 +5,36 @@
- Follow-up of overdue invoices level 0
- ${user.email or ''}
- ${user.company_id.name} Payment Follow-up
- ${object.email}
- ${object.lang}
+ First polite payment follow-up reminder email
+ ${user.email or '' | h}
+ ${user.company_id.name | h} Payment Reminder
+ ${object.email | h}
+ ${object.lang | h}
- Dear ${object.name},
+ Dear ${object.name | h},
Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take
appropriate measures in order to carry out this payment in the next 8 days.
Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to
-contact our accounting department at (+32).10.68.94.39.
+contact our accounting department.
Best Regards,
-
+
-${user.name}
+${user.name | h}
-<%
- from openerp.addons.account_followup.report import account_followup_print
- rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
- final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)
- followup_table = ''
- for currency_dict in final_res:
- currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol
- followup_table += '''
-
-
- Invoice date
- Reference
- Due date
- Amount (%s)
- Lit.
-
- ''' % (currency_symbol)
- total = 0
- for aml in currency_dict['line']:
- block = aml['blocked'] and 'X' or ' '
- total += aml['balance']
- strbegin = " "
- strend = " "
- date = aml['date_maturity'] or aml['date']
- if date <= ctx['current_date'] and aml['balance'] > 0:
- strbegin = ""
- strend = " "
- followup_table +="" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + " "
- total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)
- followup_table += '''
-
- Amount due: %s ''' % (total)
-%>
-${followup_table}
+${ctx.get('followup_table','')}
@@ -79,72 +46,37 @@ ${followup_table}
- Follow-up of overdue invoices level 1
- ${user.email or ''}
- ${user.company_id.name} Payment Follow-up
- ${object.email}
- ${object.lang}
+ A bit urging second payment follow-up reminder email
+ ${user.email or '' | h}
+ ${user.company_id.name | h} Payment Reminder
+ ${object.email | h}
+ ${object.lang | h}
- Dear ${object.name},
+ Dear ${object.name | h},
We are disappointed to see that despite sending a reminder, that your account is now seriously overdue.
It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account
which means that we will no longer be able to supply your company with (goods/services).
Please, take appropriate measures in order to carry out this payment in the next 8 days.
If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting
-department at (+32).10.68.94.39. so that we can resolve the matter quickly.
+department. so that we can resolve the matter quickly.
Details of due payments is printed below.
Best Regards,
-${user.name}
+
+${user.name | h}
-
-<%
- from openerp.addons.account_followup.report import account_followup_print
- rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
- final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)
- followup_table = ''
- for currency_dict in final_res:
- currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol
- followup_table += '''
-
-
- Invoice date
- Reference
- Due date
- Amount (%s)
- Lit.
-
- ''' % (currency_symbol)
- total = 0
- for aml in currency_dict['line']:
- block = aml['blocked'] and 'X' or ' '
- total += aml['balance']
- strbegin = " "
- strend = " "
- date = aml['date_maturity'] or aml['date']
- if date <= ctx['current_date'] and aml['balance'] > 0:
- strbegin = ""
- strend = " "
- followup_table +="" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + " "
- total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)
- followup_table += '''
-
- Amount due: %s ''' % (total)
-
-%>
-
-${followup_table}
+${ctx.get('followup_table','')}
@@ -153,71 +85,34 @@ ${followup_table}
- Follow-up of overdue invoices level 2
- ${user.email or ''}
- ${user.company_id.name} Payment Follow-up
- ${object.email}
- ${object.lang}
+ Urging payment follow-up reminder email
+ ${user.email or '' | h}
+ ${user.company_id.name | h} Payment Reminder
+ ${object.email | h}
+ ${object.lang | h}
- Dear ${object.name},
+ Dear ${object.name | h},
Despite several reminders, your account is still not settled.
Unless full payment is made in next 8 days, legal action for the recovery of the debt will be taken without
further notice.
I trust that this action will prove unnecessary and details of due payments is printed below.
-In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.
+In case of any queries concerning this matter, do not hesitate to contact our accounting department.
Best Regards,
-
-${user.name}
-
+
+${user.name | h}
-
-<%
- from openerp.addons.account_followup.report import account_followup_print
- rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
- final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)
- followup_table = ''
- for currency_dict in final_res:
- currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol
- followup_table += '''
-
-
- Invoice date
- Reference
- Due date
- Amount (%s)
- Lit.
-
- ''' % (currency_symbol)
- total = 0
- for aml in currency_dict['line']:
- block = aml['blocked'] and 'X' or ' '
- total += aml['balance']
- strbegin = " "
- strend = " "
- date = aml['date_maturity'] or aml['date']
- if date <= ctx['current_date'] and aml['balance'] > 0:
- strbegin = ""
- strend = " "
- followup_table +="" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + " "
- total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)
- followup_table += '''
-
- Amount due: %s ''' % (total)
-
-%>
-
-${followup_table}
+${ctx.get('followup_table','')}
@@ -228,81 +123,37 @@ ${followup_table}
- Default follow-up of overdue invoices
- ${user.email or ''}
- ${user.company_id.name} Payment Follow-up
- ${object.email}
- ${object.lang}
+ Default payment follow-up reminder e-mail
+ ${user.email or '' | h}
+ ${user.company_id.name | h} Payment Reminder
+ ${object.email | h}
+ ${object.lang | h}
- Dear ${object.name},
+ Dear ${object.name | h},
Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take
appropriate measures in order to carry out this payment in the next 8 days.
Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to
-contact our accounting department at (+32).10.68.94.39.
+contact our accounting department.
Best Regards,
-
-
-${user.name}
-
+
+${user.name | h}
-
-
-<%
- from openerp.addons.account_followup.report import account_followup_print
- rml_parse = account_followup_print.report_rappel(object._cr, user.id, "followup_rml_parser")
- final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)
- followup_table = ''
- for currency_dict in final_res:
- currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol
- followup_table += '''
-
-
- Invoice date
- Reference
- Due date
- Amount (%s)
- Lit.
-
- ''' % (currency_symbol)
- total = 0
- for aml in currency_dict['line']:
- block = aml['blocked'] and 'X' or ' '
- total += aml['balance']
- strbegin = " "
- strend = " "
- date = aml['date_maturity'] or aml['date']
- if date <= ctx['current_date'] and aml['balance'] > 0:
- strbegin = ""
- strend = " "
- followup_table +="" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + " "
- total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)
- followup_table += '''
-
- Amount due: %s ''' % (total)
-
-%>
-
-${followup_table}
-
-
+${ctx.get('followup_table','')}
+
]]>
-
-
-
-
@@ -319,7 +170,7 @@ Dear %(partner_name)s,
Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.
-Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to contact our accounting department at (+32).10.68.94.39.
+Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to contact our accounting department.
Best Regards,
@@ -342,15 +193,13 @@ We are disappointed to see that despite sending a reminder, that your account is
It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account which means that we will no longer be able to supply your company with (goods/services).
Please, take appropriate measures in order to carry out this payment in the next 8 days.
-If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting department at (+32).10.68.94.39. so that we can resolve the matter quickly.
+If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting department, so that we can resolve the matter quickly.
Details of due payments is printed below.
Best Regards,
-
-
Call the customer on the phone
3
@@ -369,7 +218,7 @@ Unless full payment is made in next 8 days, then legal action for the recovery o
I trust that this action will prove unnecessary and details of due payments is printed below.
-In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.
+In case of any queries concerning this matter, do not hesitate to contact our accounting department.
Best Regards,
diff --git a/addons/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml
index 4f22c18857d..0c470f5980e 100644
--- a/addons/account_followup/account_followup_demo.xml
+++ b/addons/account_followup/account_followup_demo.xml
@@ -17,7 +17,7 @@ Unless full payment is made in next 8 days, then legal action for the recovery o
I trust that this action will prove unnecessary and details of due payments is printed below.
-In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.
+In case of any queries concerning this matter, do not hesitate to contact our accounting department.
Best Regards,
@@ -39,7 +39,7 @@ Unless full payment is made in next 8 days, then legal action for the recovery o
I trust that this action will prove unnecessary and details of due payments is printed below.
-In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.
+In case of any queries concerning this matter, do not hesitate to contact our accounting department.
Best Regards,
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 1df87feac76..5560ca822dc 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -69,7 +69,6 @@
account_followup.followup.form
account_followup.followup
-
@@ -77,9 +76,11 @@
To remind customers of paying their invoices, you can
define different actions depending on how severely
overdue the customer is. These actions are bundled
- into folow-up levels that are triggered when the due
- date of the most overdue invoice has passed a certain
- amount of days.
+ into follow-up levels that are triggered when the due
+ date of an invoice has passed a certain
+ number of days. If there are other overdue invoices for the
+ same customer, the actions of the most
+ overdue invoice will be executed.
@@ -91,7 +92,7 @@
account_followup.followup
-
+
@@ -180,18 +181,5 @@
-
-
-
diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po
index 6293620420f..59f09101eb9 100644
--- a/addons/account_followup/i18n/de.po
+++ b/addons/account_followup/i18n/de.po
@@ -7,31 +7,31 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-15 22:50+0000\n"
+"PO-Revision-Date: 2012-12-08 09:41+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_followup
#: view:account_followup.followup.line:0
#: field:account_followup.followup.line,manual_action:0
msgid "Manual Action"
-msgstr ""
+msgstr "Manuelle Folgeaktion"
#. module: account_followup
#: help:res.partner,latest_followup_level_id:0
msgid "The maximum follow-up level"
-msgstr ""
+msgstr "Maximale Mahnstufe"
#. module: account_followup
#: view:res.partner:0
msgid "Group by"
-msgstr ""
+msgstr "Gruppierung ..."
#. module: account_followup
#: view:account_followup.stat:0
@@ -47,27 +47,27 @@ msgstr "Mahnung"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "%(date)s"
-msgstr ""
+msgstr "%(date)s"
#. module: account_followup
#: field:res.partner,payment_next_action_date:0
msgid "Next Action Date"
-msgstr ""
+msgstr "Nächste Zahlungserinnerung"
#. module: account_followup
#: field:account_followup.sending.results,needprinting:0
msgid "Needs Printing"
-msgstr ""
+msgstr "Ausdruck ist erforderlich"
#. module: account_followup
#: view:res.partner:0
msgid "⇾ Mark as Done"
-msgstr ""
+msgstr "-> Als erledigt markieren"
#. module: account_followup
#: field:account_followup.followup.line,manual_action_note:0
msgid "Action To Do"
-msgstr ""
+msgstr "Folgeaktion"
#. module: account_followup
#: model:email.template,body_html:account_followup.email_template_account_followup_level0
@@ -145,11 +145,85 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+"\n"
+"\n"
+"
Guten Tag ${object.name},
\n"
+"
\n"
+" unter der Annahme, dass unsere Konten korrekt gebucht sind, sind "
+"offensichtlich folgende Beträge nicht bezahlt.\n"
+" Bitte nehmen Sie innerhalb der nächsten 8 Tage einen Kontoausgleich "
+"vor.\n"
+"\n"
+" Sollte sich unsere Mahnung mit Ihrer Zahlung überschneiden, betrachten "
+"Sie diesen Vorgang als erledigt.\n"
+" Bitte zögern Sie bei Rückfragen nicht, unsere Finanzabteilung per EMail "
+"oder Telefon zu kontaktieren.\n"
+"\n"
+" \n"
+"Viele Grüsse\n"
+"\n"
+" \n"
+"${user.name}\n"
+"\n"
+" \n"
+" \n"
+"<%\n"
+" from openerp.addons.account_followup.report import "
+"account_followup_print\n"
+" rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
+"\"followup_rml_parser\")\n"
+" final_res = rml_parse._lines_get_with_partner(object, "
+"user.company_id.id)\n"
+" followup_table = ''\n"
+" for currency_dict in final_res:\n"
+" currency_symbol = currency_dict.get('line', [{'currency_id': "
+"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
+" followup_table += '''\n"
+"
\n"
+" \n"
+" Rechnungsdatum \n"
+" Referenz \n"
+" Fällig am \n"
+" Betrag (%s) \n"
+" EUR \n"
+" \n"
+" ''' % (currency_symbol)\n"
+" total = 0\n"
+" for aml in currency_dict['line']:\n"
+" block = aml['blocked'] and 'X' or ' '\n"
+" total += aml['balance']\n"
+" strbegin = \" \"\n"
+" strend = \" \"\n"
+" date = aml['date_maturity'] or aml['date']\n"
+" if date <= ctx['current_date'] and aml['balance'] > 0:\n"
+" strbegin = \"\"\n"
+" strend = \" \"\n"
+" followup_table +=\"\" + strbegin + str(aml['date']) + strend "
+"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
+"+ str(aml['balance']) + strend + strbegin + block + strend + \" \"\n"
+" total = rml_parse.formatLang(total, dp='Account', "
+"currency_obj=object.company_id.currency_id)\n"
+" followup_table += ''' \n"
+"
\n"
+"
fälliger Gesamtbetrag: %s ''' % "
+"(total)\n"
+"\n"
+"%>\n"
+"\n"
+"${followup_table}\n"
+"\n"
+"
\n"
+"\n"
+"
\n"
+" "
#. module: account_followup
#: view:res.partner:0
msgid "Follow-ups to do"
-msgstr ""
+msgstr "Anstehende Mahnungen"
#. module: account_followup
#: field:account_followup.followup,company_id:0
@@ -189,36 +263,52 @@ msgid ""
"Best Regards,\n"
" "
msgstr ""
+"\n"
+"Sehr geehrte(r) %(partner_name)s,\n"
+"\n"
+"trotz verschiedener Zahlungserinnerungen, wurde Ihr Konto bislang nicht "
+"ausgegelichen.\n"
+"\n"
+"Sollte in den nächsten 8 Tagen keine Zahlung eingehen, ergreifen wir ohne "
+"weitere Vorwarnung die erforderlichen Maßnahmen des gesetzlichen "
+"Mahnverfahrens. Voraussichtlich wird dieser Schritt nicht erforderlich sein, "
+"sie sehen alle fälligen Rechnungen in der unteren Liste.\n"
+"\n"
+"Bei weiteren Fragestellungen zu der Rechnung, zögern Sie bitte nicht unsere "
+"Finanzbuchhaltung anzusprechen. \n"
+"\n"
+"Best Regards,\n"
+" "
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "days overdue, do the following actions:"
-msgstr ""
+msgstr "bei fällig, tun Sie folgendes:"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "Follow-up Steps"
-msgstr ""
+msgstr "Mahnstufen"
#. module: account_followup
#: field:account_followup.print,email_body:0
msgid "Email Body"
-msgstr ""
+msgstr "Text der E-Mail"
#. module: account_followup
#: help:res.partner,payment_responsible_id:0
msgid "Responsible for making sure the action happens."
-msgstr ""
+msgstr "Verantwortlicher Mitarbeiter für die Durchführung"
#. module: account_followup
#: view:res.partner:0
msgid "Overdue amount"
-msgstr ""
+msgstr "Überfälliger Betrag"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
msgid "Send Follow-Ups"
-msgstr ""
+msgstr "Sende Mahnungen"
#. module: account_followup
#: report:account_followup.followup.print:0
@@ -228,7 +318,7 @@ msgstr "Betrag"
#. module: account_followup
#: view:res.partner:0
msgid "No Responsible"
-msgstr ""
+msgstr "Kein Verantwortlicher"
#. module: account_followup
#: view:account_followup.stat.by.partner:0
@@ -243,12 +333,12 @@ msgstr "Gesamt Soll"
#. module: account_followup
#: field:res.partner,payment_next_action:0
msgid "Next Action"
-msgstr ""
+msgstr "Nächste Aktion"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid ": Partner Name"
-msgstr ""
+msgstr ": Partner Name"
#. module: account_followup
#: view:account_followup.followup:0
@@ -283,12 +373,12 @@ msgstr "Datum:"
#. module: account_followup
#: view:res.partner:0
msgid "I am responsible"
-msgstr ""
+msgstr "Ich bin verantwortlich"
#. module: account_followup
#: sql_constraint:account_followup.followup:0
msgid "Only one follow-up per company is allowed"
-msgstr ""
+msgstr "Es ist nur ein Mahnverfahren je Unternehmen zulässig"
#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
@@ -311,11 +401,33 @@ msgid ""
"Best Regards,\n"
" "
msgstr ""
+"\n"
+"Sehr geehrte(r) %(partner_name)s,\n"
+"\n"
+"trotz mehrerer Mahnungen, ist Ihr Konto leider immer noch nicht "
+"ausgeglichen.\n"
+"\n"
+"Sofern keine vollständige Bezahlung innerhalb der nächsten 8 Tage "
+"vorgenommen wird, \n"
+"werden wir unsererseits die erforderlichen rechtlichen Schritte für das "
+"gesetzliche\n"
+"Mahnverfahren ohne weitere Ankündigung in die Wege leiten.\n"
+"\n"
+"Wir sind zuversichtlich, dass diese Aktion nicht erforderlich sein wird. "
+"Sämtliche Details der \n"
+"fälligen Rechnungen sind in diesem Schreiben aufgelistet.\n"
+"\n"
+"Bei Fragen zu dieser Angelegenheit, zögern Sie bitte nicht, unsere "
+"Buchhaltung unter #\n"
+"(+49) 4471 840 9000 zu kontaktieren.\n"
+"\n"
+"Freundliche Grüsse\n"
+" "
#. module: account_followup
#: help:account_followup.followup.line,send_letter:0
msgid "When processing, it will print a letter"
-msgstr ""
+msgstr "Bei Verarbeitung wird ein Anschreiben gedruckt"
#. module: account_followup
#: view:account_followup.stat:0
@@ -325,22 +437,22 @@ msgstr "Kein Verzug"
#. module: account_followup
#: view:res.partner:0
msgid "Without responsible"
-msgstr ""
+msgstr "Ohne Verantwortlichen"
#. module: account_followup
#: view:account_followup.print:0
msgid "Send emails and generate letters"
-msgstr ""
+msgstr "Sende Emails und erstelle Anschreiben"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_customer_followup
msgid "Manual Follow-Ups"
-msgstr ""
+msgstr "Manuelle Mahnung"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "%(partner_name)s"
-msgstr ""
+msgstr "%(partner_name)s"
#. module: account_followup
#: field:account_followup.stat,debit:0
@@ -350,17 +462,17 @@ msgstr "Forderung"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_stat
msgid "Follow-up Statistics"
-msgstr ""
+msgstr "Statistik Mahnungen"
#. module: account_followup
#: view:res.partner:0
msgid "Send Overdue Email"
-msgstr ""
+msgstr "Sende fällige Rechnungen"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_followup_line
msgid "Follow-up Criteria"
-msgstr ""
+msgstr "Mahnkriterien"
#. module: account_followup
#: help:account_followup.followup.line,sequence:0
@@ -373,34 +485,34 @@ msgstr ""
#: code:addons/account_followup/wizard/account_followup_print.py:166
#, python-format
msgid " will be sent"
-msgstr ""
+msgstr " wird gesendet"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid ": User's Company Name"
-msgstr ""
+msgstr ": Benutzer Unternehmen"
#. module: account_followup
#: view:account_followup.followup.line:0
#: field:account_followup.followup.line,send_letter:0
msgid "Send a Letter"
-msgstr ""
+msgstr "Sende Anschreiben"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
msgid "Payment Follow-ups"
-msgstr ""
+msgstr "Mahnwesen"
#. module: account_followup
#: field:account_followup.followup.line,delay:0
msgid "Due Days"
-msgstr ""
+msgstr "Zahlungsverzug"
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:155
#, python-format
msgid "Nobody"
-msgstr ""
+msgstr "Niemand"
#. module: account_followup
#: field:account.move.line,followup_line_id:0
@@ -417,12 +529,12 @@ msgstr "Letzte Erinnerung"
#: model:ir.actions.act_window,name:account_followup.action_account_manual_reconcile_receivable
#: model:ir.ui.menu,name:account_followup.menu_manual_reconcile_followup
msgid "Reconcile Invoices & Payments"
-msgstr ""
+msgstr "Ausgleich Rechnungen & Zahlungen"
#. module: account_followup
#: model:ir.ui.menu,name:account_followup.account_followup_s
msgid "Do Manual Follow-Ups"
-msgstr ""
+msgstr "Erstelle händische Mahnung"
#. module: account_followup
#: report:account_followup.followup.print:0
@@ -432,17 +544,17 @@ msgstr "Limit"
#. module: account_followup
#: field:account_followup.print,email_conf:0
msgid "Send Email Confirmation"
-msgstr ""
+msgstr "Sende Email Bestätigung"
#. module: account_followup
#: view:res.partner:0
msgid "Print Overdue Payments"
-msgstr ""
+msgstr "Drucke fällige Zahlungen"
#. module: account_followup
#: field:account_followup.stat.by.partner,date_followup:0
msgid "Latest follow-up"
-msgstr ""
+msgstr "Letzte Mahnung"
#. module: account_followup
#: field:account_followup.print,partner_lang:0
@@ -453,13 +565,13 @@ msgstr "Sende EMail in Sprache d. Partners"
#: code:addons/account_followup/wizard/account_followup_print.py:169
#, python-format
msgid " email(s) sent"
-msgstr ""
+msgstr " gesendete Email(s)"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_print
#: model:ir.model,name:account_followup.model_account_followup_print_all
msgid "Print Follow-up & Send Mail to Customers"
-msgstr ""
+msgstr "Drucke Erinnerungen & Sende Emails"
#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -499,17 +611,17 @@ msgstr "gedruckte Mitteilung"
#. module: account_followup
#: field:res.partner,latest_followup_level_id_without_lit:0
msgid "Latest Follow-up Level without litigation"
-msgstr ""
+msgstr "Letzte Mahnstufe vor Mahnverfahren"
#. module: account_followup
#: view:res.partner:0
msgid "Partners with Credits"
-msgstr ""
+msgstr "Kunden mit Guthaben"
#. module: account_followup
#: help:account_followup.followup.line,send_email:0
msgid "When processing, it will send an email"
-msgstr ""
+msgstr "Bei Durchführung wird Email gesendet"
#. module: account_followup
#: view:account_followup.stat.by.partner:0
@@ -519,7 +631,7 @@ msgstr "Zu erinnernde Partner"
#. module: account_followup
#: view:res.partner:0
msgid "Print overdue payments report independent of follow-up line"
-msgstr ""
+msgstr "Drucke fällige Zahlungen ohne Mahnstufe"
#. module: account_followup
#: field:account_followup.followup.line,followup_id:0
@@ -531,12 +643,12 @@ msgstr "Mahnungen"
#: code:addons/account_followup/account_followup.py:227
#, python-format
msgid "Email not sent because of email address of partner not filled in"
-msgstr ""
+msgstr "Email wurde aufgrund fehlender Mailadresse nicht gesendet"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_followup
msgid "Account Follow-up"
-msgstr ""
+msgstr "Mahnwesen"
#. module: account_followup
#: help:res.partner,payment_next_action_date:0
@@ -545,11 +657,15 @@ msgid ""
"the current date if the action fields are empty and the partner gets a "
"follow-up level that requires a manual action. "
msgstr ""
+"Folgendermassen können Sie eine weitere Mahnung schreiben. Tragen Sie das "
+"aktuelle Datum ein und lassen Sie alle weiteren Felder unausgefüllt damit "
+"der Partner hierdurch eine Mahnstufe erhält, die eine manuelle Aktion "
+"erfordert. "
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_sending_results
msgid "Results from the sending of the different letters and emails"
-msgstr ""
+msgstr "Ergebnis der Versendung von Anschreiben und EMails"
#. module: account_followup
#: constraint:account_followup.followup.line:0
@@ -564,12 +680,12 @@ msgstr ""
#: code:addons/account_followup/wizard/account_followup_print.py:172
#, python-format
msgid " manual action(s) assigned:"
-msgstr ""
+msgstr " manuell zugewiesene Aktion:"
#. module: account_followup
#: view:res.partner:0
msgid "Search Partner"
-msgstr ""
+msgstr "Suche Partner"
#. module: account_followup
#: view:res.partner:0
@@ -580,32 +696,38 @@ msgid ""
" order to not include it in the next payment\n"
" follow-ups."
msgstr ""
+"Unten sehen Sie die Vorgangshistorie für diesen \n"
+" Kunden. Einer Rechnung kann zugewiesen werden, "
+"daß Sie per\n"
+" gesetzlichem Mahnverfahren weiter verfolgt "
+"wird, um weitere\n"
+" Versendungen von Mahnungen zu vermeiden."
#. module: account_followup
#: model:ir.ui.menu,name:account_followup.account_followup_print_menu
msgid "Send Letters and Emails"
-msgstr ""
+msgstr "Sende Mahnschreiben und Emails"
#. module: account_followup
#: view:account_followup.followup:0
msgid "Search Follow-up"
-msgstr ""
+msgstr "Suche Mahnungen"
#. module: account_followup
#: view:res.partner:0
msgid "Account Move line"
-msgstr ""
+msgstr "Buchungszeile"
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:240
#, python-format
msgid "Send Letters and Emails: Actions Summary"
-msgstr ""
+msgstr "Versende Mahnschreiben und Emails: Zusammenfassung"
#. module: account_followup
#: view:account_followup.print:0
msgid "or"
-msgstr ""
+msgstr "oder"
#. module: account_followup
#: field:account_followup.stat,blocked:0
@@ -615,17 +737,17 @@ msgstr "Abgewiesen"
#. module: account_followup
#: sql_constraint:account_followup.followup.line:0
msgid "Days of the follow-up levels must be different"
-msgstr ""
+msgstr "Tage der Mahnstufen müssen verschieden sein"
#. module: account_followup
#: view:res.partner:0
msgid "Click to mark the action as done."
-msgstr ""
+msgstr "Klicken Sie um Aktion abzuschließen"
#. module: account_followup
#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
msgid "Follow-Ups Analysis"
-msgstr ""
+msgstr "Statistik Mahnungen"
#. module: account_followup
#: help:account_followup.print,date:0
@@ -643,7 +765,7 @@ msgstr "Datum für Versand der Mahnung(en)"
#. module: account_followup
#: field:res.partner,payment_responsible_id:0
msgid "Follow-up Responsible"
-msgstr ""
+msgstr "Verantwortlich für Mahnung"
#. module: account_followup
#: report:account_followup.followup.print:0
@@ -659,12 +781,12 @@ msgstr "Erinnerung an zu zahlende Rechnungen"
#. module: account_followup
#: model:ir.ui.menu,name:account_followup.account_followup_menu
msgid "Follow-up Levels"
-msgstr ""
+msgstr "Mahnstufen"
#. module: account_followup
#: view:res.partner:0
msgid "Future Follow-ups"
-msgstr ""
+msgstr "Zukünftige Mahnungen"
#. module: account_followup
#: view:account_followup.followup:0
@@ -678,11 +800,19 @@ msgid ""
"certain\n"
" amount of days."
msgstr ""
+"Um Kunden an die Zahlung Ihrer offenen Rechnungen zu erinnern, können Sie\n"
+" je nach Fristüberschreitung unterschiedliche "
+"Mahnaktionen auslösen .\n"
+" Diese werden zusammengefasst in verschiedenen "
+"Mahnstufen,\n"
+" die in Abhängigkeit Ihres maximalen Verzugs bei "
+"Überschreitung\n"
+" ausgelöst werden."
#. module: account_followup
#: view:account_followup.stat:0
msgid "Follow-up Entries with period in current year"
-msgstr ""
+msgstr "Mahnungen mit Rechnung aus diesem Jahr"
#. module: account_followup
#: field:account.move.line,followup_date:0
@@ -692,24 +822,24 @@ msgstr "Letzte Mahnung"
#. module: account_followup
#: view:account_followup.sending.results:0
msgid "Download Letters"
-msgstr ""
+msgstr "Herunterladen Abschreiben"
#. module: account_followup
#: field:account_followup.print,company_id:0
#: field:res.partner,unreconciled_aml_ids:0
msgid "unknown"
-msgstr ""
+msgstr "unbekannt"
#. module: account_followup
#: code:addons/account_followup/account_followup.py:245
#, python-format
msgid "Printed overdue payments report"
-msgstr ""
+msgstr "Druck überfällige Zahlungen"
#. module: account_followup
#: model:ir.model,name:account_followup.model_email_template
msgid "Email Templates"
-msgstr ""
+msgstr "EMail Vorlagen"
#. module: account_followup
#: help:account_followup.followup.line,manual_action:0
@@ -717,18 +847,20 @@ msgid ""
"When processing, it will set the manual action to be taken for that "
"customer. "
msgstr ""
+"Bei Durchführung wird das manuelle Verfahren für diesen Kunden vorgeschlagen "
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:171
#, python-format
msgid " email(s) should have been sent, but "
-msgstr ""
+msgstr " EMail(s) sollten ausgetauscht werden, aber "
#. module: account_followup
#: help:account_followup.print,test_print:0
msgid ""
"Check if you want to print follow-ups without changing follow-ups level."
msgstr ""
+"Möchten Sie Ausdrucke von Mahnungen ohne Wechsel der Stufe generieren."
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_move_line
@@ -743,12 +875,12 @@ msgstr "Summe:"
#. module: account_followup
#: field:account_followup.followup.line,email_template_id:0
msgid "Email Template"
-msgstr ""
+msgstr "EMail Vorlage"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "%(user_signature)s"
-msgstr ""
+msgstr "%(user_signature)s"
#. module: account_followup
#: model:ir.model,name:account_followup.model_res_company
@@ -764,7 +896,7 @@ msgstr "Zusammenfassung"
#: view:account_followup.followup.line:0
#: field:account_followup.followup.line,send_email:0
msgid "Send an Email"
-msgstr ""
+msgstr "Sende eine Email"
#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -790,6 +922,25 @@ msgid ""
"Best Regards,\n"
" "
msgstr ""
+"\n"
+"Sehr geehrte(r) %partner_name,\n"
+"\n"
+"wir haben mit Enttäuschung feststellen müssen, dass trotz erfolgter Mahnung, "
+"Ihr Konto weiterhin überfällig ist.\n"
+"\n"
+"Es ist in Ihrem eigenen Interesse sehr wichtig, dass die sofortige Zahlung "
+"erfolgt, sonst müssen wir in Betracht ziehen, \n"
+"dass wir nicht mehr in der Lage sein werden, Ihr Unternehmen mit Waren / "
+"Dienstleistungen zu beliefern. Bitte ergreifen Sie \n"
+"geeignete Maßnahmen, um die Durchführung dieser Zahlung in den nächsten 8 "
+"Tagen vorzunehmen.\n"
+"\n"
+"Wenn es ein Problem mit der Zahlung der Rechnung gibt, die uns aktuell nicht "
+"bewusst ist, zögern Sie bitte nicht, unsere Buchhaltung unter (+49) 4471 "
+"8409000 zu kontaktieren. damit wir die Angelegenheit schnell lösen können.\n"
+"\n"
+"Details fälliger Zahlungen werden dann weiter unten gedruckt.\n"
+" "
#. module: account_followup
#: report:account_followup.followup.print:0
@@ -874,6 +1025,82 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+"\n"
+" \n"
+"
Sehr geehrte(r) ${object.name},
\n"
+"
\n"
+" Vorbehaltlich eines Fehler unsererseits, sind offensichtlich die "
+"folgenden Beträge noch nicht bezahlt. \n"
+"Bitte ergreifen Sie geeignete Maßnahmen Ihrerseits, um die entsprechenden "
+"Zahlungen innerhalb der nächsten \n"
+"8 Tage anzuweisen. Sollte sich diese EMail mit Ihrer Bezahlung zeitlich "
+"überschneiden, ignorieren Sie bitte diese Nachricht. \n"
+"Zögern Sie bei Rückfragen bitte auch nicht, unsere Buchhaltung unter (+49) "
+"4471 8409000 zu kontaktieren.\n"
+"
\n"
+"
\n"
+"Freundliche Grüsse\n"
+"\n"
+"\n"
+"
\n"
+"${user.name}\n"
+" \n"
+"
\n"
+"
\n"
+"\n"
+" \n"
+"\n"
+"<%\n"
+" from openerp.addons.account_followup.report import "
+"account_followup_print\n"
+" rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
+"\"followup_rml_parser\")\n"
+" final_res = rml_parse._lines_get_with_partner(object, "
+"user.company_id.id)\n"
+" followup_table = ''\n"
+" for currency_dict in final_res:\n"
+" currency_symbol = currency_dict.get('line', [{'currency_id': "
+"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
+" followup_table += '''\n"
+"
\n"
+" \n"
+" Rechnungsdatum \n"
+" Rechnungsnummer \n"
+" fällig am \n"
+" Betrag (%s) \n"
+" EUR \n"
+" \n"
+" ''' % (currency_symbol)\n"
+" total = 0\n"
+" for aml in currency_dict['line']:\n"
+" block = aml['blocked'] and 'X' or ' '\n"
+" total += aml['balance']\n"
+" strbegin = \" \"\n"
+" strend = \" \"\n"
+" date = aml['date_maturity'] or aml['date']\n"
+" if date <= ctx['current_date'] and aml['balance'] > 0:\n"
+" strbegin = \"\"\n"
+" strend = \" \"\n"
+" followup_table +=\"\" + strbegin + str(aml['date']) + strend "
+"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
+"+ str(aml['balance']) + strend + strbegin + block + strend + \" \"\n"
+" total = rml_parse.formatLang(total, dp='Account', "
+"currency_obj=object.company_id.currency_id)\n"
+" followup_table += ''' \n"
+"
\n"
+"
fälliger Betrag: %s ''' % (total)\n"
+"\n"
+"%>\n"
+"\n"
+"${followup_table}\n"
+"\n"
+"
\n"
+"\n"
+"
\n"
+" "
#. module: account_followup
#: help:res.partner,latest_followup_level_id_without_lit:0
@@ -881,12 +1108,14 @@ msgid ""
"The maximum follow-up level without taking into account the account move "
"lines with litigation"
msgstr ""
+"Die höchstmögliche Mahnstufe, ohne dass die Rechnung dem gesetzlichen "
+"Mahnverfahren übergeben wird."
#. module: account_followup
#: view:account_followup.stat:0
#: field:res.partner,latest_followup_date:0
msgid "Latest Follow-up Date"
-msgstr ""
+msgstr "Letzte Mahnung"
#. module: account_followup
#: model:email.template,body_html:account_followup.email_template_account_followup_level1
@@ -970,6 +1199,88 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+"\n"
+" \n"
+"
Sehr geehrte(r) ${object.name},
\n"
+"
\n"
+" \t Wir sind enttäuscht, dass trotz Mahnung, Ihr Konto immer noch "
+"überfällige Rechnungen ausweist.\n"
+"\n"
+"Es ist wichtig, dass die sofortige Zahlung erfolgt, sonst müssen wir in "
+"Betracht ziehen, Ihr Kundenkonto zu sperren, \n"
+"wodurch wir dann leider gezwungen sind, Ihr Unternehmen vorerst nicht mehr "
+"mit Waren / Dienstleistungen zu \n"
+"beliefern. Bitte ergreifen Sie geeignete Maßnahmen, um eine Zahlung in den "
+"nächsten 8 Tagen durchzuführen.\n"
+"\n"
+"Wenn es ein Problem mit der Zahlung der Rechnung(en) gibt, die uns nicht "
+"bekannt ist, zögern Sie nicht, \n"
+"unsere Buchhaltung unter (+49) 4471 8409000 zu kontaktieren, damit wir die "
+"Angelegenheit lösen können.\n"
+"\n"
+"Details zu den fälligen Zahlungen finden Sie unten.\n"
+"
\n"
+"
\n"
+"Mit freundlichen Grüßen\n"
+" \n"
+"
\n"
+"${user.name}\n"
+" \n"
+"
\n"
+"
\n"
+"\n"
+" \n"
+"<%\n"
+" from openerp.addons.account_followup.report import "
+"account_followup_print\n"
+" rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
+"\"followup_rml_parser\")\n"
+" final_res = rml_parse._lines_get_with_partner(object, "
+"user.company_id.id)\n"
+" followup_table = ''\n"
+" for currency_dict in final_res:\n"
+" currency_symbol = currency_dict.get('line', [{'currency_id': "
+"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
+" followup_table += '''\n"
+"
\n"
+" \n"
+" Rechnungsdatum \n"
+" Rechnungsnummer \n"
+" fällig am \n"
+" Betrag(%s) \n"
+" EUR \n"
+" \n"
+" ''' % (currency_symbol)\n"
+" total = 0\n"
+" for aml in currency_dict['line']:\n"
+" block = aml['blocked'] and 'X' or ' '\n"
+" total += aml['balance']\n"
+" strbegin = \" \"\n"
+" strend = \" \"\n"
+" date = aml['date_maturity'] or aml['date']\n"
+" if date <= ctx['current_date'] and aml['balance'] > 0:\n"
+" strbegin = \"\"\n"
+" strend = \" \"\n"
+" followup_table +=\"\" + strbegin + str(aml['date']) + strend "
+"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
+"+ str(aml['balance']) + strend + strbegin + block + strend + \" \"\n"
+" total = rml_parse.formatLang(total, dp='Account', "
+"currency_obj=object.company_id.currency_id)\n"
+" followup_table += ''' \n"
+"
\n"
+"
Fälliger Betrag: %s ''' % (total)\n"
+"\n"
+"%>\n"
+"\n"
+"${followup_table}\n"
+"\n"
+"
\n"
+"\n"
+"
\n"
+" "
#. module: account_followup
#: field:account.move.line,result:0
@@ -982,17 +1293,17 @@ msgstr "Saldo"
#. module: account_followup
#: help:res.partner,payment_note:0
msgid "Payment Note"
-msgstr ""
+msgstr "Zahlungsmitteilung"
#. module: account_followup
#: view:res.partner:0
msgid "My Follow-ups"
-msgstr ""
+msgstr "Meine Mahnungen"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "%(company_name)s"
-msgstr ""
+msgstr "%(company_name)s"
#. module: account_followup
#: field:account_followup.stat,date_move_last:0
@@ -1014,12 +1325,12 @@ msgstr "Periode"
#: code:addons/account_followup/wizard/account_followup_print.py:231
#, python-format
msgid "%s partners have no credits and as such the action is cleared"
-msgstr ""
+msgstr "%s Partner haben kein Guthaben, insofern wurde die Aktion gelöscht"
#. module: account_followup
#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
msgid "Follow-up Report"
-msgstr ""
+msgstr "Statistik Mahnungen"
#. module: account_followup
#: view:res.partner:0
@@ -1027,6 +1338,8 @@ msgid ""
", the latest payment follow-up\n"
" was:"
msgstr ""
+", die letzte Mahnung\n"
+" war:"
#. module: account_followup
#: view:account_followup.print:0
@@ -1036,7 +1349,7 @@ msgstr "Abbrechen"
#. module: account_followup
#: view:account_followup.sending.results:0
msgid "Close"
-msgstr ""
+msgstr "Schließen"
#. module: account_followup
#: view:account_followup.stat:0
@@ -1053,33 +1366,33 @@ msgstr "Höchste Mahnstufe"
#: code:addons/account_followup/wizard/account_followup_print.py:171
#, python-format
msgid " had unknown email address(es)"
-msgstr ""
+msgstr " es ergab()en sich unbekannte Emailanschrift(en)"
#. module: account_followup
#: view:res.partner:0
msgid "Responsible"
-msgstr ""
+msgstr "Verantwortlicher"
#. module: account_followup
#: model:ir.ui.menu,name:account_followup.menu_finance_followup
#: view:res.partner:0
msgid "Payment Follow-up"
-msgstr ""
+msgstr "Mahnwesen"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid ": Current Date"
-msgstr ""
+msgstr ": Heutiges Datum"
#. module: account_followup
#: field:res.partner,payment_amount_due:0
msgid "Total amount due"
-msgstr ""
+msgstr "Fälliger Gesamtbetrag"
#. module: account_followup
#: field:account_followup.followup.line,name:0
msgid "Follow-Up Action"
-msgstr ""
+msgstr "Mahnung"
#. module: account_followup
#: view:account_followup.stat:0
@@ -1098,12 +1411,12 @@ msgstr "Beschreibung"
#: model:email.template,subject:account_followup.email_template_account_followup_level1
#: model:email.template,subject:account_followup.email_template_account_followup_level2
msgid "${user.company_id.name} Payment Follow-up"
-msgstr ""
+msgstr "${user.company_id.name} Mahnwesen"
#. module: account_followup
#: view:account_followup.sending.results:0
msgid "Summary of actions"
-msgstr ""
+msgstr "Zusammenfassung Mahnungen"
#. module: account_followup
#: report:account_followup.followup.print:0
@@ -1113,7 +1426,7 @@ msgstr "Ref."
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "After"
-msgstr ""
+msgstr "Danach"
#. module: account_followup
#: view:account_followup.stat:0
@@ -1126,6 +1439,8 @@ msgid ""
"If not specified by the latest follow-up level, it will send from the "
"default follow-up of overdue invoices template"
msgstr ""
+"Falls nicht automatisch durch die Mahnstufe vorgegeben, wird die Standard "
+"Mahnvorlage für Anschreiben und EMail angewendet."
#. module: account_followup
#: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable
@@ -1135,6 +1450,11 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Es wurden keine Buchungsbelege in diesem Journal "
+"gefunden.\n"
+"
\n"
+" "
#. module: account_followup
#: view:account.move.line:0
@@ -1144,12 +1464,12 @@ msgstr "Partnereinträge"
#. module: account_followup
#: view:account_followup.stat:0
msgid "Follow-up lines"
-msgstr ""
+msgstr "Mahnpositionen"
#. module: account_followup
#: field:account_followup.followup.line,manual_action_responsible_id:0
msgid "Assign a Responsible"
-msgstr ""
+msgstr "Zuweisen eines Verantwortlichen"
#. module: account_followup
#: view:account_followup.print:0
@@ -1157,6 +1477,9 @@ msgid ""
"This action will send follow-up emails, print the letters and\n"
" set the manual actions per customers."
msgstr ""
+"Hierdurch werden Mahnungen als EMails versendet, Anschreiben ausgedruckt und "
+"die manuell zu\n"
+"bearbeiteten Mahnungen der Kunden ausgelöst."
#. module: account_followup
#: help:account_followup.print,partner_lang:0
@@ -1179,6 +1502,14 @@ msgid ""
"installed\n"
" using to top right icon."
msgstr ""
+"Schreiben Sie hier eine allgemeingültige Einführung,\n"
+" in Abhängigkeit von der Mahnstufe. Sie können "
+"dabei\n"
+" die folgenden Schlüsselwörter verwenden. "
+"Vergessen Sie\n"
+" allerdings dann nicht alle Sprachen, die Sie "
+"verwenden, mit Hilfe\n"
+" des oberen rechten Knopfs zu installierenn."
#. module: account_followup
#: view:account_followup.stat:0
@@ -1194,7 +1525,7 @@ msgstr "Name"
#. module: account_followup
#: field:res.partner,latest_followup_level_id:0
msgid "Latest Follow-up Level"
-msgstr ""
+msgstr "Letzte Mahnstufe"
#. module: account_followup
#: field:account_followup.stat,date_move:0
@@ -1205,18 +1536,18 @@ msgstr "Erste Zahlung:"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
msgid "Follow-up Statistics by Partner"
-msgstr ""
+msgstr "Statistik Mahnwesen nach Partner"
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:172
#, python-format
msgid " letter(s) in report"
-msgstr ""
+msgstr " Geschäftsformulare Ansicht"
#. module: account_followup
#: view:res.partner:0
msgid "Customer Followup"
-msgstr ""
+msgstr "Kunden Historie"
#. module: account_followup
#: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form
@@ -1232,6 +1563,17 @@ msgid ""
" \n"
" "
msgstr ""
+"p class = \"oe_view_nocontent_create\">\n"
+" Klicken Sie, um zu definieren Follow-up Ebenen und die "
+"damit verbundenen Aktionen.\n"
+" p>\n"
+" Für jeden Schritt fest, welche Aktionen ergriffen werden "
+"und verzögern in Tagen. es ist\n"
+" möglich, Print-und E-Mail-Vorlagen verwenden, um bestimmte "
+"Nachrichten zu senden\n"
+" der Kunde.\n"
+" p>\n"
+" "
#. module: account_followup
#: model:email.template,body_html:account_followup.email_template_account_followup_level2
@@ -1312,6 +1654,83 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+"\n"
+" \n"
+"
Sehr geehrte(r) ${object.name},
\n"
+"
\n"
+" Trotz mehrerer Mahnungen, ist Ihr Konto immer noch nicht ausgeglichen.\n"
+"Sofern keine vollständige Bezahlung in den nächsten 8 Tagen vorgenommen "
+"wird, werden wir \n"
+"weitere rechtliche Schritte ohne weitere Ankündigung in die Wege leiten. "
+"Wir sind zuversichtlich, \n"
+"dass diese Aktion unnötig ist. Sollten Ihrerseits zu diesem Zeitpunkt "
+"weitere Detailfragen zu diesem \n"
+"Thema auftreten, zögern Sie bitte nicht, unsere Buchhaltung unter (+49) "
+"4471 8409000 \n"
+"zu kontaktieren.\n"
+"
\n"
+"
\n"
+"Freundliche Grüsse\n"
+" \n"
+"
\n"
+"${user.name}\n"
+" \n"
+"
\n"
+"
\n"
+"\n"
+" \n"
+"\n"
+"<%\n"
+" from openerp.addons.account_followup.report import "
+"account_followup_print\n"
+" rml_parse = account_followup_print.report_rappel(object._cr, user.id, "
+"\"followup_rml_parser\")\n"
+" final_res = rml_parse._lines_get_with_partner(object, "
+"user.company_id.id)\n"
+" followup_table = ''\n"
+" for currency_dict in final_res:\n"
+" currency_symbol = currency_dict.get('line', [{'currency_id': "
+"user.company_id.currency_id}])[0]['currency_id'].symbol\n"
+" followup_table += '''\n"
+"
\n"
+" \n"
+" Rechnungsdatum \n"
+" Rechnungsnummer \n"
+" Fällig am \n"
+" Betrag (%s) \n"
+" EUR \n"
+" \n"
+" ''' % (currency_symbol)\n"
+" total = 0\n"
+" for aml in currency_dict['line']:\n"
+" block = aml['blocked'] and 'X' or ' '\n"
+" total += aml['balance']\n"
+" strbegin = \" \"\n"
+" strend = \" \"\n"
+" date = aml['date_maturity'] or aml['date']\n"
+" if date <= ctx['current_date'] and aml['balance'] > 0:\n"
+" strbegin = \"\"\n"
+" strend = \" \"\n"
+" followup_table +=\"\" + strbegin + str(aml['date']) + strend "
+"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin "
+"+ str(aml['balance']) + strend + strbegin + block + strend + \" \"\n"
+" total = rml_parse.formatLang(total, dp='Account', "
+"currency_obj=object.company_id.currency_id)\n"
+" followup_table += ''' \n"
+"
\n"
+"
fälliger Betrag: %s ''' % (total)\n"
+"\n"
+"%>\n"
+"\n"
+"${followup_table}\n"
+"\n"
+"
\n"
+"\n"
+"
\n"
+" "
#. module: account_followup
#: help:res.partner,payment_next_action:0
@@ -1320,6 +1739,11 @@ msgid ""
"set when the action fields are empty and the partner gets a follow-up level "
"that requires a manual action. "
msgstr ""
+"Dies ist die nächste Aktion, die durch den Anwender getroffen werden muss. "
+"Die Aktion wird jetzt automatisch so eingestellt, \r\n"
+"dass erst wenn die Aktion Felder leer sind und der Partner eine automatische "
+"Mahnstufe erhält, ein manueller Eingriff \r\n"
+"erforderlich sein wird. "
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:166
@@ -1330,12 +1754,12 @@ msgstr ""
#. module: account_followup
#: view:res.partner:0
msgid "The"
-msgstr ""
+msgstr "Der"
#. module: account_followup
#: view:account_followup.print:0
msgid "Send follow-ups"
-msgstr ""
+msgstr "Sende Mahnungen"
#. module: account_followup
#: view:account.move.line:0
@@ -1350,7 +1774,7 @@ msgstr "Punkte"
#. module: account_followup
#: view:res.partner:0
msgid "Follow-ups To Do"
-msgstr ""
+msgstr "To-Do Liste Mahnungen"
#. module: account_followup
#: report:account_followup.followup.print:0
@@ -1368,7 +1792,7 @@ msgstr ""
#. module: account_followup
#: help:res.partner,latest_followup_date:0
msgid "Latest date that the follow-up level of the partner was changed"
-msgstr ""
+msgstr "Letztes Änderung der Mahnstufe"
#. module: account_followup
#: field:account_followup.print,test_print:0
@@ -1378,22 +1802,22 @@ msgstr "Testdruck"
#. module: account_followup
#: view:res.partner:0
msgid "Search view"
-msgstr ""
+msgstr "Suche Ansicht"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid ": User Name"
-msgstr ""
+msgstr ": Benutzer Name"
#. module: account_followup
#: view:res.partner:0
msgid "Accounting"
-msgstr ""
+msgstr "Finanzbuchhaltung"
#. module: account_followup
#: field:res.partner,payment_note:0
msgid "Customer Payment Promise"
-msgstr ""
+msgstr "Kundenzahlung Versprechen"
#~ msgid "All payable entries"
#~ msgstr "Alle offenen Posten"
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index c4a52167a46..c7cdc088578 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 17:33+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
+"PO-Revision-Date: 2012-12-09 18:16+0000\n"
+"Last-Translator: Harjan Talen \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-12-05 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:37+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_followup
#: view:account_followup.followup.line:0
@@ -287,7 +287,7 @@ msgstr "Ik ben verantwoordelijk"
#. module: account_followup
#: sql_constraint:account_followup.followup:0
msgid "Only one follow-up per company is allowed"
-msgstr ""
+msgstr "Per bedrijf is één betalingsherinnering mogelijk"
#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
@@ -310,6 +310,21 @@ msgid ""
"Best Regards,\n"
" "
msgstr ""
+"\n"
+"Geachte %(partner_name)s,\n"
+"\n"
+"Ondanks herhaaldelijk verzoek is onze vordering nog niet voldaan.\n"
+"\n"
+"Wanneer de volledige betaling niet binnen 8 dagen wordt voldaan zijn wij "
+"genoodzaakt verdere stappen te ondernemen zonder vermelding vooraf.\n"
+"\n"
+"Wij gaan er vanuit dat dit echter niet noodzakelijk zal zijn. Onderstaand "
+"een overzicht van de openstaande posten.\n"
+"\n"
+"Wanneer u vragen op opmerkingen hierover heeft dan horen wij dat graag.\n"
+"\n"
+"Met vriendelijke groet,\n"
+" "
#. module: account_followup
#: help:account_followup.followup.line,send_letter:0
@@ -496,17 +511,17 @@ msgstr "Afgedrukt bericht"
#. module: account_followup
#: field:res.partner,latest_followup_level_id_without_lit:0
msgid "Latest Follow-up Level without litigation"
-msgstr ""
+msgstr "Laatste herinnering voor het incasso-traject."
#. module: account_followup
#: view:res.partner:0
msgid "Partners with Credits"
-msgstr ""
+msgstr "Relaties met openstaande facturen"
#. module: account_followup
#: help:account_followup.followup.line,send_email:0
msgid "When processing, it will send an email"
-msgstr ""
+msgstr "Bij verwerking wordt een e-mail verzonden"
#. module: account_followup
#: view:account_followup.stat.by.partner:0
@@ -517,6 +532,7 @@ msgstr "Relatie voor betalingsherinnering"
#: view:res.partner:0
msgid "Print overdue payments report independent of follow-up line"
msgstr ""
+"Druk overzicht openstaande posten af ongeacht status betalingsherinneringen."
#. module: account_followup
#: field:account_followup.followup.line,followup_id:0
@@ -614,7 +630,7 @@ msgstr "Geblokkeerd"
#. module: account_followup
#: sql_constraint:account_followup.followup.line:0
msgid "Days of the follow-up levels must be different"
-msgstr ""
+msgstr "De dagen van de herinnerings-niveau's moeten van elkaar verschillen"
#. module: account_followup
#: view:res.partner:0
@@ -703,7 +719,7 @@ msgstr "onbekend"
#: code:addons/account_followup/account_followup.py:245
#, python-format
msgid "Printed overdue payments report"
-msgstr ""
+msgstr "Druk het rapport achterstallige betalingen af"
#. module: account_followup
#: model:ir.model,name:account_followup.model_email_template
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index a41462e57b6..234b3bf1191 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.po
@@ -7,20 +7,20 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2010-12-16 00:03+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2012-12-07 10:43+0000\n"
+"Last-Translator: Andrei Talpa (multibase.pt) \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-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:58+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_followup
#: view:account_followup.followup.line:0
#: field:account_followup.followup.line,manual_action:0
msgid "Manual Action"
-msgstr ""
+msgstr "Ação manual"
#. module: account_followup
#: help:res.partner,latest_followup_level_id:0
@@ -30,7 +30,7 @@ msgstr ""
#. module: account_followup
#: view:res.partner:0
msgid "Group by"
-msgstr ""
+msgstr "Agrupar por"
#. module: account_followup
#: view:account_followup.stat:0
@@ -398,7 +398,7 @@ msgstr ""
#: code:addons/account_followup/wizard/account_followup_print.py:155
#, python-format
msgid "Nobody"
-msgstr ""
+msgstr "Ninguém"
#. module: account_followup
#: field:account.move.line,followup_line_id:0
diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po
index bde6e33ac6f..e2184129bf8 100644
--- a/addons/account_followup/i18n/zh_CN.po
+++ b/addons/account_followup/i18n/zh_CN.po
@@ -7,61 +7,61 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-30 12:07+0000\n"
-"Last-Translator: ccdos \n"
+"PO-Revision-Date: 2012-12-09 04:57+0000\n"
+"Last-Translator: sum1201 \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-12-04 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:37+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_followup
#: view:account_followup.followup.line:0
#: field:account_followup.followup.line,manual_action:0
msgid "Manual Action"
-msgstr ""
+msgstr "手动操作"
#. module: account_followup
#: help:res.partner,latest_followup_level_id:0
msgid "The maximum follow-up level"
-msgstr ""
+msgstr "最大跟踪级别"
#. module: account_followup
#: view:res.partner:0
msgid "Group by"
-msgstr ""
+msgstr "分组"
#. module: account_followup
#: view:account_followup.stat:0
#: view:res.partner:0
msgid "Group By..."
-msgstr "分组..."
+msgstr "基于...分组"
#. module: account_followup
#: field:account_followup.print,followup_id:0
msgid "Follow-Up"
-msgstr "催款"
+msgstr "后续跟进"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "%(date)s"
-msgstr ""
+msgstr "%(日期)"
#. module: account_followup
#: field:res.partner,payment_next_action_date:0
msgid "Next Action Date"
-msgstr ""
+msgstr "下次活动日期"
#. module: account_followup
#: field:account_followup.sending.results,needprinting:0
msgid "Needs Printing"
-msgstr ""
+msgstr "需要印刷"
#. module: account_followup
#: view:res.partner:0
msgid "⇾ Mark as Done"
-msgstr ""
+msgstr "标记为完成"
#. module: account_followup
#: field:account_followup.followup.line,manual_action_note:0
@@ -192,7 +192,7 @@ msgstr ""
#. module: account_followup
#: view:account_followup.followup.line:0
msgid "days overdue, do the following actions:"
-msgstr ""
+msgstr "天过期,做下列动作:"
#. module: account_followup
#: view:account_followup.followup.line:0
@@ -207,12 +207,12 @@ msgstr "电子邮件正文"
#. module: account_followup
#: help:res.partner,payment_responsible_id:0
msgid "Responsible for making sure the action happens."
-msgstr ""
+msgstr "负责确保动作发生。"
#. module: account_followup
#: view:res.partner:0
msgid "Overdue amount"
-msgstr ""
+msgstr "逾期金额"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
@@ -242,12 +242,12 @@ msgstr "借方合计"
#. module: account_followup
#: field:res.partner,payment_next_action:0
msgid "Next Action"
-msgstr ""
+msgstr "下个行动日期"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid ": Partner Name"
-msgstr ""
+msgstr ":伙伴名称"
#. module: account_followup
#: view:account_followup.followup:0
@@ -334,7 +334,7 @@ msgstr ""
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_customer_followup
msgid "Manual Follow-Ups"
-msgstr ""
+msgstr "手动跟进"
#. module: account_followup
#: view:account_followup.followup.line:0
@@ -354,7 +354,7 @@ msgstr "催款统计"
#. module: account_followup
#: view:res.partner:0
msgid "Send Overdue Email"
-msgstr ""
+msgstr "过期邮件发送"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_followup_line
@@ -370,7 +370,7 @@ msgstr "输入序列用于显示催款列表"
#: code:addons/account_followup/wizard/account_followup_print.py:166
#, python-format
msgid " will be sent"
-msgstr ""
+msgstr " 将被发送"
#. module: account_followup
#: view:account_followup.followup.line:0
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index 83a759b37e5..198f889636a 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -25,6 +25,8 @@ from openerp import pooler
from openerp.report import report_sxw
class report_rappel(report_sxw.rml_parse):
+ _name = "account_followup.report.rappel"
+
def __init__(self, cr, uid, name, context=None):
super(report_rappel, self).__init__(cr, uid, name, context=context)
self.localcontext.update({
@@ -79,7 +81,6 @@ class report_rappel(report_sxw.rml_parse):
final_res.append({'line': line_cur[cur]['line']})
return final_res
-
def _get_text(self, stat_line, followup_id, context=None):
if context is None:
context = {}
@@ -108,7 +109,6 @@ class report_rappel(report_sxw.rml_parse):
'company_name': stat_line.company_id.name,
'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature or '',
}
-
return text
report_sxw.report_sxw('report.account_followup.followup.print',
diff --git a/addons/account_followup/tests/test_account_followup.py b/addons/account_followup/tests/test_account_followup.py
index 28e2e2f38ec..14f458de98d 100644
--- a/addons/account_followup/tests/test_account_followup.py
+++ b/addons/account_followup/tests/test_account_followup.py
@@ -108,7 +108,7 @@ class TestAccountFollowup(TransactionCase):
def test_03_filter_on_credit(self):
""" Check the partners can be filtered on having credits """
cr, uid = self.cr, self.uid
- ids = self.partner.search(cr, uid, [('credit', '>=', 0.0)])
+ ids = self.partner.search(cr, uid, [('payment_amount_due', '>=', 0.0)])
self.assertIn(self.partner_id, ids)
def test_04_action_done(self):
@@ -153,7 +153,6 @@ class TestAccountFollowup(TransactionCase):
}, context={"followup_id": self.followup_id})
self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id})
partner_ref = self.partner.browse(cr, uid, self.partner_id)
- print partner_ref.credit, partner_ref.payment_next_action_date, partner_ref.payment_responsible_id
- self.assertEqual(0, self.partner.browse(cr, uid, self.partner_id).credit, "Credit != 0")
+ self.assertEqual(0, self.partner.browse(cr, uid, self.partner_id).payment_amount_due, "Amount Due != 0")
self.assertFalse(self.partner.browse(cr, uid, self.partner_id).payment_next_action_date, "Next action date not cleared")
-
\ No newline at end of file
+
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 488123b55d1..e93b4dd8b69 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -152,7 +152,7 @@ class account_followup_print(osv.osv_memory):
if partner.max_followup_id.manual_action:
partner_obj.do_partner_manual_action(cr, uid, [partner.partner_id.id], context=context)
nbmanuals = nbmanuals + 1
- key = partner.partner_id.payment_responsible_id.name or _("Nobody")
+ key = partner.partner_id.payment_responsible_id.name or _("Anybody")
if not key in manuals.keys():
manuals[key]= 1
else:
@@ -198,15 +198,12 @@ class account_followup_print(osv.osv_memory):
ids = self.pool.get('res.partner').search(cr, uid, ['&', ('id', 'not in', partner_list_ids), '|',
('payment_responsible_id', '!=', False),
('payment_next_action_date', '!=', False)], context=context)
- partners = self.pool.get('res.partner').browse(cr, uid, ids, context=context)
- newids = []
- for part in partners:
- credit = 0
- for aml in part.unreconciled_aml_ids:
- credit +=aml.result
- if credit <= 0:
- newids.append(part.id)
- self.pool.get('res.partner').action_done(cr, uid, newids, context=context)
+
+ partners_to_clear = []
+ for part in self.pool.get('res.partner').browse(cr, uid, ids, context=context):
+ if not part.unreconciled_aml_ids:
+ partners_to_clear.append(part.id)
+ self.pool.get('res.partner').action_done(cr, uid, partners_to_clear, context=context)
return len(ids)
def do_process(self, cr, uid, ids, context=None):
diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml
index 29f36522d05..62943330d63 100644
--- a/addons/account_followup/wizard/account_followup_print_view.xml
+++ b/addons/account_followup/wizard/account_followup_print_view.xml
@@ -13,7 +13,7 @@
This action will send follow-up emails, print the letters and
- set the manual actions per customers.
+ set the manual actions per customer, according to the follow-up levels defined.
diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po
index 30fd5d1eef5..c61aa961d60 100644
--- a/addons/account_payment/i18n/de.po
+++ b/addons/account_payment/i18n/de.po
@@ -7,14 +7,15 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-08 08:52+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp \n"
+"PO-Revision-Date: 2012-12-07 15:45+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_payment
#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -28,6 +29,15 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Klicken Sie zur Erstellung eines Zahlungsauftrags.\n"
+"
\n"
+" Ein Zahlungsauftrag ist eine Zahlungsaufforderung aus Ihrem "
+"Unternehmen zur Zahlung \n"
+" einer Lieferantenrechnung oder einer Rückerstattung durch "
+"eine Kundengutschrift.\n"
+"
\n"
+" "
#. module: account_payment
#: field:payment.line,currency:0
@@ -123,13 +133,16 @@ msgid ""
"You cannot cancel an invoice which has already been imported in a payment "
"order. Remove it from the following payment order : %s."
msgstr ""
+"Sie können keine Rechnung stornieren, die Sie bereits in einen "
+"Zahlungsauftrag übernommen haben. Entfernen Sie die Rechnung vom "
+"Zahlungsauftrag: %s ."
#. module: account_payment
#: code:addons/account_payment/account_invoice.py:43
#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Fehler !"
#. module: account_payment
#: report:payment.order:0
@@ -194,6 +207,9 @@ msgid ""
" Once the bank is confirmed the status is set to 'Confirmed'.\n"
" Then the order is paid the status is 'Done'."
msgstr ""
+"Wenn ein Zahlungsauftrag erstellt wird ist der Status 'Entwurf'.\n"
+" Durch Bestätigung wechselt der Status in 'Bestätigt'.\n"
+" Durch die tatsächliche Freigabe zu Zahlung wechselt der"
#. module: account_payment
#: view:payment.order:0
@@ -219,7 +235,7 @@ msgstr "Strukturiert"
#. module: account_payment
#: view:account.bank.statement:0
msgid "Import Payment Lines"
-msgstr ""
+msgstr "Import von Zahlungspositionen"
#. module: account_payment
#: view:payment.line:0
@@ -262,7 +278,7 @@ msgstr ""
#. module: account_payment
#: field:payment.order,date_created:0
msgid "Creation Date"
-msgstr ""
+msgstr "Datum Erstellung"
#. module: account_payment
#: help:payment.mode,journal:0
@@ -369,7 +385,7 @@ msgstr "Beleg Zahlungsvorschlag"
#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "There is no partner defined on the entry line."
-msgstr ""
+msgstr "Es gibt keinen Partner als Zahlungsempfänger für diese Position."
#. module: account_payment
#: help:payment.mode,name:0
@@ -401,7 +417,7 @@ msgstr "Entwurf"
#: view:payment.order:0
#: field:payment.order,state:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: account_payment
#: help:payment.line,communication2:0
@@ -449,7 +465,7 @@ msgstr "Suche"
#. module: account_payment
#: field:payment.order,user_id:0
msgid "Responsible"
-msgstr ""
+msgstr "Verantwortlicher"
#. module: account_payment
#: field:payment.line,date:0
@@ -464,7 +480,7 @@ msgstr "Summe:"
#. module: account_payment
#: field:payment.order,date_done:0
msgid "Execution Date"
-msgstr ""
+msgstr "Datum Ausführung"
#. module: account_payment
#: view:account.payment.populate.statement:0
@@ -582,7 +598,7 @@ msgstr "Verwendungszweck 2"
#. module: account_payment
#: field:payment.order,date_scheduled:0
msgid "Scheduled Date"
-msgstr ""
+msgstr "Geplantes Datum"
#. module: account_payment
#: view:account.payment.make.payment:0
@@ -677,14 +693,14 @@ msgstr "Bezahlung"
#. module: account_payment
#: field:payment.order,date_prefered:0
msgid "Preferred Date"
-msgstr ""
+msgstr "bevorzugtes Datum"
#. module: account_payment
#: view:account.payment.make.payment:0
#: view:account.payment.populate.statement:0
#: view:payment.order.create:0
msgid "or"
-msgstr ""
+msgstr "oder"
#. module: account_payment
#: help:payment.mode,bank_id:0
diff --git a/addons/account_test/__init__.py b/addons/account_test/__init__.py
new file mode 100644
index 00000000000..106682f4a12
--- /dev/null
+++ b/addons/account_test/__init__.py
@@ -0,0 +1,2 @@
+import account_test
+import report
diff --git a/addons/account_test/__openerp__.py b/addons/account_test/__openerp__.py
new file mode 100644
index 00000000000..cfd4007fed0
--- /dev/null
+++ b/addons/account_test/__openerp__.py
@@ -0,0 +1,47 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (c) 2011 CCI Connect asbl (http://www.cciconnect.be) All Rights Reserved.
+# Philmer
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+{
+ 'name' : 'Accounting Consistency Tests',
+ 'version' : '1.0',
+ 'author' : 'OpenERP',
+ 'category' : 'Accounting & Finance',
+ 'website': 'http://www.openerp.com',
+ 'description': """
+Asserts on accounting.
+======================
+With this module you can manually check consistencies and inconsistencies of accounting module from menu Reporting/Accounting/Accounting Tests.
+
+You can write a query in order to create Consistency Test and you will get the result of the test
+in PDF format which can be accessed by Menu Reporting -> Accounting Tests, then select the test
+and print the report from Print button in header area.
+""",
+ 'depends' : ['account'],
+ 'data' : [
+ 'security/ir.model.access.csv',
+ 'account_test_view.xml',
+ 'account_test_report.xml',
+ 'account_test_data.xml',
+ ],
+ 'active': False,
+ 'installable': True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py
new file mode 100644
index 00000000000..bf925e8236a
--- /dev/null
+++ b/addons/account_test/account_test.py
@@ -0,0 +1,65 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: product_expiry.py 4304 2006-10-25 09:54:51Z ged $
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+from osv import fields,osv
+import pooler
+import netsvc
+import time
+from xml import dom
+
+
+CODE_EXEC_DEFAULT = '''\
+res = []
+cr.execute("select id, code from account_journal")
+for record in cr.dictfetchall():
+ res.append(record['code'])
+result = res
+'''
+
+class accounting_assert_test(osv.osv):
+ _name = "accounting.assert.test"
+ _order = "sequence"
+
+ _columns = {
+ 'name': fields.char('Test Name', size=256, required=True, select=True, translate=True),
+ 'desc': fields.text('Test Description', select=True, translate=True),
+ 'code_exec': fields.text('Python code', required=True),
+ 'active': fields.boolean('Active'),
+ 'sequence': fields.integer('Sequence'),
+ }
+
+ _defaults = {
+ 'code_exec': CODE_EXEC_DEFAULT,
+ 'active': True,
+ 'sequence': 10,
+ }
+
+accounting_assert_test()
+
diff --git a/addons/account_test/account_test_data.xml b/addons/account_test/account_test_data.xml
new file mode 100644
index 00000000000..4970bef6a0d
--- /dev/null
+++ b/addons/account_test/account_test_data.xml
@@ -0,0 +1,172 @@
+
+
+
+
+
+ 1
+ Test 1: General balance
+ Check the balance: Debit sum = Credit sum
+
+
+
+
+ 2
+ Test 2: Opening a fiscal year
+ Check if the balance of the new opened fiscal year matches with last year's balance
+
+
+
+
+ 3
+ Test 3: Movement lines
+ Check if movement lines are balanced and have the same date and period
+ 0 or am.period_id!=ml.period_id or (am.date!=ml.date)
+"""
+cr.execute(sql)
+res = cr.dictfetchall()
+if res:
+ res.insert(0,_('* The test failed for these movement lines:'))
+result = res
+
+]]>
+
+
+
+ 4
+ Test 4: Totally reconciled mouvements
+ Check if the totally reconciled movements are balanced
+ 0", (record['reconcile_id'],))
+ reconcile_ids=cr.dictfetchall()
+ if reconcile_ids:
+ res.append(', '.join(["Reconcile name: %(name)s, id=%(id)s " % r for r in reconcile_ids]))
+result = res
+if result:
+ result.insert(0,_('* The test failed for these reconciled items(id/name):'))
+]]>
+
+
+
+ 5
+ Test 5.1 : Payable and Receivable accountant lines of reconciled invoices
+ Check that reconciled invoice for Sales/Purchases has reconciled entries for Payable and Receivable Accounts
+
+
+
+
+ 6
+ Test 5.2 : Reconcilied invoices and Payable/Receivable accounts
+ Check that reconciled account moves, that define Payable and Receivable accounts, are belonging to reconciled invoices
+
+
+
+
+ 7
+ Test 6 : Invoices status
+ Check that paid/reconciled invoices are not in 'Open' state
+
+
+
+
+
+ 8
+ Test 7: « View » account type
+ Check that there's no move for any account with « View » account type
+
+
+
+
+ 9
+ Test 8 : Closing balance on bank statements
+ Check on bank statement that the Closing Balance = Starting Balance + sum of statement lines
+ 0.000000001;")
+result = cr.dictfetchall()
+if result:
+ result.insert(0,_('* Unbalanced bank statement that need to be checked: '))
+]]>
+
+
+
+ 10
+ Test 9 : Accounts and partners on account moves
+ Check that general accounts and partners on account moves are active
+
+
+
+
diff --git a/addons/account_test/account_test_report.xml b/addons/account_test/account_test_report.xml
new file mode 100644
index 00000000000..480507b6072
--- /dev/null
+++ b/addons/account_test/account_test_report.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
diff --git a/addons/account_test/account_test_view.xml b/addons/account_test/account_test_view.xml
new file mode 100644
index 00000000000..43a67edcc6c
--- /dev/null
+++ b/addons/account_test/account_test_view.xml
@@ -0,0 +1,85 @@
+
+
+
+
+
+ Tests
+ accounting.assert.test
+
+
+
+
+
+
+
+
+
+
+ Tests
+ accounting.assert.test
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Code should always set a variable named `result` with the result of your test, that can be a list or
+a dictionary. If `result` is an empty list, it means that the test was succesful. Otherwise it will
+try to translate and print what is inside `result`.
+
+If the result of your test is a dictionary, you can set a variable named `column_order` to choose in
+what order you want to print `result`'s content.
+
+Should you need them, you can also use the following variables into your code:
+ * cr: cursor to the database
+ * uid: ID of the current user
+
+In any ways, the code must be legal python statements with correct indentation (if needed).
+
+Example:
+ sql = '''SELECT id, name, ref, date
+ FROM account_move_line
+ WHERE account_id IN (SELECT id FROM account_account WHERE type = 'view')
+ '''
+ cr.execute(sql)
+ result = cr.dictfetchall()
+
+
+
+
+
+
+
+
+
+
+ Accounting Tests
+ accounting.assert.test
+ tree,form
+
+
+ Click to create Accounting Test.
+
+
+
+
+
+
+
+
diff --git a/addons/account_test/report/__init__.py b/addons/account_test/report/__init__.py
new file mode 100644
index 00000000000..0e4fbf07082
--- /dev/null
+++ b/addons/account_test/report/__init__.py
@@ -0,0 +1,3 @@
+import account_test_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_test/report/account_test.rml b/addons/account_test/report/account_test.rml
new file mode 100644
index 00000000000..1efa12fd5cb
--- /dev/null
+++ b/addons/account_test/report/account_test.rml
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Accouting tests on [[ datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") ]]
+
+
+
+
+ [[repeatIn(objects,'o')]]
+
+
+
+ [[ o.name ]]
+
+
+
+
+ [[ o.desc or '' ]]
+
+
+
+
+
+
+ [[ repeatIn(execute_code(o.code_exec), 'test_result') ]]
+ [[ test_result ]]
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account_test/report/account_test_report.py b/addons/account_test/report/account_test_report.py
new file mode 100644
index 00000000000..ab683e18688
--- /dev/null
+++ b/addons/account_test/report/account_test_report.py
@@ -0,0 +1,87 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved
+# $Id$
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import datetime
+import time
+from report import report_sxw
+from tools.translate import _
+#
+# Use period and Journal for selection or resources
+#
+class report_assert_account(report_sxw.rml_parse):
+ def __init__(self, cr, uid, name, context):
+ super(report_assert_account, self).__init__(cr, uid, name, context=context)
+ self.localcontext.update( {
+ 'time': time,
+ 'datetime': datetime,
+ 'execute_code': self.execute_code,
+ })
+
+ def execute_code(self, code_exec):
+ def reconciled_inv():
+ """
+ returns the list of invoices that are set as reconciled = True
+ """
+ return self.pool.get('account.invoice').search(self.cr, self.uid, [('reconciled','=',True)])
+
+ def order_columns(item, cols=None):
+ """
+ This function is used to display a dictionary as a string, with its columns in the order chosen.
+
+ :param item: dict
+ :param cols: list of field names
+ :returns: a list of tuples (fieldname: value) in a similar way that would dict.items() do except that the
+ returned values are following the order given by cols
+ :rtype: [(key, value)]
+ """
+ if cols is None:
+ cols = item.keys()
+ return [(col, item.get(col)) for col in cols if col in item.keys()]
+
+ localdict = {
+ 'cr': self.cr,
+ 'uid': self.uid,
+ 'reconciled_inv': reconciled_inv, #specific function used in different tests
+ 'result': None, #used to store the result of the test
+ 'column_order': None, #used to choose the display order of columns (in case you are returning a list of dict)
+ }
+ exec code_exec in localdict
+ result = localdict['result']
+ column_order = localdict.get('column_order', None)
+
+ if not isinstance(result, (tuple, list, set)):
+ result = [result]
+ if not result:
+ result = [_('The test was passed successfully')]
+ else:
+ def _format(item):
+ if isinstance(item, dict):
+ return ', '.join(["%s: %s" % (tup[0], tup[1]) for tup in order_columns(item, column_order)])
+ else:
+ return item
+ result = [_(_format(rec)) for rec in result]
+
+ return result
+
+report_sxw.report_sxw('report.account.test.assert.print', 'accounting.assert.test', 'addons/account_test/report/account_test.rml', parser=report_assert_account, header=False)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_test/security/ir.model.access.csv b/addons/account_test/security/ir.model.access.csv
new file mode 100644
index 00000000000..cf7e93b6baa
--- /dev/null
+++ b/addons/account_test/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_accounting_assert_test","accounting.assert.test","model_accounting_assert_test",base.group_system,1,0,0,1
+"access_accounting_assert_test_manager","accounting.assert.test","model_accounting_assert_test",account.group_account_manager,1,0,0,0
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 927fda19182..d9f1f680030 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -26,7 +26,7 @@
'summary': 'Send Invoices and Track Payments',
'description': """
Invoicing & Payments by Accounting Voucher & Receipts
-======================================================
+=====================================================
The specific and easy-to-use Invoicing system in OpenERP allows you to keep track of your accounting, even when you are not an accountant. It provides an easy way to follow up on your suppliers and customers.
You could use this simplified accounting in case you work with an (external) account to keep your books, and you still want to keep track of payments.
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index 074cbcaa580..769536fd4a2 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/i18n/de.po
@@ -7,15 +7,15 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-05-10 17:49+0000\n"
+"PO-Revision-Date: 2012-12-07 20:51+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-04 05:41+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: account_voucher
#: field:account.bank.statement.line,voucher_id:0
@@ -64,7 +64,7 @@ msgstr "Berechnet als Differenz zwischen Belege und Belegzeilen"
#. module: account_voucher
#: view:account.voucher:0
msgid "(Update)"
-msgstr ""
+msgstr "(Aktualisieren)"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:1093
@@ -99,7 +99,7 @@ msgstr "März"
#. module: account_voucher
#: field:account.voucher,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Ungelesene Nachrichten"
#. module: account_voucher
#: view:account.voucher:0
@@ -109,7 +109,7 @@ msgstr "Bezahle Rechnung"
#. module: account_voucher
#: view:account.voucher:0
msgid "Are you sure you want to cancel this receipt?"
-msgstr ""
+msgstr "Sind Sie sicher, dass Sie diesen Beleg löschen wollen ?"
#. module: account_voucher
#: view:account.voucher:0
@@ -130,7 +130,7 @@ msgstr "Gruppiere je Jahr der Rechnung"
#: view:sale.receipt.report:0
#: field:sale.receipt.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Verkäufer"
#. module: account_voucher
#: view:account.voucher:0
@@ -144,6 +144,8 @@ msgid ""
"You can not change the journal as you already reconciled some statement "
"lines!"
msgstr ""
+"Dieses Journal kann nicht geändert werden, da bereits Auszugspositionen "
+"ausgeglichen wurden."
#. module: account_voucher
#: view:account.voucher:0
@@ -161,6 +163,13 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Klicken Sie zur Erfassung eines Kaufbeleg.\n"
+" p>\n"
+" Wenn der Kaufbeleg bestätigt wird, können Sie die\n"
+" Lieferanten Bezahlung erfassen.\n"
+" p>\n"
+" "
#. module: account_voucher
#: view:account.voucher:0
@@ -210,7 +219,7 @@ msgstr "Anmerkungen"
#. module: account_voucher
#: field:account.voucher,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Mitteilungen"
#. module: account_voucher
#: selection:account.voucher,type:0
@@ -228,7 +237,7 @@ msgstr "Journal Buchung"
#: code:addons/account_voucher/account_voucher.py:964
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Fehler !"
#. module: account_voucher
#: field:account.voucher.line,amount:0
@@ -272,11 +281,19 @@ msgid ""
"
\n"
" "
msgstr ""
+"\n"
+" Klicken Sie zur Erstellung eines Kaufbeleg.\n"
+"
\n"
+" Wenn Sie den Kaufbeleg bestätigt haben, können Sie optional "
+"die\n"
+" Einzahlung sofort oder später erfassen.\n"
+"
\n"
+" "
#. module: account_voucher
#: help:account.voucher,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Benachrichtigung erfordert handeln"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_bank_statement_line
@@ -298,7 +315,7 @@ msgstr "Steuer"
#: code:addons/account_voucher/account_voucher.py:864
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Diese Aktion ist fehlerhaft !"
#. module: account_voucher
#: field:account.voucher,comment:0
@@ -316,6 +333,9 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Beinhaltet die Chatter Zusammenfassung (Anzahl der Nachrichten, ...). Diese "
+"Zusammenfassung ist im HTML-Format, um in Kanban Karten Ansichten eingefügt "
+"zu werden."
#. module: account_voucher
#: view:account.voucher:0
@@ -325,7 +345,7 @@ msgstr "Zahlungsinformation"
#. module: account_voucher
#: view:account.voucher:0
msgid "(update)"
-msgstr ""
+msgstr "(aktualisieren)"
#. module: account_voucher
#: view:account.voucher:0
@@ -361,6 +381,9 @@ msgid ""
"settings, to manage automatically the booking of accounting entries related "
"to differences between exchange rates."
msgstr ""
+"Sie sollten in den Einstellungen für die Buchhaltung das 'Kursgewinn Konto' "
+"einstellen, um automatisch die entstehenden erforderlichen Buchungen für "
+"Wechselkursdifferenzen zu generieren."
#. module: account_voucher
#: view:account.voucher:0
@@ -397,7 +420,7 @@ msgstr "Konto belasten (Soll)"
#: code:addons/account_voucher/account_voucher.py:1558
#, python-format
msgid "Unable to change journal !"
-msgstr ""
+msgstr "Es ist nicht möglich das Journal zu ändern !"
#. module: account_voucher
#: view:sale.receipt.report:0
@@ -527,12 +550,22 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Klicken Sie zur Eingabe einer Einzahlung.\n"
+" p>\n"
+" Erfassen Sie den Kunden, die Zahlungsmethode und den "
+"Betrag, bevor Sie dann entweder \n"
+" einfach nur die Zahlung bestätigen oder den automatischen "
+"Vorschlag der auszugleichenden \n"
+" Rechnungen bzw. Verkaufsbelege übernehmen und buchen.\n"
+" p>\n"
+" "
#. module: account_voucher
#: field:account.config.settings,expense_currency_exchange_account_id:0
#: field:res.company,expense_currency_exchange_account_id:0
msgid "Loss Exchange Rate Account"
-msgstr ""
+msgstr "Kursverlust Konto"
#. module: account_voucher
#: view:account.voucher:0
@@ -566,6 +599,9 @@ msgid ""
"settings, to manage automatically the booking of accounting entries related "
"to differences between exchange rates."
msgstr ""
+"Sie sollten das Kursverlust Konto in den Einstellungen der Buchhaltung "
+"definieren, um automatisch die Buchungen für die Kursverluste aus "
+"Wechselkursänderungen zu generieren."
#. module: account_voucher
#: view:account.voucher:0
@@ -575,7 +611,7 @@ msgstr "Aufwandspositionen"
#. module: account_voucher
#: view:account.voucher:0
msgid "Sale voucher"
-msgstr ""
+msgstr "Verkauf Belege"
#. module: account_voucher
#: help:account.voucher,is_multi_currency:0
@@ -589,7 +625,7 @@ msgstr ""
#. module: account_voucher
#: view:account.invoice:0
msgid "Register Payment"
-msgstr ""
+msgstr "Erfassen Einzahlung"
#. module: account_voucher
#: field:account.statement.from.invoice.lines,line_ids:0
@@ -627,17 +663,17 @@ msgstr "Kreditoren und Debitoren"
#. module: account_voucher
#: view:account.voucher:0
msgid "Voucher Payment"
-msgstr ""
+msgstr "Zahlung Belege"
#. module: account_voucher
#: field:sale.receipt.report,state:0
msgid "Voucher Status"
-msgstr ""
+msgstr "Belegstatus"
#. module: account_voucher
#: view:account.voucher:0
msgid "Are you sure to unreconcile this record?"
-msgstr ""
+msgstr "Möchten Sie wirklich den Ausgleich stornieren?"
#. module: account_voucher
#: field:account.voucher,company_id:0
@@ -661,7 +697,7 @@ msgstr "OP-Ausgleich Saldo"
#: code:addons/account_voucher/account_voucher.py:960
#, python-format
msgid "Configuration Error !"
-msgstr ""
+msgstr "Konfigurationsfehler !"
#. module: account_voucher
#: view:account.voucher:0
@@ -678,14 +714,14 @@ msgstr "Bruttobetrag"
#. module: account_voucher
#: view:account.voucher:0
msgid "Purchase Voucher"
-msgstr ""
+msgstr "Einkauf Belege"
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher,state:0
#: view:sale.receipt.report:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: account_voucher
#: view:account.voucher:0
@@ -696,7 +732,7 @@ msgstr "Zuordnung"
#: view:account.statement.from.invoice.lines:0
#: view:account.voucher:0
msgid "or"
-msgstr ""
+msgstr "oder"
#. module: account_voucher
#: selection:sale.receipt.report,month:0
@@ -721,7 +757,7 @@ msgstr "Oktober"
#: code:addons/account_voucher/account_voucher.py:961
#, python-format
msgid "Please activate the sequence of selected journal !"
-msgstr ""
+msgstr "Bitte aktivieren Sie die Nummernfolge für das gewählte Journal !"
#. module: account_voucher
#: selection:sale.receipt.report,month:0
@@ -779,7 +815,7 @@ msgstr "Betrag Ausgeglichen"
#: field:account.voucher,message_comment_ids:0
#: help:account.voucher,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Kommentare und EMails"
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -792,6 +828,14 @@ msgid ""
"
\n"
" "
msgstr ""
+"\n"
+" Klicken Sie zur Eingabe einer Lieferanten Zahlung.\n"
+" p>\n"
+" OpenERP hilft bei der Ermittlung der offenen Rechnungen für "
+"Zahlungsvorschläge \n"
+" und hilft bei der Verfolgung von Zahlungen .\n"
+" p>\n"
+" "
#. module: account_voucher
#: selection:account.voucher,pay_now:0
@@ -828,18 +872,18 @@ msgstr "Unternehmen"
#. module: account_voucher
#: field:account.voucher,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Zusammenfassung"
#. module: account_voucher
#: field:account.voucher,active:0
msgid "Active"
-msgstr ""
+msgstr "Aktiv"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:965
#, python-format
msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "Bitte definieren Sie eine Nummernfolge für dieses Journal."
#. module: account_voucher
#: view:account.voucher:0
@@ -855,7 +899,7 @@ msgstr "Gruppiert je Rechnungsdatum"
#: code:addons/account_voucher/account_voucher.py:1093
#, python-format
msgid "Wrong bank statement line"
-msgstr ""
+msgstr "Falsche Bankauszugposition"
#. module: account_voucher
#: view:account.voucher:0
@@ -952,7 +996,7 @@ msgstr "Abbrechen"
#. module: account_voucher
#: model:ir.actions.client,name:account_voucher.action_client_invoice_menu
msgid "Open Invoicing Menu"
-msgstr ""
+msgstr "Offene Rechnungen Auswahl"
#. module: account_voucher
#: selection:account.voucher,state:0
@@ -972,6 +1016,8 @@ msgstr "Buchungsjournale"
#, python-format
msgid "Please define default credit/debit accounts on the journal \"%s\"."
msgstr ""
+"Bitte definieren Sie je ein Standard Soll / Haben Konto für das Journal "
+"\"%s\"."
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
@@ -1021,6 +1067,16 @@ msgid ""
"
\n"
" "
msgstr ""
+"\n"
+" Durch diese Statistik können Sie sich einen Überblick über die "
+"abgerechneten Rechnungen \n"
+" verschaffen sowie den Status der nicht termingerechten "
+"Zahlungen bewerten. Die \n"
+" Sucheinstellung kann verwendet werden, um Statistiken zu "
+"personalisieren \n"
+" und bedarfsgerecht anzupassen.\n"
+"
\n"
+" "
#. module: account_voucher
#: view:account.voucher:0
@@ -1050,7 +1106,7 @@ msgstr "Mai"
#. module: account_voucher
#: view:account.voucher:0
msgid "Sale Receipt"
-msgstr ""
+msgstr "Verkauf Buchungsbelege"
#. module: account_voucher
#: view:account.voucher:0
@@ -1143,7 +1199,7 @@ msgstr "Jahr"
#: field:account.config.settings,income_currency_exchange_account_id:0
#: field:res.company,income_currency_exchange_account_id:0
msgid "Gain Exchange Rate Account"
-msgstr ""
+msgstr "Kursverlust Konto"
#. module: account_voucher
#: selection:sale.receipt.report,month:0
@@ -1163,7 +1219,7 @@ msgstr "Standard Typ"
#. module: account_voucher
#: help:account.voucher,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Nachrichten und Kommunikation Historie"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
@@ -1187,12 +1243,14 @@ msgid ""
"The amount of the voucher must be the same amount as the one on the "
"statement line."
msgstr ""
+"Der Betrag für diesen Beleg sollte identisch sein mit demjenigen auf dem "
+"Bankauszug."
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:864
#, python-format
msgid "Cannot delete voucher(s) which are already opened or paid."
-msgstr ""
+msgstr "Offene oder bezahlte Belege können nicht storniert werden"
#. module: account_voucher
#: help:account.voucher,date:0
@@ -1202,7 +1260,7 @@ msgstr "Tatsächliches Buchungsdatum"
#. module: account_voucher
#: model:mail.message.subtype,name:account_voucher.mt_voucher
msgid "Status Change"
-msgstr ""
+msgstr "Status Änderung"
#. module: account_voucher
#: selection:account.voucher,payment_option:0
@@ -1251,7 +1309,7 @@ msgstr "Offener Saldo"
#: code:addons/account_voucher/account_voucher.py:1001
#, python-format
msgid "Insufficient Configuration!"
-msgstr ""
+msgstr "Unzureichende Konfiguration !"
#. module: account_voucher
#: help:account.voucher,active:0
@@ -1260,6 +1318,9 @@ msgid ""
"inactive, which allow to hide the customer/supplier payment while the bank "
"statement isn't confirmed."
msgstr ""
+"Standardmäßig werden die Zahlungsausgleiche aus Bank Belegen als inaktiv "
+"gesetzt, um Kunden / Lieferanten Bezahlung zu verbergen, während der "
+"Kontoauszug noch nicht endgültig bestätigt wurde."
#~ msgid "On Account of :"
#~ msgstr "Bezug Konto:"
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
index 63a495011b6..a2b4294d422 100644
--- a/addons/analytic/i18n/de.po
+++ b/addons/analytic/i18n/de.po
@@ -8,29 +8,30 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-08 08:55+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp \n"
+"PO-Revision-Date: 2012-12-08 10:41+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: analytic
#: field:account.analytic.account,child_ids:0
msgid "Child Accounts"
-msgstr "untergeordnete Konten"
+msgstr "untergordnete Kostenstelle"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "In Progress"
-msgstr ""
+msgstr "In Arbeit"
#. module: analytic
#: model:mail.message.subtype,name:analytic.mt_account_status
msgid "Status Change"
-msgstr ""
+msgstr "Status Änderung"
#. module: analytic
#: selection:account.analytic.account,state:0
@@ -40,7 +41,7 @@ msgstr "Vorlage"
#. module: analytic
#: view:account.analytic.account:0
msgid "End Date"
-msgstr ""
+msgstr "Ende Datum"
#. module: analytic
#: help:account.analytic.line,unit_amount:0
@@ -60,12 +61,16 @@ msgid ""
"the\n"
" customer."
msgstr ""
+"Sobald das Ende Datum des Vertrags überschritten wird oder die maximale "
+"Anzahl von Service Einheiten (beispielsweise in einem Support-Vertrag) "
+"abgeleistet wurde, wird der Projekt Manager per EMail benachrichtigt, um den "
+"Vertrag mit dem Kunden zu erneuern."
#. module: analytic
#: code:addons/analytic/analytic.py:222
#, python-format
msgid "Contract: "
-msgstr ""
+msgstr "Vertrag: "
#. module: analytic
#: field:account.analytic.account,manager_id:0
@@ -75,13 +80,13 @@ msgstr "Verantw. Mitarbeiter"
#. module: analytic
#: field:account.analytic.account,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Followers"
#. module: analytic
#: code:addons/analytic/analytic.py:319
#, python-format
msgid "Contract created ."
-msgstr ""
+msgstr "Vertrag wurde erstellt ."
#. module: analytic
#: selection:account.analytic.account,state:0
@@ -101,23 +106,23 @@ msgstr "Neu"
#. module: analytic
#: field:account.analytic.account,user_id:0
msgid "Project Manager"
-msgstr ""
+msgstr "Projekt Manager"
#. module: analytic
#: field:account.analytic.account,state:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: analytic
#: code:addons/analytic/analytic.py:261
#, python-format
msgid "%s (copy)"
-msgstr ""
+msgstr "%s (Kopie)"
#. module: analytic
#: model:ir.model,name:analytic.model_account_analytic_line
msgid "Analytic Line"
-msgstr "Analytische Buchungszeile"
+msgstr "Kostenstellen Buchung"
#. module: analytic
#: field:account.analytic.account,description:0
@@ -128,17 +133,17 @@ msgstr "Buchungstext"
#. module: analytic
#: field:account.analytic.account,name:0
msgid "Account/Contract Name"
-msgstr ""
+msgstr "Kostenstelle/Vertrag Bezeichnung"
#. module: analytic
#: field:account.analytic.account,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Ungelesene Nachrichten"
#. module: analytic
#: constraint:account.analytic.account:0
msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Kostenstellen anlegen."
#. module: analytic
#: field:account.analytic.account,company_id:0
@@ -149,12 +154,12 @@ msgstr "Unternehmen"
#. module: analytic
#: view:account.analytic.account:0
msgid "Renewal"
-msgstr ""
+msgstr "Erneuerung"
#. module: analytic
#: help:account.analytic.account,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Nachrichten und Kommunikation"
#. module: analytic
#: help:account.analytic.account,quantity_max:0
@@ -162,6 +167,8 @@ msgid ""
"Sets the higher limit of time to work on the contract, based on the "
"timesheet. (for instance, number of hours in a limited support contract.)"
msgstr ""
+"Tragen Sie die für diesen Vertrag maximal abrechenbare Zeit, die sich aus "
+"den Stundenzetteln ergibt (z.B. Kontingent Supportstunden)."
#. module: analytic
#: code:addons/analytic/analytic.py:153
@@ -182,7 +189,7 @@ msgstr ""
#. module: analytic
#: field:account.analytic.account,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Ist ein Follower"
#. module: analytic
#: field:account.analytic.line,user_id:0
@@ -211,53 +218,62 @@ msgid ""
"The special type 'Template of Contract' allows you to define a template with "
"default data that you can reuse easily."
msgstr ""
+"Wenn Sie 'Ansicht' als Typ einer Kostenstelle auswählen, darf auf dieser "
+"Kostenstelle nicht gebucht werden.\n"
+"Der Typ 'Kostenstelle' steht für die normalen internen Kostenstellen, die "
+"nur in der Buchhaltung verwendet werden.\n"
+"Wenn Sie 'Vertrag oder Projekt' auswählen, können Sie die Einstellungen zur "
+"Vertragsdauer und zur Abrechnung \n"
+"verwalten. In einer 'Vertrag Vorlage' hinterlegen Sie Standard-Daten, die "
+"Sie immer wieder verwenden können."
#. module: analytic
#: field:account.analytic.account,message_comment_ids:0
#: help:account.analytic.account,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Kommentare und EMails"
#. module: analytic
#: field:account.analytic.account,partner_id:0
msgid "Customer"
-msgstr ""
+msgstr "Kunde"
#. module: analytic
#: field:account.analytic.account,child_complete_ids:0
msgid "Account Hierarchy"
-msgstr "Kontenhierarchie"
+msgstr "Kostenstellen Hierachie"
#. module: analytic
#: field:account.analytic.account,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Mitteilungen"
#. module: analytic
#: constraint:account.analytic.line:0
msgid "You cannot create analytic line on view account."
msgstr ""
+"Sie können keine Kostenstellen buchen, die als Ansicht definiert wurde"
#. module: analytic
#: view:account.analytic.account:0
msgid "Contract Information"
-msgstr ""
+msgstr "Vertrag Informationen"
#. module: analytic
#: field:account.analytic.account,template_id:0
#: selection:account.analytic.account,type:0
msgid "Template of Contract"
-msgstr ""
+msgstr "Vertrag Vorlage"
#. module: analytic
#: field:account.analytic.account,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Zusammenfassung"
#. module: analytic
#: field:account.analytic.account,quantity_max:0
msgid "Prepaid Service Units"
-msgstr ""
+msgstr "Servicekontingent"
#. module: analytic
#: field:account.analytic.account,credit:0
@@ -273,12 +289,12 @@ msgstr "Betrag"
#: code:addons/analytic/analytic.py:321
#, python-format
msgid "Contract for %s has been created ."
-msgstr ""
+msgstr "Vertrag für %s wurde erstellt ."
#. module: analytic
#: view:account.analytic.account:0
msgid "Terms and Conditions"
-msgstr ""
+msgstr "Bedingungen und Konditionen"
#. module: analytic
#: selection:account.analytic.account,state:0
@@ -288,7 +304,7 @@ msgstr "Abgebrochen"
#. module: analytic
#: selection:account.analytic.account,type:0
msgid "Analytic View"
-msgstr ""
+msgstr "Kostenstelle Ansicht"
#. module: analytic
#: field:account.analytic.account,balance:0
@@ -298,18 +314,18 @@ msgstr "Saldo"
#. module: analytic
#: help:account.analytic.account,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Benachrichtigung erfordert handeln"
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "To Renew"
-msgstr ""
+msgstr "Zu Erneuern"
#. module: analytic
#: field:account.analytic.account,quantity:0
#: field:account.analytic.line,unit_amount:0
msgid "Quantity"
-msgstr "Menge"
+msgstr "Anzahl"
#. module: analytic
#: field:account.analytic.account,date:0
@@ -319,28 +335,28 @@ msgstr "Ende Datum"
#. module: analytic
#: field:account.analytic.account,code:0
msgid "Reference"
-msgstr ""
+msgstr "Kostenstellennummer"
#. module: analytic
#: code:addons/analytic/analytic.py:153
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Fehler !"
#. module: analytic
#: model:res.groups,name:analytic.group_analytic_accounting
msgid "Analytic Accounting"
-msgstr "Analytische Konten"
+msgstr "Kostenstellenrechnung"
#. module: analytic
#: selection:account.analytic.account,type:0
msgid "Contract or Project"
-msgstr ""
+msgstr "Vertrag oder Projekt"
#. module: analytic
#: field:account.analytic.account,complete_name:0
msgid "Full Account Name"
-msgstr "Vollständige Kontobezeichnung"
+msgstr "Bezeichnung der Kostenstelle"
#. module: analytic
#: view:account.analytic.account:0
@@ -348,7 +364,7 @@ msgstr "Vollständige Kontobezeichnung"
#: field:account.analytic.line,account_id:0
#: model:ir.model,name:analytic.model_account_analytic_account
msgid "Analytic Account"
-msgstr "Analytisches Konto"
+msgstr "Kostenstelle"
#. module: analytic
#: field:account.analytic.account,currency_id:0
@@ -361,16 +377,19 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Beinhaltet die Chatter Zusammenfassung (Anzahl der Nachrichten, ...). Diese "
+"Zusammenfassung ist im HTML-Format, um in Kanban Karten Ansichten eingefügt "
+"zu werden."
#. module: analytic
#: field:account.analytic.account,type:0
msgid "Type of Account"
-msgstr ""
+msgstr "Typ der Kostenstelle"
#. module: analytic
#: field:account.analytic.account,date_start:0
msgid "Start Date"
-msgstr ""
+msgstr "Start Datum"
#. module: analytic
#: help:account.analytic.line,amount:0
@@ -385,7 +404,7 @@ msgstr ""
#. module: analytic
#: field:account.analytic.account,line_ids:0
msgid "Analytic Entries"
-msgstr "Analytische Buchungen"
+msgstr "Kostenstellen Buchungen"
#~ msgid "Account Name"
#~ msgstr "Kontenbezeichnung"
diff --git a/addons/analytic_contract_hr_expense/i18n/de.po b/addons/analytic_contract_hr_expense/i18n/de.po
new file mode 100644
index 00000000000..5ca42f6dc52
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/i18n/de.po
@@ -0,0 +1,73 @@
+# German 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-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-08 10:51+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
+"Language-Team: German \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "oder Ansicht"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "expenses"
+msgstr "Spesen"
+
+#. module: analytic_contract_hr_expense
+#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Kostenstelle"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#, python-format
+msgid "Expenses to Invoice of %s"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#, python-format
+msgid "Expenses of %s"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,expense_invoiced:0
+#: field:account.analytic.account,expense_to_invoice:0
+#: field:account.analytic.account,remaining_expense:0
+msgid "unknown"
+msgstr "unbekannt"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,est_expenses:0
+msgid "Estimation of Expenses to Invoice"
+msgstr "Geplante Spesenabrechnung"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,charge_expenses:0
+msgid "Charge Expenses"
+msgstr "Weiterberechnung Spesen"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "=> Rechnung"
diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po
index 7b0cc8483dd..595cc4bca3e 100644
--- a/addons/analytic_user_function/i18n/de.po
+++ b/addons/analytic_user_function/i18n/de.po
@@ -7,44 +7,45 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-01-13 19:15+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp \n"
+"PO-Revision-Date: 2012-12-08 11:12+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_account_analytic_line
msgid "Analytic Line"
-msgstr ""
+msgstr "Kostenstellen Buchung"
#. module: analytic_user_function
#: view:account.analytic.account:0
msgid "Invoice Price Rate per User"
-msgstr ""
+msgstr "Abrechenbare Stundensätze der Benutzer"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,product_id:0
msgid "Service"
-msgstr ""
+msgstr "Dienstleistung"
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
msgid "Price per User"
-msgstr ""
+msgstr "Preis nach Benutzer"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,price:0
msgid "Price"
-msgstr ""
+msgstr "Preis"
#. module: analytic_user_function
#: help:analytic.user.funct.grid,price:0
msgid "Price per hour for this user."
-msgstr ""
+msgstr "Preis pro Stunde für Benutzer"
#. module: analytic_user_function
#: field:analytic.user.funct.grid,account_id:0
@@ -57,12 +58,12 @@ msgstr "Analytisches Konto"
#: code:addons/analytic_user_function/analytic_user_function.py:135
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Fehler !"
#. module: analytic_user_function
#: view:analytic.user.funct.grid:0
msgid "Invoicing Data"
-msgstr ""
+msgstr "Rechnungsdaten"
#. module: analytic_user_function
#: field:account.analytic.account,user_product_ids:0
@@ -78,11 +79,15 @@ msgid ""
" of the default values when invoicing the "
"customer."
msgstr ""
+"Anlegen einer spezifischen Dienstleistung (z.B. Senior Consultant)\n"
+" und Preis für einige Benutzer, um diese Daten "
+"anstelle der Standard Werte\n"
+" für die Abrechnung an Kunden zu benutzen."
#. module: analytic_user_function
#: field:analytic.user.funct.grid,uom_id:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "Mengeneinheit"
#. module: analytic_user_function
#: code:addons/analytic_user_function/analytic_user_function.py:107
@@ -105,6 +110,9 @@ msgid ""
" specific user. This allows to set invoicing\n"
" conditions for a group of contracts."
msgstr ""
+"OpenERP durchsucht rekursiv die übergeordneten Kostenstellen, um spezifische "
+"Konditionen für spezifische Benutzer zu überprüfen. Dieses ermöglicht die "
+"Hinterlegung der Abrechnungskonditionen für bestimmte Vertragsgruppen."
#. module: analytic_user_function
#: field:analytic.user.funct.grid,user_id:0
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index e26cd7b3c04..2e4133d84fc 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -36,7 +36,7 @@ from itertools import groupby
from operator import itemgetter
-FIELD_STATES = [('clear', 'Clear'), ('anonymized', 'Anonymized'), ('not_existing', 'Not Existing')]
+FIELD_STATES = [('clear', 'Clear'), ('anonymized', 'Anonymized'), ('not_existing', 'Not Existing'), ('new', 'New')]
ANONYMIZATION_STATES = FIELD_STATES + [('unstable', 'Unstable')]
WIZARD_ANONYMIZATION_STATES = [('clear', 'Clear'), ('anonymized', 'Anonymized'), ('unstable', 'Unstable')]
ANONYMIZATION_HISTORY_STATE = [('started', 'Started'), ('done', 'Done'), ('in_exception', 'Exception occured')]
diff --git a/addons/association/i18n/it.po b/addons/association/i18n/it.po
index ac9867921fa..abe59bf8ab7 100644
--- a/addons/association/i18n/it.po
+++ b/addons/association/i18n/it.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: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-17 07:43+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2012-12-09 20:34+0000\n"
+"Last-Translator: Sergio Corato \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-10-30 05:33+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: association
#: field:profile.association.config.install_modules_wizard,wiki:0
@@ -71,6 +71,8 @@ msgid ""
"Tracks and manages employee expenses, and can automatically re-invoice "
"clients if the expenses are project-related."
msgstr ""
+"Traccia e gestisce le spese dei dipendenti e può ri-generare automaticamente "
+"fatture se le spese sono collegate al progetto."
#. module: association
#: help:profile.association.config.install_modules_wizard,project_gtd:0
@@ -101,7 +103,7 @@ msgstr "Monitoraggio spese"
#: model:ir.actions.act_window,name:association.action_config_install_module
#: view:profile.association.config.install_modules_wizard:0
msgid "Association Application Configuration"
-msgstr ""
+msgstr "Configurazione Applicazione Associazione"
#. module: association
#: help:profile.association.config.install_modules_wizard,wiki:0
@@ -109,6 +111,8 @@ msgid ""
"Lets you create wiki pages and page groups in order to keep track of "
"business knowledge and share it with and between your employees."
msgstr ""
+"Permette di creare pagine wiki e gruppi di pagine per tenere traccia delle "
+"conoscenze aziendali e condividerle con e tra gli dipendenti."
#. module: association
#: help:profile.association.config.install_modules_wizard,project:0
@@ -116,6 +120,8 @@ msgid ""
"Helps you manage your projects and tasks by tracking them, generating "
"plannings, etc..."
msgstr ""
+"Aiuta a gestire i progetti e le attività attraverso il loro tracciamento, "
+"pianificazione, ecc..."
#. module: association
#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index 5e138203dc3..ff2ad7f818d 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -83,11 +83,11 @@ class audittrail_rule(osv.osv):
"domain": "[('object_id','=', " + str(thisrule.object_id.id) + "), ('res_id', '=', active_id)]"
}
- action_id = obj_action.create(cr, uid, val)
+ action_id = obj_action.create(cr, SUPERUSER_ID, val)
self.write(cr, uid, [thisrule.id], {"state": "subscribed", "action_id": action_id})
keyword = 'client_action_relate'
value = 'ir.actions.act_window,' + str(action_id)
- res = obj_model.ir_set(cr, uid, 'action', keyword, 'View_log_' + thisrule.object_id.model, [thisrule.object_id.model], value, replace=True, isobject=True, xml_id=False)
+ res = obj_model.ir_set(cr, SUPERUSER_ID, 'action', keyword, 'View_log_' + thisrule.object_id.model, [thisrule.object_id.model], value, replace=True, isobject=True, xml_id=False)
#End Loop
return True
@@ -109,7 +109,7 @@ class audittrail_rule(osv.osv):
setattr(function[0], function[1], function[2])
w_id = obj_action.search(cr, uid, [('name', '=', 'View Log'), ('res_model', '=', 'audittrail.log'), ('src_model', '=', thisrule.object_id.model)])
if w_id:
- obj_action.unlink(cr, uid, w_id)
+ obj_action.unlink(cr, SUPERUSER_ID, w_id)
value = "ir.actions.act_window" + ',' + str(w_id[0])
val_id = ir_values_obj.search(cr, uid, [('model', '=', thisrule.object_id.model), ('value', '=', value)])
if val_id:
diff --git a/addons/auth_anonymous/i18n/fr.po b/addons/auth_anonymous/i18n/fr.po
new file mode 100644
index 00000000000..32042501573
--- /dev/null
+++ b/addons/auth_anonymous/i18n/fr.po
@@ -0,0 +1,30 @@
+# 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-12-07 10:27+0000\n"
+"Last-Translator: Quentin THEURET \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-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: auth_anonymous
+#. openerp-web
+#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
+#, python-format
+msgid "Login"
+msgstr "Connexion"
+
+#. module: auth_anonymous
+#: model:res.groups,name:auth_anonymous.group_anonymous
+msgid "Anonymous Group"
+msgstr ""
diff --git a/addons/auth_anonymous/i18n/hr.po b/addons/auth_anonymous/i18n/hr.po
new file mode 100644
index 00000000000..4e910f11324
--- /dev/null
+++ b/addons/auth_anonymous/i18n/hr.po
@@ -0,0 +1,30 @@
+# Croatian 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-12-09 19:39+0000\n"
+"Last-Translator: Goran Kliska \n"
+"Language-Team: Croatian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: auth_anonymous
+#. openerp-web
+#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
+#, python-format
+msgid "Login"
+msgstr "Prijava"
+
+#. module: auth_anonymous
+#: model:res.groups,name:auth_anonymous.group_anonymous
+msgid "Anonymous Group"
+msgstr "Anonimna grupa"
diff --git a/addons/auth_oauth/i18n/fr.po b/addons/auth_oauth/i18n/fr.po
new file mode 100644
index 00000000000..c6aaa187365
--- /dev/null
+++ b/addons/auth_oauth/i18n/fr.po
@@ -0,0 +1,135 @@
+# 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-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-07 10:28+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-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,validation_endpoint:0
+msgid "Validation URL"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,auth_endpoint:0
+msgid "Authentication URL"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,name:0
+msgid "Provider name"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,scope:0
+msgid "Scope"
+msgstr ""
+
+#. module: auth_oauth
+#: field:res.users,oauth_provider_id:0
+msgid "OAuth Provider"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,css_class:0
+msgid "CSS class"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,body:0
+msgid "Body"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,sequence:0
+msgid "unknown"
+msgstr ""
+
+#. module: auth_oauth
+#: field:res.users,oauth_access_token:0
+msgid "OAuth Access Token"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,client_id:0
+#: field:base.config.settings,auth_oauth_facebook_client_id:0
+#: field:base.config.settings,auth_oauth_google_client_id:0
+msgid "Client ID"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.ui.menu,name:auth_oauth.menu_oauth_providers
+msgid "OAuth Providers"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_auth_oauth_provider
+msgid "OAuth2 provider"
+msgstr ""
+
+#. module: auth_oauth
+#: field:res.users,oauth_uid:0
+msgid "OAuth User ID"
+msgstr ""
+
+#. module: auth_oauth
+#: field:base.config.settings,auth_oauth_facebook_enabled:0
+msgid "Allow users to sign in with Facebook"
+msgstr ""
+
+#. module: auth_oauth
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr ""
+
+#. module: auth_oauth
+#: help:res.users,oauth_uid:0
+msgid "Oauth Provider user_id"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,data_endpoint:0
+msgid "Data URL"
+msgstr ""
+
+#. module: auth_oauth
+#: view:auth.oauth.provider:0
+msgid "arch"
+msgstr ""
+
+#. module: auth_oauth
+#: model:ir.actions.act_window,name:auth_oauth.action_oauth_provider
+msgid "Providers"
+msgstr ""
+
+#. module: auth_oauth
+#: field:base.config.settings,auth_oauth_google_enabled:0
+msgid "Allow users to sign in with Google"
+msgstr ""
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,enabled:0
+msgid "Allowed"
+msgstr ""
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index d2429e8dfd2..baf1a8f0b28 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -57,18 +57,17 @@ class Controller(openerp.addons.web.http.Controller):
def signup(self, req, dbname, token, name, login, password):
""" sign up a user (new or existing)"""
values = {'name': name, 'login': login, 'password': password}
- return self._signup_with_values(req, dbname, token, values)
+ try:
+ self._signup_with_values(req, dbname, token, values)
+ except SignupError, e:
+ return {'error': openerp.tools.exception_to_unicode(e)}
+ return {}
def _signup_with_values(self, req, dbname, token, values):
registry = RegistryManager.get(dbname)
with registry.cursor() as cr:
res_users = registry.get('res.users')
- try:
- res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
- except SignupError, e:
- return {'error': openerp.tools.exception_to_unicode(e)}
- cr.commit()
- return {}
+ res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
@openerp.addons.web.http.httprequest
def reset_password(self, req, dbname, login):
diff --git a/addons/auth_signup/i18n/hr.po b/addons/auth_signup/i18n/hr.po
new file mode 100644
index 00000000000..a95bba3f1c3
--- /dev/null
+++ b/addons/auth_signup/i18n/hr.po
@@ -0,0 +1,258 @@
+# Croatian 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-12-04 14:41+0000\n"
+"PO-Revision-Date: 2012-12-09 19:58+0000\n"
+"Last-Translator: Goran Kliska \n"
+"Language-Team: Croatian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr "Dozvoli prijavu eksternim korisnicima"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:16
+#, python-format
+msgid "Confirm Password"
+msgstr "Potvrdi lozinku"
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr "Dozvoli prijavu svima ili samo pozvanim korisnicima"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:248
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr "Korisnik nema e-mail adresu."
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25
+#, python-format
+msgid "Reset password"
+msgstr "Resetiraj lozinku"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr "Korisnik predložak za sve korisnike kreirane prijavom."
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr "Promjena lozinke"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr "Molim upišite lozinku i potvrdu."
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send an email to the user to (re)set their password."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
+#, python-format
+msgid "Sign Up"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "New"
+msgstr "Nova(i)"
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.reset_password_email
+msgid ""
+"\n"
+"A password reset was requested for the OpenERP account linked to this "
+"email.
\n"
+"\n"
+"You may change your password by following this link .
\n"
+"\n"
+"Note: If you do not expect this, you can safely ignore this email.
"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a name."
+msgstr "Unesite ime"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr "Korisnici"
+
+#. module: auth_signup
+#: field:res.partner,signup_url:0
+msgid "Signup URL"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a username."
+msgstr "Upišite korisničko ime"
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Active"
+msgstr "Aktivan"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username"
+msgstr "Korisničko ime"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
+#, python-format
+msgid "Name"
+msgstr "Naziv"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Please enter a username or email address."
+msgstr "Upišite korisničko ime ili email adresu."
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr "Promjena lozinke"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
+#, python-format
+msgid "Username (Email)"
+msgstr "Korisničko ime (e-mail)"
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:21
+#, python-format
+msgid "Log in"
+msgstr "Prijava"
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr "Token prijave je ispravan"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#, python-format
+msgid "Login"
+msgstr "Prijava"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr "Lozinke nisu iste, pokušajte ponovo."
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#, python-format
+msgid "No database selected !"
+msgstr "Nije odabrana baza podataka"
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "Promijeni lozinku"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
+msgstr "Omogući promjenu lozinke na stranici prijave"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24
+#, python-format
+msgid "Back to Login"
+msgstr "Nazad na prijavu"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
+#, python-format
+msgid "Sign up"
+msgstr "Prijava"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: auth_signup
+#: field:res.partner,signup_token:0
+msgid "Signup Token"
+msgstr "Token prijave"
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 8380cd8b23f..5fd7917f444 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -254,6 +254,6 @@ class res_users(osv.Model):
# overridden to automatically invite user to sign up
user_id = super(res_users, self).create(cr, uid, values, context=context)
user = self.browse(cr, uid, user_id, context=context)
- if user.email:
+ if context and context.get('reset_password') and user.email:
user.action_reset_password()
return user_id
diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml
index 90729c54285..7f91d970b50 100644
--- a/addons/auth_signup/res_users_view.xml
+++ b/addons/auth_signup/res_users_view.xml
@@ -2,6 +2,11 @@
+
+
+ {'reset_password': True}
+
+
user.form.state
res.users
@@ -22,7 +27,7 @@
-
+
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 77018898c84..ec62b24dd7c 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -2,43 +2,6 @@
-
-
-
- CRM Meeting: Mark read
- True
- ir.actions.server
-
- code
- self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
-
-
- action_crm_meeting_read
-
-
- action
-
- crm.meeting
- client_action_multi
-
-
-
- CRM Meeting: Mark unread
- True
- ir.actions.server
-
- code
- self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
-
-
- action_crm_meeting_unread
-
-
- action
-
- crm.meeting
- client_action_multi
-
diff --git a/addons/base_calendar/i18n/pt_BR.po b/addons/base_calendar/i18n/pt_BR.po
index de4755bc3f8..b3eba080425 100644
--- a/addons/base_calendar/i18n/pt_BR.po
+++ b/addons/base_calendar/i18n/pt_BR.po
@@ -8,14 +8,15 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-01 11:25+0000\n"
-"Last-Translator: Luiz Fernando M.França \n"
+"PO-Revision-Date: 2012-12-07 22:49+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"\n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:50+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: base_calendar
#: selection:calendar.alarm,trigger_related:0
@@ -364,6 +365,9 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:388
@@ -518,7 +522,7 @@ msgstr "Email"
#. module: base_calendar
#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
msgid "CRM Meeting: Mark unread"
-msgstr ""
+msgstr "CRM Reunião : Marcar como não lida"
#. module: base_calendar
#: selection:calendar.alarm,state:0
@@ -1061,7 +1065,7 @@ msgstr "Intervalo"
#. module: base_calendar
#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
msgid "CRM Meeting: Mark read"
-msgstr ""
+msgstr "CRM Reunião: Marcar como lida"
#. module: base_calendar
#: selection:calendar.event,week_list:0
@@ -1173,7 +1177,7 @@ msgstr "Detalhes do Lembrete"
#. module: base_calendar
#: model:crm.meeting.type,name:base_calendar.categ_meet3
msgid "Off-site Meeting"
-msgstr ""
+msgstr "Reunião Externa"
#. module: base_calendar
#: view:crm.meeting:0
diff --git a/addons/base_crypt/i18n/fr.po b/addons/base_crypt/i18n/fr.po
index 0b79cb416de..f22023e61bc 100644
--- a/addons/base_crypt/i18n/fr.po
+++ b/addons/base_crypt/i18n/fr.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-12-07 10:31+0000\n"
+"Last-Translator: WANTELLET Sylvain \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-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: base_crypt
#: model:ir.model,name:base_crypt.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
#, python-format
#~ msgid "Error"
diff --git a/addons/base_crypt/i18n/hr.po b/addons/base_crypt/i18n/hr.po
index ec695b9a285..c971ae1bf00 100644
--- a/addons/base_crypt/i18n/hr.po
+++ b/addons/base_crypt/i18n/hr.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-12-19 12:11+0000\n"
-"Last-Translator: Tomislav Bosnjakovic \n"
+"PO-Revision-Date: 2012-12-09 19:40+0000\n"
+"Last-Translator: Goran Kliska \n"
"Language-Team: Croatian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: base_crypt
#: model:ir.model,name:base_crypt.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Korisnici"
#~ msgid ""
#~ "This module replaces the cleartext password in the database with a password "
diff --git a/addons/base_crypt/i18n/id.po b/addons/base_crypt/i18n/id.po
new file mode 100644
index 00000000000..035480b7a84
--- /dev/null
+++ b/addons/base_crypt/i18n/id.po
@@ -0,0 +1,23 @@
+# Indonesian 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-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-09 08:46+0000\n"
+"Last-Translator: Budhi Hartono \n"
+"Language-Team: Indonesian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "Users"
+msgstr "Pengguna"
diff --git a/addons/base_crypt/i18n/ru.po b/addons/base_crypt/i18n/ru.po
index 084cc086f5f..9701a6ba556 100644
--- a/addons/base_crypt/i18n/ru.po
+++ b/addons/base_crypt/i18n/ru.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-03-15 23:59+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-12-07 08:15+0000\n"
+"Last-Translator: Denis Karataev \n"
"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: base_crypt
#: model:ir.model,name:base_crypt.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Пользователи"
#~ msgid "res.users"
#~ msgstr "res.users"
diff --git a/addons/base_gengo/__openerp__.py b/addons/base_gengo/__openerp__.py
index cc9183f6851..aa1be78321f 100644
--- a/addons/base_gengo/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -24,7 +24,7 @@
'category': 'Tools',
'description': """
Automated Translations through Gengo API
-----------------------------------------
+========================================
This module will install passive scheduler job for automated translations
using the Gengo API. To activate it, you must
diff --git a/addons/base_gengo/i18n/hr.po b/addons/base_gengo/i18n/hr.po
new file mode 100644
index 00000000000..128c691bef4
--- /dev/null
+++ b/addons/base_gengo/i18n/hr.po
@@ -0,0 +1,249 @@
+# Croatian 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-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-09 20:02+0000\n"
+"Last-Translator: Goran Kliska \n"
+"Language-Team: Croatian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Comments for Translator"
+msgstr "Komentari prevoditelju"
+
+#. module: base_gengo
+#: field:ir.translation,job_id:0
+msgid "Gengo Job ID"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "This language is not supported by the Gengo translation services."
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_comment:0
+msgid "Comments"
+msgstr "Komentari"
+
+#. module: base_gengo
+#: field:res.company,gengo_private_key:0
+msgid "Gengo Private Key"
+msgstr "Gengo privatni ključ"
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_base_gengo_translations
+msgid "base.gengo.translations"
+msgstr ""
+
+#. module: base_gengo
+#: help:res.company,gengo_auto_approve:0
+msgid "Jobs are Automatically Approved by Gengo."
+msgstr ""
+
+#. module: base_gengo
+#: field:base.gengo.translations,lang_id:0
+msgid "Language"
+msgstr "Jezik"
+
+#. module: base_gengo
+#: field:ir.translation,gengo_comment:0
+msgid "Comments & Activity Linked to Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:124
+#, python-format
+msgid "Gengo Sync Translation (Response)"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:72
+#, python-format
+msgid ""
+"Gengo `Public Key` or `Private Key` are missing. Enter your Gengo "
+"authentication parameters under `Settings > Companies > Gengo Parameters`."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Translation By Machine"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:155
+#, python-format
+msgid ""
+"%s\n"
+"\n"
+"--\n"
+" Commented on %s by %s."
+msgstr ""
+
+#. module: base_gengo
+#: field:ir.translation,gengo_translation:0
+msgid "Gengo Translation Service Level"
+msgstr ""
+
+#. module: base_gengo
+#: constraint:ir.translation:0
+msgid ""
+"The Gengo translation service selected is not supported for this language."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Standard"
+msgstr "Standardni"
+
+#. module: base_gengo
+#: help:ir.translation,gengo_translation:0
+msgid ""
+"You can select here the service level you want for an automatic translation "
+"using Gengo."
+msgstr ""
+
+#. module: base_gengo
+#: field:base.gengo.translations,restart_send_job:0
+msgid "Restart Sending Job"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "To Approve In Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Private Key"
+msgstr "Privatni ključ"
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Public Key"
+msgstr "Javni ključ"
+
+#. module: base_gengo
+#: field:res.company,gengo_public_key:0
+msgid "Gengo Public Key"
+msgstr "Gengo Javni ključ"
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:123
+#, python-format
+msgid "Gengo Sync Translation (Request)"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Translations"
+msgstr "Prijevodi"
+
+#. module: base_gengo
+#: field:res.company,gengo_auto_approve:0
+msgid "Auto Approve Translation ?"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.actions.act_window,name:base_gengo.action_wizard_base_gengo_translations
+#: model:ir.ui.menu,name:base_gengo.menu_action_wizard_base_gengo_translations
+msgid "Gengo: Manual Request of Translation"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/ir_translation.py:62
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:109
+#, python-format
+msgid "Gengo Authentication Error"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_res_company
+msgid "Companies"
+msgstr "Organizacije"
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid ""
+"Note: If the translation state is 'In Progress', it means that the "
+"translation has to be approved to be uploaded in this system. You are "
+"supposed to do that directly by using your Gengo Account"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:82
+#, python-format
+msgid ""
+"Gengo connection failed with this message:\n"
+"``%s``"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Gengo Parameters"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Send"
+msgstr "Pošalji"
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Ultra"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_ir_translation
+msgid "ir.translation"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Gengo Translation Service"
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Pro"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Gengo Request Form"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "Warning"
+msgstr "Upozoranje"
+
+#. module: base_gengo
+#: help:res.company,gengo_comment:0
+msgid ""
+"This comment will be automatically be enclosed in each an every request sent "
+"to Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "or"
+msgstr ""
diff --git a/addons/base_gengo/i18n/nb.po b/addons/base_gengo/i18n/nb.po
new file mode 100644
index 00000000000..935f150894c
--- /dev/null
+++ b/addons/base_gengo/i18n/nb.po
@@ -0,0 +1,256 @@
+# Norwegian Bokmal 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-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-06 10:25+0000\n"
+"Last-Translator: Kaare Pettersen \n"
+"Language-Team: Norwegian Bokmal \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Comments for Translator"
+msgstr "Kommentarer til oversetter."
+
+#. module: base_gengo
+#: field:ir.translation,job_id:0
+msgid "Gengo Job ID"
+msgstr "Gengo jobb ID."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "This language is not supported by the Gengo translation services."
+msgstr "Dette språket er ikke støttet av Gengo oversettings tjenester."
+
+#. module: base_gengo
+#: field:res.company,gengo_comment:0
+msgid "Comments"
+msgstr "Kommentarer."
+
+#. module: base_gengo
+#: field:res.company,gengo_private_key:0
+msgid "Gengo Private Key"
+msgstr "Gengo privat nøkkel."
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_base_gengo_translations
+msgid "base.gengo.translations"
+msgstr "Base.Gengo.Oversettelser."
+
+#. module: base_gengo
+#: help:res.company,gengo_auto_approve:0
+msgid "Jobs are Automatically Approved by Gengo."
+msgstr "Jobber godkjennes automatisk ved Gengo."
+
+#. module: base_gengo
+#: field:base.gengo.translations,lang_id:0
+msgid "Language"
+msgstr "Språk."
+
+#. module: base_gengo
+#: field:ir.translation,gengo_comment:0
+msgid "Comments & Activity Linked to Gengo"
+msgstr "Kommentarer og aktivitet knyttet til Gengo."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:124
+#, python-format
+msgid "Gengo Sync Translation (Response)"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:72
+#, python-format
+msgid ""
+"Gengo `Public Key` or `Private Key` are missing. Enter your Gengo "
+"authentication parameters under `Settings > Companies > Gengo Parameters`."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Translation By Machine"
+msgstr "Oversetting av maskin."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:155
+#, python-format
+msgid ""
+"%s\n"
+"\n"
+"--\n"
+" Commented on %s by %s."
+msgstr ""
+"%s\n"
+"\n"
+"--\n"
+"Kommentarer på %s by %s."
+
+#. module: base_gengo
+#: field:ir.translation,gengo_translation:0
+msgid "Gengo Translation Service Level"
+msgstr "Gengo Oversettelse tjeneste nivå."
+
+#. module: base_gengo
+#: constraint:ir.translation:0
+msgid ""
+"The Gengo translation service selected is not supported for this language."
+msgstr ""
+"Den Gengo oversettelses tjeneste som er valgt støttes ikke for dette språket."
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Standard"
+msgstr "Standard"
+
+#. module: base_gengo
+#: help:ir.translation,gengo_translation:0
+msgid ""
+"You can select here the service level you want for an automatic translation "
+"using Gengo."
+msgstr ""
+"Du kan velge her tjenestenivået du ønsker for en automatisk oversettelse ved "
+"hjelp av Gengo."
+
+#. module: base_gengo
+#: field:base.gengo.translations,restart_send_job:0
+msgid "Restart Sending Job"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "To Approve In Gengo"
+msgstr "Slik godkjenner du I Gengo."
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Private Key"
+msgstr "Privat nøkkel."
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Public Key"
+msgstr "Offentlig nøkkel."
+
+#. module: base_gengo
+#: field:res.company,gengo_public_key:0
+msgid "Gengo Public Key"
+msgstr "Gengo offentlig nøkkel."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:123
+#, python-format
+msgid "Gengo Sync Translation (Request)"
+msgstr "Gengo synkronisering oversettelse (Forespørsel)"
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Translations"
+msgstr "Oversettelser."
+
+#. module: base_gengo
+#: field:res.company,gengo_auto_approve:0
+msgid "Auto Approve Translation ?"
+msgstr "Automatisk godkjenning oversettelse."
+
+#. module: base_gengo
+#: model:ir.actions.act_window,name:base_gengo.action_wizard_base_gengo_translations
+#: model:ir.ui.menu,name:base_gengo.menu_action_wizard_base_gengo_translations
+msgid "Gengo: Manual Request of Translation"
+msgstr "Gengo: Manuell forespørsel av oversetting."
+
+#. module: base_gengo
+#: code:addons/base_gengo/ir_translation.py:62
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:109
+#, python-format
+msgid "Gengo Authentication Error"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_res_company
+msgid "Companies"
+msgstr "Firmaer."
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid ""
+"Note: If the translation state is 'In Progress', it means that the "
+"translation has to be approved to be uploaded in this system. You are "
+"supposed to do that directly by using your Gengo Account"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:82
+#, python-format
+msgid ""
+"Gengo connection failed with this message:\n"
+"``%s``"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Gengo Parameters"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Send"
+msgstr "Send."
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Ultra"
+msgstr "Ultra."
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_ir_translation
+msgid "ir.translation"
+msgstr "Ir.Oversettelse."
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Gengo Translation Service"
+msgstr "Gengo oversettelse tjeneste."
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Pro"
+msgstr "Profesjonell."
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Gengo Request Form"
+msgstr "Gengo forespørsel form."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "Warning"
+msgstr "Advarsel."
+
+#. module: base_gengo
+#: help:res.company,gengo_comment:0
+msgid ""
+"This comment will be automatically be enclosed in each an every request sent "
+"to Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Cancel"
+msgstr "Avbryt."
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "or"
+msgstr "Eller."
diff --git a/addons/base_import/i18n/fr.po b/addons/base_import/i18n/fr.po
index 520af932a87..c851c081b58 100644
--- a/addons/base_import/i18n/fr.po
+++ b/addons/base_import/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-29 15:28+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-12-07 10:31+0000\n"
+"Last-Translator: Numérigraphe \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-11-30 05:08+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: base_import
#. openerp-web
@@ -1016,7 +1016,7 @@ msgstr ""
#: code:addons/base_import/static/src/xml/import.xml:170
#, python-format
msgid "CSV file for Products"
-msgstr ""
+msgstr "Fichier CSV des articles"
#. module: base_import
#. openerp-web
diff --git a/addons/base_import/i18n/nb.po b/addons/base_import/i18n/nb.po
new file mode 100644
index 00000000000..415341ab9f2
--- /dev/null
+++ b/addons/base_import/i18n/nb.po
@@ -0,0 +1,1172 @@
+# Norwegian Bokmal 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-12-07 10:50+0000\n"
+"Last-Translator: Kaare Pettersen \n"
+"Language-Team: Norwegian Bokmal \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:420
+#, python-format
+msgid "Get all possible values"
+msgstr "Få alle mulige verdier."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:71
+#, python-format
+msgid "Need to import data from an other application?"
+msgstr "Behov for å importere data fra en annen applikasjon?"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:163
+#, python-format
+msgid ""
+"When you use External IDs, you can import CSV files \n"
+" with the \"External ID\" column to define the "
+"External \n"
+" ID of each record you import. Then, you will be able "
+"\n"
+" to make a reference to that record with columns like "
+"\n"
+" \"Field/External ID\". The following two CSV files "
+"give \n"
+" you an example for Products and their Categories."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:271
+#, python-format
+msgid ""
+"How to export/import different tables from an SQL \n"
+" application to OpenERP?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:310
+#, python-format
+msgid "Relation Fields"
+msgstr "Forhold feltene."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:142
+#, python-format
+msgid ""
+"Country/Database ID: the unique OpenERP ID for a \n"
+" record, defined by the ID postgresql column"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:155
+#, python-format
+msgid ""
+"Use \n"
+" Country/Database ID: You should rarely use this \n"
+" notation. It's mostly used by developers as it's "
+"main \n"
+" advantage is to never have conflicts (you may have \n"
+" several records with the same name, but they always "
+"\n"
+" have a unique Database ID)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:146
+#, python-format
+msgid ""
+"For the country \n"
+" Belgium, you can use one of these 3 ways to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:303
+#, python-format
+msgid "company_1,Bigees,True"
+msgstr "Selskapet_1,Bigees,Sant."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
+msgid "base_import.tests.models.m2o"
+msgstr "Base_import_tester.modeller.m2o."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:297
+#, python-format
+msgid ""
+"copy \n"
+" (select 'company_'||id as \"External "
+"ID\",company_name \n"
+" as \"Name\",'True' as \"Is a Company\" from "
+"companies) TO \n"
+" '/tmp/company.csv' with CSV HEADER;"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:206
+#, python-format
+msgid "CSV file for Manufacturer, Retailer"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:160
+#, python-format
+msgid ""
+"Use \n"
+" Country/External ID: Use External ID when you import "
+"\n"
+" data from a third party application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:316
+#, python-format
+msgid "person_1,Fabien,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/External ID"
+msgstr "XXX/Ekstern ID."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:351
+#, python-format
+msgid "Don't Import"
+msgstr "Ikke importer."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:24
+#, python-format
+msgid "Select the"
+msgstr "Velg."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:100
+#, python-format
+msgid ""
+"Note that if your CSV file \n"
+" has a tabulation as separator, OpenERP will not \n"
+" detect the separations. You will need to change the "
+"\n"
+" file format options in your spreadsheet application. "
+"\n"
+" See the following question."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:141
+#, python-format
+msgid "Country: the name or code of the country"
+msgstr "Land: Navnet eller koden for dette landet."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m_child
+msgid "base_import.tests.models.o2m.child"
+msgstr "Basen_import.tester.modeller.o2m.barn."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:239
+#, python-format
+msgid "Can I import several times the same record?"
+msgstr "Kan jeg importere flere ganger fra den samme posten?"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:15
+#, python-format
+msgid "Validate"
+msgstr "Valider."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:55
+#, python-format
+msgid "Map your data to OpenERP"
+msgstr "Kartlegge dine data til OpenERP."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:153
+#, python-format
+msgid ""
+"Use Country: This is \n"
+" the easiest way when your data come from CSV files \n"
+" that have been created manually."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:127
+#, python-format
+msgid ""
+"What's the difference between Database ID and \n"
+" External ID?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:138
+#, python-format
+msgid ""
+"For example, to \n"
+" reference the country of a contact, OpenERP proposes "
+"\n"
+" you 3 different fields to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:175
+#, python-format
+msgid "What can I do if I have multiple matches for a field?"
+msgstr "Hva kan jeg gjøre hvis jeg har flere treff for et felt?"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:302
+#, python-format
+msgid "External ID,Name,Is a Company"
+msgstr "Ekstern ID, navn, er et selskap."
+
+#. module: base_import
+#: field:base_import.tests.models.preview,somevalue:0
+msgid "Some Value"
+msgstr "Noen verdi."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:231
+#, python-format
+msgid ""
+"The following CSV file shows how to import \n"
+" suppliers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:109
+#, python-format
+msgid ""
+"How can I change the CSV file format options when \n"
+" saving in my spreadsheet application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:320
+#, python-format
+msgid ""
+"As you can see in this file, Fabien and Laurence \n"
+" are working for the Bigees company (company_1) and \n"
+" Eric is working for the Organi company. The relation "
+"\n"
+" between persons and companies is done using the \n"
+" External ID of the companies. We had to prefix the \n"
+" \"External ID\" by the name of the table to avoid a "
+"\n"
+" conflict of ID between persons and companies "
+"(person_1 \n"
+" and company_1 who shared the same ID 1 in the "
+"orignial \n"
+" database)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:308
+#, python-format
+msgid ""
+"copy (select \n"
+" 'person_'||id as \"External ID\",person_name as \n"
+" \"Name\",'False' as \"Is a "
+"Company\",'company_'||company_id\n"
+" as \"Related Company/External ID\" from persons) TO "
+"\n"
+" '/tmp/person.csv' with CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid "Country: Belgium"
+msgstr "Land: Belgia."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
+msgid "base_import.tests.models.char.stillreadonly"
+msgstr "Base_Import.tester.modeller.røye.fortsattlesebare."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:314
+#, python-format
+msgid ""
+"External ID,Name,Is a \n"
+" Company,Related Company/External ID"
+msgstr ""
+"Ekstern ID, Navn, Er en\n"
+"Firma, Relatert firma/Ekstern ID."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:233
+#, python-format
+msgid "Suppliers and their respective contacts"
+msgstr "Leverandører og deres respektive kontakter."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:179
+#, python-format
+msgid ""
+"If for example you have two product categories \n"
+" with the child name \"Sellable\" (ie. \"Misc. \n"
+" Products/Sellable\" & \"Other Products/Sellable\"),\n"
+" your validation is halted but you may still import \n"
+" your data. However, we recommend you do not import "
+"the \n"
+" data because they will all be linked to the first \n"
+" 'Sellable' category found in the Product Category "
+"list \n"
+" (\"Misc. Products/Sellable\"). We recommend you "
+"modify \n"
+" one of the duplicates' values or your product "
+"category \n"
+" hierarchy."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:306
+#, python-format
+msgid ""
+"To create the CSV file for persons, linked to \n"
+" companies, we will use the following SQL command in "
+"\n"
+" PSQL:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:119
+#, python-format
+msgid ""
+"Microsoft Excel will allow \n"
+" you to modify only the encoding when saving \n"
+" (in 'Save As' dialog box > click 'Tools' dropdown \n"
+" list > Encoding tab)."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,othervalue:0
+msgid "Other Variable"
+msgstr "Annet variabel."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid ""
+"will also be used to update the original\n"
+" import if you need to re-import modified data\n"
+" later, it's thus good practice to specify it\n"
+" whenever possible"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ""
+"file to import. If you need a sample importable file, you\n"
+" can use the export tool to generate one."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid ""
+"Country/Database \n"
+" ID: 21"
+msgstr ""
+"Land/database\n"
+"ID: 21"
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char
+msgid "base_import.tests.models.char"
+msgstr "Base_import.tester.modeller.char."
+
+#. module: base_import
+#: help:base_import.import,file:0
+msgid "File to check and/or import, raw binary (not base64)"
+msgstr "Filen for å kontrollere og / eller import, rå binære (ikke base64."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:230
+#, python-format
+msgid "Purchase orders with their respective purchase order lines"
+msgstr "Innkjøpsordrer med sine respektive kjøpsordre linjer."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:60
+#, python-format
+msgid ""
+"If the file contains\n"
+" the column names, OpenERP can try auto-detecting the\n"
+" field corresponding to the column. This makes imports\n"
+" simpler especially when the file has many columns."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ".CSV"
+msgstr ".CSV"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid ""
+". The issue is\n"
+" usually an incorrect file encoding."
+msgstr ""
+". Problemet er\n"
+"vanligvis en feil fil koding."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
+msgid "base_import.tests.models.m2o.required"
+msgstr "Base_import.tester.modeller.m2o.påkrevd."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+" Order Lines of a Sale Order)?"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
+msgid "base_import.tests.models.char.noreadonly"
+msgstr "Base_import.tester.modeller.char.ikkelesebare."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:113
+#, python-format
+msgid ""
+"If you edit and save CSV files in speadsheet \n"
+" applications, your computer's regional settings will "
+"\n"
+" be applied for the separator and delimiter. \n"
+" We suggest you use OpenOffice or LibreOffice Calc \n"
+" as they will allow you to modify all three options \n"
+" (in 'Save As' dialog box > Check the box 'Edit "
+"filter \n"
+" settings' > Save)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:30
+#, python-format
+msgid "CSV File:"
+msgstr "CSV fil:"
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_preview
+msgid "base_import.tests.models.preview"
+msgstr "Base_import.tester.modeller.forhåndsvisning."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_required
+msgid "base_import.tests.models.char.required"
+msgstr "Base_import.tester.modeller.char.påkrevd."
+
+#. module: base_import
+#: code:addons/base_import/models.py:112
+#, python-format
+msgid "Database ID"
+msgstr "Database ID."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:313
+#, python-format
+msgid "It will produce the following CSV file:"
+msgstr "Det vil produsere følgende CSV-filen:"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:362
+#, python-format
+msgid "Here is the start of the file we could not import:"
+msgstr "Her er starten på filen vi ikke kunne importere:"
+
+#. module: base_import
+#: field:base_import.import,file_type:0
+msgid "File Type"
+msgstr "Fil type."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_import
+msgid "base_import.import"
+msgstr "Base_Import.Import."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m
+msgid "base_import.tests.models.o2m"
+msgstr "Base_import.tester.modeller.o2m"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid "Import preview failed due to:"
+msgstr "Import forhåndsvisning mislyktes på grunn av:"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:144
+#, python-format
+msgid ""
+"Country/External ID: the ID of this record \n"
+" referenced in another application (or the .XML file "
+"\n"
+" that imported it)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:35
+#, python-format
+msgid "Reload data to check changes."
+msgstr "Lad data til å sjekke endringer."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_readonly
+msgid "base_import.tests.models.char.readonly"
+msgstr "Base_import.tester.modeller.char.lesbare."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:131
+#, python-format
+msgid ""
+"Some fields define a relationship with another \n"
+" object. For example, the country of a contact is a \n"
+" link to a record of the 'Country' object. When you \n"
+" want to import such fields, OpenERP will have to \n"
+" recreate links between the different records. \n"
+" To help you import such fields, OpenERP provides 3 \n"
+" mechanisms. You must use one and only one mechanism "
+"\n"
+" per field you want to import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:201
+#, python-format
+msgid ""
+"The tags should be separated by a comma without any \n"
+" spacing. For example, if you want you customer to be "
+"\n"
+" lined to both tags 'Manufacturer' and 'Retailer' \n"
+" then you will encode it as follow \"Manufacturer,\n"
+" Retailer\" in the same column of your CSV file."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:264
+#, python-format
+msgid "You must configure at least one field to import"
+msgstr "Du må konfigurere minst ett felt for å importere."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:304
+#, python-format
+msgid "company_2,Organi,True"
+msgstr "Firma_2,organisasjon,sant."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:58
+#, python-format
+msgid ""
+"The first row of the\n"
+" file contains the label of the column"
+msgstr ""
+"den første raden av\n"
+"filen inneholder etiketten av kolonnen."
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_states
+msgid "base_import.tests.models.char.states"
+msgstr "Base_import.tester.modeller.char.stater."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:7
+#, python-format
+msgid "Import a CSV File"
+msgstr "Importer en CSV fil."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:74
+#, python-format
+msgid "Quoting:"
+msgstr "Siterer:"
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required_related
+msgid "base_import.tests.models.m2o.required.related"
+msgstr "Base_import.tester.modeller.m2o.påkrevd.relatert."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid ")."
+msgstr ")."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:18
+#: code:addons/base_import/static/src/xml/import.xml:396
+#, python-format
+msgid "Import"
+msgstr "Importer."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:407
+#, python-format
+msgid "Here are the possible values:"
+msgstr "Her er de mulige verdiene."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "The"
+msgstr "Den."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:227
+#, python-format
+msgid ""
+"A single column was found in the file, this often means the file separator "
+"is incorrect"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid "dump of such a PostgreSQL database"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:301
+#, python-format
+msgid "This SQL command will create the following CSV file:"
+msgstr "Dette SQL-kommandoen vil skape følgende CSV-filen:"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:228
+#, python-format
+msgid ""
+"The following CSV file shows how to import purchase \n"
+" orders with their respective purchase order lines:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:91
+#, python-format
+msgid ""
+"What can I do when the Import preview table isn't \n"
+" displayed correctly?"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.char,value:0
+#: field:base_import.tests.models.char.noreadonly,value:0
+#: field:base_import.tests.models.char.readonly,value:0
+#: field:base_import.tests.models.char.required,value:0
+#: field:base_import.tests.models.char.states,value:0
+#: field:base_import.tests.models.char.stillreadonly,value:0
+#: field:base_import.tests.models.m2o,value:0
+#: field:base_import.tests.models.m2o.related,value:0
+#: field:base_import.tests.models.m2o.required,value:0
+#: field:base_import.tests.models.m2o.required.related,value:0
+#: field:base_import.tests.models.o2m,value:0
+#: field:base_import.tests.models.o2m.child,parent_id:0
+#: field:base_import.tests.models.o2m.child,value:0
+msgid "unknown"
+msgstr "Ukjent."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:317
+#, python-format
+msgid "person_2,Laurence,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:149
+#, python-format
+msgid "Country/External ID: base.be"
+msgstr "Land/Ekstern ID: Base.være."
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:288
+#, python-format
+msgid ""
+"As an example, suppose you have a SQL database \n"
+" with two tables you want to import: companies and \n"
+" persons. Each person belong to one company, so you \n"
+" will have to recreate the link between a person and "
+"\n"
+" the company he work for. (If you want to test this \n"
+" example, here is a"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:396
+#, python-format
+msgid "(%d more)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:227
+#, python-format
+msgid "File for some Quotations"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:72
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:280
+#, python-format
+msgid ""
+"To manage relations between tables, \n"
+" you can use the \"External ID\" facilities of "
+"OpenERP. \n"
+" The \"External ID\" of a record is the unique "
+"identifier \n"
+" of this record in another application. This "
+"\"External \n"
+" ID\" must be unique accoss all the records of all \n"
+" objects, so it's a good practice to prefix this \n"
+" \"External ID\" with the name of the application or "
+"\n"
+" table. (like 'company_1', 'person_1' instead of '1')"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:295
+#, python-format
+msgid ""
+"We will first export all companies and their \n"
+" \"External ID\". In PSQL, write the following "
+"command:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:373
+#, python-format
+msgid "Everything seems valid."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:188
+#, python-format
+msgid ""
+"However if you do not wish to change your \n"
+" configuration of product categories, we recommend "
+"you \n"
+" use make use of the external ID for this field \n"
+" 'Category'."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:390
+#, python-format
+msgid "at row %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:197
+#, python-format
+msgid ""
+"How can I import a many2many relationship field \n"
+" (e.g. a customer that has multiple tags)?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:275
+#, python-format
+msgid ""
+"If you need to import data from different tables, \n"
+" you will have to recreate relations between records "
+"\n"
+" belonging to different tables. (e.g. if you import \n"
+" companies and persons, you will have to recreate the "
+"\n"
+" link between each person and the company they work \n"
+" for)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:150
+#, python-format
+msgid ""
+"According to your need, you should use \n"
+" one of these 3 ways to reference records in "
+"relations. \n"
+" Here is when you should use one or the other, \n"
+" according to your need:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:319
+#, python-format
+msgid "person_4,Ramsy,False,company_3"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:261
+#, python-format
+msgid ""
+"If you do not set all fields in your CSV file, \n"
+" OpenERP will assign the default value for every non "
+"\n"
+" defined fields. But if you\n"
+" set fields with empty values in your CSV file, "
+"OpenERP \n"
+" will set the EMPTY value in the field, instead of \n"
+" assigning the default value."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:20
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:257
+#, python-format
+msgid ""
+"What happens if I do not provide a value for a \n"
+" specific field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:68
+#, python-format
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:305
+#, python-format
+msgid "company_3,Boum,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:249
+#, python-format
+msgid ""
+"This feature \n"
+" allows you to use the Import/Export tool of OpenERP "
+"to \n"
+" modify a batch of records in your favorite "
+"spreadsheet \n"
+" application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#, python-format
+msgid ""
+"column in OpenERP. When you\n"
+" import an other record that links to the first\n"
+" one, use"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:242
+#, python-format
+msgid ""
+"If you import a file that contains one of the \n"
+" column \"External ID\" or \"Database ID\", records "
+"that \n"
+" have already been imported will be modified instead "
+"of \n"
+" being created. This is very usefull as it allows you "
+"\n"
+" to import several times the same CSV file while "
+"having \n"
+" made some changes in between two imports. OpenERP "
+"will \n"
+" take care of creating or modifying each record \n"
+" depending if it's new or not."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:169
+#, python-format
+msgid "CSV file for categories"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:309
+#, python-format
+msgid "Normal Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:74
+#, python-format
+msgid ""
+"In order to re-create relationships between\n"
+" different records, you should use the unique\n"
+" identifier from the original application and\n"
+" map it to the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:170
+#, python-format
+msgid "CSV file for Products"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:216
+#, python-format
+msgid ""
+"If you want to import sales order having several \n"
+" order lines; for each order line, you need to "
+"reserve \n"
+" a specific row in the CSV file. The first order line "
+"\n"
+" will be imported on the same row as the information "
+"\n"
+" relative to order. Any additional lines will need an "
+"\n"
+" addtional row that does not have any information in "
+"\n"
+" the fields relative to the order."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_related
+msgid "base_import.tests.models.m2o.related"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "to the original unique identifier."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:318
+#, python-format
+msgid "person_3,Eric,False,company_2"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:329
+#, python-format
+msgid ""
+"The two files produced are ready to be imported in \n"
+" OpenERP without any modifications. After having \n"
+" imported these two CSV files, you will have 4 "
+"contacts \n"
+" and 3 companies. (the firsts two contacts are linked "
+"\n"
+" to the first company). You must first import the \n"
+" companies and then the persons."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:95
+#, python-format
+msgid ""
+"By default the Import preview is set on commas as \n"
+" field separators and quotation marks as text \n"
+" delimiters. If your csv file does not have these \n"
+" settings, you can modify the File Format Options \n"
+" (displayed under the Browse CSV file bar after you \n"
+" select your file)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:73
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_name:0
+msgid "File Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/models.py:80
+#: code:addons/base_import/models.py:111
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:39
+#, python-format
+msgid "File Format Options…"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:392
+#, python-format
+msgid "between rows %d and %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:19
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:223
+#, python-format
+msgid ""
+"As an example, here is \n"
+" purchase.order_functional_error_line_cant_adpat.CSV "
+"\n"
+" file of some quotations you can import, based on "
+"demo \n"
+" data."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file:0
+msgid "File"
+msgstr ""
diff --git a/addons/base_import/i18n/zh_CN.po b/addons/base_import/i18n/zh_CN.po
new file mode 100644
index 00000000000..89aa3b23e80
--- /dev/null
+++ b/addons/base_import/i18n/zh_CN.po
@@ -0,0 +1,1164 @@
+# Chinese (Simplified) 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-12-09 11:00+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Chinese (Simplified) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:420
+#, python-format
+msgid "Get all possible values"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:71
+#, python-format
+msgid "Need to import data from an other application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:163
+#, python-format
+msgid ""
+"When you use External IDs, you can import CSV files \n"
+" with the \"External ID\" column to define the "
+"External \n"
+" ID of each record you import. Then, you will be able "
+"\n"
+" to make a reference to that record with columns like "
+"\n"
+" \"Field/External ID\". The following two CSV files "
+"give \n"
+" you an example for Products and their Categories."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:271
+#, python-format
+msgid ""
+"How to export/import different tables from an SQL \n"
+" application to OpenERP?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:310
+#, python-format
+msgid "Relation Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:142
+#, python-format
+msgid ""
+"Country/Database ID: the unique OpenERP ID for a \n"
+" record, defined by the ID postgresql column"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:155
+#, python-format
+msgid ""
+"Use \n"
+" Country/Database ID: You should rarely use this \n"
+" notation. It's mostly used by developers as it's "
+"main \n"
+" advantage is to never have conflicts (you may have \n"
+" several records with the same name, but they always "
+"\n"
+" have a unique Database ID)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:146
+#, python-format
+msgid ""
+"For the country \n"
+" Belgium, you can use one of these 3 ways to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:303
+#, python-format
+msgid "company_1,Bigees,True"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
+msgid "base_import.tests.models.m2o"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:297
+#, python-format
+msgid ""
+"copy \n"
+" (select 'company_'||id as \"External "
+"ID\",company_name \n"
+" as \"Name\",'True' as \"Is a Company\" from "
+"companies) TO \n"
+" '/tmp/company.csv' with CSV HEADER;"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:206
+#, python-format
+msgid "CSV file for Manufacturer, Retailer"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:160
+#, python-format
+msgid ""
+"Use \n"
+" Country/External ID: Use External ID when you import "
+"\n"
+" data from a third party application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:316
+#, python-format
+msgid "person_1,Fabien,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:351
+#, python-format
+msgid "Don't Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:24
+#, python-format
+msgid "Select the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:100
+#, python-format
+msgid ""
+"Note that if your CSV file \n"
+" has a tabulation as separator, OpenERP will not \n"
+" detect the separations. You will need to change the "
+"\n"
+" file format options in your spreadsheet application. "
+"\n"
+" See the following question."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:141
+#, python-format
+msgid "Country: the name or code of the country"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m_child
+msgid "base_import.tests.models.o2m.child"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:239
+#, python-format
+msgid "Can I import several times the same record?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:15
+#, python-format
+msgid "Validate"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:55
+#, python-format
+msgid "Map your data to OpenERP"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:153
+#, python-format
+msgid ""
+"Use Country: This is \n"
+" the easiest way when your data come from CSV files \n"
+" that have been created manually."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:127
+#, python-format
+msgid ""
+"What's the difference between Database ID and \n"
+" External ID?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:138
+#, python-format
+msgid ""
+"For example, to \n"
+" reference the country of a contact, OpenERP proposes "
+"\n"
+" you 3 different fields to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:175
+#, python-format
+msgid "What can I do if I have multiple matches for a field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:302
+#, python-format
+msgid "External ID,Name,Is a Company"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,somevalue:0
+msgid "Some Value"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:231
+#, python-format
+msgid ""
+"The following CSV file shows how to import \n"
+" suppliers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:109
+#, python-format
+msgid ""
+"How can I change the CSV file format options when \n"
+" saving in my spreadsheet application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:320
+#, python-format
+msgid ""
+"As you can see in this file, Fabien and Laurence \n"
+" are working for the Bigees company (company_1) and \n"
+" Eric is working for the Organi company. The relation "
+"\n"
+" between persons and companies is done using the \n"
+" External ID of the companies. We had to prefix the \n"
+" \"External ID\" by the name of the table to avoid a "
+"\n"
+" conflict of ID between persons and companies "
+"(person_1 \n"
+" and company_1 who shared the same ID 1 in the "
+"orignial \n"
+" database)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:308
+#, python-format
+msgid ""
+"copy (select \n"
+" 'person_'||id as \"External ID\",person_name as \n"
+" \"Name\",'False' as \"Is a "
+"Company\",'company_'||company_id\n"
+" as \"Related Company/External ID\" from persons) TO "
+"\n"
+" '/tmp/person.csv' with CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid "Country: Belgium"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
+msgid "base_import.tests.models.char.stillreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:314
+#, python-format
+msgid ""
+"External ID,Name,Is a \n"
+" Company,Related Company/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:233
+#, python-format
+msgid "Suppliers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:179
+#, python-format
+msgid ""
+"If for example you have two product categories \n"
+" with the child name \"Sellable\" (ie. \"Misc. \n"
+" Products/Sellable\" & \"Other Products/Sellable\"),\n"
+" your validation is halted but you may still import \n"
+" your data. However, we recommend you do not import "
+"the \n"
+" data because they will all be linked to the first \n"
+" 'Sellable' category found in the Product Category "
+"list \n"
+" (\"Misc. Products/Sellable\"). We recommend you "
+"modify \n"
+" one of the duplicates' values or your product "
+"category \n"
+" hierarchy."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:306
+#, python-format
+msgid ""
+"To create the CSV file for persons, linked to \n"
+" companies, we will use the following SQL command in "
+"\n"
+" PSQL:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:119
+#, python-format
+msgid ""
+"Microsoft Excel will allow \n"
+" you to modify only the encoding when saving \n"
+" (in 'Save As' dialog box > click 'Tools' dropdown \n"
+" list > Encoding tab)."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,othervalue:0
+msgid "Other Variable"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid ""
+"will also be used to update the original\n"
+" import if you need to re-import modified data\n"
+" later, it's thus good practice to specify it\n"
+" whenever possible"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ""
+"file to import. If you need a sample importable file, you\n"
+" can use the export tool to generate one."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid ""
+"Country/Database \n"
+" ID: 21"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char
+msgid "base_import.tests.models.char"
+msgstr ""
+
+#. module: base_import
+#: help:base_import.import,file:0
+msgid "File to check and/or import, raw binary (not base64)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:230
+#, python-format
+msgid "Purchase orders with their respective purchase order lines"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:60
+#, python-format
+msgid ""
+"If the file contains\n"
+" the column names, OpenERP can try auto-detecting the\n"
+" field corresponding to the column. This makes imports\n"
+" simpler especially when the file has many columns."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ".CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid ""
+". The issue is\n"
+" usually an incorrect file encoding."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
+msgid "base_import.tests.models.m2o.required"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+" Order Lines of a Sale Order)?"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
+msgid "base_import.tests.models.char.noreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:113
+#, python-format
+msgid ""
+"If you edit and save CSV files in speadsheet \n"
+" applications, your computer's regional settings will "
+"\n"
+" be applied for the separator and delimiter. \n"
+" We suggest you use OpenOffice or LibreOffice Calc \n"
+" as they will allow you to modify all three options \n"
+" (in 'Save As' dialog box > Check the box 'Edit "
+"filter \n"
+" settings' > Save)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:30
+#, python-format
+msgid "CSV File:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_preview
+msgid "base_import.tests.models.preview"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_required
+msgid "base_import.tests.models.char.required"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:112
+#, python-format
+msgid "Database ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:313
+#, python-format
+msgid "It will produce the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:362
+#, python-format
+msgid "Here is the start of the file we could not import:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_type:0
+msgid "File Type"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_import
+msgid "base_import.import"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m
+msgid "base_import.tests.models.o2m"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid "Import preview failed due to:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:144
+#, python-format
+msgid ""
+"Country/External ID: the ID of this record \n"
+" referenced in another application (or the .XML file "
+"\n"
+" that imported it)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:35
+#, python-format
+msgid "Reload data to check changes."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_readonly
+msgid "base_import.tests.models.char.readonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:131
+#, python-format
+msgid ""
+"Some fields define a relationship with another \n"
+" object. For example, the country of a contact is a \n"
+" link to a record of the 'Country' object. When you \n"
+" want to import such fields, OpenERP will have to \n"
+" recreate links between the different records. \n"
+" To help you import such fields, OpenERP provides 3 \n"
+" mechanisms. You must use one and only one mechanism "
+"\n"
+" per field you want to import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:201
+#, python-format
+msgid ""
+"The tags should be separated by a comma without any \n"
+" spacing. For example, if you want you customer to be "
+"\n"
+" lined to both tags 'Manufacturer' and 'Retailer' \n"
+" then you will encode it as follow \"Manufacturer,\n"
+" Retailer\" in the same column of your CSV file."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:264
+#, python-format
+msgid "You must configure at least one field to import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:304
+#, python-format
+msgid "company_2,Organi,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:58
+#, python-format
+msgid ""
+"The first row of the\n"
+" file contains the label of the column"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_states
+msgid "base_import.tests.models.char.states"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:7
+#, python-format
+msgid "Import a CSV File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:74
+#, python-format
+msgid "Quoting:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required_related
+msgid "base_import.tests.models.m2o.required.related"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid ")."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:18
+#: code:addons/base_import/static/src/xml/import.xml:396
+#, python-format
+msgid "Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:407
+#, python-format
+msgid "Here are the possible values:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "The"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:227
+#, python-format
+msgid ""
+"A single column was found in the file, this often means the file separator "
+"is incorrect"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid "dump of such a PostgreSQL database"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:301
+#, python-format
+msgid "This SQL command will create the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:228
+#, python-format
+msgid ""
+"The following CSV file shows how to import purchase \n"
+" orders with their respective purchase order lines:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:91
+#, python-format
+msgid ""
+"What can I do when the Import preview table isn't \n"
+" displayed correctly?"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.char,value:0
+#: field:base_import.tests.models.char.noreadonly,value:0
+#: field:base_import.tests.models.char.readonly,value:0
+#: field:base_import.tests.models.char.required,value:0
+#: field:base_import.tests.models.char.states,value:0
+#: field:base_import.tests.models.char.stillreadonly,value:0
+#: field:base_import.tests.models.m2o,value:0
+#: field:base_import.tests.models.m2o.related,value:0
+#: field:base_import.tests.models.m2o.required,value:0
+#: field:base_import.tests.models.m2o.required.related,value:0
+#: field:base_import.tests.models.o2m,value:0
+#: field:base_import.tests.models.o2m.child,parent_id:0
+#: field:base_import.tests.models.o2m.child,value:0
+msgid "unknown"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:317
+#, python-format
+msgid "person_2,Laurence,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:149
+#, python-format
+msgid "Country/External ID: base.be"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:288
+#, python-format
+msgid ""
+"As an example, suppose you have a SQL database \n"
+" with two tables you want to import: companies and \n"
+" persons. Each person belong to one company, so you \n"
+" will have to recreate the link between a person and "
+"\n"
+" the company he work for. (If you want to test this \n"
+" example, here is a"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:396
+#, python-format
+msgid "(%d more)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:227
+#, python-format
+msgid "File for some Quotations"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:72
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:280
+#, python-format
+msgid ""
+"To manage relations between tables, \n"
+" you can use the \"External ID\" facilities of "
+"OpenERP. \n"
+" The \"External ID\" of a record is the unique "
+"identifier \n"
+" of this record in another application. This "
+"\"External \n"
+" ID\" must be unique accoss all the records of all \n"
+" objects, so it's a good practice to prefix this \n"
+" \"External ID\" with the name of the application or "
+"\n"
+" table. (like 'company_1', 'person_1' instead of '1')"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:295
+#, python-format
+msgid ""
+"We will first export all companies and their \n"
+" \"External ID\". In PSQL, write the following "
+"command:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:373
+#, python-format
+msgid "Everything seems valid."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:188
+#, python-format
+msgid ""
+"However if you do not wish to change your \n"
+" configuration of product categories, we recommend "
+"you \n"
+" use make use of the external ID for this field \n"
+" 'Category'."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:390
+#, python-format
+msgid "at row %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:197
+#, python-format
+msgid ""
+"How can I import a many2many relationship field \n"
+" (e.g. a customer that has multiple tags)?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:275
+#, python-format
+msgid ""
+"If you need to import data from different tables, \n"
+" you will have to recreate relations between records "
+"\n"
+" belonging to different tables. (e.g. if you import \n"
+" companies and persons, you will have to recreate the "
+"\n"
+" link between each person and the company they work \n"
+" for)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:150
+#, python-format
+msgid ""
+"According to your need, you should use \n"
+" one of these 3 ways to reference records in "
+"relations. \n"
+" Here is when you should use one or the other, \n"
+" according to your need:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:319
+#, python-format
+msgid "person_4,Ramsy,False,company_3"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:261
+#, python-format
+msgid ""
+"If you do not set all fields in your CSV file, \n"
+" OpenERP will assign the default value for every non "
+"\n"
+" defined fields. But if you\n"
+" set fields with empty values in your CSV file, "
+"OpenERP \n"
+" will set the EMPTY value in the field, instead of \n"
+" assigning the default value."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:20
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:257
+#, python-format
+msgid ""
+"What happens if I do not provide a value for a \n"
+" specific field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:68
+#, python-format
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:305
+#, python-format
+msgid "company_3,Boum,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:249
+#, python-format
+msgid ""
+"This feature \n"
+" allows you to use the Import/Export tool of OpenERP "
+"to \n"
+" modify a batch of records in your favorite "
+"spreadsheet \n"
+" application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#, python-format
+msgid ""
+"column in OpenERP. When you\n"
+" import an other record that links to the first\n"
+" one, use"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:242
+#, python-format
+msgid ""
+"If you import a file that contains one of the \n"
+" column \"External ID\" or \"Database ID\", records "
+"that \n"
+" have already been imported will be modified instead "
+"of \n"
+" being created. This is very usefull as it allows you "
+"\n"
+" to import several times the same CSV file while "
+"having \n"
+" made some changes in between two imports. OpenERP "
+"will \n"
+" take care of creating or modifying each record \n"
+" depending if it's new or not."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:169
+#, python-format
+msgid "CSV file for categories"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:309
+#, python-format
+msgid "Normal Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:74
+#, python-format
+msgid ""
+"In order to re-create relationships between\n"
+" different records, you should use the unique\n"
+" identifier from the original application and\n"
+" map it to the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:170
+#, python-format
+msgid "CSV file for Products"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:216
+#, python-format
+msgid ""
+"If you want to import sales order having several \n"
+" order lines; for each order line, you need to "
+"reserve \n"
+" a specific row in the CSV file. The first order line "
+"\n"
+" will be imported on the same row as the information "
+"\n"
+" relative to order. Any additional lines will need an "
+"\n"
+" addtional row that does not have any information in "
+"\n"
+" the fields relative to the order."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_related
+msgid "base_import.tests.models.m2o.related"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "to the original unique identifier."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:318
+#, python-format
+msgid "person_3,Eric,False,company_2"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:329
+#, python-format
+msgid ""
+"The two files produced are ready to be imported in \n"
+" OpenERP without any modifications. After having \n"
+" imported these two CSV files, you will have 4 "
+"contacts \n"
+" and 3 companies. (the firsts two contacts are linked "
+"\n"
+" to the first company). You must first import the \n"
+" companies and then the persons."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:95
+#, python-format
+msgid ""
+"By default the Import preview is set on commas as \n"
+" field separators and quotation marks as text \n"
+" delimiters. If your csv file does not have these \n"
+" settings, you can modify the File Format Options \n"
+" (displayed under the Browse CSV file bar after you \n"
+" select your file)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:73
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_name:0
+msgid "File Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/models.py:80
+#: code:addons/base_import/models.py:111
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:39
+#, python-format
+msgid "File Format Options…"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:392
+#, python-format
+msgid "between rows %d and %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:19
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:223
+#, python-format
+msgid ""
+"As an example, here is \n"
+" purchase.order_functional_error_line_cant_adpat.CSV "
+"\n"
+" file of some quotations you can import, based on "
+"demo \n"
+" data."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file:0
+msgid "File"
+msgstr ""
diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
index 071c32e4ceb..abef384cd91 100644
--- a/addons/base_report_designer/wizard/base_report_designer_modify.py
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -19,15 +19,14 @@
# along with this program. If not, see .
#
##############################################################################
-import time
-from openerp import wizard
-from openerp import osv
-from openerp import pooler
-import urllib
+
import base64
-from openerp import tools
-from openerp.tools.translate import _
+import time
+import urllib
+
+from openerp import osv, pooler, tools
from openerp.osv import fields, osv
+from openerp.tools.translate import _
class base_report_sxw(osv.osv_memory):
"""Base Report sxw """
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index 04d37f89e95..ece8f65a258 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -7,19 +7,20 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-01-13 19:44+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp \n"
+"PO-Revision-Date: 2012-12-08 12:33+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) \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-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Emails Integration"
-msgstr ""
+msgstr "EMail Integration"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -29,7 +30,7 @@ msgstr "Gast"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Contacts"
-msgstr ""
+msgstr "Kontakte"
#. module: base_setup
#: model:ir.model,name:base_setup.model_base_config_settings
@@ -41,6 +42,8 @@ msgstr ""
msgid ""
"Use external authentication providers, sign in with google, facebook, ..."
msgstr ""
+"Benutzen Sie eine externe Authentifizierung, z.B. von Anbietern wie google, "
+"facebook, ..."
#. module: base_setup
#: view:sale.config.settings:0
@@ -54,6 +57,16 @@ msgid ""
"OpenERP using specific\n"
" plugins for your preferred email application."
msgstr ""
+"OpenERP ermöglicht die automatische Erstellung von Interessenten (und "
+"anderen Belegen)\n"
+" aus eingehenden EMails. Sie können Ihren "
+"EMail Posteingang regelmässig synchronisieren, indem\n"
+" Sie hierzu Ihre POP/IMAP Konten anbinden "
+"und dann ein Script zur direkten EMail Integration \n"
+" regelmässig anwenden, oder indem Sie "
+"selektiv mit Hilfe eines Plugins für Ihre persönliche Arbeitsplatz \n"
+" Mailanwendung bestimmte EMails nach "
+"OpenERP transferieren."
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -63,24 +76,24 @@ msgstr "Mitglied"
#. module: base_setup
#: view:base.config.settings:0
msgid "Portal access"
-msgstr ""
+msgstr "Portal Zugang"
#. module: base_setup
#: view:base.config.settings:0
msgid "Authentication"
-msgstr ""
+msgstr "Authentifizierung"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Quotations and Sales Orders"
-msgstr ""
+msgstr "Angebote und Aufträge"
#. module: base_setup
#: view:base.config.settings:0
#: model:ir.actions.act_window,name:base_setup.action_general_configuration
#: model:ir.ui.menu,name:base_setup.menu_general_configuration
msgid "General Settings"
-msgstr ""
+msgstr "Grundeinstellungen"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -90,12 +103,12 @@ msgstr "Spender"
#. module: base_setup
#: view:base.config.settings:0
msgid "Email"
-msgstr ""
+msgstr "EMail"
#. module: base_setup
#: field:sale.config.settings,module_crm:0
msgid "CRM"
-msgstr ""
+msgstr "CRM"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -105,17 +118,17 @@ msgstr "Patient"
#. module: base_setup
#: field:base.config.settings,module_base_import:0
msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "Ermöglicht Benutzern Import von .csv Dateien"
#. module: base_setup
#: field:base.config.settings,module_multi_company:0
msgid "Manage multiple companies"
-msgstr ""
+msgstr "Multi-Company Management"
#. module: base_setup
#: help:base.config.settings,module_portal:0
msgid "Give access your customers and suppliers to their documents."
-msgstr ""
+msgstr "Erlauben Sie Kunden oder Lieferanten Zugriff auf Ihre Belege"
#. module: base_setup
#: view:sale.config.settings:0
@@ -125,12 +138,12 @@ msgstr ""
#. module: base_setup
#: field:sale.config.settings,module_web_linkedin:0
msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "Kontakte aus linkedin Netzwerk importieren"
#. module: base_setup
#: field:sale.config.settings,module_plugin_thunderbird:0
msgid "Enable Thunderbird plug-in"
-msgstr ""
+msgstr "Aktiviere Thunderbird Plug-In"
#. module: base_setup
#: view:base.setup.terminology:0
@@ -140,22 +153,22 @@ msgstr "res_config_contents"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Customer Features"
-msgstr ""
+msgstr "Kunden Features"
#. module: base_setup
#: view:base.config.settings:0
msgid "Import / Export"
-msgstr ""
+msgstr "Import / Export"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Sale Features"
-msgstr ""
+msgstr "Verkauf Features"
#. module: base_setup
#: field:sale.config.settings,module_plugin_outlook:0
msgid "Enable Outlook plug-in"
-msgstr ""
+msgstr "Aktiviere Outlook Plugin"
#. module: base_setup
#: view:base.setup.terminology:0
@@ -174,7 +187,7 @@ msgstr "Mieter"
#. module: base_setup
#: help:base.config.settings,module_share:0
msgid "Share or embbed any screen of openerp."
-msgstr ""
+msgstr "Teilen oder einbetten von OpenERP Ansichten"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -187,6 +200,9 @@ msgid ""
"When you create a new contact (person or company), you will be able to load "
"all the data from LinkedIn (photos, address, etc)."
msgstr ""
+"Wenn Sie einen neuen Kontakt erstellen (Person oder Firma) können Sie "
+"sämtliche in linkedin verknüpften Kontaktdaten einfach als neue Kontakte "
+"bzw. Ansprechpartner importieren (Photo, Adresse, etc.)"
#. module: base_setup
#: help:base.config.settings,module_multi_company:0
@@ -195,6 +211,9 @@ msgid ""
"companies.\n"
" This installs the module multi_company."
msgstr ""
+"Arbeiten Sie in einer Multi-Company Organisation, und wenden Sie die "
+"entsprechenden Berechtigungen für den wechselseitigen Unternehmenszugriff "
+"einfach an."
#. module: base_setup
#: view:base.config.settings:0
@@ -202,6 +221,9 @@ msgid ""
"You will find more options in your company details: address for the header "
"and footer, overdue payments texts, etc."
msgstr ""
+"Sie finden weitere Optionen unter Ihren Unternehmenseinstellungen: "
+"Adressanschrift für Kopf- und Fußzeile, Mahntexte für überfällige Zahlungen, "
+"u.s.w."
#. module: base_setup
#: model:ir.model,name:base_setup.model_sale_config_settings
@@ -227,6 +249,8 @@ msgstr "Klient"
#: help:base.config.settings,module_auth_anonymous:0
msgid "Enable the public part of openerp, openerp becomes a public website."
msgstr ""
+"Aktivieren Sie den globalen Zugriff auf veröffentliche Bereiche und "
+"Dokumente , OpenERP wird dadurch auch öffentlich verfügbar.."
#. module: base_setup
#: help:sale.config.settings,module_plugin_thunderbird:0
@@ -239,6 +263,15 @@ msgid ""
" Partner from the selected emails.\n"
" This installs the module plugin_thunderbird."
msgstr ""
+"Die Erweiterung erlaubt es, EMails inklusive Anhänge bei ausgewählten\n"
+" OpenERP Objekten zu archivieren. Sie können bei der Auswahl "
+"entscheiden, ob Sie den Anhang \n"
+" als .eml Dateianhang beim Kunden oder bei einem "
+"Interessenten zuordnen. Sie können auch neue \n"
+" Dokumente anlegen, z.B. für einen neuen Interessenten (CRM "
+"Lead), indem Sie die Auswahl\n"
+" \"Neues Dokument\" anklicken. Durch Ihre Auswahl wird das "
+"Modul plugin_thunderbird installiert."
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -254,7 +287,7 @@ msgstr "Verwenden Sie ein anderes Wort für \"Kunde\""
#: model:ir.actions.act_window,name:base_setup.action_sale_config
#: view:sale.config.settings:0
msgid "Configure Sales"
-msgstr ""
+msgstr "Konfiguriere Verkauf"
#. module: base_setup
#: help:sale.config.settings,module_plugin_outlook:0
@@ -267,36 +300,45 @@ msgid ""
" email into an OpenERP mail message with attachments.\n"
" This installs the module plugin_outlook."
msgstr ""
+"Das Outlook Plugin erlaubt es, EMails inklusive Anhänge bei ausgewählten\n"
+" OpenERP Objekten zu archivieren. Sie können bei der Auswahl "
+"entscheiden, ob Sie den Anhang \n"
+" als .eml Dateianhang beim Kunden oder bei einem "
+"Interessenten zuordnen. Sie können auch neue \n"
+" Dokumente anlegen, z.B. für einen neuen Interessenten (CRM "
+"Lead), indem Sie die Auswahl\n"
+" \"Neues Dokument\" anklicken. Durch Ihre Auswahl wird das "
+"Modul plugin_outlook installiert."
#. module: base_setup
#: view:base.config.settings:0
msgid "Options"
-msgstr ""
+msgstr "Optionen"
#. module: base_setup
#: field:base.config.settings,module_portal:0
msgid "Activate the customer/supplier portal"
-msgstr ""
+msgstr "Aktivierung Kunden / Lieferanten Portal"
#. module: base_setup
#: field:base.config.settings,module_share:0
msgid "Allow documents sharing"
-msgstr ""
+msgstr "Ermögliche Dokumentenfreigabe"
#. module: base_setup
#: field:base.config.settings,module_auth_anonymous:0
msgid "Activate the public portal"
-msgstr ""
+msgstr "Aktivierung des öffentlichen Portals"
#. module: base_setup
#: view:base.config.settings:0
msgid "Configure outgoing email servers"
-msgstr ""
+msgstr "Konfigurieren des ausgehenden Mailservers"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Social Network Integration"
-msgstr ""
+msgstr "Integration Soziale Netzwerke"
#. module: base_setup
#: view:base.config.settings:0
@@ -308,7 +350,7 @@ msgstr "Abbruch"
#: view:base.config.settings:0
#: view:sale.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Anwenden"
#. module: base_setup
#: view:base.setup.terminology:0
@@ -319,12 +361,12 @@ msgstr "Spezifizieren Sie Ihre Terminologie"
#: view:base.config.settings:0
#: view:sale.config.settings:0
msgid "or"
-msgstr ""
+msgstr "oder"
#. module: base_setup
#: view:base.config.settings:0
msgid "Configure your company data"
-msgstr ""
+msgstr "Konfigurieren Sie Ihre Unternehmensdaten"
#~ msgid "City"
#~ msgstr "Stadt"
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index bbfaae1ef10..23520b8dc12 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-12-04 10:03+0000\n"
+"PO-Revision-Date: 2012-12-07 10:32+0000\n"
"Last-Translator: WANTELLET Sylvain \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-12-05 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:58+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: base_setup
#: view:sale.config.settings:0
@@ -63,12 +63,12 @@ msgstr "Membre"
#. module: base_setup
#: view:base.config.settings:0
msgid "Portal access"
-msgstr ""
+msgstr "Accès au portail"
#. module: base_setup
#: view:base.config.settings:0
msgid "Authentication"
-msgstr ""
+msgstr "Authentification"
#. module: base_setup
#: view:sale.config.settings:0
@@ -80,7 +80,7 @@ msgstr "Devis et bons de commande"
#: model:ir.actions.act_window,name:base_setup.action_general_configuration
#: model:ir.ui.menu,name:base_setup.menu_general_configuration
msgid "General Settings"
-msgstr ""
+msgstr "Paramètres généraux"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -95,7 +95,7 @@ msgstr ""
#. module: base_setup
#: field:sale.config.settings,module_crm:0
msgid "CRM"
-msgstr ""
+msgstr "CRM"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
@@ -125,7 +125,7 @@ msgstr ""
#. module: base_setup
#: field:sale.config.settings,module_web_linkedin:0
msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "Récupérer les contacts automatiquement de LinkedIn"
#. module: base_setup
#: field:sale.config.settings,module_plugin_thunderbird:0
@@ -145,7 +145,7 @@ msgstr ""
#. module: base_setup
#: view:base.config.settings:0
msgid "Import / Export"
-msgstr ""
+msgstr "Import / Export"
#. module: base_setup
#: view:sale.config.settings:0
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index f0037c0c6a7..19bcbbe8839 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.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-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-24 18:22+0000\n"
-"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n"
+"PO-Revision-Date: 2012-12-09 18:22+0000\n"
+"Last-Translator: Leen Sonneveld \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-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:37+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: base_setup
#: view:sale.config.settings:0
msgid "Emails Integration"
-msgstr "E-mail intergratie"
+msgstr "E-mail integratie"
#. module: base_setup
#: selection:base.setup.terminology,partner:0
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index b319d64ee64..31626d1fba3 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -60,6 +60,7 @@ class sale_config_settings(osv.osv_memory):
'module_web_linkedin': fields.boolean('Get contacts automatically from linkedIn',
help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""),
'module_crm': fields.boolean('CRM'),
+ 'module_sale' : fields.boolean('SALE'),
'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plug-in',
help="""The plugin allows you archive email and its attachments to the selected
OpenERP objects. You can select a partner, or a lead and
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index c06ff6534d7..b08f116d414 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -105,7 +105,8 @@
-
+
+
diff --git a/addons/base_status/i18n/de.po b/addons/base_status/i18n/de.po
new file mode 100644
index 00000000000..e9c60fbfe9c
--- /dev/null
+++ b/addons/base_status/i18n/de.po
@@ -0,0 +1,91 @@
+# German 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-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-08 13:50+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
+"Language-Team: German \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid "Error !"
+msgstr "Fehler !"
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:326
+#: code:addons/base_status/base_state.py:187
+#, python-format
+msgid "%s has been opened ."
+msgstr "%s wurde eröffnet ."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:350
+#: code:addons/base_status/base_state.py:220
+#, python-format
+msgid "%s has been renewed ."
+msgstr "%s wurde erneuert ."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:211
+#, python-format
+msgid "Error!"
+msgstr "Fehler !"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid ""
+"You can not escalate, you are already at the top level regarding your sales-"
+"team category."
+msgstr ""
+"Keine weitere Eskalation möglich, da Sie bereits die obersten Ebene erreicht "
+"haben."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:344
+#: code:addons/base_status/base_state.py:214
+#, python-format
+msgid "%s is now pending ."
+msgstr "%s wurde geändert auf Wiedervorlage ."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:338
+#, python-format
+msgid "%s has been cancelled ."
+msgstr "%s wurde abgebrochen ."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:208
+#, python-format
+msgid "%s has been canceled ."
+msgstr "%s wurde abgebrochen ."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:211
+#, python-format
+msgid ""
+"You are already at the top level of your sales-team category.\n"
+"Therefore you cannot escalate furthermore."
+msgstr ""
+"Keine weitere Eskalation möglich, da Sie bereits die obersten Ebene erreicht "
+"haben."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:332
+#: code:addons/base_status/base_state.py:202
+#, python-format
+msgid "%s has been closed ."
+msgstr "%s wurde beendet ."
diff --git a/addons/base_status/i18n/hr.po b/addons/base_status/i18n/hr.po
new file mode 100644
index 00000000000..d5f12130be2
--- /dev/null
+++ b/addons/base_status/i18n/hr.po
@@ -0,0 +1,88 @@
+# Croatian 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-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-09 19:46+0000\n"
+"Last-Translator: Goran Kliska \n"
+"Language-Team: Croatian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid "Error !"
+msgstr "Greška !"
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:326
+#: code:addons/base_status/base_state.py:187
+#, python-format
+msgid "%s has been opened ."
+msgstr "%s je otvoren ."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:350
+#: code:addons/base_status/base_state.py:220
+#, python-format
+msgid "%s has been renewed ."
+msgstr "%s je obnovljen ."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:211
+#, python-format
+msgid "Error!"
+msgstr "Greška!"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid ""
+"You can not escalate, you are already at the top level regarding your sales-"
+"team category."
+msgstr "Ne možete eskaliarati. Vi ste na vrhu hijerarhije prodajnog tima."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:344
+#: code:addons/base_status/base_state.py:214
+#, python-format
+msgid "%s is now pending ."
+msgstr "%s je sada na čekanju ."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:338
+#, python-format
+msgid "%s has been cancelled ."
+msgstr "%s je otkazan ."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:208
+#, python-format
+msgid "%s has been canceled ."
+msgstr "%s je otkazan ."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:211
+#, python-format
+msgid ""
+"You are already at the top level of your sales-team category.\n"
+"Therefore you cannot escalate furthermore."
+msgstr ""
+"Vi ste na vrhu hijerarhije prodajnog tima.\n"
+"Stoga ne možete dalje eskalirati."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:332
+#: code:addons/base_status/base_state.py:202
+#, python-format
+msgid "%s has been closed ."
+msgstr "%s je zatvoren ."
diff --git a/addons/base_vat/i18n/it.po b/addons/base_vat/i18n/it.po
index e3ed140f9bf..c4da24e29c4 100644
--- a/addons/base_vat/i18n/it.po
+++ b/addons/base_vat/i18n/it.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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-01-01 13:29+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2012-12-09 20:30+0000\n"
+"Last-Translator: Sergio Corato \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-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:37+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: base_vat
#: view:res.partner:0
msgid "Check Validity"
-msgstr ""
+msgstr "Verifica Validità"
#. module: base_vat
#: code:addons/base_vat/base_vat.py:147
@@ -28,22 +28,24 @@ msgid ""
"This VAT number does not seem to be valid.\n"
"Note: the expected format is %s"
msgstr ""
+"Questo numero IVA non sembra essere valido.\n"
+"Nota: il formato atteso è %s"
#. module: base_vat
#: field:res.company,vat_check_vies:0
msgid "VIES VAT Check"
-msgstr ""
+msgstr "Verifica IVA VIES"
#. module: base_vat
#: model:ir.model,name:base_vat.model_res_company
msgid "Companies"
-msgstr ""
+msgstr "Aziende"
#. module: base_vat
#: code:addons/base_vat/base_vat.py:111
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Errore!"
#. module: base_vat
#: help:res.partner,vat_subjected:0
@@ -65,6 +67,9 @@ msgid ""
"If checked, Partners VAT numbers will be fully validated against EU's VIES "
"service rather than via a simple format validation (checksum)."
msgstr ""
+"Se selezionato, i numeri IVA dei Patner saranno validati interamente con il "
+"service VIES UE invece che con una semplice validazione del formato (cifra "
+"di controllo)."
#. module: base_vat
#: field:res.partner,vat_subjected:0
diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index 13a51cc663e..0a38c744738 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -176,18 +176,21 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
action = result,
view_mode = action_attrs.view_mode;
- if (action_attrs.context && action_attrs.context['dashboard_merge_domains_contexts'] === false) {
+ // evaluate action_attrs context and domain
+ action_attrs.context = instance.web.pyeval.eval(
+ 'context', action_attrs.context || {});
+ action_attrs.domain = instance.web.pyeval.eval(
+ 'domain', action_attrs.domain || [], action_attrs.context);
+ if (action_attrs.context['dashboard_merge_domains_contexts'] === false) {
// TODO: replace this 6.1 workaround by attribute on
action.context = action_attrs.context || {};
action.domain = action_attrs.domain || [];
} else {
- if (action_attrs.context) {
- action.context = _.extend((action.context || {}), action_attrs.context);
- }
- if (action_attrs.domain) {
- action.domain = action.domain || [];
- action.domain.unshift.apply(action.domain, action_attrs.domain);
- }
+ action.context = instance.web.pyeval.eval(
+ 'contexts', [action.context || {}, action_attrs.context]);
+ action.domain = instance.web.pyeval.eval(
+ 'domains', [action_attrs.domain, action.domain || []],
+ action.context)
}
var action_orig = _.extend({ flags : {} }, action);
diff --git a/addons/claim_from_delivery/i18n/nb.po b/addons/claim_from_delivery/i18n/nb.po
index bd1bfdbcf0e..89078cf4889 100644
--- a/addons/claim_from_delivery/i18n/nb.po
+++ b/addons/claim_from_delivery/i18n/nb.po
@@ -8,29 +8,29 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-30 20:43+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-12-08 19:14+0000\n"
+"Last-Translator: Kaare Pettersen \n"
"Language-Team: Norwegian Bokmal \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: claim_from_delivery
#: view:stock.picking.out:0
msgid "Claims"
-msgstr ""
+msgstr "Kravene."
#. module: claim_from_delivery
#: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
msgid "Delivery Order"
-msgstr ""
+msgstr "Leveringsordre"
#. module: claim_from_delivery
#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
msgid "Claim From Delivery"
-msgstr ""
+msgstr "Kravene fra leveringen."
#~ msgid "Claim from delivery"
#~ msgstr "Krav fra leveranse"
diff --git a/addons/claim_from_delivery/i18n/zh_CN.po b/addons/claim_from_delivery/i18n/zh_CN.po
index f48cbfd2565..f638742ba82 100644
--- a/addons/claim_from_delivery/i18n/zh_CN.po
+++ b/addons/claim_from_delivery/i18n/zh_CN.po
@@ -8,29 +8,29 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-07-04 05:17+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-12-09 04:11+0000\n"
+"Last-Translator: sum1201 \n"
"Language-Team: Chinese (Simplified) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: claim_from_delivery
#: view:stock.picking.out:0
msgid "Claims"
-msgstr ""
+msgstr "索赔"
#. module: claim_from_delivery
#: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
msgid "Delivery Order"
-msgstr ""
+msgstr "送货单"
#. module: claim_from_delivery
#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
msgid "Claim From Delivery"
-msgstr ""
+msgstr "交货索赔"
#~ msgid "Claim from delivery"
#~ msgstr "送货单索赔"
diff --git a/addons/contacts/i18n/hr.po b/addons/contacts/i18n/hr.po
new file mode 100644
index 00000000000..8de3a7cf309
--- /dev/null
+++ b/addons/contacts/i18n/hr.po
@@ -0,0 +1,37 @@
+# Croatian 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-12-09 19:40+0000\n"
+"Last-Translator: Goran Kliska \n"
+"Language-Team: Croatian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"\n"
+" Click to add a contact in your address book.\n"
+"
\n"
+" OpenERP helps you easily track all activities related to\n"
+" a customer; discussions, history of business opportunities,\n"
+" documents, etc.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Kontakti"
diff --git a/addons/contacts/i18n/zh_CN.po b/addons/contacts/i18n/zh_CN.po
new file mode 100644
index 00000000000..f2e813afd34
--- /dev/null
+++ b/addons/contacts/i18n/zh_CN.po
@@ -0,0 +1,37 @@
+# Chinese (Simplified) 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-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-12-09 04:58+0000\n"
+"Last-Translator: sum1201 \n"
+"Language-Team: Chinese (Simplified) \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"\n"
+" Click to add a contact in your address book.\n"
+"
\n"
+" OpenERP helps you easily track all activities related to\n"
+" a customer; discussions, history of business opportunities,\n"
+" documents, etc.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "联系人列表"
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 63d5d3da84b..b4ec404470c 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -28,7 +28,7 @@
'summary': 'Leads, Opportunities, Phone Calls',
'description': """
The generic OpenERP Customer Relationship Management
-=====================================================
+====================================================
This application enables a group of people to intelligently and efficiently manage leads, opportunities, meetings and phone calls.
@@ -67,15 +67,11 @@ Dashboard for CRM will include:
'security/crm_security.xml',
'security/ir.model.access.csv',
- 'wizard/crm_lead_to_partner_view.xml',
'wizard/crm_lead_to_opportunity_view.xml',
'wizard/crm_phonecall_to_phonecall_view.xml',
- 'wizard/crm_phonecall_to_partner_view.xml',
- 'wizard/crm_phonecall_to_opportunity_view.xml',
'wizard/crm_opportunity_to_phonecall_view.xml',
- 'wizard/crm_partner_to_opportunity_view.xml',
'wizard/crm_merge_opportunities_view.xml',
@@ -109,6 +105,7 @@ Dashboard for CRM will include:
'test': [
'test/process/communication_with_customer.yml',
'test/process/lead2opportunity2win.yml',
+ 'test/process/lead2opportunity_assign_salesmen.yml',
'test/process/merge_opportunity.yml',
'test/process/cancel_lead.yml',
'test/process/action_rule.yml',
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 8e6d9dd1510..a8635db0296 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -197,8 +197,9 @@ class crm_case_categ(osv.osv):
def _find_object_id(self, cr, uid, context=None):
"""Finds id for case object"""
- object_id = context and context.get('object_id', False) or False
- ids = self.pool.get('ir.model').search(cr, uid, [('id', '=', object_id)])
+ context = context or {}
+ object_id = context.get('object_id', False)
+ ids = self.pool.get('ir.model').search(cr, uid, ['|',('id', '=', object_id),('model', '=', context.get('object_name', False))])
return ids and ids[0] or False
_defaults = {
diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml
index 14a9761e102..6885aba9bff 100644
--- a/addons/crm/crm_action_rule_demo.xml
+++ b/addons/crm/crm_action_rule_demo.xml
@@ -1,7 +1,13 @@
-
+
+
+ Draft Leads
+ crm.lead
+ [('state','=','draft')]
+
+
Reminder to User
@@ -10,46 +16,12 @@
email
object.user_id.email
Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' +object.partner_id.name or '']]
- Hello [[object.user_id.name]],
-can you check following lead, it's not open since 5 days ?
-
-Lead: [[object.id ]]
-Description:
-
- [[object.description]]
-
-Thanks,
+ Warning unprocessed incoming lead is more than 5 day old.
+Name: [[object.name ]]
+ID: [[object.id ]]
+Description: [[object.description]]
-
-
- Reminder to Customer
-
- True
- ir.actions.server
- email
- object.email_from
- Reminder on Lead: [[object.id ]]
- Hello [[object.partner_id and object.partner_id.name or '']],
-your following lead is not open since 5 days.
-
-Lead: [[object.id ]]
-Description:
-
- [[object.description]]
-
-Thanks,
-
-
-
-
- Draft Leads
- crm.lead
- [('state','=','draft')]
-
-
-
-
Set Auto Reminder on leads which are not open since 5 days.
@@ -58,16 +30,16 @@ Thanks,
create
5
day
-
+
+
Leads from USA
crm.lead
[('country_id','=','United States')]
-
Set Auto Followers on leads which are urgent and come from USA.
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 1acd7faccc2..72c4fd39005 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -30,6 +30,36 @@ from openerp.tools import html2plaintext
from base.res.res_partner import format_address
+CRM_LEAD_FIELDS_TO_MERGE = ['name',
+ 'partner_id',
+ 'channel_id',
+ 'company_id',
+ 'country_id',
+ 'section_id',
+ 'stage_id',
+ 'state_id',
+ 'type_id',
+ 'user_id',
+ 'title',
+ 'city',
+ 'contact_name',
+ 'description',
+ 'email',
+ 'fax',
+ 'mobile',
+ 'partner_name',
+ 'phone',
+ 'probability',
+ 'planned_revenue',
+ 'street',
+ 'street2',
+ 'zip',
+ 'create_date',
+ 'date_action_last',
+ 'date_action_next',
+ 'email_from',
+ 'email_cc',
+ 'partner_name']
CRM_LEAD_PENDING_STATES = (
crm.AVAILABLE_STATES[2][0], # Cancelled
crm.AVAILABLE_STATES[3][0], # Done
@@ -120,11 +150,7 @@ class crm_lead(base_stage, format_address, osv.osv):
def _compute_day(self, cr, uid, ids, fields, args, context=None):
"""
- @param cr: the current row, from the database cursor,
- @param uid: the current user’s ID for security checks,
- @param ids: List of Openday’s IDs
- @return: difference between current date and log date
- @param context: A standard dictionary for contextual values
+ :return dict: difference between current date and log date
"""
cal_obj = self.pool.get('resource.calendar')
res_obj = self.pool.get('resource.resource')
@@ -413,15 +439,46 @@ class crm_lead(base_stage, format_address, osv.osv):
"""
return self.set_priority(cr, uid, ids, '3')
+ def _merge_get_result_type(self, cr, uid, opps, context=None):
+ """
+ Define the type of the result of the merge. If at least one of the
+ element to merge is an opp, the resulting new element will be an opp.
+ Otherwise it will be a lead.
+
+ We'll directly use a list of browse records instead of a list of ids
+ for performances' sake: it will spare a second browse of the
+ leads/opps.
+
+ :param list opps: list of browse records containing the leads/opps to process
+ :return string type: the type of the final element
+ """
+ for opp in opps:
+ if (opp.type == 'opportunity'):
+ return 'opportunity'
+
+ return 'lead'
+
def _merge_data(self, cr, uid, ids, oldest, fields, context=None):
- # prepare opportunity data into dictionary for merging
+ """
+ Prepare lead/opp data into a dictionary for merging. Different types
+ of fields are processed in different ways:
+ - text: all the values are concatenated
+ - m2m and o2m: those fields aren't processed
+ - m2o: the first not null value prevails (the other are dropped)
+ - any other type of field: same as m2o
+
+ :param list ids: list of ids of the leads to process
+ :param list fields: list of leads' fields to process
+ :return dict data: contains the merged values
+ """
opportunities = self.browse(cr, uid, ids, context=context)
+
def _get_first_not_null(attr):
if hasattr(oldest, attr):
return getattr(oldest, attr)
- for opportunity in opportunities:
- if hasattr(opportunity, attr):
- return getattr(opportunity, attr)
+ for opp in opportunities:
+ if hasattr(opp, attr):
+ return getattr(opp, attr)
return False
def _get_first_not_null_id(attr):
@@ -429,8 +486,9 @@ class crm_lead(base_stage, format_address, osv.osv):
return res and res.id or False
def _concat_all(attr):
- return ', '.join(filter(lambda x: x, [getattr(opportunity, attr) or '' for opportunity in opportunities if hasattr(opportunity, attr)]))
+ return ', '.join(filter(lambda x: x, [getattr(opp, attr) or '' for opp in opportunities if hasattr(opp, attr)]))
+ # Process the fields' values
data = {}
for field_name in fields:
field_info = self._all_columns.get(field_name)
@@ -445,30 +503,41 @@ class crm_lead(base_stage, format_address, osv.osv):
data[field_name] = _concat_all(field_name) #not lost
else:
data[field_name] = _get_first_not_null(field_name) #not lost
+
+ # Define the resulting type ('lead' or 'opportunity')
+ data['type'] = self._merge_get_result_type(cr, uid, opportunities, context)
+
return data
def _merge_find_oldest(self, cr, uid, ids, context=None):
+ """
+ Return the oldest lead found among ids.
+
+ :param list ids: list of ids of the leads to inspect
+ :return object: browse record of the oldest of the leads
+ """
if context is None:
context = {}
- #TOCHECK: where pass 'convert' in context ?
- if context.get('convert'):
- ids = list(set(ids) - set(context.get('lead_ids', False)) )
- #search opportunities order by create date
- opportunity_ids = self.search(cr, uid, [('id', 'in', ids)], order='create_date' , context=context)
- oldest_id = opportunity_ids[0]
- return self.browse(cr, uid, oldest_id, context=context)
+ if context.get('convert'):
+ ids = list(set(ids) - set(context.get('lead_ids', [])))
+
+ # Search opportunities order by create date
+ opportunity_ids = self.search(cr, uid, [('id', 'in', ids)], order='create_date', context=context)
+ oldest_opp_id = opportunity_ids[0]
+ return self.browse(cr, uid, oldest_opp_id, context=context)
def _mail_body(self, cr, uid, lead, fields, title=False, context=None):
body = []
if title:
body.append("%s\n" % (title))
+
for field_name in fields:
field_info = self._all_columns.get(field_name)
if field_info is None:
continue
field = field_info.column
- value = None
+ value = ''
if field._type == 'selection':
if hasattr(field.selection, '__call__'):
@@ -479,24 +548,33 @@ class crm_lead(base_stage, format_address, osv.osv):
elif field._type == 'many2one':
if lead[field_name]:
value = lead[field_name].name_get()[0][1]
+ elif field._type == 'many2many':
+ if lead[field_name]:
+ for val in lead[field_name]:
+ field_value = val.name_get()[0][1]
+ value += field_value + ","
else:
value = lead[field_name]
body.append("%s: %s" % (field.string, value or ''))
- return "\n".join(body + ['---'])
+ return " ".join(body + [' '])
- def _merge_notification(self, cr, uid, opportunity_id, opportunities, context=None):
+ def _merge_notify(self, cr, uid, opportunity_id, opportunities, context=None):
+ """
+ Create a message gathering merged leads/opps information.
+ """
#TOFIX: mail template should be used instead of fix body, subject text
details = []
- merge_message = _('Merged opportunities')
+ result_type = self._merge_get_result_type(cr, uid, opportunities, context)
+ if result_type == 'lead':
+ merge_message = _('Merged leads')
+ else:
+ merge_message = _('Merged opportunities')
subject = [merge_message]
- fields = ['name', 'partner_id', 'stage_id', 'section_id', 'user_id', 'categ_ids', 'channel_id', 'company_id', 'contact_name',
- 'email_from', 'phone', 'fax', 'mobile', 'state_id', 'description', 'probability', 'planned_revenue',
- 'country_id', 'city', 'street', 'street2', 'zip']
for opportunity in opportunities:
subject.append(opportunity.name)
title = "%s : %s" % (merge_message, opportunity.name)
- details.append(self._mail_body(cr, uid, opportunity, fields, title=title, context=context))
+ details.append(self._mail_body(cr, uid, opportunity, CRM_LEAD_FIELDS_TO_MERGE, title=title, context=context))
# Chatter message's subject
subject = subject[0] + ": " + ", ".join(subject[1:])
@@ -540,42 +618,41 @@ class crm_lead(base_stage, format_address, osv.osv):
def merge_opportunity(self, cr, uid, ids, context=None):
"""
- To merge opportunities
- :param ids: list of opportunities ids to merge
+ Different cases of merge:
+ - merge leads together = 1 new lead
+ - merge at least 1 opp with anything else (lead or opp) = 1 new opp
+
+ :param list ids: leads/opportunities ids to merge
+ :return int id: id of the resulting lead/opp
"""
if context is None: context = {}
- #TOCHECK: where pass lead_ids in context?
- lead_ids = context and context.get('lead_ids', []) or []
-
if len(ids) <= 1:
- raise osv.except_osv(_('Warning!'),_('Please select more than one opportunity from the list view.'))
+ raise osv.except_osv(_('Warning!'),_('Please select more than one element (lead or opportunity) from the list view.'))
+
+ lead_ids = context.get('lead_ids', [])
ctx_opportunities = self.browse(cr, uid, lead_ids, context=context)
opportunities = self.browse(cr, uid, ids, context=context)
opportunities_list = list(set(opportunities) - set(ctx_opportunities))
oldest = self._merge_find_oldest(cr, uid, ids, context=context)
- if ctx_opportunities :
+ if ctx_opportunities:
first_opportunity = ctx_opportunities[0]
tail_opportunities = opportunities_list + ctx_opportunities[1:]
else:
first_opportunity = opportunities_list[0]
tail_opportunities = opportunities_list[1:]
- fields = ['partner_id', 'title', 'name', 'categ_ids', 'channel_id', 'city', 'company_id', 'contact_name', 'country_id', 'type_id', 'user_id', 'section_id', 'state_id', 'description', 'email', 'fax', 'mobile',
- 'partner_name', 'phone', 'probability', 'planned_revenue', 'street', 'street2', 'zip', 'create_date', 'date_action_last',
- 'date_action_next', 'email_from', 'email_cc', 'partner_name']
-
- data = self._merge_data(cr, uid, ids, oldest, fields, context=context)
+ merged_data = self._merge_data(cr, uid, ids, oldest, CRM_LEAD_FIELDS_TO_MERGE, context=context)
# Merge messages and attachements into the first opportunity
self._merge_opportunity_history(cr, uid, first_opportunity.id, tail_opportunities, context=context)
self._merge_opportunity_attachments(cr, uid, first_opportunity.id, tail_opportunities, context=context)
# Merge notifications about loss of information
- self._merge_notification(cr, uid, first_opportunity, opportunities, context=context)
+ self._merge_notify(cr, uid, first_opportunity, opportunities, context=context)
# Write merged data into first opportunity
- self.write(cr, uid, [first_opportunity.id], data, context=context)
+ self.write(cr, uid, [first_opportunity.id], merged_data, context=context)
# Delete tail opportunities
self.unlink(cr, uid, [x.id for x in tail_opportunities], context=context)
@@ -599,17 +676,17 @@ class crm_lead(base_stage, format_address, osv.osv):
stage_id = stage_ids and stage_ids[0] or False
return {
- 'planned_revenue': lead.planned_revenue,
- 'probability': lead.probability,
- 'name': lead.name,
- 'partner_id': customer and customer.id or False,
- 'user_id': (lead.user_id and lead.user_id.id),
- 'type': 'opportunity',
- 'stage_id': stage_id or False,
- 'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
- 'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),
- 'email_from': customer and customer.email or lead.email_from,
- 'phone': customer and customer.phone or lead.phone,
+ 'planned_revenue': lead.planned_revenue,
+ 'probability': lead.probability,
+ 'name': lead.name,
+ 'partner_id': customer and customer.id or False,
+ 'user_id': (lead.user_id and lead.user_id.id),
+ 'type': 'opportunity',
+ 'stage_id': stage_id or False,
+ 'date_action': fields.datetime.now(),
+ 'date_open': fields.datetime.now(),
+ 'email_from': customer and customer.email or lead.email_from,
+ 'phone': customer and customer.phone or lead.phone,
}
def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):
@@ -668,48 +745,75 @@ class crm_lead(base_stage, format_address, osv.osv):
return partner_id
def _lead_set_partner(self, cr, uid, lead, partner_id, context=None):
+ """
+ Assign a partner to a lead.
+
+ :param object lead: browse record of the lead to process
+ :param int partner_id: identifier of the partner to assign
+ :return bool: True if the partner has properly been assigned
+ """
res = False
res_partner = self.pool.get('res.partner')
if partner_id:
res_partner.write(cr, uid, partner_id, {'section_id': lead.section_id.id or False})
contact_id = res_partner.address_get(cr, uid, [partner_id])['default']
- res = lead.write({'partner_id' : partner_id, }, context=context)
+ res = lead.write({'partner_id': partner_id}, context=context)
self._lead_set_partner_send_note(cr, uid, [lead.id], context)
return res
- def convert_partner(self, cr, uid, ids, action='create', partner_id=False, context=None):
+ def handle_partner_assignation(self, cr, uid, ids, action='create', partner_id=False, context=None):
"""
- Convert partner based on action.
+ Handle partner assignation during a lead conversion.
if action is 'create', create new partner with contact and assign lead to new partner_id.
- otherwise assign lead to specified partner_id
+ otherwise assign lead to the specified partner_id
+
+ :param list ids: leads/opportunities ids to process
+ :param string action: what has to be done regarding partners (create it, assign an existing one, or nothing)
+ :param int partner_id: partner to assign if any
+ :return dict: dictionary organized as followed: {lead_id: partner_assigned_id}
"""
- if context is None:
- context = {}
+ #TODO this is a duplication of the handle_partner_assignation method of crm_phonecall
partner_ids = {}
+ # If a partner_id is given, force this partner for all elements
+ force_partner_id = partner_id
for lead in self.browse(cr, uid, ids, context=context):
+ # If the action is set to 'create' and no partner_id is set, create a new one
if action == 'create':
- if not partner_id:
- partner_id = self._create_lead_partner(cr, uid, lead, context)
+ partner_id = force_partner_id or self._create_lead_partner(cr, uid, lead, context)
self._lead_set_partner(cr, uid, lead, partner_id, context=context)
partner_ids[lead.id] = partner_id
return partner_ids
- def allocate_salesman(self, cr, uid, ids, user_ids, team_id=False, context=None):
+ def allocate_salesman(self, cr, uid, ids, user_ids=None, team_id=False, context=None):
+ """
+ Assign salesmen and salesteam to a batch of leads. If there are more
+ leads than salesmen, these salesmen will be assigned in round-robin.
+ E.g.: 4 salesmen (S1, S2, S3, S4) for 6 leads (L1, L2, ... L6). They
+ will be assigned as followed: L1 - S1, L2 - S2, L3 - S3, L4 - S4,
+ L5 - S1, L6 - S2.
+
+ :param list ids: leads/opportunities ids to process
+ :param list user_ids: salesmen to assign
+ :param int team_id: salesteam to assign
+ :return bool
+ """
index = 0
+
for lead_id in ids:
value = {}
if team_id:
value['section_id'] = team_id
- if index < len(user_ids):
+ if user_ids:
value['user_id'] = user_ids[index]
- index += 1
+ # Cycle through user_ids
+ index = (index + 1) % len(user_ids)
if value:
self.write(cr, uid, [lead_id], value, context=context)
return True
def schedule_phonecall(self, cr, uid, ids, schedule_time, call_summary, desc, phone, contact_name, user_id=False, section_id=False, categ_id=False, action='schedule', context=None):
"""
- action :('schedule','Schedule a call'), ('log','Log a call')
+ :param string action: ('schedule','Schedule a call'), ('log','Log a call')
"""
phonecall = self.pool.get('crm.phonecall')
model_data = self.pool.get('ir.model.data')
@@ -724,17 +828,17 @@ class crm_lead(base_stage, format_address, osv.osv):
if not user_id:
user_id = lead.user_id and lead.user_id.id or False
vals = {
- 'name' : call_summary,
- 'opportunity_id' : lead.id,
- 'user_id' : user_id or False,
- 'categ_id' : categ_id or False,
- 'description' : desc or '',
- 'date' : schedule_time,
- 'section_id' : section_id or False,
- 'partner_id': lead.partner_id and lead.partner_id.id or False,
- 'partner_phone' : phone or lead.phone or (lead.partner_id and lead.partner_id.phone or False),
- 'partner_mobile' : lead.partner_id and lead.partner_id.mobile or False,
- 'priority': lead.priority,
+ 'name': call_summary,
+ 'opportunity_id': lead.id,
+ 'user_id': user_id or False,
+ 'categ_id': categ_id or False,
+ 'description': desc or '',
+ 'date': schedule_time,
+ 'section_id': section_id or False,
+ 'partner_id': lead.partner_id and lead.partner_id.id or False,
+ 'partner_phone': phone or lead.phone or (lead.partner_id and lead.partner_id.phone or False),
+ 'partner_mobile': lead.partner_id and lead.partner_id.mobile or False,
+ 'priority': lead.priority,
}
new_id = phonecall.create(cr, uid, vals, context=context)
phonecall.case_open(cr, uid, [new_id], context=context)
@@ -744,30 +848,50 @@ class crm_lead(base_stage, format_address, osv.osv):
self.schedule_phonecall_send_note(cr, uid, [lead.id], new_id, action, context=context)
return phonecall_dict
-
def redirect_opportunity_view(self, cr, uid, opportunity_id, context=None):
models_data = self.pool.get('ir.model.data')
- # Get Opportunity views
- form_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_oppor')
- tree_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_oppor')
+ # Get opportunity views
+ dummy, form_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_oppor')
+ dummy, tree_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_oppor')
return {
- 'name': _('Opportunity'),
- 'view_type': 'form',
- 'view_mode': 'tree, form',
- 'res_model': 'crm.lead',
- 'domain': [('type', '=', 'opportunity')],
- 'res_id': int(opportunity_id),
- 'view_id': False,
- 'views': [(form_view and form_view[1] or False, 'form'),
- (tree_view and tree_view[1] or False, 'tree'),
- (False, 'calendar'), (False, 'graph')],
- 'type': 'ir.actions.act_window',
+ 'name': _('Opportunity'),
+ 'view_type': 'form',
+ 'view_mode': 'tree, form',
+ 'res_model': 'crm.lead',
+ 'domain': [('type', '=', 'opportunity')],
+ 'res_id': int(opportunity_id),
+ 'view_id': False,
+ 'views': [(form_view or False, 'form'),
+ (tree_view or False, 'tree'),
+ (False, 'calendar'), (False, 'graph')],
+ 'type': 'ir.actions.act_window',
+ }
+
+ def redirect_lead_view(self, cr, uid, lead_id, context=None):
+ models_data = self.pool.get('ir.model.data')
+
+ # Get lead views
+ dummy, form_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_form_view_leads')
+ dummy, tree_view = models_data.get_object_reference(cr, uid, 'crm', 'crm_case_tree_view_leads')
+ return {
+ 'name': _('Lead'),
+ 'view_type': 'form',
+ 'view_mode': 'tree, form',
+ 'res_model': 'crm.lead',
+ 'domain': [('type', '=', 'lead')],
+ 'res_id': int(lead_id),
+ 'view_id': False,
+ 'views': [(form_view or False, 'form'),
+ (tree_view or False, 'tree'),
+ (False, 'calendar'), (False, 'graph')],
+ 'type': 'ir.actions.act_window',
}
def action_makeMeeting(self, cr, uid, ids, context=None):
- """ This opens Meeting's calendar view to schedule meeting on current Opportunity
- @return : Dictionary value for created Meeting view
+ """
+ Open meeting's calendar view to schedule meeting on current opportunity.
+ :return dict: dictionary value for created Meeting view
"""
opportunity = self.browse(cr, uid, ids[0], context)
res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid, 'base_calendar', 'action_crm_meeting', context)
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index 913ce9fc612..6d392097d84 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -247,7 +247,7 @@ Andrew
Bojing Hú
Incom Corporation
bhu.a100@gmail.com
-
+
Shenzhen
@@ -548,6 +548,31 @@ Andrew
+
+ opportunity
+ Would appreciate more information about your products
+
+
+ Agrolait
+ info@agrolait.com
+
+ 69 rue de Chimay
+
+ Wavre
+ 1300
+
+
+
+ 3
+
+
+ Send Catalogue by Email
+
+
+
+
+
+
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 208d92a6684..8c38ed41a1c 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -12,7 +12,7 @@
{'default_type':'lead', 'stage_type':'lead'}
- Click to create an unqualified lead.
+ Click to create an unqualified lead.
Use leads if you need a qualification step before creating an
opportunity or a customer. It can be a business card you received,
@@ -39,48 +39,48 @@
-
- Opportunities
- crm.lead
- kanban,tree,graph,form,calendar
- [('type','=','opportunity')]
- {'stage_type': 'opportunity', 'default_type': 'opportunity'}
-
-
-
-
- Click to create a new opportunity.
-
- OpenERP helps you keep track of your sales pipeline to follow
- up potential sales and better forecast your future revenues.
-
- You will be able to plan meetings and phone calls from
- opportunities, convert them into quotations, attach related
- documents, track all discussions, and much more.
-
-
-
+
+ Opportunities
+ crm.lead
+ kanban,tree,graph,form,calendar
+ [('type','=','opportunity')]
+ {'stage_type': 'opportunity', 'default_type': 'opportunity', 'default_user_id': uid}
+
+
+
+
+ Click to create a new opportunity.
+
+ OpenERP helps you keep track of your sales pipeline to follow
+ up potential sales and better forecast your future revenues.
+
+ You will be able to plan meetings and phone calls from
+ opportunities, convert them into quotations, attach related
+ documents, track all discussions, and much more.
+
+
+
-
-
- kanban
-
-
-
+
+
+ kanban
+
+
+
-
-
- tree
-
-
-
+
+
+ tree
+
+
+
-
-
- form
-
-
-
+
+
+ form
+
+
+
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index c552b1835f2..ce5d4555028 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -2,42 +2,6 @@
-
-
- CRM Lead: Mark unread
- True
- ir.actions.server
-
- code
- self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
-
-
- action_crm_lead_unread
-
-
- action
-
- crm.lead
- client_action_multi
-
-
-
- CRM Lead: Mark read
- True
- ir.actions.server
-
- code
- self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
-
-
- action_crm_lead_read
-
-
- action
-
- crm.lead
- client_action_multi
-
+ on_change="on_change_partner(partner_id)"
+ options='{"create_name_field": "name"}'
+ context="{'default_name': contact_name, 'default_street': street, 'default_city': city, 'default_state_id': state_id, 'default_zip': zip, 'default_country_id': country_id, 'default_function': function, 'default_phone': phone, 'default_mobile': mobile, 'default_fax': fax, 'default_email': email_from, 'default_user_id': user_id, 'default_section_id': section_id}"/>
@@ -169,7 +136,7 @@
- ,
+ ,
@@ -242,7 +209,6 @@
-
Leads
@@ -308,7 +274,7 @@
Edit...
Delete
Send Email
- Log Call
+ Schedule/Log Call
Schedule Meeting
@@ -333,7 +299,7 @@
-
+
-
+
@@ -231,10 +233,10 @@
-
+
-
+
@@ -250,11 +252,10 @@
-
+
-
-
+
@@ -268,9 +269,9 @@
-
+
-
+
@@ -310,7 +311,7 @@
-
-
+
+
@@ -358,17 +359,17 @@
-
+
@@ -401,7 +402,7 @@
-
+
@@ -449,7 +450,7 @@
-
+
@@ -491,7 +492,7 @@
-
+
fleet.vehicle.odometer.form
@@ -568,7 +569,7 @@
-
+
fleet.vehicle.log.fuel.form
@@ -657,7 +658,7 @@
-
+
@@ -669,7 +670,7 @@
-
+
@@ -691,7 +692,7 @@
-
+
@@ -711,7 +712,7 @@
-
+
@@ -749,7 +750,7 @@
-
+
fleet.service.type.tree
@@ -787,7 +788,7 @@
-
+
@@ -801,7 +802,7 @@
-
+
@@ -811,7 +812,7 @@
-
+
@@ -828,7 +829,7 @@
-
+
@@ -870,7 +871,7 @@
-
+
@@ -112,7 +112,7 @@
-
+
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 73ae9ff29c1..f0589308cb7 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/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-12-06 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
"X-Generator: Launchpad (build 16341)\n"
#. module: hr
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 75c343bbcb3..ce3dc00d258 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -137,7 +137,7 @@ class hr_employee(osv.osv):
_columns = {
'state': fields.function(_state, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
'last_sign': fields.function(_last_sign, type='datetime', string='Last Sign'),
- 'attendance_access': fields.function(_attendance_access, type='boolean'),
+ 'attendance_access': fields.function(_attendance_access, string='Attendance Access', type='boolean'),
}
def _action_check(self, cr, uid, emp_id, dt=False, context=None):
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index d0e6cbbebbd..a76663dd4df 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -107,41 +107,24 @@ class hr_employee(osv.osv):
'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Appraisal Plan'),
'evaluation_date': fields.date('Next Appraisal Date', help="The date of the next appraisal is computed by the appraisal plan's dates (first appraisal + periodicity)."),
}
-
def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
+ now = parser.parse(datetime.now().strftime('%Y-%m-%d'))
obj_evaluation = self.pool.get('hr_evaluation.evaluation')
- for id in self.browse(cr, uid, self.search(cr, uid, [], context=context), context=context):
- if id.evaluation_plan_id and id.evaluation_date:
- if (parser.parse(id.evaluation_date) + relativedelta(months = int(id.evaluation_plan_id.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"):
- self.write(cr, uid, id.id, {'evaluation_date': (parser.parse(id.evaluation_date) + relativedelta(months =+ int(id.evaluation_plan_id.month_next))).strftime('%Y-%m-%d')}, context=context)
- obj_evaluation.create(cr, uid, {'employee_id': id.id, 'plan_id': id.evaluation_plan_id}, context=context)
+ emp_ids =self.search(cr, uid, [ ('evaluation_plan_id','<>',False), ('evaluation_date','=', False)], context=context)
+ for emp in self.browse(cr, uid, emp_ids, context=context):
+ first_date = (now+ relativedelta(months=emp.evaluation_plan_id.month_first)).strftime('%Y-%m-%d')
+ self.write(cr, uid, [emp.id], {'evaluation_date': first_date}, context=context)
+
+ emp_ids =self.search(cr, uid, [
+ ('evaluation_plan_id','<>',False), ('evaluation_date','<=', time.strftime("%Y-%m-%d")),
+ ], context=context)
+ for emp in self.browse(cr, uid, emp_ids, context=context):
+ next_date = (now + relativedelta(months=emp.evaluation_plan_id.month_next)).strftime('%Y-%m-%d')
+ self.write(cr, uid, [emp.id], {'evaluation_date': next_date}, context=context)
+ plan_id = obj_evaluation.create(cr, uid, {'employee_id': emp.id, 'plan_id': emp.evaluation_plan_id.id}, context=context)
+ obj_evaluation.button_plan_in_progress(cr, uid, [plan_id], context=context)
return True
- def onchange_evaluation_plan_id(self, cr, uid, ids, evaluation_plan_id, evaluation_date, context=None):
- if evaluation_plan_id:
- evaluation_plan_obj=self.pool.get('hr_evaluation.plan')
- obj_evaluation = self.pool.get('hr_evaluation.evaluation')
- flag = False
- evaluation_plan = evaluation_plan_obj.browse(cr, uid, [evaluation_plan_id], context=context)[0]
- if not evaluation_date:
- evaluation_date=(parser.parse(datetime.now().strftime('%Y-%m-%d'))+ relativedelta(months=+evaluation_plan.month_first)).strftime('%Y-%m-%d')
- flag = True
- else:
- if (parser.parse(evaluation_date) + relativedelta(months = int(evaluation_plan.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"):
- evaluation_date=(parser.parse(evaluation_date)+ relativedelta(months=+evaluation_plan.month_next)).strftime('%Y-%m-%d')
- flag = True
- if ids and flag:
- obj_evaluation.create(cr, uid, {'employee_id': ids[0], 'plan_id': evaluation_plan_id}, context=context)
- return {'value': {'evaluation_date': evaluation_date}}
-
- def create(self, cr, uid, vals, context=None):
- id = super(hr_employee, self).create(cr, uid, vals, context=context)
- if vals.get('evaluation_plan_id', False):
- self.pool.get('hr_evaluation.evaluation').create(cr, uid, {'employee_id': id, 'plan_id': vals['evaluation_plan_id']}, context=context)
- return id
-
-hr_employee()
-
class hr_evaluation(osv.osv):
_name = "hr_evaluation.evaluation"
_inherit = "mail.thread"
@@ -188,13 +171,14 @@ class hr_evaluation(osv.osv):
return res
def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
- evaluation_plan_id=False
+ vals = {}
+ vals['plan_id'] = False
if employee_id:
- employee_obj=self.pool.get('hr.employee')
+ employee_obj = self.pool.get('hr.employee')
for employee in employee_obj.browse(cr, uid, [employee_id], context=context):
if employee and employee.evaluation_plan_id and employee.evaluation_plan_id.id:
- evaluation_plan_id=employee.evaluation_plan_id.id
- return {'value': {'plan_id':evaluation_plan_id}}
+ vals.update({'plan_id': employee.evaluation_plan_id.id})
+ return {'value': vals}
def button_plan_in_progress(self, cr, uid, ids, context=None):
mail_message = self.pool.get('mail.message')
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index de0a9714763..82ef2aa83f4 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -124,7 +124,7 @@
hr_evaluation.plan.phase
-
+
@@ -290,7 +290,7 @@
created, waiting confirmation."), context=context)
return True
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index aba6dd36538..0d2e958728d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -1,43 +1,6 @@
-
-
- Holidays: Mark unread
- True
- ir.actions.server
-
- code
- self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
-
-
- action_holidays_unread
-
-
- action
-
- hr.holidays
- client_action_multi
-
-
-
- Holidays: Mark read
- True
- ir.actions.server
-
- code
- self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
-
-
- action_holidays_read
-
-
- action
-
- hr.holidays
- client_action_multi
-
-
hr.holidays.filter
hr.holidays
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index ac24ea47bd7..0cfbe531066 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/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-12-06 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
"X-Generator: Launchpad (build 16341)\n"
#. module: hr_holidays
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index f2ba3d55057..749af25e765 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -28,7 +28,7 @@
'summary': 'Jobs, Recruitment, Applications, Job Interviews',
'description': """
Manage job positions and the recruitment process
-=================================================
+================================================
This application allows you to easily keep track of jobs, vacancies, applications, interviews...
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 8282c5a300c..f709a224a45 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -35,43 +35,6 @@
-
-
- HR Applicant: Mark unread
- True
- ir.actions.server
-
- code
- self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
-
-
- action_project_unread
-
-
- action
-
- hr.applicant
- client_action_multi
-
-
-
- HR Applicant: Mark read
- True
- ir.actions.server
-
- code
- self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
-
-
- action_project_read
-
-
- action
-
- hr.applicant
- client_action_multi
-
-
Applicants
hr.applicant
@@ -107,10 +70,12 @@
+ class="oe_highlight"
+ attrs="{'invisible':['|', ('emp_id','!=',False), ('state','=','cancel')]}"/>
+
@@ -145,7 +110,7 @@
- -
+
@@ -166,12 +131,14 @@
- ,
+
+ +
- ,
+
+ +
@@ -281,7 +248,6 @@
i
-
+
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index da8e9ceb31b..77676f6b702 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-18 00:40+0000\n"
+"PO-Revision-Date: 2012-12-09 21:03+0000\n"
"Last-Translator: Felix Schubert
\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-12-04 05:33+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: hr_timesheet
#: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -41,6 +41,25 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Keine Aktivitäten bezüglich dieses Vertrages bis jetzt.\n"
+"
\n"
+" In OpenERP, Verträge und Projekte werden über analytische\n"
+" Konten abgebildet. Dadurch können Sie einfach Ihre Kosten\n"
+" und Erträge überwachen.\n"
+"
\n"
+" Kosten werden automatisch zugewiesen, wenn Sie Lieferanten\n"
+" Rechnungen, Ausgaben oder Zeiterfassungen zuordnen.\n"
+"
\n"
+" Erträge werden automatisch zugewiesen, wenn Sie "
+"Ausgangsrechnungen\n"
+" zuweisen. Ausgangsrechnungen können auf Basis von Aufträgen\n"
+" (Pauschalangebote), Zeiterfassungen (basierend auf der "
+"geleisteten Arbeit) oder\n"
+" Ausgaben (z.B. Weiterberechnung von Reisespesen) erzeugt "
+"werden.\n"
+"
\n"
+" "
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:44
@@ -52,12 +71,12 @@ msgstr "Mi"
#. module: hr_timesheet
#: view:hr.sign.out.project:0
msgid "(Keep empty for current_time)"
-msgstr "(frei lassen um aktuelle Zeiteinstellung zu verwenden)"
+msgstr "(frei lassen um die aktuelle Zeiteinstellung zu verwenden)"
#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
msgid "Group By..."
-msgstr "Gruppieren nach"
+msgstr "Gruppiert nach..."
#. module: hr_timesheet
#: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -67,16 +86,16 @@ msgid ""
"analytic account. This feature allows to record at the same time the "
"attendance and the timesheet."
msgstr ""
-"Mitarbeiter können Zeiten erfassen, die für spezifizische Projekte benötigt "
-"wurden. Ein Projekt entspricht einem Analytischen Konto, wodurch automatisch "
-"eine erfasste Zeit zu Kosten für das Projekt führt. Diese Funktion "
-"ermöglicht eine zeitgleiche Bearbeitung von Anwesenheitszeiten und Zeiten "
-"mit Projektbezug."
+"Mitarbeiter können Zeiten erfassen, die für verschieden Projekte aufgewendet "
+"wurden. Ein Projekt ist einem Analytischen Konto zugeordnet, wodurch "
+"automatisch die erfasste Zeit als Kosten für das Projekt verbucht werden. "
+"Diese Funktion ermöglicht eine zeitgleiche Bearbeitung von "
+"Anwesenheitszeiten und Projektzeiten."
#. module: hr_timesheet
#: field:hr.employee,uom_id:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "Mengeneinheit"
#. module: hr_timesheet
#: field:hr.employee,journal_id:0
@@ -104,7 +123,7 @@ msgstr "Zeiterfassung"
#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
#, python-format
msgid "Please define employee for this user!"
-msgstr ""
+msgstr "Bitte ordnen Sie diesem User einen Mitarbeiter zu!"
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:44
@@ -130,7 +149,7 @@ msgstr "Fr"
#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
msgid "Timesheet Activities"
-msgstr ""
+msgstr "Zeiterfassungsaktivitäten"
#. module: hr_timesheet
#: field:hr.sign.out.project,analytic_amount:0
@@ -151,12 +170,12 @@ msgstr "kürzlich erledigte Arbeit"
#: field:hr.sign.in.project,name:0
#: field:hr.sign.out.project,name:0
msgid "Employees name"
-msgstr "Mitarbeiter"
+msgstr "Mitarbeitername"
#. module: hr_timesheet
#: field:hr.sign.out.project,account_id:0
msgid "Project / Analytic Account"
-msgstr "Projekt / Analyse Konto"
+msgstr "Projekt / Analytisches Konto"
#. module: hr_timesheet
#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
@@ -167,12 +186,12 @@ msgstr "Drucke Zeiterfassung"
#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
#, python-format
msgid "Please define employee for your user."
-msgstr ""
+msgstr "Bitte ordnen Sie diesem User einen Mitarbeiter zu."
#. module: hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet.act_analytic_cost_revenue
msgid "Costs & Revenues"
-msgstr ""
+msgstr "Kosten & Erlöse"
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:44
@@ -189,7 +208,7 @@ msgstr "Analytisches Konto"
#. module: hr_timesheet
#: view:account.analytic.account:0
msgid "Costs and Revenues"
-msgstr ""
+msgstr "Kosten und Erlöse"
#. module: hr_timesheet
#: code:addons/hr_timesheet/hr_timesheet.py:141
@@ -199,7 +218,7 @@ msgstr ""
#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Warnung!"
#. module: hr_timesheet
#: field:hr.analytic.timesheet,partner_id:0
@@ -245,17 +264,29 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Klicken Sie hier um Ihre Aufgaben zu erfassen.\n"
+"
\n"
+" Sie können Ihre Arbeitsstunden auf Tagesbasis erfassen und "
+"auswerten. \n"
+" Alle Zeiten die für ein Projekt aufgewendet wurden, werden "
+"als Kosten\n"
+" auf dem zugehörigen Analytischen Konto verbucht und können "
+"ggf. dem\n"
+" Kunden in Rechnung gestellt werden.\n"
+"
\n"
+" "
#. module: hr_timesheet
#: view:hr.analytical.timesheet.employee:0
#: view:hr.analytical.timesheet.users:0
msgid "Print"
-msgstr "Druck"
+msgstr "Drucken"
#. module: hr_timesheet
#: help:account.analytic.account,use_timesheets:0
msgid "Check this field if this project manages timesheets"
-msgstr ""
+msgstr "Werden für das Projekt Zeiten erfasst?"
#. module: hr_timesheet
#: view:hr.analytical.timesheet.users:0
@@ -281,7 +312,7 @@ msgstr "Start Datum"
#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
#, python-format
msgid "Please define cost unit for this employee."
-msgstr ""
+msgstr "Bitte defineiren Sie die Kosteneinheit für diesen Mitarbeiter."
#. module: hr_timesheet
#: help:hr.employee,product_id:0
@@ -297,6 +328,9 @@ msgid ""
"No analytic account is defined on the project.\n"
"Please set one or we cannot automatically fill the timesheet."
msgstr ""
+"Diesem Projekt wurde kein Analytisches Konto zugewiesen.\n"
+"Bitte weisen Sie ein Analytisches Konto zu, da sonst keine automatische "
+"Zuordnung erfolgen kann."
#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
@@ -310,6 +344,9 @@ msgid ""
"No 'Analytic Journal' is defined for employee %s \n"
"Define an employee for the selected user and assign an 'Analytic Journal'!"
msgstr ""
+"Es wurde kein 'Analytisches Journal' für den Mitarbeiter %s zugeordnet\n"
+"Weisen Sie einen Mitarbeiter dem ausgewählten Benutzer zu und ordnen Sie das "
+"'Analytische Journal' zu!"
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:41
@@ -351,12 +388,12 @@ msgstr "Aufgabenbeschreibung"
#: view:hr.sign.in.project:0
#: view:hr.sign.out.project:0
msgid "or"
-msgstr ""
+msgstr "oder"
#. module: hr_timesheet
#: xsl:hr.analytical.timesheet:0
msgid "Timesheet by Employee"
-msgstr "Zeitnachweise je Mitarbeiter"
+msgstr "Zeiterfassung nach Mitarbeiter"
#. module: hr_timesheet
#: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
@@ -372,7 +409,7 @@ msgstr "Anmelden / Abmelden bei Projekt"
#. module: hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
msgid "Define your Analytic Structure"
-msgstr "Definiere die Struktur der Analytischen Konten"
+msgstr "Definieren Sie die Struktur der Analytischen Konten"
#. module: hr_timesheet
#: view:hr.sign.in.project:0
@@ -422,6 +459,8 @@ msgid ""
"No analytic journal defined for '%s'.\n"
"You should assign an analytic journal on the employee form."
msgstr ""
+"Kein Analytisches Journal für '%s' zugeordnet.\n"
+"Sie können das Analytische Journal im Datensatz des Mitarbeiters zuordnen."
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:41
@@ -436,7 +475,7 @@ msgstr "Juni"
#: field:hr.sign.in.project,state:0
#: field:hr.sign.out.project,state:0
msgid "Current Status"
-msgstr ""
+msgstr "Aktueller Status"
#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
@@ -491,7 +530,7 @@ msgstr "Anmelden / Abmelden bei Projekt"
#. module: hr_timesheet
#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
msgid "Print Employee Timesheet & Print My Timesheet"
-msgstr "Drucke Alle Arbeitszeiten & Meine Arbeitszeiten"
+msgstr "Alle Mitarbeiter Zeiterfassungen und meine Zeiterfassung drucken"
#. module: hr_timesheet
#: field:hr.sign.in.project,emp_id:0
@@ -502,7 +541,7 @@ msgstr "Mitarbeiter Nr."
#. module: hr_timesheet
#: view:hr.analytical.timesheet.users:0
msgid "Period"
-msgstr ""
+msgstr "Periode"
#. module: hr_timesheet
#: view:hr.sign.out.project:0
@@ -523,7 +562,7 @@ msgstr "Abbrechen"
#: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
msgid "Employees Timesheet"
-msgstr "Personal Arbeitszeiten"
+msgstr "Mitarbeiter Zeiterfassung"
#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
@@ -544,11 +583,11 @@ msgid ""
"project generates costs on the analytic account. This feature allows to "
"record at the same time the attendance and the timesheet."
msgstr ""
-"Mitarbeiter können Zeiten erfassen, die für spezifizische Projekte benötigt "
-"wurden. Ein Projekt entspricht einem Analytischen Konto, wodurch automatisch "
-"eine erfasste Zeit zu Kosten für das Projekt führt. Diese Funktion "
-"ermöglicht eine zeitgleiche Bearbeitung von Anwesenheitszeiten und Zeiten "
-"mit Projektbezug."
+"Mitarbeiter können Zeiten erfassen, die für verschieden Projekte aufgewendet "
+"wurden. Ein Projekt ist einem Analytischen Konto zugeordnet, wodurch "
+"automatisch die erfasste Zeit als Kosten für das Projekt verbucht werden. "
+"Diese Funktion ermöglicht eine zeitgleiche Bearbeitung von "
+"Anwesenheitszeiten und Projektzeiten."
#. module: hr_timesheet
#: field:hr.sign.in.project,server_date:0
@@ -608,7 +647,7 @@ msgstr "Februar"
#. module: hr_timesheet
#: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
msgid "Sign Out By Project"
-msgstr "Anmelden / Abmelden Projekt"
+msgstr "Abmeldung von Projekt"
#. module: hr_timesheet
#: code:addons/hr_timesheet/hr_timesheet.py:141
@@ -617,6 +656,8 @@ msgid ""
"Please create an employee for this user, using the menu: Human Resources > "
"Employees."
msgstr ""
+"Bitte legen Sie einen Mitarbeiter für diesen Benutzer an, Sie finden den "
+"Eintrag unter Personal -> Mitarbeiter."
#. module: hr_timesheet
#: view:hr.analytical.timesheet.users:0
@@ -646,7 +687,7 @@ msgstr "April"
#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
#, python-format
msgid "User Error!"
-msgstr ""
+msgstr "Benutzerfehler!"
#. module: hr_timesheet
#: view:hr.sign.in.project:0
@@ -662,7 +703,7 @@ msgstr "Jahr"
#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
msgid "Duration"
-msgstr ""
+msgstr "Dauer"
#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
@@ -673,7 +714,7 @@ msgstr "Finanzbuchhaltung"
#: xsl:hr.analytical.timesheet:0
#: xsl:hr.analytical.timesheet_users:0
msgid "Total"
-msgstr "Betrag gesamt"
+msgstr "Summe"
#. module: hr_timesheet
#: view:hr.sign.out.project:0
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index a3eee954e0f..9fa61e69abd 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -78,13 +78,6 @@ class account_analytic_account(osv.osv):
'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
}
- def on_change_use_timesheets(self, cr, uid, ids, use_timesheets, context=None):
- res = {'value': {}}
- if use_timesheets:
- ir_model_obj = self.pool.get('ir.model.data')
- res['value']['to_invoice'] = ir_model_obj.get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')[1]
- return res
-
def on_change_partner_id(self, cr, uid, ids, partner_id, name, context=None):
res = super(account_analytic_account, self).on_change_partner_id(cr, uid, ids, partner_id, name, context=context)
part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 58dca6bd2d5..4b1751abc50 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index bd46fdf62ba..2440a38bddf 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-10-12 23:22+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp \n"
+"PO-Revision-Date: 2012-12-09 21:46+0000\n"
+"Last-Translator: Felix Schubert \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-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
@@ -25,7 +25,7 @@ msgstr "Zeiterfassung nach Benutzer"
#. module: hr_timesheet_invoice
#: field:hr_timesheet_invoice.factor,name:0
msgid "Internal Name"
-msgstr ""
+msgstr "Interne Bezeichnung"
#. module: hr_timesheet_invoice
#: view:hr_timesheet_invoice.factor:0
@@ -38,23 +38,26 @@ msgid ""
"The product to invoice is defined on the employee form, the price will be "
"deducted by this pricelist on the product."
msgstr ""
+"Das Produkt, das in Rechnung gestellt wird, wird im Datensatz des "
+"Mitarbeiters festgelegt. Der Preis kann durch die Preisliste des Produkte "
+"rabattiert werden."
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
#, python-format
msgid "No record(s) found for this report."
-msgstr ""
+msgstr "Keine Daten für diese Auswertung gefunden."
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
#, python-format
msgid "Insufficient Data!"
-msgstr ""
+msgstr "Unzureichende Daten"
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
msgid "Group By..."
-msgstr "Gruppierung..."
+msgstr "Gruppieren nach"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create:0
@@ -64,12 +67,12 @@ msgstr "Erzwinge Verwendung eines spezifischen Produktes"
#. module: hr_timesheet_invoice
#: report:account.analytic.profit:0
msgid "Income"
-msgstr "Erlöse"
+msgstr "Einnahmen"
#. module: hr_timesheet_invoice
#: field:hr.timesheet.invoice.create.final,name:0
msgid "Log of Activity"
-msgstr ""
+msgstr "Keine Aktivitäten dokumentiert"
#. module: hr_timesheet_invoice
#: view:account.analytic.account:0
@@ -79,7 +82,7 @@ msgstr "Projekt wiedereröffnen"
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,product_uom_id:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "Mengeneinheit"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
@@ -103,6 +106,11 @@ msgid ""
"20% advance invoice (fixed price, based on a sale order), you should invoice "
"the rest on timesheet with a 80% ratio."
msgstr ""
+"Normalerweise werden 100% der aufgewendeten Zeiten in Rechnung gestellt. "
+"Wenn Sie jedoch Pauschalangebote und projektzeiten-basierte Abrechnungen "
+"mischen, benötigen Sie ein anderes Abrechnungsverhältnis. Wenn Sie z.B. 20% "
+"vorab abrechnen (fixer Betrag, basierend auf einem Angebot) können Sie den "
+"Restbetrag mit einem 80% Verhältnis abrechnen."
#. module: hr_timesheet_invoice
#: report:account.analytic.profit:0
@@ -113,7 +121,7 @@ msgstr "Gewinn"
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
#, python-format
msgid "You cannot modify an invoiced analytic line!"
-msgstr "Sie dürfen keine fakturierte Analysebuchung verändern"
+msgstr "Sie können keine fakturierte Analysebuchung ändern"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_factor
@@ -123,7 +131,7 @@ msgstr "Quote Abrechnung"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.invoice.create.final,time:0
msgid "Display time in the history of works"
-msgstr "Anzeige der Zeit in Liste erledigter Aufgaben"
+msgstr "Anzeige der Zeit in der Liste erledigter Aufgaben"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.analytic.profit:0
@@ -142,6 +150,9 @@ msgid ""
"Fill this field only if you want to force to use a specific product. Keep "
"empty to use the real product that comes from the cost."
msgstr ""
+"Benutzen Sie dieses Feld, wenn Sie die Verwendung eines spezifischen "
+"Produkts erzwingen wollen. Wenn Sie es leer lassen, können die realen Kosten "
+"zur Berechnung herangezogen werden."
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -159,6 +170,20 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Klicken, um einen neuen Abrechnungstyp anzulegen.\n"
+"
\n"
+" OpenERP ermöglicht Ihnen die Anlage von "
+"Standardabrechnungstypen.\n"
+" Wenn Sie regelmässig Nachlässe aufgrund von Verträgen oder "
+"Verein-\n"
+" barungen mit Ihrem Kunden gewähren, können Sie mit diesem "
+"Menu\n"
+" zusätzliche Abrechnungstypen anlegen, um Ihre "
+"Rechnungserstellung\n"
+" zu beschleunigen.\n"
+"
\n"
+" "
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
@@ -168,18 +193,18 @@ msgstr "Konto"
#. module: hr_timesheet_invoice
#: field:hr.timesheet.invoice.create,time:0
msgid "Time spent"
-msgstr "Zeitbedarf"
+msgstr "Zeitaufwand"
#. module: hr_timesheet_invoice
#: field:account.analytic.account,amount_invoiced:0
msgid "Invoiced Amount"
-msgstr "Rechnungsbetrag"
+msgstr "Abgerechneter Betrag"
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
#, python-format
msgid "Analytic Account incomplete !"
-msgstr ""
+msgstr "Analytisches Konto unvollständig!"
#. module: hr_timesheet_invoice
#: field:report_timesheet.invoice,account_id:0
@@ -191,7 +216,7 @@ msgstr "Projekt"
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Fehler!"
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,amount:0
@@ -201,23 +226,23 @@ msgstr "Betrag"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.invoice.create,name:0
msgid "The detail of each work done will be displayed on the invoice"
-msgstr "Details der erledigten Arbeit werden auf dieser Rechnung angezeigt"
+msgstr "Details der erledigten Aufgaben werden auf der Rechnung ausgegeben."
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
#, python-format
msgid "Contract has been set as pending ."
-msgstr ""
+msgstr "Der Vertrag wurde auf schwebend gesetzt"
#. module: hr_timesheet_invoice
#: field:account.analytic.account,pricelist_id:0
msgid "Pricelist"
-msgstr ""
+msgstr "Preisliste"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
msgid "Create invoice from timesheet"
-msgstr "Erzeuge Rechnung für abrechenbare Zeiten"
+msgstr "Erzeuge Rechnung auf Zeiterfassungsbasis"
#. module: hr_timesheet_invoice
#: report:account.analytic.profit:0
@@ -227,7 +252,7 @@ msgstr "bis Periode"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
msgid "Analytic account to close"
-msgstr "Abzuschliessende Analysekonten"
+msgstr "Abzuschliessende Analytische Konten"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create:0
@@ -257,7 +282,7 @@ msgstr "Frist"
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
#, python-format
msgid "Configuration Error!"
-msgstr ""
+msgstr "Konfigurationsfehler!"
#. module: hr_timesheet_invoice
#: field:report.analytic.account.close,partner_id:0
@@ -267,12 +292,12 @@ msgstr "Partner"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.invoice.create,time:0
msgid "The time of each work done will be displayed on the invoice"
-msgstr "Die Zeit jedes Arbeitsvorgangs wird auf der Rechnung ausgewiesen"
+msgstr "Der Zeitaufwand jeder Aufgabe wird auf der Rechnung ausgewiesen"
#. module: hr_timesheet_invoice
#: view:account.analytic.account:0
msgid "Cancel Contract"
-msgstr ""
+msgstr "Vertrag stornieren"
#. module: hr_timesheet_invoice
#: field:hr.timesheet.analytic.profit,date_from:0
@@ -294,7 +319,7 @@ msgstr "Abzurechnende Kosten"
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
#, python-format
msgid "Please define income account for product '%s'."
-msgstr ""
+msgstr "Bitte legen Sie ein Ertragskonto für das Produkt '%s' fest."
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,account_id:0
@@ -305,12 +330,12 @@ msgstr "Analytisches Konto"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.analytic.profit:0
msgid "Print"
-msgstr "Druck"
+msgstr "Drucken"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.invoice.create.final,date:0
msgid "Display date in the history of works"
-msgstr "Anzeige Datum in der Arbeitsvorgangshistorie"
+msgstr "Anzeigen des Datums in der Historie der Aufgaben"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.invoice.create,price:0
@@ -319,7 +344,7 @@ msgid ""
"don't want to check this"
msgstr ""
"Die Selbstkosten für jede erledigte Aufgabe werden auf der Rechnung mit "
-"angezeigt. Sie sollten prüfen, ob dieses wirklich gewollt ist."
+"angezeigt. Sie sollten prüfen, ob dies wirklich gewollt ist."
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create.final:0
@@ -336,13 +361,13 @@ msgstr "Zeiterfassung nach Benutzer"
#: view:hr.analytic.timesheet:0
#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
msgid "To Invoice"
-msgstr "Abzurechnen"
+msgstr "Abrechenbar"
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
#, python-format
msgid "Contract has been closed ."
-msgstr ""
+msgstr "Der Vertrag wurde beendet "
#. module: hr_timesheet_invoice
#: view:hr.timesheet.analytic.profit:0
@@ -355,12 +380,12 @@ msgstr "Abrechnungsquote"
#. module: hr_timesheet_invoice
#: field:hr.timesheet.invoice.create,product:0
msgid "Force Product"
-msgstr ""
+msgstr "Erzwinge Produkt"
#. module: hr_timesheet_invoice
#: view:account.analytic.account:0
msgid "Contract Finished"
-msgstr ""
+msgstr "Vertrag beendet"
#. module: hr_timesheet_invoice
#: selection:report.account.analytic.line.to.invoice,month:0
@@ -374,19 +399,19 @@ msgstr "Juli"
#. module: hr_timesheet_invoice
#: field:account.analytic.line,to_invoice:0
msgid "Invoiceable"
-msgstr ""
+msgstr "Abrechenbar"
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:56
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Warnung!"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
#: model:ir.ui.menu,name:hr_timesheet_invoice.hr_timesheet_invoice_factor_view
msgid "Types of Invoicing"
-msgstr "Rechnungsarten"
+msgstr "Abrechnungsarten"
#. module: hr_timesheet_invoice
#: report:account.analytic.profit:0
@@ -396,7 +421,7 @@ msgstr "Soll"
#. module: hr_timesheet_invoice
#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
msgid "Free of charge"
-msgstr ""
+msgstr "kostenfrei"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
@@ -427,7 +452,7 @@ msgstr "100%"
#. module: hr_timesheet_invoice
#: view:report_timesheet.user:0
msgid "Timesheet by users"
-msgstr ""
+msgstr "Zeiterfassung nach Benutzern"
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:58
@@ -448,7 +473,7 @@ msgstr "Dezember"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create.final:0
msgid "Invoice contract"
-msgstr "Fakturiere Vertrag"
+msgstr "Vertrag abrechnen"
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,month:0
@@ -485,7 +510,7 @@ msgstr "Abgerechnet"
#. module: hr_timesheet_invoice
#: field:report.analytic.account.close,quantity_max:0
msgid "Max. Quantity"
-msgstr "Max Anzahl"
+msgstr "Max. Anzahl"
#. module: hr_timesheet_invoice
#: report:account.analytic.profit:0
@@ -544,7 +569,7 @@ msgstr "Juni"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.invoice.create.final,name:0
msgid "Display detail of work in the invoice line."
-msgstr "Zeige Details der Arbeitsvorgänge in Rechnung"
+msgstr "Zeige Details der Aufgaben in der Rechnung"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_account
@@ -560,7 +585,7 @@ msgstr "Zeiterfassung nach Konto"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_account_move_line
msgid "Journal Items"
-msgstr "Journal Zeilen"
+msgstr "Journal Einträge"
#. module: hr_timesheet_invoice
#: selection:report.account.analytic.line.to.invoice,month:0
@@ -625,7 +650,7 @@ msgstr "Datum"
#. module: hr_timesheet_invoice
#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
msgid "finished"
-msgstr ""
+msgstr "Abgeschlossen"
#. module: hr_timesheet_invoice
#: field:report.timesheet.line,quantity:0
@@ -634,7 +659,7 @@ msgstr ""
#: field:report_timesheet.invoice,quantity:0
#: field:report_timesheet.user,quantity:0
msgid "Time"
-msgstr ""
+msgstr "Zeit"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
@@ -660,7 +685,7 @@ msgstr "Sachkonto"
#. module: hr_timesheet_invoice
#: view:account.analytic.account:0
msgid "Invoice on Timesheets Options"
-msgstr ""
+msgstr "Rechnung auf Basis von Zeiterfassungsoptionen"
#. module: hr_timesheet_invoice
#: report:account.analytic.profit:0
@@ -670,7 +695,7 @@ msgstr "Summen:"
#. module: hr_timesheet_invoice
#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
msgid "canceled"
-msgstr ""
+msgstr "Abgebrochen"
#. module: hr_timesheet_invoice
#: help:account.analytic.line,to_invoice:0
@@ -678,6 +703,8 @@ msgid ""
"It allows to set the discount while making invoice, keep empty if the "
"activities should not be invoiced."
msgstr ""
+"Erlaubt Ihnen einen Rabatt während der Rechnungserzeugung anzulegen. Bitte "
+"leer lassen wenn diese Aufgaben nicht in Rechnung gestellt werden sollen."
#. module: hr_timesheet_invoice
#: field:account.analytic.account,amount_max:0
@@ -687,7 +714,7 @@ msgstr "Max. Rechnungsbetrag"
#. module: hr_timesheet_invoice
#: field:account.analytic.account,to_invoice:0
msgid "Timesheet Invoicing Ratio"
-msgstr ""
+msgstr "Zeiterfassung Verrechnungsverhältnis"
#. module: hr_timesheet_invoice
#: selection:report.account.analytic.line.to.invoice,month:0
@@ -738,7 +765,7 @@ msgstr "An"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create:0
msgid "Do you want to show details of work in invoice?"
-msgstr ""
+msgstr "Möchten Sie die Aufgabendetails auf der Rechnung ausgeben?"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create:0
@@ -766,13 +793,13 @@ msgstr "Anzeige der Kosten des weiterzuberechnenden Artikels"
#. module: hr_timesheet_invoice
#: view:report_timesheet.invoice:0
msgid "Timesheets to invoice"
-msgstr "Weiterberechnung Arbeitszeiterfassung"
+msgstr "Abrechenbare Zeiterfassungen"
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
#, python-format
msgid "Contract has been canceled ."
-msgstr ""
+msgstr "Vertrag wurde abgebrochen "
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
@@ -780,6 +807,8 @@ msgstr ""
msgid ""
"Contract incomplete. Please fill in the Customer and Pricelist fields."
msgstr ""
+"Der Vertrag ist unvollständig. Bitte füllen Sie die Kunden und "
+"Preislistenfelder aus."
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 13b1fcd0adc..f5011c5aaa5 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -221,6 +221,15 @@ class hr_timesheet_sheet(osv.osv):
department_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).department_id.id
return {'value': {'department_id': department_id}}
+ # ------------------------------------------------
+ # OpenChatter methods and notifications
+ # ------------------------------------------------
+
+ def _needaction_domain_get(self, cr, uid, ids, context=None):
+ emp_obj = self.pool.get('hr.employee')
+ empids = emp_obj.search(cr, uid, [('parent_id.user_id', '=', uid)], context=context)
+ dom = ['&', ('state', '=', 'confirm'), ('employee_id', 'in', empids)]
+ return dom
hr_timesheet_sheet()
class account_analytic_line(osv.osv):
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 015308c1d85..53734d53919 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -2,7 +2,7 @@
-
+
idea.category.search
diff --git a/addons/knowledge/i18n/pt_BR.po b/addons/knowledge/i18n/pt_BR.po
index 9e6ef1b8f05..f5d05c9e705 100644
--- a/addons/knowledge/i18n/pt_BR.po
+++ b/addons/knowledge/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-12-04 15:13+0000\n"
+"PO-Revision-Date: 2012-12-06 16:47+0000\n"
"Last-Translator: Cristiano Korndörfer \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: knowledge
#: view:knowledge.config.settings:0
@@ -25,7 +25,7 @@ msgstr "Documentos"
#. module: knowledge
#: model:ir.model,name:knowledge.model_knowledge_config_settings
msgid "knowledge.config.settings"
-msgstr ""
+msgstr "knowledge.config.settings"
#. module: knowledge
#: help:knowledge.config.settings,module_document_webdav:0
@@ -65,6 +65,11 @@ msgid ""
"and a document dashboard.\n"
" This installs the module document."
msgstr ""
+"Este é um sistema de gerenciamento de documentos completo, com: autenticação "
+"de usuários,\n"
+" pesquisa completa de documentos (pptx e docx não são "
+"suportados), e um painel de documentos.\n"
+" O módulo document será instalado."
#. module: knowledge
#: field:knowledge.config.settings,module_document_page:0
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index ec7f51af2b4..807397012f2 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -20,7 +20,7 @@
-
+
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py
index c103e38979e..ffd42290ed0 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra.py
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py
@@ -164,7 +164,10 @@ class partner_vat_intra(osv.osv_memory):
'comments': comments,
'issued_by': issued_by,
})
-
+ #tax code 44: services
+ #tax code 46L: normal good deliveries
+ #tax code 46T: ABC good deliveries
+ #tax code 48xxx: credite note on tax code xxx
codes = ('44', '46L', '46T', '48s44', '48s46L', '48s46T')
cr.execute('''SELECT p.name As partner_name, l.partner_id AS partner_id, p.vat AS vat,
(CASE WHEN t.code = '48s44' THEN '44'
diff --git a/addons/l10n_be_coda/l10n_be_coda.py b/addons/l10n_be_coda/l10n_be_coda.py
index 584cf7bb8d2..e976f3b40e6 100644
--- a/addons/l10n_be_coda/l10n_be_coda.py
+++ b/addons/l10n_be_coda/l10n_be_coda.py
@@ -30,8 +30,11 @@ class coda_bank_account(osv.osv):
def _check_currency(self, cr, uid, ids, context=None):
obj_cba = self.browse(cr, uid, ids[0], context=context)
- if (obj_cba.state == 'normal') and obj_cba.journal and (obj_cba.currency != obj_cba.journal.currency):
- return False
+ if (obj_cba.state == 'normal') and obj_cba.journal:
+ if obj_cba.journal.currency and (obj_cba.currency != obj_cba.journal.currency):
+ return False
+ if not obj_cba.journal.currency and (obj_cba.currency != obj_cba.company_id.currency_id):
+ return False
return True
_columns = {
diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py
index 97b48912939..a0363162551 100644
--- a/addons/l10n_be_coda/wizard/account_coda_import.py
+++ b/addons/l10n_be_coda/wizard/account_coda_import.py
@@ -631,12 +631,6 @@ class account_coda_import(osv.osv_memory):
nb_err += 1
err_string += _('\nConfiguration Error!\nPlease verify the Default Debit and Credit Account settings in journal %s.') % journal.name
break
- if balance_start_check <> statement['balance_start']:
- nb_err += 1
- err_string += _('\nThe CODA Statement %s Starting Balance (%.2f) does not correspond with the previous Closing Balance (%.2f) in journal %s.') \
- % (statement['name'], statement['balance_start'], balance_start_check, journal.name)
- break
-
bk_st_id = bank_st_obj.create(cr, uid, {
'name': statement['name'],
'journal_id': statement['journal_id'],
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index ec50d9b0f8e..bc157713d07 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -22,8 +22,8 @@
{
'name': 'Switzerland - Accounting',
'description': """
-Swiss localization :
-====================
+Swiss localization:
+===================
- DTA generation for a lot of payment types
- BVR management (number generation, report.)
- Import account move from the bank file (like v11)
diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py
index 42765f84d0d..a1094e16d2f 100644
--- a/addons/l10n_ch/report/report_webkit_html.py
+++ b/addons/l10n_ch/report/report_webkit_html.py
@@ -20,7 +20,6 @@
##############################################################################
import time
-import sys
import os
import re
@@ -29,9 +28,10 @@ from mako.lookup import TemplateLookup
from mako import exceptions
+
+from openerp import addons
+from openerp import pooler
from openerp.report import report_sxw
-from report_webkit import webkit_report
-from report_webkit import report_helper
from openerp.osv import osv
from openerp.osv.osv import except_osv
@@ -40,11 +40,8 @@ from openerp.tools import mod10r
from openerp.tools.translate import _
from openerp.tools.config import config
-from openerp import wizard
-from openerp import addons
-from openerp import pooler
-
-
+from openerp.addons.report_webkit import webkit_report
+from openerp.addons.report_webkit import report_helper
class l10n_ch_report_webkit_html(report_sxw.rml_parse):
@@ -78,12 +75,12 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse):
def police_absolute_path(self, inner_path):
"""Will get the ocrb police absolute path"""
- path = addons.get_module_resource(os.path.join('l10n_ch', 'report', inner_path))
+ path = addons.get_module_resource('l10n_ch', 'report', inner_path)
return path
def bvr_absolute_path(self) :
"""Will get the ocrb police absolute path"""
- path = addons.get_module_resource(os.path.join('l10n_ch', 'report', 'bvr1.jpg'))
+ path = addons.get_module_resource('l10n_ch', 'report', 'bvr1.jpg')
return path
def headheight(self):
@@ -167,7 +164,7 @@ class BVRWebKitParser(webkit_report.WebKitParser):
"""generate the PDF"""
context = context or {}
if report_xml.report_type != 'webkit':
- return super(WebKitParser,self).create_single_pdf(cursor, uid, ids, data, report_xml, context=context)
+ return super(BVRWebKitParser,self).create_single_pdf(cursor, uid, ids, data, report_xml, context=context)
self.parser_instance = self.parser(cursor,
uid,
self.name2,
@@ -177,7 +174,7 @@ class BVRWebKitParser(webkit_report.WebKitParser):
self.parser_instance.set_context(objs, data, ids, report_xml.report_type)
template = False
if report_xml.report_file :
- path = addons.get_module_resource(report_xml.report_file)
+ path = addons.get_module_resource(*report_xml.report_file.split(os.path.sep))
if os.path.exists(path) :
template = file(path).read()
if not template and report_xml.report_webkit_data :
@@ -203,7 +200,7 @@ class BVRWebKitParser(webkit_report.WebKitParser):
company = user.company_id
body_mako_tpl = mako_template(template)
#BVR specific
- bvr_path = addons.get_module_resource(os.path.join('l10n_ch','report','bvr.mako'))
+ bvr_path = addons.get_module_resource('l10n_ch','report','bvr.mako')
body_bvr_tpl = mako_template(file(bvr_path).read())
helper = report_helper.WebKitHelper(cursor, uid, report_xml.id, context)
##BVR Specific
diff --git a/addons/l10n_ch/test/l10n_ch_report.yml b/addons/l10n_ch/test/l10n_ch_report.yml
index 78b04a4b931..6903ee80e6e 100644
--- a/addons/l10n_ch/test/l10n_ch_report.yml
+++ b/addons/l10n_ch/test/l10n_ch_report.yml
@@ -58,4 +58,4 @@
!python {model: account.invoice}: |
from tools.test_reports import try_report
company = self.pool.get('res.users').browse(cr, uid, uid).company_id
- company.lib_path and try_report(cr, uid, 'report.invoice_web_bvr', [ref('l10n_ch_invoice')]) or 'Webkit lib not set'
+ try_report(cr, uid, 'report.invoice_web_bvr', [ref('l10n_ch_invoice')]) or 'Unable to find Webkit'
diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py
index 62d364a5277..eb9ede34570 100755
--- a/addons/l10n_fr_hr_payroll/__openerp__.py
+++ b/addons/l10n_fr_hr_payroll/__openerp__.py
@@ -32,8 +32,8 @@ French Payroll Rules.
- All main contributions rules for French payslip, for 'cadre' and 'non-cadre'
- New payslip report
-TODO :
-------
+TODO:
+-----
- Integration with holidays module for deduction and allowance
- Integration with hr_payroll_account for the automatic account_move_line
creation from the payslip
diff --git a/addons/l10n_multilang/i18n/hr.po b/addons/l10n_multilang/i18n/hr.po
new file mode 100644
index 00000000000..ca1852490c0
--- /dev/null
+++ b/addons/l10n_multilang/i18n/hr.po
@@ -0,0 +1,163 @@
+# Croatian 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:06+0000\n"
+"PO-Revision-Date: 2012-12-09 20:31+0000\n"
+"Last-Translator: Goran Kliska \n"
+"Language-Team: Croatian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr "Predložak za fiskalnu poziciju"
+
+#. module: l10n_multilang
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr "Šifra konta mora biti jedinstvena za jednu organizaciju !"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr "Knjiga analitike"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Greška ! Ne možete kreirati rekurzivne predloške konta."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_journal
+msgid "Journal"
+msgstr "Knjiga"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "Predlošci kontnog plana"
+
+#. module: l10n_multilang
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr ""
+
+#. module: l10n_multilang
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Greška ! Ne možete kreirati rekurzivne porezne grupe."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_template
+msgid "account.tax.template"
+msgstr ""
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax
+msgid "account.tax"
+msgstr ""
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account
+msgid "Account"
+msgstr "Konto"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr ""
+
+#. module: l10n_multilang
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "Predlošci za konta"
+
+#. module: l10n_multilang
+#: help:account.chart.template,spoken_languages:0
+msgid ""
+"State here the languages for which the translations of templates could be "
+"loaded at the time of installation of this localization module and copied in "
+"the final object when generating them from templates. You must provide the "
+"language codes separated by ';'"
+msgstr ""
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "Greška ! Ne možete kreirati rekurzivna konta."
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Naziv knjige mora biti jedinstven za jednu organizaciju!"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analitički konto"
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Šifra knjige mora biti jedinstvena (za organizaciju) !"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position
+msgid "Fiscal Position"
+msgstr "Fiskalna pozicija"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: l10n_multilang
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Greška! Ne možete kreirati rekurzivna analitička konta."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Predložak PDV obrasca"
+
+#. module: l10n_multilang
+#: field:account.chart.template,spoken_languages:0
+msgid "Spoken Languages"
+msgstr ""
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 8953beef987..1b1c1365415 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index f68fb4599dc..37dff92a21f 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/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-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-04 11:00+0000\n"
+"PO-Revision-Date: 2012-12-06 17:21+0000\n"
"Last-Translator: WANTELLET Sylvain \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-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: mail
#: field:res.partner,notification_email_send:0
@@ -1490,7 +1490,7 @@ msgstr ""
#: model:ir.ui.menu,name:mail.mail_feeds
#: model:ir.ui.menu,name:mail.mail_feeds_main
msgid "Messaging"
-msgstr ""
+msgstr "Messagerie"
#. module: mail
#: view:mail.alias:0
diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po
index 91b277419d1..fdb266e335d 100644
--- a/addons/mail/i18n/hr.po
+++ b/addons/mail/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-10-28 19:42+0000\n"
-"Last-Translator: Marijan Rajic \n"
+"PO-Revision-Date: 2012-12-09 20:37+0000\n"
+"Last-Translator: Goran Kliska \n"
"Language-Team: Croatian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: mail
#: field:res.partner,notification_email_send:0
@@ -36,7 +36,7 @@ msgstr ""
#: field:mail.compose.message,author_id:0
#: field:mail.message,author_id:0
msgid "Author"
-msgstr ""
+msgstr "Autor"
#. module: mail
#: view:mail.mail:0
@@ -51,7 +51,7 @@ msgstr "Primatelji poruke"
#. module: mail
#: view:mail.message:0
msgid "Comments"
-msgstr ""
+msgstr "Komentari"
#. module: mail
#: view:mail.alias:0
@@ -88,12 +88,12 @@ msgstr ""
#. module: mail
#: view:mail.group:0
msgid "Group Name"
-msgstr ""
+msgstr "Naziv grupe"
#. module: mail
#: selection:mail.group,public:0
msgid "Public"
-msgstr ""
+msgstr "Javna"
#. module: mail
#: view:mail.mail:0
@@ -123,14 +123,14 @@ msgstr "Čarobnjak za sastavljanje e-pošte"
#: field:mail.thread,message_unread:0
#: field:res.partner,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Nepročitane poruke"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:247
#, python-format
msgid "show"
-msgstr ""
+msgstr "prikaži"
#. module: mail
#: help:mail.message.subtype,default:0
@@ -155,7 +155,7 @@ msgstr ""
#: view:mail.message:0
#: field:mail.notification,read:0
msgid "Read"
-msgstr ""
+msgstr "Pročitano"
#. module: mail
#: view:mail.group:0
@@ -233,7 +233,7 @@ msgstr "Reference"
#: code:addons/mail/static/src/xml/mail.xml:179
#, python-format
msgid "No messages."
-msgstr ""
+msgstr "Nema poruka."
#. module: mail
#: model:ir.model,name:mail.model_mail_group
@@ -294,13 +294,13 @@ msgstr ""
#. module: mail
#: field:mail.group,image_medium:0
msgid "Medium-sized photo"
-msgstr ""
+msgstr "Fotografija srednje veličine"
#. module: mail
#: model:ir.actions.client,name:mail.action_mail_to_me_feeds
#: model:ir.ui.menu,name:mail.mail_tomefeeds
msgid "To: me"
-msgstr ""
+msgstr "Za: mene"
#. module: mail
#: field:mail.message.subtype,name:0
@@ -318,7 +318,7 @@ msgstr "Auto brisanje"
#: view:mail.group:0
#, python-format
msgid "Unfollow"
-msgstr ""
+msgstr "Ne slijedi više"
#. module: mail
#. openerp-web
@@ -397,7 +397,7 @@ msgstr "Naslov"
#. module: mail
#: field:mail.wizard.invite,partner_ids:0
msgid "Partners"
-msgstr ""
+msgstr "Partneri"
#. module: mail
#: view:mail.mail:0
@@ -467,20 +467,20 @@ msgstr ""
#: field:res.partner,message_follower_ids:0
#, python-format
msgid "Followers"
-msgstr ""
+msgstr "Pratitelji"
#. module: mail
#: model:ir.actions.client,name:mail.action_mail_archives_feeds
#: model:ir.ui.menu,name:mail.mail_archivesfeeds
msgid "Archives"
-msgstr ""
+msgstr "Arhive"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:82
#, python-format
msgid "Delete this attachment"
-msgstr ""
+msgstr "Obriši privitak"
#. module: mail
#: field:mail.compose.message,message_id:0
@@ -493,30 +493,30 @@ msgstr ""
#: code:addons/mail/static/src/js/mail_followers.js:132
#, python-format
msgid "One follower"
-msgstr ""
+msgstr "Jedan pratitelj"
#. module: mail
#: field:mail.compose.message,type:0
#: field:mail.message,type:0
msgid "Type"
-msgstr ""
+msgstr "Tip"
#. module: mail
#: selection:mail.compose.message,type:0
#: view:mail.mail:0
#: selection:mail.message,type:0
msgid "Email"
-msgstr ""
+msgstr "E-mail"
#. module: mail
#: field:ir.ui.menu,mail_group_id:0
msgid "Mail Group"
-msgstr ""
+msgstr "Mail grupa"
#. module: mail
#: selection:res.partner,notification_email_send:0
msgid "Comments and Emails"
-msgstr ""
+msgstr "Komentari i mailovi"
#. module: mail
#: model:ir.model,name:mail.model_mail_favorite
diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po
index 5616c174150..3e1bf92ee2b 100644
--- a/addons/mail/i18n/it.po
+++ b/addons/mail/i18n/it.po
@@ -8,35 +8,35 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2011-01-15 19:32+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2012-12-09 13:10+0000\n"
+"Last-Translator: Davide Corio - agilebg.com \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:52+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: mail
#: field:res.partner,notification_email_send:0
msgid "Receive Feeds by Email"
-msgstr ""
+msgstr "Ricevi Feeds via Email"
#. module: mail
#: view:mail.followers:0
msgid "Followers Form"
-msgstr ""
+msgstr "Modulo Followers"
#. module: mail
#: model:ir.model,name:mail.model_publisher_warranty_contract
msgid "publisher_warranty.contract"
-msgstr ""
+msgstr "publisher_warranty.contract"
#. module: mail
#: field:mail.compose.message,author_id:0
#: field:mail.message,author_id:0
msgid "Author"
-msgstr ""
+msgstr "Autore"
#. module: mail
#: view:mail.mail:0
@@ -46,12 +46,12 @@ msgstr "Dettagli messaggio"
#. module: mail
#: help:mail.mail,email_to:0
msgid "Message recipients"
-msgstr ""
+msgstr "Destinatario messaggio"
#. module: mail
#: view:mail.message:0
msgid "Comments"
-msgstr ""
+msgstr "Commenti"
#. module: mail
#: view:mail.alias:0
@@ -63,7 +63,7 @@ msgstr "Raggruppa per..."
#: help:mail.compose.message,body:0
#: help:mail.message,body:0
msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "Pulisci automaticamente il contenuto HTML"
#. module: mail
#: help:mail.alias,alias_name:0
@@ -71,12 +71,14 @@ msgid ""
"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
""
msgstr ""
+"Il nome dell'alias email, es: 'jobs' se vuoi ricevere le email per "
+""
#. module: mail
#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
#: view:mail.compose.message:0
msgid "Compose Email"
-msgstr ""
+msgstr "Componi Email"
#. module: mail
#: constraint:mail.alias:0
@@ -84,26 +86,28 @@ msgid ""
"Invalid expression, it must be a literal python dictionary definition e.g. "
"\"{'field': 'value'}\""
msgstr ""
+"Espressione non valida, deve essere un dizionario python, es: "
+"\"{'field':'value'}\""
#. module: mail
#: view:mail.group:0
msgid "Group Name"
-msgstr ""
+msgstr "Nome Gruppo"
#. module: mail
#: selection:mail.group,public:0
msgid "Public"
-msgstr ""
+msgstr "Pubblica"
#. module: mail
#: view:mail.mail:0
msgid "Body"
-msgstr ""
+msgstr "Corpo"
#. module: mail
#: view:mail.message:0
msgid "Show messages to read"
-msgstr ""
+msgstr "Mostra messaggi da leggere"
#. module: mail
#: help:mail.compose.message,email_from:0
@@ -112,30 +116,32 @@ msgid ""
"Email address of the sender. This field is set when no matching partner is "
"found for incoming emails."
msgstr ""
+"Indirizzo email del mittente. Questo campo è valorizzato quando non viene "
+"trovato nessun partner corrispondente per le email in arrivo."
#. module: mail
#: model:ir.model,name:mail.model_mail_compose_message
msgid "Email composition wizard"
-msgstr ""
+msgstr "Wizard composizione email"
#. module: mail
#: field:mail.group,message_unread:0
#: field:mail.thread,message_unread:0
#: field:res.partner,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Messaggi Non Letti"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:247
#, python-format
msgid "show"
-msgstr ""
+msgstr "mostra"
#. module: mail
#: help:mail.message.subtype,default:0
msgid "Checked by default when subscribing."
-msgstr ""
+msgstr "Selezionato di default durante la sottoscrizione."
#. module: mail
#: help:mail.group,group_ids:0
@@ -143,37 +149,40 @@ msgid ""
"Members of those groups will automatically added as followers. Note that "
"they will be able to manage their subscription manually if necessary."
msgstr ""
+"I membri di questi gruppi verranno automaticamente aggiunti ai followers. "
+"Ricorda che saranno in grado di gestire le loro sottoscrizioni manualmente "
+"se necessario."
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/mail.js:778
#, python-format
msgid "Do you really want to delete this message?"
-msgstr ""
+msgstr "Vuoi veramente cancellare questi messaggi?"
#. module: mail
#: view:mail.message:0
#: field:mail.notification,read:0
msgid "Read"
-msgstr ""
+msgstr "Letto"
#. module: mail
#: view:mail.group:0
msgid "Search Groups"
-msgstr ""
+msgstr "Cerca Gruppi"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/mail_followers.js:134
#, python-format
msgid "followers"
-msgstr ""
+msgstr "followers"
#. module: mail
#: code:addons/mail/mail_message.py:646
#, python-format
msgid "Access Denied"
-msgstr ""
+msgstr "Accesso Negato"
#. module: mail
#: help:mail.group,image_medium:0
@@ -182,17 +191,19 @@ msgid ""
"image, with aspect ratio preserved. Use this field in form views or some "
"kanban views."
msgstr ""
+"Foto grandezza media del gruppo. Viene automaticamente ridimensionata a "
+"128x128px, preservando le proporzioni. Usata su alcuni form e viste kanban."
#. module: mail
#: view:mail.mail:0
#: selection:mail.mail,state:0
msgid "Received"
-msgstr ""
+msgstr "Ricevuti"
#. module: mail
#: field:mail.mail,body_html:0
msgid "Rich-text Contents"
-msgstr ""
+msgstr "Contenuto Rich-text"
#. module: mail
#: view:mail.mail:0
@@ -204,41 +215,41 @@ msgstr "Argomento"
#: code:addons/mail/static/src/xml/mail.xml:37
#, python-format
msgid "Open the full mail composer"
-msgstr ""
+msgstr "Apri il compositore email completo"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:37
#, python-format
msgid "ò"
-msgstr ""
+msgstr "ò"
#. module: mail
#: field:base.config.settings,alias_domain:0
msgid "Alias Domain"
-msgstr ""
+msgstr "Alias Dominio"
#. module: mail
#: field:mail.group,group_ids:0
msgid "Auto Subscription"
-msgstr ""
+msgstr "Sottoscrizione Automatica"
#. module: mail
#: field:mail.mail,references:0
msgid "References"
-msgstr ""
+msgstr "Riferimenti"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:179
#, python-format
msgid "No messages."
-msgstr ""
+msgstr "Nessun messaggio."
#. module: mail
#: model:ir.model,name:mail.model_mail_group
msgid "Discussion group"
-msgstr ""
+msgstr "Gruppo discussioni"
#. module: mail
#. openerp-web
@@ -246,14 +257,14 @@ msgstr ""
#: code:addons/mail/static/src/xml/mail.xml:95
#, python-format
msgid "uploading"
-msgstr ""
+msgstr "Caricamento"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:211
#, python-format
msgid "Set back to Inbox"
-msgstr ""
+msgstr "Reimposta a Inbox"
#. module: mail
#: help:mail.compose.message,type:0
@@ -262,55 +273,57 @@ msgid ""
"Message type: email for email message, notification for system message, "
"comment for other messages such as user replies"
msgstr ""
+"Tipo messaggio: email per messaggi email, notifica per messaggio di sistema, "
+"commento per altri messaggi come le risposte degli utenti."
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
msgid "Invite wizard"
-msgstr ""
+msgstr "Wizard invito"
#. module: mail
#: selection:mail.mail,state:0
msgid "Cancelled"
-msgstr ""
+msgstr "Annullato"
#. module: mail
#: field:mail.mail,reply_to:0
msgid "Reply-To"
-msgstr ""
+msgstr "Rispondi a"
#. module: mail
#: code:addons/mail/wizard/invite.py:36
#, python-format
msgid "You have been invited to follow %s.
"
-msgstr ""
+msgstr "Sei stato invitato a seguire %s.
"
#. module: mail
#: help:mail.group,message_unread:0
#: help:mail.thread,message_unread:0
#: help:res.partner,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se selezionato, nuovi messaggi richiedono la tua attenzione"
#. module: mail
#: field:mail.group,image_medium:0
msgid "Medium-sized photo"
-msgstr ""
+msgstr "Foto grandezza media"
#. module: mail
#: model:ir.actions.client,name:mail.action_mail_to_me_feeds
#: model:ir.ui.menu,name:mail.mail_tomefeeds
msgid "To: me"
-msgstr ""
+msgstr "A: me"
#. module: mail
#: field:mail.message.subtype,name:0
msgid "Message Type"
-msgstr ""
+msgstr "Tipo Messaggio"
#. module: mail
#: field:mail.mail,auto_delete:0
msgid "Auto Delete"
-msgstr ""
+msgstr "Eliminazione Automatica"
#. module: mail
#. openerp-web
@@ -318,28 +331,28 @@ msgstr ""
#: view:mail.group:0
#, python-format
msgid "Unfollow"
-msgstr ""
+msgstr "Non seguire più"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:246
#, python-format
msgid "show one more message"
-msgstr ""
+msgstr "Mostra un nuovo messaggio"
#. module: mail
#: code:addons/mail/mail_mail.py:71
#: code:addons/mail/res_users.py:76
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Azione non valida!"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:25
#, python-format
msgid "User img"
-msgstr ""
+msgstr "Immagine Utente"
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_mail_mail
@@ -352,7 +365,7 @@ msgstr "Email"
#. module: mail
#: field:mail.followers,partner_id:0
msgid "Related Partner"
-msgstr ""
+msgstr "Partner Correlato"
#. module: mail
#: help:mail.group,message_summary:0
@@ -362,6 +375,8 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Gestisce il sommario (numero di messaggi, ...) di Chatter. Questo sommario è "
+"direttamente in html così da poter essere inserito nelle viste kanban."
#. module: mail
#: help:mail.alias,alias_model_id:0
@@ -375,7 +390,7 @@ msgstr ""
#: selection:mail.compose.message,type:0
#: selection:mail.message,type:0
msgid "System notification"
-msgstr ""
+msgstr "Notifica di sistema"
#. module: mail
#: model:ir.model,name:mail.model_res_partner
@@ -386,7 +401,7 @@ msgstr "Partner"
#. module: mail
#: model:ir.ui.menu,name:mail.mail_my_stuff
msgid "Organizer"
-msgstr ""
+msgstr "Rubrica"
#. module: mail
#: field:mail.compose.message,subject:0
@@ -397,12 +412,12 @@ msgstr "Oggetto"
#. module: mail
#: field:mail.wizard.invite,partner_ids:0
msgid "Partners"
-msgstr ""
+msgstr "Partners"
#. module: mail
#: view:mail.mail:0
msgid "Retry"
-msgstr ""
+msgstr "Riprova"
#. module: mail
#: field:mail.compose.message,email_from:0
@@ -415,7 +430,7 @@ msgstr "Da"
#: view:mail.mail:0
#: view:mail.message.subtype:0
msgid "Email message"
-msgstr ""
+msgstr "Messaggio email"
#. module: mail
#: help:mail.compose.message,favorite_user_ids:0
@@ -426,35 +441,35 @@ msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_base_config_settings
msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
#. module: mail
#: field:mail.compose.message,to_read:0
#: field:mail.message,to_read:0
msgid "To read"
-msgstr ""
+msgstr "Da leggere"
#. module: mail
#: view:mail.compose.message:0
msgid "Send"
-msgstr ""
+msgstr "Invia"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/mail_followers.js:130
#, python-format
msgid "No followers"
-msgstr ""
+msgstr "Nessun follower"
#. module: mail
#: view:mail.mail:0
msgid "Failed"
-msgstr ""
+msgstr "Fallito"
#. module: mail
#: model:mail.message.subtype,name:mail.mt_crm_won
msgid "Won"
-msgstr ""
+msgstr "Vinto"
#. module: mail
#. openerp-web
@@ -467,67 +482,67 @@ msgstr ""
#: field:res.partner,message_follower_ids:0
#, python-format
msgid "Followers"
-msgstr ""
+msgstr "Followers"
#. module: mail
#: model:ir.actions.client,name:mail.action_mail_archives_feeds
#: model:ir.ui.menu,name:mail.mail_archivesfeeds
msgid "Archives"
-msgstr ""
+msgstr "Archivi"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:82
#, python-format
msgid "Delete this attachment"
-msgstr ""
+msgstr "Elimina questo allegato"
#. module: mail
#: field:mail.compose.message,message_id:0
#: field:mail.message,message_id:0
msgid "Message-Id"
-msgstr ""
+msgstr "Message-Id"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/js/mail_followers.js:132
#, python-format
msgid "One follower"
-msgstr ""
+msgstr "Un follower"
#. module: mail
#: field:mail.compose.message,type:0
#: field:mail.message,type:0
msgid "Type"
-msgstr ""
+msgstr "Tipo"
#. module: mail
#: selection:mail.compose.message,type:0
#: view:mail.mail:0
#: selection:mail.message,type:0
msgid "Email"
-msgstr ""
+msgstr "Email"
#. module: mail
#: field:ir.ui.menu,mail_group_id:0
msgid "Mail Group"
-msgstr ""
+msgstr "Gruppo Mail"
#. module: mail
#: selection:res.partner,notification_email_send:0
msgid "Comments and Emails"
-msgstr ""
+msgstr "Commenti ed Emails"
#. module: mail
#: model:ir.model,name:mail.model_mail_favorite
msgid "Favorite messages"
-msgstr ""
+msgstr "Messaggi preferiti"
#. module: mail
#: code:addons/mail/res_users.py:97
#, python-format
msgid "%s has joined the %s network."
-msgstr ""
+msgstr "%s si è unito alla rete %s."
#. module: mail
#: help:mail.group,image_small:0
@@ -541,36 +556,36 @@ msgstr ""
#: view:mail.compose.message:0
#: field:mail.message,partner_ids:0
msgid "Recipients"
-msgstr ""
+msgstr "Destinatari"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:126
#, python-format
msgid "<<<"
-msgstr ""
+msgstr "<<<"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:43
#, python-format
msgid "Write to the followers of this document..."
-msgstr ""
+msgstr "Scrivi ai followers di questo documento..."
#. module: mail
#: field:mail.group,group_public_id:0
msgid "Authorized Group"
-msgstr ""
+msgstr "Gruppo Autorizzato"
#. module: mail
#: view:mail.group:0
msgid "Join Group"
-msgstr ""
+msgstr "Unisciti al Gruppo"
#. module: mail
#: help:mail.mail,email_from:0
msgid "Message sender, taken from user preferences."
-msgstr ""
+msgstr "Mittente messaggi, preso dalle preferenze utente."
#. module: mail
#: code:addons/mail/wizard/invite.py:39
@@ -582,7 +597,7 @@ msgstr ""
#: field:mail.compose.message,parent_id:0
#: field:mail.message,parent_id:0
msgid "Parent Message"
-msgstr ""
+msgstr "Messaggio Superiore"
#. module: mail
#: field:mail.compose.message,res_id:0
@@ -606,14 +621,14 @@ msgstr ""
#. module: mail
#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
msgid "R&D"
-msgstr ""
+msgstr "R&D"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:61
#, python-format
msgid "/web/binary/upload_attachment"
-msgstr ""
+msgstr "/web/binary/upload_attachment"
#. module: mail
#: model:ir.model,name:mail.model_mail_thread
@@ -623,13 +638,13 @@ msgstr ""
#. module: mail
#: view:mail.mail:0
msgid "Advanced"
-msgstr ""
+msgstr "Avanzate"
#. module: mail
#: code:addons/mail/wizard/mail_compose_message.py:154
#, python-format
msgid "Re:"
-msgstr ""
+msgstr "Re:"
#. module: mail
#. openerp-web
@@ -637,7 +652,7 @@ msgstr ""
#: view:mail.mail:0
#, python-format
msgid "Reply"
-msgstr ""
+msgstr "Rispondi"
#. module: mail
#: code:addons/mail/res_users.py:76
@@ -668,26 +683,26 @@ msgstr ""
#: code:addons/mail/static/src/xml/mail.xml:271
#, python-format
msgid "like"
-msgstr ""
+msgstr "like"
#. module: mail
#: view:mail.compose.message:0
#: view:mail.mail:0
#: view:mail.wizard.invite:0
msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:44
#, python-format
msgid "Share with my followers..."
-msgstr ""
+msgstr "Condividi con i miei followers..."
#. module: mail
#: field:mail.notification,partner_id:0
msgid "Contact"
-msgstr ""
+msgstr "Contatto"
#. module: mail
#: view:mail.group:0
@@ -699,12 +714,12 @@ msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_ir_ui_menu
msgid "ir.ui.menu"
-msgstr ""
+msgstr "ir.ui.menu"
#. module: mail
#: view:mail.message:0
msgid "Has attachments"
-msgstr ""
+msgstr "Ha allegati"
#. module: mail
#: view:mail.mail:0
@@ -738,7 +753,7 @@ msgstr ""
#: view:mail.mail:0
#: selection:mail.message,type:0
msgid "Comment"
-msgstr ""
+msgstr "Commento"
#. module: mail
#: model:ir.actions.client,help:mail.action_mail_inbox_feeds
@@ -758,19 +773,19 @@ msgstr ""
#. module: mail
#: field:mail.mail,notification:0
msgid "Is Notification"
-msgstr ""
+msgstr "E' una notifica"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:161
#, python-format
msgid "Compose a new message"
-msgstr ""
+msgstr "Componi un nuovo messaggio"
#. module: mail
#: view:mail.mail:0
msgid "Send Now"
-msgstr ""
+msgstr "Invia Adesso"
#. module: mail
#: code:addons/mail/mail_mail.py:71
@@ -789,7 +804,7 @@ msgstr ""
#. module: mail
#: field:mail.group,image:0
msgid "Photo"
-msgstr ""
+msgstr "Foto"
#. module: mail
#. openerp-web
@@ -798,7 +813,7 @@ msgstr ""
#: view:mail.wizard.invite:0
#, python-format
msgid "or"
-msgstr ""
+msgstr "o"
#. module: mail
#: help:mail.compose.message,vote_user_ids:0
@@ -826,13 +841,13 @@ msgstr "Cerca email"
#. module: mail
#: model:mail.message.subtype,name:mail.mt_issue_canceled
msgid "Canceled"
-msgstr ""
+msgstr "Annullato"
#. module: mail
#: field:mail.compose.message,child_ids:0
#: field:mail.message,child_ids:0
msgid "Child Messages"
-msgstr ""
+msgstr "Messaggi Figli"
#. module: mail
#: help:mail.compose.message,to_read:0
@@ -843,12 +858,12 @@ msgstr ""
#. module: mail
#: field:mail.alias,alias_user_id:0
msgid "Owner"
-msgstr ""
+msgstr "Proprietario"
#. module: mail
#: model:ir.model,name:mail.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Utenti"
#. module: mail
#: model:ir.model,name:mail.model_mail_message
@@ -859,67 +874,67 @@ msgstr ""
#: field:mail.vote,message_id:0
#: field:mail.wizard.invite,message:0
msgid "Message"
-msgstr ""
+msgstr "Messaggio"
#. module: mail
#: model:ir.actions.client,name:mail.action_mail_star_feeds
#: model:ir.ui.menu,name:mail.mail_starfeeds
msgid "Todo"
-msgstr ""
+msgstr "Da fare"
#. module: mail
#: help:mail.followers,res_id:0
#: help:mail.wizard.invite,res_id:0
msgid "Id of the followed resource"
-msgstr ""
+msgstr "Id della risorsa seguita"
#. module: mail
#: field:mail.compose.message,body:0
#: field:mail.message,body:0
msgid "Contents"
-msgstr ""
+msgstr "Contenuti"
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_mail_alias
#: model:ir.ui.menu,name:mail.mail_alias_menu
msgid "Aliases"
-msgstr ""
+msgstr "Alias"
#. module: mail
#: field:mail.compose.message,vote_user_ids:0
#: field:mail.message,vote_user_ids:0
msgid "Votes"
-msgstr ""
+msgstr "Voti"
#. module: mail
#: view:mail.group:0
msgid "Group"
-msgstr ""
+msgstr "Gruppo"
#. module: mail
#: field:mail.group,public:0
msgid "Privacy"
-msgstr ""
+msgstr "Privacy"
#. module: mail
#: view:mail.mail:0
msgid "Notification"
-msgstr ""
+msgstr "Notifica"
#. module: mail
#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
msgid "Support"
-msgstr ""
+msgstr "Supporto"
#. module: mail
#: view:mail.wizard.invite:0
msgid "Add Followers"
-msgstr ""
+msgstr "Aggiungi Followers"
#. module: mail
#: model:mail.message.subtype,name:mail.mt_issue_closed
msgid "Closed"
-msgstr ""
+msgstr "Chiuso"
#. module: mail
#: field:mail.alias,alias_force_thread_id:0
@@ -929,7 +944,7 @@ msgstr ""
#. module: mail
#: model:ir.ui.menu,name:mail.mail_group_root
msgid "My Groups"
-msgstr ""
+msgstr "I miei Gruppi"
#. module: mail
#: model:ir.actions.client,help:mail.action_mail_archives_feeds
@@ -948,18 +963,18 @@ msgstr ""
#: view:mail.mail:0
#: field:mail.mail,state:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: mail
#: view:mail.mail:0
#: selection:mail.mail,state:0
msgid "Outgoing"
-msgstr ""
+msgstr "In uscita"
#. module: mail
#: selection:res.partner,notification_email_send:0
msgid "All feeds"
-msgstr ""
+msgstr "Tutti i feeds"
#. module: mail
#: help:mail.compose.message,record_name:0
@@ -976,12 +991,12 @@ msgstr ""
#: field:mail.message,notification_ids:0
#: view:mail.notification:0
msgid "Notifications"
-msgstr ""
+msgstr "Notifiche"
#. module: mail
#: view:mail.alias:0
msgid "Search Alias"
-msgstr ""
+msgstr "Cerca Alias"
#. module: mail
#: help:mail.alias,alias_force_thread_id:0
@@ -1004,7 +1019,7 @@ msgstr ""
#. module: mail
#: view:mail.mail:0
msgid "by"
-msgstr ""
+msgstr "da"
#. module: mail
#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
@@ -1014,14 +1029,14 @@ msgstr ""
#. module: mail
#: selection:mail.group,public:0
msgid "Selected Group Only"
-msgstr ""
+msgstr "Solo Gruppo Selezionato"
#. module: mail
#: field:mail.group,message_is_follower:0
#: field:mail.thread,message_is_follower:0
#: field:res.partner,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "E' un Follower"
#. module: mail
#: view:mail.alias:0
@@ -1029,17 +1044,17 @@ msgstr ""
#: view:mail.mail:0
#: field:mail.vote,user_id:0
msgid "User"
-msgstr ""
+msgstr "Utente"
#. module: mail
#: view:mail.group:0
msgid "Groups"
-msgstr ""
+msgstr "Gruppi"
#. module: mail
#: view:mail.message:0
msgid "Messages Search"
-msgstr ""
+msgstr "Ricerca Messaggi"
#. module: mail
#: field:mail.compose.message,date:0
@@ -1052,12 +1067,12 @@ msgstr "Data"
#: code:addons/mail/static/src/xml/mail.xml:34
#, python-format
msgid "Post"
-msgstr ""
+msgstr "Pubblica"
#. module: mail
#: view:mail.mail:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtri Estesi..."
#. module: mail
#: field:mail.group,message_comment_ids:0
@@ -1067,21 +1082,21 @@ msgstr ""
#: field:res.partner,message_comment_ids:0
#: help:res.partner,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Commenti ed Email"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:107
#, python-format
msgid "To:"
-msgstr ""
+msgstr "A:"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:166
#, python-format
msgid "Write to my followers"
-msgstr ""
+msgstr "Scrivi ai miei followers"
#. module: mail
#: model:ir.model,name:mail.model_res_groups
@@ -1091,28 +1106,28 @@ msgstr ""
#. module: mail
#: field:mail.message.subtype,default:0
msgid "Default"
-msgstr ""
+msgstr "Predefinito"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:245
#, python-format
msgid "show more message"
-msgstr ""
+msgstr "Mostra ulteriori messaggi"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:213
#, python-format
msgid "Mark as Todo"
-msgstr ""
+msgstr "Segna da fare"
#. module: mail
#: field:mail.group,message_summary:0
#: field:mail.thread,message_summary:0
#: field:res.partner,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Riepilogo"
#. module: mail
#: field:mail.compose.message,subtype_id:0
@@ -1120,32 +1135,32 @@ msgstr ""
#: field:mail.message,subtype_id:0
#: view:mail.message.subtype:0
msgid "Subtype"
-msgstr ""
+msgstr "Sottotipo"
#. module: mail
#: view:mail.group:0
msgid "Group Form"
-msgstr ""
+msgstr "Form Gruppo"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:247
#, python-format
msgid "more messages"
-msgstr ""
+msgstr "altri messaggi"
#. module: mail
#: code:addons/mail/update.py:93
#, python-format
msgid "Error"
-msgstr ""
+msgstr "Errore"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail_followers.xml:13
#, python-format
msgid "Following"
-msgstr ""
+msgstr "Seguendo"
#. module: mail
#: sql_constraint:mail.alias:0
@@ -1198,24 +1213,26 @@ msgstr "CC"
#: view:mail.compose.message:0
#, python-format
msgid "Followers of"
-msgstr ""
+msgstr "Followers di"
#. module: mail
#: help:mail.mail,auto_delete:0
msgid "Permanently delete this email after sending it, to save space"
msgstr ""
+"Cancella definitivamente questo messaggio dopo averlo inviato, per "
+"risparmiare spazio"
#. module: mail
#: model:ir.actions.client,name:mail.action_mail_group_feeds
msgid "Discussion Group"
-msgstr ""
+msgstr "Gruppo Discussioni"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:209
#, python-format
msgid "Done"
-msgstr ""
+msgstr "Completato"
#. module: mail
#: help:mail.message.subtype,res_model:0
@@ -1226,19 +1243,19 @@ msgstr ""
#. module: mail
#: model:mail.message.subtype,name:mail.mt_comment
msgid "Discussions"
-msgstr ""
+msgstr "Discussioni"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail_followers.xml:11
#, python-format
msgid "Follow"
-msgstr ""
+msgstr "Segui"
#. module: mail
#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
msgid "Whole Company"
-msgstr ""
+msgstr "Tutta l'azienda"
#. module: mail
#. openerp-web
@@ -1246,34 +1263,34 @@ msgstr ""
#: view:mail.compose.message:0
#, python-format
msgid "and"
-msgstr ""
+msgstr "e"
#. module: mail
#: help:mail.mail,body_html:0
msgid "Rich-text/HTML message"
-msgstr ""
+msgstr "Messaggio Rich-text/HTML"
#. module: mail
#: view:mail.mail:0
msgid "Creation Month"
-msgstr ""
+msgstr "Mese di Creazione"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:257
#, python-format
msgid "Compose new Message"
-msgstr ""
+msgstr "Componi nuovo Messaggio"
#. module: mail
#: field:mail.group,menu_id:0
msgid "Related Menu"
-msgstr ""
+msgstr "Menu Correlato"
#. module: mail
#: view:mail.message:0
msgid "Content"
-msgstr ""
+msgstr "Contenuto"
#. module: mail
#: field:mail.mail,email_to:0
@@ -1283,30 +1300,30 @@ msgstr "A"
#. module: mail
#: model:ir.model,name:mail.model_mail_message_subtype
msgid "mail_message_subtype"
-msgstr ""
+msgstr "mail_message_subtype"
#. module: mail
#: selection:mail.group,public:0
msgid "Private"
-msgstr ""
+msgstr "Privato"
#. module: mail
#: model:mail.message.subtype,name:mail.mt_issue_new
msgid "New"
-msgstr ""
+msgstr "Nuovo"
#. module: mail
#: field:mail.compose.message,notified_partner_ids:0
#: field:mail.message,notified_partner_ids:0
msgid "Notified partners"
-msgstr ""
+msgstr "Partners notificati"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail_followers.xml:22
#, python-format
msgid "Invite others"
-msgstr ""
+msgstr "Invita altri"
#. module: mail
#: help:mail.group,public:0
@@ -1334,18 +1351,18 @@ msgstr ""
#. module: mail
#: field:mail.group,description:0
msgid "Description"
-msgstr ""
+msgstr "Descrizione"
#. module: mail
#: model:mail.message.subtype,name:mail.mt_crm_stage
#: model:mail.message.subtype,name:mail.mt_issue_change
msgid "Stage Changed"
-msgstr ""
+msgstr "Stato Cambiato"
#. module: mail
#: model:ir.model,name:mail.model_mail_followers
msgid "Document Followers"
-msgstr ""
+msgstr "Followers del Documento"
#. module: mail
#: code:addons/mail/mail_message.py:647
@@ -1360,31 +1377,31 @@ msgstr ""
#. module: mail
#: selection:res.partner,notification_email_send:0
msgid "Never"
-msgstr ""
+msgstr "Più recente"
#. module: mail
#: field:mail.mail,mail_server_id:0
msgid "Outgoing mail server"
-msgstr ""
+msgstr "Mail server in Uscita"
#. module: mail
#: code:addons/mail/mail_message.py:813
#, python-format
msgid "Partners email addresses not found"
-msgstr ""
+msgstr "Indirizzi email Partner non trovati"
#. module: mail
#: view:mail.mail:0
#: selection:mail.mail,state:0
msgid "Sent"
-msgstr ""
+msgstr "Inviato"
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_favorites
#: model:ir.ui.menu,name:mail.menu_email_favorites
#: view:mail.favorite:0
msgid "Favorites"
-msgstr ""
+msgstr "Preferiti"
#. module: mail
#: help:res.partner,notification_email_send:0
@@ -1396,7 +1413,7 @@ msgstr ""
#: model:ir.actions.act_window,name:mail.action_view_groups
#: model:ir.ui.menu,name:mail.mail_allgroups
msgid "Join a group"
-msgstr ""
+msgstr "Unisciti ad un gruppo"
#. module: mail
#: model:ir.actions.client,help:mail.action_mail_group_feeds
@@ -1428,22 +1445,22 @@ msgstr ""
#: code:addons/mail/static/src/xml/mail.xml:113
#, python-format
msgid "this document"
-msgstr ""
+msgstr "questo documento"
#. module: mail
#: field:mail.compose.message,filter_id:0
msgid "Filters"
-msgstr ""
+msgstr "Filtri"
#. module: mail
#: model:mail.message.subtype,name:mail.mt_crm_lost
msgid "Lost"
-msgstr ""
+msgstr "Perso"
#. module: mail
#: field:mail.alias,alias_defaults:0
msgid "Default Values"
-msgstr ""
+msgstr "Valori Predefiniti"
#. module: mail
#: help:base.config.settings,alias_domain:0
@@ -1456,14 +1473,14 @@ msgstr ""
#: field:mail.compose.message,favorite_user_ids:0
#: field:mail.message,favorite_user_ids:0
msgid "Favorite"
-msgstr ""
+msgstr "Preferito"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:125
#, python-format
msgid "others..."
-msgstr ""
+msgstr "altri..."
#. module: mail
#: view:mail.alias:0
@@ -1471,12 +1488,12 @@ msgstr ""
#: field:mail.group,alias_id:0
#: field:res.users,alias_id:0
msgid "Alias"
-msgstr ""
+msgstr "Alias"
#. module: mail
#: model:ir.model,name:mail.model_mail_mail
msgid "Outgoing Mails"
-msgstr ""
+msgstr "Email in Uscita"
#. module: mail
#: help:mail.compose.message,notification_ids:0
@@ -1496,12 +1513,12 @@ msgstr ""
#: view:mail.alias:0
#: field:mail.message.subtype,res_model:0
msgid "Model"
-msgstr ""
+msgstr "Modello"
#. module: mail
#: view:mail.message:0
msgid "Unread"
-msgstr ""
+msgstr "Non letto"
#. module: mail
#: help:mail.followers,subtype_ids:0
@@ -1515,7 +1532,7 @@ msgstr ""
#: help:mail.thread,message_ids:0
#: help:res.partner,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Storico messaggi e comunicazioni"
#. module: mail
#: help:mail.mail,references:0
@@ -1525,7 +1542,7 @@ msgstr ""
#. module: mail
#: field:mail.compose.message,composition_mode:0
msgid "Composition mode"
-msgstr ""
+msgstr "Modo composizione"
#. module: mail
#: field:mail.compose.message,model:0
@@ -1553,12 +1570,12 @@ msgstr ""
#. module: mail
#: help:mail.mail,email_cc:0
msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Destinatari CC"
#. module: mail
#: field:mail.alias,alias_domain:0
msgid "Alias domain"
-msgstr ""
+msgstr "Alias dominio"
#. module: mail
#: code:addons/mail/update.py:93
@@ -1588,12 +1605,12 @@ msgstr ""
#. module: mail
#: selection:mail.mail,state:0
msgid "Delivery Failed"
-msgstr ""
+msgstr "Invio Fallito"
#. module: mail
#: field:mail.compose.message,partner_ids:0
msgid "Additional contacts"
-msgstr ""
+msgstr "Contatti Aggiuntivi"
#. module: mail
#: help:mail.compose.message,parent_id:0
@@ -1609,20 +1626,20 @@ msgstr ""
#. module: mail
#: selection:res.partner,notification_email_send:0
msgid "Emails only"
-msgstr ""
+msgstr "Solo email"
#. module: mail
#: model:ir.actions.client,name:mail.action_mail_inbox_feeds
#: model:ir.ui.menu,name:mail.mail_inboxfeeds
msgid "Inbox"
-msgstr ""
+msgstr "Inbox"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:58
#, python-format
msgid "File"
-msgstr ""
+msgstr "File"
#. module: mail
#. openerp-web
@@ -1635,7 +1652,7 @@ msgstr ""
#: model:ir.actions.act_window,name:mail.action_view_message_subtype
#: model:ir.ui.menu,name:mail.menu_message_subtype
msgid "Subtypes"
-msgstr ""
+msgstr "Sottotipi"
#. module: mail
#: model:ir.model,name:mail.model_mail_alias
diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py
index 4d182d0eea5..6eac1c0770a 100644
--- a/addons/mail/wizard/invite.py
+++ b/addons/mail/wizard/invite.py
@@ -74,6 +74,8 @@ class invite_wizard(osv.osv_memory):
for follower_id in new_follower_ids:
mail_mail = self.pool.get('mail.mail')
mail_id = mail_mail.create(cr, uid, {
+ 'model': wizard.res_model,
+ 'res_id': wizard.res_id,
'subject': 'Invitation to follow %s' % document.name_get()[0][1],
'body_html': '%s' % wizard.message,
'auto_delete': True,
diff --git a/addons/marketing/i18n/pt_BR.po b/addons/marketing/i18n/pt_BR.po
index 9084c2b3348..d8732ad349b 100644
--- a/addons/marketing/i18n/pt_BR.po
+++ b/addons/marketing/i18n/pt_BR.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-16 01:34+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br \n"
+"PO-Revision-Date: 2012-12-07 17:00+0000\n"
+"Last-Translator: Cristiano Korndörfer \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: marketing
#: model:ir.model,name:marketing.model_marketing_config_settings
msgid "marketing.config.settings"
-msgstr ""
+msgstr "marketing.config.settings"
#. module: marketing
#: help:marketing.config.settings,module_marketing_campaign_crm_demo:0
@@ -29,12 +29,15 @@ msgid ""
"Campaigns.\n"
" This installs the module marketing_campaign_crm_demo."
msgstr ""
+"Instala dados de demonstração como prospectos, campanhas e segmentos para "
+"Campanhas de Marketing.\n"
+" O módulo marketing_campaign_crm_demo será instalado."
#. module: marketing
#: model:ir.actions.act_window,name:marketing.action_marketing_configuration
#: view:marketing.config.settings:0
msgid "Configure Marketing"
-msgstr ""
+msgstr "Configurar Marketing"
#. module: marketing
#: model:ir.ui.menu,name:marketing.menu_marketing_configuration
@@ -44,17 +47,17 @@ msgstr "Marketing"
#. module: marketing
#: field:marketing.config.settings,module_marketing_campaign:0
msgid "Marketing campaigns"
-msgstr ""
+msgstr "Campanhas de marketing"
#. module: marketing
#: view:marketing.config.settings:0
msgid "or"
-msgstr ""
+msgstr "ou"
#. module: marketing
#: view:marketing.config.settings:0
msgid "Campaigns"
-msgstr ""
+msgstr "Campanhas"
#. module: marketing
#: model:res.groups,name:marketing.group_marketing_manager
@@ -69,7 +72,7 @@ msgstr "Usuário"
#. module: marketing
#: view:marketing.config.settings:0
msgid "Campaigns Settings"
-msgstr ""
+msgstr "Configurações das Campanhas"
#. module: marketing
#: field:marketing.config.settings,module_crm_profiling:0
@@ -79,12 +82,12 @@ msgstr ""
#. module: marketing
#: view:marketing.config.settings:0
msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
#. module: marketing
#: view:marketing.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
#. module: marketing
#: help:marketing.config.settings,module_marketing_campaign:0
@@ -94,6 +97,10 @@ msgid ""
"CRM leads.\n"
" This installs the module marketing_campaign."
msgstr ""
+"Fornece automação de prospectos através de campanhas de marketing.\n"
+" As campanhas podem ser definidas em qualquer recurso, não "
+"somente nos prospectos.\n"
+" O módulo marketing_campaign será instalado."
#. module: marketing
#: help:marketing.config.settings,module_crm_profiling:0
@@ -101,11 +108,13 @@ msgid ""
"Allows users to perform segmentation within partners.\n"
" This installs the module crm_profiling."
msgstr ""
+"Permite aos usuários realizar segmentação dos parceiros.\n"
+" O módulo crm_profiling será instalado."
#. module: marketing
#: field:marketing.config.settings,module_marketing_campaign_crm_demo:0
msgid "Demo data for marketing campaigns"
-msgstr ""
+msgstr "Dados de demonstração para campanhas de marketing"
#~ msgid "Image"
#~ msgstr "Imagem"
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 5fed59dac59..9b57039939c 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -467,8 +467,8 @@ class Product(osv.osv):
_inherit = 'product.product'
_columns = {
'membership': fields.boolean('Membership', help='Check if the product is eligible for membership.'),
- 'membership_date_from': fields.date('Date from', help='Date from which membership becomes active.'),
- 'membership_date_to': fields.date('Date to', help='Date until which membership remains active.'),
+ 'membership_date_from': fields.date('Membership Start Date', help='Date from which membership becomes active.'),
+ 'membership_date_to': fields.date('Membership End Date', help='Date until which membership remains active.'),
}
_sql_constraints = [('membership_date_greater','check(membership_date_to >= membership_date_from)','Error ! Ending Date cannot be set before Beginning Date.')]
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 376e0bcaf9b..5cadd4077ec 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -84,9 +84,10 @@
Membership Products
product.product
+ 6
-
+
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index 1f49d02f3d0..5f6151643e1 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-18 14:43+0000\n"
+"PO-Revision-Date: 2012-12-09 19:07+0000\n"
"Last-Translator: Erwin van der Ploeg (Endian Solutions) \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-12-04 05:09+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:37+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: mrp
#: help:mrp.config.settings,module_mrp_repair:0
@@ -102,7 +102,7 @@ msgstr "Voor voorraadproducten en verbruiksproducten"
#: help:mrp.production,message_unread:0
#: help:mrp.production.workcenter.line,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
#. module: mrp
#: help:mrp.routing.workcenter,cycle_nbr:0
@@ -116,7 +116,7 @@ msgstr ""
#. module: mrp
#: view:product.product:0
msgid "False"
-msgstr ""
+msgstr "Onwaar"
#. module: mrp
#: view:mrp.bom:0
@@ -143,6 +143,9 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Bevat de samenvatting van de chatter (aantal berichten,...). Deze "
+"samenvatting is direct in html formaat om zo in de kanban weergave te worden "
+"ingevoegd."
#. module: mrp
#: model:process.transition,name:mrp.process_transition_servicerfq0
@@ -212,7 +215,7 @@ msgstr ""
#: code:addons/mrp/mrp.py:648
#, python-format
msgid "Cannot cancel manufacturing order!"
-msgstr ""
+msgstr "Het is niet mogelijk de productieorder te annuleren!"
#. module: mrp
#: field:mrp.workcenter,costs_cycle_account_id:0
@@ -454,7 +457,7 @@ msgstr "Geplande datum"
#: code:addons/mrp/procurement.py:113
#, python-format
msgid "Manufacturing Order %s created."
-msgstr ""
+msgstr "Productieorder %s aangemaakt."
#. module: mrp
#: view:mrp.bom:0
@@ -530,7 +533,7 @@ msgstr "Offerte aanvraag"
#: view:mrp.product_price:0
#: view:mrp.workcenter.load:0
msgid "or"
-msgstr ""
+msgstr "of"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -550,7 +553,7 @@ msgstr "Producten te produceren"
#. module: mrp
#: view:mrp.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Toepassen"
#. module: mrp
#: view:mrp.routing:0
@@ -866,7 +869,7 @@ msgstr ""
#. module: mrp
#: view:mrp.production:0
msgid "Mark as Started"
-msgstr ""
+msgstr "Markeert als gestart"
#. module: mrp
#: view:mrp.production:0
@@ -945,7 +948,7 @@ msgstr "Gereed voor productie"
#: field:mrp.production,message_is_follower:0
#: field:mrp.production.workcenter.line,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Is een volger"
#. module: mrp
#: view:mrp.bom:0
@@ -1150,7 +1153,7 @@ msgstr "Modus"
#: help:mrp.production,message_ids:0
#: help:mrp.production.workcenter.line,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Berichten en communicatie historie"
#. module: mrp
#: field:mrp.workcenter.load,measure_unit:0
@@ -1190,7 +1193,7 @@ msgstr "Lopende productieorders"
#. module: mrp
#: model:ir.actions.client,name:mrp.action_client_mrp_menu
msgid "Open MRP Menu"
-msgstr ""
+msgstr "Productie menu openen"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_action4
@@ -1264,7 +1267,7 @@ msgstr "Per week"
#: field:mrp.production,message_unread:0
#: field:mrp.production.workcenter.line,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Ongelezen berichten"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_stockmts0
@@ -1309,7 +1312,7 @@ msgstr "Selecteer tijdseenheid"
#: model:ir.ui.menu,name:mrp.menu_mrp_product_form
#: view:mrp.config.settings:0
msgid "Products"
-msgstr ""
+msgstr "Producten"
#. module: mrp
#: view:report.workcenter.load:0
@@ -1336,7 +1339,7 @@ msgstr ""
#: code:addons/mrp/mrp.py:521
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Ongeldige actie!"
#. module: mrp
#: model:process.transition,note:mrp.process_transition_producttostockrules0
@@ -1382,7 +1385,7 @@ msgstr ""
#: code:addons/mrp/mrp.py:374
#, python-format
msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopie)"
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_production_product_line
@@ -1494,7 +1497,7 @@ msgstr "Kostenplaats uren"
#: field:mrp.production,product_uom:0
#: field:mrp.production.product.line,product_uom:0
msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Maateenheid product"
#. module: mrp
#: view:mrp.production:0
@@ -1765,7 +1768,7 @@ msgstr "Goedkeuren"
#. module: mrp
#: view:mrp.config.settings:0
msgid "Order"
-msgstr ""
+msgstr "Opdracht"
#. module: mrp
#: view:mrp.property.group:0
@@ -1847,7 +1850,7 @@ msgstr "Geannuleerd"
#. module: mrp
#: view:mrp.production:0
msgid "(Update)"
-msgstr ""
+msgstr "(Update)"
#. module: mrp
#: help:mrp.config.settings,module_mrp_operations:0
@@ -1890,7 +1893,7 @@ msgstr "Bedrijf"
#. module: mrp
#: view:mrp.bom:0
msgid "Default Unit of Measure"
-msgstr ""
+msgstr "Standaard maateenheid"
#. module: mrp
#: field:mrp.workcenter,time_cycle:0
@@ -1916,7 +1919,7 @@ msgstr "Automatische verwerkingsregel"
#: field:mrp.production,message_ids:0
#: field:mrp.production.workcenter.line,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Berichten"
#. module: mrp
#: view:mrp.production:0
@@ -1929,7 +1932,7 @@ msgstr "Bereken gegevens"
#: code:addons/mrp/wizard/change_production_qty.py:88
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Fout!"
#. module: mrp
#: code:addons/mrp/report/price.py:139
@@ -1973,7 +1976,7 @@ msgstr "Productietijd"
#: code:addons/mrp/mrp.py:284
#, python-format
msgid "Warning"
-msgstr ""
+msgstr "Waarschuwing"
#. module: mrp
#: field:mrp.bom,product_uos_qty:0
@@ -1983,7 +1986,7 @@ msgstr "Product hvh. VE"
#. module: mrp
#: field:mrp.production,move_prod_id:0
msgid "Product Move"
-msgstr ""
+msgstr "Product mutatie"
#. module: mrp
#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
@@ -2011,7 +2014,7 @@ msgstr "Productie efficiëntie"
#: field:mrp.production,message_follower_ids:0
#: field:mrp.production.workcenter.line,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Volgers"
#. module: mrp
#: help:mrp.bom,active:0
@@ -2222,7 +2225,7 @@ msgstr "Referentie"
#: field:mrp.production.workcenter.line,message_comment_ids:0
#: help:mrp.production.workcenter.line,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Opmerkingen en e-mails."
#. module: mrp
#: code:addons/mrp/mrp.py:784
@@ -2437,7 +2440,7 @@ msgstr "Reinigingstijd in uren"
#: field:mrp.production,message_summary:0
#: field:mrp.production.workcenter.line,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Samenvatting"
#. module: mrp
#: model:process.transition,name:mrp.process_transition_purchaseprocure0
@@ -2495,12 +2498,12 @@ msgstr "Afwezigheid resource"
#. module: mrp
#: help:mrp.bom,sequence:0
msgid "Gives the sequence order when displaying a list of bills of material."
-msgstr "Geeft de volgorde weer, bij het weergaven van een materiaallijst."
+msgstr "Geeft de volgorde weer, bij het weergeven van een materiaallijst."
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_config_settings
msgid "mrp.config.settings"
-msgstr ""
+msgstr "mrp.config.settings"
#. module: mrp
#: view:mrp.production:0
@@ -2536,9 +2539,6 @@ msgstr "Producten te verbruiken"
#~ msgid "Product Standard Price"
#~ msgstr "Standaard productprijs"
-#~ msgid "Modification Date"
-#~ msgstr "Wijzigingsdatum"
-
#~ msgid "For stockable and consumable"
#~ msgstr "Voor voorraadartikel en verbruiksartikel"
@@ -3302,9 +3302,6 @@ msgstr "Producten te verbruiken"
#~ msgid "Workcenter Operations"
#~ msgstr "Werkcenter operaties"
-#~ msgid "Modification name"
-#~ msgstr "Naamswijziging"
-
#~ msgid "alphabetical indices"
#~ msgstr "Alfabetische index"
@@ -3682,3 +3679,9 @@ msgstr "Producten te verbruiken"
#~ "en te beheren, welke moeten worden opgevolgt binnen uw werkplekken om een "
#~ "product te produceren. Ze zijn gekoppeld aan een materiaallijst, welke de "
#~ "benodigde materialen beschrijft."
+
+#~ msgid "Modification name"
+#~ msgstr "Naam van wijziging"
+
+#~ msgid "Modification Date"
+#~ msgstr "Datum van wijziging"
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2ed442b1831..932a45bbb15 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -360,9 +360,9 @@
+
-
-
+
@@ -623,7 +623,7 @@
-
+
@@ -687,7 +687,7 @@
groups="stock.group_production_lot"/>
@@ -704,7 +704,7 @@
@@ -726,7 +726,7 @@
icon="gtk-justify-fill"/>
@@ -744,7 +744,7 @@
diff --git a/addons/mrp_byproduct/i18n/nl.po b/addons/mrp_byproduct/i18n/nl.po
index 0cc23f5780c..abcc7c67d89 100644
--- a/addons/mrp_byproduct/i18n/nl.po
+++ b/addons/mrp_byproduct/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-02-18 14:58+0000\n"
+"PO-Revision-Date: 2012-12-09 18:53+0000\n"
"Last-Translator: Erwin van der Ploeg (Endian Solutions) \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-12-04 05:43+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: mrp_byproduct
#: help:mrp.subproduct,subproduct_type:0
@@ -36,7 +36,7 @@ msgstr "Product"
#. module: mrp_byproduct
#: field:mrp.subproduct,product_uom:0
msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Maateenheid product"
#. module: mrp_byproduct
#: model:ir.model,name:mrp_byproduct.model_mrp_production
@@ -46,13 +46,13 @@ msgstr "Productieorder"
#. module: mrp_byproduct
#: model:ir.model,name:mrp_byproduct.model_change_production_qty
msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Wijzig de hoeveelheid van producten"
#. module: mrp_byproduct
#: view:mrp.bom:0
#: field:mrp.bom,sub_products:0
msgid "Byproducts"
-msgstr ""
+msgstr "Bijproducten"
#. module: mrp_byproduct
#: field:mrp.subproduct,subproduct_type:0
@@ -73,7 +73,7 @@ msgstr "Aantal"
#: code:addons/mrp_byproduct/mrp_byproduct.py:62
#, python-format
msgid "Warning"
-msgstr ""
+msgstr "Waarschuwing"
#. module: mrp_byproduct
#: field:mrp.subproduct,bom_id:0
@@ -101,4 +101,4 @@ msgstr ""
#. module: mrp_byproduct
#: model:ir.model,name:mrp_byproduct.model_mrp_subproduct
msgid "Byproduct"
-msgstr ""
+msgstr "Bijproducten"
diff --git a/addons/mrp_byproduct/mrp_byproduct.py b/addons/mrp_byproduct/mrp_byproduct.py
index 7b27a3ffcfd..fc8d44025c8 100644
--- a/addons/mrp_byproduct/mrp_byproduct.py
+++ b/addons/mrp_byproduct/mrp_byproduct.py
@@ -39,6 +39,7 @@ class mrp_subproduct(osv.osv):
}
_defaults={
'subproduct_type': 'variable',
+ 'product_qty': lambda *a: 1.0,
}
def onchange_product_id(self, cr, uid, ids, product_id, context=None):
diff --git a/addons/note/i18n/hr.po b/addons/note/i18n/hr.po
new file mode 100644
index 00000000000..01be8bbc2b4
--- /dev/null
+++ b/addons/note/i18n/hr.po
@@ -0,0 +1,290 @@
+# Croatian 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-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-09 20:42+0000\n"
+"Last-Translator: Goran Kliska \n"
+"Language-Team: Croatian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr ""
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+#: model:note.stage,name:note.note_stage_02
+msgid "This Week"
+msgstr "Ovaj tjedan"
+
+#. module: note
+#: model:ir.model,name:note.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
+msgstr ""
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr "Bilješka"
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr "Grupiraj po..."
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr "Pratitelji"
+
+#. module: note
+#: model:ir.actions.act_window,help:note.action_note_note
+msgid ""
+"\n"
+" Click to add a personal note.\n"
+"
\n"
+" Use notes to organize personal tasks or notes. All\n"
+" notes are private; no one else will be able to see them. "
+"However\n"
+" you can share some notes with other people by inviting "
+"followers\n"
+" on the note. (Useful for meeting minutes, especially if\n"
+" you activate the pad feature for collaborative writings).\n"
+"
\n"
+" You can customize how you process your notes/tasks by adding,\n"
+" removing or modifying columns.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
+msgstr "Danas"
+
+#. module: note
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
+msgstr "Korisnici"
+
+#. module: note
+#: view:note.note:0
+msgid "í"
+msgstr "í"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stage of Notes"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
+msgstr "Nepročitane poruke"
+
+#. module: note
+#: field:note.note,current_partner_id:0
+msgid "unknown"
+msgstr "nepoznato"
+
+#. module: note
+#: view:note.note:0
+msgid "By sticky note Category"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_02
+msgid "Tomorrow"
+msgstr "Sutra"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,open:0
+msgid "Active"
+msgstr "Aktivan"
+
+#. module: note
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
+msgstr ""
+
+#. module: note
+#: model:ir.ui.menu,name:note.menu_notes_stage
+msgid "Categories"
+msgstr "Kategorije"
+
+#. module: note
+#: field:note.note,message_comment_ids:0
+#: help:note.note,message_comment_ids:0
+msgid "Comments and emails"
+msgstr "Komentari i e-pošta."
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr "Naziv taga"
+
+#. module: note
+#: field:note.note,message_ids:0
+msgid "Messages"
+msgstr "Poruke"
+
+#. module: note
+#: view:base.config.settings:0
+#: model:ir.actions.act_window,name:note.action_note_note
+#: model:ir.ui.menu,name:note.menu_note_notes
+#: view:note.note:0
+#: model:note.stage,name:note.note_stage_04
+msgid "Notes"
+msgstr "Bilješke"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
+msgstr "Kasnije"
+
+#. module: note
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr "Sažetak"
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr ""
+
+#. module: note
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
+msgstr ""
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr ""
+
+#. module: note
+#: model:ir.actions.act_window,name:note.action_note_stage
+#: view:note.note:0
+msgid "Stages"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
+msgstr "Poruke i povijest komuniciranja"
+
+#. module: note
+#: view:note.note:0
+msgid "Delete"
+msgstr "Briši"
+
+#. module: note
+#: field:note.note,color:0
+msgid "Color Index"
+msgstr "Indeks boje"
+
+#. module: note
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
+msgstr "Slijed"
+
+#. module: note
+#: field:note.note,tag_ids:0
+msgid "Tags"
+msgstr "Tagovi"
+
+#. module: note
+#: view:note.note:0
+msgid "Archive"
+msgstr "Arhiva"
+
+#. module: note
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Sadrži sažetak konverzacije (broj poruka,..). Ovaj sažetak je u html formatu "
+"da bi mogao biti ubačen u kanban pogled."
+
+#. module: note
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr ""
+
+#. module: note
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr "Vlasnik"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: note
+#: field:note.note,date_done:0
+msgid "Date done"
+msgstr "Datum izvršenja"
+
+#. module: note
+#: field:note.stage,fold:0
+msgid "Folded by Default"
+msgstr ""
diff --git a/addons/note/i18n/pt_BR.po b/addons/note/i18n/pt_BR.po
index 9fc11184337..31164a9ba2b 100644
--- a/addons/note/i18n/pt_BR.po
+++ b/addons/note/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-14 04:29+0000\n"
-"Last-Translator: Guilherme R. Santos \n"
+"PO-Revision-Date: 2012-12-06 12:58+0000\n"
+"Last-Translator: Cristiano Korndörfer \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: note
#: field:note.note,memo:0
@@ -31,7 +31,7 @@ msgstr "Estágio das Notas"
#: model:note.stage,name:note.demo_note_stage_04
#: model:note.stage,name:note.note_stage_02
msgid "This Week"
-msgstr ""
+msgstr "Esta Semana"
#. module: note
#: model:ir.model,name:note.model_base_config_settings
@@ -41,7 +41,7 @@ msgstr "base.config.settings"
#. module: note
#: model:ir.model,name:note.model_note_tag
msgid "Note Tag"
-msgstr "Tag da Nota"
+msgstr "Marcador da Nota"
#. module: note
#: model:res.groups,name:note.group_note_fancy
@@ -123,7 +123,7 @@ msgstr "Estágios das Notas"
#. module: note
#: field:note.note,message_unread:0
msgid "Unread Messages"
-msgstr "Mensagens não lidas"
+msgstr "Mensagens Não Lidas"
#. module: note
#: field:note.note,current_partner_id:0
@@ -133,7 +133,7 @@ msgstr "desconhecido"
#. module: note
#: view:note.note:0
msgid "By sticky note Category"
-msgstr ""
+msgstr "Por Categoria de lembrete"
#. module: note
#: help:note.note,message_unread:0
@@ -148,7 +148,7 @@ msgstr "Nome do Estágio"
#. module: note
#: field:note.note,message_is_follower:0
msgid "Is a Follower"
-msgstr "É um seguidor"
+msgstr "É um Seguidor"
#. module: note
#: model:note.stage,name:note.demo_note_stage_02
@@ -175,12 +175,12 @@ msgstr "Categorias"
#: field:note.note,message_comment_ids:0
#: help:note.note,message_comment_ids:0
msgid "Comments and emails"
-msgstr "Comentários e emails"
+msgstr "Comentários e e-mails"
#. module: note
#: field:note.tag,name:0
msgid "Tag Name"
-msgstr "Nome da Tag"
+msgstr "Nome do Marcador"
#. module: note
#: field:note.note,message_ids:0
@@ -257,7 +257,7 @@ msgstr "Sequencia"
#. module: note
#: field:note.note,tag_ids:0
msgid "Tags"
-msgstr "Tags"
+msgstr "Marcadores"
#. module: note
#: view:note.note:0
@@ -275,6 +275,9 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
#. module: note
#: field:base.config.settings,group_note_fancy:0
diff --git a/addons/note_pad/__openerp__.py b/addons/note_pad/__openerp__.py
index e1d4b96e3c6..8dd6e110e8d 100644
--- a/addons/note_pad/__openerp__.py
+++ b/addons/note_pad/__openerp__.py
@@ -25,7 +25,7 @@
'category': 'Tools',
'description': """
This module update memos inside OpenERP for using an external pad
-===================================================================
+=================================================================
Use for update your text memo in real time with the following user that you invite.
diff --git a/addons/note_pad/i18n/hr.po b/addons/note_pad/i18n/hr.po
new file mode 100644
index 00000000000..2354b2623ff
--- /dev/null
+++ b/addons/note_pad/i18n/hr.po
@@ -0,0 +1,28 @@
+# Croatian 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-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-12-09 20:25+0000\n"
+"Last-Translator: Goran Kliska \n"
+"Language-Team: Croatian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: note_pad
+#: model:ir.model,name:note_pad.model_note_note
+msgid "Note"
+msgstr "Bilješka"
+
+#. module: note_pad
+#: field:note.note,note_pad_url:0
+msgid "Pad Url"
+msgstr "Pad Url"
diff --git a/addons/note_pad/i18n/pt_BR.po b/addons/note_pad/i18n/pt_BR.po
new file mode 100644
index 00000000000..30a66801956
--- /dev/null
+++ b/addons/note_pad/i18n/pt_BR.po
@@ -0,0 +1,28 @@
+# Brazilian Portuguese 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-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-12-06 13:00+0000\n"
+"Last-Translator: Cristiano Korndörfer \n"
+"Language-Team: Brazilian Portuguese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: note_pad
+#: model:ir.model,name:note_pad.model_note_note
+msgid "Note"
+msgstr "Nota"
+
+#. module: note_pad
+#: field:note.note,note_pad_url:0
+msgid "Pad Url"
+msgstr "Url do Pad"
diff --git a/addons/pad/i18n/pt_BR.po b/addons/pad/i18n/pt_BR.po
index fe4c8062dd5..65f6e824e97 100644
--- a/addons/pad/i18n/pt_BR.po
+++ b/addons/pad/i18n/pt_BR.po
@@ -8,31 +8,31 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-01-19 19:50+0000\n"
-"Last-Translator: Emerson \n"
+"PO-Revision-Date: 2012-12-06 13:03+0000\n"
+"Last-Translator: Cristiano Korndörfer \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: pad
#. openerp-web
#: code:addons/pad/static/src/xml/pad.xml:27
#, python-format
msgid "Ñ"
-msgstr ""
+msgstr "Ñ"
#. module: pad
#: model:ir.model,name:pad.model_pad_common
msgid "pad.common"
-msgstr ""
+msgstr "pad.common"
#. module: pad
#: help:res.company,pad_key:0
msgid "Etherpad lite api key."
-msgstr ""
+msgstr "chave da api do Etherpad lite."
#. module: pad
#: model:ir.model,name:pad.model_res_company
@@ -47,26 +47,28 @@ msgid ""
"You must configure the etherpad through the menu Setting > Companies > "
"Companies, in the configuration tab of your company."
msgstr ""
+"Você deve configurar o etherpad através do menu Configuração > Empresas > "
+"Empresas, na aba de configuração da sua empresa."
#. module: pad
#: view:res.company:0
msgid "Pads"
-msgstr ""
+msgstr "Pads"
#. module: pad
#: field:res.company,pad_server:0
msgid "Pad Server"
-msgstr ""
+msgstr "Servidor Pad"
#. module: pad
#: field:res.company,pad_key:0
msgid "Pad Api Key"
-msgstr ""
+msgstr "Chave da Api Pad"
#. module: pad
#: help:res.company,pad_server:0
msgid "Etherpad lite server. Example: beta.primarypad.com"
-msgstr ""
+msgstr "Servidor Etherpad lite. Exemplo: beta.primarypad.com"
#, python-format
#~ msgid "Write"
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index eaa519dc04b..bd3e296f9b3 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -8,7 +8,7 @@
- You must configure the etherpad through the menu Setting > Companies > Companies, in the configuration tab of your company.
+ You must configure the etherpad through the menu Settings > Companies > Companies, in the configuration tab of your company.
diff --git a/addons/pad_project/i18n/hr.po b/addons/pad_project/i18n/hr.po
new file mode 100644
index 00000000000..9afc8214c00
--- /dev/null
+++ b/addons/pad_project/i18n/hr.po
@@ -0,0 +1,38 @@
+# Croatian 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-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-12-09 20:44+0000\n"
+"Last-Translator: Goran Kliska \n"
+"Language-Team: Croatian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Pogreška! Datum završetka zadatka mora biti veći od datuma početka."
+
+#. module: pad_project
+#: field:project.task,description_pad:0
+msgid "Description PAD"
+msgstr ""
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Zadatak"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Greška! Rekurzivni zadaci."
diff --git a/addons/pad_project/i18n/pt_BR.po b/addons/pad_project/i18n/pt_BR.po
index 4237a4de38e..176293a343c 100644
--- a/addons/pad_project/i18n/pt_BR.po
+++ b/addons/pad_project/i18n/pt_BR.po
@@ -8,24 +8,24 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-08-13 03:40+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-12-06 13:08+0000\n"
+"Last-Translator: Cristiano Korndörfer \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: pad_project
#: constraint:project.task:0
msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Erro ! A data final deve ser maior do que a data inicial"
+msgstr "Erro ! A data final da tarefa deve ser maior do que a data inicial"
#. module: pad_project
#: field:project.task,description_pad:0
msgid "Description PAD"
-msgstr ""
+msgstr "Descrição do Pad"
#. module: pad_project
#: model:ir.model,name:pad_project.model_project_task
diff --git a/addons/plugin/i18n/hr.po b/addons/plugin/i18n/hr.po
new file mode 100644
index 00000000000..e1dc542526b
--- /dev/null
+++ b/addons/plugin/i18n/hr.po
@@ -0,0 +1,23 @@
+# Croatian 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-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-12-09 20:44+0000\n"
+"Last-Translator: Goran Kliska \n"
+"Language-Team: Croatian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "plugin.handler"
diff --git a/addons/plugin_thunderbird/i18n/it.po b/addons/plugin_thunderbird/i18n/it.po
index c54ca6de0ec..4e40d9ae9cd 100644
--- a/addons/plugin_thunderbird/i18n/it.po
+++ b/addons/plugin_thunderbird/i18n/it.po
@@ -8,42 +8,43 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-12-26 19:12+0000\n"
-"Last-Translator: tfr (Openerp) \n"
+"PO-Revision-Date: 2012-12-09 23:19+0000\n"
+"Last-Translator: Sergio Corato \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: plugin_thunderbird
#: view:plugin_thunderbird.installer:0
msgid "Restart Thunderbird."
-msgstr ""
+msgstr "Riavvia Thunderbird."
#. module: plugin_thunderbird
#: view:plugin_thunderbird.installer:0
msgid "Thunderbird plug-in installation:"
-msgstr ""
+msgstr "Installazione plug-in Thunderbird:"
#. module: plugin_thunderbird
#: view:sale.config.settings:0
msgid "Download and install the plug-in"
-msgstr ""
+msgstr "Scarica e installa il plug-in"
#. module: plugin_thunderbird
#: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
#: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
#: view:plugin_thunderbird.installer:0
msgid "Install Thunderbird Plug-In"
-msgstr ""
+msgstr "Installa il plug-in Thunderbird"
#. module: plugin_thunderbird
#: help:plugin_thunderbird.installer,plugin_file:0
msgid ""
"Thunderbird plug-in file. Save this file and install it in Thunderbird."
msgstr ""
+"File del plug-in Thunderbird. Salvare il file e installarlo in Thunderbird."
#. module: plugin_thunderbird
#: view:plugin_thunderbird.installer:0
@@ -63,12 +64,12 @@ msgstr "Nome file"
#. module: plugin_thunderbird
#: view:plugin_thunderbird.installer:0
msgid "Click \"Install Now\"."
-msgstr ""
+msgstr "Clicca \"Installa adesso\"."
#. module: plugin_thunderbird
#: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
msgid "plugin_thunderbird.installer"
-msgstr ""
+msgstr "plugin_thunderbird.installer"
#. module: plugin_thunderbird
#: field:plugin_thunderbird.installer,plugin_file:0
@@ -79,7 +80,7 @@ msgstr "Plug-in Thunderbird"
#. module: plugin_thunderbird
#: view:plugin_thunderbird.installer:0
msgid "Configure your openerp server."
-msgstr ""
+msgstr "Configurare il server openerp."
#. module: plugin_thunderbird
#: help:plugin_thunderbird.installer,thunderbird:0
@@ -88,22 +89,22 @@ msgid ""
"its attachments."
msgstr ""
"Permette di selezionare un oggetto che è possibile aggiungere all'email e ai "
-"suoi attachment."
+"suoi allegati."
#. module: plugin_thunderbird
#: view:plugin_thunderbird.installer:0
msgid "Save the Thunderbird plug-in."
-msgstr ""
+msgstr "Salvare il plug-in Thunderbird."
#. module: plugin_thunderbird
#: view:plugin_thunderbird.installer:0
msgid "Close"
-msgstr ""
+msgstr "Chiudi"
#. module: plugin_thunderbird
#: view:plugin_thunderbird.installer:0
msgid "Select the plug-in (the file named openerp_plugin.xpi)."
-msgstr ""
+msgstr "Selezionare il plug-in (il file si chiama openerp_plugin.xpi)."
#. module: plugin_thunderbird
#: view:plugin_thunderbird.installer:0
@@ -111,11 +112,13 @@ msgid ""
"From the Thunderbird menubar: Tools > Add-ons -> Screwdriver/Wrench Icon -> "
"Install add-on from file..."
msgstr ""
+"Dalla barra del menu di Thunderbird: Strumenti > Componenti aggiuntivi -> "
+"Icona Cacciavite/Chiave -> Installa l'addon da file..."
#. module: plugin_thunderbird
#: view:plugin_thunderbird.installer:0
msgid "From the Thunderbird menubar: OpenERP -> Configuration."
-msgstr ""
+msgstr "Dalla barra del menu di Thunderbird: OpenERP -> Configurazione."
#~ msgid "Description"
#~ msgstr "Descrizione"
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index 0823a573ab6..d68bd240c4f 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -28,7 +28,7 @@
'summary': 'Touchscreen Interface for Shops',
'description': """
Quick and Easy sale process
-============================
+===========================
This module allows you to manage your shop sales very easily with a fully web based touchscreen interface.
It is compatible with all PC tablets and the iPad, offering multiple payment methods.
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index 9d5c62a36af..011c6d81bfc 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -888,6 +888,7 @@
True
0.83
Belle-Vue Kriek 25cl
+ 5410228193449
/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAYAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZhTAKACgBGZV+8wH1NACghhkEEe1AGPrHirR9CuUtr+52TOhkCKpY7R34+hpAJo/i3Rtdu2tbG5LzLH5uxkK5XpkZ60AVPGviO98N2FrPY2aXLzziIqx5GR2FDBHP+GviFqus6/Z2E9hDHFctIu4tgjYOcc9R6Uk7jasdzqWrWGj26z6hdR28bMEUueregqhFCLxhoMsyRLqEe55BEuQcbz0XPrSugNo0wOd8ea3e+HvCs+pWDQrLE6A+aCeC2OB68/wA6TdkNK55rL8T/ABLE8rGazURSIDyG4b6Hke46VKkNxZ2//C1vDhCbZZGLHA+Qjn8uPxqrknlvi3xUbvxFqN3Z394sM2wxJk8EABh2x04xUsaRr+GfGV5oel6nfWYlu4pb6KJJLjgYZXPC5+9wM4PpTuFit4n8UT67uuL/AExHe1c2yOykbCwPUZwG44yD0pXuhq6NT4MvLceI7uUtEix2IjKRpjfhhhj7/wA80RQSZzF54mvE1eaObWLpUGoMrb9xKx56nnn6ChvUEtDf+Gi/2h4ztr65fznVZQjSE7sgHBAPtQnqVyPlbOu+MaSnwnbyIkbIl4hcN16HgU5bER3PNvCP2m78U6bFHZQR7tQWUFskBByU+mBUxLlY+iDWhmc38Q4Yp/A+orLGrgKpAYdDuHNJ7DW54Q3h7y5mDCFXU9N/BrPn1N1QbjcgiF5Z3MaKltMIZt67o87vY8cjjpRLfczWxAyyRxsJMbixOF7e1VcSRtadCLnwXqkEyOrrdW8kPbnDqeO/Wi6DlZXTw/fG2klcT7Qwd1YkZxn5sE9v61Ckk7GrpSauzqfgxPBH4ruI45ixmtH+XbjGGU+tVCVyalPlW6Zl3OnwX3iDUbqWZQDfS7l2kngk5/n+VRUnYuhR9o7eRqeDfI074g6bAtwzBwwVdvHIbvmiDTaHUg4Rav1Ox+L0mPD1lFtLhrtWZR3AU5/nWsnoc8Fqcr4SvbE+ItMW2tkUPPgHByDzg9f85rGLfOdUnT9j5+h7Oa6DjOc+IE0cHgjUXlBKYQEA4PMiiplsVBJyVzwOW9tX3SHUpWHYMnz/AIc+1YW12OzllGPLzaGxZ3VjDFGJLfE4U8suc5OQc/Q/pSm2PDundqWnyMjX9Qkiu99mht4ZB91cgEjrTtzLUUXq+Xb0K2l6tLi4gmmKrKqkOcnaVOQf51SXKiZqUmrs6R7q8lsppZri3VByZBKDwfbOc8elZaX3NoqrGnycvzKHw01NdL8e6e7sBHK5hYn/AGgVH6kVtHRmVfWJTl1+xGs3EtzFMC1w7CSBwCQT6EdaUoNmcJU13TJNO1yKDxVpuowRtFDBcqcM2SRuBJJ/E0RVrFzUeVpHoPxx1Ex2+kQQyYYs82VPbgA/zq6mxnhtJXOC8L+Jr+PxFpguLlmiW7jLZ7jcM5NZxilJHTXfuPRH0tXQeccF8ZL77L4INuDhrq4RMewyx/kKmWxdNe8fPbAis0dDZsJ4gu7OVYdsUqIPlEsYbH50p00OlV5tJJMo3uoXGpXQluZN7YwB0AHoBQo2RXtLzaIYiBHISeo2/nVRMqz0RFHIwGwk4PvQ1qTGp7rRNbsyzoykgg5yDjHvStqa814Fa4fdJuPUkmtEcjLEEm+EnPKkH/P6VMlZG9KV215G74t8Ry+I7mxeTP8Ao1nHCMnqQOT+JzSk7l0Y8tzDhkMcyyKcFTkGpW5pPWLPq7Q78aroNjfg5+0W6SH6kDP61scB5d8c70mTTLEHhEeZh9SFH8jUy2NKS1PIEXfKR+J/OpRtJ2RXkcmdmzzVtXOeMuV3H24LHJPvQ1oVCT5rjycRBfUlv04/rUoqq7srMSCCKpGTLKuAu/p8tJrU0U/csQTDG36U0Zsdbkjd70PYqDsyYtlifQYFZs60tBqnkUDPon4Q37XngaKJzk2szxD6dR/OtIvQ4pq0jhPjIHl8UPkEhLeMJ+ZJ/nUzNKTsecWqlpJCB0TH5miJdVrlKDDkk96o5h0DbZPqKYEgcEtzwFwKktu5DwxwTTRJI4PlDHQcUMAZJJAGCEjGBgUIC1babM0ZZl2gqTzQC0G2lu1xMUJ4pWRp7WRrWXh2acnbHLIVGSFHSpaRaqOx7X8JLb7J4fuodu3FxyP+AitFsYzd2cr8WY/+KpQkcNboc/iRQxI4yXSZbS3MzxbN+CuQAT/nNSpJ7DadjmZ7GaNyNpYeopiJLHTZJGLSgoo/M0wGR2oN55J6bsc+makZr2Xhae7uVWCGSbJ6D+tDkluFibXdHm02wAntzCd3AKYzRzJ7BZou6Ho0M2mpcXkiwxsflGMs30FZzqqLsa06MqmyN2XSdJNsBbmaNmQhXkGQT+XFT7V31HGg5JtdDl/COlfbdVmLxtKkOcopA3HsM56VpNu2hEI3ep3Ef21Y3UMtrCozsTAGOO4+orns76nc8PDlTiz0LwRby22m3CTOHkEvLDvwK6aasjir8rlojl/iHBC/jHT2nICfZgcnGMhmx14pz2Ipq7ON1tE5dbgTsxGSGBHQHj8SfyrOnFJ6G9aV4rSw1NDtIIUfUnKyOMiGNfmx7/8A6qUqutkTToSkmy6um6NLCPKjntmf7jEZH48f1qVVkmONBzjdHJWWltP4w+xt+8CvkhD94Dng1rzXWhnyWep3SxXzTxwxbbWIEBUXAxkqOf8AvoVzNSvqdyo03S0f9a/5Gb4utZB4blneYOjMGVPvbfmxwfru/KtKcbamdVRStbYNKudPGnQObeY7flzs4yMHH5Aj8e9FRwKw3Neysabapb28ZZbTeoAHI2nIz16+oqYyV9EbVKcmm2zjPC0zLqV5smMR35JDgcZOTnHpmtajaVzzedRudS82xVA1CSaKTtnARemK57t9T2o0IqKbSTPQvhyMaLcNkkNcEgn0wK6qXwnk4y3tXYwPijIttrelzsuVMTKw9Rnn+dVNXRhF2ONuiiTrD5O1wqlWyuXHrx61hTTszpUlyRu9bmxd3mm/alkNvMilvu+UOSCM45pTcGzow/PytKwkeqWsED/6NujKKpIXBBAw3qOetTGS2SNpwlLVvqcZNdOPGkk8BMLyfMgznGRnGSK2v7tzzZySkzrZJ5UQyJqMjYOPL3chsDJyOvT9K53OXc9PC0VUpqTSMLxOwfTJHVywIG7P94n/APXWlJamWOSjBJMTQ9Re20yNoiuXLLIgHzZwOfypzg7s58HWjSk3JXuXnuXSDEgbyyS20jGcCphDzOivj1JNJbnIaJemz1N51JDAk9Mg/hXQ1dWPN0WpuQ6jFtfKue+AcAVPsy/ayta56/8AC9jJ4YlkIxm4YD/vla1SsjJmP8YYpI7fTrtVyoLxtkZHYj+RoaBM8xguZJZdnomRgnjFK1h3udANUZbdZEMeyYNvVRyrZGSR+VcsqbuztwVeFO/P1II7gyQNE5xEXBLY6UKDOmrj4tNJbnI6hcgeIXnGU+fK8ZwO36V0JaHlSd2bzanHLcs7MFL4yEXjOPpUOkaRrzirJsp6xJJe2zW9pDJIzMPlUZJwD2H41cYWM5SuZ1k88VqELsp3Hg1VkTc19Ps7zVbiCzt0knklONq807Bc725+CEce2XTdU2OUAdJ0yM45ww7Z9qBCWfwavg2LrV4FQnnyo2Y/rigD0nQ9FtvD+lR6falmRMks55Zj1JpgTajptnq1k9nf26zwP1Rv5+xoA8+8T/DXSNJ0W61LSxcieFdwjaTcu3Iz2z096QHlzXU6A4IJHcjmlyod2Kl5cPE26QjpjFCiguzoLT4R6vrGmQ6zbXESvOxYW82UO3sc+/4cYp2ETj4V+KvPB+yQbc9fPXH86BnceCfh5LoN+NU1K4SS5UHy4ouVTIwSSepxQI7C50bS7yQyXWm2k7nq0kCsfzIpgTW1laWSlbW1hgU9RFGFH6UATUAFAAaAAGkAhAIIIBB6g0Ac5ffD/wAMX8plk0xI2bk+SzID+AOKAJNP8C+GtMcSW+lRM4OQ0pMn/oRIoA6AcDAoAM0AGaADNABmgAzQAZoACeKAAP/Z
@@ -896,6 +897,7 @@
True
1.00
Leffe Brune 33cl
+ 5410228142164
/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAF8AZAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqYGRr3iTT9Dgf7RdRx3BjLRo4Jye2cdqmUrFRjc4JPiRrZuE2NZzRscDbA3+PFZOpJbo09nHueoW8jS20UjABnQMQDwCRWxizmvFHjOHR1SKwns57jeVkR3zsx2IHQ1Ep22LjC+5S8KeOb3XdVSyubSBQ4b54N2BgZ6nilGo27WHKmkr3O1ZgqlmICgZJPatDM4LxD8RpNP1B4NMWxu4lAw5kJ3cc9OOvvUSm09jSNNNbm/4U8QzeILaZ5oYkaEgFomJVic8cjtj9acJ8wpx5TbnnhtYWmnlSKNfvM5wBVEHn978TLtNQeCztbOSIS7EZ5W+Zc/eyOKhza6Gqpp9TstB1VtY0tLt4ljYsVIUkg47jIBqoy5kROPK7GlVEhQB558RTi/X5ZS3kKV2LkHlutc1fc6aOx5410slsj750b+PPAc5+6PbHp6CoirFyPfdNdZdLtZEGFeFCB6AqK6zke54vr8kMd5cNsLSrcyIQ8W4RneRwcc/rXJK/MdcdjX8EXEcnjK1jE8rIEfYjDb82089B7jHtWlLczqbHputAnQ78AEn7NJgA4z8prd7GEdzxNpbaO/tyk9wdy8ymL7mfTjrXFrc7Eei/Dpw0eoL5rSENGRu7Ag4H866KPU56vQ0fHsixeFJ3fcFEsWWU8qN4596up8LJp/EeW6Y1v/aksKpIiYyhWLDOT0J46Vy3dzqex614Qz/YSFpDI5c7mx1PArppfCc1X4jbrQzCgDzz4gtJJeSRoSSsYwoGSe9cld+8dVD4Tzu9kkW2WYlQyx/cH8HzDp79amFi+Vydkj3fw+6yeHdNdPutaxkf98iuxbHHLdnj2rSyyXazOBOHnZjHjgEseT7964pbnZHYueFmaHxzYlmB3ynGOBnaRj6YzWtLdGdT4Weq6/J5Ph7UZMZxbSYHr8preWzOeO6PFl3rq0aMvmMU+UdQn9K4WdvQ7v4aSsbrUomIOI4WyD97O7mumic9ZbGv8QZGTw0FQhS9xGuT25z/AEq6vwMml8R5xpXmm+lQooOOZCOW9q5FudT2PUPBr7tEPAG2UjA7cCuqj8JzVviN6tTIKAPKPH9+y6velF+4nBzjouD+oNYzpczub06llY8+W5M+mQEjZ5ySAd/ukN/Ss5U7XXkdeHkrqXnb8Ge5/D6/S88C6dMW/wBTGY39tpI/kBXRH4V6HFWVqkvU8Z1DVnj0u2kVCBPLhgG6jJNYuhd7miq+Rf0+9+yeJbe4f5Us7uKRj6KWjB/RjRGPLJGzalRfy/X/ACPXPHdyLTwTqs5PSDH5kD+tbSV0cUdGeMXGqGLXbWxKtsYA4zxzXP7DXc6PbLsdx8N70DxM8O7i504OP95H2kfzq6atIeIX7teprfFK78rTtLthyZr3OM9gjZ/nWk48ysc9OXK7nm2iak1x4luIGBzGdqkt05rH2Nupuqt+h6n4AujJb3UBOCCkuPQnIP8A6CPzrWCsZ1tWmdfWhiIzBFLMQABkk9qWwHi3iaO4vZL+5DRN5iuw/eqME5OMEj1qOdWNFFnJQ2c8eg2c0ixAQXJVwJUY7GHPGaHOLLXMjsfB/iddK8HeIdNklVbiINJApIz8+E7ehwaSkuUUoyck31OU1/TriPSLGFBGWjK5/er2H1qnNE8rLN1BcR38uPL/ANMs1IBKPlgCPw9c+1TKUWXHmR23i3XjrPwy0iGBhJNqbxxyDeB/qz8/fn5gKrmSSM+V3Z5/qFlff8JhbOtnOygoNwQkdf8A69JzjfdD5XbY6Lw1dS6Pr9rcTKUFrfvDIcLhYpTwSeo5JwPaoclzF6uNjd+JFzJqHjLTrCHaUsIHlky4GGcYHBPoB+dauSWhnGLscJoVnef8JReymBgCxIbjH3vWp54t7js0eoeE5ns9TjEgVY5C0BOFHXleR1PA/Okn7w5axO+rUyMrxNe/YdEmcDJkKxgeoJ+b/wAdzUy2Gtzy6/aO7sbmSCVdmw5R4gXUnPA9e/Oe1c9R8i1OqjF1JWRzoNvH4bvobiRGki2uI4UG7nkEt26/X2pwvJXQqvuSafQwNMnhfWbd5Y2dLkhXVWwRyMnP1Fayg2rIUqi5Udh4iWOW3SSK5jeLdxmEbweCcjtj6nr9a56suS10b4Wg67aTsUfEc9va6RYyySiS4jYxMIlAVOxyccng/wCNaRTlZrY53PlZmeFbwTalBYXdwwity7w8bkUnrkdfyqpxk2mh1JR52bF9bTHX0ZY7X5mGza5PmdvXA59cdKwlUUZWdzanRnOm5LZFHxfJFFeeTFMDLNEshEY+QMucc9zjdzW8Yu92ZU5rmsaGhawPEOoalqt3II7yQjPmDKMOcAHtwAOaJRlczUlawuj28kWrzGX7MmDmQcgJgn8+uOM9qxjNOVlc6alGUKak9mdDJfw293bTRyMQJEKNjAZ1dTwOw+7XQlZHMne565Whicf8TrmSz8NQ3EfPl3alh6jY4IpMaPHLzxEqW8i2jMsrjHzoCvXuDkUpQUlZlwnKDunZmNFqEq2t6HDTNcqNzse4701FJWRLd2VNMuVt9St5pFJSInp+P+NMDW1PxBJIyCwlaNeS29Qcntwe45596znTjPdF06s4fC2inf6kJ9BhtWR2kWQu0jHr97/GqtYgg0DUItPv3uJ1dl2EfKM8nFMC1da/dPdSvBLtiJ+QMoLLxg4Pb+mazlSjKV2jWFecIOKejG6zqiX17bPEh+RNh3d+v+NaGQ7QNWi062nSSJ3MhBBXpwKBEuna3cRzxi7uS8I6gIMnjjJ6n8ahUoqV0jWVacoqLeiOlsdTTVr20ijUrHDIDz1JLL/h+tVLRER3PoCqIOQ+JqPJ4YjjjTe73SKq4zklW4qJuyuXDc84bwNZ2ti1xqUq+ZjJSLhV/Hv+FeVPNVKpyU9X/XyOlUNLsoXfgtY7CaaylVvk3BH6N9D2P1/OqpZmnNwno0xOhePNHVHMaLYzX1+tpDAHlYkbWA4+uelejUqKMbt6GUI3udbceBLK1hRry4XeTj5CQoJ9OCT+leYszdWbjSTdv68jZ0FFXloUPEHg9tN0prq2dZY05ZSPmUeo9RWuFzKnXduop0HAw/DWjz6zMbeCFXI5Z24CD3NddatGkrtmcYcyOlk8CQLMsU90d7k7QpwCfYf/AKq8/wDtTmTlGLaW7Nfq6Vk+pj+I/DcuhSQOdkkLsAJF659COxrrw+MhiFeLInS5N0T+GfDE+r2Jn2pDCMjzGHLfQd6MRjadDdhGk59DTh8C20rvFFdfvEODuORn3A6frXN/anKlKSaT2ZX1dN2W6Nbwhoclpr0+n3MCqwh3LjkNhlIIP4VvXxF4RlHVXRMYJNo9trvOYyfENutxbW24ZEdwH/8AHWH9a4Mzk1h2l10NsOvfOLkubG9WRb6TylW6aBFAYHIOASR2II9AM15uGyyMI3XVHROvd69zI0vUba7tY7Zbcxb1BQBt4GVVsZx2Drk+pqcZl1rzT1Lp4jmepmeD9NS38R6zOy5EBwuPfJ4/Kox9SVWjSpp77/IdOKjKTNu+u9PudFS+upPnMDypAjEbtoJIz9VI98HFdGHy32V1F9V/wPzMpYhNptDma31CxlsSm11jcEfeUhSVJDY9QcdzjNceIwEqE1OL6/8ABNoVlPRmD4Kgj0fwvPfyJuJlPGcZ+baK0xyli8Wqaelv+CTTtSp3NzV/sEciTvOklzG8f7pJMbATkEnrjBz+I9a6KOXyjDlTaWv46Mh14817f0jP8WfZ9T8LTzw5zCUYgjlTkfh+Vc+Fws8Lio22ZpOoqlNl/SUi06303TVVQ00RwzHAG0An+dYU8M8ZUnNvqVKoqSSGJcaZZaoskMvnrLH80quNvLHtntsJJPYd8131svnUp8rfy9FYxhXjHZHRwNaQXVpqbyqkbxmNGPG7cy4GOueOlYYOjWpJ0/O/3bjqyjLU7qvpTgMPxbqkej6VHdSxNJGJwrBOoG1uf0rlxlH2sEr9TSlKzOI/tLw2sYvLd2gfd5w3eYFBIwc4yBnv61z0/aRVmaySZkpqGhaRp+RctdSxqAJEjYcBFTA7dEXr3FZ1oVq0XHuVDli7mV4Z8WWEOo3v22GWOG8OQ6846jnHP5VlUy2aUGmm4ov2ylfQ6K/GgfYHt4L9bcyRPAPOkYgKxz39M5HSuqnOdtUYuKINS13R9KsXmEzzzybtzRqwDkszdDwOWPvXLiMPWxMVHT1NacowdzL8I+INJvtIOlX3mwMxY8MwDAkn7y/XvSng6lKu6kbPYbqqcbGzexaTIxW11e2VpJFkfz5VJBVNmQMZ6BeOnB6V2c8uXYx5VcyvFmsaRY6PLp9nK0sk+OASR1GTnoBxXM8PVrYiE3okaqcYQaNHSNY0PWbaGeWaWCW2GCGdl25BB9u/Wow+Hq4ZtbphUlGeo6K20drlB/alo1pFCsO0TL5jABxg7cdnHPXiuyVSatZf1p/kZKKLl3rWmXhsbC0drlkvIgDyADuwOe557VlhMPUjUlN6XRc5KyR6pXqnIcl8S5JIfCTToMiKdGcEAjHI5B4PUVE4plQdmeNSataSWzJJaRRq3V4QwYH1wTg/Tj8Kh0muppzoqf2rb/ZZVisoeBhWfc7fjk4/ShUn1YOaJpLObSLDSdQuYA8WoRyNtkT5eHIHTGOMdPWqlTTFGQt5qenTRxrNAYschoWJzjt82fzzx71m6UlsyudFa81a3k08CGyhVjwrEFmH5nH6U1S7thzj0iOgapLp1/bB5I1VhvyGG5Q3BBHr3zTdO+wlIWfUdMe681lmjZOPKWTIfPocfL78HNT7KQ+ZFq1gj8Ra/bada2ihpw2SGZm4UnvwOnpVRp2tqKUtCrpWowRW7rPaIXHDFSUY/wBP0odJ9GHOiS1v9MjmLoJpN/OwybdnsTj5v04x+E+zkx8yO7+GdnZ6zqsjm2CR2JWZdhPMmfl3E59zxjpWkYWerIlLQ9crQzIL2yttRs5bO7iWWCZdro3cUmrgcJd/BvQ5mb7NeXdujfwZVwPpkZo1Hcfp/wAHfD1o2bme6uxkEozBFP1wM/rRqFzpNd8IaRr+jw6XcwmKG3x5BhO0xYGOPw7UNAmcRdfBC2mI8rXHRR2a2DH89wpajujR0X4P6Ppt3Dc3l3NfNAwZUKhELA5yRkk/nRYLm14n8AaN4puUvLkSw3aLtE0R6gdAQeDTsJM5N/gbaPOZBrkqj0+zj+e6lZjujqvC3w+0jwrcNd27S3F2ylfOlI+UdwAOn607CbKms/CzQdUupbuAy2U0xLP5eChPc7T0/AigLmJD8EbKOXc2tTMvoIAD+eaNR3O38OeF9N8L2bW2no+ZCDJJI2WcjpmhITdzYpiAAP/Z
@@ -903,6 +905,7 @@
True
1.00
Leffe Blonde 33cl
+ 5410228142218
/9j/4AAQSkZJRgABAAEBLAEsAAD/2wCEAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9PjsBCwoKDg0OHBYWHCgoKCgoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O//AABEIAGQAXAMBEQACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APZqAGebHv2eYu7+7uGaLgPoAy9V8QWekuI5kuJX27isMRfaPfsKmU1HcpRbHaRr1prSsbZLhNvOJoiufoehojNS2BxaJNY1BtM02S7RFdlIADthRk4yTROXKriiruxzml+ML+81NbaePTtm8KfKmJbn065rKNe7NHTsdZLc28BxNPHGfR3A/nW7aRlY4fXdQ1VtVkFpqNykIbgwvGEx2ArlqVnGRvGmmjdh1+20jSo5NVu5nZ3YIzpudgMddgx3rWFS8bszlDXQn0nxXpOsziG0llLkcB4WUH8cYq1NMTi0bNUSUdbx/Y11lto2cn0HepqfCyo7nlz6dp9vqgG2y9QBIxHfkiuL2ku5vyo72+8Tf2TDbxLYT3T+UpZkIABwD9c11Oqo6GKg2YGpaw2rj7WdMvIo3QINkoBYgk56jisK0uZ3NYK2g7Qr57exupbaN45YoPlLP5hALKOB60qUnFNhNXsVBqGr6lcy20ur3LxAgsoswDgHPp7UOq5KzBQSY3Qry7fW2aSRdnmLlUXB/Hk9qzg0pIuS0GeJTaf25dKy2zuLj5/NJBAPr7YrSrJqbJgvdRR1NLRJbJIltjwGzCMLye/PP1rKUmyoo0teuEttP0wKGYM8vzx4DDhPXtk1o3emvUlfEy/4LkM08JPnk7iC0jDB4PYU6PxoVTY7w12nOUNbbZo1ycgfJjJGepAqKvwMqG55vqKwRXqkReVkEnAG564Lu50o29eud0EQNu0wa2icbH2nJXGD+Va1Xr8iIGF9tQ6ftMYt2C4Zw5bPJ4H1/wAayaLRJpt2psbxXBUNbfKV6n94gz/n0qoaKXoKW6G2LS/bHb7ROzFcAA9O3JqNBmTol48eq3IG4BWySTyxFU1azAu69OsvirUGOGxcFCMenrV1fjZMPhRBrlvcT3lm8QEgUDftIAwOnU1zVMRTpr3nY1hSnPZEmv3Je5sIM+YUDtk8AZ2/4CtKVWNSndbXJnBxlqdD4OkDXFs5GWDBS3bkdBWlLSaM5/CehV3nOZHim7js9BlkkzgyRqAO+XWs63wMukryR5pqVwJL3ckjONhO48EcV5TxNNaHcsNNmg+oefoiSpIoCRJG2RliVGCPzrpqO7Xoc6Vr+pStmWTRlVlA5JAPUn1rmxVSVODaNqEVOaTKayS28iRRsdrLhvXGc/zArPCV5VL37G2IoxhFW7lrSyXv2jVSi7TuHGWrqexylLZtErbQCQc47815XtGqu+zPT5E6e3QrWjTTiS5aXdvmJkOOSc4J/Q16tevThNpvU8+FGcoppG1e3tnFcxxtME2xLjIwOSen5V5uNhKrCMoq+51YZ+zbUtDF1O883xNDZhVKLbbie/TP+FdeHjKjg1JrW5jO1Wu1fobvh/VWs3tE8pBGk6szHOQAwyfyzWuEqe0ndixFBQiz1o16p5xx/jxri7fTdItEMkkzvcOoPOxFx/6E4/KsMTK1Nm2Hsp3ZxN7aTWuoxQXEbRyPgKrd88V4E6c3LRHrxrU+XcXTS0mlT28kSjyppFU9xzz+ua3r4mVCMdN0jnjRjUk3fqOaQ2tlBHldrSbHdhzznH64op1PrUJJqwpQ9g01qZUdyl/JYspxMs0m9ccBFUEH8yKPYqhSm79ClVdWolY6aFFWfKqA2MZA5rxo16l1eT37nW6cbbI41dSl0vVpo5BviiWRAjk4wARnH619DGhCck7bnnzqTimrs0dLhePQopGBwzAFyOCcc/zrgxfNOq3Z7nZQcYxSutg8VaVqC2VvqC2kvlJhScbckkbceveuzCL93yvQ5q7i5aMz/DtmdU1PVdUM4EdtEUUnncAAM5+grfGpcsaaMMPU5JOVjsfD/h6DVdOM8l+EU5LRouWA6dc/0rDDp0maV8Qpq1j0qwlM1hC7EltoDE9dw4P6g17FOXNFM8+Sszh9R102/j2+maPzEtYY7RcHpkeYxH4kD8K4cbUs7HXQoc8LnK+N9Thkv7e7hkkwuB8xOR37/SsMO1NtIuVCcVqb8Hhy80/w6Lq4lRnaPzpV5BDN8zfqTXLjqDqy91rTQ0w+IjBWdyrbeHj4k0Nyl0luuflLDJBB44+vvTwcJUG76hia8ZqyOc06zji8QNDEz7RKsDFuxOGbn8h+FOpOU6cYyS11/HQqKUOaUTqLR4m8ZvYtG7WwOAv9c+lZfU6SSdvzIeKqW3M74iWaWt9aWsEAgjvpAWGcn5ep/EYrqjFQcqnaOhNKbqWi+rEvW/4pmzsoS4aJ8ttA5469K5qGIp3d3qaVcNUT01NvVdWs9Q8E3UKSzST28OACNoZsHkY64wfyrrj7tr9zH2MrnnngWaZNLvgHKpO5Uj8v8ajMqzhVjbsb4ShGdPXudvpGv3Wm2kNvblBHC5Mu7GXHHHPtnpzwKnD1Y1E29GOphVF9zq/AepvqWm3zSMS0d4wAPYFVb+bGvYotOCsebWjyzaPLvFfiCXSvGesQmESKbktycHoK58Rhfau9zpoV+SNrGXa62dc1S2tHt1RZJkyc5OAcn9K5VhFh7z5nombvEe0Sjbqem6jqZvNJlguYEkfb8rbR1ry6OZKTtJW1Kng+sTE8DeIVjsbuA2fzxsPLYjI5znPpj+td+JqqjZvqKWD21MbStTgjv777VdwpN9scnc4Unng4+lcuYUpylFwTtyrY3wzioNN9WXLm7smkkuLa/tkuWON/2gLkZ6ZB4474rPD1a8GueMmvQcqVJ6q1zL8Xa3E66XP9qiu5bQ7SFlDfw46/hXZQU68ppppNdUZS5admrblH/hNVEahrI4GcYl6/pU/2Q7/F+H/BL+updBD4wgW2kiisDH5udx8zgnn2963WArOyc9F5GbxUL3sc/aw6pDAzW3nKmM/umP8AIV2TdGcrStfzOWNScVoyzbx+ILhf3QvGz1LEgfmaHTwy6RD29V9Wez/Cayu7Lw/dre4857ncQG3Y+ReprehKEl7uxzVeZu7MnWtOhvPEWoC4t4Z4/Ob/AFig7e/cV5+KnKNV2ZrTV4o5HX9NXS5Yr3TLTY8cgIaNc4GD29Kzo1o15SpylfQ6OR00peZmt4z1hkx58ZA6/uhR/ZOHXT8TRYmfciXxZq3IjeNd3XESir/syhLe+nmxPEyWxnrp99eagXddkk58zEg27snr0rodWnTil0Whg5Ntsl/sC/kujEfLB3Y5bimq8LC1ZfvfCkthZtczTrK4ZQI0X5Rk45JrJ4pN2SBxZdfw3byWlufsx81s5Csef1xXPDGNRbctClTbdka+maBp8Z8tLOIzxjJ3Ddj6Z71lXxsowUpX5X1/4BcaSbsQaXpqmO5CjLO7Ag/7xrKpilGV32HGi2jbh0me1hQQxlxndIzABQv49B/hRRlVrqTaflb8/kVJRhZHfeFrT7JYzLjG6XIH/ARXp5V7VUmqm6Zx4rl5tOxgXFv5/iDUV7CbJ/IVx5jGU6/Iuv5G+HsoXZgCVr+N3KmB4btogpQjAAyDnPOf88Up4Onhopx6j9tKpdMdeaZb3ULb7eGSU8bnjB/XFZTxaorWT9EOFJyKWh6dbW1zIsaIXUZ4jC8eo9qrEYiVOKcldPs9V6jjTUtilfW6jxcMJybdT/49UOsnR5k7rm/QFTfNY17bSvtTy/Ztj3OcElvudM/Tg/ypUVXrTTa93t+XrqXJwhHR6jNYt438NSYnjmmhdA23r/rFHftyOfoaueEq0q/Pok73S9P8yY1IzXKhYpVgn06Bl4un2eYVJCnjA/EmssLgvrF3J6IutV9noi4L+ygv4WsbcSJLuVpJVZdxJPIPTbx1wevTjFetPAUXCzV9PyONV5X0KFnCWj1GODeXZ5QhTG4Ek4IyQOPrXl06UHX12R2TbVMvQLq0ej21vPbvBCqRB0SNGLuJQDnBJ+6FII6857V70XFI86V7nb+ErOSx0NLeVg0iud3OccDj8Kuk7p+v6ImatY5jUtXTTfE+pwtF5mXDYHU5Ra87Ex5cQ5+Vjopu8EjGW+025vY7awsVtZXcPIVjVcjHt35rHFVX7FvsXTiuY0ppxa6xb2UqFbeSB5C6rnleSD6DAP4kVGBy+Eoc09Wx1a7TsikdYt7W5WaysBBb+QJGWSIAkYlYnIODkRcY/vEnOMV6f1Wm+hh7aRHqgiXxRbuVVXezQsFbIB3NnB7ivHrYeEHyx25v8jspTbi2x2m6dqsZuwk6xW810s52XTBtvO4AhBg8g/8AAQPWvXoyjyq3Y46kXcg1W1/s3wvcXFyTHNPKgVHxkruj6+n3TxWeKlzJRLoe47jVv9KjjtpNQtzI0ZBRgM4I9K5MJJxjoaVWpM1oL/TIvLvrOF9yqRCmNqpnPPr/ABGumpidNLmMYanI2GozeTdvHOI5fMZsr/vVyezaqX8jZz03N2w1TVZtObddjdnAZWHAx7Vq5yWzItc7jwPIZdFmZpPMb7S25s55wtd+Dv7PXuYVviPN/iTqV1onja5LQCSG5SOWM9P4Qp5+qmnVw6qO9xwqWRj+H/EJudZ3rAEaOIvzg9wMcfWuTFYP9002aQq+8dmda0u4YTX2mo0kXKs0Yc/UH8amlVcRyVyPTdT0g3y3FrHLmNAkUYQKiBd+Px/eMPxrWeIIUDnvEOoNL4vQuwRjAFAHUfN/+uuZQcoX/vGvNZ/IZb316NS2JqDom77u4j+laWtHQi9x/jTUkh0sr5iy3LuGEeckAEH8qKFF1JoHLlRzR8VLLZwxy2pJXOeQR+tdEcFy7Mh1bmraeLpbiKHT9P07dcTERoc9zx0Ao+pa3bD2pd1D4P8Ai2wuJW06eK8STndFN5THnPIYgfqa7OVW2MuYjs/hn4+mAgmja3jJ5Mt6pUfgrH+VL2cOyDmfc9j8JeHl8L+HrfTBL5zplpJAMBmPX8O34VaE2XdT0fTtZg8jUrKG6jHIEqA7T7HqPwoYjhfGXg3SvDnhy61bQNOENzEVMv7x2DR55GCTjsfwrOpTU42ZcJWZ5uvi2E27LPaPyOgwwz+OK5Xg2nozT2oWHi+2sy7xWLFj2JAGf1xQ8HJ9Q9qjbX4da7400q28SwXUEU8+dltKGTagJAIbnOevOOtdNOkqcbIzlK7KQ+EnjQ3HMUYUnljdLj+eauy7CuehfD/4byeF57i+1O4huLmeLyvKjG5FUnJySOScDt+dMRuXXw/8J3khkl0K2DE5Plgxj8lIFOwXL2leF9D0R/M03S7e3kxjzFXL4/3jzRYLmrQIKACgANADXRZEZHUMrDDKRkEelAHK3/wx8JahKZG0zyGbr9nkZB/3yDgfgKVh3DTvhj4R02USppazuDkfaHaQf98k4/SnYLnVKqooVVCqowABgAUCHUAFABQAUAFABQAUAAD/2Q==
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 5f55bff40f3..8a53015b7d7 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -924,7 +924,7 @@
diff --git a/addons/portal/acquirer.py b/addons/portal/acquirer.py
index 083a8c93d4f..9c18b597a1b 100644
--- a/addons/portal/acquirer.py
+++ b/addons/portal/acquirer.py
@@ -71,10 +71,18 @@ class acquirer(osv.Model):
return
def _wrap_payment_block(self, cr, uid, html_block, amount, currency, context=None):
- payment_header = _('Pay safely online')
- amount_str = float_repr(amount, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
- currency_str = currency.symbol or currency.name
- amount = u"%s %s" % ((currency_str, amount_str) if currency.position == 'before' else (amount_str, currency_str))
+ if not html_block:
+ link = '#action=account.action_account_config'
+ payment_header = _('You can finish the configuration in the
Bank&Cash settings ') % link
+ amount = _('No online payment acquirers configured')
+ group_ids = self.pool.get('res.users').browse(cr, uid, uid, context=context).groups_id
+ if any(group.is_portal for group in group_ids):
+ return ''
+ else:
+ payment_header = _('Pay safely online')
+ amount_str = float_repr(amount, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
+ currency_str = currency.symbol or currency.name
+ amount = u"%s %s" % ((currency_str, amount_str) if currency.position == 'before' else (amount_str, currency_str))
result = """
\n"
" "
msgstr ""
+"\n"
+"
\n"
+"\n"
+"
Olá${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
+"''},
\n"
+"\n"
+"
Uma nova fatura está disponível para você:
\n"
+" \n"
+"
\n"
+" REFERÊNCIAS \n"
+" Número da Fatura: ${object.number} \n"
+" Total Faturado: ${object.amount_total} "
+"${object.currency_id.name} \n"
+" Data de Faturamento: ${object.date_invoice} \n"
+" % if object.origin:\n"
+" Pedido de Referência: ${object.origin} \n"
+" % endif\n"
+" % if object.user_id:\n"
+" Seu contato: ${object.user_id.name} \n"
+" % endif\n"
+"
\n"
+"\n"
+" <%\n"
+" action = 'portal_sale.portal_action_invoices'\n"
+" object.partner_id.signup_prepare()\n"
+" signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+" %>\n"
+" % if signup_url:\n"
+"
\n"
+" Você pode acessar o documento da fatura e pagar online através do nosso "
+"Portal de Atendimento:\n"
+"
\n"
+"
Ver Fatura \n"
+" % endif\n"
+" \n"
+" % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+" <% \n"
+" comp_name = quote(object.company_id.name)\n"
+" inv_number = quote(object.number)\n"
+" paypal_account = quote(object.company_id.paypal_account)\n"
+" inv_amount = quote(str(object.residual))\n"
+" cur_name = quote(object.currency_id.name)\n"
+" paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s&"
+"\" \\\n"
+" "
+"\"invoice=%s&amount=%s¤cy_code=%s&button_subtype=services&a"
+"mp;no_note=1&bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+" %>\n"
+"
\n"
+"
Também é possível pagar diretamente pelo Paypal:
\n"
+"
\n"
+" \n"
+" \n"
+" % endif\n"
+" \n"
+"
\n"
+"
Se você possui alguma dúvida ou sugestão, entre em contato "
+"conosco.
\n"
+"
Obrigado por escolher ${object.company_id.name or 'nossa "
+"empresa'}!
\n"
+"
\n"
+"
\n"
+"
\n"
+"
\n"
+" ${object.company_id.name} \n"
+" \n"
+"
\n"
+"
\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street} \n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2} \n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city} \n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''} \n"
+" % endif\n"
+" \n"
+" % if object.company_id.phone:\n"
+"
\n"
+" Telefone: ${object.company_id.phone}\n"
+"
\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+"
\n"
+" %endif\n"
+"
\n"
+"
\n"
+"
\n"
+" "
#. module: portal_sale
#: model:res.groups,comment:portal_sale.group_payment_options
@@ -203,11 +328,13 @@ msgid ""
"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
"and 'draft' or ''}"
msgstr ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
#. module: portal_sale
#: model:email.template,subject:portal_sale.email_template_edi_invoice
msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
#. module: portal_sale
#: model:ir.model,name:portal_sale.model_mail_mail
@@ -381,6 +508,134 @@ msgid ""
"
\n"
" "
msgstr ""
+"\n"
+"
\n"
+"\n"
+"
Olá${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
+"''},
\n"
+" \n"
+"
Esta é sua ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} de ${object.company_id.name}:
\n"
+"\n"
+"
\n"
+" REFERÊNCIAS \n"
+" Número do Pedido: ${object.name} \n"
+" Valor Total do Pedido: ${object.amount_total} "
+"${object.pricelist_id.currency_id.name} \n"
+" Data do Pedido: ${object.date_order} \n"
+" % if object.origin:\n"
+" Referência do Pedido: ${object.origin} \n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" Sua referência: ${object.client_order_ref} \n"
+" % endif\n"
+" % if object.user_id:\n"
+" Seu contato: ${object.user_id.name} \n"
+" % endif\n"
+"
\n"
+"\n"
+" <%\n"
+" action = 'portal_sale.action_quotations_portal' if object.state in "
+"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
+" object.partner_id.signup_prepare()\n"
+" signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+" %>\n"
+" % if signup_url:\n"
+"
\n"
+" Você pode acessar o documento e pagar online através do nosso Portal de "
+"Atendimento:\n"
+"
\n"
+"
View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'} \n"
+" % endif\n"
+"\n"
+" % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state != 'draft':\n"
+" <%\n"
+" comp_name = quote(object.company_id.name)\n"
+" order_name = quote(object.name)\n"
+" paypal_account = quote(object.company_id.paypal_account)\n"
+" order_amount = quote(str(object.residual))\n"
+" cur_name = quote(object.pricelist_id.currency_id.name)\n"
+" paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s\" \\\n"
+" "
+"\"&invoice=%s&amount=%s¤cy_code=%s&button_subtype=servi"
+"ces&no_note=1\" \\\n"
+" \"&bn=OpenERP_Order_PayNow_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+" %>\n"
+"
\n"
+"
Também é possível pagar diretamente pelo Paypal:
\n"
+"
\n"
+" \n"
+" \n"
+" % endif\n"
+"\n"
+"
\n"
+"
Se você possui alguma dúvida ou sugestão, entre em contato "
+"conosco.
\n"
+"
Obrigado por escolher ${object.company_id.name or 'nossa "
+"empresa'}!
\n"
+"
\n"
+"
\n"
+"
\n"
+"
\n"
+" ${object.company_id.name} \n"
+" \n"
+"
\n"
+"
\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street} \n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2} \n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city} \n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''} \n"
+" % endif\n"
+" \n"
+" % if object.company_id.phone:\n"
+"
\n"
+" Telefone: ${object.company_id.phone}\n"
+"
\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+"
\n"
+" %endif\n"
+"
\n"
+"
\n"
+"
\n"
+" "
#. module: portal_sale
#: model:ir.model,name:portal_sale.model_account_invoice
@@ -398,3 +653,5 @@ msgid ""
"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
"'draft' or ''}"
msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
diff --git a/addons/portal_sale/portal_sale.py b/addons/portal_sale/portal_sale.py
index 818da5e8784..7cda77ed9ea 100644
--- a/addons/portal_sale/portal_sale.py
+++ b/addons/portal_sale/portal_sale.py
@@ -67,7 +67,7 @@ class account_invoice(osv.Model):
result = dict.fromkeys(ids, False)
payment_acquirer = self.pool.get('portal.payment.acquirer')
for this in self.browse(cr, uid, ids, context=context):
- if this.state not in ('draft','done') and not this.reconciled:
+ if this.type == 'out_invoice' and this.state not in ('draft','done') and not this.reconciled:
result[this.id] = payment_acquirer.render_payment_block(cr, uid, this, this.number,
this.currency_id, this.residual, context=context)
return result
diff --git a/addons/portal_sale/portal_sale_data.xml b/addons/portal_sale/portal_sale_data.xml
index 8239f1cbcca..f40897f6998 100644
--- a/addons/portal_sale/portal_sale_data.xml
+++ b/addons/portal_sale/portal_sale_data.xml
@@ -74,7 +74,7 @@
-
+
${object.company_id.name}
@@ -150,7 +150,7 @@
href="${signup_url}">View Invoice
% endif
- % if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'):
+ % if object.company_id.paypal_account and object.type in ('out_invoice'):
<%
comp_name = quote(object.company_id.name)
inv_number = quote(object.number)
@@ -174,7 +174,7 @@
-
+
${object.company_id.name}
diff --git a/addons/portal_sale/sale.py b/addons/portal_sale/sale.py
index 72e86db427a..ca392b50f63 100644
--- a/addons/portal_sale/sale.py
+++ b/addons/portal_sale/sale.py
@@ -51,8 +51,13 @@ class mail_mail(osv.osv):
if mail.model == 'sale.order':
so_obj = self.pool.get('sale.order')
partner = so_obj.browse(cr, uid, mail.res_id, context=context)['partner_id']
+ # Add the customer in the SO as follower
if partner.id not in so_obj.browse(cr, uid, mail.res_id, context=context)['message_follower_ids']:
so_obj.message_subscribe(cr, uid, [mail.res_id], [partner.id], context=context)
+ # Add all recipients of the email as followers
+ for p in mail.partner_ids:
+ if p.id not in so_obj.browse(cr, uid, mail.res_id, context=context)['message_follower_ids']:
+ so_obj.message_subscribe(cr, uid, [mail.res_id], [p.id], context=context)
return super(mail_mail, self)._postprocess_sent_message(cr, uid, mail=mail, context=context)
mail_mail()
\ No newline at end of file
diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
index 73ca4396ce6..0737bce1522 100644
--- a/addons/process/static/src/js/process.js
+++ b/addons/process/static/src/js/process.js
@@ -228,7 +228,7 @@ instance.web.ViewManager.include({
context: dataset.context
}).done(function(result) {
action_manager.replace(self.$el);
- action_manager.do_action(result.result);
+ action_manager.do_action(result);
})
});
},
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index 4c9a76f7bb2..082ee8e3d3e 100644
--- a/addons/product/i18n/hr.po
+++ b/addons/product/i18n/hr.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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-05-10 18:03+0000\n"
+"PO-Revision-Date: 2012-12-09 19:51+0000\n"
"Last-Translator: Goran Kliska
\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-12-04 05:32+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: product
#: field:product.packaging,rows:0
@@ -1536,7 +1536,7 @@ msgstr ""
#: field:product.product,active:0
#: field:product.uom,active:0
msgid "Active"
-msgstr "Actif"
+msgstr "Aktivan"
#. module: product
#: field:product.product,price_margin:0
diff --git a/addons/product/product.py b/addons/product/product.py
index 38abae06f3c..d9a1127e8b4 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -325,7 +325,7 @@ class product_template(osv.osv):
help='Coefficient to convert default Unit of Measure to Unit of Sale\n'
' uos = uom * coeff'),
'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type'),
- 'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
+ 'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Supplier'),
'company_id': fields.many2one('res.company', 'Company', select=1),
}
@@ -541,7 +541,7 @@ class product_product(osv.osv):
'virtual_available': fields.function(_product_virtual_available, type='float', string='Quantity Available'),
'incoming_qty': fields.function(_product_incoming_qty, type='float', string='Incoming'),
'outgoing_qty': fields.function(_product_outgoing_qty, type='float', string='Outgoing'),
- 'price': fields.function(_product_price, type='float', string='Pricelist', digits_compute=dp.get_precision('Product Price')),
+ 'price': fields.function(_product_price, type='float', string='Price', digits_compute=dp.get_precision('Product Price')),
'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')),
'code': fields.function(_product_code, type='char', string='Internal Reference'),
'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'),
@@ -575,7 +575,7 @@ class product_product(osv.osv):
help="Small-sized image of the product. It is automatically "\
"resized as a 64x64px image, with aspect ratio preserved. "\
"Use this field anywhere a small image is required."),
- 'seller_info_id': fields.function(_calc_seller, type='many2one', relation="product.supplierinfo", multi="seller_info"),
+ 'seller_info_id': fields.function(_calc_seller, type='many2one', relation="product.supplierinfo", string="Supplier Info", multi="seller_info"),
'seller_delay': fields.function(_calc_seller, type='integer', string='Supplier Lead Time', multi="seller_info", help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
'seller_qty': fields.function(_calc_seller, type='float', string='Supplier Quantity', multi="seller_info", help="This is minimum quantity to purchase from Main Supplier."),
'seller_id': fields.function(_calc_seller, type='many2one', relation="res.partner", string='Main Supplier', help="Main Supplier who has highest priority in Supplier List.", multi="seller_info"),
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 8e5280d036a..49362e380f4 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -33,13 +33,13 @@
-->
- Unit
+ Unit(s)
- Dozen
+ Dozen(s)
bigger
@@ -55,13 +55,13 @@
smaller
- Hour
+ Hour(s)
smaller
- Day
+ Day(s)
@@ -91,7 +91,7 @@
smaller
- Litre
+ Liter(s)
1.0
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index f1554f08346..3e360594b19 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -124,7 +124,7 @@
-
+
diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index bfd312103e3..f9187647f35 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -93,8 +93,8 @@ class product_product(osv.osv):
return res
_columns = {
- 'date_from': fields.function(_product_margin, type='date', string='From Date', multi='product_margin'),
- 'date_to': fields.function(_product_margin, type='date', string='To Date', multi='product_margin'),
+ 'date_from': fields.function(_product_margin, type='date', string='Margin Date From', multi='product_margin'),
+ 'date_to': fields.function(_product_margin, type='date', string='Margin Date To', multi='product_margin'),
'invoice_state': fields.function(_product_margin, type='selection', selection=[
('paid','Paid'),('open_paid','Open and Paid'),('draft_open_paid','Draft, Open and Paid')
], string='Invoice State',multi='product_margin', readonly=True),
@@ -102,9 +102,9 @@ class product_product(osv.osv):
help="Avg. Price in Customer Invoices."),
'purchase_avg_price' : fields.function(_product_margin, type='float', string='Avg. Unit Price', multi='product_margin',
help="Avg. Price in Supplier Invoices "),
- 'sale_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced', multi='product_margin',
+ 'sale_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced in Sale', multi='product_margin',
help="Sum of Quantity in Customer Invoices"),
- 'purchase_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced', multi='product_margin',
+ 'purchase_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced in Purchase', multi='product_margin',
help="Sum of Quantity in Supplier Invoices"),
'sales_gap' : fields.function(_product_margin, type='float', string='Sales Gap', multi='product_margin',
help="Expected Sale - Turn Over"),
@@ -122,7 +122,7 @@ class product_product(osv.osv):
help="Turnover - Standard price"),
'expected_margin' : fields.function(_product_margin, type='float', string='Expected Margin', multi='product_margin',
help="Expected Sale - Normal Cost"),
- 'total_margin_rate' : fields.function(_product_margin, type='float', string='Total Margin (%)', multi='product_margin',
+ 'total_margin_rate' : fields.function(_product_margin, type='float', string='Total Margin Rate(%)', multi='product_margin',
help="Total margin * 100 / Turnover"),
'expected_margin_rate' : fields.function(_product_margin, type='float', string='Expected Margin (%)', multi='product_margin',
help="Expected margin * 100 / Expected Sale"),
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index 2f32f06be1b..a22da21dec1 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-09-29 14:57+0000\n"
+"PO-Revision-Date: 2012-12-09 18:51+0000\n"
"Last-Translator: Erwin van der Ploeg (Endian Solutions) \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-12-04 05:04+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: project
#: view:project.project:0
msgid "Email Interface"
-msgstr ""
+msgstr "Email Interface"
#. module: project
#: help:account.analytic.account,use_tasks:0
@@ -91,7 +91,7 @@ msgstr "Waarschuwing !"
#: help:project.project,message_unread:0
#: help:project.task,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
#. module: project
#: model:process.node,name:project.process_node_donetask0
@@ -106,7 +106,7 @@ msgstr "Taak is voltooid"
#. module: project
#: view:res.partner:0
msgid "False"
-msgstr ""
+msgstr "Onwaar"
#. module: project
#: model:project.task.type,name:project.project_tt_testing
@@ -130,13 +130,16 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Bevat de samenvatting van de chatter (aantal berichten,...). Deze "
+"samenvatting is direct in html formaat om zo in de kanban weergave te worden "
+"ingevoegd."
#. module: project
#: code:addons/project/project.py:440
#: code:addons/project/project.py:1414
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Waarschuwing!"
#. module: project
#: model:ir.model,name:project.model_res_partner
@@ -195,7 +198,7 @@ msgstr "Validatie taak titel"
#. module: project
#: model:res.groups,name:project.group_delegate_task
msgid "Task Delegation"
-msgstr ""
+msgstr "Taak delegeren"
#. module: project
#: field:project.project,planned_hours:0
@@ -207,7 +210,7 @@ msgstr "Geplande tijd"
#. module: project
#: selection:project.project,privacy_visibility:0
msgid "Public"
-msgstr ""
+msgstr "Openbaar"
#. module: project
#: model:project.category,name:project.project_category_01
@@ -273,7 +276,7 @@ msgstr ""
#. module: project
#: view:project.config.settings:0
msgid "Support"
-msgstr ""
+msgstr "Ondersteuning"
#. module: project
#: view:project.project:0
@@ -283,7 +286,7 @@ msgstr "Lid"
#. module: project
#: view:project.task:0
msgid "Cancel Task"
-msgstr ""
+msgstr "Taak annuleren"
#. module: project
#: help:project.project,members:0
@@ -363,7 +366,7 @@ msgstr "Wanneer taak is afgerond, komt deze in de status Voltooid"
#: field:project.project,message_summary:0
#: field:project.task,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Samenvatting"
#. module: project
#: view:project.project:0
@@ -404,7 +407,7 @@ msgstr "De gedelegeerde gebruiker moet worden gespecificeerd"
#. module: project
#: view:project.project:0
msgid "Project(s) Manager"
-msgstr ""
+msgstr "Projectanager"
#. module: project
#: selection:project.project,state:0
@@ -436,12 +439,12 @@ msgstr "Taak her-evalueren"
#: code:addons/project/project.py:1292
#, python-format
msgid "Stage changed to %s ."
-msgstr ""
+msgstr "Fase veranderd in %s ."
#. module: project
#: view:project.task:0
msgid "Validate planned time"
-msgstr ""
+msgstr "Bevestig de geplande tijd"
#. module: project
#: field:project.config.settings,module_pad:0
@@ -456,12 +459,12 @@ msgstr "Voer uw gewerkte uren in."
#. module: project
#: field:project.project,alias_id:0
msgid "Alias"
-msgstr ""
+msgstr "Alias"
#. module: project
#: view:project.task:0
msgid "oe_kanban_text_red"
-msgstr ""
+msgstr "oe_kanban_text_red"
#. module: project
#: view:project.task:0
@@ -481,7 +484,7 @@ msgstr "Hiermee wijzigt u naar de open status"
#. module: project
#: view:project.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Toepassen"
#. module: project
#: model:ir.model,name:project.model_project_task_delegate
@@ -496,7 +499,7 @@ msgstr "De omschrijving van de taak heropnemen in de taak van de gebruiker"
#. module: project
#: view:project.project:0
msgid "Project Settings"
-msgstr ""
+msgstr "Projectinstellingen"
#. module: project
#: view:report.project.task.user:0
@@ -730,7 +733,7 @@ msgstr "Aanmaakdatum"
#. module: project
#: view:project.project:0
msgid "Miscellaneous"
-msgstr ""
+msgstr "Diversen"
#. module: project
#: view:project.task:0
@@ -769,7 +772,7 @@ msgstr "Taken fases"
#: view:project.project:0
#: view:project.task:0
msgid "Delete"
-msgstr ""
+msgstr "Verwijder"
#. module: project
#: view:report.project.task.user:0
@@ -789,7 +792,7 @@ msgstr "Urgent"
#. module: project
#: model:project.category,name:project.project_category_02
msgid "Feature request"
-msgstr ""
+msgstr "Uitbreidingsverzoek"
#. module: project
#: view:project.task:0
@@ -810,12 +813,12 @@ msgstr "CONTROLEER: %s"
#. module: project
#: view:project.project:0
msgid "Close Project"
-msgstr ""
+msgstr "Project sluiten"
#. module: project
#: field:project.project,tasks:0
msgid "Task Activities"
-msgstr ""
+msgstr "Taak activiteiten"
#. module: project
#: field:project.project,effective_hours:0
@@ -827,18 +830,18 @@ msgstr "Bestede tijd"
#: view:project.project:0
#: view:project.task:0
msgid "í"
-msgstr ""
+msgstr "í"
#. module: project
#: field:account.analytic.account,company_uom_id:0
msgid "unknown"
-msgstr ""
+msgstr "onbekend"
#. module: project
#: field:project.project,message_is_follower:0
#: field:project.task,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Is een volger"
#. module: project
#: field:project.task,work_ids:0
@@ -853,7 +856,7 @@ msgstr "Uitgebreide filters..."
#. module: project
#: model:ir.ui.menu,name:project.menu_tasks_config
msgid "GTD"
-msgstr ""
+msgstr "GTD"
#. module: project
#: help:project.task,state:0
@@ -864,6 +867,10 @@ msgid ""
"the case needs to be reviewed then the status is set "
"to 'Pending'."
msgstr ""
+"De status is ingesteld op 'Concept' wanneer de klacht wordt aangemaakt. Als "
+"de klacht in behandeling is, is de status ingesteld op 'Open'. wanneer de "
+"klacht is afgewerkt, wordt de status ingesteld op 'Gereed'. Indien de klacht "
+"moet worden gecontroleerd, wordt de status op ingesteld op 'In afwachting'."
#. module: project
#: model:ir.model,name:project.model_res_company
@@ -897,13 +904,13 @@ msgstr ""
#. module: project
#: view:project.task:0
msgid "10"
-msgstr ""
+msgstr "10"
#. module: project
#: code:addons/project/project.py:566
#, python-format
msgid "Project has been canceled ."
-msgstr ""
+msgstr "Project is geannuleerd ."
#. module: project
#: help:project.project,analytic_account_id:0
@@ -931,17 +938,17 @@ msgstr "Annuleren"
#: code:addons/project/project.py:569
#, python-format
msgid "Project has been closed ."
-msgstr ""
+msgstr "Project is afgesloten ."
#. module: project
#: model:ir.actions.server,name:project.actions_server_project_task_read
msgid "Task: Mark read"
-msgstr ""
+msgstr "Taak: Markeer rood"
#. module: project
#: view:project.project:0
msgid "Other Info"
-msgstr ""
+msgstr "Overige gegevens"
#. module: project
#: view:project.task.delegate:0
@@ -977,7 +984,7 @@ msgstr "Gebruikers"
#: model:mail.message.subtype,name:project.mt_project_stage
#: model:mail.message.subtype,name:project.mt_task_change
msgid "Stage Changed"
-msgstr ""
+msgstr "Fase veranderd"
#. module: project
#: field:project.task.type,fold:0
@@ -998,7 +1005,7 @@ msgstr "Normaal voor alle projecten"
#. module: project
#: field:project.category,name:0
msgid "Name"
-msgstr ""
+msgstr "Naam"
#. module: project
#: selection:report.project.task.user,month:0
@@ -1025,7 +1032,7 @@ msgstr "Algemeen"
#: help:project.project,message_ids:0
#: help:project.task,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Berichten en communicatie historie"
#. module: project
#: view:project.project:0
@@ -1048,13 +1055,13 @@ msgstr "Samenvatting werk"
#: code:addons/project/project.py:563
#, python-format
msgid "Project is now pending ."
-msgstr ""
+msgstr "Project is nu in afwachting ."
#. module: project
#: code:addons/project/project.py:560
#, python-format
msgid "Project has been opened ."
-msgstr ""
+msgstr "Project is geopend ."
#. module: project
#: view:project.project:0
@@ -1100,7 +1107,7 @@ msgstr "Gedelegeerde taken"
#: view:project.task:0
#: field:project.task,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Ongelezen berichten"
#. module: project
#: view:project.task:0
@@ -1111,7 +1118,7 @@ msgstr "Bovenliggende taken"
#. module: project
#: model:ir.actions.server,name:project.actions_server_project_read
msgid "Project: Mark read"
-msgstr ""
+msgstr "Project: Markeer gelezen"
#. module: project
#: model:process.node,name:project.process_node_opentask0
@@ -1147,7 +1154,7 @@ msgstr "Geef alleen taken met een deadline weer"
#. module: project
#: model:project.category,name:project.project_category_04
msgid "Usability"
-msgstr ""
+msgstr "Gebruiksvriendelijkheid"
#. module: project
#: view:report.project.task.user:0
@@ -1164,7 +1171,7 @@ msgstr "Gedaan door"
#: code:addons/project/project.py:180
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Ongeldige actie!"
#. module: project
#: help:project.task.type,state:0
@@ -1182,7 +1189,7 @@ msgstr "Extra informatie"
#. module: project
#: view:project.task:0
msgid "Edit..."
-msgstr ""
+msgstr "Bewerken..."
#. module: project
#: view:report.project.task.user:0
@@ -1193,7 +1200,7 @@ msgstr "# taken"
#. module: project
#: field:project.project,doc_count:0
msgid "Number of documents attached"
-msgstr ""
+msgstr "Aantal gekoppelde documenten"
#. module: project
#: model:ir.actions.server,name:project.actions_server_project_task_unread
@@ -1277,7 +1284,7 @@ msgstr "Uren vertraging"
#. module: project
#: view:project.project:0
msgid "Team"
-msgstr ""
+msgstr "Team"
#. module: project
#: help:project.config.settings,time_unit:0
@@ -1331,7 +1338,7 @@ msgstr "Title voor uw validatie taak"
#. module: project
#: field:project.config.settings,time_unit:0
msgid "Working time unit"
-msgstr ""
+msgstr "Werktijd maateenheid"
#. module: project
#: view:project.project:0
@@ -1349,7 +1356,7 @@ msgstr "Laag"
#: model:mail.message.subtype,name:project.mt_task_closed
#: selection:project.project,state:0
msgid "Closed"
-msgstr ""
+msgstr "Gesloten"
#. module: project
#: view:project.project:0
@@ -1368,7 +1375,7 @@ msgstr "In afwachting"
#. module: project
#: field:project.task,categ_ids:0
msgid "Tags"
-msgstr ""
+msgstr "Labels"
#. module: project
#: model:ir.model,name:project.model_project_task_history
@@ -1417,7 +1424,7 @@ msgstr ""
#. module: project
#: view:project.config.settings:0
msgid "Helpdesk & Support"
-msgstr ""
+msgstr "Helpdesk & Support"
#. module: project
#: help:report.project.task.user,opening_days:0
@@ -1442,7 +1449,7 @@ msgstr ""
#: code:addons/project/project.py:219
#, python-format
msgid "Attachments"
-msgstr ""
+msgstr "Bijlagen"
#. module: project
#: view:project.task:0
@@ -1516,7 +1523,7 @@ msgstr "Manager"
#. module: project
#: view:project.task:0
msgid "Very Important"
-msgstr ""
+msgstr "Erg belangrijk"
#. module: project
#: view:report.project.task.user:0
@@ -1527,7 +1534,7 @@ msgstr "Totaal aantal uren"
#. module: project
#: model:ir.model,name:project.model_project_config_settings
msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
#. module: project
#: view:project.project:0
@@ -1600,7 +1607,7 @@ msgstr ""
#. module: project
#: field:project.task,total_hours:0
msgid "Total"
-msgstr ""
+msgstr "Totaal"
#. module: project
#: model:process.node,note:project.process_node_taskbydelegate0
@@ -1618,6 +1625,8 @@ msgid ""
"This stage is not visible, for example in status bar or kanban view, when "
"there are no records in that stage to display."
msgstr ""
+"Deze fase is niet zichtbaar, in bijvoorbeeld de statusbalk of kanban "
+"weergave, wanneer er geen records in deze fase zijn om weer te geven."
#. module: project
#: view:project.task:0
@@ -1647,7 +1656,7 @@ msgstr "Projecten in afwachting"
#. module: project
#: view:project.task:0
msgid "Remaining"
-msgstr ""
+msgstr "Resterend"
#. module: project
#: field:project.task,progress:0
@@ -1681,12 +1690,12 @@ msgstr ""
#. module: project
#: field:project.config.settings,module_project_mrp:0
msgid "Generate tasks from sale orders"
-msgstr ""
+msgstr "Genereer Tarn van verkooporders"
#. module: project
#: model:ir.ui.menu,name:project.menu_task_types_view
msgid "Task Stages"
-msgstr ""
+msgstr "Taak fases"
#. module: project
#: model:process.node,note:project.process_node_drafttask0
@@ -1697,7 +1706,7 @@ msgstr "Definiëer de benodigdheden en de geplande uren."
#: field:project.project,message_ids:0
#: field:project.task,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Berichten"
#. module: project
#: field:project.project,color:0
@@ -1755,12 +1764,12 @@ msgstr "Einddatum"
#. module: project
#: field:project.task.type,state:0
msgid "Related Status"
-msgstr ""
+msgstr "Gerelateerde status"
#. module: project
#: view:project.project:0
msgid "Documents"
-msgstr ""
+msgstr "Documenten"
#. module: project
#: view:report.project.task.user:0
@@ -1772,7 +1781,7 @@ msgstr "# Dagen"
#: field:project.project,message_follower_ids:0
#: field:project.task,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Volgers"
#. module: project
#: model:mail.message.subtype,name:project.mt_project_new
@@ -1895,7 +1904,7 @@ msgstr "Projecttaken"
#: code:addons/project/project.py:1296
#, python-format
msgid "Task has been created ."
-msgstr ""
+msgstr "Task is aangemaakt ."
#. module: project
#: field:account.analytic.account,use_tasks:0
@@ -1919,14 +1928,14 @@ msgstr "December"
#: model:mail.message.subtype,name:project.mt_project_canceled
#: model:mail.message.subtype,name:project.mt_task_canceled
msgid "Canceled"
-msgstr ""
+msgstr "Geannuleerd"
#. module: project
#: view:project.config.settings:0
#: view:project.task.delegate:0
#: view:project.task.reevaluate:0
msgid "or"
-msgstr ""
+msgstr "of"
#. module: project
#: help:project.config.settings,module_project_mrp:0
@@ -1948,7 +1957,7 @@ msgstr "Geschatte tijd tot sluiting taak door gedelegeerde gebruiker"
#. module: project
#: model:project.category,name:project.project_category_03
msgid "Experiment"
-msgstr ""
+msgstr "Experiment"
#. module: project
#: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -2022,7 +2031,7 @@ msgstr ""
#: field:project.task,message_comment_ids:0
#: help:project.task,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Opmerkingen en e-mails."
#. module: project
#: view:project.task.history.cumulative:0
@@ -2037,7 +2046,7 @@ msgstr "Januari"
#. module: project
#: model:ir.actions.server,name:project.actions_server_project_unread
msgid "Project: Mark unread"
-msgstr ""
+msgstr "Project: Markeer ongelezen"
#. module: project
#: field:project.task.delegate,prefix:0
@@ -2071,7 +2080,7 @@ msgstr "projecten waarvan ik manager ben"
#: selection:project.task.history,kanban_state:0
#: selection:project.task.history.cumulative,kanban_state:0
msgid "Ready for next stage"
-msgstr ""
+msgstr "Gereed voor ogende fase"
#. module: project
#: view:project.task:0
@@ -2148,7 +2157,7 @@ msgstr ""
#: view:board.board:0
#: field:project.project,task_count:0
msgid "Open Tasks"
-msgstr ""
+msgstr "Open taak"
#. module: project
#: field:project.project,priority:0
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index cdc9fb60ac4..7a01ea56051 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 14:58+0000\n"
+"PO-Revision-Date: 2012-12-06 18:51+0000\n"
"Last-Translator: Cristiano Korndörfer \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-12-05 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: project
#: view:project.project:0
@@ -262,7 +262,7 @@ msgstr "Contrato/Analítico"
#. module: project
#: view:project.config.settings:0
msgid "Project Management"
-msgstr "Gerência de Projeto"
+msgstr "Gerenciamento de Projetos"
#. module: project
#: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -452,7 +452,7 @@ msgstr "Validar tempo planejado"
#. module: project
#: field:project.config.settings,module_pad:0
msgid "Use integrated collaborative note pads on task"
-msgstr ""
+msgstr "Utilizar as notas colaborativas pads nas tarefas"
#. module: project
#: model:process.node,note:project.process_node_opentask0
@@ -467,7 +467,7 @@ msgstr "Apelido"
#. module: project
#: view:project.task:0
msgid "oe_kanban_text_red"
-msgstr ""
+msgstr "oe_kanban_text_red"
#. module: project
#: view:project.task:0
@@ -669,7 +669,7 @@ msgstr ""
"Você pode definir\n"
" projetos internos (R&D, Melhoria no Processo de "
"Vendas),\n"
-" projetos pessoais (Meus A Fazer) ou ou para clientes.\n"
+" projetos pessoais (Meus A Fazer) ou para clientes.\n"
" \n"
" Você poderá colaborar com os projetos de usuários "
"internos\n"
@@ -823,7 +823,7 @@ msgstr "Tarefas delegadas"
#. module: project
#: model:ir.model,name:project.model_project_task_work
msgid "Project Task Work"
-msgstr "Tarefa de Projeto em Andamento"
+msgstr "Trabalho da Tarefa do Projeto"
#. module: project
#: code:addons/project/wizard/project_task_delegate.py:81
@@ -877,7 +877,7 @@ msgstr "Filtros Extendidos..."
#. module: project
#: model:ir.ui.menu,name:project.menu_tasks_config
msgid "GTD"
-msgstr ""
+msgstr "GTD"
#. module: project
#: help:project.task,state:0
@@ -888,6 +888,10 @@ msgid ""
"the case needs to be reviewed then the status is set "
"to 'Pending'."
msgstr ""
+"A situação é definida como 'Rascunho' quando o caso é criado. Se o caso está "
+"em progresso, a situação muda para 'Aberto'. Quando o caso termina, a "
+"situação é definida como 'Concluído'. Se o caso precisa ser revisado, a "
+"situação é definida como 'Pendente'."
#. module: project
#: model:ir.model,name:project.model_res_company
@@ -928,7 +932,7 @@ msgstr ""
#. module: project
#: view:project.task:0
msgid "10"
-msgstr ""
+msgstr "10"
#. module: project
#: code:addons/project/project.py:566
@@ -1109,7 +1113,7 @@ msgstr "Reabrir projeto"
#. module: project
#: help:project.project,priority:0
msgid "Gives the sequence order when displaying the list of projects"
-msgstr "Fornece a ordem sequencial ao exibir a lista de projectos"
+msgstr "Fornece a ordem sequencial ao exibir a lista de projetos"
#. module: project
#: constraint:project.project:0
@@ -1143,7 +1147,7 @@ msgstr "Tarefas Pai"
#. module: project
#: model:ir.actions.server,name:project.actions_server_project_read
msgid "Project: Mark read"
-msgstr "Projeto: Marcar Lido"
+msgstr "Projeto: Marcar como Lido"
#. module: project
#: model:process.node,name:project.process_node_opentask0
@@ -1205,6 +1209,10 @@ msgid ""
"stage. For example, if a stage is related to the status 'Close', when your "
"document reaches this stage, it is automatically closed."
msgstr ""
+"A situação do seu documento é automaticamente alterada de acordo com o "
+"estágio selecionado. Por exemplo, se um estágio é relacionado à situação "
+"'Fechado', e seu documento muda para este estágio, ele é automaticamente "
+"fechado."
#. module: project
#: view:project.task:0
@@ -1380,7 +1388,7 @@ msgstr "Unidade de Tempo de Trabalho"
#. module: project
#: view:project.project:0
msgid "Projects in which I am a member."
-msgstr "Projetos nos quais eu sou um membro."
+msgstr "Projetos dos quais eu sou um membro."
#. module: project
#: selection:project.task,priority:0
@@ -1442,7 +1450,7 @@ msgstr "Ativo"
#. module: project
#: model:ir.model,name:project.model_project_category
msgid "Category of project's task, issue, ..."
-msgstr "Categoria da tarefa ou incidente do projeto"
+msgstr "Categoria da tarefa do projeto, incidente, ..."
#. module: project
#: help:project.project,resource_calendar_id:0
@@ -1574,7 +1582,7 @@ msgstr "Horas Totais"
#. module: project
#: model:ir.model,name:project.model_project_config_settings
msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
#. module: project
#: view:project.project:0
@@ -1613,6 +1621,11 @@ msgid ""
" (by default, http://ietherpad.com/).\n"
" This installs the module pad."
msgstr ""
+"Permite à empresa personalizar qual instalação de Pad (bloco de notas) deve "
+"ser utilizada\n"
+" para conectar novos pads (por padrão, "
+"http://ietherpad.com/).\n"
+" O módulo pad será instalado."
#. module: project
#: field:project.task,id:0
@@ -1722,6 +1735,12 @@ msgid ""
" editing and deleting either ways.\n"
" This installs the module project_timesheet."
msgstr ""
+"Permite transferir as entradas dentro de tarefas definidas no Gerenciamento "
+"de Projetos\n"
+" para entradas de planilha de horas com uma data e usuário "
+"específicos, com o\n"
+" efeito de criar, editar e excluir de várias formas.\n"
+" O módulo project_timesheet será instalado."
#. module: project
#: field:project.config.settings,module_project_issue:0
@@ -1999,6 +2018,13 @@ msgid ""
"'Manufacture'.\n"
" This installs the module project_mrp."
msgstr ""
+"Este recurso cria automaticamente tarefas de projeto a partir de serviços em "
+"um pedido de venda.\n"
+" Mais precisamente, tarefas são criadas para linhas de "
+"obtenção com o produto do tipo 'Serviço',\n"
+" método de obtenção 'Fazer pedido' e método de fornecimento "
+"'Fabricação'.\n"
+" O módulo project_mrp será instalado."
#. module: project
#: help:project.task.delegate,planned_hours:0
@@ -2099,7 +2125,7 @@ msgstr "Janeiro"
#. module: project
#: model:ir.actions.server,name:project.actions_server_project_unread
msgid "Project: Mark unread"
-msgstr "Projeto: Marcar não lido"
+msgstr "Projeto: Marcar como não lido"
#. module: project
#: field:project.task.delegate,prefix:0
@@ -2173,6 +2199,9 @@ msgid ""
"resource allocation.\n"
" This installs the module project_long_term."
msgstr ""
+"Um módulo de gerenciamento de projetos a longo prazo que rastreia o "
+"planejamento, agendamento e alocação de recursos.\n"
+" O módulo project_long_term será instalado."
#. module: project
#: selection:report.project.task.user,month:0
@@ -2200,17 +2229,20 @@ msgid ""
"Provides timesheet support for the issues/bugs management in project.\n"
" This installs the module project_issue_sheet."
msgstr ""
+"Fornece suporte a planilha de horas para o gerenciamento de "
+"incidentes/problemas em um projeto.\n"
+" O módulo project_issue_sheet será instalado."
#. module: project
#: selection:project.project,privacy_visibility:0
msgid "Followers Only"
-msgstr ""
+msgstr "Somente Seguidores"
#. module: project
#: view:board.board:0
#: field:project.project,task_count:0
msgid "Open Tasks"
-msgstr ""
+msgstr "Tarefas Abertas"
#. module: project
#: field:project.project,priority:0
diff --git a/addons/project/project.py b/addons/project/project.py
index 05f37e7d26c..48016b274b2 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -357,6 +357,7 @@ class project(osv.osv):
context['active_test'] = False
default['state'] = 'open'
+ default['line_ids'] = []
default['tasks'] = []
default.pop('alias_name', None)
default.pop('alias_id', None)
@@ -649,16 +650,6 @@ class task(base_stage, osv.osv):
'user_id': _read_group_user_id,
}
- def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
- obj_project = self.pool.get('project.project')
- for domain in args:
- if domain[0] == 'project_id' and (not isinstance(domain[2], str)):
- id = isinstance(domain[2], list) and domain[2][0] or domain[2]
- if id and isinstance(id, (long, int)):
- if obj_project.read(cr, user, id, ['state'])['state'] == 'template':
- args.append(('active', '=', False))
- return super(task, self).search(cr, user, args, offset=offset, limit=limit, order=order, context=context, count=count)
-
def _str_get(self, task, level=0, border='***', context=None):
return border+' '+(task.user_id and task.user_id.name.upper() or '')+(level and (': L'+str(level)) or '')+(' - %.1fh / %.1fh'%(task.effective_hours or 0.0,task.planned_hours))+' '+border+'\n'+ \
border[0]+' '+(task.name or '')+'\n'+ \
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 840d9b47ae0..853dac4e20c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -19,43 +19,6 @@
{'search_default_project_id': [active_id], 'default_project_id': active_id}
-
-
- Project: Mark unread
- True
- ir.actions.server
-
- code
- self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
-
-
- action_project_unread
-
-
- action
-
- project.project
- client_action_multi
-
-
-
- Project: Mark read
- True
- ir.actions.server
-
- code
- self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
-
-
- action_project_read
-
-
- action
-
- project.project
- client_action_multi
-
-
project.project.form
@@ -287,7 +250,7 @@
kanban,tree,form,gantt
- {}
+ {'search_default_Current': 1}
Click to start a new project.
@@ -342,43 +305,6 @@
-
-
- Task: Mark unread
- True
- ir.actions.server
-
- code
- self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
-
-
- action_project_task_unread
-
-
- action
-
- project.task
- client_action_multi
-
-
-
- Task: Mark read
- True
- ir.actions.server
-
- code
- self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
-
-
- action_project_task_read
-
-
- action
-
- project.task
- client_action_multi
-
-
project.task.form
project.task
@@ -526,7 +452,7 @@
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 5f7361e2ad7..b2f3acebba2 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -47,6 +47,12 @@
color: #888;
}
+.oe_kanban_content .oe_ellipsis {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ max-height: 100px;
+}
+
.oe_kanban_project_fields div:nth-child(odd) {
border-right: 1px solid #dddddd;
vertical-align: top;
@@ -75,3 +81,4 @@
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
}
+
diff --git a/addons/project_gtd/i18n/pt_BR.po b/addons/project_gtd/i18n/pt_BR.po
index acc789c6945..fff929d7eec 100644
--- a/addons/project_gtd/i18n/pt_BR.po
+++ b/addons/project_gtd/i18n/pt_BR.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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-01-16 14:06+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br \n"
+"PO-Revision-Date: 2012-12-06 17:34+0000\n"
+"Last-Translator: Cristiano Korndörfer \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-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: project_gtd
#: view:project.task:0
@@ -81,7 +81,7 @@ msgstr "Hoje"
#. module: project_gtd
#: view:project.task:0
msgid "Timeframe"
-msgstr ""
+msgstr "Período"
#. module: project_gtd
#: model:project.gtd.timebox,name:project_gtd.timebox_lt
@@ -194,7 +194,7 @@ msgstr "project.gtd.timebox"
#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Erro!"
#. module: project_gtd
#: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
@@ -224,7 +224,7 @@ msgstr "Seleção de tarefas"
#. module: project_gtd
#: view:project.task:0
msgid "Display"
-msgstr ""
+msgstr "Exibir"
#. module: project_gtd
#: model:project.gtd.context,name:project_gtd.context_office
@@ -297,7 +297,7 @@ msgstr "Para reabrir as tarefas"
#. module: project_gtd
#: view:project.timebox.fill.plan:0
msgid "or"
-msgstr ""
+msgstr "ou"
#~ msgid ""
#~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/project_issue/i18n/nl.po b/addons/project_issue/i18n/nl.po
index 391962b01a2..28e740e5adb 100644
--- a/addons/project_issue/i18n/nl.po
+++ b/addons/project_issue/i18n/nl.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2011-01-18 20:31+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) \n"
+"PO-Revision-Date: 2012-12-09 18:59+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) \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-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: project_issue
#: model:project.category,name:project_issue.project_issue_category_03
msgid "Deadly bug"
-msgstr ""
+msgstr "Dodelijke bug"
#. module: project_issue
#: help:project.config.settings,fetchmail_issue:0
@@ -69,18 +69,18 @@ msgstr "Voortgang (%)"
#: view:project.issue:0
#: field:project.issue,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Ongelezen berichten"
#. module: project_issue
#: code:addons/project_issue/project_issue.py:560
#, python-format
msgid "escalated ."
-msgstr ""
+msgstr "geëscaleerd ."
#. module: project_issue
#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
msgid "Issue: Mark unread"
-msgstr ""
+msgstr "Issue: Markeer ongelezen"
#. module: project_issue
#: field:project.issue,email_cc:0
@@ -90,7 +90,7 @@ msgstr "Emails toeschouwers"
#. module: project_issue
#: help:project.issue,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
#. module: project_issue
#: help:account.analytic.account,use_issues:0
@@ -188,7 +188,7 @@ msgstr "Geannuleerd"
#. module: project_issue
#: field:project.issue,description:0
msgid "Private Note"
-msgstr ""
+msgstr "Privé notitie"
#. module: project_issue
#: field:project.issue.report,date_closed:0
@@ -218,7 +218,7 @@ msgstr "Gem. werkuren tot openen"
#. module: project_issue
#: model:ir.model,name:project_issue.model_account_analytic_account
msgid "Analytic Account"
-msgstr ""
+msgstr "Kostenplaats"
#. module: project_issue
#: help:project.issue,message_summary:0
@@ -226,6 +226,9 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Bevat de samenvatting van de chatter (aantal berichten,...). Deze "
+"samenvatting is direct in html formaat om zo in de kanban weergave te worden "
+"ingevoegd."
#. module: project_issue
#: help:project.project,project_escalation_id:0
@@ -257,7 +260,7 @@ msgstr ""
#. module: project_issue
#: view:project.issue:0
msgid "Edit..."
-msgstr ""
+msgstr "Bewerken..."
#. module: project_issue
#: view:project.issue:0
@@ -278,7 +281,7 @@ msgstr "Onderhoud"
#: code:addons/project_issue/project_issue.py:547
#, python-format
msgid "Project issue converted to task."
-msgstr ""
+msgstr "Project issue geconverteerd naar taak."
#. module: project_issue
#: view:project.issue:0
@@ -299,7 +302,7 @@ msgstr "Versie"
#. module: project_issue
#: field:project.issue,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Volgers"
#. module: project_issue
#: view:project.issue:0
@@ -334,7 +337,7 @@ msgstr "Laagste"
#: code:addons/project_issue/project_issue.py:358
#, python-format
msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopie)"
#. module: project_issue
#: view:project.issue:0
@@ -405,7 +408,7 @@ msgstr "Issues analyse"
#: code:addons/project_issue/project_issue.py:493
#, python-format
msgid "No Subject"
-msgstr ""
+msgstr "Geen onderwerp"
#. module: project_issue
#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
@@ -424,12 +427,12 @@ msgstr "Contactpersoon"
#: code:addons/project_issue/project_issue.py:551
#, python-format
msgid "Project issue created ."
-msgstr ""
+msgstr "Project issue aangemaakt ."
#. module: project_issue
#: view:project.issue:0
msgid "Delete"
-msgstr ""
+msgstr "Verwijder"
#. module: project_issue
#: code:addons/project_issue/project_issue.py:341
@@ -445,7 +448,7 @@ msgstr "# Issues"
#. module: project_issue
#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
msgid "Issue: Mark read"
-msgstr ""
+msgstr "Issue: Markeer gelezen"
#. module: project_issue
#: selection:project.issue.report,month:0
@@ -455,7 +458,7 @@ msgstr "December"
#. module: project_issue
#: field:project.issue,categ_ids:0
msgid "Tags"
-msgstr ""
+msgstr "Labels"
#. module: project_issue
#: view:project.issue:0
@@ -465,12 +468,12 @@ msgstr "Issue tracker boom"
#. module: project_issue
#: model:project.category,name:project_issue.project_issue_category_01
msgid "Little problem"
-msgstr ""
+msgstr "Klein probleem"
#. module: project_issue
#: view:project.project:0
msgid "creates"
-msgstr ""
+msgstr "Aanmaken"
#. module: project_issue
#: model:crm.case.categ,name:project_issue.feature_request_categ
@@ -485,7 +488,7 @@ msgstr "Datum gewijzigd"
#. module: project_issue
#: view:project.issue:0
msgid "Project:"
-msgstr ""
+msgstr "Project:"
#. module: project_issue
#: view:project.issue:0
@@ -590,12 +593,12 @@ msgstr "Normaal"
#. module: project_issue
#: field:project.project,issue_count:0
msgid "unknown"
-msgstr ""
+msgstr "onbekend"
#. module: project_issue
#: view:project.issue:0
msgid "Category:"
-msgstr ""
+msgstr "Categorie:"
#. module: project_issue
#: selection:project.issue.report,month:0
@@ -605,7 +608,7 @@ msgstr "Juni"
#. module: project_issue
#: help:project.issue,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Berichten en communicatie historie"
#. module: project_issue
#: view:project.issue:0
@@ -620,7 +623,7 @@ msgstr "Dagen tot sluiten"
#. module: project_issue
#: field:project.issue,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Is een volger"
#. module: project_issue
#: help:project.issue,state:0
@@ -631,6 +634,10 @@ msgid ""
"the case needs to be reviewed then the status is set "
"to 'Pending'."
msgstr ""
+"De status is ingesteld op 'Concept' wanneer de klacht wordt aangemaakt. Als "
+"de klacht in behandeling is, is de status ingesteld op 'Open'. wanneer de "
+"klacht is afgewerkt, wordt de status ingesteld op 'Gereed'. Indien de klacht "
+"moet worden gecontroleerd, wordt de status op ingesteld op 'In afwachting'."
#. module: project_issue
#: field:project.issue,active:0
@@ -647,13 +654,13 @@ msgstr "November"
#: code:addons/project_issue/project_issue.py:472
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Waarschuwing!"
#. module: project_issue
#: field:project.issue,message_comment_ids:0
#: help:project.issue,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Opmerkingen en e-mails."
#. module: project_issue
#: view:project.issue.report:0
@@ -688,7 +695,7 @@ msgstr "Deze personen zullen email ontvangen."
#. module: project_issue
#: field:project.issue,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Samenvatting"
#. module: project_issue
#: field:project.issue,date:0
@@ -705,7 +712,7 @@ msgstr "Toegekend aan"
#. module: project_issue
#: view:project.config.settings:0
msgid "Configure"
-msgstr ""
+msgstr "Instellen"
#. module: project_issue
#: view:project.issue:0
@@ -774,7 +781,7 @@ msgstr "Aanmaak maand"
#: code:addons/project_issue/project_issue.py:557
#, python-format
msgid "escalated to '%s' ."
-msgstr ""
+msgstr "geëscaleerd naar '%s' ."
#. module: project_issue
#: view:project.issue.report:0
@@ -800,12 +807,12 @@ msgstr "Issue"
#: code:addons/project_issue/project_issue.py:540
#, python-format
msgid "Stage changed to %s ."
-msgstr ""
+msgstr "Fase veranderd in %s ."
#. module: project_issue
#: model:project.category,name:project_issue.project_issue_category_02
msgid "PBCK"
-msgstr ""
+msgstr "PBCK"
#. module: project_issue
#: view:project.issue:0
@@ -830,7 +837,7 @@ msgstr "Mei"
#. module: project_issue
#: model:ir.model,name:project_issue.model_project_config_settings
msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
#. module: project_issue
#: view:project.issue.report:0
@@ -883,7 +890,7 @@ msgstr "Mijn issues"
#. module: project_issue
#: help:project.issue.report,delay_open:0
msgid "Number of Days to open the project issue."
-msgstr ""
+msgstr "Aantal dagen voor het openen van de project issue"
#. module: project_issue
#: selection:project.issue.report,month:0
@@ -893,7 +900,7 @@ msgstr "April"
#. module: project_issue
#: view:project.issue:0
msgid "⇒ Escalate"
-msgstr ""
+msgstr "⇒ Escaleren"
#. module: project_issue
#: view:project.issue:0
diff --git a/addons/project_issue/i18n/pt_BR.po b/addons/project_issue/i18n/pt_BR.po
index c271005eca0..3bafb098d83 100644
--- a/addons/project_issue/i18n/pt_BR.po
+++ b/addons/project_issue/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 16:20+0000\n"
+"PO-Revision-Date: 2012-12-06 19:01+0000\n"
"Last-Translator: Cristiano Korndörfer \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: project_issue
#: model:project.category,name:project_issue.project_issue_category_03
@@ -45,7 +45,7 @@ msgstr "Agrupar Por..."
#. module: project_issue
#: field:project.issue,working_hours_open:0
msgid "Working Hours to Open the Issue"
-msgstr "Horas Trabalhadas para Abrir o Caso"
+msgstr "Horas Trabalhadas para Abrir o Incidente"
#. module: project_issue
#: field:project.issue,date_open:0
@@ -82,7 +82,7 @@ msgstr "escalado ."
#. module: project_issue
#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
msgid "Issue: Mark unread"
-msgstr "Incidente: Marcar não lido"
+msgstr "Incidente: Marcar como não lido"
#. module: project_issue
#: field:project.issue,email_cc:0
@@ -111,7 +111,7 @@ msgid ""
"You cannot escalate this issue.\n"
"The relevant Project has not configured the Escalation Project!"
msgstr ""
-"Você não pode escalonar este caso.\n"
+"Você não pode escalonar este incidente.\n"
"O Projeto em questão não foi configurado como Projeto Escalonado!"
#. module: project_issue
@@ -210,7 +210,7 @@ msgstr "Data do Fechamento"
#. module: project_issue
#: view:project.issue:0
msgid "Issue Tracker Search"
-msgstr "Rastreador de Incidentes"
+msgstr "Pesquisar no Rastreador de Incidentes"
#. module: project_issue
#: field:project.issue,color:0
@@ -248,8 +248,8 @@ msgid ""
"If any issue is escalated from the current Project, it will be listed under "
"the project selected here."
msgstr ""
-"Se esta questão for escalonada do Projeto atual, ela será listada abaixo do "
-"projeto selecionado aqui."
+"Se qualquer incidente for escalonado do Projeto atual, ele será listado "
+"abaixo do projeto selecionado aqui."
#. module: project_issue
#: view:project.issue:0
@@ -264,10 +264,11 @@ msgid ""
"analyse the time required to open or close an issue, the number of email to "
"exchange and the time spent on average by issues."
msgstr ""
-"Este relatório nos casos do projeto te permitem analisar a qualidade do seu "
-"suporte ou do pós-venda. Você pode rastrear as questões por período. Você "
-"pode analisar o tempo necessário para abrir ou fechar uma questão, o número "
-"de emails trocados e o tempo gasto em média por questão."
+"Este relatório nos incidentes de projeto permite analisar a qualidade do seu "
+"suporte ou dos serviços pós-venda. Você pode rastrear os incidentes por "
+"período. Você pode analisar o tempo necessário para abrir ou fechar um "
+"incidente, o número de e-mails trocados e o tempo gasto em média por "
+"incidente."
#. module: project_issue
#: view:project.issue:0
@@ -354,7 +355,7 @@ msgstr "%s (cópia)"
#. module: project_issue
#: view:project.issue:0
msgid "Unassigned Issues"
-msgstr "Questões não atribuídas"
+msgstr "Incidentes não atribuídos"
#. module: project_issue
#: field:project.issue,create_date:0
@@ -372,7 +373,7 @@ msgstr "Versões"
#. module: project_issue
#: view:project.issue:0
msgid "To Do Issues"
-msgstr "Questões a Serem Feitas"
+msgstr "Incidentes A Serem Feitos"
#. module: project_issue
#: model:ir.model,name:project_issue.model_project_issue_version
@@ -414,7 +415,7 @@ msgstr "Fase"
#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
#: view:project.issue.report:0
msgid "Issues Analysis"
-msgstr "Análise de Questões"
+msgstr "Análise de Incidentes"
#. module: project_issue
#: code:addons/project_issue/project_issue.py:493
@@ -425,7 +426,7 @@ msgstr "Sem Assunto"
#. module: project_issue
#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
msgid "My Project Issues"
-msgstr "Minhas Questões do Projeto"
+msgstr "Meus Incidentes do Projeto"
#. module: project_issue
#: view:project.issue:0
@@ -460,7 +461,7 @@ msgstr "Nº de Incidentes"
#. module: project_issue
#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
msgid "Issue: Mark read"
-msgstr "Incidente: Marcar lido"
+msgstr "Incidente: Marcar como lido"
#. module: project_issue
#: selection:project.issue.report,month:0
@@ -475,7 +476,7 @@ msgstr "Marcadores"
#. module: project_issue
#: view:project.issue:0
msgid "Issue Tracker Tree"
-msgstr "Árvore de Rastreamento de Questões"
+msgstr "Árvore do Rastreador de Incidentes"
#. module: project_issue
#: model:project.category,name:project_issue.project_issue_category_01
@@ -532,7 +533,7 @@ msgstr "E-mail do Usuário"
#. module: project_issue
#: view:project.issue.report:0
msgid "#Number of Project Issues"
-msgstr "#Número de Questões de Projeto"
+msgstr "Número de Incidentes do Projeto"
#. module: project_issue
#: help:project.issue,channel_id:0
@@ -589,7 +590,7 @@ msgstr "Status"
#. module: project_issue
#: view:project.issue.report:0
msgid "#Project Issues"
-msgstr "#Questões do Projeto"
+msgstr "Nº de Incidentes do Projeto"
#. module: project_issue
#: selection:project.issue.report,month:0
@@ -625,7 +626,7 @@ msgstr "Histórico de mensagens e comunicação"
#. module: project_issue
#: view:project.issue:0
msgid "New Issues"
-msgstr "Novas Questões"
+msgstr "Novos Incidentes"
#. module: project_issue
#: field:project.issue,day_close:0
@@ -646,6 +647,10 @@ msgid ""
"the case needs to be reviewed then the status is set "
"to 'Pending'."
msgstr ""
+"A situação é definida como 'Rascunho' quando o caso é criado. Se o caso está "
+"em progresso, a situação muda para 'Aberto'. Quando o caso termina, a "
+"situação é definida como 'Concluído'. Se o caso precisa ser revisado, a "
+"situação é definida como 'Pendente'."
#. module: project_issue
#: field:project.issue,active:0
@@ -693,7 +698,7 @@ msgstr "Janeiro"
#. module: project_issue
#: view:project.issue:0
msgid "Feature Tracker Tree"
-msgstr "Árvore de Recursos"
+msgstr "Árvore do Rastreador de Recursos"
#. module: project_issue
#: help:project.issue,email_from:0
@@ -778,7 +783,7 @@ msgstr "A fazer"
#: model:ir.model,name:project_issue.model_project_issue
#: view:project.issue.report:0
msgid "Project Issue"
-msgstr "Questões do Projeto"
+msgstr "Incidente do Projeto"
#. module: project_issue
#: view:project.issue:0
@@ -820,12 +825,12 @@ msgstr "Estágio alterado para %s ."
#. module: project_issue
#: model:project.category,name:project_issue.project_issue_category_02
msgid "PBCK"
-msgstr ""
+msgstr "PBCK"
#. module: project_issue
#: view:project.issue:0
msgid "Feature Tracker Search"
-msgstr "Procurar Recurso"
+msgstr "Pesquisar no Rastreador de Recursos"
#. module: project_issue
#: view:project.issue:0
@@ -845,7 +850,7 @@ msgstr "Maio"
#. module: project_issue
#: model:ir.model,name:project_issue.model_project_config_settings
msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
#. module: project_issue
#: view:project.issue.report:0
@@ -925,7 +930,7 @@ msgstr "Referências"
#. module: project_issue
#: field:project.issue,working_hours_close:0
msgid "Working Hours to Close the Issue"
-msgstr "Horas de Trabalho para Concluir a Questão"
+msgstr "Horas de Trabalho para Concluir o Incidente"
#. module: project_issue
#: field:project.issue,id:0
@@ -940,7 +945,7 @@ msgstr "project.issue.report"
#. module: project_issue
#: help:project.issue.report,delay_close:0
msgid "Number of Days to close the project issue"
-msgstr "Número de dias para fechar a questão do projeto."
+msgstr "Número de dias para fechar o incidente do projeto."
#. module: project_issue
#: field:project.issue.report,working_hours_close:0
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index bc9a93461ba..994be956b45 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -500,7 +500,6 @@ class project_issue(base_stage, osv.osv):
custom_values['priority'] = msg.get('priority')
res_id = super(project_issue, self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
- # self.convert_to_bug(cr, uid, [res_id], context=context)
return res_id
def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 60cc6448a46..279fec28411 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -4,43 +4,6 @@
-
-
- Issue: Mark unread
- True
- ir.actions.server
-
- code
- self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
-
-
- action_project_issue_unread
-
-
- action
-
- project.issue
- client_action_multi
-
-
-
- Issue: Mark read
- True
- ir.actions.server
-
- code
- self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
-
-
- action_project_issue_read
-
-
- action
-
- project.issue
- client_action_multi
-
-
Issue Version
project.issue.version
@@ -200,12 +163,12 @@
+
-
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index c38e2769ebb..d8cca820dd5 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -52,8 +52,8 @@ class project_issue_report(osv.osv):
'date_closed': fields.date('Date of Closing', readonly=True),
'stage_id': fields.many2one('project.task.type', 'Stage'),
'nbr': fields.integer('# of Issues', readonly=True),
- 'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True),
- 'working_hours_close': fields.float('Avg. Working Hours to Close', readonly=True),
+ 'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True, group_operator="avg"),
+ 'working_hours_close': fields.float('Avg. Working Hours to Close', readonly=True, group_operator="avg"),
'delay_open': fields.float('Avg. Delay to Open', digits=(16,2), readonly=True, group_operator="avg",
help="Number of Days to open the project issue."),
'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",
diff --git a/addons/project_issue_sheet/i18n/pt_BR.po b/addons/project_issue_sheet/i18n/pt_BR.po
index be8ee860908..6e3418f9dc8 100644
--- a/addons/project_issue_sheet/i18n/pt_BR.po
+++ b/addons/project_issue_sheet/i18n/pt_BR.po
@@ -8,21 +8,20 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-08-13 03:17+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"\n"
+"PO-Revision-Date: 2012-12-06 17:36+0000\n"
+"Last-Translator: Cristiano Korndörfer \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: project_issue_sheet
#: code:addons/project_issue_sheet/project_issue_sheet.py:57
#, python-format
msgid "The Analytic Account is pending !"
-msgstr ""
+msgstr "A Conta Analítica está pendente !"
#. module: project_issue_sheet
#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
@@ -42,7 +41,7 @@ msgstr "Linha da Planilhao de Horas"
#. module: project_issue_sheet
#: view:project.issue:0
msgid "on_change_project(project_id)"
-msgstr ""
+msgstr "on_change_project(project_id)"
#. module: project_issue_sheet
#: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_long_term/i18n/nl.po b/addons/project_long_term/i18n/nl.po
index 757a3103709..72bebf93825 100644
--- a/addons/project_long_term/i18n/nl.po
+++ b/addons/project_long_term/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-11-26 20:20+0000\n"
+"PO-Revision-Date: 2012-12-09 18:54+0000\n"
"Last-Translator: Erwin van der Ploeg (Endian Solutions) \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-12-04 05:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: project_long_term
#: help:project.phase,constraint_date_end:0
@@ -120,7 +120,7 @@ msgstr "Nieuw"
#. module: project_long_term
#: field:project.phase,product_uom:0
msgid "Duration Unit of Measure"
-msgstr ""
+msgstr "Maateenheid tijdsduur"
#. module: project_long_term
#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
@@ -319,7 +319,7 @@ msgstr "Taakdetails"
#. module: project_long_term
#: field:project.project,phase_count:0
msgid "Open Phases"
-msgstr ""
+msgstr "Open fases"
#. module: project_long_term
#: help:project.phase,date_end:0
diff --git a/addons/project_timesheet/i18n/pt_BR.po b/addons/project_timesheet/i18n/pt_BR.po
index 52c6c4495a3..2e15734e772 100644
--- a/addons/project_timesheet/i18n/pt_BR.po
+++ b/addons/project_timesheet/i18n/pt_BR.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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2011-01-26 00:43+0000\n"
-"Last-Translator: Adriano Prado \n"
+"PO-Revision-Date: 2012-12-06 17:53+0000\n"
+"Last-Translator: Cristiano Korndörfer \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-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: project_timesheet
#: view:report.timesheet.task.user:0
@@ -43,6 +43,8 @@ msgid ""
"You cannot delete a partner which is assigned to project, but you can "
"uncheck the active box."
msgstr ""
+"Não é possível excluir um parceiro que está atribuído a um projeto, mas você "
+"pode desmarcar a caixa 'Ativo'."
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_project_task_work
@@ -55,11 +57,13 @@ msgstr "Tarefa de Projeto em Andamento"
msgid ""
"You cannot select a Analytic Account which is in Close or Cancelled state."
msgstr ""
+"Não é possível selecionar uma Conta Analítica que está nas situações Fechada "
+"ou Cancelada."
#. module: project_timesheet
#: view:report.timesheet.task.user:0
msgid "Group By..."
-msgstr "Agrupado Por..."
+msgstr "Agrupar Por..."
#. module: project_timesheet
#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
@@ -76,7 +80,7 @@ msgstr "Outubro"
#: view:project.project:0
#, python-format
msgid "Timesheets"
-msgstr ""
+msgstr "Planilhas de Horas"
#. module: project_timesheet
#: view:project.project:0
@@ -94,11 +98,19 @@ msgid ""
"
\n"
" "
msgstr ""
+"\n"
+" Clique para adicionar um contrato de cliente.\n"
+"
\n"
+" Você encontrará aqui os contratos relacionados a\n"
+" seus projetos de clientes para acompanhar o processo\n"
+" de faturamento.\n"
+"
\n"
+" "
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "Analytic Account/Project"
-msgstr ""
+msgstr "Conta Analítica/Projeto"
#. module: project_timesheet
#: view:account.analytic.line:0
@@ -118,6 +130,9 @@ msgid ""
"employee.\n"
"Fill in the HR Settings tab of the employee form."
msgstr ""
+"Por favor defina produto e propriedades da conta de produto no colaborador "
+"relacionado.\n"
+"Preencha na aba de Configurações de RH do formulário do colaborador."
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_account_analytic_line
@@ -151,6 +166,8 @@ msgid ""
"Please define journal on the related employee.\n"
"Fill in the timesheet tab of the employee form."
msgstr ""
+"Por favor informe o diário no colaborador relacionado\n"
+"Preencha na aba de apontamento de horas no formulário do colaborador."
#. module: project_timesheet
#: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
@@ -170,7 +187,7 @@ msgstr "Contratos a Renovar"
#. module: project_timesheet
#: view:project.project:0
msgid "Hours"
-msgstr ""
+msgstr "Horas"
#. module: project_timesheet
#: view:report.timesheet.task.user:0
@@ -231,6 +248,13 @@ msgid ""
"
\n"
" "
msgstr ""
+"\n"
+" Você encontra aqui planilhas de horas e compras feitas para "
+"contratos que podem ser faturados para o cliente.\n"
+" Se você deseja registrar novos trabalhos para faturar, você "
+"deve utilizar o menu de planilha de horas.\n"
+"
\n"
+" "
#. module: project_timesheet
#: model:process.node,name:project_timesheet.process_node_timesheettask0
@@ -291,7 +315,7 @@ msgstr "Codifique quanto tempo você gastou em sua tarefa"
#: code:addons/project_timesheet/project_timesheet.py:85
#, python-format
msgid "Please define employee for user \"%s\". You must create one."
-msgstr ""
+msgstr "Defina um colaborador para o usuário \"%s\". Você deve criá-lo."
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_res_partner
@@ -339,6 +363,8 @@ msgid ""
"Timesheets on this project may be invoiced to %s, according to the terms "
"defined in the contract.
"
msgstr ""
+"Planilhas de horas deste projeto devem ser faturadas para %s, de acordo "
+"com os termos definidos no contrato.
"
#. module: project_timesheet
#: model:process.node,note:project_timesheet.process_node_taskwork0
@@ -371,7 +397,7 @@ msgstr "Depois da tarefa concluída, Criar sua nota fiscal"
#: code:addons/project_timesheet/project_timesheet.py:266
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Ação Inválida!"
#. module: project_timesheet
#: view:report.timesheet.task.user:0
@@ -386,6 +412,8 @@ msgid ""
"Record your timesheets for the project "
"'%s'.
"
msgstr ""
+"Registre suas planilhas de horas para "
+"o projeto '%s'.
"
#. module: project_timesheet
#: field:report.timesheet.task.user,timesheet_hrs:0
diff --git a/addons/project_timesheet/test/work_timesheet.yml b/addons/project_timesheet/test/work_timesheet.yml
index 4867f92b4b1..d8367e9f7d8 100644
--- a/addons/project_timesheet/test/work_timesheet.yml
+++ b/addons/project_timesheet/test/work_timesheet.yml
@@ -18,5 +18,5 @@
task_ids = self.browse(cr, uid, task_work, context)
assert task_ids.user_id.id == ref("base.user_demo"), 'Error, The User in Timesheet is not Correct'
assert task_ids.date == start, 'Error, The Date in Timesheet is not ok'
- assert task_ids.product_uom_id.name == "Hour", 'Error, The Hour in Timesheet is not ok'
+ assert task_ids.product_uom_id.name == "Hour(s)", 'Error, The Hour in Timesheet is not ok'
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index be35fb9d6bc..42efd08d44c 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -26,8 +26,9 @@
RFQ_${(object.name or '').replace('/','_')}
+ ${object.partner_id.lang}
+
Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
@@ -55,7 +56,7 @@
-
+
${object.company_id.name}
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index 5fbda5a82ba..98c2cb15999 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/i18n/nl.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-30 19:55+0000\n"
+"PO-Revision-Date: 2012-12-09 19:11+0000\n"
"Last-Translator: Erwin van der Ploeg (Endian Solutions)
\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-12-04 05:11+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:37+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
@@ -62,7 +62,7 @@ msgstr ""
#. module: purchase
#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
msgid "Purchase: Mark read"
-msgstr ""
+msgstr "Purchase: Markeer als gelezen"
#. module: purchase
#: view:purchase.report:0
@@ -357,7 +357,7 @@ msgstr "Oktober"
#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for %s cancelled ."
-msgstr ""
+msgstr "Inkooporder voorr %s geannuleerd ."
#. module: purchase
#: field:purchase.order,message_summary:0
@@ -393,7 +393,7 @@ msgstr "Aantal"
#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment %s scheduled for %s."
-msgstr ""
+msgstr "Inkomende levering %s geplant for %s."
#. module: purchase
#: field:purchase.order,fiscal_position:0
@@ -641,7 +641,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order.line:0
msgid "Invoices and Receptions"
-msgstr ""
+msgstr "Facturen en ontvangsten"
#. module: purchase
#: view:purchase.report:0
@@ -786,7 +786,7 @@ msgstr "Offerteaanvraag :"
#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
#: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
msgid "On Incoming Shipments"
-msgstr ""
+msgstr "Op inkomende leveringen"
#. module: purchase
#: report:purchase.order:0
@@ -1015,7 +1015,7 @@ msgstr ""
#. module: purchase
#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
msgid "Purchase: Mark unread"
-msgstr ""
+msgstr "Inkoop: Markeer als ongelezen"
#. module: purchase
#: help:purchase.order,message_ids:0
@@ -1242,7 +1242,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
-msgstr ""
+msgstr "Maak à.u.b. Facturen."
#. module: purchase
#: model:ir.model,name:purchase.model_procurement_order
@@ -1337,7 +1337,7 @@ msgstr "IO: %s"
#. module: purchase
#: view:purchase.order:0
msgid "Send by EMail"
-msgstr ""
+msgstr "Stuur per -mail"
#. module: purchase
#: code:addons/purchase/purchase.py:498
@@ -1622,7 +1622,7 @@ msgstr "Inkoop menu openen"
#. module: purchase
#: model:ir.model,name:purchase.model_mail_compose_message
msgid "Email composition wizard"
-msgstr ""
+msgstr "E-mail samenstellen wizard"
#. module: purchase
#: field:purchase.order,company_id:0
@@ -2018,7 +2018,7 @@ msgstr "Verzoek om offerte nr."
#. module: purchase
#: view:purchase.config.settings:0
msgid "Invoicing Settings"
-msgstr ""
+msgstr "Facturering instellingen"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase
diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po
index 9fb239ca82d..bfc429ca74d 100644
--- a/addons/purchase/i18n/sl.po
+++ b/addons/purchase/i18n/sl.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2010-12-16 05:34+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2012-12-08 17:09+0000\n"
+"Last-Translator: Vida Potočnik \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-12-04 05:12+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-09 04:38+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: purchase
#: model:res.groups,name:purchase.group_analytic_accounting
msgid "Analytic Accounting for Purchases"
-msgstr ""
+msgstr "Analitičen konto nabave"
#. module: purchase
#: model:ir.model,name:purchase.model_account_config_settings
@@ -29,7 +29,7 @@ msgstr ""
#. module: purchase
#: view:board.board:0
msgid "Monthly Purchases by Category"
-msgstr ""
+msgstr "Mesečne nabave po skupini"
#. module: purchase
#: help:purchase.config.settings,module_warning:0
@@ -48,7 +48,7 @@ msgstr "Privzeti nabavni cenik"
#. module: purchase
#: report:purchase.order:0
msgid "Tel :"
-msgstr ""
+msgstr "Tel :"
#. module: purchase
#: help:purchase.order,pricelist_id:0
@@ -62,7 +62,7 @@ msgstr ""
#. module: purchase
#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
msgid "Purchase: Mark read"
-msgstr ""
+msgstr "Nabava: Označi kot prebrano"
#. module: purchase
#: view:purchase.report:0
@@ -73,7 +73,7 @@ msgstr "Dan"
#. module: purchase
#: view:purchase.report:0
msgid "Order of Day"
-msgstr ""
+msgstr "Dnevna naročila"
#. module: purchase
#: help:purchase.order,message_unread:0
@@ -165,7 +165,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
-msgstr ""
+msgstr "Nabavni nalogi s statusom \"izjeme\""
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
@@ -194,7 +194,7 @@ msgstr "Naslov za odpremo:"
#. module: purchase
#: view:purchase.order:0
msgid "Confirm Order"
-msgstr ""
+msgstr "Potrdi naročilo"
#. module: purchase
#: field:purchase.config.settings,module_warning:0
@@ -236,7 +236,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:255
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
-msgstr ""
+msgstr "Če želite izbrisati nabavni nalog, ga morate najprej preklicati."
#. module: purchase
#: view:product.product:0
@@ -246,12 +246,12 @@ msgstr ""
#. module: purchase
#: view:purchase.order:0
msgid "Approved purchase orders"
-msgstr ""
+msgstr "Potrjeni nabavni nalogi"
#. module: purchase
#: model:email.template,subject:purchase.email_template_edi_purchase
msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Naročilo (Ref ${object.name or 'n/a' })"
#. module: purchase
#: view:purchase.order:0
@@ -261,7 +261,7 @@ msgstr "Skupaj brez davka"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
msgid "Unit of Measure Categories"
-msgstr ""
+msgstr "Skupine enot mere"
#. module: purchase
#: view:purchase.report:0
@@ -279,7 +279,7 @@ msgstr ""
#, python-format
msgid ""
"Quotation for %s converted to a Purchase Order of %s %s."
-msgstr ""
+msgstr "Ponudba za %s spremenjena v nabavni nalog %s %s."
#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -296,7 +296,7 @@ msgstr ""
#: field:purchase.order.line,state:0
#: view:purchase.report:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: purchase
#: selection:purchase.report,month:0
@@ -322,7 +322,7 @@ msgstr "Naročila"
#: help:account.config.settings,group_analytic_account_for_purchases:0
#: help:purchase.config.settings,group_analytic_account_for_purchases:0
msgid "Allows you to specify an analytic account on purchase orders."
-msgstr ""
+msgstr "Omogoča določitev analitičnega konta na nabavnem nalogu."
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -349,7 +349,7 @@ msgstr "Oktober"
#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for %s cancelled ."
-msgstr ""
+msgstr "Nabavni nalog za %s preklican ."
#. module: purchase
#: field:purchase.order,message_summary:0
@@ -372,7 +372,7 @@ msgstr "Ponudbe"
#. module: purchase
#: view:purchase.order.line_invoice:0
msgid "Do you want to generate the supplier invoices?"
-msgstr ""
+msgstr "Želite ustvariti prejete račune?"
#. module: purchase
#: field:purchase.order.line,product_qty:0
@@ -448,7 +448,7 @@ msgstr ""
#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is waiting for validation ."
-msgstr ""
+msgstr "Osnutek računa %s %s čaka na potrditev."
#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -2203,7 +2203,7 @@ msgstr ""
#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
-msgstr ""
+msgstr "Osnutki naročil"
#. module: purchase
#: view:purchase.report:0
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 29de1fe30fd..4d7a2fbdb04 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -178,7 +178,7 @@ class purchase_order(osv.osv):
'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse'),
'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')], states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]} ),
'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
- 'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", readonly=True, required=True),
+ 'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", string="Currency",readonly=True, required=True),
'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The status of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' status. Then the order has to be confirmed by the user, the status switch to 'Confirmed'. Then the supplier must confirm the order to change the status to 'Approved'. When the purchase order is paid and received, the status becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the status becomes in exception.", select=True),
'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
@@ -186,7 +186,7 @@ class purchase_order(osv.osv):
'invoice_ids': fields.many2many('account.invoice', 'purchase_invoice_rel', 'purchase_id', 'invoice_id', 'Invoices', help="Invoices generated for a purchase order"),
'picking_ids': fields.one2many('stock.picking.in', 'purchase_id', 'Picking List', readonly=True, help="This is the list of incoming shipments that have been generated for this purchase order."),
'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"),
- 'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'),
+ 'shipped_rate': fields.function(_shipped_rate, string='Received Ratio', type='float'),
'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been paid"),
'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,
@@ -389,6 +389,15 @@ class purchase_order(osv.osv):
self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
return True
+ def print_confirm(self,cr,uid,ids,context=None):
+ print "Confirmed"
+
+ def print_double(self,cr,uid,ids,context=None):
+ print "double Approval"
+
+ def print_router(self,cr,uid,ids,context=None):
+ print "Routed"
+
def wkf_send_rfq(self, cr, uid, ids, context=None):
'''
This function opens a window to compose an email, with the edi purchase template message loaded by default
@@ -985,7 +994,7 @@ class purchase_order_line(osv.osv):
if not date_order:
date_order = fields.date.context_today(self,cr,uid,context=context)
- qty = qty or 1.0
+
supplierinfo = False
for supplier in product.seller_ids:
if partner_id and (supplier.name.id == partner_id):
@@ -993,13 +1002,15 @@ class purchase_order_line(osv.osv):
if supplierinfo.product_uom.id != uom_id:
res['warning'] = {'title': _('Warning!'), 'message': _('The selected supplier only sells this product by %s') % supplierinfo.product_uom.name }
min_qty = product_uom._compute_qty(cr, uid, supplierinfo.product_uom.id, supplierinfo.min_qty, to_uom_id=uom_id)
- if qty < min_qty: # If the supplier quantity is greater than entered from user, set minimal.
- res['warning'] = {'title': _('Warning!'), 'message': _('The selected supplier has a minimal quantity set to %s %s, you should not purchase less.') % (supplierinfo.min_qty, supplierinfo.product_uom.name)}
+ if (qty or 0.0) < min_qty: # If the supplier quantity is greater than entered from user, set minimal.
+ if qty:
+ res['warning'] = {'title': _('Warning!'), 'message': _('The selected supplier has a minimal quantity set to %s %s, you should not purchase less.') % (supplierinfo.min_qty, supplierinfo.product_uom.name)}
qty = min_qty
-
dt = self._get_date_planned(cr, uid, supplierinfo, date_order, context=context).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
-
- res['value'].update({'date_planned': date_planned or dt, 'product_qty': qty})
+ qty = qty or 1.0
+ res['value'].update({'date_planned': date_planned or dt})
+ if qty:
+ res['value'].update({'product_qty': qty})
# - determine price_unit and taxes_id
if pricelist_id:
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index eba27492974..15a9de84f43 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -132,43 +132,6 @@
-
-
- Purchase: Mark unread
- True
- ir.actions.server
-
- code
- self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
-
-
- action_purchase_order_unread
-
-
- action
-
- purchase.order
- client_action_multi
-
-
-
- Purchase: Mark read
- True
- ir.actions.server
-
- code
- self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
-
-
- action_purchase_order_read
-
-
- action
-
- purchase.order
- client_action_multi
-
-
purchase.order.calendar
purchase.order
@@ -242,7 +205,7 @@
-
+
@@ -421,7 +384,7 @@
-
+
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 212ce304e07..aa2de4d17a0 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -22,6 +22,7 @@
confirmed
+ OR
function
wkf_confirm_order()
@@ -49,6 +50,7 @@
router
OR
function
+
AND
wkf_approve_order()
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index c1500c48710..11c69a1946c 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -32,7 +32,6 @@
-
@@ -167,4 +166,4 @@
[[ user.signature or '' ]]
-
+
\ No newline at end of file
diff --git a/addons/purchase_double_validation/i18n/pt_BR.po b/addons/purchase_double_validation/i18n/pt_BR.po
index 8946c584996..e1cdaefbab0 100644
--- a/addons/purchase_double_validation/i18n/pt_BR.po
+++ b/addons/purchase_double_validation/i18n/pt_BR.po
@@ -8,46 +8,45 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-07-28 21:05+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"\n"
+"PO-Revision-Date: 2012-12-07 16:41+0000\n"
+"Last-Translator: Cristiano Korndörfer \n"
"Language-Team: Brazilian Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: purchase_double_validation
#: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
msgid "purchase.config.settings"
-msgstr ""
+msgstr "purchase.config.settings"
#. module: purchase_double_validation
#: view:purchase.order:0
msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "Pedidos de compra que ainda não foram aprovados"
#. module: purchase_double_validation
#: field:purchase.config.settings,limit_amount:0
msgid "limit to require a second approval"
-msgstr ""
+msgstr "limitar para solicitar uma segunda aprovação"
#. module: purchase_double_validation
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
msgid "Purchase Orders Waiting Approval"
-msgstr ""
+msgstr "Pedidos de Compra Aguardando Aprovação"
#. module: purchase_double_validation
#: view:purchase.order:0
msgid "To Approve"
-msgstr ""
+msgstr "Para Aprovar"
#. module: purchase_double_validation
#: help:purchase.config.settings,limit_amount:0
msgid "Amount after which validation of purchase is required."
-msgstr ""
+msgstr "Valor a partir do qual é solicitada validação da compra."
#~ msgid "Configure Limit Amount for Purchase"
#~ msgstr "Configura o Valor Limite para Compra"
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
index 157694cf0cc..75600867482 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.py
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -34,16 +34,16 @@ class purchase_config_settings(osv.osv_memory):
def get_default_limit_amount(self, cr, uid, fields, context=None):
ir_model_data = self.pool.get('ir.model.data')
- transition = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed')
+ transition = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_lt')
field, value = transition.condition.split('<', 1)
return {'limit_amount': int(value)}
def set_limit_amount(self, cr, uid, ids, context=None):
ir_model_data = self.pool.get('ir.model.data')
config = self.browse(cr, uid, ids[0], context)
- waiting = ir_model_data.get_object(cr, uid, 'purchase', 'trans_confirmed_router')
+ waiting = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_gt')
waiting.write({'condition': 'amount_total >= %s' % config.limit_amount})
- confirm = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed')
+ confirm = ir_model_data.get_object(cr, uid, 'purchase_double_validation', 'trans_confirmed_double_lt')
confirm.write({'condition': 'amount_total < %s' % config.limit_amount})
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
index 5ad03705035..f0bed5e99b0 100644
--- a/addons/purchase_double_validation/purchase_double_validation_installer.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -8,7 +8,7 @@
-
+
diff --git a/addons/purchase_double_validation/purchase_double_validation_workflow.xml b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
index 61503564246..673063ff049 100644
--- a/addons/purchase_double_validation/purchase_double_validation_workflow.xml
+++ b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
@@ -2,17 +2,42 @@
-
+
+
+ WaitForApproval
+ dummy
+
+
+
+
+ CheckForApproval
+ OR
+ dummy
+
+
+
+
+
+
+
+
+
+
amount_untaxed >= 5000
purchase_approve
-
-
-
+
+
+
amount_untaxed < 5000
+
+
+
+
+
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 5ee0a007cc9..230c81a0bfc 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -156,7 +156,7 @@
purchase.requisition
form
tree,form
- {"search_default_create_uid":uid}
+ {"search_default_user_id":uid}
@@ -182,7 +182,7 @@
product.product
-
+
diff --git a/addons/report_webkit/company.py b/addons/report_webkit/company.py
index 1e4d06b9b2f..f9ae4191528 100644
--- a/addons/report_webkit/company.py
+++ b/addons/report_webkit/company.py
@@ -31,7 +31,7 @@
from openerp.osv import fields, osv
-class ResCompany(osv.osv):
+class res_company(osv.osv):
"""Override company to add Header object link a company can have many header and logos"""
_inherit = "res.company"
@@ -50,13 +50,6 @@ class ResCompany(osv.osv):
'html_id',
'Available html',
),
- 'lib_path' : fields.char('Webkit Executable Path', size=264,
- help="Full path to the wkhtmltopdf executable file. "
- "Version 0.9.9 is required. Install a static version "
- "of the library if you experience missing header/footers "
- "on Linux."),
-
}
-ResCompany()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/company_view.xml b/addons/report_webkit/company_view.xml
index bfbf2b2d79b..2768ade976b 100644
--- a/addons/report_webkit/company_view.xml
+++ b/addons/report_webkit/company_view.xml
@@ -7,7 +7,6 @@
-
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index 36ef2eb7c38..b6c273f8852 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -106,7 +106,6 @@ class WebKitParser(report_sxw):
webkit_header = report_xml.webkit_header
tmp_dir = tempfile.gettempdir()
out_filename = tempfile.mktemp(suffix=".pdf", prefix="webkit.tmp.")
- files = []
file_to_del = [out_filename]
if comm_path:
command = [comm_path]
@@ -220,7 +219,7 @@ class WebKitParser(report_sxw):
template = False
if report_xml.report_file :
- path = addons.get_module_resource(report_xml.report_file)
+ path = addons.get_module_resource(*report_xml.report_file.split(os.path.sep))
if os.path.exists(path) :
template = file(path).read()
if not template and report_xml.report_webkit_data :
@@ -242,8 +241,6 @@ class WebKitParser(report_sxw):
css = report_xml.webkit_header.css
if not css :
css = ''
- user = self.pool.get('res.users').browse(cursor, uid, uid)
- company= user.company_id
#default_filters=['unicode', 'entity'] can be used to set global filter
body_mako_tpl = mako_template(template)
@@ -257,7 +254,7 @@ class WebKitParser(report_sxw):
_=self.translate_call,
**self.parser_instance.localcontext)
htmls.append(html)
- except Exception, e:
+ except Exception:
msg = exceptions.text_error_template().render()
_logger.error(msg)
raise except_osv(_('Webkit render!'), msg)
@@ -268,7 +265,7 @@ class WebKitParser(report_sxw):
_=self.translate_call,
**self.parser_instance.localcontext)
htmls.append(html)
- except Exception, e:
+ except Exception:
msg = exceptions.text_error_template().render()
_logger.error(msg)
raise except_osv(_('Webkit render!'), msg)
@@ -279,7 +276,7 @@ class WebKitParser(report_sxw):
_=self.translate_call,
_debug=False,
**self.parser_instance.localcontext)
- except Exception, e:
+ except Exception:
raise except_osv(_('Webkit render!'),
exceptions.text_error_template().render())
foot = False
@@ -301,7 +298,7 @@ class WebKitParser(report_sxw):
_debug=tools.ustr("\n".join(htmls)),
_=self.translate_call,
**self.parser_instance.localcontext)
- except Exception, e:
+ except Exception:
msg = exceptions.text_error_template().render()
_logger.error(msg)
raise except_osv(_('Webkit render!'), msg)
@@ -327,8 +324,8 @@ class WebKitParser(report_sxw):
report_xml.report_rml = None
report_xml.report_rml_content = None
report_xml.report_sxw_content_data = None
- report_rml.report_sxw_content = None
- report_rml.report_sxw = None
+ report_xml.report_sxw_content = None
+ report_xml.report_sxw = None
else:
return super(WebKitParser, self).create(cursor, uid, ids, data, context)
if report_xml.report_type != 'webkit' :
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index b243b254d57..727ca93d7c9 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -274,13 +274,10 @@ class resource_calendar_attendance(osv.osv):
}
resource_calendar_attendance()
-def convert_timeformat(time_string):
- split_list = str(time_string).split('.')
- hour_part = split_list[0]
- mins_part = split_list[1]
- round_mins = int(round(float(mins_part) * 60,-2))
- converted_string = hour_part + ':' + str(round_mins)[0:2]
- return converted_string
+def hours_time_string(hours):
+ """ convert a number of hours (float) into a string with format '%H:%M' """
+ minutes = int(round(hours * 60))
+ return "%02d:%02d" % divmod(minutes, 60)
class resource_resource(osv.osv):
_name = "resource.resource"
@@ -390,8 +387,8 @@ class resource_resource(osv.osv):
wk_days[week['dayofweek']] = week_days[week['dayofweek']]
else:
raise osv.except_osv(_('Configuration Error!'),_('Make sure the Working time has been configured with proper week days!'))
- hour_from_str = convert_timeformat(week['hour_from'])
- hour_to_str = convert_timeformat(week['hour_to'])
+ hour_from_str = hours_time_string(week['hour_from'])
+ hour_to_str = hours_time_string(week['hour_to'])
res_str = hour_from_str + '-' + hour_to_str
wktime_list.append((day, res_str))
# Convert into format like [('mon', '8:00-12:00', '13:00-18:00')]
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 92611cea180..ad96ae39109 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -28,8 +28,9 @@
${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}
+ ${object.partner_id.lang}
+
Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
@@ -76,7 +77,7 @@
-
+
${object.company_id.name}
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 7d736a56b32..ac92aa26c53 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-05-10 17:16+0000\n"
-"Last-Translator: Ferdinand-camptocamp
\n"
+"PO-Revision-Date: 2012-12-09 22:57+0000\n"
+"Last-Translator: Felix Schubert \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: sale
#: model:ir.model,name:sale.model_account_config_settings
msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
#. module: sale
#: view:sale.order.line:0
@@ -45,7 +45,7 @@ msgstr "VE"
#: view:sale.report:0
#: field:sale.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Verkäufer"
#. module: sale
#: help:sale.order,pricelist_id:0
@@ -60,6 +60,7 @@ msgstr "Tag"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
msgid "Cancel Order"
msgstr "Auftrag stornieren"
@@ -67,18 +68,18 @@ msgstr "Auftrag stornieren"
#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
#, python-format
msgid "Incorrect Data"
-msgstr ""
+msgstr "Fehlerhafte Daten"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
#, python-format
msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "Der Wert eines Vorschussbetrags muss positiv sein"
#. module: sale
#: help:sale.order,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Wenn aktiviert, erfordern neue Nachrichten Ihr Handeln"
#. module: sale
#: view:res.partner:0
@@ -88,7 +89,7 @@ msgstr ""
#. module: sale
#: report:sale.order:0
msgid "Tax"
-msgstr ""
+msgstr "Steuer"
#. module: sale
#: help:sale.order,state:0
@@ -102,6 +103,7 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -114,6 +116,9 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Hier finden Sie die Nachrichtenübersicht (Anzahl Nachrichten etc., ...) im "
+"html Format, um über dieses Format dann später in einer Kanban Ansicht "
+"weiterzuarbeiten."
#. module: sale
#: view:sale.report:0
@@ -124,7 +129,7 @@ msgstr "Menge"
#. module: sale
#: help:sale.config.settings,group_discount_per_so_line:0
msgid "Allows you to apply some discount per sale order line."
-msgstr ""
+msgstr "Ermöglicht die Gewährung eines Rabatts für eine Auftragsposition"
#. module: sale
#: help:sale.config.settings,group_sale_pricelist:0
@@ -132,6 +137,10 @@ msgid ""
"Allows to manage different prices based on rules per category of customers.\n"
"Example: 10% for retailers, promotion of 5 EUR on this product, etc."
msgstr ""
+"Erlaubt die Verwaltung von unterschiedlichen Preisen auf Basis von "
+"Kundenkategorien.\n"
+"z.B. 10% für Wiederverkäufer, Nachlass um 5 EUR aufgrund einer "
+"Verkaufsaktion für das Produkt, etc."
#. module: sale
#: field:sale.shop,payment_default_id:0
@@ -142,17 +151,17 @@ msgstr "Standard Zahlungsbedingung"
#: code:addons/sale/sale.py:662
#, python-format
msgid "Invoice paid ."
-msgstr ""
+msgstr "Rechnung bezahlt "
#. module: sale
#: field:sale.config.settings,group_uom:0
msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Erlaubt die Verwendung verschiedener Maßeinheiten"
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
msgid "Percentage"
-msgstr ""
+msgstr "Prozentsatz"
#. module: sale
#: report:sale.order:0
@@ -163,7 +172,7 @@ msgstr "Rabatt (%)"
#: code:addons/sale/sale.py:787
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Weisen Sie ein Ertragskonto für diese Produkt zu: \"%s\" (id:%d)."
#. module: sale
#: view:sale.report:0
@@ -214,17 +223,17 @@ msgstr "Andere Informationen"
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Warnung!"
#. module: sale
#: view:sale.config.settings:0
msgid "Invoicing Process"
-msgstr ""
+msgstr "Rechnungsstellungsprozess"
#. module: sale
#: view:sale.order:0
msgid "Sales Order done"
-msgstr ""
+msgstr "Auftrag erledigt"
#. module: sale
#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -237,6 +246,8 @@ msgstr "Angebote und Verkäufe"
msgid ""
"Allows you to select and maintain different units of measure for products."
msgstr ""
+"Ermöglicht die Auswahl und Verwaltung verschiedener Maßeinheiten für "
+"Produkte."
#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
@@ -257,7 +268,7 @@ msgstr "Rabatt (%)"
#. module: sale
#: view:sale.order.line.make.invoice:0
msgid "Create & View Invoice"
-msgstr ""
+msgstr "Erzeuge und zeige Rechnung an"
#. module: sale
#: view:board.board:0
@@ -269,6 +280,7 @@ msgstr "Meine Angebote"
#: field:sale.config.settings,module_warning:0
msgid "Allow configuring alerts by customer or products"
msgstr ""
+"Ermöglicht die Konfiguration von Hinweisen nach Kunden oder Produkten"
#. module: sale
#: field:sale.shop,name:0
@@ -289,27 +301,38 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Hier finden Sie eine Liste mit abrechenbaren "
+"Auftragspositionen.\n"
+" Sie können Aufträge teilweise, basierend auf "
+"Auftragspositionen,\n"
+" abrechnen. Sie benötigen diese Liste nicht, wenn Sie auf "
+"Basis \n"
+" von Lieferscheinen oder die vollständigen Aufträge "
+"abrechnen.\n"
+"
\n"
+" "
#. module: sale
#: view:sale.order:0
msgid "Quotation "
-msgstr ""
+msgstr "Angebot "
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
#, python-format
msgid "Advance of %s %%"
-msgstr ""
+msgstr "Abschlagszahlung von %s %%"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
msgid "Sales in Exception"
msgstr "Verkaufsaufträge in Fehlerliste"
#. module: sale
#: help:sale.order.line,address_allotment_id:0
msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
+msgstr "Ein Partner, dem dieses bestimmte Produkt zugeordnet wurde."
#. module: sale
#: view:sale.order:0
@@ -339,6 +362,17 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Klicken Sie hier, um ein Angebot zu erzeugen, das in einen "
+"Auftrag\n"
+" umgewandelt werden kann.\n"
+"
\n"
+" OpenERP unterstützt Sie effizient Ihren vollständigen "
+"Verkaufsprozess\n"
+" abzuwickeln: Angebot, Auftrag, Lieferung, Rechnungsstellung "
+"und Bezahlung.\n"
+"
\n"
+" "
#. module: sale
#: selection:sale.report,month:0
@@ -363,23 +397,23 @@ msgstr "Oktober"
#. module: sale
#: field:sale.order,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Zusammenfassung"
#. module: sale
#: view:sale.order:0
msgid "View Invoice"
-msgstr ""
+msgstr "Rechnung anzeigen"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
#, python-format
msgid "Advance of %s %s"
-msgstr ""
+msgstr "Abschlagszahlung von %s %s"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -388,14 +422,13 @@ msgstr "Angebote"
#. module: sale
#: field:sale.advance.payment.inv,qtty:0
#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
msgid "Quantity"
msgstr "Menge"
#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "Lieferadress für den aktuellen Auftrag."
#. module: sale
#: report:sale.order:0
@@ -413,6 +446,7 @@ msgid "Fiscal Position"
msgstr "Steuerzuordnung"
#. module: sale
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "In Progress"
msgstr "In Bearbeitung"
@@ -421,7 +455,7 @@ msgstr "In Bearbeitung"
#: code:addons/sale/sale.py:667
#, python-format
msgid "Draft Invoice of %s %s waiting for validation ."
-msgstr ""
+msgstr "Rechnungsentwurf %s %s wartet auf Bestätigung ."
#. module: sale
#: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -438,6 +472,8 @@ msgstr ""
#, python-format
msgid "You cannot cancel a sale order line that has already been invoiced."
msgstr ""
+"Sie können keine Auftragszeile stornieren, wenn sie bereits abgerechnet "
+"wurde."
#. module: sale
#: report:sale.order:0
@@ -452,12 +488,12 @@ msgstr "Rechnungsadresse für diesen Verkaufsauftrag."
#. module: sale
#: model:ir.model,name:sale.model_sale_config_settings
msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
#. module: sale
#: selection:sale.order,order_policy:0
msgid "Before Delivery"
-msgstr ""
+msgstr "Vor Lieferung"
#. module: sale
#: code:addons/sale/sale.py:804
@@ -470,17 +506,17 @@ msgstr ""
#. module: sale
#: model:res.groups,name:sale.group_delivery_invoice_address
msgid "Addresses in Sale Orders"
-msgstr ""
+msgstr "Addressen in Aufträgen"
#. module: sale
#: field:sale.order,project_id:0
msgid "Contract / Analytic"
-msgstr ""
+msgstr "Vertrag/Analytisches Konto"
#. module: sale
#: model:res.groups,name:sale.group_invoice_so_lines
msgid "Enable Invoicing Sale order lines"
-msgstr ""
+msgstr "Rechnungserstellung basierend auf Auftragszeilen"
#. module: sale
#: view:sale.report:0
@@ -501,10 +537,9 @@ msgstr ""
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "or"
-msgstr ""
+msgstr "oder"
#. module: sale
-#: field:sale.order,invoice_exists:0
#: field:sale.order,invoiced_rate:0
#: field:sale.order.line,invoiced:0
msgid "Invoiced"
@@ -513,7 +548,7 @@ msgstr "Abgerechnet"
#. module: sale
#: model:res.groups,name:sale.group_analytic_accounting
msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "Analytische Konten für den Verkauf"
#. module: sale
#: field:sale.order,date_confirm:0
@@ -528,7 +563,7 @@ msgstr "Vertriebspartner"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
msgid "Invoice Order"
-msgstr ""
+msgstr "Bestellungsrechnung"
#. module: sale
#: selection:sale.report,month:0
@@ -538,7 +573,7 @@ msgstr "März"
#. module: sale
#: model:ir.actions.server,name:sale.actions_server_sale_order_read
msgid "Sale: Mark read"
-msgstr ""
+msgstr "Verkauf: Als gelesen markieren"
#. module: sale
#: help:sale.order,amount_total:0
@@ -549,6 +584,8 @@ msgstr "Gesamtsumme."
#: field:sale.config.settings,module_sale_journal:0
msgid "Allow batch invoicing of delivery orders through journals"
msgstr ""
+"Stapelverarbeitung zur Erzeugung von Rechnungen auf Basis von Lieferscheinen "
+"erlauben"
#. module: sale
#: field:sale.order.line,price_subtotal:0
@@ -558,7 +595,7 @@ msgstr "Zwischensumme"
#. module: sale
#: field:sale.config.settings,group_discount_per_so_line:0
msgid "Allow setting a discount on the sale order lines"
-msgstr ""
+msgstr "Rabatt auf Auftragszeilen erlauben"
#. module: sale
#: report:sale.order:0
@@ -568,12 +605,12 @@ msgstr "Rechnungsanschrift:"
#. module: sale
#: field:sale.order.line,product_uom:0
msgid "Unit of Measure "
-msgstr ""
+msgstr "Maßeinheit "
#. module: sale
#: field:sale.config.settings,time_unit:0
msgid "The default working time unit for services is"
-msgstr ""
+msgstr "Standard Zeiteinheit für Dienstleistungen ist"
#. module: sale
#: field:sale.order,partner_invoice_id:0
@@ -598,14 +635,19 @@ msgid ""
" or a fixed price (for advances) directly from the sale "
"order form if you prefer."
msgstr ""
+"Alle Auftragszeilen werden in Rechnung gestellt. Sie können auch einen "
+"Prozentsatz\n"
+" definieren, der auf die Summe angewendet wird oder einen "
+"Festpreis (für Abschlagszahlungen) direkt aus dem Auftrag."
#. module: sale
#: view:sale.order:0
msgid "(update)"
-msgstr ""
+msgstr "(aktualisieren)"
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
msgid "Sales Order Line"
msgstr "Auftragsposition"
@@ -613,11 +655,12 @@ msgstr "Auftragsposition"
#: field:sale.config.settings,module_analytic_user_function:0
msgid "One employee can have different roles per contract"
msgstr ""
+"Ein Mitarbeiter kann verschiedene Rollen in verschiedenen Verträgen haben."
#. module: sale
#: view:sale.order:0
msgid "Print"
-msgstr ""
+msgstr "Drucken"
#. module: sale
#: report:sale.order:0
@@ -625,7 +668,6 @@ msgid "Order N°"
msgstr "Bestellnummer"
#. module: sale
-#: view:sale.order:0
#: field:sale.order,order_line:0
msgid "Order Lines"
msgstr "Auftragszeilen"
@@ -633,7 +675,7 @@ msgstr "Auftragszeilen"
#. module: sale
#: field:account.config.settings,module_sale_analytic_plans:0
msgid "Use multiple analytic accounts on sales"
-msgstr ""
+msgstr "Verwenden Sie mehrere Analytische Konten für den Verkauf"
#. module: sale
#: help:sale.config.settings,module_sale_journal:0
@@ -653,7 +695,7 @@ msgstr "Datum Auftragserstellung"
#: code:addons/sale/sale.py:659
#, python-format
msgid "Sale Order for %s set to Done "
-msgstr ""
+msgstr "Auftrag für %s wurde auf Erledigt gesetzt"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -695,7 +737,7 @@ msgstr ""
#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
#, python-format
msgid "There is no income account defined as global property."
-msgstr ""
+msgstr "Es wurde kein Ertragskonto als allgemeiner Standard festgelegt."
#. module: sale
#: code:addons/sale/sale.py:984
@@ -703,12 +745,12 @@ msgstr ""
#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
#, python-format
msgid "Configuration Error!"
-msgstr ""
+msgstr "Konfigurationsfehler!"
#. module: sale
#: view:sale.order:0
msgid "Send by Email"
-msgstr ""
+msgstr "E-mail senden"
#. module: sale
#: code:addons/sale/res_config.py:89
@@ -723,6 +765,7 @@ msgstr "Auftragsdatum"
#. module: sale
#: view:sale.order.line:0
+#: field:sale.report,shipped:0
msgid "Shipped"
msgstr "Ausgeliefert"
@@ -732,9 +775,9 @@ msgid ""
"To allow your salesman to make invoices for sale order lines using the menu "
"'Lines to Invoice'."
msgstr ""
+"Erlaubt dem Verkäufer Rechnung auf Basis von Auftragspositionen zu erstellen."
#. module: sale
-#: model:ir.model,name:sale.model_res_partner
#: view:sale.report:0
#: field:sale.report,partner_id:0
msgid "Partner"
@@ -743,7 +786,7 @@ msgstr "Partner"
#. module: sale
#: view:sale.advance.payment.inv:0
msgid "Create and View Invoice"
-msgstr ""
+msgstr "Erzeuge und zeige Rechnung an"
#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
@@ -771,7 +814,7 @@ msgid "You cannot confirm a sale order which has no line."
msgstr "Sie können einen Verkaufsauftrag ohne Zeilen nicht bestätigen"
#. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
#, python-format
msgid ""
"You have to select a pricelist or a customer in the sales form !\n"
@@ -790,7 +833,7 @@ msgstr "Produktkategorie"
#: code:addons/sale/sale.py:555
#, python-format
msgid "Cannot cancel this sales order!"
-msgstr ""
+msgstr "Der Auftrag kann nicht abgebrochen werden!"
#. module: sale
#: view:sale.order:0
@@ -803,6 +846,7 @@ msgstr "Wiederherstellung Rechnung"
msgid ""
"In order to delete a confirmed sale order, you must cancel it before !"
msgstr ""
+"Um einen bestätigten Auftrag zu löschen, muss er vorher storniert werden!"
#. module: sale
#: report:sale.order:0
@@ -812,17 +856,17 @@ msgstr "Steuern:"
#. module: sale
#: selection:sale.order,order_policy:0
msgid "On Demand"
-msgstr ""
+msgstr "Auf Anforderung"
#. module: sale
#: field:sale.order,currency_id:0
msgid "unknown"
-msgstr ""
+msgstr "Unbekannt"
#. module: sale
#: field:sale.order,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Ist ein Follower"
#. module: sale
#: field:sale.order,date_order:0
@@ -865,7 +909,7 @@ msgstr "Keine gültige Preisliste gefunden"
#. module: sale
#: field:sale.config.settings,module_sale_margin:0
msgid "Display margins on sales orders"
-msgstr ""
+msgstr "Gewinnspanne in Aufträgen anzeigen"
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -884,6 +928,7 @@ msgid "Your Reference"
msgstr "Ihre Referenz"
#. module: sale
+#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Anz."
@@ -895,9 +940,10 @@ msgstr "Meine Verkaufsauftragspositionen"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
#: view:sale.advance.payment.inv:0
#: view:sale.make.invoice:0
-#: view:sale.order:0
#: view:sale.order.line:0
#: view:sale.order.line.make.invoice:0
msgid "Cancel"
@@ -915,13 +961,15 @@ msgid ""
"Cannot find a pricelist line matching this product and quantity.\n"
"You have to change either the product, the quantity or the pricelist."
msgstr ""
+"Es wurde keine Preisliste gefunden, die für diese Produkt und Anzahl "
+"zutrifft.\n"
+"Sie müssen entweder das Produkt, die Anzahl oder die Preisliste ändern."
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
#: view:sale.order.line:0
msgid "Create Invoice"
msgstr "Erzeuge Rechnung"
@@ -948,13 +996,14 @@ msgstr ""
#. module: sale
#: report:sale.order:0
+#: view:sale.order.line:0
msgid "Price"
msgstr "Verkaufspreis"
#. module: sale
#: view:sale.order:0
msgid "Quotation Number"
-msgstr ""
+msgstr "Angebotsnummer"
#. module: sale
#: selection:sale.order.line,type:0
@@ -969,7 +1018,7 @@ msgstr "Lieferanschrift:"
#. module: sale
#: help:account.config.settings,group_analytic_account_for_sales:0
msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
+msgstr "Ermöglicht die Zuordnung eines Analytischen Kontos zu einem Auftrag."
#. module: sale
#: model:process.node,note:sale.process_node_quotation0
@@ -980,12 +1029,12 @@ msgstr "Entwurf Zustand des Verkaufsauftrags"
#: code:addons/sale/sale.py:647
#, python-format
msgid "Quotation for %s created ."
-msgstr ""
+msgstr "Angebot für %s erzeugt ."
#. module: sale
#: help:sale.order,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Nachrichten und Kommunikations-Historie"
#. module: sale
#: view:sale.order:0
@@ -996,12 +1045,12 @@ msgstr ""
#: code:addons/sale/sale.py:1007
#, python-format
msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
+msgstr "Kann eine Auftragszeile im Status '%s' nicht löschen."
#. module: sale
#: model:res.groups,name:sale.group_mrp_properties
msgid "Properties on lines"
-msgstr ""
+msgstr "Eigentschaften von Zeilen"
#. module: sale
#: code:addons/sale/sale.py:888
@@ -1010,6 +1059,8 @@ msgid ""
"Before choosing a product,\n"
" select a customer in the sales form."
msgstr ""
+"Bevor Sie ein Produkt auswählen,\n"
+" wählen Sie einen Kunden im Verkaufsformular aus."
#. module: sale
#: view:sale.order:0
@@ -1030,7 +1081,7 @@ msgstr "Bestätige Angebot"
#: model:ir.actions.act_window,name:sale.action_order_line_tree2
#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
msgid "Order Lines to Invoice"
-msgstr ""
+msgstr "Auftragszeilen für Rechnung"
#. module: sale
#: view:sale.order:0
@@ -1042,7 +1093,7 @@ msgstr "Gruppierung..."
#. module: sale
#: view:sale.config.settings:0
msgid "Product Features"
-msgstr ""
+msgstr "Produkteigenschaften"
#. module: sale
#: selection:sale.order,state:0
@@ -1054,7 +1105,7 @@ msgstr "Warteliste"
#: view:sale.order.line:0
#: field:sale.report,product_uom:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "Maßeinheit"
#. module: sale
#: field:sale.order.line,type:0
@@ -1064,18 +1115,18 @@ msgstr "Dispositionsmethode"
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
msgid "Invoice the whole sale order"
-msgstr ""
+msgstr "Rechnung auf Basis eines vollständigen Auftrags"
#. module: sale
#: view:sale.order:0
#: field:sale.order,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Ungelesene Nachrichten"
#. module: sale
#: selection:sale.order,state:0
msgid "Draft Quotation"
-msgstr ""
+msgstr "Angebotsentwurf"
#. module: sale
#: selection:sale.order,state:0
@@ -1083,6 +1134,7 @@ msgid "Sale Order"
msgstr "Verkaufsauftrag"
#. module: sale
+#: view:sale.order:0
#: field:sale.order,amount_tax:0
#: field:sale.order.line,tax_id:0
msgid "Taxes"
@@ -1122,7 +1174,7 @@ msgstr "Erzeuge Rechnungen"
#: code:addons/sale/sale.py:1007
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Ungültige Aktion!"
#. module: sale
#: report:sale.order:0
@@ -1152,13 +1204,14 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
msgid "Make Invoices"
msgstr "Rechnungen erstellen"
#. module: sale
#: field:res.partner,sale_order_count:0
msgid "# of Sales Order"
-msgstr ""
+msgstr "# des Auftrags"
#. module: sale
#: view:sale.order:0
@@ -1182,11 +1235,15 @@ msgid ""
"After clicking 'Show Lines to Invoice', select lines to invoice and create "
"the invoice from the 'More' dropdown menu."
msgstr ""
+"Nachdem Sie 'Auftragszeilen zur Verrechnung anzeigen' angeklickt haben, "
+"wählen Sie die zu verrechnenden Zeilen aus und erzeugen Sie die Rechnung "
+"durch Auswahl des Eintrages im Menu 'Mehr'."
#. module: sale
#: help:sale.order,invoice_exists:0
msgid "It indicates that sale order has at least one invoice."
msgstr ""
+"Gibt an das mindestens eine Rechnung für diesen Auftrag erzeugt wurde."
#. module: sale
#: selection:sale.order,state:0
@@ -1204,16 +1261,17 @@ msgstr "Gruppiere Rechnungen"
#, python-format
msgid "Quotation for %s converted to Sale Order of %s %s."
msgstr ""
+"Das Angebot für %s wurde umgewandelt in Auftrag %s %s."
#. module: sale
#: view:sale.advance.payment.inv:0
msgid "Invoice Sale Order"
-msgstr ""
+msgstr "Auftrag abrechnen"
#. module: sale
#: view:sale.config.settings:0
msgid "Contracts Management"
-msgstr ""
+msgstr "Vertragsverwaltung"
#. module: sale
#: view:sale.report:0
@@ -1256,7 +1314,7 @@ msgstr "Statistik Verkaufsaufträge"
#. module: sale
#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Quotation"
msgstr "Angebot"
@@ -1383,7 +1441,7 @@ msgstr ""
#. module: sale
#: field:sale.config.settings,group_sale_pricelist:0
msgid "Use pricelists to adapt your price per customers"
-msgstr ""
+msgstr "Benutzen Sie Preislisten, um den Preis auf Kundenbasis anzupassen"
#. module: sale
#: view:sale.order.line:0
@@ -1405,10 +1463,8 @@ msgid "Customer Invoices"
msgstr "Kundenrechnungen"
#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
#: view:sale.order:0
#: view:sale.report:0
msgid "Sales"
@@ -1430,7 +1486,6 @@ msgid "Unit Price"
msgstr "Preis/ME"
#. module: sale
-#: view:sale.order:0
#: selection:sale.order,state:0
#: view:sale.order.line:0
#: selection:sale.order.line,state:0
@@ -1439,10 +1494,8 @@ msgid "Done"
msgstr "Erledigt"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Rechnung"
@@ -1477,7 +1530,7 @@ msgstr "Produkt"
#. module: sale
#: field:sale.config.settings,group_invoice_so_lines:0
msgid "Generate invoices based on the sale order lines"
-msgstr ""
+msgstr "Erzeugt Rechnungen auf Basis von Auftragszeilen"
#. module: sale
#: help:sale.order,order_policy:0
@@ -1518,6 +1571,7 @@ msgid "Product UoS"
msgstr "Produkt - Verkaufseinheit"
#. module: sale
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manuell in Bearbeitung"
@@ -1525,7 +1579,7 @@ msgstr "Manuell in Bearbeitung"
#. module: sale
#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
msgid "Sale: Mark unread"
-msgstr ""
+msgstr "Verkauf: Als ungelesen markieren"
#. module: sale
#: view:sale.order.line:0
@@ -1535,7 +1589,7 @@ msgstr "Auftrag"
#. module: sale
#: view:sale.order:0
msgid "Confirm Sale"
-msgstr ""
+msgstr "Auftrag bestätiguen"
#. module: sale
#: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -1564,7 +1618,7 @@ msgstr ""
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
msgid "Some order lines"
-msgstr ""
+msgstr "Einige Auftragspositionen"
#. module: sale
#: view:res.partner:0
@@ -1574,7 +1628,7 @@ msgstr ""
#. module: sale
#: model:res.groups,name:sale.group_discount_per_so_line
msgid "Discount on lines"
-msgstr ""
+msgstr "Rabatt auf Auftragspositionen"
#. module: sale
#: field:sale.order,client_order_ref:0
@@ -1640,6 +1694,7 @@ msgstr "Datum der Auftragsbestätigung"
#, python-format
msgid "First cancel all invoices attached to this sales order."
msgstr ""
+"Stornieren Sie zuerst alle Rechnungen, die mit diesem Auftrag verknüpft sind."
#. module: sale
#: field:sale.order,company_id:0
@@ -1667,7 +1722,7 @@ msgid "Invoice Exception"
msgstr "Abrechnungsfehler"
#. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
#, python-format
msgid "No Customer Defined !"
msgstr "Kein Kunde definiert !"
@@ -1675,7 +1730,7 @@ msgstr "Kein Kunde definiert !"
#. module: sale
#: field:sale.order,partner_shipping_id:0
msgid "Delivery Address"
-msgstr ""
+msgstr "Lieferadresse"
#. module: sale
#: selection:sale.order,state:0
@@ -1685,17 +1740,17 @@ msgstr ""
#. module: sale
#: view:sale.config.settings:0
msgid "Warehouse Features"
-msgstr ""
+msgstr "Lager Eigenschaften"
#. module: sale
#: field:sale.order,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Nachrichten"
#. module: sale
#: field:sale.config.settings,module_project:0
msgid "Project"
-msgstr ""
+msgstr "Projekt"
#. module: sale
#: code:addons/sale/sale.py:354
@@ -1705,7 +1760,7 @@ msgstr ""
#: code:addons/sale/sale.py:803
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Fehler!"
#. module: sale
#: report:sale.order:0
@@ -1735,15 +1790,16 @@ msgstr "Suche nicht abgerechnete Auftragspositionen"
#. module: sale
#: selection:sale.order,state:0
msgid "Quotation Sent"
-msgstr ""
+msgstr "Angebot gesendet"
#. module: sale
#: model:ir.model,name:sale.model_mail_compose_message
msgid "Email composition wizard"
-msgstr ""
+msgstr "E-Mail Assistent"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
#: view:sale.report:0
#: field:sale.report,shop_id:0
@@ -1760,22 +1816,20 @@ msgstr "Geplante Lieferung am"
#, python-format
msgid "Please define sales journal for this company: \"%s\" (id:%d)."
msgstr ""
+"Bitte wählen Sie ein Verkaufsjournal für das Unternehmen \"%s\" (id:%d) aus."
#. module: sale
#: view:sale.config.settings:0
msgid "Contract Features"
-msgstr ""
+msgstr "Vertragseigenschaften"
#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
#: model:res.request.link,name:sale.req_link_sale_order
#: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
msgid "Sales Order"
msgstr "Verkaufsauftrag"
@@ -1797,7 +1851,7 @@ msgstr "Bestätigt"
#. module: sale
#: field:sale.order,note:0
msgid "Terms and conditions"
-msgstr ""
+msgstr "Geschäftsbedingungen"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1807,9 +1861,10 @@ msgstr "Bestätigen"
#. module: sale
#: field:sale.order,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Followers"
#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,invoice_lines:0
msgid "Invoice Lines"
msgstr "Rechnungszeilen"
@@ -1821,7 +1876,6 @@ msgid "# of Lines"
msgstr "# Positionen"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1830,12 +1884,12 @@ msgstr "Verkaufsauftragpositionen"
#. module: sale
#: view:sale.config.settings:0
msgid "Default Options"
-msgstr ""
+msgstr "Standardeinstellungen"
#. module: sale
#: field:account.config.settings,group_analytic_account_for_sales:0
msgid "Analytic accounting for sales"
-msgstr ""
+msgstr "Analytische Konten für den Verkauf"
#. module: sale
#: code:addons/sale/edi/sale_order.py:139
@@ -1872,7 +1926,7 @@ msgstr ""
#. module: sale
#: view:sale.report:0
msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Basis Mengeneinheit"
#. module: sale
#: model:ir.actions.act_window,help:sale.action_quotations
@@ -1895,7 +1949,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1919,6 +1973,8 @@ msgid "Weight"
msgstr "Gewicht"
#. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
#: field:sale.order,invoice_ids:0
msgid "Invoices"
msgstr "Alle Rechnungen"
@@ -1933,6 +1989,8 @@ msgstr "Dezember"
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)."
msgstr ""
+"Es wurde kein Ertragskonto für dieses Produkt ausgewählt: \"%s\" (Kürzel: "
+"%d)."
#. module: sale
#: view:sale.order.line:0
@@ -1950,7 +2008,10 @@ msgid "Untaxed Amount"
msgstr "Nettobetrag"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
#, python-format
msgid "Advance Invoice"
msgstr "Anzahlungsrechnung"
@@ -1958,7 +2019,7 @@ msgstr "Anzahlungsrechnung"
#. module: sale
#: model:ir.actions.client,name:sale.action_client_sale_menu
msgid "Open Sale Menu"
-msgstr ""
+msgstr "Öffne Menü Verkauf"
#. module: sale
#: selection:sale.order.line,state:0
@@ -1968,7 +2029,7 @@ msgstr "Entwurf"
#. module: sale
#: field:sale.config.settings,module_sale_stock:0
msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
+msgstr "Erzeuge Lieferscheine automatisch aus Aufträgen"
#. module: sale
#: help:sale.order,amount_tax:0
@@ -1978,7 +2039,7 @@ msgstr "Steuerbetrag"
#. module: sale
#: view:sale.order:0
msgid "Sale Order "
-msgstr ""
+msgstr "Auftrag "
#. module: sale
#: view:sale.order.line:0
@@ -1991,6 +2052,8 @@ msgid "Email Templates"
msgstr "E-Mail Vorlagen"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
#: view:sale.order:0
msgid "Sales Orders"
msgstr "Verkaufsaufträge"
@@ -2010,7 +2073,7 @@ msgstr "November"
#: field:sale.order,message_comment_ids:0
#: help:sale.order,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Kommentare und E-Mails"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -2028,7 +2091,7 @@ msgid "January"
msgstr "Januar"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Auftrag in Bearbeitung"
@@ -2041,7 +2104,7 @@ msgstr ""
#: code:addons/sale/sale.py:655
#, python-format
msgid "Sale Order for %s cancelled ."
-msgstr ""
+msgstr "Auftrag für %s wurde abgebrochen ."
#. module: sale
#: help:sale.order,origin:0
@@ -2057,7 +2120,7 @@ msgstr "Tage bis Auftrag"
#. module: sale
#: field:sale.report,state:0
msgid "Order Status"
-msgstr ""
+msgstr "Auftragsstatus"
#. module: sale
#: view:sale.advance.payment.inv:0
@@ -2094,12 +2157,12 @@ msgstr "Keine Preisliste! "
#: model:ir.actions.act_window,name:sale.action_orders
#: model:ir.ui.menu,name:sale.menu_sale_order
msgid "Sale Orders"
-msgstr ""
+msgstr "Aufträge"
#. module: sale
#: field:sale.config.settings,module_account_analytic_analysis:0
msgid "Use contracts management"
-msgstr ""
+msgstr "Vertragsmanagement benutzen"
#. module: sale
#: help:sale.order,invoiced:0
@@ -2207,6 +2270,7 @@ msgid "Quotation N°"
msgstr "Angebot Nr."
#. module: sale
+#: field:sale.order,picked_rate:0
#: view:sale.report:0
msgid "Picked"
msgstr "Ausgeliefert"
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 6ae6cb1889f..972215fda66 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2010-09-21 22:36+0000\n"
-"Last-Translator: Margarita Manterola \n"
+"PO-Revision-Date: 2012-12-10 03:06+0000\n"
+"Last-Translator: Guillermo Bisheimer \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-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: sale
#: model:ir.model,name:sale.model_account_config_settings
msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
#. module: sale
#: view:sale.order.line:0
@@ -27,11 +27,13 @@ msgid ""
"Sale Order Lines that are confirmed, done or in exception state and haven't "
"yet been invoiced"
msgstr ""
+"Lineas de orden de venta que están confirmadas, realizadas o con el estado "
+"de excepción y que aún no han sido facturadas"
#. module: sale
#: view:sale.order:0
msgid "UoS"
-msgstr ""
+msgstr "UdV"
#. module: sale
#: report:sale.order:0
@@ -42,21 +44,22 @@ msgstr ""
#: view:sale.report:0
#: field:sale.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Vendedor"
#. module: sale
#: help:sale.order,pricelist_id:0
msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Tarifa para la orden de venta actual."
#. module: sale
#: view:sale.report:0
#: field:sale.report,day:0
msgid "Day"
-msgstr ""
+msgstr "Día"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
msgid "Cancel Order"
msgstr "Cancelar orden"
@@ -64,28 +67,28 @@ msgstr "Cancelar orden"
#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
#, python-format
msgid "Incorrect Data"
-msgstr ""
+msgstr "Datos incorrectos"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
#, python-format
msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "El valor del monto de adelanto debe ser positivo"
#. module: sale
#: help:sale.order,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Si está marcado, nuevos mensajes requieren su atención."
#. module: sale
#: view:res.partner:0
msgid "False"
-msgstr ""
+msgstr "Falso"
#. module: sale
#: report:sale.order:0
msgid "Tax"
-msgstr ""
+msgstr "Impuesto"
#. module: sale
#: help:sale.order,state:0
@@ -99,6 +102,7 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -111,17 +115,19 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Guarda el resumen del Chatter (número de mensajes, ...). Este resumen está "
+"en formato HTML para ser insertado directamente en las vistas kanban."
#. module: sale
#: view:sale.report:0
#: field:sale.report,product_uom_qty:0
msgid "# of Qty"
-msgstr ""
+msgstr "# de cantidad"
#. module: sale
#: help:sale.config.settings,group_discount_per_so_line:0
msgid "Allows you to apply some discount per sale order line."
-msgstr ""
+msgstr "Permite aplicar un descuento a las líneas de una orden de venta."
#. module: sale
#: help:sale.config.settings,group_sale_pricelist:0
@@ -129,6 +135,9 @@ msgid ""
"Allows to manage different prices based on rules per category of customers.\n"
"Example: 10% for retailers, promotion of 5 EUR on this product, etc."
msgstr ""
+"Permite manejar diferentes precios basados en reglas según categorías de "
+"cliente.\n"
+"Por ejemplo: 10% para revendedores, promoción de 5 EUR en este producto, etc."
#. module: sale
#: field:sale.shop,payment_default_id:0
@@ -139,17 +148,17 @@ msgstr "Término de pago predeterminado"
#: code:addons/sale/sale.py:662
#, python-format
msgid "Invoice paid ."
-msgstr ""
+msgstr "Factura pagada "
#. module: sale
#: field:sale.config.settings,group_uom:0
msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Permitir el uso de diferentes unidades de medida"
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
msgid "Percentage"
-msgstr ""
+msgstr "Porcentaje"
#. module: sale
#: report:sale.order:0
@@ -161,6 +170,7 @@ msgstr "Desc.(%)"
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d)."
msgstr ""
+"Por favor devina la cuenta de ingresos para este producto: \"%s\" (id:%d)."
#. module: sale
#: view:sale.report:0
@@ -171,12 +181,12 @@ msgstr "Precio total"
#. module: sale
#: help:sale.make.invoice,grouped:0
msgid "Check the box to group the invoices for the same customers"
-msgstr ""
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
#. module: sale
#: view:sale.order:0
msgid "My Sale Orders"
-msgstr ""
+msgstr "Mis pedidos de venta"
#. module: sale
#: help:sale.config.settings,timesheet:0
@@ -202,47 +212,49 @@ msgstr "Referencia de la orden"
#. module: sale
#: view:sale.order:0
msgid "Other Information"
-msgstr ""
+msgstr "Otra información"
#. module: sale
#: code:addons/sale/wizard/sale_line_invoice.py:109
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "¡Advertencia!"
#. module: sale
#: view:sale.config.settings:0
msgid "Invoicing Process"
-msgstr ""
+msgstr "Proceso de facturación"
#. module: sale
#: view:sale.order:0
msgid "Sales Order done"
-msgstr ""
+msgstr "Orden de venta lista"
#. module: sale
#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
#: view:res.partner:0
msgid "Quotations and Sales"
-msgstr ""
+msgstr "Presupuestos y ventas"
#. module: sale
#: help:sale.config.settings,group_uom:0
msgid ""
"Allows you to select and maintain different units of measure for products."
msgstr ""
+"Permite seleccionar y mantener diferentes unidades de medida para los "
+"productos."
#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Ventas. Realizar factura"
#. module: sale
#: code:addons/sale/sale.py:293
#, python-format
msgid "Pricelist Warning!"
-msgstr ""
+msgstr "¡Advertencia de la lista de precios!"
#. module: sale
#: field:sale.order.line,discount:0
@@ -252,7 +264,7 @@ msgstr "Descuento (%)"
#. module: sale
#: view:sale.order.line.make.invoice:0
msgid "Create & View Invoice"
-msgstr ""
+msgstr "Crear y visualizar factura"
#. module: sale
#: view:board.board:0
@@ -263,7 +275,7 @@ msgstr "Mis cotizaciones"
#. module: sale
#: field:sale.config.settings,module_warning:0
msgid "Allow configuring alerts by customer or products"
-msgstr ""
+msgstr "Permitir configurar alertas por cliente o productos"
#. module: sale
#: field:sale.shop,name:0
@@ -288,23 +300,23 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Quotation "
-msgstr ""
+msgstr "Presupuesto "
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
#, python-format
msgid "Advance of %s %%"
-msgstr ""
+msgstr "Adelanto del %s %%"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
msgid "Sales in Exception"
msgstr "Ventas en excepción"
#. module: sale
#: help:sale.order.line,address_allotment_id:0
msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
+msgstr "Un partner al cual debe asignarse el producto."
#. module: sale
#: view:sale.order:0
@@ -318,7 +330,7 @@ msgstr "Estado"
#. module: sale
#: selection:sale.report,month:0
msgid "August"
-msgstr ""
+msgstr "Agosto"
#. module: sale
#: model:ir.actions.act_window,help:sale.action_orders
@@ -334,63 +346,71 @@ msgid ""
" \n"
" "
msgstr ""
+"\n"
+" Hacer click para crear un presupuesto que pueda ser "
+"convertido en una orden de venta.\n"
+"
\n"
+" OpenERP le ayudará a manejar eficientemente el flujo de "
+"venta completo:\n"
+" presupuesto, orden de venta, despacho, facturación y pago.\n"
+"
\n"
+" "
#. module: sale
#: selection:sale.report,month:0
msgid "June"
-msgstr ""
+msgstr "Junio"
#. module: sale
#: model:ir.model,name:sale.model_sale_report
msgid "Sales Orders Statistics"
-msgstr ""
+msgstr "Estadísticas de pedidos de venta"
#. module: sale
#: help:sale.order,project_id:0
msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "La cuenta analítica relacionada con una orden de venta."
#. module: sale
#: selection:sale.report,month:0
msgid "October"
-msgstr ""
+msgstr "Octubre"
#. module: sale
#: field:sale.order,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Resumen"
#. module: sale
#: view:sale.order:0
msgid "View Invoice"
-msgstr ""
+msgstr "Ver factura"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
#, python-format
msgid "Advance of %s %s"
-msgstr ""
+msgstr "Avance del %s %s"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
-msgstr ""
+msgstr "Presupuestos"
#. module: sale
#: field:sale.advance.payment.inv,qtty:0
#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
msgid "Quantity"
msgstr "Cantidad"
#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "Dirección de envío para la orden de venta actual."
#. module: sale
#: report:sale.order:0
@@ -400,7 +420,7 @@ msgstr "IVA :"
#. module: sale
#: selection:sale.report,month:0
msgid "September"
-msgstr ""
+msgstr "Setiembre"
#. module: sale
#: field:sale.order,fiscal_position:0
@@ -408,6 +428,7 @@ msgid "Fiscal Position"
msgstr "Posición fiscal"
#. module: sale
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "In Progress"
msgstr "En proceso"
@@ -416,7 +437,7 @@ msgstr "En proceso"
#: code:addons/sale/sale.py:667
#, python-format
msgid "Draft Invoice of %s %s waiting for validation ."
-msgstr ""
+msgstr "Borrador de factura %s %s esperando validación ."
#. module: sale
#: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -424,12 +445,15 @@ msgid ""
"The salesman confirms the quotation. The state of the sales order becomes "
"'In progress' or 'Manual in progress'."
msgstr ""
+"El vendedor confirma el presupuesto. El estado de la orden de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
#. module: sale
#: code:addons/sale/sale.py:843
#, python-format
msgid "You cannot cancel a sale order line that has already been invoiced."
msgstr ""
+"No se puede cancelar una linea de una orden de venta que ya fue facturada."
#. module: sale
#: report:sale.order:0
@@ -439,7 +463,7 @@ msgstr "Tel. :"
#. module: sale
#: help:sale.order,partner_invoice_id:0
msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "Dirección de facturación para la orden de venta activa."
#. module: sale
#: model:ir.model,name:sale.model_sale_config_settings
@@ -449,7 +473,7 @@ msgstr ""
#. module: sale
#: selection:sale.order,order_policy:0
msgid "Before Delivery"
-msgstr ""
+msgstr "Antes del envío"
#. module: sale
#: code:addons/sale/sale.py:804
@@ -458,11 +482,13 @@ msgid ""
"There is no Fiscal Position defined or Income category account defined for "
"default properties of Product categories."
msgstr ""
+"No hay una posición fiscal o cuenta de ingresos definida para las "
+"propiedades por defecto de las categorías de producto."
#. module: sale
#: model:res.groups,name:sale.group_delivery_invoice_address
msgid "Addresses in Sale Orders"
-msgstr ""
+msgstr "Direcciones en órdenes de venta"
#. module: sale
#: field:sale.order,project_id:0
@@ -472,12 +498,12 @@ msgstr ""
#. module: sale
#: model:res.groups,name:sale.group_invoice_so_lines
msgid "Enable Invoicing Sale order lines"
-msgstr ""
+msgstr "Habilitar facturación de líneas de ordenes de venta"
#. module: sale
#: view:sale.report:0
msgid "Ordered month of the sales order"
-msgstr ""
+msgstr "Pedidos de venta ordenados por meses"
#. module: sale
#: code:addons/sale/sale.py:496
@@ -485,16 +511,16 @@ msgstr ""
msgid ""
"You cannot group sales having different currencies for the same partner."
msgstr ""
+"No puede agrupar ventas con diferentes monedas para el mismo cliente."
#. module: sale
#: view:sale.advance.payment.inv:0
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "or"
-msgstr ""
+msgstr "o"
#. module: sale
-#: field:sale.order,invoice_exists:0
#: field:sale.order,invoiced_rate:0
#: field:sale.order.line,invoiced:0
msgid "Invoiced"
@@ -503,12 +529,12 @@ msgstr "Facturada"
#. module: sale
#: model:res.groups,name:sale.group_analytic_accounting
msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "Cuenta analítica para las ventas"
#. module: sale
#: field:sale.order,date_confirm:0
msgid "Confirmation Date"
-msgstr ""
+msgstr "Fecha de confirmación"
#. module: sale
#: field:sale.order.line,address_allotment_id:0
@@ -518,22 +544,22 @@ msgstr "Partner de Distribución"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
msgid "Invoice Order"
-msgstr ""
+msgstr "Facturar orden"
#. module: sale
#: selection:sale.report,month:0
msgid "March"
-msgstr ""
+msgstr "Marzo"
#. module: sale
#: model:ir.actions.server,name:sale.actions_server_sale_order_read
msgid "Sale: Mark read"
-msgstr ""
+msgstr "Venta: Marcar como leído"
#. module: sale
#: help:sale.order,amount_total:0
msgid "The total amount."
-msgstr ""
+msgstr "El importe total."
#. module: sale
#: field:sale.config.settings,module_sale_journal:0
@@ -548,7 +574,7 @@ msgstr "Subtotal"
#. module: sale
#: field:sale.config.settings,group_discount_per_so_line:0
msgid "Allow setting a discount on the sale order lines"
-msgstr ""
+msgstr "Permite aplicar un descuento a las lineas de una orden de venta"
#. module: sale
#: report:sale.order:0
@@ -558,12 +584,12 @@ msgstr "Domicilio de facturación :"
#. module: sale
#: field:sale.order.line,product_uom:0
msgid "Unit of Measure "
-msgstr ""
+msgstr "Unidad de medida "
#. module: sale
#: field:sale.config.settings,time_unit:0
msgid "The default working time unit for services is"
-msgstr ""
+msgstr "La unidad por defecto de tiempo de trabajo para servicios es"
#. module: sale
#: field:sale.order,partner_invoice_id:0
@@ -596,6 +622,7 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
msgid "Sales Order Line"
msgstr ""
@@ -615,7 +642,6 @@ msgid "Order N°"
msgstr "Orden Nº"
#. module: sale
-#: view:sale.order:0
#: field:sale.order,order_line:0
msgid "Order Lines"
msgstr "Líneas de la orden"
@@ -713,6 +739,7 @@ msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: field:sale.report,shipped:0
msgid "Shipped"
msgstr ""
@@ -724,7 +751,6 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_res_partner
#: view:sale.report:0
#: field:sale.report,partner_id:0
msgid "Partner"
@@ -761,7 +787,7 @@ msgid "You cannot confirm a sale order which has no line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
#, python-format
msgid ""
"You have to select a pricelist or a customer in the sales form !\n"
@@ -869,6 +895,7 @@ msgid "Your Reference"
msgstr "Su referencia"
#. module: sale
+#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Ctd"
@@ -880,9 +907,10 @@ msgstr ""
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
#: view:sale.advance.payment.inv:0
#: view:sale.make.invoice:0
-#: view:sale.order:0
#: view:sale.order.line:0
#: view:sale.order.line.make.invoice:0
msgid "Cancel"
@@ -903,10 +931,9 @@ msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
#: view:sale.order.line:0
msgid "Create Invoice"
msgstr "Crear factura"
@@ -933,6 +960,7 @@ msgstr ""
#. module: sale
#: report:sale.order:0
+#: view:sale.order.line:0
msgid "Price"
msgstr "Precio"
@@ -1015,7 +1043,7 @@ msgstr "Confirmar cotización"
#: model:ir.actions.act_window,name:sale.action_order_line_tree2
#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
msgid "Order Lines to Invoice"
-msgstr ""
+msgstr "Lineas de pedido a facturar"
#. module: sale
#: view:sale.order:0
@@ -1068,6 +1096,7 @@ msgid "Sale Order"
msgstr "Orden de Venta"
#. module: sale
+#: view:sale.order:0
#: field:sale.order,amount_tax:0
#: field:sale.order.line,tax_id:0
msgid "Taxes"
@@ -1135,6 +1164,7 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
msgid "Make Invoices"
msgstr ""
@@ -1239,7 +1269,7 @@ msgstr ""
#. module: sale
#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Quotation"
msgstr "Cotización"
@@ -1385,10 +1415,8 @@ msgid "Customer Invoices"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
#: view:sale.order:0
#: view:sale.report:0
msgid "Sales"
@@ -1410,7 +1438,6 @@ msgid "Unit Price"
msgstr "Precio unitario"
#. module: sale
-#: view:sale.order:0
#: selection:sale.order,state:0
#: view:sale.order.line:0
#: selection:sale.order.line,state:0
@@ -1419,10 +1446,8 @@ msgid "Done"
msgstr "Realizada"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Factura"
@@ -1498,6 +1523,7 @@ msgid "Product UoS"
msgstr "UdV del producto"
#. module: sale
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manual en proceso"
@@ -1642,7 +1668,7 @@ msgid "Invoice Exception"
msgstr "Excepción de factura"
#. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
#, python-format
msgid "No Customer Defined !"
msgstr "¡No se ha definido un cliente!"
@@ -1719,6 +1745,7 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
#: view:sale.report:0
#: field:sale.report,shop_id:0
@@ -1742,15 +1769,12 @@ msgid "Contract Features"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
#: model:res.request.link,name:sale.req_link_sale_order
#: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
msgid "Sales Order"
msgstr ""
@@ -1785,6 +1809,7 @@ msgid "Followers"
msgstr ""
#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,invoice_lines:0
msgid "Invoice Lines"
msgstr "Líneas de Facturación"
@@ -1796,7 +1821,6 @@ msgid "# of Lines"
msgstr "# de líneas"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1870,7 +1894,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1890,6 +1914,8 @@ msgid "Weight"
msgstr "Peso"
#. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
#: field:sale.order,invoice_ids:0
msgid "Invoices"
msgstr "Facturas"
@@ -1921,7 +1947,10 @@ msgid "Untaxed Amount"
msgstr "Importe sin impuestos"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
#, python-format
msgid "Advance Invoice"
msgstr "Avanzar factura"
@@ -1962,6 +1991,8 @@ msgid "Email Templates"
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
#: view:sale.order:0
msgid "Sales Orders"
msgstr "Órdenes de venta"
@@ -1999,7 +2030,7 @@ msgid "January"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Órdenes de venta en proceso"
@@ -2172,6 +2203,7 @@ msgid "Quotation N°"
msgstr "Cotización Nº"
#. module: sale
+#: field:sale.order,picked_rate:0
#: view:sale.report:0
msgid "Picked"
msgstr "Entregada"
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index f4c3dceb198..1bc9fffe042 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:08+0000\n"
+"PO-Revision-Date: 2012-12-06 13:18+0000\n"
"Last-Translator: Krešimir Jeđud \n"
"Language-Team: Vinteh <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
"Language: hr\n"
#. module: sale
@@ -60,6 +60,7 @@ msgstr "Dan"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
msgid "Cancel Order"
msgstr "Otkaži narudžbu"
@@ -102,6 +103,7 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -300,7 +302,7 @@ msgid "Advance of %s %%"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
msgid "Sales in Exception"
msgstr "Prodaje u iznimci"
@@ -376,8 +378,8 @@ msgid "Advance of %s %s"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -386,14 +388,13 @@ msgstr "Ponude"
#. module: sale
#: field:sale.advance.payment.inv,qtty:0
#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
msgid "Quantity"
msgstr "Količina"
#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "Adresa dostave za trenutni prodajni nalog"
#. module: sale
#: report:sale.order:0
@@ -411,6 +412,7 @@ msgid "Fiscal Position"
msgstr "Porezna pozicija"
#. module: sale
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "In Progress"
msgstr "U tijeku"
@@ -501,7 +503,6 @@ msgid "or"
msgstr ""
#. module: sale
-#: field:sale.order,invoice_exists:0
#: field:sale.order,invoiced_rate:0
#: field:sale.order.line,invoiced:0
msgid "Invoiced"
@@ -603,6 +604,7 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
msgid "Sales Order Line"
msgstr "Stavka prodajnog naloga"
@@ -622,7 +624,6 @@ msgid "Order N°"
msgstr "Narudžba broj"
#. module: sale
-#: view:sale.order:0
#: field:sale.order,order_line:0
msgid "Order Lines"
msgstr "Stavke narudžbe"
@@ -720,6 +721,7 @@ msgstr "Datum narudžbe"
#. module: sale
#: view:sale.order.line:0
+#: field:sale.report,shipped:0
msgid "Shipped"
msgstr "Otpremljeno"
@@ -731,7 +733,6 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_res_partner
#: view:sale.report:0
#: field:sale.report,partner_id:0
msgid "Partner"
@@ -768,7 +769,7 @@ msgid "You cannot confirm a sale order which has no line."
msgstr "Ne možete potvrditi prodajni nalog koji nema stavku."
#. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
#, python-format
msgid ""
"You have to select a pricelist or a customer in the sales form !\n"
@@ -878,6 +879,7 @@ msgid "Your Reference"
msgstr "Vaša referenca"
#. module: sale
+#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Količina"
@@ -889,9 +891,10 @@ msgstr "Moje stavke prodajnog naloga"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
#: view:sale.advance.payment.inv:0
#: view:sale.make.invoice:0
-#: view:sale.order:0
#: view:sale.order.line:0
#: view:sale.order.line.make.invoice:0
msgid "Cancel"
@@ -912,10 +915,9 @@ msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
#: view:sale.order.line:0
msgid "Create Invoice"
msgstr "Napravi fakturu"
@@ -942,6 +944,7 @@ msgstr ""
#. module: sale
#: report:sale.order:0
+#: view:sale.order.line:0
msgid "Price"
msgstr "Cijena"
@@ -1077,6 +1080,7 @@ msgid "Sale Order"
msgstr "Prodajna narudžba"
#. module: sale
+#: view:sale.order:0
#: field:sale.order,amount_tax:0
#: field:sale.order.line,tax_id:0
msgid "Taxes"
@@ -1146,6 +1150,7 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
msgid "Make Invoices"
msgstr "Napravi fakture"
@@ -1250,7 +1255,7 @@ msgstr "Analiza prodaje"
#. module: sale
#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Quotation"
msgstr "Ponuda"
@@ -1399,10 +1404,8 @@ msgid "Customer Invoices"
msgstr "Izlazni računi"
#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
#: view:sale.order:0
#: view:sale.report:0
msgid "Sales"
@@ -1424,7 +1427,6 @@ msgid "Unit Price"
msgstr "Jedinična cijena"
#. module: sale
-#: view:sale.order:0
#: selection:sale.order,state:0
#: view:sale.order.line:0
#: selection:sale.order.line,state:0
@@ -1433,10 +1435,8 @@ msgid "Done"
msgstr "Završeno"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Faktura"
@@ -1512,6 +1512,7 @@ msgid "Product UoS"
msgstr "Proizvod - jedinica prodaje"
#. module: sale
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Ručni postupak u tijeku"
@@ -1659,7 +1660,7 @@ msgid "Invoice Exception"
msgstr "Iznimka fakture"
#. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
#, python-format
msgid "No Customer Defined !"
msgstr "Nije definiran kupac !"
@@ -1736,6 +1737,7 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
#: view:sale.report:0
#: field:sale.report,shop_id:0
@@ -1759,15 +1761,12 @@ msgid "Contract Features"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
#: model:res.request.link,name:sale.req_link_sale_order
#: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
msgid "Sales Order"
msgstr "Prodajni nalog"
@@ -1802,6 +1801,7 @@ msgid "Followers"
msgstr ""
#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,invoice_lines:0
msgid "Invoice Lines"
msgstr "Stavke fakture"
@@ -1813,7 +1813,6 @@ msgid "# of Lines"
msgstr "# linija"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1887,7 +1886,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1911,6 +1910,8 @@ msgid "Weight"
msgstr "Težina"
#. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
#: field:sale.order,invoice_ids:0
msgid "Invoices"
msgstr "Fakture"
@@ -1942,7 +1943,10 @@ msgid "Untaxed Amount"
msgstr "Iznos bez poreza"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
#, python-format
msgid "Advance Invoice"
msgstr "Faktura predujma"
@@ -1983,6 +1987,8 @@ msgid "Email Templates"
msgstr "Email predlošci"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
#: view:sale.order:0
msgid "Sales Orders"
msgstr "Prodajni nalozi"
@@ -2020,7 +2026,7 @@ msgid "January"
msgstr "Siječanj"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Prodajni nalozi u tijeku"
@@ -2199,6 +2205,7 @@ msgid "Quotation N°"
msgstr "Ponuda broj"
#. module: sale
+#: field:sale.order,picked_rate:0
#: view:sale.report:0
msgid "Picked"
msgstr "Odabran"
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index aef62851456..7d67a3a9b31 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-05-10 18:26+0000\n"
-"Last-Translator: simone.sandri \n"
+"PO-Revision-Date: 2012-12-09 14:03+0000\n"
+"Last-Translator: Davide Corio - agilebg.com \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-12-04 05:30+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: sale
#: model:ir.model,name:sale.model_account_config_settings
msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
#. module: sale
#: view:sale.order.line:0
@@ -31,7 +31,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "UoS"
-msgstr ""
+msgstr "UoS"
#. module: sale
#: report:sale.order:0
@@ -42,7 +42,7 @@ msgstr ""
#: view:sale.report:0
#: field:sale.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Commerciale"
#. module: sale
#: help:sale.order,pricelist_id:0
@@ -57,6 +57,7 @@ msgstr "Giorno"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
msgid "Cancel Order"
msgstr "Annulla Ordine"
@@ -64,7 +65,7 @@ msgstr "Annulla Ordine"
#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
#, python-format
msgid "Incorrect Data"
-msgstr ""
+msgstr "Dati Errati"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
@@ -75,17 +76,17 @@ msgstr ""
#. module: sale
#: help:sale.order,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se selezionato, nuovi messaggi richiedono la tua attenzione"
#. module: sale
#: view:res.partner:0
msgid "False"
-msgstr ""
+msgstr "Falso"
#. module: sale
#: report:sale.order:0
msgid "Tax"
-msgstr ""
+msgstr "Imposta"
#. module: sale
#: help:sale.order,state:0
@@ -99,6 +100,7 @@ msgid ""
msgstr ""
#. module: sale
+#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -111,6 +113,8 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Gestisce il sommario (numero di messaggi, ...) di Chatter. Questo sommario è "
+"direttamente in html così da poter essere inserito nelle viste kanban."
#. module: sale
#: view:sale.report:0
@@ -139,17 +143,17 @@ msgstr "Scadenza Pagamento Predefinita"
#: code:addons/sale/sale.py:662
#, python-format
msgid "Invoice paid ."
-msgstr ""
+msgstr "Fattura pagata ."
#. module: sale
#: field:sale.config.settings,group_uom:0
msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Consente di usare differenti unità di misura"
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
msgid "Percentage"
-msgstr ""
+msgstr "Percentuale"
#. module: sale
#: report:sale.order:0
@@ -177,7 +181,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "My Sale Orders"
-msgstr ""
+msgstr "I Miei Ordini di Vendita"
#. module: sale
#: help:sale.config.settings,timesheet:0
@@ -210,23 +214,23 @@ msgstr "Altre informazioni"
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Attenzione!"
#. module: sale
#: view:sale.config.settings:0
msgid "Invoicing Process"
-msgstr ""
+msgstr "Processo di Fatturazione"
#. module: sale
#: view:sale.order:0
msgid "Sales Order done"
-msgstr ""
+msgstr "Ordine di Vendita completato"
#. module: sale
#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
#: view:res.partner:0
msgid "Quotations and Sales"
-msgstr ""
+msgstr "Preventivi e Vendite"
#. module: sale
#: help:sale.config.settings,group_uom:0
@@ -253,7 +257,7 @@ msgstr "Sconto (%)"
#. module: sale
#: view:sale.order.line.make.invoice:0
msgid "Create & View Invoice"
-msgstr ""
+msgstr "Crea e Visualizza Fattura"
#. module: sale
#: view:board.board:0
@@ -289,7 +293,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Quotation "
-msgstr ""
+msgstr "Preventivo "
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
@@ -298,7 +302,7 @@ msgid "Advance of %s %%"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
msgid "Sales in Exception"
msgstr "Vendite in Eccezione"
@@ -359,23 +363,23 @@ msgstr "Ottobre"
#. module: sale
#: field:sale.order,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Riepilogo"
#. module: sale
#: view:sale.order:0
msgid "View Invoice"
-msgstr ""
+msgstr "Visualizza Fattura"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
#, python-format
msgid "Advance of %s %s"
-msgstr ""
+msgstr "Anticipo su %s %s"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -384,14 +388,13 @@ msgstr "Preventivi"
#. module: sale
#: field:sale.advance.payment.inv,qtty:0
#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
msgid "Quantity"
msgstr "Quantità"
#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "Indirizzo di spedizione per questo ordine di vendita"
#. module: sale
#: report:sale.order:0
@@ -409,6 +412,7 @@ msgid "Fiscal Position"
msgstr "Posizione Fiscale"
#. module: sale
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "In Progress"
msgstr "In corso"
@@ -447,12 +451,12 @@ msgstr "Indirizzo di fatturazione per questo ordine di vendita."
#. module: sale
#: model:ir.model,name:sale.model_sale_config_settings
msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
#. module: sale
#: selection:sale.order,order_policy:0
msgid "Before Delivery"
-msgstr ""
+msgstr "Prima della Consegna"
#. module: sale
#: code:addons/sale/sale.py:804
@@ -470,7 +474,7 @@ msgstr ""
#. module: sale
#: field:sale.order,project_id:0
msgid "Contract / Analytic"
-msgstr ""
+msgstr "Contratto / Conto Analitico"
#. module: sale
#: model:res.groups,name:sale.group_invoice_so_lines
@@ -494,10 +498,9 @@ msgstr ""
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "or"
-msgstr ""
+msgstr "o"
#. module: sale
-#: field:sale.order,invoice_exists:0
#: field:sale.order,invoiced_rate:0
#: field:sale.order.line,invoiced:0
msgid "Invoiced"
@@ -506,7 +509,7 @@ msgstr "Fatturato"
#. module: sale
#: model:res.groups,name:sale.group_analytic_accounting
msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "Contabilità Analitica su Vendite"
#. module: sale
#: field:sale.order,date_confirm:0
@@ -521,7 +524,7 @@ msgstr "Ripartizione Partner"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
msgid "Invoice Order"
-msgstr ""
+msgstr "Ordine di Fatturazione"
#. module: sale
#: selection:sale.report,month:0
@@ -599,6 +602,7 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
msgid "Sales Order Line"
msgstr "Linea d'ordine di vendita"
@@ -618,7 +622,6 @@ msgid "Order N°"
msgstr "Ordine N°"
#. module: sale
-#: view:sale.order:0
#: field:sale.order,order_line:0
msgid "Order Lines"
msgstr "Righe Ordine"
@@ -716,6 +719,7 @@ msgstr "Data dell'ordine"
#. module: sale
#: view:sale.order.line:0
+#: field:sale.report,shipped:0
msgid "Shipped"
msgstr "Spedite"
@@ -727,7 +731,6 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_res_partner
#: view:sale.report:0
#: field:sale.report,partner_id:0
msgid "Partner"
@@ -764,7 +767,7 @@ msgid "You cannot confirm a sale order which has no line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
#, python-format
msgid ""
"You have to select a pricelist or a customer in the sales form !\n"
@@ -875,6 +878,7 @@ msgid "Your Reference"
msgstr "Riferimento"
#. module: sale
+#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Qta'"
@@ -886,9 +890,10 @@ msgstr ""
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
#: view:sale.advance.payment.inv:0
#: view:sale.make.invoice:0
-#: view:sale.order:0
#: view:sale.order.line:0
#: view:sale.order.line.make.invoice:0
msgid "Cancel"
@@ -909,10 +914,9 @@ msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
#: view:sale.order.line:0
msgid "Create Invoice"
msgstr "Crea fattura"
@@ -939,6 +943,7 @@ msgstr ""
#. module: sale
#: report:sale.order:0
+#: view:sale.order.line:0
msgid "Price"
msgstr "Prezzo"
@@ -1074,6 +1079,7 @@ msgid "Sale Order"
msgstr "Ordine di Vendita"
#. module: sale
+#: view:sale.order:0
#: field:sale.order,amount_tax:0
#: field:sale.order.line,tax_id:0
msgid "Taxes"
@@ -1141,6 +1147,7 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
msgid "Make Invoices"
msgstr "Genera fatture"
@@ -1245,7 +1252,7 @@ msgstr "Analisi delle vendite"
#. module: sale
#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Quotation"
msgstr "Preventivo"
@@ -1395,10 +1402,8 @@ msgid "Customer Invoices"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
#: view:sale.order:0
#: view:sale.report:0
msgid "Sales"
@@ -1420,7 +1425,6 @@ msgid "Unit Price"
msgstr "Prezzo unitario"
#. module: sale
-#: view:sale.order:0
#: selection:sale.order,state:0
#: view:sale.order.line:0
#: selection:sale.order.line,state:0
@@ -1429,10 +1433,8 @@ msgid "Done"
msgstr "Completato"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Fattura"
@@ -1508,6 +1510,7 @@ msgid "Product UoS"
msgstr "Unità di Vendita Prodotto"
#. module: sale
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Manuale in Progresso"
@@ -1656,7 +1659,7 @@ msgid "Invoice Exception"
msgstr "Eccezione Fattura"
#. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
#, python-format
msgid "No Customer Defined !"
msgstr "Nessun cliente definito!"
@@ -1733,6 +1736,7 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
#: view:sale.report:0
#: field:sale.report,shop_id:0
@@ -1756,15 +1760,12 @@ msgid "Contract Features"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
#: model:res.request.link,name:sale.req_link_sale_order
#: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
msgid "Sales Order"
msgstr "Ordine di vendita"
@@ -1799,6 +1800,7 @@ msgid "Followers"
msgstr ""
#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,invoice_lines:0
msgid "Invoice Lines"
msgstr "Righe Fattura"
@@ -1810,7 +1812,6 @@ msgid "# of Lines"
msgstr "Numero Righe"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1884,7 +1885,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1908,6 +1909,8 @@ msgid "Weight"
msgstr "Peso"
#. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
#: field:sale.order,invoice_ids:0
msgid "Invoices"
msgstr "Fatture"
@@ -1939,7 +1942,10 @@ msgid "Untaxed Amount"
msgstr "Totale Imponibile"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
#, python-format
msgid "Advance Invoice"
msgstr "Fattura di acconto"
@@ -1980,6 +1986,8 @@ msgid "Email Templates"
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
#: view:sale.order:0
msgid "Sales Orders"
msgstr "Ordini di Vendita"
@@ -2017,7 +2025,7 @@ msgid "January"
msgstr "Gennaio"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Ordini di Vendita in esecuzione"
@@ -2196,6 +2204,7 @@ msgid "Quotation N°"
msgstr "Preventivo N°"
#. module: sale
+#: field:sale.order,picked_rate:0
#: view:sale.report:0
msgid "Picked"
msgstr "Prelevato"
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index dacd67b5907..034499bc17f 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,20 +8,19 @@ msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-07-28 16:28+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"\n"
+"PO-Revision-Date: 2012-12-06 18:10+0000\n"
+"Last-Translator: Cristiano Korndörfer \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-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: sale
#: model:ir.model,name:sale.model_account_config_settings
msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
#. module: sale
#: view:sale.order.line:0
@@ -46,7 +45,7 @@ msgstr "UdV"
#: view:sale.report:0
#: field:sale.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Vendedor"
#. module: sale
#: help:sale.order,pricelist_id:0
@@ -61,6 +60,7 @@ msgstr "Dia"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
msgid "Cancel Order"
msgstr "Cancelar Pedido"
@@ -68,23 +68,23 @@ msgstr "Cancelar Pedido"
#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
#, python-format
msgid "Incorrect Data"
-msgstr ""
+msgstr "Dados Incorretos"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
#, python-format
msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "O valor da Soma Avançada deve ser positivo."
#. module: sale
#: help:sale.order,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens requerem sua atenção"
#. module: sale
#: view:res.partner:0
msgid "False"
-msgstr ""
+msgstr "Falso"
#. module: sale
#: report:sale.order:0
@@ -101,8 +101,15 @@ msgid ""
"The 'Waiting Schedule' status is set when the invoice is confirmed "
" but waiting for the scheduler to run on the order date."
msgstr ""
+"Informa a situação da cotação ou pedido de venda. \n"
+"A situação excepcional é definida automaticamente quando uma operação de "
+"cancelamento ocorre na validação da fatura (Exceção da "
+"Fatura) ou no processo de lista de separação (Exceção de Envio).\n"
+"A situação 'Aguardando Agendamento' é definida quando a fatura é confirmada "
+" mas aguarda pelo processamento na data de pedido."
#. module: sale
+#: field:sale.order,project_id:0
#: view:sale.report:0
#: field:sale.report,analytic_account_id:0
#: field:sale.shop,project_id:0
@@ -115,17 +122,20 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
#. module: sale
#: view:sale.report:0
#: field:sale.report,product_uom_qty:0
msgid "# of Qty"
-msgstr "# de Qtd"
+msgstr "Nº de Qtd"
#. module: sale
#: help:sale.config.settings,group_discount_per_so_line:0
msgid "Allows you to apply some discount per sale order line."
-msgstr ""
+msgstr "Permite aplicar algum desconto por linha do pedido de venda."
#. module: sale
#: help:sale.config.settings,group_sale_pricelist:0
@@ -133,6 +143,9 @@ msgid ""
"Allows to manage different prices based on rules per category of customers.\n"
"Example: 10% for retailers, promotion of 5 EUR on this product, etc."
msgstr ""
+"Permite gerenciar diferentes preços baseado em regras por categoria de "
+"cliente.\n"
+"Exemplo: 10% para varejistas, promoção de R$ 15 neste produto, etc."
#. module: sale
#: field:sale.shop,payment_default_id:0
@@ -143,17 +156,17 @@ msgstr "Condição de Pagamento Padrão"
#: code:addons/sale/sale.py:662
#, python-format
msgid "Invoice paid ."
-msgstr ""
+msgstr "Fatura paga ."
#. module: sale
#: field:sale.config.settings,group_uom:0
msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Permite utilizar diferentes unidades de medida"
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
msgid "Percentage"
-msgstr ""
+msgstr "Porcentagem"
#. module: sale
#: report:sale.order:0
@@ -165,6 +178,7 @@ msgstr "Desc. (%)"
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d)."
msgstr ""
+"Por favor defina conta de recebimento para este produto: \"%s\" (id:%d)."
#. module: sale
#: view:sale.report:0
@@ -301,7 +315,7 @@ msgid "Advance of %s %%"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
msgid "Sales in Exception"
msgstr "Vendas em Exceção"
@@ -377,8 +391,8 @@ msgid "Advance of %s %s"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
#: view:sale.order:0
#: view:sale.report:0
msgid "Quotations"
@@ -387,7 +401,6 @@ msgstr "Cotações"
#. module: sale
#: field:sale.advance.payment.inv,qtty:0
#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
msgid "Quantity"
msgstr "Quantidade"
@@ -412,6 +425,7 @@ msgid "Fiscal Position"
msgstr "Posição Fiscal"
#. module: sale
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "In Progress"
msgstr "Em Progresso"
@@ -501,7 +515,6 @@ msgid "or"
msgstr ""
#. module: sale
-#: field:sale.order,invoice_exists:0
#: field:sale.order,invoiced_rate:0
#: field:sale.order.line,invoiced:0
msgid "Invoiced"
@@ -603,6 +616,7 @@ msgstr ""
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
msgid "Sales Order Line"
msgstr "Linha de Pedido de Vendas"
@@ -622,7 +636,6 @@ msgid "Order N°"
msgstr "Pedido N°"
#. module: sale
-#: view:sale.order:0
#: field:sale.order,order_line:0
msgid "Order Lines"
msgstr "Itens do Pedido"
@@ -720,6 +733,7 @@ msgstr "Data do Pedido"
#. module: sale
#: view:sale.order.line:0
+#: field:sale.report,shipped:0
msgid "Shipped"
msgstr "Enviado"
@@ -731,7 +745,6 @@ msgid ""
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_res_partner
#: view:sale.report:0
#: field:sale.report,partner_id:0
msgid "Partner"
@@ -770,7 +783,7 @@ msgstr ""
"pedido."
#. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
#, python-format
msgid ""
"You have to select a pricelist or a customer in the sales form !\n"
@@ -883,6 +896,7 @@ msgid "Your Reference"
msgstr "Sua Referência"
#. module: sale
+#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Qtd"
@@ -894,9 +908,10 @@ msgstr "Minhas linhas de Pedido de Venda"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
#: view:sale.advance.payment.inv:0
#: view:sale.make.invoice:0
-#: view:sale.order:0
#: view:sale.order.line:0
#: view:sale.order.line.make.invoice:0
msgid "Cancel"
@@ -917,10 +932,9 @@ msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
#: view:sale.order.line:0
msgid "Create Invoice"
msgstr "Criar Nota Fiscal"
@@ -947,6 +961,7 @@ msgstr ""
#. module: sale
#: report:sale.order:0
+#: view:sale.order.line:0
msgid "Price"
msgstr "Preço"
@@ -1082,6 +1097,7 @@ msgid "Sale Order"
msgstr "Pedido de Venda"
#. module: sale
+#: view:sale.order:0
#: field:sale.order,amount_tax:0
#: field:sale.order.line,tax_id:0
msgid "Taxes"
@@ -1151,6 +1167,7 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
msgid "Make Invoices"
msgstr "Gerar Nota Fiscal"
@@ -1255,7 +1272,7 @@ msgstr "Análise de Vendas"
#. module: sale
#: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Quotation"
msgstr "Cotação"
@@ -1404,10 +1421,8 @@ msgid "Customer Invoices"
msgstr "Faturas de Clientes"
#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
#: view:sale.order:0
#: view:sale.report:0
msgid "Sales"
@@ -1429,7 +1444,6 @@ msgid "Unit Price"
msgstr "Preço Unitário"
#. module: sale
-#: view:sale.order:0
#: selection:sale.order,state:0
#: view:sale.order.line:0
#: selection:sale.order.line,state:0
@@ -1438,10 +1452,8 @@ msgid "Done"
msgstr "Concluído"
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
#: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
msgid "Invoice"
msgstr "Fatura"
@@ -1517,6 +1529,7 @@ msgid "Product UoS"
msgstr "UdS Produto"
#. module: sale
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Em Andamento Manual"
@@ -1665,7 +1678,7 @@ msgid "Invoice Exception"
msgstr "Exceção de Faturamento"
#. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
#, python-format
msgid "No Customer Defined !"
msgstr "Sem Cliente definido!"
@@ -1742,6 +1755,7 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
#: field:sale.order,shop_id:0
#: view:sale.report:0
#: field:sale.report,shop_id:0
@@ -1765,15 +1779,12 @@ msgid "Contract Features"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
#: model:ir.model,name:sale.model_sale_order
#: model:process.node,name:sale.process_node_order0
#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
#: model:res.request.link,name:sale.req_link_sale_order
#: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
msgid "Sales Order"
msgstr "Pedido de Venda"
@@ -1808,6 +1819,7 @@ msgid "Followers"
msgstr ""
#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,invoice_lines:0
msgid "Invoice Lines"
msgstr "Linhas da Nota Fiscal"
@@ -1819,7 +1831,6 @@ msgid "# of Lines"
msgstr "# de Linhas"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Sales Order Lines"
@@ -1893,7 +1904,7 @@ msgid ""
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
#, python-format
msgid ""
"Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1917,6 +1928,8 @@ msgid "Weight"
msgstr "Peso"
#. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
#: field:sale.order,invoice_ids:0
msgid "Invoices"
msgstr "Notas Fiscais"
@@ -1948,7 +1961,10 @@ msgid "Untaxed Amount"
msgstr "Total de Mercadorias"
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
#, python-format
msgid "Advance Invoice"
msgstr "Avançar Fatura"
@@ -1989,6 +2005,8 @@ msgid "Email Templates"
msgstr "Modelos de Email"
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
#: view:sale.order:0
msgid "Sales Orders"
msgstr "Pedidos de Venda"
@@ -2026,7 +2044,7 @@ msgid "January"
msgstr "Janeiro"
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
msgid "Sales Order in Progress"
msgstr "Pedido de Venda em Processamento"
@@ -2205,6 +2223,7 @@ msgid "Quotation N°"
msgstr "Cotação N°"
#. module: sale
+#: field:sale.order,picked_rate:0
#: view:sale.report:0
msgid "Picked"
msgstr "Separado"
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index c9783b962e5..9df4169de6b 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/i18n/sl.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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-05 10:46+0000\n"
-"Last-Translator: Vida Potočnik \n"
+"PO-Revision-Date: 2012-12-08 16:54+0000\n"
+"Last-Translator: Dusan Laznik \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-12-06 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n"
"X-Generator: Launchpad (build 16341)\n"
#. module: sale
@@ -44,7 +44,7 @@ msgstr ""
#: view:sale.report:0
#: field:sale.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Prodajalec"
#. module: sale
#: help:sale.order,pricelist_id:0
@@ -67,13 +67,13 @@ msgstr "Prekliči nalog"
#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
#, python-format
msgid "Incorrect Data"
-msgstr ""
+msgstr "Napačni podatki"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
#, python-format
msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "Znesek avansa mora biti pozitiven."
#. module: sale
#: help:sale.order,message_unread:0
@@ -125,7 +125,7 @@ msgstr "# od Kos"
#. module: sale
#: help:sale.config.settings,group_discount_per_so_line:0
msgid "Allows you to apply some discount per sale order line."
-msgstr ""
+msgstr "Omogoča uporabo popusta na poziciji prodajnega naloga."
#. module: sale
#: help:sale.config.settings,group_sale_pricelist:0
@@ -133,6 +133,9 @@ msgid ""
"Allows to manage different prices based on rules per category of customers.\n"
"Example: 10% for retailers, promotion of 5 EUR on this product, etc."
msgstr ""
+"Omogoča upravljanje različnih cen na osnovi pravil za posamezne skupine "
+"kupcev.\n"
+"Primer: 10% za trgovce na drobno, 5 EUR za promocijo tega produkta, itd."
#. module: sale
#: field:sale.shop,payment_default_id:0
@@ -143,12 +146,12 @@ msgstr "Privzeti plačilni pogoji"
#: code:addons/sale/sale.py:662
#, python-format
msgid "Invoice paid ."
-msgstr ""
+msgstr "Račun plačan>/b>."
#. module: sale
#: field:sale.config.settings,group_uom:0
msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Dovoli uporabo različnih enot mere"
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
@@ -164,7 +167,7 @@ msgstr "Pop. (%)"
#: code:addons/sale/sale.py:787
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Prosim določite konto prihodkov za ta produkt: \"%s\" (id:%d)."
#. module: sale
#: view:sale.report:0
@@ -180,7 +183,7 @@ msgstr "Označite polje za združitev računov za iste stranke"
#. module: sale
#: view:sale.order:0
msgid "My Sale Orders"
-msgstr ""
+msgstr "Moja prodajna naročila"
#. module: sale
#: help:sale.config.settings,timesheet:0
@@ -218,7 +221,7 @@ msgstr ""
#. module: sale
#: view:sale.config.settings:0
msgid "Invoicing Process"
-msgstr ""
+msgstr "Postopek fakturiranja"
#. module: sale
#: view:sale.order:0
@@ -229,13 +232,13 @@ msgstr "Prodajni nalog zaključen"
#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
#: view:res.partner:0
msgid "Quotations and Sales"
-msgstr ""
+msgstr "Ponudbe in Prodaja"
#. module: sale
#: help:sale.config.settings,group_uom:0
msgid ""
"Allows you to select and maintain different units of measure for products."
-msgstr ""
+msgstr "Omogoča izbiro in vzdrževanje različnih enot mere za produkte."
#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
@@ -256,7 +259,7 @@ msgstr "Popust (%)"
#. module: sale
#: view:sale.order.line.make.invoice:0
msgid "Create & View Invoice"
-msgstr ""
+msgstr "Ustvari & Poglej račun"
#. module: sale
#: view:board.board:0
@@ -267,7 +270,7 @@ msgstr "Moje ponudbe"
#. module: sale
#: field:sale.config.settings,module_warning:0
msgid "Allow configuring alerts by customer or products"
-msgstr ""
+msgstr "Omogoči oblikovanje opozoril po kupcu ali produktu"
#. module: sale
#: field:sale.shop,name:0
@@ -292,7 +295,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Quotation "
-msgstr ""
+msgstr "Ponudba "
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
@@ -308,7 +311,7 @@ msgstr "Prodaja v izjemah"
#. module: sale
#: help:sale.order.line,address_allotment_id:0
msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
+msgstr "Partner, kateremu mora biti dodeljen posamezen produkt."
#. module: sale
#: view:sale.order:0
@@ -367,7 +370,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "View Invoice"
-msgstr ""
+msgstr "Poglej račun"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
@@ -393,7 +396,7 @@ msgstr "Količina"
#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "Dobavni naslov za trenutni prodajni nalog."
#. module: sale
#: report:sale.order:0
@@ -420,7 +423,7 @@ msgstr "V obdelavi"
#: code:addons/sale/sale.py:667
#, python-format
msgid "Draft Invoice of %s %s waiting for validation ."
-msgstr ""
+msgstr "Osnutek računa %s%s čaka na potrditev ."
#. module: sale
#: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -436,6 +439,7 @@ msgstr ""
#, python-format
msgid "You cannot cancel a sale order line that has already been invoiced."
msgstr ""
+"Ne morete preklicati pozicijo prodajnega naročila, ki je že bila fakturirana."
#. module: sale
#: report:sale.order:0
@@ -455,7 +459,7 @@ msgstr ""
#. module: sale
#: selection:sale.order,order_policy:0
msgid "Before Delivery"
-msgstr ""
+msgstr "Pred dobavo"
#. module: sale
#: code:addons/sale/sale.py:804
@@ -468,22 +472,22 @@ msgstr ""
#. module: sale
#: model:res.groups,name:sale.group_delivery_invoice_address
msgid "Addresses in Sale Orders"
-msgstr ""
+msgstr "Naslovi na prodajnih nalogih"
#. module: sale
#: field:sale.order,project_id:0
msgid "Contract / Analytic"
-msgstr ""
+msgstr "Pogodba / Analitično"
#. module: sale
#: model:res.groups,name:sale.group_invoice_so_lines
msgid "Enable Invoicing Sale order lines"
-msgstr ""
+msgstr "Omogoči fakturiranje pozicij prodajnega naloga"
#. module: sale
#: view:sale.report:0
msgid "Ordered month of the sales order"
-msgstr ""
+msgstr "Mesec prodajnega naloga"
#. module: sale
#: code:addons/sale/sale.py:496
@@ -533,7 +537,7 @@ msgstr "Marec"
#. module: sale
#: model:ir.actions.server,name:sale.actions_server_sale_order_read
msgid "Sale: Mark read"
-msgstr ""
+msgstr "Prodaja: Označi za prebrano"
#. module: sale
#: help:sale.order,amount_total:0
@@ -553,7 +557,7 @@ msgstr "Skupaj"
#. module: sale
#: field:sale.config.settings,group_discount_per_so_line:0
msgid "Allow setting a discount on the sale order lines"
-msgstr ""
+msgstr "Omogoči vnašanje popusta na pozicijo prodajenga naloga"
#. module: sale
#: report:sale.order:0
@@ -563,7 +567,7 @@ msgstr "Naslov za račun:"
#. module: sale
#: field:sale.order.line,product_uom:0
msgid "Unit of Measure "
-msgstr ""
+msgstr "Enota mere "
#. module: sale
#: field:sale.config.settings,time_unit:0
@@ -597,7 +601,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "(update)"
-msgstr ""
+msgstr "(posodobi)"
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
@@ -628,7 +632,7 @@ msgstr "Postavke naročila"
#. module: sale
#: field:account.config.settings,module_sale_analytic_plans:0
msgid "Use multiple analytic accounts on sales"
-msgstr ""
+msgstr "Na prodaji uporabi več analitičnih kontov"
#. module: sale
#: help:sale.config.settings,module_sale_journal:0
@@ -728,6 +732,8 @@ msgid ""
"To allow your salesman to make invoices for sale order lines using the menu "
"'Lines to Invoice'."
msgstr ""
+"Omogoči prodajalcu, da za pozicije prodajnih naročil kreira račune z uporabo "
+"menija 'Pozicije za fakturiranje'."
#. module: sale
#: view:sale.report:0
@@ -738,7 +744,7 @@ msgstr "Stranka"
#. module: sale
#: view:sale.advance.payment.inv:0
msgid "Create and View Invoice"
-msgstr ""
+msgstr "Ustvari in poglej račun"
#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
@@ -763,7 +769,7 @@ msgstr "Datum Povpraševanja"
#: code:addons/sale/sale.py:590
#, python-format
msgid "You cannot confirm a sale order which has no line."
-msgstr ""
+msgstr "Ne morete potrditi prodajni nalog na katerem ni nobene pozicije."
#. module: sale
#: code:addons/sale/sale.py:1124
@@ -771,7 +777,7 @@ msgstr ""
msgid ""
"You have to select a pricelist or a customer in the sales form !\n"
"Please set one before choosing a product."
-msgstr ""
+msgstr "Preden izberete produkt morate izbrati cenik ali kupca."
#. module: sale
#: view:sale.report:0
@@ -783,7 +789,7 @@ msgstr "Kategorija artiklov"
#: code:addons/sale/sale.py:555
#, python-format
msgid "Cannot cancel this sales order!"
-msgstr ""
+msgstr "Prodajni nalog ni mogoče preklicati."
#. module: sale
#: view:sale.order:0
@@ -796,6 +802,7 @@ msgstr "Znova ustvari račun"
msgid ""
"In order to delete a confirmed sale order, you must cancel it before !"
msgstr ""
+"Če želite zbrisati potrjen prodajni nalog, ga morate najprej preklicati!"
#. module: sale
#: report:sale.order:0
@@ -853,12 +860,12 @@ msgstr ""
#: code:addons/sale/sale.py:979
#, python-format
msgid "No valid pricelist line found ! :"
-msgstr ""
+msgstr "Ne najdem veljavne pozicije cenika!"
#. module: sale
#: field:sale.config.settings,module_sale_margin:0
msgid "Display margins on sales orders"
-msgstr ""
+msgstr "Prikaži marže na prodajnem nalogu"
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -884,7 +891,7 @@ msgstr "Kol."
#. module: sale
#: view:sale.order.line:0
msgid "My Sales Order Lines"
-msgstr ""
+msgstr "Moje postavke prodajnega naloga"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -909,6 +916,8 @@ msgid ""
"Cannot find a pricelist line matching this product and quantity.\n"
"You have to change either the product, the quantity or the pricelist."
msgstr ""
+"Ne najdem pozicije cenika, ki bi se ujemala s tem produktom in količino.\n"
+"Prosim spremenite produkt, količino ali cenik."
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -948,7 +957,7 @@ msgstr "Cena"
#. module: sale
#: view:sale.order:0
msgid "Quotation Number"
-msgstr ""
+msgstr "Številka ponudbe"
#. module: sale
#: selection:sale.order.line,type:0
@@ -974,28 +983,28 @@ msgstr "Osnutek naročila"
#: code:addons/sale/sale.py:647
#, python-format
msgid "Quotation for %s created ."
-msgstr ""
+msgstr "Ponudba za %s ustvarjena ."
#. module: sale
#: help:sale.order,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Sporočila in zgodovina sporočil"
#. module: sale
#: view:sale.order:0
msgid "New Copy of Quotation"
-msgstr ""
+msgstr "Nova kopija ponudbe"
#. module: sale
#: code:addons/sale/sale.py:1007
#, python-format
msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
+msgstr "Ni mogoče brisati pozicijo prodajnega naloga, ki ima status '%s'."
#. module: sale
#: model:res.groups,name:sale.group_mrp_properties
msgid "Properties on lines"
-msgstr ""
+msgstr "Lastnosti pozicije"
#. module: sale
#: code:addons/sale/sale.py:888
@@ -1003,7 +1012,7 @@ msgstr ""
msgid ""
"Before choosing a product,\n"
" select a customer in the sales form."
-msgstr ""
+msgstr "Pred izbiro produkta določite kupca."
#. module: sale
#: view:sale.order:0
@@ -1013,7 +1022,7 @@ msgstr "Davek vključen"
#. module: sale
#: view:sale.report:0
msgid "Ordered date of the sales order"
-msgstr ""
+msgstr "Datum prodajenga naloga"
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
@@ -1036,7 +1045,7 @@ msgstr "Združi po ..."
#. module: sale
#: view:sale.config.settings:0
msgid "Product Features"
-msgstr ""
+msgstr "Lastnosti produkta"
#. module: sale
#: selection:sale.order,state:0
@@ -1058,7 +1067,7 @@ msgstr "Metoda Naročnja"
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
msgid "Invoice the whole sale order"
-msgstr ""
+msgstr "Fakturiraj celotni prodajni nalog"
#. module: sale
#: view:sale.order:0
@@ -1069,7 +1078,7 @@ msgstr ""
#. module: sale
#: selection:sale.order,state:0
msgid "Draft Quotation"
-msgstr ""
+msgstr "Osnutek ponudbe"
#. module: sale
#: selection:sale.order,state:0
@@ -1086,7 +1095,7 @@ msgstr "Davki"
#. module: sale
#: view:sale.order:0
msgid "Sales Order ready to be invoiced"
-msgstr ""
+msgstr "Prodajni nalog pripravljen za fakturiranje"
#. module: sale
#: help:sale.config.settings,module_analytic_user_function:0
@@ -1163,7 +1172,7 @@ msgstr "Na Račun"
#. module: sale
#: view:sale.report:0
msgid "Ordered Year of the sales order"
-msgstr ""
+msgstr "Leto prodajnega naloga"
#. module: sale
#: selection:sale.report,month:0
@@ -1374,12 +1383,12 @@ msgstr ""
#. module: sale
#: field:sale.config.settings,group_sale_pricelist:0
msgid "Use pricelists to adapt your price per customers"
-msgstr ""
+msgstr "Za prilagoditev cene po kupcih uporabi cenike"
#. module: sale
#: view:sale.order.line:0
msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
+msgstr "Potrjene, nedobavljene pozicije prodajnega naročila"
#. module: sale
#: help:sale.order,invoice_quantity:0
@@ -1463,7 +1472,7 @@ msgstr "Proizvod"
#. module: sale
#: field:sale.config.settings,group_invoice_so_lines:0
msgid "Generate invoices based on the sale order lines"
-msgstr ""
+msgstr "Ustvari račune na osnovi pozicij prodajnega naročila"
#. module: sale
#: help:sale.order,order_policy:0
@@ -1475,6 +1484,11 @@ msgid ""
"Before delivery: A draft invoice is created from the sales order and must be "
"paid before the products can be delivered."
msgstr ""
+"Na zahtevo: Osnutek računa se lahko kreira na osnovi prodajnega naročila.\n"
+"Po dobavnici: Osnutek računa se lahko kreira na osnovi dobavnice, ko je "
+"blago že dobavljeno.\n"
+"Pred dobavo: Osnutek računa je kreiran na osnovi prodajnega naloga in mora "
+"biti plačan pred dobavo."
#. module: sale
#: view:account.invoice.report:0
@@ -1522,7 +1536,7 @@ msgstr "Vrstni red"
#. module: sale
#: view:sale.order:0
msgid "Confirm Sale"
-msgstr ""
+msgstr "Potrdi prodajo"
#. module: sale
#: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -1556,7 +1570,7 @@ msgstr ""
#. module: sale
#: model:res.groups,name:sale.group_discount_per_so_line
msgid "Discount on lines"
-msgstr ""
+msgstr "Popust na pozicijah"
#. module: sale
#: field:sale.order,client_order_ref:0
@@ -1580,7 +1594,7 @@ msgstr ""
#. module: sale
#: view:board.board:0
msgid "Sales Dashboard"
-msgstr ""
+msgstr "Nadzorna plošča prodaje"
#. module: sale
#: help:sale.advance.payment.inv,advance_payment_method:0
@@ -1611,6 +1625,8 @@ msgid ""
"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
"'draft' or ''}"
msgstr ""
+"${(object.name or '').zamenjaj('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
#. module: sale
#: help:sale.order,date_confirm:0
@@ -1621,7 +1637,7 @@ msgstr "Datum potrdila naročila."
#: code:addons/sale/sale.py:556
#, python-format
msgid "First cancel all invoices attached to this sales order."
-msgstr ""
+msgstr "Najprej prekliči vse račune, vezane na ta prodajni nalog."
#. module: sale
#: field:sale.order,company_id:0
@@ -1667,7 +1683,7 @@ msgstr ""
#. module: sale
#: view:sale.config.settings:0
msgid "Warehouse Features"
-msgstr ""
+msgstr "Lastnosti skladišča"
#. module: sale
#: field:sale.order,message_ids:0
@@ -1701,6 +1717,8 @@ msgid ""
"replenishment.\n"
"On order: When needed, the product is purchased or produced."
msgstr ""
+"Iz zaloge: Produkt se vzame iz zaloge ali se počaka na dopolnitev zalog.\n"
+"Po naročilu: Produkt se naroči ali proizvede."
#. module: sale
#: selection:sale.order,state:0
@@ -1717,12 +1735,12 @@ msgstr "Iskanje Nefakturiranih Vrstic"
#. module: sale
#: selection:sale.order,state:0
msgid "Quotation Sent"
-msgstr ""
+msgstr "Ponudba poslana"
#. module: sale
#: model:ir.model,name:sale.model_mail_compose_message
msgid "Email composition wizard"
-msgstr ""
+msgstr "Čarovnik za sestavljanje e-pošte"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
@@ -1742,12 +1760,12 @@ msgstr "Potrditev Datuma"
#: code:addons/sale/sale.py:355
#, python-format
msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Prosim, določite dnevnik prodaje za to podjetje: \"%s\" (id:%d)."
#. module: sale
#: view:sale.config.settings:0
msgid "Contract Features"
-msgstr ""
+msgstr "Lastnost pogodbe"
#. module: sale
#: model:ir.model,name:sale.model_sale_order
@@ -1757,7 +1775,7 @@ msgstr ""
#: view:sale.order:0
#: field:stock.picking,sale_id:0
msgid "Sales Order"
-msgstr ""
+msgstr "Prodajni nalog"
#. module: sale
#: field:sale.order.line,product_uos_qty:0
@@ -1767,7 +1785,7 @@ msgstr "Količina (UoS)"
#. module: sale
#: view:sale.order.line:0
msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
+msgstr "Postavke prodajnega naloga s statusom 'zaključeno'"
#. module: sale
#: selection:sale.order.line,state:0
@@ -1810,18 +1828,18 @@ msgstr "Postavke prodajnega naloga"
#. module: sale
#: view:sale.config.settings:0
msgid "Default Options"
-msgstr ""
+msgstr "Privzete možnosti"
#. module: sale
#: field:account.config.settings,group_analytic_account_for_sales:0
msgid "Analytic accounting for sales"
-msgstr ""
+msgstr "Analitični konti prodaje"
#. module: sale
#: code:addons/sale/edi/sale_order.py:139
#, python-format
msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "EDI cenik (%s)"
#. module: sale
#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
@@ -1891,7 +1909,7 @@ msgstr ""
#. module: sale
#: view:sale.order.line:0
msgid "Sale order lines done"
-msgstr ""
+msgstr "Zaključene postavke prodajnega naloga"
#. module: sale
#: field:sale.order.line,th_weight:0
@@ -1914,7 +1932,7 @@ msgstr ""
#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Za ta produkt: \"%s\" (id:%d) ni določen konto prihodkov."
#. module: sale
#: view:sale.order.line:0
@@ -1943,7 +1961,7 @@ msgstr "Avansni Račun"
#. module: sale
#: model:ir.actions.client,name:sale.action_client_sale_menu
msgid "Open Sale Menu"
-msgstr ""
+msgstr "Odpri meni prodaje"
#. module: sale
#: selection:sale.order.line,state:0
@@ -1963,12 +1981,12 @@ msgstr "Znesek davka"
#. module: sale
#: view:sale.order:0
msgid "Sale Order "
-msgstr ""
+msgstr "Prodajni nalog "
#. module: sale
#: view:sale.order.line:0
msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
+msgstr "Postavke prodajnega naloga pripravljene za fakturiranje"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_email_templates
@@ -1997,7 +2015,7 @@ msgstr "November"
#: field:sale.order,message_comment_ids:0
#: help:sale.order,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Pripombe in e-pošta"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -2028,7 +2046,7 @@ msgstr ""
#: code:addons/sale/sale.py:655
#, python-format
msgid "Sale Order for %s cancelled ."
-msgstr ""
+msgstr "Prodajni nalog za %s preklican ."
#. module: sale
#: help:sale.order,origin:0
@@ -2044,12 +2062,12 @@ msgstr "Prevzem z zamudo"
#. module: sale
#: field:sale.report,state:0
msgid "Order Status"
-msgstr ""
+msgstr "Status naročila"
#. module: sale
#: view:sale.advance.payment.inv:0
msgid "Show Lines to Invoice"
-msgstr ""
+msgstr "Prikaži pozicije za fakturiranje"
#. module: sale
#: field:sale.report,date:0
@@ -2064,7 +2082,7 @@ msgstr "Potrjena naročilnica za račun"
#. module: sale
#: view:sale.order:0
msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
+msgstr "Nepotrjen prodajni nalog"
#. module: sale
#: selection:sale.order.line,type:0
@@ -2075,18 +2093,18 @@ msgstr "iz zaloge"
#: code:addons/sale/sale.py:968
#, python-format
msgid "No Pricelist ! : "
-msgstr ""
+msgstr "Ni cenika! : "
#. module: sale
#: model:ir.actions.act_window,name:sale.action_orders
#: model:ir.ui.menu,name:sale.menu_sale_order
msgid "Sale Orders"
-msgstr ""
+msgstr "Prodajni nalogi"
#. module: sale
#: field:sale.config.settings,module_account_analytic_analysis:0
msgid "Use contracts management"
-msgstr ""
+msgstr "Uporabi upravljanje pogodb"
#. module: sale
#: help:sale.order,invoiced:0
@@ -2124,7 +2142,7 @@ msgstr "Kupec"
#. module: sale
#: model:product.template,name:sale.advance_product_0_product_template
msgid "Advance"
-msgstr ""
+msgstr "V naprej"
#. module: sale
#: selection:sale.report,month:0
@@ -2149,12 +2167,12 @@ msgstr ""
#: view:sale.order:0
#: view:sale.order.line:0
msgid "Search Sales Order"
-msgstr ""
+msgstr "Iskanje prodajnih nalogov"
#. module: sale
#: field:sale.advance.payment.inv,advance_payment_method:0
msgid "What do you want to invoice?"
-msgstr ""
+msgstr "Kaj želite fakturirati?"
#. module: sale
#: field:sale.order.line,sequence:0
@@ -2202,7 +2220,7 @@ msgstr ""
#. module: sale
#: view:sale.order.line.make.invoice:0
msgid "Do you want to invoice the selected sale order lines?"
-msgstr ""
+msgstr "Želite fakturirati izbrane pozicije prodajnega naloga?"
#~ msgid "Inventory Moves"
#~ msgstr "Premiki inventarja"
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 32926cc0626..dfd8c87f209 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -195,8 +195,8 @@
- [[ o.state<>'draft' and removeParentNode('para') ]] Quotation N° [[ o.name ]]
- [[ o.state=='draft' and removeParentNode('para') ]] Order N° [[ o.name ]]
+ [[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation N° [[ o.name ]]
+ [[ o.state in ['draft','sent'] and removeParentNode('para') ]] Order N° [[ o.name ]]
@@ -206,8 +206,8 @@
Your Reference
- [[ o.state=='draft' and removeParentNode('para') ]] Date Ordered
- [[ o.state <> 'draft' and removeParentNode('para') ]] Quotation Date
+ [[ o.state in ['draft','sent'] and removeParentNode('para') ]] Date Ordered
+ [[ o.state not in ['draft','sent'] and removeParentNode('para') ]] Quotation Date
Salesperson
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 208e30235f8..4c242cccd5f 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -201,12 +201,12 @@ class sale_order(osv.osv):
help="""This field controls how invoice and delivery operations are synchronized.
- With 'Before Delivery', a draft invoice is created, and it must be paid before delivery."""),
'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Pricelist for current sales order."),
- 'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", readonly=True, required=True),
+ 'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", string="Currency", readonly=True, required=True),
'project_id': fields.many2one('account.analytic.account', 'Contract / Analytic', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="The analytic account related to a sales order."),
'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."),
- 'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
+ 'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced Ratio', type='float'),
'invoiced': fields.function(_invoiced, string='Paid',
fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
'invoice_exists': fields.function(_invoice_exists, string='Invoiced',
@@ -742,7 +742,7 @@ class sale_order_line(osv.osv):
'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesperson'),
'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
}
- _order = 'sequence, id'
+ _order = 'order_id desc, sequence'
_defaults = {
'product_uom' : _get_uom_id,
'discount': 0.0,
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index dd9cfad066a..2c2fdd6991f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -66,43 +66,6 @@
-
-
- Sale: Mark unread
- True
- ir.actions.server
-
- code
- self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)
-
-
- action_sale_order_unread
-
-
- action
-
- sale.order
- client_action_multi
-
-
-
- Sale: Mark read
- True
- ir.actions.server
-
- code
- self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)
-
-
- action_sale_order_read
-
-
- action
-
- sale.order
- client_action_multi
-
-
sale.order.calendar
sale.order
@@ -207,7 +170,7 @@
-
+
@@ -235,7 +198,7 @@
-
+
%%
@@ -447,6 +410,7 @@
sale.order.line
+
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 6144ff489f4..720586e638c 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -6,9 +6,6 @@
sale.order.line.make.invoice
-
All items in these order lines will be invoiced. You can also invoice a percentage of the sale order
or a fixed price (for advances) directly from the sale order form if you prefer.
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 17821f519a6..2decdd60f0b 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -22,9 +22,9 @@
+ attrs="{'required': [('advance_payment_method', 'in', ('fixed','percentage'))]}" class="oe_inline"/>
+ attrs="{'invisible': [('advance_payment_method', '!=', 'percentage')]}" class="oe_inline"/>
diff --git a/addons/sale_analytic_plans/i18n/pt_BR.po b/addons/sale_analytic_plans/i18n/pt_BR.po
index f96aab820db..59fcd3e6a65 100644
--- a/addons/sale_analytic_plans/i18n/pt_BR.po
+++ b/addons/sale_analytic_plans/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2011-01-13 15:19+0000\n"
-"Last-Translator: Emerson \n"
+"PO-Revision-Date: 2012-12-07 16:43+0000\n"
+"Last-Translator: Cristiano Korndörfer \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-12-04 05:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: sale_analytic_plans
#: field:sale.order.line,analytics_id:0
@@ -24,7 +24,7 @@ msgstr "Distribuição Analítica"
#. module: sale_analytic_plans
#: model:ir.model,name:sale_analytic_plans.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de Venda"
#. module: sale_analytic_plans
#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
diff --git a/addons/sale_crm/i18n/nl.po b/addons/sale_crm/i18n/nl.po
index 717a61eba27..ce24e8a0993 100644
--- a/addons/sale_crm/i18n/nl.po
+++ b/addons/sale_crm/i18n/nl.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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-11-24 21:39+0000\n"
+"PO-Revision-Date: 2012-12-09 18:40+0000\n"
"Last-Translator: Erwin van der Ploeg (Endian Solutions) \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-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:37+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -31,7 +31,7 @@ msgstr "Omzetten naar offerte"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_account_invoice_report
msgid "Invoices Statistics"
-msgstr ""
+msgstr "Factuur analyses"
#. module: sale_crm
#: field:crm.make.sale,close:0
@@ -41,7 +41,7 @@ msgstr "Markeren als gewonnen"
#. module: sale_crm
#: field:res.users,default_section_id:0
msgid "Default Sales Team"
-msgstr ""
+msgstr "Standaard verkoopteam"
#. module: sale_crm
#: view:sale.order:0
@@ -51,7 +51,7 @@ msgstr "Mijn verkoop team(s)"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Gebruikers"
#. module: sale_crm
#: help:crm.make.sale,close:0
@@ -90,7 +90,7 @@ msgstr "Verkoop maken"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_account_invoice
msgid "Invoice"
-msgstr ""
+msgstr "Factuur"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:93
diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po
index 59f9661f271..9d18e5ea12e 100644
--- a/addons/sale_crm/i18n/pt_BR.po
+++ b/addons/sale_crm/i18n/pt_BR.po
@@ -7,21 +7,20 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-07-28 19:41+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"\n"
+"PO-Revision-Date: 2012-12-06 17:59+0000\n"
+"Last-Translator: Cristiano Korndörfer \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-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:90
#, python-format
msgid "Insufficient Data!"
-msgstr ""
+msgstr "Dados insuficientes!"
#. module: sale_crm
#: view:crm.lead:0
@@ -32,27 +31,27 @@ msgstr "Converter em Cotação"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_account_invoice_report
msgid "Invoices Statistics"
-msgstr ""
+msgstr "Estatísticas das Faturas"
#. module: sale_crm
#: field:crm.make.sale,close:0
msgid "Mark Won"
-msgstr ""
+msgstr "Marcar como Vencido"
#. module: sale_crm
#: field:res.users,default_section_id:0
msgid "Default Sales Team"
-msgstr ""
+msgstr "Equipe de Vendas Padrão"
#. module: sale_crm
#: view:sale.order:0
msgid "My Sales Team(s)"
-msgstr "Minha Equipe de Vendas"
+msgstr "Minha(s) Equipe(s) de Vendas"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Usuários"
#. module: sale_crm
#: help:crm.make.sale,close:0
@@ -65,7 +64,7 @@ msgstr ""
#. module: sale_crm
#: field:sale.order,categ_ids:0
msgid "Categories"
-msgstr ""
+msgstr "Categorias"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:124
@@ -87,12 +86,12 @@ msgstr "_Criar"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_crm_make_sale
msgid "Make sales"
-msgstr "Criar vendas"
+msgstr "Fazer vendas"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_account_invoice
msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:93
@@ -104,7 +103,7 @@ msgstr "Oportunidade: %s"
#: code:addons/sale_crm/wizard/crm_make_sale.py:110
#, python-format
msgid "Opportunity has been converted to the quotation %s ."
-msgstr ""
+msgstr "A oportunidade foi convertida para a cotação %s ."
#. module: sale_crm
#: field:crm.make.sale,shop_id:0
@@ -115,7 +114,7 @@ msgstr "Estabelecimento"
#: code:addons/sale_crm/wizard/crm_make_sale.py:90
#, python-format
msgid "No addresse(s) defined for this customer."
-msgstr ""
+msgstr "Nenhum endereço definido para o cliente."
#. module: sale_crm
#: view:account.invoice:0
@@ -129,7 +128,7 @@ msgstr "Equipe de Vendas"
#. module: sale_crm
#: view:crm.lead:0
msgid "Create Quotation"
-msgstr ""
+msgstr "Criar Cotação"
#. module: sale_crm
#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -149,7 +148,7 @@ msgstr "Pedido de Venda"
#. module: sale_crm
#: view:crm.make.sale:0
msgid "or"
-msgstr ""
+msgstr "ou"
#~ msgid "Crm opportunity quotation"
#~ msgstr "Cotação da oportunidade de Crm"
diff --git a/addons/sale_journal/i18n/pt_BR.po b/addons/sale_journal/i18n/pt_BR.po
index de40cfdd6a2..8740e9c90c9 100644
--- a/addons/sale_journal/i18n/pt_BR.po
+++ b/addons/sale_journal/i18n/pt_BR.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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-07-28 19:50+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"\n"
+"PO-Revision-Date: 2012-12-07 16:45+0000\n"
+"Last-Translator: Cristiano Korndörfer \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-12-04 05:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: sale_journal
#: field:sale_journal.invoice.type,note:0
@@ -32,6 +31,8 @@ msgstr "Tipo de Fatura"
msgid ""
"This invoicing type will be used, by default, to invoice the current partner."
msgstr ""
+"Este tipo de faturamento será utilizado como padrão em faturas do parceiro "
+"atual."
#. module: sale_journal
#: view:res.partner:0
@@ -46,7 +47,7 @@ msgstr "Faturamento"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_stock_picking_in
msgid "Incoming Shipments"
-msgstr ""
+msgstr "Recebimentos"
#. module: sale_journal
#: help:sale_journal.invoice.type,active:0
@@ -104,7 +105,7 @@ msgstr ""
#. module: sale_journal
#: help:sale.order,invoice_type_id:0
msgid "Generate invoice based on the selected option."
-msgstr ""
+msgstr "Gerar fatura baseada na opção selecionada."
#. module: sale_journal
#: view:sale.order:0
@@ -138,7 +139,7 @@ msgstr "Pedido de Venda"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_stock_picking_out
msgid "Delivery Orders"
-msgstr ""
+msgstr "Ordens de Entrega"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Invalido XML para Arquitetura da View"
diff --git a/addons/sale_mrp/i18n/nl.po b/addons/sale_mrp/i18n/nl.po
index b31d113a93e..e4d609f5c7d 100644
--- a/addons/sale_mrp/i18n/nl.po
+++ b/addons/sale_mrp/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-02-08 10:27+0000\n"
+"PO-Revision-Date: 2012-12-09 18:42+0000\n"
"Last-Translator: Erwin van der Ploeg (Endian Solutions) \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-12-04 05:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
#. module: sale_mrp
#: model:ir.model,name:sale_mrp.model_mrp_production
@@ -35,12 +35,12 @@ msgstr "Toont de klant referentie van de verkooporder."
#. module: sale_mrp
#: field:mrp.production,sale_ref:0
msgid "Sale Reference"
-msgstr ""
+msgstr "Verkoop referentie"
#. module: sale_mrp
#: field:mrp.production,sale_name:0
msgid "Sale Name"
-msgstr ""
+msgstr "Verkoopnaam"
#~ msgid "Sales and MRP Management"
#~ msgstr "Verkoop en productie beheer"
diff --git a/addons/sale_mrp/i18n/sl.po b/addons/sale_mrp/i18n/sl.po
index 78c2921768e..558628ff491 100644
--- a/addons/sale_mrp/i18n/sl.po
+++ b/addons/sale_mrp/i18n/sl.po
@@ -8,29 +8,29 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2010-08-03 03:51+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) \n"
+"PO-Revision-Date: 2012-12-08 17:06+0000\n"
+"Last-Translator: Dusan Laznik