-
+
% endif
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 162e0d2572c..8f1de2744b4 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-16 23:17+0000\n"
+"PO-Revision-Date: 2012-12-17 21:28+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-17 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: account
@@ -11915,8 +11915,8 @@ msgid ""
"This label will be displayed on report to show the balance computed for the "
"given comparison filter."
msgstr ""
-"Dieser Text wird am Bericht gedruckt um den Saldo für den entsprechenden "
-"Vergleichsfilter zu berschreiben"
+"Dieser Text wird am Bericht gedruckt, um den Saldo für den entsprechenden "
+"Vergleichsfilter zu beschreiben"
#. module: account
#: selection:account.config.settings,tax_calculation_rounding_method:0
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index 2bb65e58ef5..57a3ededa93 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.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:16+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) \n"
+"PO-Revision-Date: 2012-12-17 13:50+0000\n"
+"Last-Translator: Normunds (Alistek) \n"
"Language-Team: Latvian \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:23+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -460,7 +460,7 @@ msgstr ""
#: field:account.tax.template,chart_template_id:0
#: field:wizard.multi.charts.accounts,chart_template_id:0
msgid "Chart Template"
-msgstr "Grafika Sagatave"
+msgstr "Kontu Plāna Sagatave"
#. module: account
#: help:account.config.settings,tax_calculation_rounding_method:0
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index f19dddf8cdd..6dd03fe96bb 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-15 10:47+0000\n"
+"PO-Revision-Date: 2012-12-17 14:28+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-16 04:47+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#, python-format
@@ -808,6 +808,9 @@ msgid ""
"lines for refunds. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
msgstr ""
+"Selecteer de kostenplaats rekening welke standaard gebruikt wordt voor "
+"belastingregels op creditfacturen. Laat deze leeg wanneer geen gebruikt "
+"gemaakt wordt van kostenplaatsen."
#. module: account
#: view:account.account:0
@@ -1227,6 +1230,17 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Klik om een grootboekkaar toe te voegen.\n"
+"
\n"
+" Bij transacties in meerdere valuta kan een valutaresultaat "
+"tot\n"
+" stand komen. Dit menu geeft het actuele valutaresultaat aan\n"
+" tegen de huidige koers. Dit wordt alleen aangegeven bij "
+"groot-\n"
+" boekkaarten waar meerdere valuta aan gekoppeld zijn.\n"
+"
\n"
+" "
#. module: account
#: field:account.bank.accounts.wizard,acc_name:0
@@ -1236,7 +1250,7 @@ msgstr "Rekeningnaam."
#. module: account
#: field:account.journal,with_last_closing_balance:0
msgid "Opening With Last Closing Balance"
-msgstr ""
+msgstr "Openen met het laatst afgesloten saldo."
#. module: account
#: help:account.tax.code,notprintable:0
@@ -1646,6 +1660,8 @@ msgid ""
"There is no default debit account defined \n"
"on journal \"%s\"."
msgstr ""
+"Er is geen standaard debet grootboekrekening gedefinieerd in dit dagboek: "
+"\"%s\"."
#. module: account
#: view:account.tax:0
@@ -1680,6 +1696,8 @@ msgid ""
"There is nothing to reconcile. All invoices and payments\n"
" have been reconciled, your partner balance is clean."
msgstr ""
+"Er zijn geen facturen om af te letteren. Alle facturen en betalingen zijn "
+"afgeletterd."
#. module: account
#: field:account.chart.template,code_digits:0
@@ -13651,9 +13669,6 @@ msgstr ""
#~ "U kunt het bedrijf niet meer veranderen in dit dagboek omdat er inmiddels al "
#~ "gerelateerde transacties op zijn geboekt."
-#~ msgid "Reference UoM"
-#~ msgstr "Referentie meeteenheid"
-
#~ msgid "Unreconciliate transactions"
#~ msgstr "Afletteren transactief ongedaan maken"
@@ -15278,3 +15293,6 @@ msgstr ""
#~ "OpenERP geeft u de mogelijkheid om, vanuit dit menu, een belastingweergave "
#~ "te beheren. Het is mogelijk om numerieke en alfanumerieke belastingrubrieken "
#~ "te gebruiken."
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referentie maateenheid"
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index ee04cc4efc7..e35ca349aa1 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/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-16 00:45+0000\n"
+"PO-Revision-Date: 2012-12-17 16:09+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-17 04:46+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: account
@@ -179,7 +179,7 @@ msgid ""
"You have to set the 'End of Year Entries Journal' for this Fiscal Year "
"which is set after generating opening entries from 'Generate Opening "
"Entries'."
-msgstr ""
+msgstr "Nastavite morate dnevnik za zaključek leta."
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
@@ -323,6 +323,10 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Tu lahko kreirate dobropise kupcem\n"
+"
\n"
+" "
#. module: account
#: help:account.installer,charts:0
@@ -339,7 +343,7 @@ msgstr "Neusklajen konto"
#. module: account
#: field:account.config.settings,module_account_budget:0
msgid "Budget management"
-msgstr ""
+msgstr "Upravljanje proračuna"
#. module: account
#: view:product.template:0
@@ -381,7 +385,7 @@ msgstr "Junij"
#: code:addons/account/wizard/account_automatic_reconcile.py:148
#, python-format
msgid "You must select accounts to reconcile."
-msgstr ""
+msgstr "Izbrati morate konte za usklajevnaje"
#. module: account
#: help:account.config.settings,group_analytic_accounting:0
@@ -453,7 +457,7 @@ msgid ""
" This installs the module account_asset. If you do not check "
"this box, you will be able to do invoicing & payments,\n"
" but not accounting (Journal Items, Chart of Accounts, ...)"
-msgstr ""
+msgstr "Vodenje osnovnih sredstev"
#. module: account
#. openerp-web
@@ -482,6 +486,8 @@ 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 ""
+"Če imate davek vključen v prodajno ceno , morate izbrati zaokroževanje na "
+"vrstico."
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -549,7 +555,7 @@ msgstr "Nadrejeni element"
#. module: account
#: help:account.invoice.line,sequence:0
msgid "Gives the sequence of this line when displaying the invoice."
-msgstr ""
+msgstr "Prikaz zaporednih številk pozicij na računu."
#. module: account
#: field:account.bank.statement,account_id:0
@@ -709,7 +715,7 @@ msgstr "SAJ"
#: code:addons/account/account.py:1546
#, python-format
msgid "Cannot create move with currency different from .."
-msgstr ""
+msgstr "Valuta se razlikuje od .."
#. module: account
#: model:email.template,report_name:account.email_template_edi_invoice
@@ -753,7 +759,7 @@ msgid ""
"Set the analytic account that will be used by default on the invoice tax "
"lines for refunds. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
-msgstr ""
+msgstr "Tu lahko nastavite privzeti konto za davek na dobropisih kupcem."
#. module: account
#: view:account.account:0
@@ -806,7 +812,7 @@ msgstr "Izpis računa"
msgid ""
"Cannot %s invoice which is already reconciled, invoice should be "
"unreconciled first. You can only refund this invoice."
-msgstr ""
+msgstr "Ni možno %s račun , ki je že zaprt."
#. module: account
#: selection:account.financial.report,display_detail:0
@@ -962,6 +968,10 @@ msgid ""
"
\n"
" "
msgstr ""
+"
\n"
+" Ni postavk.\n"
+"
\n"
+" "
#. module: account
#: code:addons/account/account.py:1632
@@ -971,6 +981,8 @@ msgid ""
" opening/closing fiscal "
"year process."
msgstr ""
+"Ne morete odpreti postavk, ki so bile ustvarjene ob avtomatskem "
+"zaključevanju/odpiranju poslovnega leta."
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -1015,7 +1027,7 @@ msgstr "Dnevnik nabav"
msgid ""
"You cannot validate this journal entry because account \"%s\" does not "
"belong to chart of accounts \"%s\"."
-msgstr ""
+msgstr "Konto \"%s\" ne pripada kontnemu načrtu \"%s\"."
#. module: account
#: view:validate.account.move:0
@@ -1033,7 +1045,7 @@ msgstr "Skupni znesek"
#. module: account
#: help:account.invoice,supplier_invoice_number:0
msgid "The reference of this invoice as provided by the supplier."
-msgstr ""
+msgstr "Dobaviteljeva številka računa."
#. module: account
#: selection:account.account,type:0
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 05a0f6b455e..d02e7196d4d 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -19,17 +19,17 @@
#
##############################################################################
-import logging
-import time
import datetime
from dateutil.relativedelta import relativedelta
+import logging
from operator import itemgetter
from os.path import join as opj
+import time
+
+from openerp import netsvc, tools
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
-from tools.translate import _
-from osv import fields, osv
-import netsvc
-import tools
_logger = logging.getLogger(__name__)
class account_installer(osv.osv_memory):
diff --git a/addons/account/ir_sequence.py b/addons/account/ir_sequence.py
index a98b7e87d77..56e1a4d0367 100644
--- a/addons/account/ir_sequence.py
+++ b/addons/account/ir_sequence.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class ir_sequence_fiscalyear(osv.osv):
_name = 'account.sequence.fiscalyear'
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 2b4c4a49cb4..346cc38f5df 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -20,9 +20,10 @@
##############################################################################
from operator import itemgetter
-from osv import fields, osv
import time
+from openerp.osv import fields, osv
+
class account_fiscal_position(osv.osv):
_name = 'account.fiscal.position'
_description = 'Fiscal Position'
diff --git a/addons/account/product.py b/addons/account/product.py
index 0a6a0eda10c..ce1ac83d6dd 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class product_category(osv.osv):
_inherit = "product.category"
diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index 764bedeb2b3..f4927331ca8 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -19,8 +19,7 @@
#
##############################################################################
-from osv import fields
-from osv import osv
+from openerp.osv import fields, osv
class account_analytic_journal(osv.osv):
_name = 'account.analytic.journal'
diff --git a/addons/account/project/report/account_journal.py b/addons/account/project/report/account_journal.py
index 4f7768a7b19..50f98fd0ee0 100644
--- a/addons/account/project/report/account_journal.py
+++ b/addons/account/project/report/account_journal.py
@@ -21,7 +21,7 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
#
# Use period and Journal for selection or resources
diff --git a/addons/account/project/report/analytic_balance.py b/addons/account/project/report/analytic_balance.py
index 42e36744cb8..2aa9f2c549e 100644
--- a/addons/account/project/report/analytic_balance.py
+++ b/addons/account/project/report/analytic_balance.py
@@ -20,7 +20,8 @@
##############################################################################
import time
-from report import report_sxw
+
+from openerp.report import report_sxw
class account_analytic_balance(report_sxw.rml_parse):
diff --git a/addons/account/project/report/analytic_journal.py b/addons/account/project/report/analytic_journal.py
index 88d56108550..e91de96940e 100644
--- a/addons/account/project/report/analytic_journal.py
+++ b/addons/account/project/report/analytic_journal.py
@@ -20,8 +20,9 @@
##############################################################################
import time
-import pooler
-from report import report_sxw
+
+from openerp import pooler
+from openerp.report import report_sxw
#
# Use period and Journal for selection or resources
diff --git a/addons/account/project/report/cost_ledger.py b/addons/account/project/report/cost_ledger.py
index 6ca17a7ac0a..04b8edeb166 100644
--- a/addons/account/project/report/cost_ledger.py
+++ b/addons/account/project/report/cost_ledger.py
@@ -19,9 +19,10 @@
#
##############################################################################
-import pooler
import time
-from report import report_sxw
+
+from openerp import pooler
+from openerp.report import report_sxw
class account_analytic_cost_ledger(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account/project/report/inverted_analytic_balance.py b/addons/account/project/report/inverted_analytic_balance.py
index 6ba8e724d35..829dd03df02 100644
--- a/addons/account/project/report/inverted_analytic_balance.py
+++ b/addons/account/project/report/inverted_analytic_balance.py
@@ -19,9 +19,10 @@
#
##############################################################################
-import pooler
import time
-from report import report_sxw
+
+from openerp import pooler
+from openerp.report import report_sxw
class account_inverted_analytic_balance(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account/project/report/quantity_cost_ledger.py b/addons/account/project/report/quantity_cost_ledger.py
index 4d874fe50ee..1fe77f6e878 100644
--- a/addons/account/project/report/quantity_cost_ledger.py
+++ b/addons/account/project/report/quantity_cost_ledger.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-import pooler
-from report import report_sxw
+from openerp import pooler
+from openerp.report import report_sxw
class account_analytic_quantity_cost_ledger(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account/project/wizard/account_analytic_balance_report.py b/addons/account/project/wizard/account_analytic_balance_report.py
index 81d325ee8f5..81d6c192962 100644
--- a/addons/account/project/wizard/account_analytic_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_balance_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_analytic_balance(osv.osv_memory):
_name = 'account.analytic.balance'
diff --git a/addons/account/project/wizard/account_analytic_chart.py b/addons/account/project/wizard/account_analytic_chart.py
index 92367e27da5..01c606d5f08 100644
--- a/addons/account/project/wizard/account_analytic_chart.py
+++ b/addons/account/project/wizard/account_analytic_chart.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_analytic_chart(osv.osv_memory):
_name = 'account.analytic.chart'
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
index 186d39c4859..fdb8eafb402 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_analytic_cost_ledger_journal_report(osv.osv_memory):
_name = 'account.analytic.cost.ledger.journal.report'
diff --git a/addons/account/project/wizard/account_analytic_cost_ledger_report.py b/addons/account/project/wizard/account_analytic_cost_ledger_report.py
index 246f02c20dc..1c74c61e31f 100644
--- a/addons/account/project/wizard/account_analytic_cost_ledger_report.py
+++ b/addons/account/project/wizard/account_analytic_cost_ledger_report.py
@@ -18,9 +18,10 @@
# along with this program. If not, see .
#
##############################################################################
+
import time
-from osv import osv, fields
+from openerp.osv import osv, fields
class account_analytic_cost_ledger(osv.osv_memory):
_name = 'account.analytic.cost.ledger'
diff --git a/addons/account/project/wizard/account_analytic_inverted_balance_report.py b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
index 95365716a22..10f97baf755 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_analytic_inverted_balance(osv.osv_memory):
_name = 'account.analytic.inverted.balance'
diff --git a/addons/account/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py
index 3d6bf0f5447..e70649cd406 100644
--- a/addons/account/project/wizard/account_analytic_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_journal_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_analytic_journal_report(osv.osv_memory):
_name = 'account.analytic.journal.report'
diff --git a/addons/account/project/wizard/project_account_analytic_line.py b/addons/account/project/wizard/project_account_analytic_line.py
index 54979d79b8a..c5a496527c1 100644
--- a/addons/account/project/wizard/project_account_analytic_line.py
+++ b/addons/account/project/wizard/project_account_analytic_line.py
@@ -18,8 +18,8 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class project_account_analytic_line(osv.osv_memory):
_name = "project.account.analytic.line"
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 2812fd409e6..897b8366b7a 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
from common_report_header import common_report_header
class aged_trial_report(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_analytic_entries_report.py b/addons/account/report/account_analytic_entries_report.py
index 02c1c508237..dad0dedc9fc 100644
--- a/addons/account/report/account_analytic_entries_report.py
+++ b/addons/account/report/account_analytic_entries_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
class analytic_entries_report(osv.osv):
_name = "analytic.entries.report"
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index fdda9cb11ce..2a445984b27 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -21,7 +21,7 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
from common_report_header import common_report_header
class account_balance(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_central_journal.py b/addons/account/report/account_central_journal.py
index ebb8012f5e7..8dae208a7a5 100644
--- a/addons/account/report/account_central_journal.py
+++ b/addons/account/report/account_central_journal.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
from common_report_header import common_report_header
#
# Use period and Journal for selection or resources
diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py
index 676f833eeaf..d53e6153981 100644
--- a/addons/account/report/account_entries_report.py
+++ b/addons/account/report/account_entries_report.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import tools
-from osv import fields,osv
-import decimal_precision as dp
+from openerp import tools
+from openerp.osv import fields,osv
+import openerp.addons.decimal_precision as dp
class account_entries_report(osv.osv):
_name = "account.entries.report"
diff --git a/addons/account/report/account_financial_report.py b/addons/account/report/account_financial_report.py
index 6e0c8b95e1a..3898158c457 100644
--- a/addons/account/report/account_financial_report.py
+++ b/addons/account/report/account_financial_report.py
@@ -20,9 +20,9 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
from common_report_header import common_report_header
-from tools.translate import _
+from openerp.tools.translate import _
class report_account_common(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_general_journal.py b/addons/account/report/account_general_journal.py
index 0ffa08b31ef..4f63411478c 100644
--- a/addons/account/report/account_general_journal.py
+++ b/addons/account/report/account_general_journal.py
@@ -21,7 +21,7 @@
import time
from common_report_header import common_report_header
-from report import report_sxw
+from openerp.report import report_sxw
class journal_print(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 38f2392f740..498cb1369a8 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -28,7 +28,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
from common_report_header import common_report_header
class general_ledger(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index a001b6b4f52..af6ae1eede7 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import tools
-import decimal_precision as dp
-from osv import fields,osv
+from openerp import tools
+import openerp.addons.decimal_precision as dp
+from openerp.osv import fields,osv
class account_invoice_report(osv.osv):
_name = "account.invoice.report"
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 45472fc7e45..769a8335f55 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -21,7 +21,7 @@
import time
from common_report_header import common_report_header
-from report import report_sxw
+from openerp.report import report_sxw
class journal_print(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py
index fcc112d9d81..53edbbe9685 100644
--- a/addons/account/report/account_partner_balance.py
+++ b/addons/account/report/account_partner_balance.py
@@ -21,8 +21,8 @@
import time
-from tools.translate import _
-from report import report_sxw
+from openerp.tools.translate import _
+from openerp.report import report_sxw
from common_report_header import common_report_header
class partner_balance(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index ca0515c9f08..f72e81fbc08 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -21,9 +21,9 @@
import time
import re
-from report import report_sxw
+from openerp.report import report_sxw
from common_report_header import common_report_header
-from tools.translate import _
+from openerp.tools.translate import _
class third_party_ledger(report_sxw.rml_parse, common_report_header):
diff --git a/addons/account/report/account_print_invoice.py b/addons/account/report/account_print_invoice.py
index 280bc0bc7a0..75680810254 100644
--- a/addons/account/report/account_print_invoice.py
+++ b/addons/account/report/account_print_invoice.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class account_invoice(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py
index 4ddedc102f5..68c1c35ef53 100644
--- a/addons/account/report/account_print_overdue.py
+++ b/addons/account/report/account_print_overdue.py
@@ -21,8 +21,8 @@
import time
-from report import report_sxw
-import pooler
+from openerp.report import report_sxw
+from openerp import pooler
class Overdue(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 076e598ac54..d6cc784c767 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -23,9 +23,9 @@ import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
-import pooler
-import tools
-from osv import fields,osv
+from openerp import pooler
+from openerp import tools
+from openerp.osv import fields,osv
def _code_get(self, cr, uid, context=None):
acc_type_obj = self.pool.get('account.account.type')
diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index cef1cf54af0..b3cbcb441bf 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -22,7 +22,7 @@
import time
from common_report_header import common_report_header
-from report import report_sxw
+from openerp.report import report_sxw
class tax_report(report_sxw.rml_parse, common_report_header):
_name = 'report.account.vat.declaration'
diff --git a/addons/account/report/account_treasury_report.py b/addons/account/report/account_treasury_report.py
index 40d9364981f..1ee411708c7 100644
--- a/addons/account/report/account_treasury_report.py
+++ b/addons/account/report/account_treasury_report.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import tools
-from osv import fields,osv
-import decimal_precision as dp
+from openerp import tools
+from openerp.osv import fields,osv
+import openerp.addons.decimal_precision as dp
class account_treasury_report(osv.osv):
_name = "account.treasury.report"
diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py
index c5719d98b96..cedc4ccf5c4 100644
--- a/addons/account/report/common_report_header.py
+++ b/addons/account/report/common_report_header.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import pooler
-from tools.translate import _
+from openerp import pooler
+from openerp.tools.translate import _
class common_report_header(object):
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 8f525795d1c..72d30c11cfd 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -25,9 +25,9 @@ from dateutil.relativedelta import relativedelta
from operator import itemgetter
from os.path import join as opj
-from tools.translate import _
-from osv import osv, fields
-import tools
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
+from openerp import tools
class account_config_settings(osv.osv_memory):
_name = 'account.config.settings'
diff --git a/addons/account/res_currency.py b/addons/account/res_currency.py
index 60bb6152a9b..9564b4e57c6 100644
--- a/addons/account/res_currency.py
+++ b/addons/account/res_currency.py
@@ -18,7 +18,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
"""Inherit res.currency to handle accounting date values when converting currencies"""
diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py
index b4355e79129..88d31b5b6c5 100644
--- a/addons/account/wizard/account_automatic_reconcile.py
+++ b/addons/account/wizard/account_automatic_reconcile.py
@@ -21,8 +21,8 @@
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_automatic_reconcile(osv.osv_memory):
_name = 'account.automatic.reconcile'
diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py
index d51df1e4d70..73fd52b3fcb 100644
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_change_currency(osv.osv_memory):
_name = 'account.change.currency'
diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py
index a9d3739103f..32b83a0a670 100644
--- a/addons/account/wizard/account_chart.py
+++ b/addons/account/wizard/account_chart.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_chart(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py
index 4f9d6abf099..dde07eb7034 100644
--- a/addons/account/wizard/account_financial_report.py
+++ b/addons/account/wizard/account_financial_report.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class accounting_report(osv.osv_memory):
_name = "accounting.report"
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index e11b4dcd34b..d4f7b3e6654 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_fiscalyear_close(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py
index f57684a1460..746f1c47976 100644
--- a/addons/account/wizard/account_fiscalyear_close_state.py
+++ b/addons/account/wizard/account_fiscalyear_close_state.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_fiscalyear_close_state(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 52c754b5394..533170cf4a4 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -21,9 +21,9 @@
import time
-from osv import fields, osv
-from tools.translate import _
-import netsvc
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import netsvc
class account_invoice_refund(osv.osv_memory):
diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py
index 7c7f6882b75..f79b4c046e3 100644
--- a/addons/account/wizard/account_invoice_state.py
+++ b/addons/account/wizard/account_invoice_state.py
@@ -19,10 +19,10 @@
#
##############################################################################
-from osv import osv
-from tools.translate import _
-import netsvc
-import pooler
+from openerp.osv import osv
+from openerp.tools.translate import _
+from openerp import netsvc
+from openerp import pooler
class account_invoice_confirm(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_journal_select.py b/addons/account/wizard/account_journal_select.py
index b91c195f6b3..7edd7923f4c 100644
--- a/addons/account/wizard/account_journal_select.py
+++ b/addons/account/wizard/account_journal_select.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class account_journal_select(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_move_bank_reconcile.py b/addons/account/wizard/account_move_bank_reconcile.py
index 2b29bf6b30d..283068ae693 100644
--- a/addons/account/wizard/account_move_bank_reconcile.py
+++ b/addons/account/wizard/account_move_bank_reconcile.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_move_bank_reconcile(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_move_line_reconcile_select.py b/addons/account/wizard/account_move_line_reconcile_select.py
index e23212c514c..76af8538e05 100644
--- a/addons/account/wizard/account_move_line_reconcile_select.py
+++ b/addons/account/wizard/account_move_line_reconcile_select.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_move_line_reconcile_select(osv.osv_memory):
_name = "account.move.line.reconcile.select"
diff --git a/addons/account/wizard/account_move_line_select.py b/addons/account/wizard/account_move_line_select.py
index a99750a36fe..b56621f2114 100644
--- a/addons/account/wizard/account_move_line_select.py
+++ b/addons/account/wizard/account_move_line_select.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class account_move_line_select(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_move_line_unreconcile_select.py b/addons/account/wizard/account_move_line_unreconcile_select.py
index 26421eb4c0c..f9009fc8199 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select.py
+++ b/addons/account/wizard/account_move_line_unreconcile_select.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_move_line_unreconcile_select(osv.osv_memory):
_name = "account.move.line.unreconcile.select"
diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
index 1b5622a589d..3b5d956d381 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_open_closed_fiscalyear(osv.osv_memory):
_name = "account.open.closed.fiscalyear"
diff --git a/addons/account/wizard/account_period_close.py b/addons/account/wizard/account_period_close.py
index 086485ac0f2..fad757c0ff9 100644
--- a/addons/account/wizard/account_period_close.py
+++ b/addons/account/wizard/account_period_close.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_period_close(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index 6f6c8f07844..81609249fd7 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -21,9 +21,9 @@
import time
-from osv import fields, osv
-from tools.translate import _
-import decimal_precision as dp
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
class account_move_line_reconcile(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_reconcile_partner_process.py b/addons/account/wizard/account_reconcile_partner_process.py
index 380d25001c7..1c317111888 100644
--- a/addons/account/wizard/account_reconcile_partner_process.py
+++ b/addons/account/wizard/account_reconcile_partner_process.py
@@ -21,7 +21,7 @@
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_partner_reconcile_process(osv.osv_memory):
_name = 'account.partner.reconcile.process'
diff --git a/addons/account/wizard/account_report_account_balance.py b/addons/account/wizard/account_report_account_balance.py
index 4e52066b49e..e883a59c102 100644
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_balance_report(osv.osv_memory):
_inherit = "account.common.account.report"
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index c4167322b90..1054e7fa285 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -22,8 +22,8 @@
import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_aged_trial_balance(osv.osv_memory):
_inherit = 'account.common.partner.report'
diff --git a/addons/account/wizard/account_report_central_journal.py b/addons/account/wizard/account_report_central_journal.py
index 046aec4690d..da8be6d4735 100644
--- a/addons/account/wizard/account_report_central_journal.py
+++ b/addons/account/wizard/account_report_central_journal.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_central_journal(osv.osv_memory):
_name = 'account.central.journal'
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 2c1448b5e6f..f5b465222f1 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -22,9 +22,9 @@
import time
from lxml import etree
-from osv import fields, osv
-from tools.translate import _
+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):
_name = "account.common.report"
diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py
index a27241a37ff..7cedf427386 100644
--- a/addons/account/wizard/account_report_common_account.py
+++ b/addons/account/wizard/account_report_common_account.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_common_account_report(osv.osv_memory):
_name = 'account.common.account.report'
diff --git a/addons/account/wizard/account_report_common_journal.py b/addons/account/wizard/account_report_common_journal.py
index ed0f03df5b5..609c2840ca6 100644
--- a/addons/account/wizard/account_report_common_journal.py
+++ b/addons/account/wizard/account_report_common_journal.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_common_journal_report(osv.osv_memory):
_name = 'account.common.journal.report'
diff --git a/addons/account/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py
index a2acdc4b988..9779005b0de 100644
--- a/addons/account/wizard/account_report_common_partner.py
+++ b/addons/account/wizard/account_report_common_partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_common_partner_report(osv.osv_memory):
_name = 'account.common.partner.report'
diff --git a/addons/account/wizard/account_report_general_journal.py b/addons/account/wizard/account_report_general_journal.py
index 631de5f1260..4a170a84db1 100644
--- a/addons/account/wizard/account_report_general_journal.py
+++ b/addons/account/wizard/account_report_general_journal.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_general_journal(osv.osv_memory):
_inherit = "account.common.journal.report"
diff --git a/addons/account/wizard/account_report_general_ledger.py b/addons/account/wizard/account_report_general_ledger.py
index 8078da372ca..a10ff624fee 100644
--- a/addons/account/wizard/account_report_general_ledger.py
+++ b/addons/account/wizard/account_report_general_ledger.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_report_general_ledger(osv.osv_memory):
_inherit = "account.common.account.report"
diff --git a/addons/account/wizard/account_report_partner_balance.py b/addons/account/wizard/account_report_partner_balance.py
index 80ee455456c..33a7a42072c 100644
--- a/addons/account/wizard/account_report_partner_balance.py
+++ b/addons/account/wizard/account_report_partner_balance.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_partner_balance(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index 60ac20a42ed..d1e6dd9809e 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_partner_ledger(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index 0ffbde3fa9e..b91fe04660a 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
from lxml import etree
class account_print_journal(osv.osv_memory):
diff --git a/addons/account/wizard/account_state_open.py b/addons/account/wizard/account_state_open.py
index 32795f0f5b7..b2cbdc4961b 100644
--- a/addons/account/wizard/account_state_open.py
+++ b/addons/account/wizard/account_state_open.py
@@ -18,10 +18,10 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
-import netsvc
-from tools.translate import _
+from openerp import netsvc
+from openerp.tools.translate import _
class account_state_open(osv.osv_memory):
_name = 'account.state.open'
diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
index 0dae5aa90a8..f5babc4fd87 100644
--- a/addons/account/wizard/account_subscription_generate.py
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -21,7 +21,7 @@
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_subscription_generate(osv.osv_memory):
diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py
index 16796a5d57c..84859e2077c 100644
--- a/addons/account/wizard/account_tax_chart.py
+++ b/addons/account/wizard/account_tax_chart.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_tax_chart(osv.osv_memory):
"""
diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
index 5494875cf26..ff592a329c7 100644
--- a/addons/account/wizard/account_unreconcile.py
+++ b/addons/account/wizard/account_unreconcile.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class account_unreconcile(osv.osv_memory):
_name = "account.unreconcile"
diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py
index 7ce73caba55..795284c8fef 100644
--- a/addons/account/wizard/account_use_model.py
+++ b/addons/account/wizard/account_use_model.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_use_model(osv.osv_memory):
diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index 1a53c9dfd53..faf7f8e2ccd 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -18,8 +18,8 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class validate_account_move(osv.osv_memory):
_name = "validate.account.move"
diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py
index 85fce5de000..a60a7906e28 100644
--- a/addons/account/wizard/account_vat.py
+++ b/addons/account/wizard/account_vat.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_vat_declaration(osv.osv_memory):
_name = 'account.vat.declaration'
diff --git a/addons/account/wizard/pos_box.py b/addons/account/wizard/pos_box.py
index b5d1cc37776..49178dfd3ea 100644
--- a/addons/account/wizard/pos_box.py
+++ b/addons/account/wizard/pos_box.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
-from osv import osv, fields
-import decimal_precision as dp
-from tools.translate import _
+from openerp.osv import fields, osv
+import openerp.addons.decimal_precision as dp
+from openerp.tools.translate import _
class CashBox(osv.osv_memory):
_register = False
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 466db63e61e..b6cbd1a459c 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -19,11 +19,12 @@
#
##############################################################################
-from osv import osv, fields
-from osv.orm import intersect, except_orm
-import tools.sql
-from tools.translate import _
-from decimal_precision import decimal_precision as dp
+from openerp.osv import osv, fields
+from openerp.osv.orm import intersect, except_orm
+import openerp.tools
+from openerp.tools.translate import _
+
+from openerp.addons.decimal_precision import decimal_precision as dp
class account_analytic_account(osv.osv):
@@ -518,7 +519,7 @@ class account_analytic_account_summary_user(osv.osv):
}
def init(self, cr):
- tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
+ openerp.tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
cr.execute('''CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (
with mu as
(select max(id) as max_user from res_users)
@@ -553,7 +554,7 @@ class account_analytic_account_summary_month(osv.osv):
}
def init(self, cr):
- tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_month')
+ openerp.tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_month')
cr.execute('CREATE VIEW account_analytic_analysis_summary_month AS (' \
'SELECT ' \
'(TO_NUMBER(TO_CHAR(d.month, \'YYYYMM\'), \'999999\') + (d.account_id * 1000000::bigint))::bigint AS id, ' \
diff --git a/addons/account_analytic_analysis/cron_account_analytic_account.py b/addons/account_analytic_analysis/cron_account_analytic_account.py
index 41d5467157a..6e2ce4a47b3 100644
--- a/addons/account_analytic_analysis/cron_account_analytic_account.py
+++ b/addons/account_analytic_analysis/cron_account_analytic_account.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python
-from osv import osv
from mako.template import Template
import time
try:
@@ -7,7 +6,8 @@ try:
except ImportError:
import StringIO
-import tools
+from openerp import tools
+from openerp.osv import osv
MAKO_TEMPLATE = u"""Hello ${user.name},
diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index 0b0894681b8..ae72c11225f 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/i18n/de.po
@@ -7,20 +7,20 @@ 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-12-06 21:29+0000\n"
+"PO-Revision-Date: 2012-12-17 21:42+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-07 04:35+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "No order to invoice, create"
-msgstr ""
+msgstr "Kein Auftrag abzurechnen, erstelle"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -30,7 +30,7 @@ msgstr "Gruppierung ..."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "To Invoice"
-msgstr "Abrechenbar"
+msgstr "Abrechnen"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -47,14 +47,12 @@ msgstr "Verträge in Bearbeitung"
msgid ""
"If invoice from the costs, this is the date of the latest work or cost that "
"have been invoiced."
-msgstr ""
-"Falls eine Berechnung auf Basis der Produktionskosten erfolgt, ist dieses "
-"das Datum der letzten Weiter - Berechnung."
+msgstr "Datum der letzten Weiterberechnung von Kosten"
#. module: account_analytic_analysis
#: field:account.analytic.account,last_worked_date:0
msgid "Date of Last Cost/Work"
-msgstr "vorheriger Arbeitstag"
+msgstr "Letzte Aufwandserfassung"
#. module: account_analytic_analysis
#: field:account.analytic.account,ca_to_invoice:0
@@ -167,8 +165,8 @@ msgid ""
"Number of time (hours/days) (from journal of type 'general') that can be "
"invoiced if you invoice based on analytic account."
msgstr ""
-"verrechenbare Zeiten (Stunden/Tage) vom Journal 'General', wenn die "
-"Verrechnung auf Analyse Konten beruht"
+"Abrechenbare Zeit (Stunden/Tage) vom Journaltyp 'Sonstige', wenn Abrechnung "
+"über die Kostenstelle erfolgt."
#. module: account_analytic_analysis
#: help:account.analytic.account,remaining_hours_to_invoice:0
@@ -178,7 +176,7 @@ msgstr "Berechnungsformel: Maximale Zeit - Abgerechnete Zeit"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Expected"
-msgstr "Geplant"
+msgstr "Erwartet"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -186,7 +184,7 @@ msgstr "Geplant"
#: field:account_analytic_analysis.summary.user,account_id:0
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
msgid "Analytic Account"
-msgstr "Analytisches Konto"
+msgstr "Kostenstelle"
#. module: account_analytic_analysis
#: help:account.analytic.account,theorical_margin:0
@@ -329,7 +327,7 @@ msgstr "Stundenzettel"
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
#, python-format
msgid "Sale Order Lines of %s"
-msgstr ""
+msgstr "Auftragszeilen von %s"
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -437,13 +435,13 @@ msgid ""
"Number of time (hours/days) that can be invoiced plus those that already "
"have been invoiced."
msgstr ""
-"Anzahl von Stunden oder Tagen, die verrechnet werden können, inklusiver der "
-"bereits verrechneten"
+"Anzahl von Stunden oder Tagen, die zur Abrechnung anstehen inklusive bereits "
+"abgerechneter Stunden"
#. module: account_analytic_analysis
#: field:account.analytic.account,revenue_per_hour:0
msgid "Revenue per Time (real)"
-msgstr "Erträge je Zeiteinheit (real)"
+msgstr "Umsatz pro Stunde"
#. module: account_analytic_analysis
#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue_all
diff --git a/addons/account_analytic_analysis/res_config.py b/addons/account_analytic_analysis/res_config.py
index 94fe769fdd4..90e3cff01fb 100644
--- a/addons/account_analytic_analysis/res_config.py
+++ b/addons/account_analytic_analysis/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class sale_configuration(osv.osv_memory):
_inherit = 'sale.config.settings'
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index 4fe654adffc..0fe3e9f2c14 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -21,7 +21,7 @@
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_analytic_default(osv.osv):
_name = "account.analytic.default"
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 91caa6936bc..99cb0c4ebc4 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -22,9 +22,9 @@
import time
from lxml import etree
-from osv import fields, osv
-import tools
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import tools
+from openerp.tools.translate import _
class one2many_mod2(fields.one2many):
def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
diff --git a/addons/account_analytic_plans/i18n/pt.po b/addons/account_analytic_plans/i18n/pt.po
index e828d276458..44b2aa8d14c 100644
--- a/addons/account_analytic_plans/i18n/pt.po
+++ b/addons/account_analytic_plans/i18n/pt.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-13 17:11+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2012-12-17 12:28+0000\n"
+"Last-Translator: Rui Franco (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-14 05:38+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,account4_ids:0
@@ -143,7 +143,7 @@ msgstr "Identificação da Conta 3"
#: view:account.crossovered.analytic:0
#: view:analytic.plan.create.model:0
msgid "or"
-msgstr ""
+msgstr "ou"
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
@@ -316,7 +316,7 @@ msgstr "Diário analítico"
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
#, python-format
msgid "Please put a name and a code before saving the model."
-msgstr ""
+msgstr "Por favor, indique um nome e um código antes de gravar o modelo."
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@@ -348,7 +348,7 @@ msgstr "Diário"
#: 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 "Tem de definir um diário analítico para o diário '%s'."
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:342
@@ -403,7 +403,7 @@ msgstr "Distribuição analítica"
#: code:addons/account_analytic_plans/account_analytic_plans.py:221
#, python-format
msgid "A model with this name and code already exists."
-msgstr ""
+msgstr "Já existe um modelo com estes nome e código."
#. module: account_analytic_plans
#: help:account.analytic.plan.line,root_analytic_id:0
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index aa3651ba37c..b1a8f965d6b 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -21,7 +21,7 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
class crossovered_analytic(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
index a68321c334a..640443c8a0b 100644
--- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
+++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py
@@ -21,8 +21,8 @@
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_crossovered_analytic(osv.osv_memory):
_name = "account.crossovered.analytic"
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
index a8ac8401569..7038a6f1025 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv
-from tools.translate import _
+from openerp.osv import osv
+from openerp.tools.translate import _
class analytic_plan_create_model(osv.osv_memory):
_name = "analytic.plan.create.model"
diff --git a/addons/account_anglo_saxon/i18n/de.po b/addons/account_anglo_saxon/i18n/de.po
index 87fa25c52c0..3ac4cef9d35 100644
--- a/addons/account_anglo_saxon/i18n/de.po
+++ b/addons/account_anglo_saxon/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-01-13 19:22+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp \n"
+"PO-Revision-Date: 2012-12-17 22:10+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:45+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_product_category
@@ -24,7 +25,7 @@ msgstr "Produkt Kategorie"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
msgid "Invoice Line"
-msgstr "Rechnungspositionen"
+msgstr "Rechnungszeile"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_purchase_order
@@ -50,7 +51,7 @@ msgstr "Rechnung"
#. module: account_anglo_saxon
#: model:ir.model,name:account_anglo_saxon.model_stock_picking
msgid "Picking List"
-msgstr "Pack Auftrag"
+msgstr "Pickliste"
#. module: account_anglo_saxon
#: help:product.category,property_account_creditor_price_difference_categ:0
diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index 26271015b7e..52d7dde089d 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -21,7 +21,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class account_invoice_line(osv.osv):
_inherit = "account.invoice.line"
diff --git a/addons/account_anglo_saxon/product.py b/addons/account_anglo_saxon/product.py
index 87ca24753d6..443642d048b 100644
--- a/addons/account_anglo_saxon/product.py
+++ b/addons/account_anglo_saxon/product.py
@@ -18,7 +18,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class product_category(osv.osv):
_inherit = "product.category"
diff --git a/addons/account_anglo_saxon/purchase.py b/addons/account_anglo_saxon/purchase.py
index 30d196a84ec..959f8b7eb49 100644
--- a/addons/account_anglo_saxon/purchase.py
+++ b/addons/account_anglo_saxon/purchase.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class purchase_order(osv.osv):
_name = "purchase.order"
diff --git a/addons/account_anglo_saxon/stock.py b/addons/account_anglo_saxon/stock.py
index 9ddfab86a94..6243fd285d0 100644
--- a/addons/account_anglo_saxon/stock.py
+++ b/addons/account_anglo_saxon/stock.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
#----------------------------------------------------------
# Stock Picking
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index 3190801764b..b7330352b12 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -23,8 +23,8 @@ import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from osv import osv, fields
-import decimal_precision as dp
+from openerp.osv import fields, osv
+import openerp.addons.decimal_precision as dp
class account_asset_category(osv.osv):
_name = 'account.asset.category'
diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py
index 4b38834bdc3..7e2f24f0d0a 100644
--- a/addons/account_asset/account_asset_invoice.py
+++ b/addons/account_asset/account_asset_invoice.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_invoice(osv.osv):
diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po
index daf6bdb23fd..3040660b743 100755
--- a/addons/account_asset/i18n/de.po
+++ b/addons/account_asset/i18n/de.po
@@ -8,15 +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-12-06 23:48+0000\n"
+"PO-Revision-Date: 2012-12-17 22:26+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-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: account_asset
#: view:account.asset.asset:0
@@ -43,12 +43,12 @@ msgstr "Abschreibung Aufwandskonto"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Group By..."
-msgstr "Gruppiere nach..."
+msgstr "Gruppierung..."
#. module: account_asset
#: field:asset.asset.report,gross_value:0
msgid "Gross Amount"
-msgstr "Brutto-Betrag"
+msgstr "Brutto Betrag"
#. module: account_asset
#: view:account.asset.asset:0
@@ -275,7 +275,7 @@ msgstr "Analytische Information"
#. module: account_asset
#: field:account.asset.category,account_analytic_id:0
msgid "Analytic account"
-msgstr "Analytisches Konto"
+msgstr "Kostenstelle"
#. module: account_asset
#: field:account.asset.asset,method:0
@@ -448,9 +448,9 @@ msgid ""
"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 "
+"der Anlage wird diese 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 "
+"sind. Nach Verbuchung der letzen Abschreibung wird die Anlage automatisch "
"geschlossen."
#. module: account_asset
@@ -468,7 +468,7 @@ msgstr "Partner"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Posted depreciation lines"
-msgstr "verbuchte Abschreibungen"
+msgstr "Verbuchte Abschreibungen"
#. module: account_asset
#: field:account.asset.asset,child_ids:0
diff --git a/addons/account_asset/i18n/pt.po b/addons/account_asset/i18n/pt.po
index 4072bf34f2b..25fe1ae82fe 100755
--- a/addons/account_asset/i18n/pt.po
+++ b/addons/account_asset/i18n/pt.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-11 15:47+0000\n"
+"PO-Revision-Date: 2012-12-17 12:46+0000\n"
"Last-Translator: Rui Franco (multibase.pt) \n"
"Language-Team: 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-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: account_asset
#: view:account.asset.asset:0
@@ -452,7 +452,7 @@ msgstr ""
#: field:account.asset.asset,state:0
#: field:asset.asset.report,state:0
msgid "Status"
-msgstr ""
+msgstr "Estado"
#. module: account_asset
#: field:account.asset.asset,partner_id:0
diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py
index 583e5534613..1554880ac38 100644
--- a/addons/account_asset/report/account_asset_report.py
+++ b/addons/account_asset/report/account_asset_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields, osv
+from openerp import tools
+from openerp.osv import fields, osv
class asset_asset_report(osv.osv):
_name = "asset.asset.report"
diff --git a/addons/account_asset/wizard/account_asset_change_duration.py b/addons/account_asset/wizard/account_asset_change_duration.py
index 227f4e53229..19782c76367 100755
--- a/addons/account_asset/wizard/account_asset_change_duration.py
+++ b/addons/account_asset/wizard/account_asset_change_duration.py
@@ -21,7 +21,7 @@
import time
from lxml import etree
-from osv import osv, fields
+from openerp.osv import fields, osv
class asset_modify(osv.osv_memory):
_name = 'asset.modify'
diff --git a/addons/account_asset/wizard/wizard_asset_compute.py b/addons/account_asset/wizard/wizard_asset_compute.py
index 4492f08c6e5..cc870329840 100755
--- a/addons/account_asset/wizard/wizard_asset_compute.py
+++ b/addons/account_asset/wizard/wizard_asset_compute.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class asset_depreciation_confirmation_wizard(osv.osv_memory):
_name = "asset.depreciation.confirmation.wizard"
diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index 3d097d3c757..ee2988bab6f 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -21,9 +21,9 @@
##############################################################################
import time
-from osv import osv, fields
-import decimal_precision as dp
-from tools.translate import _
+from openerp.osv import fields, osv
+import openerp.addons.decimal_precision as dp
+from openerp.tools.translate import _
class account_bank_statement(osv.osv):
_inherit = 'account.bank.statement'
diff --git a/addons/account_bank_statement_extensions/i18n/it.po b/addons/account_bank_statement_extensions/i18n/it.po
index 28fa9ddf45a..8aee2882725 100644
--- a/addons/account_bank_statement_extensions/i18n/it.po
+++ b/addons/account_bank_statement_extensions/i18n/it.po
@@ -8,13 +8,13 @@ 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-16 23:27+0000\n"
-"Last-Translator: Sergio Corato \n"
+"PO-Revision-Date: 2012-12-17 07:42+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet \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-17 04:47+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: account_bank_statement_extensions
@@ -319,7 +319,7 @@ msgstr "Riga Estratto Conto"
#. module: account_bank_statement_extensions
#: sql_constraint:account.bank.statement.line.global:0
msgid "The code must be unique !"
-msgstr "Il codice deve essere univoco!"
+msgstr "Il codice deve essere unico!"
#. module: account_bank_statement_extensions
#: field:account.bank.statement.line.global,bank_statement_line_ids:0
@@ -337,7 +337,7 @@ msgstr "Attenzione!"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line.global:0
msgid "Child Batch Payments"
-msgstr ""
+msgstr "Pagamenti batch collegati"
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
diff --git a/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py b/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py
index 5dcaafe4845..9f28b083603 100644
--- a/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py
+++ b/addons/account_bank_statement_extensions/report/bank_statement_balance_report.py
@@ -21,8 +21,8 @@
##############################################################################
import time
-from report import report_sxw
-import pooler
+from openerp.report import report_sxw
+from openerp import pooler
import logging
_logger = logging.getLogger(__name__)
diff --git a/addons/account_bank_statement_extensions/res_partner_bank.py b/addons/account_bank_statement_extensions/res_partner_bank.py
index de7c061de76..f866634a08c 100644
--- a/addons/account_bank_statement_extensions/res_partner_bank.py
+++ b/addons/account_bank_statement_extensions/res_partner_bank.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class res_partner_bank(osv.osv):
_inherit = 'res.partner.bank'
diff --git a/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py b/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py
index 40d0be76d10..46d71354d4b 100644
--- a/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py
+++ b/addons/account_bank_statement_extensions/wizard/cancel_statement_line.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class cancel_statement_line(osv.osv_memory):
_name = 'cancel.statement.line'
diff --git a/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py b/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py
index 20b57708be2..3a887a52441 100644
--- a/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py
+++ b/addons/account_bank_statement_extensions/wizard/confirm_statement_line.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class confirm_statement_line(osv.osv_memory):
_name = 'confirm.statement.line'
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index 884177662e5..a88c468fff1 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -21,10 +21,10 @@
import datetime
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
-import decimal_precision as dp
+import openerp.addons.decimal_precision as dp
def strToDate(dt):
dt_date=datetime.date(int(dt[0:4]),int(dt[5:7]),int(dt[8:10]))
diff --git a/addons/account_budget/i18n/pt.po b/addons/account_budget/i18n/pt.po
index 64070c0ab25..4e3f88fc3d7 100644
--- a/addons/account_budget/i18n/pt.po
+++ b/addons/account_budget/i18n/pt.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-11 15:30+0000\n"
+"PO-Revision-Date: 2012-12-17 12:54+0000\n"
"Last-Translator: Rui Franco (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-12 04:40+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: account_budget
#: view:account.budget.analytic:0
@@ -367,6 +367,24 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Um orçamento é uma previsão dos custos e/ou ganhos da sua "
+"empresa\n"
+" esperados num determinado período. Um orçamento é definido "
+"com\n"
+" contas financeiras e/ou analíticas (que representem "
+"projetos, departamentos,\n"
+" categorias de produtos, etc.).\n"
+"
\n"
+" Ao manter registo das despesas, está-se menos sujeito a "
+"gastos exagerados e\n"
+" mais perto de alcançar os objetivos financeiros "
+"estabelecidos. Crie um orçamento\n"
+" indicando o lucro esperado por conta analítica e monitorize "
+"a sua evolução com\n"
+" base nos ganhos conseguidos no periodo.\n"
+"
\n"
+" "
#. module: account_budget
#: report:account.budget:0
diff --git a/addons/account_budget/report/analytic_account_budget_report.py b/addons/account_budget/report/analytic_account_budget_report.py
index e29af98b6a3..eed8ded213f 100644
--- a/addons/account_budget/report/analytic_account_budget_report.py
+++ b/addons/account_budget/report/analytic_account_budget_report.py
@@ -22,8 +22,8 @@
import time
import datetime
-import pooler
-from report import report_sxw
+from openerp import pooler
+from openerp.report import report_sxw
class analytic_account_budget_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py
index c7d4ba58f68..f00eb8a3713 100644
--- a/addons/account_budget/report/budget_report.py
+++ b/addons/account_budget/report/budget_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
tot = {}
diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py
index 9f2f59fe715..4a3b632a8de 100644
--- a/addons/account_budget/report/crossovered_budget_report.py
+++ b/addons/account_budget/report/crossovered_budget_report.py
@@ -22,10 +22,10 @@
import time
import datetime
-import pooler
-from report import report_sxw
+from openerp import pooler
+from openerp.report import report_sxw
import operator
-import osv
+from openerp import osv
class budget_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account_budget/wizard/account_budget_analytic.py b/addons/account_budget/wizard/account_budget_analytic.py
index 6397ee87c76..0cdb7504f75 100644
--- a/addons/account_budget/wizard/account_budget_analytic.py
+++ b/addons/account_budget/wizard/account_budget_analytic.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_budget_analytic(osv.osv_memory):
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report.py b/addons/account_budget/wizard/account_budget_crossovered_report.py
index e120bc47caa..97fc43c8e9d 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_budget_crossvered_report(osv.osv_memory):
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report.py b/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
index a5eeeb32ff9..f42c39ec6ac 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_budget_crossvered_summary_report(osv.osv_memory):
"""
diff --git a/addons/account_budget/wizard/account_budget_report.py b/addons/account_budget/wizard/account_budget_report.py
index 6ef22c649e9..5db6c68d508 100644
--- a/addons/account_budget/wizard/account_budget_report.py
+++ b/addons/account_budget/wizard/account_budget_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_budget_report(osv.osv_memory):
diff --git a/addons/account_check_writing/account.py b/addons/account_check_writing/account.py
index 4dbbc245033..1600898fc3a 100644
--- a/addons/account_check_writing/account.py
+++ b/addons/account_check_writing/account.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv,fields
+from openerp.osv import osv,fields
class account_journal(osv.osv):
_inherit = "account.journal"
diff --git a/addons/account_check_writing/account_voucher.py b/addons/account_check_writing/account_voucher.py
index aa0a29d7845..7a5d12f5cff 100644
--- a/addons/account_check_writing/account_voucher.py
+++ b/addons/account_check_writing/account_voucher.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv,fields
-from tools.translate import _
-from tools.amount_to_text_en import amount_to_text
+from openerp.osv import osv,fields
+from openerp.tools.translate import _
+from openerp.tools.amount_to_text_en import amount_to_text
from lxml import etree
class account_voucher(osv.osv):
diff --git a/addons/account_check_writing/report/check_print.py b/addons/account_check_writing/report/check_print.py
index fd52c96b9aa..57360025623 100644
--- a/addons/account_check_writing/report/check_print.py
+++ b/addons/account_check_writing/report/check_print.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from report import report_sxw
-from tools import amount_to_text_en
+from openerp.report import report_sxw
+from openerp.tools import amount_to_text_en
class report_print_check(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/account_check_writing/wizard/account_check_batch_printing.py b/addons/account_check_writing/wizard/account_check_batch_printing.py
index 76489dee901..afeb5de6445 100644
--- a/addons/account_check_writing/wizard/account_check_batch_printing.py
+++ b/addons/account_check_writing/wizard/account_check_batch_printing.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from tools.translate import _
+from openerp.tools.translate import _
-from osv import fields, osv
+from openerp.osv import fields, osv
class account_check_write(osv.osv_memory):
_name = 'account.check.write'
diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py
index 17a09d51e6e..6587fbfd9d9 100644
--- a/addons/account_followup/account_followup.py
+++ b/addons/account_followup/account_followup.py
@@ -19,10 +19,10 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
from lxml import etree
-from tools.translate import _
+from openerp.tools.translate import _
class followup(osv.osv):
_name = 'account_followup.followup'
@@ -113,66 +113,6 @@ class account_move_line(osv.osv):
}
-
-class email_template(osv.osv):
- _inherit = 'email.template'
-
- def _get_followup_table_html(self, cr, uid, res_id, context=None):
- '''
- Build the html tables to be included in emails send to partners, when reminding them their
- overdue invoices.
-
- :param res_id: ID of the partner for whom we are building the tables
- :rtype: string
- '''
- from report import account_followup_print
-
- partner = self.pool.get('res.partner').browse(cr, uid, res_id, context=context)
- followup_table = ''
- if partner.unreconciled_aml_ids:
- company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
- current_date = fields.date.context_today(cr, uid, context)
- rml_parse = account_followup_print.report_rappel(cr, uid, "followup_rml_parser")
- final_res = rml_parse._lines_get_with_partner(partner, company.id)
-
- for currency_dict in final_res:
- currency = currency_dict.get('line', [{'currency_id': company.currency_id}])[0]['currency_id']
- 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 <= current_date and aml['balance'] > 0:
- strbegin = "
''' % (total)
- return followup_table
-
-
- def render_template(self, cr, uid, template, model, res_id, context=None):
- if model == 'res.partner' and context.get('followup'):
- context['followup_table'] = self._get_followup_table_html(cr, uid, res_id, context=context)
- # Adds current_date to the context. That way it can be used to put
- # the account move lines in bold that are overdue in the email
- context['current_date'] = fields.date.context_today(cr, uid, context)
- return super(email_template, self).render_template(cr, uid, template, model, res_id, context=context)
-
class res_partner(osv.osv):
def fields_view_get(self, cr, uid, view_id=None, view_type=None, context=None, toolbar=False, submenu=False):
@@ -289,6 +229,52 @@ class res_partner(osv.osv):
'payment_next_action': payment_next_action}, context=ctx)
return unknown_mails
+ def get_followup_table_html(self, cr, uid, ids, context=None):
+ """ Build the html tables to be included in emails send to partners,
+ when reminding them their overdue invoices.
+ :param ids: [id] of the partner for whom we are building the tables
+ :rtype: string
+ """
+ from report import account_followup_print
+
+ assert len(ids) == 1
+ partner = self.browse(cr, uid, ids[0], context=context)
+ followup_table = ''
+ if partner.unreconciled_aml_ids:
+ company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
+ current_date = fields.date.context_today(cr, uid, context)
+ rml_parse = account_followup_print.report_rappel(cr, uid, "followup_rml_parser")
+ final_res = rml_parse._lines_get_with_partner(partner, company.id)
+
+ for currency_dict in final_res:
+ currency = currency_dict.get('line', [{'currency_id': company.currency_id}])[0]['currency_id']
+ 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 <= current_date and aml['balance'] > 0:
+ strbegin = "
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.
@@ -28,13 +28,13 @@ contact our accounting department.
Best Regards,
-
-
-
-
+
+ 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}
+ ${user.email or ''}
+ ${user.company_id.name} Payment Reminder
+ ${object.email}
+ ${object.lang}
-
Dear ${object.name | h},
+
Dear ${object.name},
- We are disappointed to see that despite sending a reminder, that your account is now seriously overdue.
+ 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.
@@ -71,31 +69,32 @@ Best Regards,
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
@@ -107,12 +106,12 @@ In case of any queries concerning this matter, do not hesitate to contact our ac
Best Regards,
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.
@@ -144,11 +142,11 @@ contact our accounting department.
Best Regards,
-${user.name | h}
+${user.name}
-${ctx.get('followup_table','')}
+${object.get_followup_table_html() | safe}
@@ -174,7 +172,7 @@ Would your payment have been carried out after this mail was sent, please ignore
Best Regards,
-
+
@@ -198,8 +196,9 @@ If there is a problem with paying invoice that we are not aware of, do not hesit
Details of due payments is printed below.
Best Regards,
-
+
+
Call the customer on the phone3
@@ -221,7 +220,7 @@ I trust that this action will prove unnecessary and details of due payments is p
In case of any queries concerning this matter, do not hesitate to contact our accounting department.
Best Regards,
-
+
diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po
index 59f09101eb9..d61eae1c749 100644
--- a/addons/account_followup/i18n/de.po
+++ b/addons/account_followup/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:02+0000\n"
-"PO-Revision-Date: 2012-12-08 09:41+0000\n"
+"PO-Revision-Date: 2012-12-17 21:46+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-09 04:39+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: account_followup
#: view:account_followup.followup.line:0
@@ -1749,7 +1749,7 @@ msgstr ""
#: code:addons/account_followup/wizard/account_followup_print.py:166
#, python-format
msgid "Follow-up letter of "
-msgstr ""
+msgstr "Zahlungserinnerung für "
#. module: account_followup
#: view:res.partner:0
@@ -1788,6 +1788,9 @@ msgid ""
"the reminder. Could be negative if you want to send a polite alert "
"beforehand."
msgstr ""
+"Die Anzahl der Tage nach Fälligkeit der Rechnung vor dem Senden der "
+"Erinnerung. Könnte auch negativ sein, wenn Sie eine höfliche Warnung vorab "
+"senden möchten."
#. module: account_followup
#: help:res.partner,latest_followup_date:0
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index 942cda2f0e5..d537cf5455a 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/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-13 15:48+0000\n"
+"PO-Revision-Date: 2012-12-17 21:11+0000\n"
"Last-Translator: Velimir Valjetic \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-14 05:36+0000\n"
-"X-Generator: Launchpad (build 16369)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: account_followup
#: view:account_followup.followup.line:0
@@ -227,7 +227,7 @@ msgstr "Iznos"
#. module: account_followup
#: view:res.partner:0
msgid "No Responsible"
-msgstr "Nije odgovorna osoba"
+msgstr "Nema odgovorne osobe"
#. module: account_followup
#: view:account_followup.stat.by.partner:0
@@ -391,7 +391,7 @@ msgstr " bit će poslano"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid ": User's Company Name"
-msgstr ""
+msgstr ": Ime tvrtke korisnika"
#. module: account_followup
#: view:account_followup.followup.line:0
diff --git a/addons/account_followup/i18n/it.po b/addons/account_followup/i18n/it.po
index 379ec171cba..682ea089bc7 100644
--- a/addons/account_followup/i18n/it.po
+++ b/addons/account_followup/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-16 23:52+0000\n"
+"PO-Revision-Date: 2012-12-17 22:31+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-17 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: account_followup
@@ -202,17 +202,17 @@ msgstr "Passi Solleciti di Pagamento"
#. module: account_followup
#: field:account_followup.print,email_body:0
msgid "Email Body"
-msgstr ""
+msgstr "Corpo Mail"
#. module: account_followup
#: help:res.partner,payment_responsible_id:0
msgid "Responsible for making sure the action happens."
-msgstr ""
+msgstr "Responsabile verifica esecuzione attività."
#. module: account_followup
#: view:res.partner:0
msgid "Overdue amount"
-msgstr ""
+msgstr "Importo scaduto"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
@@ -227,7 +227,7 @@ msgstr "Importo"
#. module: account_followup
#: view:res.partner:0
msgid "No Responsible"
-msgstr ""
+msgstr "Nessun Responsabile"
#. module: account_followup
#: view:account_followup.stat.by.partner:0
@@ -242,12 +242,12 @@ msgstr "Totale debiti"
#. module: account_followup
#: field:res.partner,payment_next_action:0
msgid "Next Action"
-msgstr ""
+msgstr "Prossima Azione"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid ": Partner Name"
-msgstr ""
+msgstr ": Nome del Partner"
#. module: account_followup
#: view:account_followup.followup:0
@@ -282,7 +282,7 @@ msgstr "Data:"
#. module: account_followup
#: view:res.partner:0
msgid "I am responsible"
-msgstr ""
+msgstr "Io sono responsabile"
#. module: account_followup
#: sql_constraint:account_followup.followup:0
@@ -310,11 +310,27 @@ msgid ""
"Best Regards,\n"
" "
msgstr ""
+"\n"
+"Egregio %(partner_name)s,\n"
+"\n"
+"Nonostante vari promemoria, il Vs. debito risulta ancora impagato.\n"
+"\n"
+"A meno che il pagamento completo sia eseguito nei prossimi 8 giorni, "
+"verranno attivate le azioni legali opportune senza altro avviso.\n"
+"\n"
+"Nella speranza che tali azioni non siano necessarie, troverete in calce il "
+"saldo di quanto dovuto.\n"
+"\n"
+"Per ogni dettaglio in merito a quanto in oggetto, non esitate a contattare "
+"il ns. ufficio amministrativo al (+39).xxx.xxx.xxx.\n"
+"\n"
+"Cordiali saluti,\n"
+" "
#. module: account_followup
#: help:account_followup.followup.line,send_letter:0
msgid "When processing, it will print a letter"
-msgstr ""
+msgstr "Se eseguito, verrà stampata una lettera"
#. module: account_followup
#: view:account_followup.stat:0
@@ -324,12 +340,12 @@ msgstr "Non Contenzioso"
#. module: account_followup
#: view:res.partner:0
msgid "Without responsible"
-msgstr ""
+msgstr "Senza responsabile"
#. module: account_followup
#: view:account_followup.print:0
msgid "Send emails and generate letters"
-msgstr ""
+msgstr "Invia email e genera lettere"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_customer_followup
@@ -339,7 +355,7 @@ msgstr "Solleciti di Pagamento Manuali"
#. 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
@@ -354,7 +370,7 @@ msgstr "Statistiche Solleciti di Pagamento"
#. module: account_followup
#: view:res.partner:0
msgid "Send Overdue Email"
-msgstr ""
+msgstr "Invia Email Pagamenti in Ritardo"
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_followup_line
@@ -372,18 +388,18 @@ msgstr ""
#: code:addons/account_followup/wizard/account_followup_print.py:166
#, python-format
msgid " will be sent"
-msgstr ""
+msgstr " saranno spediti"
#. module: account_followup
#: view:account_followup.followup.line:0
msgid ": User's Company Name"
-msgstr ""
+msgstr ": Nome Utente Azienda"
#. module: account_followup
#: view:account_followup.followup.line:0
#: field:account_followup.followup.line,send_letter:0
msgid "Send a Letter"
-msgstr ""
+msgstr "Invia Lettera"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
@@ -393,13 +409,13 @@ msgstr "Solleciti di Pagamento"
#. module: account_followup
#: field:account_followup.followup.line,delay:0
msgid "Due Days"
-msgstr ""
+msgstr "Giorni di Ritardo"
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:155
#, python-format
msgid "Nobody"
-msgstr ""
+msgstr "Nessuno"
#. module: account_followup
#: field:account.move.line,followup_line_id:0
@@ -431,7 +447,7 @@ msgstr "Li."
#. module: account_followup
#: field:account_followup.print,email_conf:0
msgid "Send Email Confirmation"
-msgstr ""
+msgstr "Invia Email di Conferma"
#. module: account_followup
#: view:res.partner:0
@@ -507,7 +523,7 @@ msgstr ""
#. module: account_followup
#: help:account_followup.followup.line,send_email:0
msgid "When processing, it will send an email"
-msgstr ""
+msgstr "Se eseguito, verrà inviata una mail"
#. module: account_followup
#: view:account_followup.stat.by.partner:0
@@ -547,7 +563,7 @@ msgstr ""
#. 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 "Risultati dall'invio di diverse lettere e email"
#. module: account_followup
#: constraint:account_followup.followup.line:0
@@ -582,7 +598,7 @@ msgstr ""
#. module: account_followup
#: model:ir.ui.menu,name:account_followup.account_followup_print_menu
msgid "Send Letters and Emails"
-msgstr ""
+msgstr "Invio Lettere e Email"
#. module: account_followup
#: view:account_followup.followup:0
@@ -598,7 +614,7 @@ msgstr ""
#: code:addons/account_followup/wizard/account_followup_print.py:240
#, python-format
msgid "Send Letters and Emails: Actions Summary"
-msgstr ""
+msgstr "Invio Lettere e Email: Resoconto Azioni"
#. module: account_followup
#: view:account_followup.print:0
@@ -642,7 +658,7 @@ msgstr "Data Invio Sollecito di Pagamento"
#. module: account_followup
#: field:res.partner,payment_responsible_id:0
msgid "Follow-up Responsible"
-msgstr "Responsabile Sollecito di Pagamento"
+msgstr "Responsabile Gestione Crediti"
#. module: account_followup
#: report:account_followup.followup.print:0
@@ -763,7 +779,7 @@ msgstr "Riepilogo"
#: view:account_followup.followup.line:0
#: field:account_followup.followup.line,send_email:0
msgid "Send an Email"
-msgstr ""
+msgstr "Invia una Email"
#. module: account_followup
#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -1129,6 +1145,8 @@ msgid ""
"If not specified by the latest follow-up level, it will send from the "
"default follow-up of overdue invoices template"
msgstr ""
+"Se non specificato dall'ultimo livello di sollecito di pagamento, verrà "
+"inviato dal livello di default di sollecito del modello di fatture scadute"
#. module: account_followup
#: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable
@@ -1160,6 +1178,9 @@ msgid ""
"This action will send follow-up emails, print the letters and\n"
" set the manual actions per customers."
msgstr ""
+"Questa azione invierà email di sollecito di pagamento, stamperà le lettere "
+"e\n"
+" imposterà le azioni manuali per i clienti."
#. module: account_followup
#: help:account_followup.print,partner_lang:0
@@ -1337,7 +1358,7 @@ msgstr ""
#. module: account_followup
#: view:account_followup.print:0
msgid "Send follow-ups"
-msgstr "Spedizione solleciti di pagamento"
+msgstr "Invia solleciti di pagamento"
#. module: account_followup
#: view:account.move.line:0
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index f101aeaa369..0343fe023f9 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -20,9 +20,10 @@
##############################################################################
import time
+from collections import defaultdict
-import pooler
-from report import report_sxw
+from openerp import pooler
+from openerp.report import report_sxw
class report_rappel(report_sxw.rml_parse):
_name = "account_followup.report.rappel"
@@ -50,36 +51,30 @@ class report_rappel(report_sxw.rml_parse):
def _lines_get_with_partner(self, partner, company_id):
pool = pooler.get_pool(self.cr.dbname)
moveline_obj = pool.get('account.move.line')
- company_obj = pool.get('res.company')
- obj_currency = pool.get('res.currency')
- movelines = moveline_obj.search(self.cr, self.uid,
- [('partner_id', '=', partner.id),
- ('account_id.type', '=', 'receivable'),
- ('reconcile_id', '=', False), ('state', '<>', 'draft'),('company_id','=', company_id)])
- movelines = moveline_obj.browse(self.cr, self.uid, movelines)
- base_currency = movelines[0].company_id.currency_id
- final_res = []
- line_cur = {base_currency.id: {'line': []}}
+ moveline_ids = moveline_obj.search(self.cr, self.uid, [
+ ('partner_id', '=', partner.id),
+ ('account_id.type', '=', 'receivable'),
+ ('reconcile_id', '=', False),
+ ('state', '!=', 'draft'),
+ ('company_id', '=', company_id),
+ ])
- for line in movelines:
- if line.currency_id and (not line.currency_id.id in line_cur):
- line_cur[line.currency_id.id] = {'line': []}
+ # lines_per_currency = {currency: [line data, ...], ...}
+ lines_per_currency = defaultdict(list)
+ for line in moveline_obj.browse(self.cr, self.uid, moveline_ids):
currency = line.currency_id or line.company_id.currency_id
line_data = {
- 'name': line.move_id.name,
- 'ref': line.ref,
- 'date':line.date,
- 'date_maturity': line.date_maturity,
- 'balance': currency.id <> line.company_id.currency_id.id and line.amount_currency or (line.debit - line.credit),
- 'blocked': line.blocked,
- 'currency_id': currency,
- }
- line_cur[currency.id]['line'].append(line_data)
+ 'name': line.move_id.name,
+ 'ref': line.ref,
+ 'date': line.date,
+ 'date_maturity': line.date_maturity,
+ 'balance': line.amount_currency if currency != line.company_id.currency_id else line.debit - line.credit,
+ 'blocked': line.blocked,
+ 'currency_id': currency,
+ }
+ lines_per_currency[currency].append(line_data)
- for cur in line_cur:
- if line_cur[cur]['line']:
- final_res.append({'line': line_cur[cur]['line']})
- return final_res
+ return [{'line': lines} for lines in lines_per_currency.values()]
def _get_text(self, stat_line, followup_id, context=None):
if context is None:
diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py
index ceb8a389c0e..9ca8d3c2332 100644
--- a/addons/account_followup/report/account_followup_report.py
+++ b/addons/account_followup/report/account_followup_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-import tools
+from openerp.osv import fields, osv
+from openerp import tools
class account_followup_stat(osv.osv):
_name = "account_followup.stat"
diff --git a/addons/account_followup/tests/test_account_followup.py b/addons/account_followup/tests/test_account_followup.py
index 4495ffa6469..14f458de98d 100644
--- a/addons/account_followup/tests/test_account_followup.py
+++ b/addons/account_followup/tests/test_account_followup.py
@@ -2,10 +2,10 @@
import datetime
-import tools
+from openerp import tools
from openerp.tests.common import TransactionCase
-import netsvc
+from openerp import netsvc
class TestAccountFollowup(TransactionCase):
def setUp(self):
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 3f8bba1830f..e93b4dd8b69 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -22,9 +22,9 @@
import datetime
import time
-import tools
-from osv import fields, osv
-from tools.translate import _
+from openerp import tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_followup_stat_by_partner(osv.osv):
_name = "account_followup.stat.by.partner"
diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py
index ec4feca9b81..7c8560fc9e8 100644
--- a/addons/account_payment/account_invoice.py
+++ b/addons/account_payment/account_invoice.py
@@ -20,8 +20,8 @@
##############################################################################
from datetime import datetime
-from tools.translate import _
-from osv import fields, osv
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
class Invoice(osv.osv):
_inherit = 'account.invoice'
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 047b472e53b..35c30c686e8 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -20,8 +20,8 @@
##############################################################################
from operator import itemgetter
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_move_line(osv.osv):
_inherit = "account.move.line"
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 84eeddfb5db..d67db60e590 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -22,8 +22,8 @@
import logging
import time
-from osv import osv, fields
-import netsvc
+from openerp.osv import fields, osv
+from openerp import netsvc
_logger = logging.getLogger(__name__)
diff --git a/addons/account_payment/i18n/it.po b/addons/account_payment/i18n/it.po
index 60e9aedea53..22856dec976 100644
--- a/addons/account_payment/i18n/it.po
+++ b/addons/account_payment/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: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2011-01-13 01:14+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2012-12-17 14:02+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:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: account_payment
#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -28,6 +28,14 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Cliccare per creare un ordine di pagamento.\n"
+"
\n"
+" Un ordine di pagamento è un documento emesso dalla vostra "
+"azienda contro\n"
+" una fattura fornitore o una nota di credito.\n"
+"
\n"
+" Klicken Sie zur Erstellung eines neuen Meeting.\n"
+"
\n"
+" Der Kalender wird freigegeben für alle Mitarbeiter und ist "
+"vollständig\n"
+" integriert mit anderen Anwendungen wie Urlaub, oder Chancen. "
+"
\n"
+" Klicken Sie zur Erstellung eines neuen Alarms.\n"
+"
\n"
+" Sie können sehr einfach einen neuen angepassten "
+"Kalenderalarm anlegen,\n"
+" der für Kalender Termine oder Meetings freigegeben wurde.\n"
+"
When you send a document to a customer
- (quotation, invoice), you customer will be
+ (quotation, invoice), your customer will be
able to signup to get all his documents,
read your company news, check his projects,
etc.
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 9858a7fe0cc..afe753ebdab 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class base_stage(object):
""" Base utility mixin class for objects willing to manage their stages.
diff --git a/addons/base_status/base_state.py b/addons/base_status/base_state.py
index cebf5537485..0fb458bd13b 100644
--- a/addons/base_status/base_state.py
+++ b/addons/base_status/base_state.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class base_state(object):
""" Base utility mixin class for objects willing to manage their state.
diff --git a/addons/base_status/i18n/id.po b/addons/base_status/i18n/id.po
index 2aa71d41f2d..78afc027cfc 100644
--- a/addons/base_status/i18n/id.po
+++ b/addons/base_status/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: base_status
diff --git a/addons/base_status/i18n/pt_BR.po b/addons/base_status/i18n/pt_BR.po
index f97a48d12fe..382e1bbf2be 100644
--- a/addons/base_status/i18n/pt_BR.po
+++ b/addons/base_status/i18n/pt_BR.po
@@ -15,7 +15,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-17 04:47+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: base_status
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index 51c1663d366..fb778f0ea74 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -32,9 +32,9 @@ except ImportError:
"Install it to support more countries, for example with `easy_install vatnumber`.")
vatnumber = None
-from osv import osv, fields
-from tools.misc import ustr
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.misc import ustr
+from openerp.tools.translate import _
_ref_vat = {
'at': 'ATU12345675',
diff --git a/addons/base_vat/i18n/pt.po b/addons/base_vat/i18n/pt.po
index 5baecfe590a..76a9262cdc9 100644
--- a/addons/base_vat/i18n/pt.po
+++ b/addons/base_vat/i18n/pt.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: 2012-12-11 15:51+0000\n"
+"PO-Revision-Date: 2012-12-17 12:48+0000\n"
"Last-Translator: Rui Franco (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-12 04:39+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: base_vat
#: view:res.partner:0
msgid "Check Validity"
-msgstr ""
+msgstr "Verificar a validade"
#. module: base_vat
#: code:addons/base_vat/base_vat.py:147
diff --git a/addons/base_vat/i18n/pt_BR.po b/addons/base_vat/i18n/pt_BR.po
index 46c8601c5f5..498bf62cb45 100644
--- a/addons/base_vat/i18n/pt_BR.po
+++ b/addons/base_vat/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: base_vat
diff --git a/addons/base_vat/res_company.py b/addons/base_vat/res_company.py
index 1c63aa20f07..9959ce82833 100644
--- a/addons/base_vat/res_company.py
+++ b/addons/base_vat/res_company.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class res_company_vat (osv.osv):
_inherit = 'res.company'
diff --git a/addons/board/board.py b/addons/board/board.py
index a76bff7a66b..ba5da0db6e1 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -22,8 +22,9 @@
from operator import itemgetter
from textwrap import dedent
-from osv import fields, osv
-import tools
+
+from openerp import tools
+from openerp.osv import fields, osv
class board_board(osv.osv):
_name = 'board.board'
diff --git a/addons/board/i18n/pt_BR.po b/addons/board/i18n/pt_BR.po
index 834db5cda0e..650d7cf32d7 100644
--- a/addons/board/i18n/pt_BR.po
+++ b/addons/board/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: board
diff --git a/addons/contacts/i18n/et.po b/addons/contacts/i18n/et.po
new file mode 100644
index 00000000000..9974c578a78
--- /dev/null
+++ b/addons/contacts/i18n/et.po
@@ -0,0 +1,37 @@
+# Estonian 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-17 18:48+0000\n"
+"Last-Translator: Ahti Hinnov \n"
+"Language-Team: Estonian \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-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\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 "Kontaktid"
diff --git a/addons/contacts/i18n/pl.po b/addons/contacts/i18n/pl.po
new file mode 100644
index 00000000000..64e2d8de6fa
--- /dev/null
+++ b/addons/contacts/i18n/pl.po
@@ -0,0 +1,45 @@
+# Polish 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-17 10:43+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n"
+"Language-Team: Polish \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-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\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 ""
+"
\n"
+" Kliknij, aby dodać kontakt do książki adresowej.\n"
+"
\n"
+" OpenERP skonsoliduje wszystkie operacje dotyczące\n"
+" klienta w jednym miejscu; dyskusje, historię szans,\n"
+" dokumenty itp.\n"
+"
\n"
+" Clique para adicionar um contacto à sua agenda.\n"
+"
\n"
+" O OpenERP ajuda-o a manter facilmente registo das suas\n"
+" atividades relacionadas com um cliente; discussões, histórico de "
+"\n"
+" oportunidades de negócios, documentos, etc.\n"
+"
+
diff --git a/addons/delivery/i18n/hr.po b/addons/delivery/i18n/hr.po
index e96de5705c7..dd02b0be344 100644
--- a/addons/delivery/i18n/hr.po
+++ b/addons/delivery/i18n/hr.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:03+0000\n"
-"PO-Revision-Date: 2012-12-14 22:50+0000\n"
+"PO-Revision-Date: 2012-12-17 21:09+0000\n"
"Last-Translator: Goran Kliska \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-15 05:04+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 04:59+0000\n"
"X-Generator: Launchpad (build 16372)\n"
"Language: hr\n"
@@ -374,7 +374,7 @@ msgstr ">="
#: code:addons/delivery/sale.py:58
#, python-format
msgid "Order not in draft state !"
-msgstr ""
+msgstr "Nalog nije u nacrtu!"
#. module: delivery
#: report:sale.shipping:0
diff --git a/addons/delivery/partner.py b/addons/delivery/partner.py
index 62008c2c7cf..e4b0ba204ac 100644
--- a/addons/delivery/partner.py
+++ b/addons/delivery/partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_partner(osv.osv):
_inherit = 'res.partner'
diff --git a/addons/delivery/report/shipping.py b/addons/delivery/report/shipping.py
index 6d3b3598987..53bdad807c0 100644
--- a/addons/delivery/report/shipping.py
+++ b/addons/delivery/report/shipping.py
@@ -21,7 +21,7 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
class shipping(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 3d6139195be..98229f13c36 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from osv import fields,osv
-from tools.translate import _
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
# Overloaded sale_order to manage carriers :
class sale_order(osv.osv):
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index c3ce236dc2e..95b17a8ba68 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -19,10 +19,10 @@
#
##############################################################################
-from osv import fields,osv
-from tools.translate import _
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
-import decimal_precision as dp
+import openerp.addons.decimal_precision as dp
# Overloaded stock_picking to manage carriers :
class stock_picking(osv.osv):
@@ -66,6 +66,7 @@ class stock_picking(osv.osv):
}),
'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
'number_of_packages': fields.integer('Number of Packages'),
+ 'weight_uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of measurement for Weight",),
}
def _prepare_shipping_invoice_line(self, cr, uid, picking, invoice, context=None):
@@ -132,6 +133,12 @@ class stock_picking(osv.osv):
invoice_line_obj.create(cr, uid, invoice_line)
invoice_obj.button_compute(cr, uid, [invoice.id], context=context)
return result
+ def _get_default_uom(self,cr,uid,c):
+ uom_categ, uom_categ_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'product_uom_categ_kgm')
+ return self.pool.get('product.uom').search(cr, uid, [('category_id', '=', uom_categ_id),('factor','=',1)])[0]
+ _defaults = {
+ 'weight_uom_id': lambda self,cr,uid,c: self._get_default_uom(cr,uid,c)
+ }
stock_picking()
@@ -169,8 +176,14 @@ class stock_move(osv.osv):
store={
'stock.move': (lambda self, cr, uid, ids, c=None: ids, ['product_id', 'product_qty', 'product_uom'], 20),
}),
+ 'weight_uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True,readonly="1",help="Unit of Measure (Unit of Measure) is the unit of measurement for Weight",),
}
-
+ def _get_default_uom(self,cr,uid,c):
+ uom_categ, uom_categ_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'product_uom_categ_kgm')
+ return self.pool.get('product.uom').search(cr, uid, [('category_id', '=', uom_categ_id),('factor','=',1)])[0]
+ _defaults = {
+ 'weight_uom_id': lambda self,cr,uid,c: self._get_default_uom(cr,uid,c)
+ }
stock_move()
# Redefinition of the new fields in order to update the model stock.picking.out in the orm
diff --git a/addons/document/directory_content.py b/addons/document/directory_content.py
index 5b8ec3ddd93..6ebf8ebeb3d 100644
--- a/addons/document/directory_content.py
+++ b/addons/document/directory_content.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
-import netsvc
+from openerp import netsvc
# import os
import nodes
# import StringIO
diff --git a/addons/document/directory_report.py b/addons/document/directory_report.py
index 202725a1d3f..984dcf23bf2 100644
--- a/addons/document/directory_report.py
+++ b/addons/document/directory_report.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class ir_action_report_xml(osv.osv):
_name="ir.actions.report.xml"
diff --git a/addons/document/document.py b/addons/document/document.py
index 37a0219d143..ee288465316 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -20,13 +20,13 @@
##############################################################################
import base64
-from osv import osv, fields
+from openerp.osv import fields, osv
import os
#from psycopg2 import Binary
#from tools import config
-import tools
-from tools.translate import _
+from openerp import tools
+from openerp.tools.translate import _
import nodes
import logging
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 58492b87222..1cd809c4f9f 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -20,11 +20,11 @@
##############################################################################
-from osv import osv, fields
-from osv.orm import except_orm
+from openerp.osv import fields, osv
+from openerp.osv.orm import except_orm
import logging
import nodes
-from tools.translate import _
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
class document_directory(osv.osv):
_name = 'document.directory'
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index a4b37b126b2..48f623120a9 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -20,21 +20,21 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
import os
-import tools
+from openerp import tools
import base64
import errno
import logging
import shutil
from StringIO import StringIO
import psycopg2
-from tools.misc import ustr
-from tools.translate import _
-from osv.orm import except_orm
+from openerp.tools.misc import ustr
+from openerp.tools.translate import _
+from openerp.osv.orm import except_orm
import random
import string
-import pooler
+from openerp import pooler
import nodes
from content_index import cntIndex
_logger = logging.getLogger(__name__)
diff --git a/addons/document/i18n/pl.po b/addons/document/i18n/pl.po
index 656b50a94ce..ff3509dd7b6 100644
--- a/addons/document/i18n/pl.po
+++ b/addons/document/i18n/pl.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-05-10 17:42+0000\n"
+"PO-Revision-Date: 2012-12-17 10:30+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \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 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: document
#: field:document.directory,parent_id:0
@@ -137,7 +137,7 @@ msgstr "Nazwa katalogu musi być unikalna!"
#. module: document
#: view:ir.attachment:0
msgid "Filter on my documents"
-msgstr ""
+msgstr "Filtr na moje dokumenty"
#. module: document
#: view:ir.attachment:0
@@ -274,7 +274,7 @@ msgstr "Typ zawartości"
#. module: document
#: view:ir.attachment:0
msgid "Modification"
-msgstr ""
+msgstr "Modyfikacja"
#. module: document
#: view:document.directory:0
@@ -289,7 +289,7 @@ msgstr "Typ"
#: code:addons/document/document_directory.py:234
#, python-format
msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopia)"
#. module: document
#: help:document.directory,ressource_type_id:0
@@ -461,7 +461,7 @@ msgstr "jeśli zaznaczone, to pliki będą niedostępne."
#. module: document
#: field:report.document.user,user:0
msgid "unknown"
-msgstr ""
+msgstr "nieznane"
#. module: document
#: view:document.directory:0
@@ -507,7 +507,7 @@ msgstr ""
#: model:ir.actions.act_window,name:document.open_board_document_manager
#: model:ir.ui.menu,name:document.menu_reports_document
msgid "Knowledge"
-msgstr ""
+msgstr "Wiedza"
#. module: document
#: view:document.storage:0
@@ -554,7 +554,7 @@ msgstr ""
#: code:addons/document/static/src/js/document.js:6
#, python-format
msgid "Attachment(s)"
-msgstr ""
+msgstr "Załącznik(i)"
#. module: document
#: selection:report.document.user,month:0
@@ -564,7 +564,7 @@ msgstr "Sierpień"
#. module: document
#: view:ir.attachment:0
msgid "My Document(s)"
-msgstr ""
+msgstr "Moje dokumenty"
#. module: document
#: sql_constraint:document.directory:0
@@ -640,7 +640,7 @@ msgstr "Tylko do Odczytu"
#: view:document.directory:0
#: view:process.node:0
msgid "Document Directory"
-msgstr ""
+msgstr "Katalog Dokumentu"
#. module: document
#: sql_constraint:document.directory:0
@@ -650,7 +650,7 @@ msgstr "Nazwa katalogu musi być unikalna !"
#. module: document
#: view:ir.attachment:0
msgid "Attachments"
-msgstr ""
+msgstr "Załączniki"
#. module: document
#: field:document.directory,create_uid:0
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index aeb2e64fc97..9513434374f 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -20,10 +20,10 @@
##############################################################################
# import urlparse
-import pooler
-from tools.safe_eval import safe_eval
+from openerp import pooler
+from openerp.tools.safe_eval import safe_eval
-from tools.misc import ustr
+from openerp.tools.misc import ustr
import errno
# import os
import time
diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index 92e33c13746..c9df78e4272 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -20,8 +20,8 @@
##############################################################################
-from osv import fields,osv
-import tools
+from openerp.osv import fields,osv
+from openerp import tools
class report_document_user(osv.osv):
_name = "report.document.user"
diff --git a/addons/document/wizard/document_configuration.py b/addons/document/wizard/document_configuration.py
index 6a69e638b4e..aec7f9b75a4 100644
--- a/addons/document/wizard/document_configuration.py
+++ b/addons/document/wizard/document_configuration.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class document_configuration(osv.osv_memory):
_name='document.configuration'
diff --git a/addons/document_ftp/ftpserver/__init__.py b/addons/document_ftp/ftpserver/__init__.py
index 59aff85c633..b5ada070c84 100644
--- a/addons/document_ftp/ftpserver/__init__.py
+++ b/addons/document_ftp/ftpserver/__init__.py
@@ -24,7 +24,7 @@ import ftpserver
import authorizer
import abstracted_fs
import logging
-from tools import config
+from openerp.tools import config
_logger = logging.getLogger(__name__)
def start_server():
HOST = config.get('ftp_server_host', '127.0.0.1')
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 326c62f7a92..b3fd39bdfcd 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -9,12 +9,9 @@ import errno
import glob
import fnmatch
-import pooler
-import netsvc
-import sql_db
-
-from service import security
-from osv import osv
+from openerp import pooler, netsvc, sql_db
+from openerp.service import security
+from openerp.osv import osv
from document.nodes import get_node_context
def _get_month_name(month):
diff --git a/addons/document_ftp/res_config.py b/addons/document_ftp/res_config.py
index 374368d60bd..93b3aa69974 100644
--- a/addons/document_ftp/res_config.py
+++ b/addons/document_ftp/res_config.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools import config
+from openerp.osv import fields, osv
+from openerp.tools import config
class documnet_ftp_setting(osv.osv_memory):
_name = 'knowledge.config.settings'
diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py
index bb4e5ea6648..1ab808c3acc 100644
--- a/addons/document_ftp/test_easyftp.py
+++ b/addons/document_ftp/test_easyftp.py
@@ -25,7 +25,7 @@
"""
from ftplib import FTP
-from tools import config
+from openerp.tools import config
def get_plain_ftp(timeout=10.0):
ftp = FTP()
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
index 8260424d653..ceb7d1a60e5 100644
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ b/addons/document_ftp/wizard/ftp_browse.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-# from tools.translate import _
+from openerp.osv import fields, osv
+# from openerp.tools.translate import _
from .. import ftpserver
class document_ftp_browse(osv.osv_memory):
diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py
index d0679973c5a..87aaa2331b4 100644
--- a/addons/document_ftp/wizard/ftp_configuration.py
+++ b/addons/document_ftp/wizard/ftp_configuration.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv, fields
-from tools import config
+from openerp.osv import fields, osv
+from openerp.tools import config
class document_ftp_configuration(osv.osv_memory):
diff --git a/addons/document_page/document_page.py b/addons/document_page/document_page.py
index 092d39f22e9..f74cfe02a21 100644
--- a/addons/document_page/document_page.py
+++ b/addons/document_page/document_page.py
@@ -19,10 +19,10 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import difflib
-import tools
+from openerp import tools
class document_page(osv.osv):
_name = "document.page"
diff --git a/addons/document_page/i18n/pl.po b/addons/document_page/i18n/pl.po
index b9403be4ca2..86b17782569 100644
--- a/addons/document_page/i18n/pl.po
+++ b/addons/document_page/i18n/pl.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-08-13 12:16+0000\n"
-"Last-Translator: Antony Lesuisse (OpenERP) \n"
+"PO-Revision-Date: 2012-12-17 10:25+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \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 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: document_page
#: view:document.page:0
@@ -22,13 +22,13 @@ msgstr ""
#: selection:document.page,type:0
#: model:ir.actions.act_window,name:document_page.action_category
msgid "Category"
-msgstr ""
+msgstr "Kategoria"
#. module: document_page
#: view:document.page:0
#: field:document.page,write_uid:0
msgid "Last Contributor"
-msgstr ""
+msgstr "Ostatni kontrybutor"
#. module: document_page
#: view:document.page:0
@@ -45,12 +45,12 @@ msgstr "Menu"
#: view:document.page:0
#: model:ir.model,name:document_page.model_document_page
msgid "Document Page"
-msgstr ""
+msgstr "Strona dokumentu"
#. module: document_page
#: model:ir.actions.act_window,name:document_page.action_related_page_history
msgid "Page History"
-msgstr ""
+msgstr "Historia strony"
#. module: document_page
#: view:document.page:0
@@ -63,18 +63,20 @@ msgstr "Zawartość"
#. module: document_page
#: view:document.page:0
msgid "Group By..."
-msgstr ""
+msgstr "Grupuj wg..."
#. module: document_page
#: view:document.page:0
msgid "Template"
-msgstr ""
+msgstr "Szablon"
#. module: document_page
#: view:document.page:0
msgid ""
"that will be used as a content template for all new page of this category."
msgstr ""
+"które będzie stosowane jako szablon zawartości dla nowych stron tej "
+"kategorii."
#. module: document_page
#: field:document.page,name:0
@@ -89,7 +91,7 @@ msgstr ""
#. module: document_page
#: field:document.page,type:0
msgid "Type"
-msgstr ""
+msgstr "Typ"
#. module: document_page
#: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
@@ -99,39 +101,39 @@ msgstr ""
#. module: document_page
#: field:document.page.history,create_uid:0
msgid "Modified By"
-msgstr ""
+msgstr "Zmodyfikowane przez"
#. module: document_page
#: view:document.page.create.menu:0
msgid "or"
-msgstr ""
+msgstr "lub"
#. module: document_page
#: help:document.page,type:0
msgid "Page type"
-msgstr ""
+msgstr "Typ strony"
#. module: document_page
#: view:document.page.create.menu:0
msgid "Menu Information"
-msgstr ""
+msgstr "Informacja o menu"
#. module: document_page
#: view:document.page.history:0
#: model:ir.model,name:document_page.model_document_page_history
msgid "Document Page History"
-msgstr ""
+msgstr "Historia strony dokumentu"
#. module: document_page
#: model:ir.ui.menu,name:document_page.menu_page_history
msgid "Pages history"
-msgstr ""
+msgstr "Historia strony"
#. module: document_page
#: code:addons/document_page/document_page.py:129
#, python-format
msgid "There are no changes in revisions."
-msgstr ""
+msgstr "Brak zmian w wersjach"
#. module: document_page
#: field:document.page.history,create_date:0
@@ -143,7 +145,7 @@ msgstr "Data"
#: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
#: view:wizard.document.page.history.show_diff:0
msgid "Difference"
-msgstr ""
+msgstr "Różnica"
#. module: document_page
#: model:ir.actions.act_window,name:document_page.action_page
@@ -155,7 +157,7 @@ msgstr "Strony"
#. module: document_page
#: model:ir.ui.menu,name:document_page.menu_category
msgid "Categories"
-msgstr ""
+msgstr "Kategorie"
#. module: document_page
#: field:document.page.create.menu,menu_parent_id:0
@@ -171,12 +173,12 @@ msgstr "Utworzono"
#: code:addons/document_page/wizard/document_page_show_diff.py:50
#, python-format
msgid "You need to select minimum one or maximum two history revisions!"
-msgstr ""
+msgstr "Musisz wybrać minimum jedną a maksymalnie dwie wersje historii !"
#. module: document_page
#: model:ir.actions.act_window,name:document_page.action_history
msgid "Page history"
-msgstr ""
+msgstr "Historia strony"
#. module: document_page
#: field:document.page.history,summary:0
@@ -186,12 +188,12 @@ msgstr "Podsumowanie"
#. module: document_page
#: model:ir.actions.act_window,help:document_page.action_page
msgid "Create web pages"
-msgstr ""
+msgstr "Twórz strony web"
#. module: document_page
#: view:document.page.history:0
msgid "Document History"
-msgstr ""
+msgstr "Historia Dokumentu"
#. module: document_page
#: field:document.page.create.menu,menu_name:0
@@ -201,12 +203,12 @@ msgstr "Nazwa menu"
#. module: document_page
#: field:document.page.history,page_id:0
msgid "Page"
-msgstr ""
+msgstr "Strona"
#. module: document_page
#: field:document.page,history_ids:0
msgid "History"
-msgstr ""
+msgstr "Historia"
#. module: document_page
#: field:document.page,write_date:0
@@ -223,14 +225,14 @@ msgstr "Utwórz menu"
#. module: document_page
#: field:document.page,display_content:0
msgid "Displayed Content"
-msgstr ""
+msgstr "Wyświetlana zawartość"
#. module: document_page
#: code:addons/document_page/document_page.py:129
#: code:addons/document_page/wizard/document_page_show_diff.py:50
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Ostrzeżenie !"
#. module: document_page
#: view:document.page.create.menu:0
@@ -246,9 +248,9 @@ msgstr "Różnice"
#. module: document_page
#: view:document.page:0
msgid "Document Type"
-msgstr ""
+msgstr "Typ dokumentu"
#. module: document_page
#: field:document.page,child_ids:0
msgid "Children"
-msgstr ""
+msgstr "Podrzędne"
diff --git a/addons/document_page/wizard/document_page_create_menu.py b/addons/document_page/wizard/document_page_create_menu.py
index 79a43f952f0..9f20fab0d99 100644
--- a/addons/document_page/wizard/document_page_create_menu.py
+++ b/addons/document_page/wizard/document_page_create_menu.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class document_page_create_menu(osv.osv_memory):
""" Create Menu """
diff --git a/addons/document_page/wizard/document_page_show_diff.py b/addons/document_page/wizard/document_page_show_diff.py
index 13e8e79b3b7..0c20ee79c74 100644
--- a/addons/document_page/wizard/document_page_show_diff.py
+++ b/addons/document_page/wizard/document_page_show_diff.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import base64
class showdiff(osv.osv_memory):
diff --git a/addons/document_webdav/__init__.py b/addons/document_webdav/__init__.py
index 11bbd35f7c3..3dc4c104c80 100644
--- a/addons/document_webdav/__init__.py
+++ b/addons/document_webdav/__init__.py
@@ -20,13 +20,9 @@
##############################################################################
import logging
-_logger = logging.getLogger(__name__)
+import webdav
+import webdav_server
+import document_webdav
-try:
- import webdav
- import webdav_server
- import document_webdav
-except ImportError:
- _logger.info('document_webdav disabled please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 1b826434f74..59e93fa3722 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -18,31 +18,31 @@
# along with this program. If not, see .
#
##############################################################################
-import pooler
-import sql_db
-
import os
import time
import errno
-
-import netsvc
+import re
import urlparse
-
-from DAV.constants import COLLECTION #, OBJECT
-from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
-from DAV.iface import dav_interface
import urllib
-from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
-from cache import memoize
-from tools import misc
-
-from webdav import mk_lock_response
-
try:
- from tools.dict_tools import dict_merge2
+ from pywebdav.lib.constants import COLLECTION # , OBJECT
+ from pywebdav.lib.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
+ from pywebdav.lib.iface import dav_interface
+ from pywebdav.lib.davcmd import copyone, copytree, moveone, movetree, delone, deltree
except ImportError:
- from document.dict_tools import dict_merge2
+ from DAV.constants import COLLECTION #, OBJECT
+ from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
+ from DAV.iface import dav_interface
+ from DAV.davcmd import copyone, copytree, moveone, movetree, delone, deltree
+
+import openerp
+from openerp import pooler, sql_db, netsvc
+from openerp.tools import misc
+from openerp.addons.document.dict_tools import dict_merge2
+
+from cache import memoize
+from webdav import mk_lock_response
CACHE_SIZE=20000
@@ -355,7 +355,8 @@ class openerp_dav_handler(dav_interface):
return self.parent.get_baseuri(self) + '/'.join(ajoin)
@memoize(4)
- def db_list(self):
+ def _all_db_list(self):
+ """return all databases who have module document_webdav installed"""
s = netsvc.ExportService.getService('db')
result = s.exp_list()
self.db_name_list=[]
@@ -364,7 +365,7 @@ class openerp_dav_handler(dav_interface):
try:
db = sql_db.db_connect(db_name)
cr = db.cursor()
- cr.execute("SELECT id FROM ir_module_module WHERE name = 'document' AND state='installed' ")
+ cr.execute("SELECT id FROM ir_module_module WHERE name = 'document_webdav' AND state='installed' ")
res=cr.fetchone()
if res and len(res):
self.db_name_list.append(db_name)
@@ -375,6 +376,15 @@ class openerp_dav_handler(dav_interface):
cr.close()
return self.db_name_list
+ def db_list(self, uri):
+ # import pudb;pudb.set_trace()
+ u = urlparse.urlsplit(uri)
+ h = u.hostname
+ d = h.split('.')[0]
+ r = openerp.tools.config['dbfilter'].replace('%h', h).replace('%d',d)
+ dbs = [i for i in self._all_db_list() if re.match(r, i)]
+ return dbs
+
def get_childs(self,uri, filters=None):
""" return the child objects as self.baseuris for the given URI """
self.parent.log_message('get children: %s' % uri)
@@ -382,7 +392,7 @@ class openerp_dav_handler(dav_interface):
if not dbname:
if cr: cr.close()
- res = map(lambda x: self.urijoin(x), self.db_list())
+ res = map(lambda x: self.urijoin(x), self.db_list(uri))
return res
result = []
node = self.uri2object(cr, uid, pool, uri2[:])
diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py
index cb1315140a3..90150bab620 100644
--- a/addons/document_webdav/document_webdav.py
+++ b/addons/document_webdav/document_webdav.py
@@ -19,9 +19,10 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
+from openerp.tools import config
+
import nodes
-from tools import config
class document_davdir(osv.osv):
_inherit = 'document.directory'
diff --git a/addons/document_webdav/i18n/pt.po b/addons/document_webdav/i18n/pt.po
index fc5985eb6da..32736ef6929 100644
--- a/addons/document_webdav/i18n/pt.po
+++ b/addons/document_webdav/i18n/pt.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:03+0000\n"
-"PO-Revision-Date: 2010-12-11 22:47+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2012-12-17 14:02+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) \n"
"Language-Team: 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:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: document_webdav
#: field:document.webdav.dir.property,create_date:0
@@ -31,7 +31,7 @@ msgstr "Documentos"
#. module: document_webdav
#: view:document.webdav.dir.property:0
msgid "Document property"
-msgstr ""
+msgstr "Propriedade do documento"
#. module: document_webdav
#: view:document.webdav.dir.property:0
@@ -168,7 +168,7 @@ msgstr "Criador"
#. module: document_webdav
#: view:document.webdav.file.property:0
msgid "Document Property"
-msgstr ""
+msgstr "Propriedade do documento"
#. module: document_webdav
#: model:ir.ui.menu,name:document_webdav.menu_properties
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index a8fedee4fe3..d6bb5a6655f 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -21,7 +21,7 @@
from document import nodes
-from tools.safe_eval import safe_eval as eval
+from openerp.tools.safe_eval import safe_eval as eval
import time
import urllib
import uuid
diff --git a/addons/document_webdav/redirect.py b/addons/document_webdav/redirect.py
index c3dd9248f45..41cbe3b883b 100644
--- a/addons/document_webdav/redirect.py
+++ b/addons/document_webdav/redirect.py
@@ -22,8 +22,8 @@
import logging
import urlparse
-from service.websrv_lib import FixSendError, HTTPHandler, HttpOptions
-from service.http_server import HttpLogHandler
+from openerp.service.websrv_lib import FixSendError, HTTPHandler, HttpOptions
+from openerp.service.http_server import HttpLogHandler
_logger = logging.getLogger(__name__)
class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler):
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
index 79ee471c69e..058dc1c748d 100644
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -38,7 +38,7 @@ import xml.dom.minidom
import httplib
-from tools import config
+from openerp.tools import config
from xmlrpclib import Transport, ProtocolError
import StringIO
import base64
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index bf8b843a0a0..aedad059c16 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -20,21 +20,28 @@
#
##############################################################################
+import logging
+
+_logger = logging.getLogger(__name__)
import xml.dom.minidom
domimpl = xml.dom.minidom.getDOMImplementation()
from xml.dom.minicompat import StringTypes
import urlparse
import urllib
-from osv import osv
-from tools.translate import _
+from openerp.osv import osv
+from openerp.tools.translate import _
-from DAV import utils
-from DAV.propfind import PROPFIND
-from DAV.report import REPORT
+try:
+ from pywebdav.lib import utils
+ from pywebdav.lib.propfind import PROPFIND
+ from pywebdav.lib.report import REPORT
+except ImportError:
+ from DAV import utils
+ from DAV.propfind import PROPFIND
+ from DAV.report import REPORT
-
-import tools
+from openerp import tools
class Text2(xml.dom.minidom.Text):
def writexml(self, writer, indent="", addindent="", newl=""):
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 70ad4d2657f..f801a56ee97 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -35,12 +35,21 @@
import logging
-import netsvc
+from openerp import netsvc
from dav_fs import openerp_dav_handler
-from tools.config import config
-from DAV.WebDAVServer import DAVRequestHandler
-from service import http_server
-from service.websrv_lib import FixSendError, HttpOptions
+from openerp.tools.config import config
+try:
+ from pywebdav.lib.WebDAVServer import DAVRequestHandler
+ from pywebdav.lib.utils import IfParser, TagList
+ from pywebdav.lib.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
+ from pywebdav.lib.propfind import PROPFIND
+except ImportError:
+ from DAV.WebDAVServer import DAVRequestHandler
+ from DAV.utils import IfParser, TagList
+ from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
+ from DAV.propfind import PROPFIND
+from openerp.service import http_server
+from openerp.service.websrv_lib import FixSendError, HttpOptions
from BaseHTTPServer import BaseHTTPRequestHandler
import urlparse
import urllib
@@ -48,9 +57,6 @@ import re
import time
from string import atoi
import addons
-from DAV.utils import IfParser, TagList
-from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
-from DAV.propfind import PROPFIND
# from DAV.constants import DAV_VERSION_1, DAV_VERSION_2
from xml.dom import minidom
from redirect import RedirectHTTPHandler
@@ -71,7 +77,7 @@ def OpenDAVConfig(**kw):
return Config()
-class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
+class DAVHandler(DAVRequestHandler, HttpOptions, FixSendError):
verbose = False
protocol_version = 'HTTP/1.1'
@@ -88,7 +94,20 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
self._logger.debug(message)
def handle(self):
- self._init_buffer()
+ """Handle multiple requests if necessary."""
+ self.close_connection = 1
+ try:
+ self.handle_one_request()
+ while not self.close_connection:
+ self.handle_one_request()
+ except Exception as e:
+ try:
+ self.log_error("Request timed out: %r \n Trying old version of HTTPServer", e)
+ self._init_buffer()
+ except Exception as e:
+ #a read or a write timed out. Discard this connection
+ self.log_error("Not working neither, closing connection\n %r", e)
+ self.close_connection = 1
def finish(self):
pass
@@ -99,6 +118,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
return res
def setup(self):
+ DAVRequestHandler.setup(self)
self.davpath = '/'+config.get_misc('webdav','vdir','webdav')
addr, port = self.server.server_name, self.server.server_port
server_proto = getattr(self.server,'proto', 'http').lower()
@@ -413,7 +433,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
data['lockowner'] = owners
return data
-from service.http_server import reg_http_service,OpenERPAuthProvider
+from openerp.service.http_server import reg_http_service,OpenERPAuthProvider
class DAVAuthProvider(OpenERPAuthProvider):
def authenticate(self, db, user, passwd, client_address):
diff --git a/addons/edi/i18n/pt.po b/addons/edi/i18n/pt.po
index e5dbf0496f3..e3a42830c3e 100644
--- a/addons/edi/i18n/pt.po
+++ b/addons/edi/i18n/pt.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:03+0000\n"
-"PO-Revision-Date: 2012-12-11 15:53+0000\n"
+"PO-Revision-Date: 2012-12-17 14:11+0000\n"
"Last-Translator: Rui Franco (multibase.pt) \n"
"Language-Team: 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-12 04:41+0000\n"
-"X-Generator: Launchpad (build 16361)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: edi
#. openerp-web
@@ -53,7 +53,7 @@ msgstr "Moeda"
#: code:addons/edi/static/src/js/edi.js:71
#, python-format
msgid "Document Import Notification"
-msgstr ""
+msgstr "Notificação de importação de documento"
#. module: edi
#: code:addons/edi/models/edi.py:130
@@ -87,7 +87,7 @@ msgstr "Parceiro"
#. module: edi
#: model:ir.model,name:edi.model_edi_edi
msgid "EDI Subsystem"
-msgstr ""
+msgstr "Subsistema EDI"
#~ msgid "The company name must be unique !"
#~ msgstr "O nome da empresa deve ser único!"
diff --git a/addons/edi/i18n/pt_BR.po b/addons/edi/i18n/pt_BR.po
index c00e95fdf2f..c38e7832eac 100644
--- a/addons/edi/i18n/pt_BR.po
+++ b/addons/edi/i18n/pt_BR.po
@@ -15,7 +15,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-17 04:47+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: edi
diff --git a/addons/edi/models/edi.py b/addons/edi/models/edi.py
index 48a04c2a94d..5f3589bd9d5 100644
--- a/addons/edi/models/edi.py
+++ b/addons/edi/models/edi.py
@@ -31,8 +31,8 @@ import openerp
import openerp.release as release
import openerp.netsvc as netsvc
from openerp.osv import osv, fields
-from tools.translate import _
-from tools.safe_eval import safe_eval as eval
+from openerp.tools.translate import _
+from openerp.tools.safe_eval import safe_eval as eval
_logger = logging.getLogger(__name__)
EXTERNAL_ID_PATTERN = re.compile(r'^([^.:]+)(?::([^.]+))?\.(\S+)$')
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index a9bee623f66..743384059b4 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -23,18 +23,43 @@
import base64
import logging
-import netsvc
-from osv import osv
-from osv import fields
-import tools
-from tools.translate import _
-from urllib import quote as quote
+from openerp import netsvc
+from openerp.osv import osv, fields
+from openerp.osv import fields
+from openerp import tools
+from openerp.tools.translate import _
+from urllib import urlencode, quote as quote
+
_logger = logging.getLogger(__name__)
try:
- from mako.template import Template as MakoTemplate
+ # We use a jinja2 sandboxed environment to render mako templates.
+ # Note that the rendering does not cover all the mako syntax, in particular
+ # arbitrary Python statements are not accepted, and not all expressions are
+ # allowed: only "public" attributes (not starting with '_') of objects may
+ # be accessed.
+ # This is done on purpose: it prevents incidental or malicious execution of
+ # Python code that may break the security of the server.
+ from jinja2.sandbox import SandboxedEnvironment
+ mako_template_env = SandboxedEnvironment(
+ block_start_string="<%",
+ block_end_string="%>",
+ variable_start_string="${",
+ variable_end_string="}",
+ comment_start_string="<%doc>",
+ comment_end_string="%doc>",
+ line_statement_prefix="%",
+ line_comment_prefix="##",
+ trim_blocks=True, # do not output newline after blocks
+ autoescape=True, # XML/HTML automatic escaping
+ )
+ mako_template_env.globals.update({
+ 'str': str,
+ 'quote': quote,
+ 'urlencode': urlencode,
+ })
except ImportError:
- _logger.warning("email_template: mako templates not available, templating features will not work!")
+ _logger.warning("jinja2 not available, templating features will not work!")
class email_template(osv.osv):
"Templates for sending email"
@@ -55,7 +80,8 @@ class email_template(osv.osv):
:param str model: model name of the document record this mail is related to.
:param int res_id: id of the document record this mail is related to.
"""
- if not template: return u""
+ if not template:
+ return u""
if context is None:
context = {}
try:
@@ -64,14 +90,14 @@ class email_template(osv.osv):
if res_id:
record = self.pool.get(model).browse(cr, uid, res_id, context=context)
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
- result = MakoTemplate(template).render_unicode(object=record,
- user=user,
- # context kw would clash with mako internals
- ctx=context,
- quote=quote,
- format_exceptions=True)
- if result == u'False':
- result = u''
+ variables = {
+ 'object': record,
+ 'user': user,
+ 'ctx': context, # context kw would clash with mako internals
+ }
+ result = mako_template_env.from_string(template).render(variables)
+ if result == u"False":
+ result = u""
return result
except Exception:
_logger.exception("failed to render mako template value %r", template)
diff --git a/addons/email_template/res_partner.py b/addons/email_template/res_partner.py
index 7b350442e84..987fca43219 100644
--- a/addons/email_template/res_partner.py
+++ b/addons/email_template/res_partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class res_partner(osv.osv):
"""Inherit res.partner to add a generic opt-out field that can be used
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index 862c34cc426..1cfcf048691 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class email_template_preview(osv.osv_memory):
_inherit = "email.template"
diff --git a/addons/event/event.py b/addons/event/event.py
index b79d86ea35e..59a4773e2cb 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -20,8 +20,8 @@
##############################################################################
from datetime import datetime, timedelta
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
from openerp import SUPERUSER_ID
class event_type(osv.osv):
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 042676d0c32..481b86f032c 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-import tools
+from openerp.osv import fields, osv
+from openerp import tools
class report_event_registration(osv.osv):
_name = "report.event.registration"
diff --git a/addons/event/res_partner.py b/addons/event/res_partner.py
index 17cf5216074..88249c5a7cd 100644
--- a/addons/event/res_partner.py
+++ b/addons/event/res_partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_partner(osv.osv):
_inherit = 'res.partner'
diff --git a/addons/event/wizard/event_confirm.py b/addons/event/wizard/event_confirm.py
index e001aac9937..8611a066801 100644
--- a/addons/event/wizard/event_confirm.py
+++ b/addons/event/wizard/event_confirm.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class event_confirm(osv.osv_memory):
"""
diff --git a/addons/event_moodle/event_moodle.py b/addons/event_moodle/event_moodle.py
index 0bac50ca445..5c7373d1adb 100644
--- a/addons/event_moodle/event_moodle.py
+++ b/addons/event_moodle/event_moodle.py
@@ -19,13 +19,13 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
import xmlrpclib
import string
import time
import random
from random import sample
-from tools.translate import _
+from openerp.tools.translate import _
class event_moodle(osv.osv):
_name = 'event.moodle.config.wiz'
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 4f77b945f69..66dcbc78f13 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class product(osv.osv):
_inherit = 'product.product'
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index e5cd70948cd..fdc37e99ee1 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -32,12 +32,12 @@ except ImportError:
import zipfile
import base64
-import addons
+from openerp import addons
-import netsvc
-from osv import osv, fields
-import tools
-from tools.translate import _
+from openerp import netsvc
+from openerp.osv import fields, osv
+from openerp import tools
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po
index 312323158e4..4553a196454 100644
--- a/addons/fetchmail/i18n/pt_BR.po
+++ b/addons/fetchmail/i18n/pt_BR.po
@@ -15,7 +15,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-17 04:47+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: fetchmail
diff --git a/addons/fetchmail/res_config.py b/addons/fetchmail/res_config.py
index f2447ce7b94..84a50eb22c8 100644
--- a/addons/fetchmail/res_config.py
+++ b/addons/fetchmail/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class fetchmail_config_settings(osv.osv_memory):
""" This wizard can be inherited in conjunction with 'res.config.settings', in order to
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index af0a78b5448..f5166319e92 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -19,12 +19,12 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
import time
import datetime
-import tools
-from osv.orm import except_orm
-from tools.translate import _
+from openerp import tools
+from openerp.osv.orm import except_orm
+from openerp.tools.translate import _
from dateutil.relativedelta import relativedelta
def str_to_datetime(strdate):
diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml
index 50eb8a3fab1..a8d70eb06fa 100644
--- a/addons/fleet/fleet_demo.xml
+++ b/addons/fleet/fleet_demo.xml
@@ -1,6 +1,10 @@
+
+
+
+
In shop1
diff --git a/addons/fleet/security/fleet_security.xml b/addons/fleet/security/fleet_security.xml
index 6c718f4cdd7..c9b86799b5c 100644
--- a/addons/fleet/security/fleet_security.xml
+++ b/addons/fleet/security/fleet_security.xml
@@ -8,7 +8,6 @@
User
- Manager
diff --git a/addons/google_base_account/google_base_account.py b/addons/google_base_account/google_base_account.py
index c860ec84374..46b1757a7b3 100644
--- a/addons/google_base_account/google_base_account.py
+++ b/addons/google_base_account/google_base_account.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class res_users(osv.osv):
_inherit = "res.users"
diff --git a/addons/google_base_account/wizard/google_login.py b/addons/google_base_account/wizard/google_login.py
index 7eb568075c3..f4464976aee 100644
--- a/addons/google_base_account/wizard/google_login.py
+++ b/addons/google_base_account/wizard/google_login.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields,osv
-from tools.translate import _
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
try:
import gdata.contacts.service
import gdata.contacts.client
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 1f6af0378ca..ac0cf68f3f6 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -20,9 +20,9 @@
import logging
from datetime import datetime
-from tools import DEFAULT_SERVER_DATETIME_FORMAT
-from osv import osv, fields
-from tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
diff --git a/addons/hr/__init__.py b/addons/hr/__init__.py
index 80becc6af70..02ac7f16fd9 100644
--- a/addons/hr/__init__.py
+++ b/addons/hr/__init__.py
@@ -22,7 +22,6 @@
import hr_department
import hr
-import report
import res_config
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 21c2e0fc6da..c4727730464 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -19,10 +19,10 @@
#
##############################################################################
-import addons
+from openerp import addons
import logging
-from osv import fields, osv
-import tools
+from openerp.osv import fields, osv
+from openerp import tools
_logger = logging.getLogger(__name__)
class hr_employee_category(osv.osv):
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index e73046fb2b6..185e9f73a45 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-import tools
+from openerp.osv import fields, osv
+from openerp import tools
class hr_department(osv.osv):
def name_get(self, cr, uid, ids, context=None):
diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 299c5ca68fe..147c4e4d5b9 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class hr_config_settings(osv.osv_memory):
_name = 'hr.config.settings'
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 5de1bc5f3bc..ce3dc00d258 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -21,8 +21,8 @@
import time
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_action_reason(osv.osv):
_name = "hr.action.reason"
diff --git a/addons/hr_attendance/i18n/pt.po b/addons/hr_attendance/i18n/pt.po
index 7d973f8f7a6..291f02eb454 100644
--- a/addons/hr_attendance/i18n/pt.po
+++ b/addons/hr_attendance/i18n/pt.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-05-10 17:49+0000\n"
-"Last-Translator: Daniel Reis (SECURITAS SA) \n"
+"PO-Revision-Date: 2012-12-17 12:55+0000\n"
+"Last-Translator: Rui Franco (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:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: hr_attendance
#: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -406,7 +406,7 @@ msgstr "Imprimir Relatório Semanal de Assiduidade"
#. module: hr_attendance
#: model:ir.model,name:hr_attendance.model_hr_config_settings
msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
#. module: hr_attendance
#. openerp-web
@@ -463,7 +463,7 @@ msgstr ""
#: view:hr.attendance.month:0
#: view:hr.attendance.week:0
msgid "or"
-msgstr ""
+msgstr "ou"
#. module: hr_attendance
#: help:hr.attendance,action_desc:0
diff --git a/addons/hr_attendance/report/attendance_by_month.py b/addons/hr_attendance/report/attendance_by_month.py
index 6d41869ff23..69ce9511ac2 100644
--- a/addons/hr_attendance/report/attendance_by_month.py
+++ b/addons/hr_attendance/report/attendance_by_month.py
@@ -19,19 +19,16 @@
#
##############################################################################
-import time
from datetime import datetime, timedelta
from dateutil.relativedelta import relativedelta
-import netsvc
-import pooler
+import time
-from report.interface import report_rml
-from report.interface import toxml
-
-from report import report_sxw
-from tools import ustr
-from tools.translate import _
-from tools import to_xml
+from openerp import netsvc, pooler
+from openerp.report import report_sxw
+from openerp.report.interface import report_rml
+from openerp.report.interface import toxml
+from openerp.tools import to_xml, ustr
+from openerp.tools.translate import _
one_day = relativedelta(days=1)
month2name = [0, 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py
index 29586ba5524..411a1139def 100644
--- a/addons/hr_attendance/report/attendance_errors.py
+++ b/addons/hr_attendance/report/attendance_errors.py
@@ -19,10 +19,11 @@
#
##############################################################################
-import time
-from report import report_sxw
-import pooler
import datetime
+import time
+
+from openerp import pooler
+from openerp.report import report_sxw
class attendance_print(report_sxw.rml_parse):
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 5df1bae4dba..321bb6bacc9 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -20,16 +20,14 @@
##############################################################################
-import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
+import time
-import pooler
-from report.interface import report_rml
-from report.interface import toxml
-from report import report_sxw
-from tools.translate import _
-import tools
+from openerp import pooler, tools
+from openerp.report import report_sxw
+from openerp.report.interface import report_rml, toxml
+from openerp.tools.translate import _
one_week = relativedelta(days=7)
num2day = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']
diff --git a/addons/hr_attendance/res_config.py b/addons/hr_attendance/res_config.py
index 61e2f784a5a..58c6ed4124f 100644
--- a/addons/hr_attendance/res_config.py
+++ b/addons/hr_attendance/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class hr_attendance_config_settings(osv.osv_memory):
_inherit = 'hr.config.settings'
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth.py b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
index 03e1db5dc3a..6994bc5f906 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth.py
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
@@ -21,7 +21,7 @@
import time
-from osv import osv, fields
+from openerp.osv import osv, fields
class hr_attendance_bymonth(osv.osv_memory):
_name = 'hr.attendance.month'
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek.py b/addons/hr_attendance/wizard/hr_attendance_byweek.py
index 420773eaf13..7fcfc175f0e 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek.py
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek.py
@@ -18,10 +18,11 @@
# along with this program. If not, see .
#
##############################################################################
+
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from osv import osv, fields
+from openerp.osv import fields, osv
class hr_attendance_byweek(osv.osv_memory):
_name = 'hr.attendance.week'
diff --git a/addons/hr_attendance/wizard/hr_attendance_error.py b/addons/hr_attendance/wizard/hr_attendance_error.py
index d489e699d89..066f4a56e07 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error.py
+++ b/addons/hr_attendance/wizard/hr_attendance_error.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_attendance_error(osv.osv_memory):
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 90f42d8487a..faf8b015a48 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class hr_employee(osv.osv):
_name = "hr.employee"
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 0ae98dfe4d4..d4ee28aff68 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -19,12 +19,13 @@
#
##############################################################################
-import time
from datetime import datetime
from dateutil.relativedelta import relativedelta
from dateutil import parser
-from osv import fields, osv
-from tools.translate import _
+import time
+
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_evaluation_plan(osv.osv):
_name = "hr_evaluation.plan"
diff --git a/addons/hr_evaluation/i18n/pt.po b/addons/hr_evaluation/i18n/pt.po
index 4a3515ee0ba..b9a74121317 100644
--- a/addons/hr_evaluation/i18n/pt.po
+++ b/addons/hr_evaluation/i18n/pt.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 18:26+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) \n"
+"PO-Revision-Date: 2012-12-17 12:27+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) \n"
"Language-Team: 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:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: hr_evaluation
#: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -83,7 +83,7 @@ msgstr "Fases de Avaliação"
#. module: hr_evaluation
#: view:hr.evaluation.interview:0
msgid "Send Request"
-msgstr ""
+msgstr "Enviar pedido"
#. module: hr_evaluation
#: help:hr_evaluation.plan,month_first:0
@@ -109,7 +109,7 @@ msgstr "(eval_name)s: Nome da Avaliação"
#: field:hr.evaluation.interview,message_ids:0
#: field:hr_evaluation.evaluation,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
#. module: hr_evaluation
#: view:hr_evaluation.plan.phase:0
@@ -239,7 +239,7 @@ msgstr "Prazo limite"
#: code:addons/hr_evaluation/hr_evaluation.py:326
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Aviso!"
#. module: hr_evaluation
#: view:hr.evaluation.report:0
@@ -259,7 +259,7 @@ msgstr "(data)s: Data atual"
#. module: hr_evaluation
#: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
msgid "Interviews"
-msgstr ""
+msgstr "Entrevistas"
#. module: hr_evaluation
#: code:addons/hr_evaluation/hr_evaluation.py:82
@@ -271,13 +271,13 @@ msgstr "Tendo em conta "
#: field:hr.evaluation.interview,message_follower_ids:0
#: field:hr_evaluation.evaluation,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
#. module: hr_evaluation
#: field:hr.evaluation.interview,message_unread:0
#: field:hr_evaluation.evaluation,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens por ler"
#. module: hr_evaluation
#: view:hr.evaluation.report:0
@@ -378,7 +378,7 @@ msgstr "Julho"
#: view:hr_evaluation.evaluation:0
#: field:hr_evaluation.evaluation,state:0
msgid "Status"
-msgstr ""
+msgstr "Estado"
#. module: hr_evaluation
#: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_plans_installer
@@ -447,7 +447,7 @@ msgstr "Todas as respostas"
#: view:hr.evaluation.interview:0
#: view:hr_evaluation.evaluation:0
msgid "Answer Survey"
-msgstr ""
+msgstr "Responder a inquérito"
#. module: hr_evaluation
#: selection:hr.evaluation.report,month:0
@@ -560,7 +560,7 @@ msgstr " (employee_name)s: Nome do Parceiro"
#: field:hr.evaluation.interview,message_is_follower:0
#: field:hr_evaluation.evaluation,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "É um seguidor"
#. module: hr_evaluation
#: view:hr.evaluation.report:0
@@ -591,7 +591,7 @@ msgstr "Filtros avançados..."
#: field:hr_evaluation.evaluation,message_comment_ids:0
#: help:hr_evaluation.evaluation,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Comentários e emails"
#. module: hr_evaluation
#: help:hr_evaluation.plan.phase,send_anonymous_employee:0
@@ -617,7 +617,7 @@ msgstr "Avaliação de Entrevistas"
#: field:hr.evaluation.interview,message_summary:0
#: field:hr_evaluation.evaluation,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Resumo"
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
@@ -897,7 +897,7 @@ msgstr "Fases do Plano de Avaliação"
#: help:hr.evaluation.interview,message_ids:0
#: help:hr_evaluation.evaluation,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
#. module: hr_evaluation
#: view:hr.evaluation.interview:0
diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
index bc2e50629c3..62a5e4abd89 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report.py
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields, osv
class hr_evaluation_report(osv.osv):
_name = "hr.evaluation.report"
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index ccb8af68e21..ea20ce3cf4f 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -21,10 +21,11 @@
import time
-from osv import fields, osv
-from tools.translate import _
-import decimal_precision as dp
-import netsvc
+from openerp import netsvc
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+
+import openerp.addons.decimal_precision as dp
def _employee_get(obj, cr, uid, context=None):
if context is None:
diff --git a/addons/hr_expense/report/expense.py b/addons/hr_expense/report/expense.py
index 7078c23d244..a6898204741 100644
--- a/addons/hr_expense/report/expense.py
+++ b/addons/hr_expense/report/expense.py
@@ -19,9 +19,10 @@
#
##############################################################################
-import time
-from report import report_sxw
import datetime
+import time
+
+from openerp.report import report_sxw
class expense(report_sxw.rml_parse):
diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index 72bf710ec4f..6f18c668413 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -19,9 +19,10 @@
#
##############################################################################
-import tools
-from osv import fields,osv
-from decimal_precision import decimal_precision as dp
+from openerp import tools
+from openerp.osv import fields, osv
+
+from openerp.addons.decimal_precision import decimal_precision as dp
class hr_expense_report(osv.osv):
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 23e23dd33b5..630bce14e91 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -26,10 +26,10 @@ from itertools import groupby
from operator import itemgetter
import math
-import netsvc
-import tools
-from osv import fields, osv
-from tools.translate import _
+from openerp import netsvc
+from openerp import tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_holidays_status(osv.osv):
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index b9b05b9b782..f60d7a3ee1c 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -22,16 +22,16 @@
import datetime
import time
-from osv import fields, osv
-from report.interface import report_rml
-from report.interface import toxml
+from openerp.osv import fields, osv
+from openerp.report.interface import report_rml
+from openerp.report.interface import toxml
-import pooler
+from openerp import pooler
import time
-from report import report_sxw
-from tools import ustr
-from tools.translate import _
-from tools import to_xml
+from openerp.report import report_sxw
+from openerp.tools import ustr
+from openerp.tools.translate import _
+from openerp.tools import to_xml
def lengthmonth(year, month):
if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
diff --git a/addons/hr_holidays/report/hr_holidays_report.py b/addons/hr_holidays/report/hr_holidays_report.py
index f7b813f9cc5..394575d765d 100644
--- a/addons/hr_holidays/report/hr_holidays_report.py
+++ b/addons/hr_holidays/report/hr_holidays_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
class hr_holidays_remaining_leaves_user(osv.osv):
_name = "hr.holidays.remaining.leaves.user"
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index efd64c88500..ef1cb8f9e6f 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -21,8 +21,8 @@
##############################################################################
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_holidays_summary_dept(osv.osv_memory):
_name = 'hr.holidays.summary.dept'
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
index 2622ffa7493..1897d82c882 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class hr_holidays_summary_employee(osv.osv_memory):
_name = 'hr.holidays.summary.employee'
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index c0e4bc39321..b711ed1a9c4 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -26,13 +26,13 @@ from datetime import datetime
from datetime import timedelta
from dateutil import relativedelta
-import netsvc
-from osv import fields, osv
-import tools
-from tools.translate import _
-import decimal_precision as dp
+from openerp import netsvc
+from openerp.osv import fields, osv
+from openerp import tools
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
-from tools.safe_eval import safe_eval as eval
+from openerp.tools.safe_eval import safe_eval as eval
class hr_payroll_structure(osv.osv):
"""
diff --git a/addons/hr_payroll/report/report_contribution_register.py b/addons/hr_payroll/report/report_contribution_register.py
index c0285f3de50..39c913adada 100644
--- a/addons/hr_payroll/report/report_contribution_register.py
+++ b/addons/hr_payroll/report/report_contribution_register.py
@@ -26,7 +26,7 @@ import time
from datetime import datetime
from dateutil import relativedelta
-from report import report_sxw
+from openerp.report import report_sxw
class contribution_register_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
index df4c729b298..8ed91bd9a82 100644
--- a/addons/hr_payroll/report/report_payslip.py
+++ b/addons/hr_payroll/report/report_payslip.py
@@ -22,8 +22,8 @@
#
##############################################################################
-from report import report_sxw
-from tools import amount_to_text_en
+from openerp.report import report_sxw
+from openerp.tools import amount_to_text_en
class payslip_report(report_sxw.rml_parse):
diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py
index 5a110cbfdcd..1251fedd826 100644
--- a/addons/hr_payroll/report/report_payslip_details.py
+++ b/addons/hr_payroll/report/report_payslip_details.py
@@ -22,8 +22,8 @@
#
##############################################################################
-from report import report_sxw
-from tools import amount_to_text_en
+from openerp.report import report_sxw
+from openerp.tools import amount_to_text_en
class payslip_details_report(report_sxw.rml_parse):
diff --git a/addons/hr_payroll/res_config.py b/addons/hr_payroll/res_config.py
index 72f8b56d5da..22e7f95ccaa 100644
--- a/addons/hr_payroll/res_config.py
+++ b/addons/hr_payroll/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class human_resources_configuration(osv.osv_memory):
_inherit = 'hr.config.settings'
diff --git a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.py b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.py
index 14860cdc753..716a5060f14 100644
--- a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.py
+++ b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.py
@@ -23,7 +23,7 @@ import time
from datetime import datetime
from dateutil import relativedelta
-from osv import osv, fields
+from openerp.osv import fields, osv
class payslip_lines_contribution_register(osv.osv_memory):
_name = 'payslip.lines.contribution.register'
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
index 1c9be1f9354..aa36d223406 100644
--- a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py
@@ -23,8 +23,8 @@ import time
from datetime import datetime
from dateutil import relativedelta
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_payslip_employees(osv.osv_memory):
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 94df47f6e44..b15000dd12f 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -20,12 +20,12 @@
#
##############################################################################
import time
-import netsvc
+from openerp import netsvc
from datetime import date, datetime, timedelta
-from osv import fields, osv
-from tools import config
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools import config
+from openerp.tools.translate import _
class hr_payslip(osv.osv):
'''
diff --git a/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
index af41b7b3b51..76d197a17ec 100644
--- a/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class hr_payslip_employees(osv.osv_memory):
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index de1539da55a..214c273ffb8 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -20,13 +20,13 @@
##############################################################################
import time
-import tools
+from openerp import tools
-from base_status.base_stage import base_stage
+from openerp.addons.base_status.base_stage import base_stage
from datetime import datetime
-from osv import fields, osv
-from tools.translate import _
-from tools import html2plaintext
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.tools import html2plaintext
AVAILABLE_STATES = [
('draft', 'New'),
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index d3faa3f37be..62fa1badc41 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -18,10 +18,10 @@
# along with this program. If not, see .
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
from .. import hr_recruitment
-from decimal_precision import decimal_precision as dp
+from openerp.addons.decimal_precision import decimal_precision as dp
AVAILABLE_STATES = [
diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py
index d80b0b71727..ac53bf74ff3 100644
--- a/addons/hr_recruitment/res_config.py
+++ b/addons/hr_recruitment/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class hr_applicant_settings(osv.osv_memory):
_name = 'hr.config.settings'
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
index f1fa6446588..82dd534d81b 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
@@ -19,8 +19,8 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_recruitment_partner_create(osv.osv_memory):
_name = 'hr.recruitment.partner.create'
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
index 0b57082c019..58fb706a09e 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
@@ -19,8 +19,8 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hired_employee(osv.osv_memory):
_name = 'hired.employee'
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index f6cd3366226..212d47bb115 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -21,9 +21,9 @@
import time
-from osv import fields
-from osv import osv
-from tools.translate import _
+from openerp.osv import fields
+from openerp.osv import osv
+from openerp.tools.translate import _
class hr_employee(osv.osv):
_name = "hr.employee"
diff --git a/addons/hr_timesheet/i18n/pl.po b/addons/hr_timesheet/i18n/pl.po
index 8b8bd759d5b..a1ab6a4d36c 100644
--- a/addons/hr_timesheet/i18n/pl.po
+++ b/addons/hr_timesheet/i18n/pl.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: 2010-08-02 14:34+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) \n"
+"PO-Revision-Date: 2012-12-17 10:01+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \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-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: hr_timesheet
#: model:ir.actions.act_window,help:hr_timesheet.act_analytic_cost_revenue
@@ -74,7 +74,7 @@ msgstr ""
#. module: hr_timesheet
#: field:hr.employee,uom_id:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "Jednostka Miary"
#. module: hr_timesheet
#: field:hr.employee,journal_id:0
@@ -102,7 +102,7 @@ msgstr "Karta czasu pracy"
#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
#, python-format
msgid "Please define employee for this user!"
-msgstr ""
+msgstr "Zdefiniuj pracownika dla tego użytkownika !"
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:44
@@ -128,7 +128,7 @@ msgstr "Pią"
#: 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 "Aktywności karty pracy"
#. module: hr_timesheet
#: field:hr.sign.out.project,analytic_amount:0
@@ -165,12 +165,12 @@ msgstr "Drukuj karty pracowników"
#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
#, python-format
msgid "Please define employee for your user."
-msgstr ""
+msgstr "Zdefiniuj pracownika dla tego użytkownika"
#. module: hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet.act_analytic_cost_revenue
msgid "Costs & Revenues"
-msgstr ""
+msgstr "Koszty i przychody"
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:44
@@ -187,7 +187,7 @@ msgstr "Konto analityczne"
#. module: hr_timesheet
#: view:account.analytic.account:0
msgid "Costs and Revenues"
-msgstr ""
+msgstr "Koszty i przychody"
#. module: hr_timesheet
#: code:addons/hr_timesheet/hr_timesheet.py:141
@@ -197,7 +197,7 @@ msgstr ""
#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Ostrzeżenie !"
#. module: hr_timesheet
#: field:hr.analytic.timesheet,partner_id:0
@@ -347,12 +347,12 @@ msgstr "Opis pracy"
#: view:hr.sign.in.project:0
#: view:hr.sign.out.project:0
msgid "or"
-msgstr ""
+msgstr "lub"
#. module: hr_timesheet
#: xsl:hr.analytical.timesheet:0
msgid "Timesheet by Employee"
-msgstr ""
+msgstr "karty pracy wg pracowników"
#. module: hr_timesheet
#: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
@@ -431,7 +431,7 @@ msgstr "Czerwiec"
#: field:hr.sign.in.project,state:0
#: field:hr.sign.out.project,state:0
msgid "Current Status"
-msgstr ""
+msgstr "Bieżący stan"
#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
@@ -481,7 +481,7 @@ msgstr "Czw"
#: view:hr.sign.in.project:0
#: view:hr.sign.out.project:0
msgid "Sign In/Out by Project"
-msgstr ""
+msgstr "Wejścia/Wyjścia wg projektów"
#. module: hr_timesheet
#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
@@ -497,7 +497,7 @@ msgstr "ID pracownika"
#. module: hr_timesheet
#: view:hr.analytical.timesheet.users:0
msgid "Period"
-msgstr ""
+msgstr "Okres"
#. module: hr_timesheet
#: view:hr.sign.out.project:0
@@ -639,7 +639,7 @@ msgstr "Kwiecień"
#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
#, python-format
msgid "User Error!"
-msgstr ""
+msgstr "Błąd użytkownika!"
#. module: hr_timesheet
#: view:hr.sign.in.project:0
@@ -655,7 +655,7 @@ msgstr "Rok"
#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
msgid "Duration"
-msgstr ""
+msgstr "Czas trwania"
#. module: hr_timesheet
#: view:hr.analytic.timesheet:0
diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index 8d2a7d35678..b86a6e8e89d 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -21,14 +21,14 @@
import datetime
-from report.interface import report_rml
-from report.interface import toxml
-from tools.translate import _
+from openerp.report.interface import report_rml
+from openerp.report.interface import toxml
+from openerp.tools.translate import _
import time
-import pooler
-from report import report_sxw
-from tools import ustr
-from tools import to_xml
+from openerp import pooler
+from openerp.report import report_sxw
+from openerp.tools import ustr
+from openerp.tools import to_xml
def lengthmonth(year, month):
if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index 4c619721329..4827994f2cd 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -20,13 +20,13 @@
##############################################################################
import datetime
-from report.interface import report_rml
-from report.interface import toxml
+from openerp.report.interface import report_rml
+from openerp.report.interface import toxml
import time
-import pooler
-from tools.translate import _
-from report import report_sxw
-from tools import ustr
+from openerp import pooler
+from openerp.tools.translate import _
+from openerp.report import report_sxw
+from openerp.tools import ustr
def lengthmonth(year, month):
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
index 96ce23fb855..1523756aae0 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -20,8 +20,8 @@
##############################################################################
import datetime
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class analytical_timesheet_employee(osv.osv_memory):
_name = 'hr.analytical.timesheet.employee'
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
index 2a91bb607a4..8d9f0b01f68 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
@@ -21,7 +21,7 @@
import datetime
-from osv import osv, fields
+from openerp.osv import fields, osv
class analytical_timesheet_employees(osv.osv_memory):
_name = 'hr.analytical.timesheet.users'
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index 242658bc0c0..054e797a884 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_so_project(osv.osv_memory):
_name = 'hr.sign.out.project'
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index ccc9bb72527..3d6733d0d73 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -21,8 +21,8 @@
import time
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_timesheet_invoice_factor(osv.osv):
_name = "hr_timesheet_invoice.factor"
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 2f90e5e62c8..5ebc31cabd4 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/i18n/pl.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-02-07 19:49+0000\n"
+"PO-Revision-Date: 2012-12-17 20:55+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \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-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
@@ -25,7 +25,7 @@ msgstr "Karty czasu pracy wg użytkownika"
#. module: hr_timesheet_invoice
#: field:hr_timesheet_invoice.factor,name:0
msgid "Internal Name"
-msgstr ""
+msgstr "Nazwa wewnętrzna"
#. module: hr_timesheet_invoice
#: view:hr_timesheet_invoice.factor:0
@@ -38,18 +38,20 @@ msgid ""
"The product to invoice is defined on the employee form, the price will be "
"deducted by this pricelist on the product."
msgstr ""
+"Produkt do fakturowania jest zdefiniowany w formularzu pracownika. Cena "
+"będzie pobrana z cennika w produkcie."
#. 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 "Nie znaleziono rekordu dla tego raportu."
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
#, python-format
msgid "Insufficient Data!"
-msgstr ""
+msgstr "Za mało danych!"
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
@@ -69,7 +71,7 @@ msgstr "Przychód"
#. module: hr_timesheet_invoice
#: field:hr.timesheet.invoice.create.final,name:0
msgid "Log of Activity"
-msgstr ""
+msgstr "Zarejestrowane aktywności"
#. module: hr_timesheet_invoice
#: view:account.analytic.account:0
@@ -79,7 +81,7 @@ msgstr "Ponownie otwórz projekt"
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,product_uom_id:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "Jednostka Miary"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
@@ -103,6 +105,10 @@ msgid ""
"20% advance invoice (fixed price, based on a sale order), you should invoice "
"the rest on timesheet with a 80% ratio."
msgstr ""
+"Zwykle fakturujesz 100% czasu z karty pracy. Ale jeśli stosujesz stałe ceny "
+"i fakturowanie czasu, to możesz stosować współczynniki. Na przykład: jeśli "
+"bierzesz zaliczkę 20% według stałych cen z oferty, to powinieneś fakturować "
+"resztę jako 80%."
#. module: hr_timesheet_invoice
#: report:account.analytic.profit:0
@@ -142,6 +148,8 @@ 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 ""
+"Wypełnij to pole, jeśli chcesz wymusić określony produkt na fakturze. Zostaw "
+"puste, aby stosować produkt pochodzący z kosztu."
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -179,7 +187,7 @@ msgstr "Kwota zafakturowana"
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
#, python-format
msgid "Analytic Account incomplete !"
-msgstr ""
+msgstr "Niekompletne konto analityczne !"
#. module: hr_timesheet_invoice
#: field:report_timesheet.invoice,account_id:0
@@ -191,7 +199,7 @@ msgstr "Projekt"
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Błąd!"
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,amount:0
@@ -207,12 +215,12 @@ msgstr "Szczegóły każdej wykonanej pracy będą widoczne w fakturze"
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116
#, python-format
msgid "Contract has been set as pending."
-msgstr ""
+msgstr "Umowa została ustawiona na oczekiwanie."
#. module: hr_timesheet_invoice
#: field:account.analytic.account,pricelist_id:0
msgid "Pricelist"
-msgstr ""
+msgstr "Cennik"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
@@ -257,12 +265,12 @@ msgstr "Termin"
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
#, python-format
msgid "Configuration Error!"
-msgstr ""
+msgstr "Błąd konfiguracji!"
#. module: hr_timesheet_invoice
#: field:report.analytic.account.close,partner_id:0
msgid "Partner"
-msgstr ""
+msgstr "Partner"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.invoice.create,time:0
@@ -272,7 +280,7 @@ msgstr "Czas każdej wykonanej pracy będzie widoczny w fakturze"
#. module: hr_timesheet_invoice
#: view:account.analytic.account:0
msgid "Cancel Contract"
-msgstr ""
+msgstr "Anuluj umowę"
#. module: hr_timesheet_invoice
#: field:hr.timesheet.analytic.profit,date_from:0
@@ -282,7 +290,7 @@ msgstr "Od"
#. module: hr_timesheet_invoice
#: report:account.analytic.profit:0
msgid "User or Journal Name"
-msgstr ""
+msgstr "Użytkownik lub nazwa dziennika"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_invoice
@@ -294,7 +302,7 @@ msgstr "Koszty do faktury"
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
#, python-format
msgid "Please define income account for product '%s'."
-msgstr ""
+msgstr "Zdefiniuj konto przychodów dla produktu '%s'."
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,account_id:0
@@ -318,11 +326,13 @@ msgid ""
"The cost of each work done will be displayed on the invoice. You probably "
"don't want to check this"
msgstr ""
+"Koszt pracy będzie wydrukowany na fakturze. Prawdopodobnie nie chcesz tego "
+"zaznaczyć."
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create.final:0
msgid "Force to use a special product"
-msgstr ""
+msgstr "Wymuś inny produkt."
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_user_stat_all
@@ -340,7 +350,7 @@ msgstr "Do zafakturowania"
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
#, python-format
msgid "Contract has been closed."
-msgstr ""
+msgstr "Umowa została zamknięta."
#. module: hr_timesheet_invoice
#: view:hr.timesheet.analytic.profit:0
@@ -353,12 +363,12 @@ msgstr "Zysk karty czasu pracy"
#. module: hr_timesheet_invoice
#: field:hr.timesheet.invoice.create,product:0
msgid "Force Product"
-msgstr ""
+msgstr "Wymuś produkt"
#. module: hr_timesheet_invoice
#: view:account.analytic.account:0
msgid "Contract Finished"
-msgstr ""
+msgstr "Umowa zakończona"
#. module: hr_timesheet_invoice
#: selection:report.account.analytic.line.to.invoice,month:0
@@ -372,13 +382,13 @@ msgstr "Lipiec"
#. module: hr_timesheet_invoice
#: field:account.analytic.line,to_invoice:0
msgid "Invoiceable"
-msgstr ""
+msgstr "Do fakturowania"
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:56
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Ostrzeżenie !"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -394,7 +404,7 @@ msgstr "Teoretyczny"
#. module: hr_timesheet_invoice
#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
msgid "Free of charge"
-msgstr ""
+msgstr "Bezpłatne"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
@@ -425,7 +435,7 @@ msgstr "Tak (100%)"
#. module: hr_timesheet_invoice
#: view:report_timesheet.user:0
msgid "Timesheet by users"
-msgstr ""
+msgstr "Karty pracy wg użytkowników"
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:58
@@ -446,7 +456,7 @@ msgstr "Grudzień"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create.final:0
msgid "Invoice contract"
-msgstr ""
+msgstr "Fakturuj umowę"
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,month:0
@@ -471,7 +481,7 @@ msgstr "Użytkownicy"
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
msgid "Non Assigned timesheets to users"
-msgstr ""
+msgstr "Karty pracy nieprzypisane do użytkowników"
#. module: hr_timesheet_invoice
#: view:account.analytic.line:0
@@ -623,7 +633,7 @@ msgstr "Data"
#. module: hr_timesheet_invoice
#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
msgid "finished"
-msgstr ""
+msgstr "zakończono"
#. module: hr_timesheet_invoice
#: field:report.timesheet.line,quantity:0
@@ -632,7 +642,7 @@ msgstr ""
#: field:report_timesheet.invoice,quantity:0
#: field:report_timesheet.user,quantity:0
msgid "Time"
-msgstr ""
+msgstr "Czas"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create_final
@@ -658,7 +668,7 @@ msgstr "Konto ogólne"
#. module: hr_timesheet_invoice
#: view:account.analytic.account:0
msgid "Invoice on Timesheets Options"
-msgstr ""
+msgstr "Opcje fakturowania wg kart pracy"
#. module: hr_timesheet_invoice
#: report:account.analytic.profit:0
@@ -668,7 +678,7 @@ msgstr "Sumy:"
#. module: hr_timesheet_invoice
#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
msgid "canceled"
-msgstr ""
+msgstr "anulowano"
#. module: hr_timesheet_invoice
#: help:account.analytic.line,to_invoice:0
@@ -676,6 +686,8 @@ msgid ""
"It allows to set the discount while making invoice, keep empty if the "
"activities should not be invoiced."
msgstr ""
+"To pozwala stosować upusty w fakturach. Zostaw puste, jeśli aktywności nie "
+"powinny być fakturowane."
#. module: hr_timesheet_invoice
#: field:account.analytic.account,amount_max:0
@@ -685,7 +697,7 @@ msgstr "Maks. cena faktury"
#. module: hr_timesheet_invoice
#: field:account.analytic.account,to_invoice:0
msgid "Timesheet Invoicing Ratio"
-msgstr ""
+msgstr "Współczynnik fakturowania kart pracy"
#. module: hr_timesheet_invoice
#: selection:report.account.analytic.line.to.invoice,month:0
@@ -721,12 +733,12 @@ msgstr "Pozycja karty czasu pracy"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create:0
msgid "Billing Data"
-msgstr ""
+msgstr "Dane do fakturowania"
#. module: hr_timesheet_invoice
#: help:hr_timesheet_invoice.factor,customer_name:0
msgid "Label for the customer"
-msgstr ""
+msgstr "Etykieta dla klienta"
#. module: hr_timesheet_invoice
#: field:hr.timesheet.analytic.profit,date_to:0
@@ -736,7 +748,7 @@ msgstr "Do"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create:0
msgid "Do you want to show details of work in invoice?"
-msgstr ""
+msgstr "Czy chcesz pokazać szczegóły pracy na fakturze?"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create:0
@@ -770,14 +782,14 @@ msgstr "Karta czasu pracy do zafakturowania"
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
#, python-format
msgid "Contract has been canceled."
-msgstr ""
+msgstr "Umowa została anulowana."
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
#, python-format
msgid ""
"Contract incomplete. Please fill in the Customer and Pricelist fields."
-msgstr ""
+msgstr "Umowa jest niekompletna. Wypełnij pola Klient i Cennik."
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
@@ -819,28 +831,28 @@ msgstr "Dziennik"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.invoice.create.final,product:0
msgid "The product that will be used to invoice the remaining amount"
-msgstr ""
+msgstr "Produkt, który będzie stosowany do fakturowania pozostałej kwoty."
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110
#, python-format
msgid "Contract has been opened."
-msgstr ""
+msgstr "Umowa została otwarta."
#. module: hr_timesheet_invoice
#: field:hr.timesheet.invoice.create.final,time:0
msgid "Time Spent"
-msgstr ""
+msgstr "Spędzony czas"
#. module: hr_timesheet_invoice
#: help:account.analytic.account,amount_max:0
msgid "Keep empty if this contract is not limited to a total fixed price."
-msgstr ""
+msgstr "Zostaw puste, jeśli umowa nie jest ograniczona stałą ceną."
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create.final:0
msgid "Do you want to show details of each activity to your customer?"
-msgstr ""
+msgstr "Czy chcesz pokazać szczegóły każdej aktywności klientowi?"
#. module: hr_timesheet_invoice
#: view:report_timesheet.invoice:0
@@ -869,7 +881,7 @@ msgstr "Nazwa"
#. module: hr_timesheet_invoice
#: view:report.account.analytic.line.to.invoice:0
msgid "Analytic Lines"
-msgstr ""
+msgstr "Pozycje analityczne"
#. module: hr_timesheet_invoice
#: view:report_timesheet.account.date:0
@@ -884,7 +896,7 @@ msgstr "Cena sprzedaży"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
msgid "Print Timesheet Profit"
-msgstr ""
+msgstr "Drukuj zysk karty pracy"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
@@ -907,17 +919,18 @@ msgid ""
"There is no product defined. Please select one or force the product through "
"the wizard."
msgstr ""
+"Nie zdefiniowano produktu. Wybierz produkt lub wymuś produkt w kreatorze."
#. module: hr_timesheet_invoice
#: help:hr_timesheet_invoice.factor,factor:0
msgid "Discount in percentage"
-msgstr ""
+msgstr "Upust w procentach"
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:56
#, python-format
msgid "Invoice is already linked to some of the analytic line(s)!"
-msgstr ""
+msgstr "Faktura jest już powiązana z jakimś zapisem analitycznym !"
#. module: hr_timesheet_invoice
#: field:hr.timesheet.invoice.create,name:0
@@ -939,14 +952,14 @@ msgstr "Pozycje analityczne do zafakturowania"
#. module: hr_timesheet_invoice
#: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor4
msgid "80%"
-msgstr ""
+msgstr "80%"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.analytic.profit:0
#: view:hr.timesheet.invoice.create:0
#: view:hr.timesheet.invoice.create.final:0
msgid "or"
-msgstr ""
+msgstr "lub"
#. module: hr_timesheet_invoice
#: field:report_timesheet.invoice,manager_id:0
@@ -976,7 +989,7 @@ msgstr "Rok"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.analytic.profit:0
msgid "Duration"
-msgstr ""
+msgstr "Czas trwania"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.py b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
index fc44089bf9e..57fd06b0c34 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from report import report_sxw
-import pooler
+from openerp.report import report_sxw
+from openerp import pooler
class account_analytic_profit(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
index 7af9603ebd8..02b46b71b20 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields,osv
-from tools.sql import drop_view_if_exists
+from openerp.osv import fields,osv
+from openerp.tools.sql import drop_view_if_exists
class report_timesheet_line(osv.osv):
_name = "report.timesheet.line"
diff --git a/addons/hr_timesheet_invoice/report/report_analytic.py b/addons/hr_timesheet_invoice/report/report_analytic.py
index 469e13e71b6..53912fcb1d6 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic.py
+++ b/addons/hr_timesheet_invoice/report/report_analytic.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields,osv
-import tools
-from decimal_precision import decimal_precision as dp
+from openerp.osv import fields,osv
+from openerp import tools
+from openerp.addons.decimal_precision import decimal_precision as dp
class report_analytic_account_close(osv.osv):
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
index 0ab5b434a91..6c6523f93f9 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
@@ -20,8 +20,8 @@
##############################################################################
import datetime
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class account_analytic_profit(osv.osv_memory):
_name = 'hr.timesheet.analytic.profit'
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
index 2671cd1ab90..1977d6cccc5 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py
@@ -21,8 +21,8 @@
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
#
# Create an final invoice based on selected timesheet lines
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 0a8fd36f469..6aa8b0f9d8d 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -20,8 +20,8 @@
##############################################################################
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_timesheet_invoice_create(osv.osv_memory):
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index f4ab61b028f..c30ea10c603 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -23,9 +23,9 @@ import time
from datetime import datetime, timedelta
from dateutil.relativedelta import relativedelta
-from osv import fields, osv
-from tools.translate import _
-import netsvc
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import netsvc
class hr_timesheet_sheet(osv.osv):
_name = "hr_timesheet_sheet.sheet"
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 1dd9d8323bf..644586ec502 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -99,7 +99,7 @@
-
+
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index 00232a128fc..ea55c9fb64d 100644
--- a/addons/hr_timesheet_sheet/i18n/pl.po
+++ b/addons/hr_timesheet_sheet/i18n/pl.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-08 17:57+0000\n"
+"PO-Revision-Date: 2012-12-17 20:58+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \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:36+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: hr_timesheet_sheet
#: field:hr.analytic.timesheet,sheet_id:0
@@ -33,7 +33,7 @@ msgstr "Usługa"
#: field:hr.timesheet.report,quantity:0
#: field:timesheet.report,quantity:0
msgid "Time"
-msgstr ""
+msgstr "Czas"
#. module: hr_timesheet_sheet
#: help:hr.config.settings,timesheet_max_difference:0
@@ -42,6 +42,9 @@ msgid ""
" computation for one sheet. Set this to 0 if you do not want "
"any control."
msgstr ""
+"Dozwolone różnice (w godzinach) pomiędzy wejściem i wyjściem a obliczeniami\n"
+" w jednej karcie pracy. Ustaw 0, jeśli nie chcesz żadnej "
+"kontroli."
#. module: hr_timesheet_sheet
#: view:hr.timesheet.report:0
@@ -76,6 +79,8 @@ msgid ""
"In order to create a timesheet for this employee, you must assign an "
"analytic journal to the employee, like 'Timesheet Journal'."
msgstr ""
+"Aby utworzyć kartę pracy dla użytkownika, to musisz najpierw przypisać mu "
+"dziennik analityczny. np. 'Dziennik pracy'."
#. module: hr_timesheet_sheet
#: selection:hr.timesheet.report,month:0
@@ -92,7 +97,7 @@ msgstr "#Koszt"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Nieprzeczytane wiadomości"
#. module: hr_timesheet_sheet
#: view:hr.timesheet.report:0
@@ -122,7 +127,7 @@ msgstr "Ustaw na projekt"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Timesheet Period"
-msgstr ""
+msgstr "Okres karty pracy"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,date_to:0
@@ -133,7 +138,7 @@ msgstr "Data do"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "to"
-msgstr ""
+msgstr "do"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -145,7 +150,7 @@ msgstr "Na podstawie karty"
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
#, python-format
msgid "You cannot modify an entry in a confirmed timesheet."
-msgstr ""
+msgstr "Nie możesz modyfikować zapisów w potwierdzonej karcie pracy."
#. module: hr_timesheet_sheet
#: view:hr.timesheet.report:0
@@ -188,13 +193,13 @@ msgstr "Odrzuć"
#: view:hr_timesheet_sheet.sheet:0
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
msgid "Timesheet Activities"
-msgstr ""
+msgstr "Aktywności karty pracy"
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
#, python-format
msgid "Please create an employee and associate it with this user."
-msgstr ""
+msgstr "Utwórz pracownika i przypisz do tego użytkownika."
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
@@ -202,13 +207,13 @@ msgstr ""
#, python-format
msgid ""
"You cannot enter an attendance date outside the current timesheet dates."
-msgstr ""
+msgstr "Nie możesz wprowadzić obecności poza datami bieżącej karty pracy."
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:205
#, python-format
msgid "Week "
-msgstr ""
+msgstr "Tydzień "
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -220,11 +225,17 @@ msgid ""
"the user and can be validated by his manager. If required, as defined on the "
"project, you can generate the invoices based on the timesheet."
msgstr ""
+"Moja karta pracy otwiera kartę, w której możesz wprowadzać swoje aktywności. "
+"W tym samym formularzu możesz rejestrować obecności (Wejścia/Wyjścia) i "
+"opisywać godziny spędzone nad projektami. Na koniec okresu zdefiniowanego w "
+"firmie karta jest potwierdzana przez użytkownika i może być zatwierdzana "
+"przez menedżera. Jeśli trzeba, to według definicji w projekcie, możesz "
+"generować faktury na podstawie kart pracy."
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Wiadomości"
#. module: hr_timesheet_sheet
#: help:hr_timesheet_sheet.sheet,state:0
@@ -236,6 +247,11 @@ msgid ""
"* The 'Done' status is used when users timesheet is accepted by his/her "
"senior."
msgstr ""
+" * Stan 'Projekt' oznacza nową niepotwierdzoną kartę pracy. "
+"\n"
+"* Stan 'Potwierdzone' oznacza kartę potwierdzoną przez użytkownika. "
+" \n"
+"* Stan 'Wykonano' oznacza kartę zaakceptowaną przez przełożonego."
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:64
@@ -250,26 +266,27 @@ msgstr ""
#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Błąd!"
#. module: hr_timesheet_sheet
#: field:hr.config.settings,timesheet_max_difference:0
msgid ""
"Allow a difference of time between timesheets and attendances of (in hours)"
msgstr ""
+"Zezwól na różnicę pomiędzy czasem karty pracy i obecnościami (w godzinach)."
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:99
#, python-format
msgid ""
"Please verify that the total difference of the sheet is lower than %.2f."
-msgstr ""
+msgstr "Sprawdź, czy różnica w karcie pracy jest mniejsza niż %.2f."
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
msgid "Timesheet Sheet Analysis"
-msgstr ""
+msgstr "Analiza arkusza kart pracy"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet.account,name:0
@@ -284,7 +301,7 @@ msgstr "Zatwierdzenie"
#. module: hr_timesheet_sheet
#: help:hr_timesheet_sheet.sheet,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Jeśli zaznaczone, to wiadomość wymaga twojej uwagi."
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:69
@@ -294,6 +311,8 @@ msgid ""
"In order to create a timesheet for this employee, you must assign it to a "
"user."
msgstr ""
+"Aby utworzyć kartę pracy dla tego pracownika, musisz przypisać ją do "
+"użytkownika."
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
@@ -305,7 +324,7 @@ msgstr "Zapis pracownika w karcie"
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:215
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Niedozwolona akcja!"
#. module: hr_timesheet_sheet
#: view:hr.timesheet.report:0
@@ -321,11 +340,14 @@ msgid ""
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Zawiera podsumowanie wypowiedzi (liczbę wiadomości, ...). To podsumowanie "
+"jest bezpośrednio w formacie html, aby można je było stosować w widokach "
+"kanban."
#. module: hr_timesheet_sheet
#: field:timesheet.report,nbr:0
msgid "#Nbr"
-msgstr ""
+msgstr "#Lp"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,date_from:0
@@ -368,7 +390,7 @@ msgstr "Pozycje karty czasu pracy"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Obserwatorzy"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
@@ -400,7 +422,7 @@ msgstr "Czas całkowity"
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
msgid "Timesheets to Validate"
-msgstr ""
+msgstr "Karty pracy do zatwierdzenia"
#. module: hr_timesheet_sheet
#: view:hr.timesheet.report:0
@@ -428,14 +450,14 @@ msgstr "Lipiec"
#. module: hr_timesheet_sheet
#: field:hr.config.settings,timesheet_range:0
msgid "Validate timesheets every"
-msgstr ""
+msgstr "Zatwierdzaj karty pracy co"
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:73
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:86
#, python-format
msgid "Configuration Error!"
-msgstr ""
+msgstr "Błąd konfiguracji!"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,state:0
@@ -499,6 +521,8 @@ msgid ""
"In order to create a timesheet for this employee, you must link the employee "
"to a product, like 'Consultant'."
msgstr ""
+"Aby utworzyć kartę pracy dla tego pracownika. musisz powiązać pracownika z "
+"produktem np. 'Konsultant'."
#. module: hr_timesheet_sheet
#: selection:hr.timesheet.report,month:0
@@ -531,7 +555,7 @@ msgstr "Miesiąc"
#: view:timesheet.report:0
#: field:timesheet.report,total_diff:0
msgid "#Total Diff"
-msgstr ""
+msgstr "#SumaRóżn"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
@@ -550,6 +574,8 @@ msgid ""
"In order to create a timesheet for this employee, you must link the employee "
"to a product."
msgstr ""
+"Aby utworzyć kartę pracy dla tego pracownika, musisz powiązać pracownika z "
+"produktem."
#. module: hr_timesheet_sheet
#. openerp-web
@@ -559,11 +585,13 @@ msgid ""
"You will be able to register your working hours and\n"
" activities."
msgstr ""
+"Będziesz mógł rejestrować swoje godziny pracy i\n"
+" aktywności."
#. module: hr_timesheet_sheet
#: view:hr.timesheet.current.open:0
msgid "or"
-msgstr ""
+msgstr "lub"
#. module: hr_timesheet_sheet
#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -576,6 +604,8 @@ msgid ""
"The timesheet line represents the time spent by the employee on a specific "
"service provided."
msgstr ""
+"Pozycja karty pracy reprezentuje czas spędzony przez pracownika nad "
+"określonym zadaniem."
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,name:0
@@ -587,7 +617,7 @@ msgstr "Notatka"
#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:33
#, python-format
msgid "Add"
-msgstr ""
+msgstr "Dodaj"
#. module: hr_timesheet_sheet
#: view:timesheet.report:0
@@ -598,17 +628,17 @@ msgstr "Projekt"
#. module: hr_timesheet_sheet
#: field:res.company,timesheet_max_difference:0
msgid "Timesheet allowed difference(Hours)"
-msgstr ""
+msgstr "Dozwolone różnice karty pracy (w godzinach)"
#. module: hr_timesheet_sheet
#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
msgid "The invoice is created based on the timesheet."
-msgstr ""
+msgstr "faktura utworzona na podstawie karyy pracy."
#. module: hr_timesheet_sheet
#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
msgid "Draft Timesheet"
-msgstr ""
+msgstr "Projekty kart pracy"
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -626,11 +656,23 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Nowa karta pracy do zaaprobowania.\n"
+"
\n"
+" Musisz rejestrować czas w karcie pracy codziennie i\n"
+" potwierdzać na końcu tygodnia. Kiedy karta pracy jest\n"
+" potwierdzona, to powinna być zatwierdzona przez\n"
+" menedżera.\n"
+"
\n"
+" Karty pracy mogą być fakturowane na klienta według\n"
+" ustawień w umowie dla projektu.\n"
+"
\n"
+" "
#. module: hr_timesheet_sheet
#: model:ir.model,name:hr_timesheet_sheet.model_account_analytic_line
msgid "Analytic Line"
-msgstr ""
+msgstr "Pozycja analityczna"
#. module: hr_timesheet_sheet
#: selection:hr.timesheet.report,month:0
@@ -641,7 +683,7 @@ msgstr "Sierpień"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Differences"
-msgstr ""
+msgstr "Różnice"
#. module: hr_timesheet_sheet
#: selection:hr.timesheet.report,month:0
@@ -664,12 +706,12 @@ msgstr "Tydzień"
#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
msgid "Timesheets by Period"
-msgstr ""
+msgstr "Karty pracy wg okresów"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Jest obserwatorem"
#. module: hr_timesheet_sheet
#: view:hr.timesheet.report:0
@@ -713,7 +755,7 @@ msgstr "Zakres kart"
#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Komentarze i emaile"
#. module: hr_timesheet_sheet
#: selection:hr.timesheet.report,month:0
@@ -728,6 +770,7 @@ msgid ""
"The timesheet cannot be validated as it does not contain an equal number of "
"sign ins and sign outs."
msgstr ""
+"Karta pracy nie może być zatwierdzona, jeśli liczba wejść i wyjść jest różna."
#. module: hr_timesheet_sheet
#: selection:hr.timesheet.report,month:0
@@ -738,7 +781,7 @@ msgstr "Styczeń"
#. module: hr_timesheet_sheet
#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
msgid "The employee signs in and signs out."
-msgstr ""
+msgstr "Wejścia i wyjścia pracownika."
#. module: hr_timesheet_sheet
#: model:ir.model,name:hr_timesheet_sheet.model_res_company
@@ -755,7 +798,7 @@ msgstr "Podsumowanie"
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:215
#, python-format
msgid "You cannot delete a timesheet which have attendance entries."
-msgstr ""
+msgstr "Nie możesz usunąć karyy pracy, która ma zapisy obecności."
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
@@ -769,11 +812,13 @@ msgid ""
"You cannot have 2 timesheets that overlap!\n"
"You should use the menu 'My Timesheet' to avoid this problem."
msgstr ""
+"Nie możesz mieć dwóch kart pracy zachodzących na siebie!\n"
+"Zastosuj menu 'Moje karty pracy', aby zapobiec temu."
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Submit to Manager"
-msgstr ""
+msgstr "Wyślij do menedżera"
#. module: hr_timesheet_sheet
#: view:hr.timesheet.report:0
@@ -787,18 +832,18 @@ msgstr "Konto ogólne"
#: help:hr.config.settings,timesheet_range:0
#: help:res.company,timesheet_range:0
msgid "Periodicity on which you validate your timesheets."
-msgstr ""
+msgstr "Okresy, w których zatwierdzasz swoje karty pracy."
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet.account:0
msgid "Search Account"
-msgstr ""
+msgstr "Szukaj konta"
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
#, python-format
msgid "You cannot modify an entry in a confirmed timesheet"
-msgstr ""
+msgstr "Nie możesz modyfikować zapisu w potwierdzonej karcie pracy"
#. module: hr_timesheet_sheet
#: help:res.company,timesheet_max_difference:0
@@ -806,6 +851,8 @@ msgid ""
"Allowed difference in hours between the sign in/out and the timesheet "
"computation for one sheet. Set this to 0 if you do not want any control."
msgstr ""
+"Dozwolone różnice (w godzinach) pomiędzy wejściem i wyjściem a obliczeniami "
+"w jednej karcie pracy. Ustaw 0, jeśli nie chcesz żadnej kontroli."
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
@@ -830,6 +877,8 @@ msgid ""
"You cannot have 2 timesheets that overlap!\n"
"Please use the menu 'My Current Timesheet' to avoid this problem."
msgstr ""
+"Nie możesz mieć dwóch kart pracy zachodzących na siebie!\n"
+"Zastosuj menu 'Moje karty pracy', aby zapobiec temu."
#. module: hr_timesheet_sheet
#: view:hr.timesheet.current.open:0
@@ -857,7 +906,7 @@ msgstr "Anulowanie"
#. module: hr_timesheet_sheet
#: view:board.board:0
msgid "My Total Attendance By Week"
-msgstr ""
+msgstr "Moja suma ibecności wg tygodni"
#. module: hr_timesheet_sheet
#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -873,25 +922,25 @@ msgstr "Karta czasu pracy wg kont"
#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:50
#, python-format
msgid "Open Timesheet"
-msgstr ""
+msgstr "Otwórz karty pracy"
#. module: hr_timesheet_sheet
#: view:hr.timesheet.report:0
#: view:timesheet.report:0
msgid "Group by year of date"
-msgstr ""
+msgstr "Grupuj wg lat"
#. module: hr_timesheet_sheet
#. openerp-web
#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:56
#, python-format
msgid "Click to add projects, contracts or analytic accounts."
-msgstr ""
+msgstr "Kliknij, aby dodać projekty, umowy lub konta analityczne"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
msgid "State is 'validated'."
-msgstr ""
+msgstr "Stan jest 'zatwierdzone'"
#. module: hr_timesheet_sheet
#: model:ir.model,name:hr_timesheet_sheet.model_hr_config_settings
@@ -908,17 +957,17 @@ msgstr "Analiza czasu pracy"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Search Timesheet"
-msgstr ""
+msgstr "Szukaj kart pracy"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Confirmed Timesheets"
-msgstr ""
+msgstr "Potwierdzone karty pracy"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Details"
-msgstr ""
+msgstr "Szczegóły"
#. module: hr_timesheet_sheet
#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
@@ -929,7 +978,7 @@ msgstr "Pozycja karty czasu pracy"
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:213
#, python-format
msgid "You cannot delete a timesheet which is already confirmed."
-msgstr ""
+msgstr "Nie możesz usuwać karty pracy, która jest już potwierdzona"
#. module: hr_timesheet_sheet
#: view:hr.timesheet.report:0
@@ -955,7 +1004,7 @@ msgstr "Opis"
#. module: hr_timesheet_sheet
#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
msgid "The employee periodically confirms his own timesheets."
-msgstr ""
+msgstr "Pracownik okresowo potwierdza swoje karty pracy."
#. module: hr_timesheet_sheet
#: selection:hr.timesheet.report,month:0
@@ -976,19 +1025,19 @@ msgstr "Wyjście"
#. module: hr_timesheet_sheet
#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
msgid "Moves task entry into the timesheet line"
-msgstr ""
+msgstr "Przenosi zapis zadania do pozycji karty pracy"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet.day:0
msgid "Total Attendances"
-msgstr ""
+msgstr "Suma obecności"
#. module: hr_timesheet_sheet
#. openerp-web
#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:39
#, python-format
msgid "Add a Line"
-msgstr ""
+msgstr "Dodaj pozycję"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,total_difference:0
@@ -1000,7 +1049,7 @@ msgstr "Różnica"
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:64
#, python-format
msgid "You cannot duplicate a timesheet."
-msgstr ""
+msgstr "Nie można duplikować karty pracy."
#. module: hr_timesheet_sheet
#: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -1035,11 +1084,12 @@ msgstr "Pracownicy"
#: constraint:hr.analytic.timesheet:0
msgid "You cannot modify an entry in a Confirmed/Done timesheet !"
msgstr ""
+"Nie możesz modyfikować zapisu karty pracy w stanie Potwierdzone/Wykonano !"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
msgid "Information of time spent on a service"
-msgstr ""
+msgstr "Informacja o czasie spedzonym na zadaniu"
#. module: hr_timesheet_sheet
#: selection:hr.timesheet.report,month:0
@@ -1056,7 +1106,7 @@ msgstr "Potwierdzenie"
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:99
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Ostrzeżenie !"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -1068,7 +1118,7 @@ msgstr "Współczynnik fakturowania"
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
#, python-format
msgid "User Error!"
-msgstr ""
+msgstr "Błąd użytkownika!"
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet.day:0
@@ -1083,7 +1133,7 @@ msgstr "Aprobuj"
#. module: hr_timesheet_sheet
#: help:hr_timesheet_sheet.sheet,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Wiadomości i historia komunikacji"
#. module: hr_timesheet_sheet
#: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1094,13 +1144,13 @@ msgstr "Konta analityczne"
#: view:timesheet.report:0
#: field:timesheet.report,to_invoice:0
msgid "Type of Invoicing"
-msgstr ""
+msgstr "Typ fakturowania"
#. module: hr_timesheet_sheet
#: view:timesheet.report:0
#: field:timesheet.report,total_attendance:0
msgid "#Total Attendance"
-msgstr ""
+msgstr "#SumaObecności"
#. module: hr_timesheet_sheet
#: field:hr.timesheet.report,cost:0
@@ -1115,7 +1165,7 @@ msgstr "Bieżąca data"
#. module: hr_timesheet_sheet
#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
msgid "Hr Timesheet"
-msgstr ""
+msgstr "Kadrowa karta pracy"
#. module: hr_timesheet_sheet
#: view:hr.timesheet.report:0
@@ -1148,7 +1198,7 @@ msgstr "Suma"
#. module: hr_timesheet_sheet
#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
msgid "Defines the work summary of task"
-msgstr ""
+msgstr "Definiuje podsumowanie pracy w zadaniu"
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
index 1fdcac9f7c6..49b66b63c0f 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import tools
-from osv import fields,osv
-from decimal_precision import decimal_precision as dp
+from openerp import tools
+from openerp.osv import fields,osv
+from openerp.addons.decimal_precision import decimal_precision as dp
class hr_timesheet_report(osv.osv):
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
index e276980ddf7..31255a3a6b2 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
class timesheet_report(osv.osv):
_name = "timesheet.report"
diff --git a/addons/hr_timesheet_sheet/res_config.py b/addons/hr_timesheet_sheet/res_config.py
index bb4e098e1b3..e767b4da8fa 100644
--- a/addons/hr_timesheet_sheet/res_config.py
+++ b/addons/hr_timesheet_sheet/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class hr_timesheet_settings(osv.osv_memory):
_inherit = 'hr.config.settings'
diff --git a/addons/hr_timesheet_sheet/static/src/js/timesheet.js b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
index b5ba7f74101..fe7d0c82767 100644
--- a/addons/hr_timesheet_sheet/static/src/js/timesheet.js
+++ b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
@@ -14,7 +14,7 @@ openerp.hr_timesheet_sheet = function(instance) {
date_to: false,
date_from: false,
});
- this.updating = true;
+ this.updating = false;
this.field_manager.on("field_changed:timesheet_ids", this, this.query_sheets);
this.field_manager.on("field_changed:date_from", this, function() {
this.set({"date_from": instance.web.str_to_date(this.field_manager.get_field_value("date_from"))});
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
index 652d5139288..c2d5167c179 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class hr_timesheet_current_open(osv.osv_memory):
_name = 'hr.timesheet.current.open'
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 6ba34554a61..2bf8f390776 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv
-from osv import fields
-from tools.translate import _
+from openerp.osv import osv
+from openerp.osv import fields
+from openerp.tools.translate import _
import time
VoteValues = [('-1', 'Not Voted'), ('0', 'Very Bad'), ('25', 'Bad'), \
diff --git a/addons/knowledge/i18n/hr.po b/addons/knowledge/i18n/hr.po
index 34fffd223ce..21c8d1042bb 100644
--- a/addons/knowledge/i18n/hr.po
+++ b/addons/knowledge/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:53+0000\n"
-"PO-Revision-Date: 2012-01-28 21:40+0000\n"
+"PO-Revision-Date: 2012-12-17 20:33+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:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: knowledge
#: view:knowledge.config.settings:0
msgid "Documents"
-msgstr ""
+msgstr "Dokumenti"
#. module: knowledge
#: model:ir.model,name:knowledge.model_knowledge_config_settings
@@ -53,7 +53,7 @@ msgstr ""
#. module: knowledge
#: view:knowledge.config.settings:0
msgid "Knowledge and Documents Management"
-msgstr ""
+msgstr "Upravljanje znanjem i dokumentima"
#. module: knowledge
#: help:knowledge.config.settings,module_document:0
@@ -67,7 +67,7 @@ msgstr ""
#. module: knowledge
#: field:knowledge.config.settings,module_document_page:0
msgid "Create static web pages"
-msgstr ""
+msgstr "Kreiraj statičke web stranice"
#. module: knowledge
#: field:knowledge.config.settings,module_document_ftp:0
@@ -77,17 +77,17 @@ msgstr ""
#. module: knowledge
#: field:knowledge.config.settings,module_document:0
msgid "Manage documents"
-msgstr ""
+msgstr "Dokumenti"
#. module: knowledge
#: view:knowledge.config.settings:0
msgid "Cancel"
-msgstr ""
+msgstr "Odustani"
#. module: knowledge
#: view:knowledge.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Primjeni"
#. module: knowledge
#: model:ir.ui.menu,name:knowledge.menu_document_configuration
@@ -104,7 +104,7 @@ msgstr ""
#. module: knowledge
#: view:knowledge.config.settings:0
msgid "or"
-msgstr ""
+msgstr "ili"
#. module: knowledge
#: field:knowledge.config.settings,module_document_webdav:0
diff --git a/addons/knowledge/res_config.py b/addons/knowledge/res_config.py
index 012bd670ee3..fddbb5ebdc3 100644
--- a/addons/knowledge/res_config.py
+++ b/addons/knowledge/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class knowledge_config_settings(osv.osv_memory):
_name = 'knowledge.config.settings'
diff --git a/addons/l10n_at/account_wizard.py b/addons/l10n_at/account_wizard.py
index a3f87456cfc..278837322ac 100644
--- a/addons/l10n_at/account_wizard.py
+++ b/addons/l10n_at/account_wizard.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import tools
-from osv import osv
-import addons
+from openerp import tools
+from openerp.osv import osv
+from openerp import addons
class AccountWizard_cd(osv.osv_memory):
_inherit='wizard.multi.charts.accounts'
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 092d907e4ab..d89d427ef6b 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -26,8 +26,8 @@
##############################################################################
import base64
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class l10n_be_vat_declaration(osv.osv_memory):
""" Vat Declaration """
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
index 53948945e04..7aa612d95ff 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
@@ -26,9 +26,9 @@
import time
import base64
-from tools.translate import _
-from osv import fields, osv
-from report import report_sxw
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
+from openerp.report import report_sxw
class vat_listing_clients(osv.osv_memory):
_name = 'vat.listing.clients'
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py
index 600c77b45b0..ffd42290ed0 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra.py
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py
@@ -25,9 +25,9 @@
import time
import base64
-from osv import osv, fields
-from tools.translate import _
-from report import report_sxw
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.report import report_sxw
class partner_vat_intra(osv.osv_memory):
"""
diff --git a/addons/l10n_be_coda/l10n_be_coda.py b/addons/l10n_be_coda/l10n_be_coda.py
index 2496cb20371..cb82bef6769 100644
--- a/addons/l10n_be_coda/l10n_be_coda.py
+++ b/addons/l10n_be_coda/l10n_be_coda.py
@@ -19,9 +19,7 @@
# along with this program. If not, see .
#
##############################################################################
-
-from osv import osv, fields
-
+from openerp.osv import osv, fields
class account_bank_statement(osv.osv):
_inherit = 'account.bank.statement'
diff --git a/addons/l10n_be_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py
index 23b2775357c..2b04cf9dc56 100644
--- a/addons/l10n_be_coda/wizard/account_coda_import.py
+++ b/addons/l10n_be_coda/wizard/account_coda_import.py
@@ -19,15 +19,16 @@
# along with this program. If not, see .
#
##############################################################################
-
import base64
-from osv import fields, osv
-from tools.translate import _
import time
-import tools
-import logging
-_logger = logging.getLogger(__name__)
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import tools
+
+import logging
+
+_logger = logging.getLogger(__name__)
class account_coda_import(osv.osv_memory):
_name = 'account.coda.import'
@@ -89,19 +90,30 @@ class account_coda_import(osv.osv_memory):
raise osv.except_osv(_('Error') + ' R1002', _('Foreign bank accounts with IBAN structure are not supported '))
else: # Something else, not supported
raise osv.except_osv(_('Error') + ' R1003', _('Unsupported bank account structure '))
- bank_ids = self.pool.get('res.partner.bank').search(cr, uid, [('acc_number', '=', statement['acc_number'])])
- not_found_except = osv.except_osv(_('Error') + ' R1004', _("No matching Bank Account.\n\nPlease set-up a Bank Account with as Account Number '%s' and as Currency '%s'.") % (statement['acc_number'], statement['currency']))
+ statement['journal_id'] = False
+ statement['bank_account'] = False
+ # Belgian Account Numbers are composed of 12 digits.
+ # In OpenERP, the user can fill the bank number in any format: With or without IBan code, with or without spaces, with or without '-'
+ # The two following sql requests handle those cases.
+ if len(statement['acc_number']) >= 12:
+ # If the Account Number is >= 12 digits, it is mostlikely a Belgian Account Number (With or without IBAN).
+ # The following request try to find the Account Number using a 'like' operator.
+ # So, if the Account Number is stored with IBAN code, it can be found thanks to this.
+ cr.execute("select id from res_partner_bank where replace(replace(acc_number,' ',''),'-','') like %s", ('%' + statement['acc_number'] + '%',))
+ else:
+ # This case is necessary to avoid cases like the Account Number in the CODA file is set to a single or few digits,
+ # and so a 'like' operator would return the first account number in the database which matches.
+ cr.execute("select id from res_partner_bank where replace(replace(acc_number,' ',''),'-','') = %s", (statement['acc_number'],))
+ bank_ids = [id[0] for id in cr.fetchall()]
if bank_ids and len(bank_ids) > 0:
bank_accs = self.pool.get('res.partner.bank').browse(cr, uid, bank_ids)
for bank_acc in bank_accs:
- if (bank_acc.journal_id.currency and bank_acc.journal_id.currency.name != statement['currency']) and (not bank_acc.journal_id.currency and bank_acc.journal_id.company_id.currency_id.name != statement['currency']):
- raise not_found_except
- else:
+ if not (bank_acc.journal_id and (bank_acc.journal_id.currency and bank_acc.journal_id.currency.name != statement['currency']) and (not bank_acc.journal_id.currency and bank_acc.journal_id.company_id.currency_id.name != statement['currency'])):
statement['journal_id'] = bank_acc.journal_id
statement['bank_account'] = bank_acc
break
- else:
- raise not_found_except
+ if statement['bank_account'] == False:
+ raise osv.except_osv(_('Error') + ' R1004', _("No matching Bank Account (with Account Journal) found.\n\nPlease set-up a Bank Account with as Account Number '%s' and as Currency '%s' and an Account Journal.") % (statement['acc_number'], statement['currency']))
statement['description'] = rmspaces(line[90:125])
statement['balance_start'] = float(rmspaces(line[43:58])) / 1000
statement['balance_start_date'] = time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT, time.strptime(rmspaces(line[58:64]), '%d%m%y'))
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
index e07e8cc5682..79909cf79af 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll.py
@@ -19,8 +19,9 @@
#
##############################################################################
-from osv import fields, osv
-import decimal_precision as dp
+from openerp.osv import fields, osv
+
+import openerp.addons.decimal_precision as dp
class hr_contract_be(osv.osv):
_inherit = 'hr.contract'
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index 188a8d896fd..a23dabd7c51 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -21,8 +21,8 @@
##############################################################################
import re, time, random
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
import logging
_logger = logging.getLogger(__name__)
diff --git a/addons/l10n_be_invoice_bba/partner.py b/addons/l10n_be_invoice_bba/partner.py
index 8951be5dfa2..9e0eec10713 100644
--- a/addons/l10n_be_invoice_bba/partner.py
+++ b/addons/l10n_be_invoice_bba/partner.py
@@ -21,9 +21,9 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
import time
-from tools.translate import _
+from openerp.tools.translate import _
class res_partner(osv.osv):
""" add field to indicate default 'Communication Type' on customer invoices """
diff --git a/addons/l10n_br/account.py b/addons/l10n_br/account.py
index 64d3c2cda79..4fa9298f316 100644
--- a/addons/l10n_br/account.py
+++ b/addons/l10n_br/account.py
@@ -22,13 +22,13 @@ from datetime import datetime, timedelta
from dateutil.relativedelta import relativedelta
from operator import itemgetter
-import netsvc
-import pooler
-from osv import fields, osv
-import decimal_precision as dp
-from tools.misc import currency
-from tools.translate import _
-from tools import config
+from openerp import netsvc
+from openerp import pooler
+from openerp.osv import fields, osv
+import openerp.addons.decimal_precision as dp
+from openerp.tools.misc import currency
+from openerp.tools.translate import _
+from openerp.tools import config
from openerp import SUPERUSER_ID
class account_tax_code_template(osv.osv):
diff --git a/addons/l10n_br/l10n_br.py b/addons/l10n_br/l10n_br.py
index f35ced7ea09..aac17e1d984 100644
--- a/addons/l10n_br/l10n_br.py
+++ b/addons/l10n_br/l10n_br.py
@@ -17,7 +17,7 @@
#along with this program. If not, see . #
#################################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class l10n_br_account_cst_template(osv.osv):
_name = 'l10n_br_account.cst.template'
diff --git a/addons/l10n_ch/account_wizard.py b/addons/l10n_ch/account_wizard.py
index 306207c612d..9924b4b4b0b 100644
--- a/addons/l10n_ch/account_wizard.py
+++ b/addons/l10n_ch/account_wizard.py
@@ -18,9 +18,9 @@
# along with this program. If not, see .
#
##############################################################################
-import tools
-from osv import osv
-import addons
+from openerp import tools
+from openerp.osv import osv
+from openerp import addons
import os
class WizardMultiChartsAccounts(osv.osv_memory):
diff --git a/addons/l10n_ch/bank.py b/addons/l10n_ch/bank.py
index 4e4c0e0aa8c..5a0bc44ee27 100644
--- a/addons/l10n_ch/bank.py
+++ b/addons/l10n_ch/bank.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from tools.translate import _
-from osv import fields, osv
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
import re
class Bank(osv.osv):
diff --git a/addons/l10n_ch/company.py b/addons/l10n_ch/company.py
index a90bb6a0389..bc4da0be98e 100644
--- a/addons/l10n_ch/company.py
+++ b/addons/l10n_ch/company.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_company(osv.osv):
"""override company in order to add bvr vertical and
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 3a65e9a0d2b..d8e9cb78f02 100644
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -20,8 +20,8 @@
##############################################################################
from datetime import datetime
-from osv import fields, osv
-from tools import mod10r
+from openerp.osv import fields, osv
+from openerp.tools import mod10r
class account_invoice(osv.osv):
"""Inherit account.invoice in order to add bvr
diff --git a/addons/l10n_ch/partner.py b/addons/l10n_ch/partner.py
index aba9ea7b204..7efa5cc9216 100644
--- a/addons/l10n_ch/partner.py
+++ b/addons/l10n_ch/partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_partner(osv.osv):
_inherit = 'res.partner'
diff --git a/addons/l10n_ch/payment.py b/addons/l10n_ch/payment.py
index a681daf569d..cb0430a7b25 100644
--- a/addons/l10n_ch/payment.py
+++ b/addons/l10n_ch/payment.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv
+from openerp.osv import osv
class payment_order(osv.osv):
_inherit = 'payment.order'
diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py
index 9f650227313..a1094e16d2f 100644
--- a/addons/l10n_ch/report/report_webkit_html.py
+++ b/addons/l10n_ch/report/report_webkit_html.py
@@ -28,19 +28,20 @@ from mako.lookup import TemplateLookup
from mako import exceptions
-from report import report_sxw
-from report_webkit import webkit_report
-from report_webkit import report_helper
-
-from osv import osv
-from osv.osv import except_osv
-
-from tools import mod10r
-from tools.translate import _
-from tools.config import config
from openerp import addons
-import pooler
+from openerp import pooler
+from openerp.report import report_sxw
+
+from openerp.osv import osv
+from openerp.osv.osv import except_osv
+
+from openerp.tools import mod10r
+from openerp.tools.translate import _
+from openerp.tools.config import config
+
+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):
diff --git a/addons/l10n_ch/wizard/bvr_import.py b/addons/l10n_ch/wizard/bvr_import.py
index 38ba1e2a7d9..cc20a0a8834 100644
--- a/addons/l10n_ch/wizard/bvr_import.py
+++ b/addons/l10n_ch/wizard/bvr_import.py
@@ -22,10 +22,10 @@ import base64
import time
import re
-from tools.translate import _
-from osv import osv, fields
-from tools import mod10r
-import pooler
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools import mod10r
+from openerp import pooler
def _reconstruct_invoice_ref(cursor, user, reference, context=None):
###
diff --git a/addons/l10n_ch/wizard/create_dta.py b/addons/l10n_ch/wizard/create_dta.py
index f2d8f14b772..1696e639383 100644
--- a/addons/l10n_ch/wizard/create_dta.py
+++ b/addons/l10n_ch/wizard/create_dta.py
@@ -23,9 +23,9 @@ import time
from datetime import datetime
import base64
-from osv import osv, fields
-import pooler
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import pooler
+from openerp.tools.translate import _
import unicode2ascii
import re
diff --git a/addons/l10n_fr/l10n_fr.py b/addons/l10n_fr/l10n_fr.py
index e1240ddd83a..c995b44a614 100644
--- a/addons/l10n_fr/l10n_fr.py
+++ b/addons/l10n_fr/l10n_fr.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class l10n_fr_report(osv.osv):
_name = 'l10n.fr.report'
diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py
index 4a5aaa24823..39a18bc7ca4 100644
--- a/addons/l10n_fr/report/base_report.py
+++ b/addons/l10n_fr/report/base_report.py
@@ -28,7 +28,7 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
class base_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context=None):
diff --git a/addons/l10n_fr/report/bilan_report.py b/addons/l10n_fr/report/bilan_report.py
index fafacd8f6ea..a7947434da0 100644
--- a/addons/l10n_fr/report/bilan_report.py
+++ b/addons/l10n_fr/report/bilan_report.py
@@ -27,7 +27,7 @@
##############################################################################
import base_report
-from report import report_sxw
+from openerp.report import report_sxw
class bilan(base_report.base_report):
def __init__(self, cr, uid, name, context):
diff --git a/addons/l10n_fr/report/compute_resultant_report.py b/addons/l10n_fr/report/compute_resultant_report.py
index e91f9fc839e..9a1809fd7cc 100644
--- a/addons/l10n_fr/report/compute_resultant_report.py
+++ b/addons/l10n_fr/report/compute_resultant_report.py
@@ -27,7 +27,7 @@
##############################################################################
import base_report
-from report import report_sxw
+from openerp.report import report_sxw
class cdr(base_report.base_report):
def __init__(self, cr, uid, name, context):
diff --git a/addons/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py
index adeab4f0ab4..90e97389eed 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan.py
+++ b/addons/l10n_fr/wizard/fr_report_bilan.py
@@ -26,7 +26,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_bilan_report(osv.osv_memory):
_name = 'account.bilan.report'
diff --git a/addons/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
index f3833b372c4..eff52189bc9 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
@@ -26,7 +26,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class account_cdr_report(osv.osv_memory):
_name = 'account.cdr.report'
diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py
old mode 100755
new mode 100644
index 8b08bc2385d..0519fd86a47
--- a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py
+++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-import decimal_precision as dp
+from openerp.osv import fields, osv
+import openerp.addons.decimal_precision as dp
class res_company(osv.osv):
diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.py b/addons/l10n_fr_hr_payroll/report/fiche_paye.py
index e941be0079e..daa7c6fd6ac 100755
--- a/addons/l10n_fr_hr_payroll/report/fiche_paye.py
+++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.py
@@ -22,7 +22,7 @@
#
##############################################################################
-from report import report_sxw
+from openerp.report import report_sxw
class fiche_paye_parser(report_sxw.rml_parse):
diff --git a/addons/l10n_fr_rib/bank.py b/addons/l10n_fr_rib/bank.py
index b5d284ac45d..8ad86932a34 100644
--- a/addons/l10n_fr_rib/bank.py
+++ b/addons/l10n_fr_rib/bank.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import netsvc
-from osv import fields, osv
-from tools.translate import _
+from openerp import netsvc
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class res_partner_bank(osv.osv):
"""Add fields and behavior for French RIB"""
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
index b7c3926d727..76fc1247de6 100644
--- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -24,10 +24,10 @@ from datetime import datetime
from dateutil.relativedelta import relativedelta
from calendar import isleap
-from tools.translate import _
-from osv import fields, osv
-import netsvc
-import decimal_precision as dp
+from openerp.tools.translate import _
+from openerp.osv import fields, osv
+from openerp import netsvc
+import openerp.addons.decimal_precision as dp
DATETIME_FORMAT = "%Y-%m-%d"
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report.py b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
index a264368be94..59456b13b55 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report.py
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields, osv
+from openerp import tools
+from openerp.osv import fields, osv
class payment_advice_report(osv.osv):
_name = "payment.advice.report"
diff --git a/addons/l10n_in_hr_payroll/report/payslip_report.py b/addons/l10n_in_hr_payroll/report/payslip_report.py
index a78d9850667..b44f123547b 100644
--- a/addons/l10n_in_hr_payroll/report/payslip_report.py
+++ b/addons/l10n_in_hr_payroll/report/payslip_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields, osv
+from openerp import tools
+from openerp.osv import fields, osv
class payslip_report(osv.osv):
_name = "payslip.report"
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index 54b0daa7749..f4b282dd89c 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -22,7 +22,7 @@
import datetime
import time
-from report import report_sxw
+from openerp.report import report_sxw
class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
index 576fd302f6f..220bcdb5552 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
@@ -21,7 +21,7 @@
import time
import datetime
-from report import report_sxw
+from openerp.report import report_sxw
class employees_yearly_salary_report(report_sxw.rml_parse):
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
index d4eeaf3d218..eaece823f6d 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -24,8 +24,8 @@
import time
from datetime import datetime
-from report import report_sxw
-from tools import amount_to_text_en
+from openerp.report import report_sxw
+from openerp.tools import amount_to_text_en
class payroll_advice_report(report_sxw.rml_parse):
diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.py b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
index 2732d5d09ae..462bb374287 100644
--- a/addons/l10n_in_hr_payroll/report/report_payslip_details.py
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from report import report_sxw
+from openerp.report import report_sxw
from hr_payroll import report
class payslip_details_report_in(report.report_payslip_details.payslip_details_report):
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
index 25cc615a1df..62d332ea5b8 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
@@ -21,7 +21,7 @@
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
class hr_salary_employee_bymonth(osv.osv_memory):
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
index 16bfd63bdc9..ed2a02e8d42 100644
--- a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
+++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
@@ -21,7 +21,7 @@
import time
-from osv import fields, osv
+from openerp.osv import fields, osv
class yearly_salary_detail(osv.osv_memory):
diff --git a/addons/l10n_lu/wizard/pdf_ext.py b/addons/l10n_lu/wizard/pdf_ext.py
index e90cf0527d2..94f150e41d7 100644
--- a/addons/l10n_lu/wizard/pdf_ext.py
+++ b/addons/l10n_lu/wizard/pdf_ext.py
@@ -34,7 +34,7 @@ with flatten, everything is turned into text.
"""
import os
-import tools
+from openerp import tools
HEAD="""%FDF-1.2
%\xE2\xE3\xCF\xD3
diff --git a/addons/l10n_lu/wizard/print_vat.py b/addons/l10n_lu/wizard/print_vat.py
index 5151378d2f7..b8ffc642977 100644
--- a/addons/l10n_lu/wizard/print_vat.py
+++ b/addons/l10n_lu/wizard/print_vat.py
@@ -5,13 +5,13 @@
#Tranquil IT Systems
from __future__ import with_statement
-from osv import osv, fields
-import pooler
-import tools
-from tools.translate import _
-from report.render import render
-from report.interface import report_int
-import addons
+from openerp.osv import fields, osv
+from openerp import pooler
+from openerp import tools
+from openerp.tools.translate import _
+from openerp.report.render import render
+from openerp.report.interface import report_int
+from openerp import addons
import tempfile
import os
diff --git a/addons/l10n_ma/__init__.py b/addons/l10n_ma/__init__.py
index 7295cfdaae8..895f0216346 100644
--- a/addons/l10n_ma/__init__.py
+++ b/addons/l10n_ma/__init__.py
@@ -19,6 +19,5 @@
#
##############################################################################
import l10n_ma
-import report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ma/l10n_ma.py b/addons/l10n_ma/l10n_ma.py
index a8e0dd42687..6321516cf0f 100644
--- a/addons/l10n_ma/l10n_ma.py
+++ b/addons/l10n_ma/l10n_ma.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class l10n_ma_report(osv.osv):
_name = 'l10n.ma.report'
diff --git a/addons/l10n_multilang/account.py b/addons/l10n_multilang/account.py
index c04054d1b1c..4cb0e28b672 100644
--- a/addons/l10n_multilang/account.py
+++ b/addons/l10n_multilang/account.py
@@ -20,8 +20,8 @@
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
#in this file, we mostly add the tag translate=True on existing fields that we now want to be translated
diff --git a/addons/l10n_multilang/i18n/pt_BR.po b/addons/l10n_multilang/i18n/pt_BR.po
index b0e3ad51a43..f1948d7852c 100644
--- a/addons/l10n_multilang/i18n/pt_BR.po
+++ b/addons/l10n_multilang/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-02-08 01:06+0000\n"
-"PO-Revision-Date: 2012-09-16 00:56+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2012-12-17 22:37+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-10-30 05:36+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: l10n_multilang
#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
@@ -25,7 +26,7 @@ msgstr "Modelo para Posição Fiscal"
#. module: l10n_multilang
#: sql_constraint:account.account:0
msgid "The code of the account must be unique per company !"
-msgstr "O código da conta deve ser único por empresa !"
+msgstr "O código da conta deve ser único por empresa!"
#. module: l10n_multilang
#: constraint:account.account.template:0
@@ -66,7 +67,7 @@ msgstr "A descrição deve ser única por empresa!"
#. module: l10n_multilang
#: constraint:account.tax.code.template:0
msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Erro ! Você não pode criar Códigos de Impostos recursivos"
+msgstr "Erro! Você não pode criar Códigos de Impostos recursivos"
#. module: l10n_multilang
#: model:ir.model,name:l10n_multilang.model_account_tax_template
diff --git a/addons/l10n_multilang/l10n_multilang.py b/addons/l10n_multilang/l10n_multilang.py
index c4c6be74e4b..9596b292ff3 100644
--- a/addons/l10n_multilang/l10n_multilang.py
+++ b/addons/l10n_multilang/l10n_multilang.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
import os
-from tools.translate import _
+from openerp.tools.translate import _
import logging
_logger = logging.getLogger(__name__)
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index 02904431151..d540b477f90 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -1,10 +1,13 @@
# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved
-# $Id$
-#
+###########################################################################
+# Module Writen to OpenERP, Open Source Management Solution
+# All Rights Reserved
+###############Credits######################################################
+# Coded by: Alejandro Negrin anegrin@vauxoo.com,
+# Planified by: Alejandro Negrin, Humberto Arocha, Moises Lopez
+# Finance by: Vauxoo.
+# Audited by: Humberto Arocha (hbto@vauxoo.com) y Moises Lopez (moylop260@vauxoo.com)
+#############################################################################
# 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
@@ -17,27 +20,44 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-#
##############################################################################
-{
- 'name': 'Mexico - Accounting',
- 'version': '1.0',
- 'author': 'RelTek Mexico',
- 'category': 'Localization/Account Charts',
- 'description': """
-This is the module to manage the accounting chart for Mexico in OpenERP.
-========================================================================
-Mexican accounting chart and localization.
+{
+ "name" : "Mexico - Accounting",
+ "version" : "2.0",
+ "author" : "Vauxoo",
+ "category" : "Localization/Account Charts",
+ "description": """
+Minimal accounting configuration for Mexico.
+============================================
+
+This Chart of account is a minimal proposal to be able to use OoB the
+accounting feature of Openerp.
+
+This doesn't pretend be all the localization for MX it is just the minimal
+data required to start from 0 in mexican localization.
+
+This modules and its content is updated frequently by openerp-mexico team.
+
+With this module you will have:
+
+ - Minimal chart of account tested in production eviroments.
+ - Minimal chart of taxes, to comply with SAT_ requirements.
+
+.. SAT: http://www.sat.gob.mx/
""",
- 'depends': ['account', 'base_vat', 'account_chart'],
- 'demo': [],
- 'data': ['account_tax_code.xml','account_chart.xml',
- 'account_tax.xml','l10n_chart_mx_wizard.xml'
- ],
- 'auto_install': False,
- 'installable': True,
- 'images': ['images/config_chart_l10n_mx.jpeg','images/l10n_mx_chart.jpeg'],
+ "depends" : ["account",
+ "base_vat",
+ "account_chart",
+ ],
+ "demo_xml" : [],
+ "update_xml" : ["data/account_tax_code.xml",
+ "data/account_chart.xml",
+ "data/account_tax.xml",
+ "data/l10n_chart_mx_wizard.xml"],
+ "active": False,
+ "installable": True,
+ "certificate": False,
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_mx/account_chart.xml b/addons/l10n_mx/account_chart.xml
deleted file mode 100644
index 36a252e8c22..00000000000
--- a/addons/l10n_mx/account_chart.xml
+++ /dev/null
@@ -1,726 +0,0 @@
-
-
-
-
-
-
-
-
- Receivable
- receivable
- unreconciled
-
-
-
- Payable
- payable
- unreconciled
-
-
-
- View
- view
- none
-
-
-
- Income
- income
- none
-
-
-
- Expense
- expense
- none
-
-
-
- Tax
- tax
- unreconciled
-
-
-
- Cash
- cash
- balance
-
-
-
- Asset
- asset
- balance
-
-
-
- Equity
- equity
- liability
- balance
-
-
-
-
- 0
- Account Chart
- view
-
-
-
-
- 1000
-
-
- view
-
- ACTIVO
-
-
-
- 1050
-
-
- view
-
- Caja
-
-
-
- 1100
-
-
- other
-
- Banesco APD
-
-
-
- 1110
-
-
- other
-
- Provincial
-
-
-
- 1120
-
-
- other
-
- México
-
-
-
- 1130
-
-
- other
-
- Banesco JD
-
-
-
- 1200
-
-
- other
-
- Cuentas por Cobrar
-
-
-
- 1205
-
-
- other
-
- Provisión Cuentas Incobrables
-
-
-
- 1500
-
-
- view
-
- INVENTARIO
-
-
-
- 1520
-
-
- other
-
- Mercancía en Almacén
-
-
-
- 1530
-
-
- other
-
- Mercancía en Consignación
-
-
-
- 1800
-
-
- view
-
- ACTIVOS CAPITALES
-
-
-
- 1820
-
-
- other
-
- Mobiliario y Equipo
-
-
-
- 1825
-
-
- other
-
- Amort. Acum. -Inv. y Equip.
-
-
-
- 1840
-
-
- other
-
- Vehículo
-
-
-
- 1845
-
-
- other
-
- Amort. Acum. -Vehículo
-
-
-
- 1850
-
-
- other
-
- Edificio
-
-
-
- 1855
-
-
- other
-
- Amort. Acum. -Edificio
-
-
-
- 2000
-
-
- view
-
- PASIVO CORTO PLAZO
-
-
-
- 2100
-
-
- other
-
- Cuentas por Pagar
-
-
-
- 2150
-
-
- other
-
- IVA
-
-
-
- 2600
-
-
- view
-
- PASIVO LARGO PLAZO
-
-
-
- 2620
-
-
- other
-
- Préstamos Bancarios
-
-
-
- 2680
-
-
- other
-
- Préstamos de Accionistas
-
-
-
- 2700
-
-
- view
-
- APARTADOS
-
-
-
- 2710
-
-
- other
-
- Apartados Indem. Laborales
-
-
-
- 3300
-
-
- view
-
- CAPITAL ACCIONARIO
-
-
-
- 3350
-
-
- other
-
- Acciones Comunes
-
-
-
- 3400
-
-
- view
-
- RESERVAS
-
-
-
- 3410
-
-
- other
-
- Reserva Legal
-
-
-
- 3420
-
-
- other
-
- Reserva Voluntaria
-
-
-
- 3500
-
-
- view
-
- UTILIDADES RETENIDAS
-
-
-
- 3590
-
-
- other
-
- Utilidades Retenidas - años anteriores
-
-
-
- 3600
-
-
- other
-
- Ganancia del Ejercicio
-
-
-
- 4000
-
-
- view
-
- INGRESOS PRINCIPALES
-
-
-
- 4020
-
-
- other
-
- Ventas Autopartes
-
-
-
- 4400
-
-
- view
-
- OTROS INGRESOS
-
-
-
- 4430
-
-
- other
-
- Shipping & Handling
-
-
-
- 4440
-
-
- other
-
- Intereses
-
-
-
- 4450
-
-
- receivable
-
- Ganancia en Paridad Cambiaria
-
-
-
- 5000
-
-
- view
-
- COSTO DE VENTA
-
-
-
- 5010
-
-
- other
-
- Compras
-
-
-
- 5020
-
-
- other
-
- COSTO DE VENTA: Autopartes
-
-
-
- 5100
-
-
- other
-
- Flete
-
-
-
- 5400
-
-
- view
-
- GASTO DE PERSONAL
-
-
-
- 5405
-
-
- other
-
- Sueldos Directivo y Administradores
-
-
-
- 5410
-
-
- other
-
- Sueldos Empleados
-
-
-
- 5415
-
-
- other
-
- Comisiones Vendedores
-
-
-
- 5420
-
-
- other
-
- Vacaciones
-
-
-
- 5425
-
-
- other
-
- Bono Vacacional
-
-
-
- 5430
-
-
- other
-
- Utilidades
-
-
-
- 5435
-
-
- other
-
- Indemnizaciones
-
-
-
- 5440
-
-
- other
-
- Movilizaciones y Traslados
-
-
-
- 5445
-
-
- other
-
- Gastos de Representación
-
-
-
- 5450
-
-
- other
-
- Instrucción y Mejoramiento
-
-
-
- 5510
-
-
- other
-
- ISRL
-
-
-
- 5530
-
-
-
- other
-
- Derecho de Frente
-
-
-
-
- 5600
-
-
- view
-
- GASTOS GENERALES
-
-
-
- 5610
-
-
- other
-
- Honorarios Profesionales
-
-
-
- 5615
-
-
- other
-
- Propaganda
-
-
-
- 5660
-
-
- other
-
- Gasto de Amortización
-
-
-
- 5685
-
-
- other
-
- Seguros
-
-
-
- 5690
-
-
- other
-
- Intereses y Gastos Bancarios
-
-
-
- 5700
-
-
- other
-
- Artículos de Oficina
-
-
-
- 5760
-
-
- other
-
- Alquileres
-
-
-
- 5765
-
-
- other
-
- Reparación y Mantenimiento
-
-
-
- 5780
-
-
- other
-
- Teléfono
-
-
-
- 5785
-
-
- other
-
- Viajes y Entretenimiento
-
-
-
- 5790
-
-
- other
-
- Servicios
-
-
-
- 5795
-
-
- other
-
- Patentes
-
-
-
- 5810
-
-
- payable
-
- Pérdidas Paridad Cambiaria
-
-
-
-
-
- Mexico - Chart of Accounts
-
-
-
-
-
-
-
-
-
-
-
diff --git a/addons/l10n_mx/account_tax.xml b/addons/l10n_mx/account_tax.xml
deleted file mode 100644
index 3d5ef230db9..00000000000
--- a/addons/l10n_mx/account_tax.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
- IVA(15.0%)
- 0.150000
- percent
-
-
-
-
-
-
-
-
-
diff --git a/addons/l10n_mx/account_tax_code.xml b/addons/l10n_mx/account_tax_code.xml
deleted file mode 100644
index e9a850d4345..00000000000
--- a/addons/l10n_mx/account_tax_code.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-#
-# Tax Code Template Configuration
-#
-
- Tax
-
-
-
- Tax Balance to Pay
-
-
-
-
- Tax Due (Tax to pay)
-
-
-
-
- Tax Payable
-
-
-
-
- Tax Bases
-
-
-
-
-
- Base of Taxed Sales
-
-
-
-
-
- Base of Taxed Purchases
-
-
-
-
-
diff --git a/addons/l10n_mx/data/account_chart.xml b/addons/l10n_mx/data/account_chart.xml
new file mode 100644
index 00000000000..491942e4b72
--- /dev/null
+++ b/addons/l10n_mx/data/account_chart.xml
@@ -0,0 +1,3702 @@
+
+
+
+
+
+
+
+
+ Receivable
+ receivable
+ unreconciled
+
+
+
+ Payable
+ payable
+ unreconciled
+
+
+
+ View
+ view
+ none
+
+
+
+ other
+ other
+ none
+
+
+
+ Expense
+ expense
+ none
+
+
+
+ other
+ other
+ unreconciled
+
+
+
+ other
+ other
+ balance
+
+
+
+ other
+ other
+ balance
+
+
+
+ other
+ other
+ balance
+
+
+
+ Equity
+ equity
+ liability
+ balance
+
+
+
+
+
+
+ 0
+
+ view
+
+ PLAN CONTABLE
+
+
+
+ 1
+
+
+ view
+
+ ACTIVO
+
+
+
+ 2
+
+
+ view
+
+ PASIVO
+
+
+
+ 3
+
+
+ view
+
+ CAPITAL
+
+
+
+ 4
+
+
+ view
+
+ CUENTAS DE ORDEN
+
+
+
+ 5
+
+
+ view
+
+ INGRESOS
+
+
+
+ 6
+
+
+ view
+
+ COSTO
+
+
+
+ 7
+
+
+ view
+
+ GASTOS
+
+
+
+ 9
+
+
+ view
+
+ OTROS INGRESOS (EGRESOS)
+
+
+
+ 11
+
+
+ view
+
+ ACTIVO CIRCULANTE
+
+
+
+ 12
+
+
+ view
+
+ ACTIVO LARGO PLAZO
+
+
+
+ 21
+
+
+ view
+
+ PASIVO A CORTO PLAZO
+
+
+
+ 22
+
+
+ view
+
+ OTROS PASIVOS A CORTO PLAZO
+
+
+
+ 25
+
+
+ view
+
+ PASIVO A LARGO PLAZO
+
+
+
+ 31
+
+
+ view
+
+ CAPITAL SOCIAL
+
+
+
+ 32
+
+
+ view
+
+ SUPERAVIT
+
+
+
+ 33
+
+
+ view
+
+ RESERVA DE CAPITAL
+
+
+
+ 39
+
+
+ view
+
+ GANANCIAS Y PERDIDAS
+
+
+
+ 41
+
+
+ view
+
+ CUENTAS DE ORDEN
+
+
+
+ 45
+
+
+ view
+
+ CUENTAS DE ORDEN ACREEDORAS
+
+
+
+ 51
+
+
+ view
+
+ INGRESOS OPERACIONALES
+
+
+
+ 61
+
+
+ view
+
+ COSTO DE VENTAS
+
+
+
+ 71
+
+
+ view
+
+ GASTOS OPERATIVOS
+
+
+
+ 91
+
+
+ view
+
+ EGRESOS
+
+
+
+ 92
+
+
+ view
+
+ OTROS INGRESOS
+
+
+
+ 111
+
+
+ view
+
+ EFECTIVO Y VALORES NEGOCIABLES
+
+
+
+ 112
+
+
+ view
+
+ DOCUMENTOS Y CUENTAS POR COBRAR
+
+
+
+ 113
+
+
+ view
+
+ INVENTARIOS
+
+
+
+ 114
+
+
+ view
+
+ GASTOS OPERACIONALES
+
+
+
+ 115
+
+
+ view
+
+ IMPUESTOS PAGADOS POR ANTICIPADOS
+
+
+
+ 121
+
+
+ view
+
+ ACTIVO FIJO NETO
+
+
+
+ 122
+
+
+ view
+
+ INVERSIONES LARGO PLAZO
+
+
+
+ 125
+
+
+ view
+
+ IMPUESTOS DIFERIDOS
+
+
+
+ 127
+
+
+ view
+
+ CARGOS DIFERIDOS
+
+
+
+ 129
+
+
+ view
+
+ OTROS ACTIVOS
+
+
+
+ 211
+
+
+ view
+
+ PASIVOS FINACIEROS A CORTO PLAZO
+
+
+
+ 212
+
+
+ view
+
+ DOCUMENTOS Y CUENTAS POR PAGAR
+
+
+
+ 215
+
+
+ view
+
+ DIVIDENDO POR PAGAR
+
+
+
+ 216
+
+
+ view
+
+ ACUMULACIONES LABORALES
+
+
+
+ 217
+
+
+ view
+
+ GASTOS ACUMULADOS Y RETENCIONES POR PAGAR
+
+
+
+ 218
+
+
+ view
+
+ RESERVAS
+
+
+
+ 219
+
+
+ view
+
+ IMPUESTOS SOBRE LA RENTA POR PAGAR
+
+
+
+ 220
+
+
+ view
+
+ OTROS PASIVOS A CORTO PLAZO
+
+
+
+ 251
+
+
+ view
+
+ PASIVOS FINANCIEROS A LARGO PLAZO
+
+
+
+ 252
+
+
+ view
+
+ ACUMULACIONES PARA INDEMNIZ. LABORALES
+
+
+
+ 258
+
+
+ view
+
+ PASIVOS INTERCOMPAÑIAS
+
+
+
+ 259
+
+
+ view
+
+ OTROS PASIVOS A LARGO PLAZO
+
+
+
+ 311
+
+
+ view
+
+ CAPITAL SOCIAL PAGADO
+
+
+
+ 313
+
+
+ view
+
+ ACCIONES EN TESORERIA
+
+
+
+ 321
+
+
+ view
+
+ SUPERAVIT GANADO
+
+
+
+ 322
+
+
+ view
+
+ RESULT.POR TENDENCIA DE ACTIVO NO MONETARIOS
+
+
+
+ 331
+
+
+ view
+
+ RESERVA LEGAL
+
+
+
+ 339
+
+
+ view
+
+ OTRAS RESERVAS
+
+
+
+ 391
+
+
+ view
+
+ GANACIAS Y PERDIDAS
+
+
+
+ 411
+
+
+ view
+
+ CUENTAS DE ORDEN DEUDORAS
+
+
+
+ 451
+
+
+ view
+
+ CUENTAS DE ORDEN ACREEDORAS
+
+
+
+ 511
+
+
+ view
+
+ INGRESOS OPERACIONALES
+
+
+
+ 611
+
+
+ view
+
+ COSTO DE VENTAS
+
+
+
+ 711
+
+
+ view
+
+ GASTOS COMERCIALIZACION
+
+
+
+ 713
+
+
+ view
+
+ GASTOS DE PERSONAL
+
+
+
+ 715
+
+
+ view
+
+ GASTOS GENERALES
+
+
+
+ 716
+
+
+ view
+
+ DEPRECIACION Y AMORTIZACION
+
+
+
+ 911
+
+
+ view
+
+ GASTOS FINANCIEROS
+
+
+
+ 921
+
+
+ view
+
+ OTROS INGRESOS
+
+
+
+ 1111
+
+
+ view
+
+ CAJAS
+
+
+
+ 1113
+
+
+ view
+
+ BANCOS E INTITUCIONES FINANCIERAS
+
+
+
+ 1114
+
+
+ view
+
+ BANCOS E INSTITUCIONES FINANCIERAS EXTERIOR
+
+
+
+ 1115
+
+
+ view
+
+ INVERSIONES A CORTO PLAZO
+
+
+
+ 1121
+
+
+ view
+
+ EFECTOS POR COBRAR
+
+
+
+ 1122
+
+
+ view
+
+ CUENTAS POR COBRAR NACIONALES
+
+
+
+ 1123
+
+
+ view
+
+ CUENTAS POR COBRAR EXTERIOR
+
+
+
+ 1124
+
+
+ view
+
+ PROVINCION INCOBRABLES NACIONAL
+
+
+
+ 1125
+
+
+ view
+
+ CUENTAS POR COBRAR EMPLEADOS
+
+
+
+ 1126
+
+
+ view
+
+ INTERESES POR COBRAR
+
+
+
+ 1127
+
+
+ view
+
+ COMPAÑIAS AFILIADAS Y RELACIONADAS
+
+
+
+ 1128
+
+
+ view
+
+ CUENTAS POR COBRAR ACCIONISTAS
+
+
+
+ 1129
+
+
+ view
+
+ OTRAS CUENTAS POR COBRAR
+
+
+
+ 1131
+
+
+ view
+
+ INVENTARIOS DE MERCANCIA
+
+
+
+ 1134
+
+
+ view
+
+ INVENTARIO EN TRANSITO
+
+
+
+ 1141
+
+
+ view
+
+ GASTOS PREPAGADOS OPERATIVOS
+
+
+
+ 1151
+
+
+ view
+
+ IMPUESTOS
+
+
+
+ 1211
+
+
+ view
+
+ ACTIVO FIJO
+
+
+
+ 1212
+
+
+ view
+
+ DEPRECIACION Y AMORTIZACION ACUMULADAS
+
+
+
+ 1221
+
+
+ view
+
+ TITULOS DE VALORES
+
+
+
+ 1251
+
+
+ view
+
+ IMPUESTOS DIFERIDOS ISR
+
+
+
+ 1271
+
+
+ view
+
+ CARGOS DIFERIDOS
+
+
+
+ 1291
+
+
+ view
+
+ OTROS ACTIVOS
+
+
+
+ 2111
+
+
+ view
+
+ PASIVOS FINANCIEROS A CORTO PLAZO
+
+
+
+ 2121
+
+
+ view
+
+ PROVEEDORES EXTRANJEROS
+
+
+
+ 2122
+
+
+ view
+
+ PROVEEDORES OCASIONALES
+
+
+
+ 2123
+
+
+ view
+
+ COMPAÑIAS AFILIADAS Y RELACIONADAS
+
+
+
+ 2124
+
+
+ view
+
+ CUENTAS POR PAGAR ACCIONISTAS
+
+
+
+ 2151
+
+
+ view
+
+ DIVIDENDO POR PAGAR
+
+
+
+ 2161
+
+
+ view
+
+ APORTES EMPLEADOS
+
+
+
+ 2171
+
+
+ view
+
+ CONTRIBUCIONES PATRONAL
+
+
+
+ 2172
+
+
+ view
+
+ RETENCIONES E IMPUESTOS POR PAGAR
+
+
+
+ 2173
+
+
+ view
+
+ RETENCIONES VARIAS
+
+
+
+ 2175
+
+
+ view
+
+ OTRAS ACUMULACIONES
+
+
+
+ 2181
+
+
+ view
+
+ RESERVAS
+
+
+
+ 2191
+
+
+ view
+
+ ISR ACUMULADOS GASTOS
+
+
+
+ 2201
+
+
+ view
+
+ IMPUESTOS POR PAGAR
+
+
+
+ 2202
+
+
+ view
+
+ IVA TRASLADADO
+
+
+
+ 2511
+
+
+ view
+
+ PASIVOS FINANCIEROS A LARGO PLAZO
+
+
+
+ 2521
+
+
+ view
+
+ ACUMULACIONES PARA INDEMNIZ.LABORALES
+
+
+
+ 2581
+
+
+ view
+
+ PASIVOS INTERCOMPAÑIAS
+
+
+
+ 2591
+
+
+ view
+
+ OTROS PASIVOS A LARGO PLAZO
+
+
+
+ 3111
+
+
+ view
+
+ CAPITAL SOCIAL PAGADO
+
+
+
+ 3131
+
+
+ view
+
+ ACCIONES EN TESORERIA
+
+
+
+ 3211
+
+
+ view
+
+ SUPERAVIT OPERATIVO
+
+
+
+ 3212
+
+
+ view
+
+ RESULTADO POR EXPOS. A LA INFLACION
+
+
+
+ 3221
+
+
+ view
+
+ RESULT.POR TENDENCIA DE ACTIVO NO MONETARIOS
+
+
+
+ 3311
+
+
+ view
+
+ RESERVA LEGAL
+
+
+
+ 3391
+
+
+ view
+
+ OTRAS RESERVAS
+
+
+
+ 3911
+
+
+ view
+
+ GANACIAS Y PERDIDAS
+
+
+
+ 4111
+
+
+ view
+
+ CUENTAS DE ORDEN DEUDORAS
+
+
+
+ 4511
+
+
+ view
+
+ CUENTAS DE ORDEN ACREEDORAS
+
+
+
+ 5111
+
+
+ view
+
+ VENTAS
+
+
+
+ 5112
+
+
+ view
+
+ INGRESOS POR SERVICIOS
+
+
+
+ 5114
+
+
+ view
+
+ DESCUENTOS Y DEVOLUCION EN VENTAS
+
+
+
+ 6111
+
+
+ view
+
+ COSTO DE VENTAS
+
+
+
+ 7111
+
+
+ view
+
+ GASTOS DE DISTRIBUCION
+
+
+
+ 7131
+
+
+ view
+
+ GASTOS PERSONAL
+
+
+
+ 7151
+
+
+ view
+
+ GASTOS GENERALES
+
+
+
+ 7161
+
+
+ view
+
+ DEPRECIACION
+
+
+
+ 7162
+
+
+ view
+
+ AMORTIZACION
+
+
+
+ 9111
+
+
+ view
+
+ GASTOS FINANCIEROS
+
+
+
+ 9113
+
+
+ view
+
+ OTROS EGRESOS
+
+
+
+ 9114
+
+
+ view
+
+ EGRESOS NO GRAVABLES
+
+
+
+ 9211
+
+
+ view
+
+ INGRESOS FINANCIEROS
+
+
+
+ 9212
+
+
+ view
+
+ OTROS INGRESOS
+
+
+
+ 1111001000
+
+
+ other
+
+ CAJA CHICA
+
+
+
+ 1111002000
+
+
+ other
+
+ CAJA PRINCIPAL
+
+
+
+ 1111003000
+
+
+ other
+
+ FONDO A DEPOSITAR
+
+
+
+ 1113001000
+
+
+ liquidity
+
+ BANCO X MXN
+
+
+
+ 1113002000
+
+
+ liquidity
+
+ BANCO X USD
+
+
+
+ 1114001000
+
+
+ liquidity
+
+ BANCO EXTERIOR X
+
+
+
+ 1115001000
+
+
+ other
+
+ PAPELES COMERCIALES
+
+
+
+ 1115002000
+
+
+ other
+
+ INVERSIONES TEMPORALES
+
+
+
+ 1115003000
+
+
+ other
+
+ INVERSIONES EN BONOS M.N.
+
+
+
+ 1115004000
+
+
+ other
+
+ INVERSIONES EN BONOS M.E.
+
+
+
+ 1121001000
+
+
+ receivable
+
+ EFECTOS POR COBRAR NACIONALES
+
+
+
+ 1122001000
+
+
+ receivable
+
+ CUENTAS POR COBRAR CLIENTES
+
+
+
+ 1122002000
+
+
+ other
+
+ COBRO ANTICIPO CLIENTES
+
+
+
+ 1122004000
+
+
+ receivable
+
+ CUENTAS POR COBRAR MAYORISTA
+
+
+
+ 1122005000
+
+
+ receivable
+
+ CUENTAS POR COBRAR DETALLISTA
+
+
+
+ 1124001000
+
+
+ other
+
+ PROVISION INCOBRALES NACIONALES
+
+
+
+ 1124002000
+
+
+ other
+
+ PROVINCION INCOBRABLES EXTERIOR
+
+
+
+ 1125001000
+
+
+ receivable
+
+ CUENTAS POR COBRAR EMPLEADOS
+
+
+
+ 1125002000
+
+
+ other
+
+ PRESTAMOS PERSONALES
+
+
+
+ 1125003000
+
+
+ receivable
+
+ CUENTAS POR COBRAR SOCIOS
+
+
+
+ 1125004000
+
+
+ other
+
+ VIATICOS VENDEDORES
+
+
+
+ 1125006000
+
+
+ other
+
+ VACACIONES
+
+
+
+ 1125007000
+
+
+ other
+
+ UTILIDADES
+
+
+
+ 1125008000
+
+
+ other
+
+ SEGURO DE VEHICULOS
+
+
+
+ 1125009000
+
+
+ other
+
+ ANTICIPO DE NOMINA
+
+
+
+ 1128001000
+
+
+ receivable
+
+ CUENTAS POR COBRAR SOCIOS
+
+
+
+ 1129001000
+
+
+ other
+
+ ADELANTO A PROVEEDORES
+
+
+
+ 1129002000
+
+
+ other
+
+ ENTES GUBERNAMENTALES
+
+
+
+ 1129003000
+
+
+ other
+
+ TRANSFERENCIAS BANCARIAS
+
+
+
+ 1129004000
+
+
+ other
+
+ DEPOSITOS VARIOS
+
+
+
+ 1129005000
+
+
+ other
+
+ RECLAMO AL SEGURO
+
+
+
+ 1129008000
+
+
+ other
+
+ CHEQUES DEVUELTOS
+
+
+
+ 1129009000
+
+
+ receivable
+
+ DEUDORES DIVERSOS
+
+
+
+ 1129010000
+
+
+ liquidity
+
+ RECLAMO AL BANCO
+
+
+
+ 1131001000
+
+
+ other
+
+ INVENTARIO FINAL
+
+
+
+ 1131002000
+
+
+ other
+
+ INVENTARIOS DE MERCANCIA NACIONAL
+
+
+
+ 1131003000
+
+
+ other
+
+ INVENTARIOS DE MERCANCIA EXTERIOR
+
+
+
+ 1131009000
+
+
+ other
+
+ INVENTARIO MERCANCIA ACTUALIZACION DEL VALOR
+
+
+
+ 1134001000
+
+
+ other
+
+ MERCANCIA EN TRANSITOS
+
+
+
+ 1134002000
+
+
+ other
+
+ MERCANCIA EN TRANSITO
+
+
+
+ 1141001000
+
+
+ other
+
+ PUBLICIDAD
+
+
+
+ 1141002000
+
+
+ other
+
+ SEGURO PREPAGADOS
+
+
+
+ 1141004000
+
+
+ other
+
+ ALQUILERES
+
+
+
+ 1151001000
+
+
+ other
+
+ ISR DECLARACION ESTIMADAS
+
+
+
+ 1151002000
+
+
+ other
+
+ ISR RETENIDO
+
+
+
+ 1151003000
+
+
+ other
+
+ IVA EFECTIVAMENTE PAGADO
+
+
+
+ 1151005000
+
+
+ other
+
+ PATENTE MUNICIPAL ESTIMADA
+
+
+
+ 1151006000
+
+
+ other
+
+ IVA . CREDITO FISCAL IMPORTACION
+
+
+
+ 1151007000
+
+
+ other
+
+ IMPUESTO MUNICIPAL PAGADO EN EXCESO
+
+
+
+ 1151008000
+
+
+ other
+
+ IETU PAGADO
+
+
+
+ 1151009000
+
+
+ other
+
+ ISR PAGADO
+
+
+
+ 1151004000
+
+
+ other
+
+ IVA ACREDITABLE o PAGADO A PROVEEDORES
+
+
+
+ 1211001000
+
+
+ other
+
+ TERRENO COSTO ORIGINAL
+
+
+
+ 1211005000
+
+
+ other
+
+ INMUEBLES COSTO ORIGINAL
+
+
+
+ 1211007000
+
+
+ other
+
+ MAQUINARIAS Y EQUIPOS COSTO ORIGINAL
+
+
+
+ 1211009000
+
+
+ other
+
+ VEHICULOS COSTO ORIGINAL
+
+
+
+ 1211011000
+
+
+ other
+
+ MUEBLES Y ENSERES COSTO ORIGINAL
+
+
+
+ 1211013000
+
+
+ other
+
+ LICENCIA Y SOFTWARE COSTO ORIGINAL
+
+
+
+ 1212001000
+
+
+ other
+
+ TERRENOS COSTO ORIGINAL
+
+
+
+ 1212006000
+
+
+ other
+
+ INMUEBLES COSTO ORIGINAL
+
+
+
+ 1212007000
+
+
+ other
+
+ MAQUINARIAS Y EQUIPOS COSTO ORIGINAL
+
+
+
+ 1212009000
+
+
+ other
+
+ VEHICULOS COSTO ORIGINAL
+
+
+
+ 1212011000
+
+
+ other
+
+ MUEBLES Y ENSERES COSTO ORIGINAL
+
+
+
+ 1212013000
+
+
+ other
+
+ LICENCIA Y SOFTWARE COSTO ORIGINAL
+
+
+
+ 1212015000
+
+
+ other
+
+ MEJORAS A PROPIEDAD COSTO ORIGINAL
+
+
+
+ 1221001000
+
+
+ other
+
+ INVERSIONES PERMANENTES
+
+
+
+ 1221003000
+
+
+ other
+
+ BONOS TITULOS
+
+
+
+ 1221004000
+
+
+ other
+
+ INVERSIONES EN BONOS M.N.
+
+
+
+ 1251001000
+
+
+ other
+
+ IMPUESTOS DIFERIDOS ISR
+
+
+
+ 1271001000
+
+
+ other
+
+ MARCA DE FABRICA
+
+
+
+ 1271002000
+
+
+ other
+
+ GASTOS DE CONSTITUCION
+
+
+
+ 1271005000
+
+
+ receivable
+
+ OTRAS CUENTAS POR COBRAR
+
+
+
+ 1291001000
+
+
+ other
+
+ DEPOSITOS GARANTIA PROVEEDORES
+
+
+
+ 1291002000
+
+
+ other
+
+ DEPOSITOS GARANTIA BANCOS
+
+
+
+ 1291004000
+
+
+ other
+
+ DEPOSITOS GARANTIA ARRENDAMIENTO LOCAL
+
+
+
+ 2111002000
+
+
+ liquidity
+
+ BANCO X
+
+
+
+ 2111003000
+
+
+ other
+
+ BANCO X
+
+
+
+ 2111004000
+
+
+ liquidity
+
+ BANCO X
+
+
+
+ 2122001000
+
+
+ payable
+
+ CUENTAS POR PAGAR PROVEEDORES
+
+
+
+ 2122002000
+
+
+ other
+
+ TARJETA DE CREDITO X
+
+
+
+ 2122003000
+
+
+ other
+
+ TARJETA DE CREDITO X
+
+
+
+ 2122005000
+
+
+ payable
+
+ OTRAS CUENTAS POR PAGAR
+
+
+
+ 2124001000
+
+
+ payable
+
+ CUENTAS POR PAGAR SOCIOS
+
+
+
+ 2151001000
+
+
+ payable
+
+ DIVIDENDO POR PAGAR VIGENTES
+
+
+
+ 2151002000
+
+
+ receivable
+
+ DIVDENDO POR COBRAR NO COBRADOS
+
+
+
+ 2161005000
+
+
+ other
+
+ FONDO FIDEICOMISO
+
+
+
+ 2161006000
+
+
+ other
+
+ FONDO DE AHORRO
+
+
+
+ 2161007000
+
+
+ other
+
+ APORTES EMPLEADOS
+
+
+
+ 2171001000
+
+
+ other
+
+ APORTE EMPRESA
+
+
+
+ 2172001000
+
+
+ other
+
+ RETENCIONES ISR EMPLEADOS
+
+
+
+ 2172002000
+
+
+ other
+
+ RETENCIONES ISR PROVEEDORES
+
+
+
+ 2172003000
+
+
+ other
+
+ IVA DEBITO FISCAL
+
+
+
+ 2173001000
+
+
+ other
+
+ EMBARGO DE SUELDO
+
+
+
+ 2173002000
+
+
+ other
+
+ PRESTAMOS SOBRE FIDEICOMISO
+
+
+
+ 2173003000
+
+
+ other
+
+ SINDICATOS
+
+
+
+ 2175001000
+
+
+ other
+
+ VACACIONES
+
+
+
+ 2175002000
+
+
+ other
+
+ UTILIDADES
+
+
+
+ 2175003000
+
+
+ other
+
+ PRESTACIONES SOCIALES
+
+
+
+ 2175004000
+
+
+ other
+
+ INTERESES S/PRESTACIONES SOCIALES
+
+
+
+ 2175005000
+
+
+ other
+
+ BONIFICACION ACCIDENTAL UNICA
+
+
+
+ 2175006000
+
+
+ other
+
+ PRIMA POR EFECIENCIA
+
+
+
+ 2175008000
+
+
+ payable
+
+ POLIZA DE SEGURO POR PAGAR
+
+
+
+ 2175009000
+
+
+ other
+
+ PUBLICIDAD Y PROPAGANDA
+
+
+
+ 2175010000
+
+
+ other
+
+ COMISIONES
+
+
+
+ 2175011000
+
+
+ other
+
+ ALQUILERES
+
+
+
+ 2175012000
+
+
+ other
+
+ TARJETA CORPORATIVA
+
+
+
+ 2175013000
+
+
+ other
+
+ CONDOMINIOS
+
+
+
+ 2175014000
+
+
+ payable
+
+ IMPUESTOS MUNICIPALES POR PAGAR
+
+
+
+ 2175015000
+
+
+ other
+
+ CONVESION DE COMERCIALIZACION
+
+
+
+ 2175017000
+
+
+ payable
+
+ NOMINA POR PAGAR
+
+
+
+ 2175018000
+
+
+ payable
+
+ IMPUESTOS POR PAGAR
+
+
+
+ 2175019000
+
+
+ other
+
+ PROGRAMA DE ALIMENTACION
+
+
+
+ 2175020000
+
+
+ other
+
+ ADELANTO DE CLIENTES
+
+
+
+ 2175021000
+
+
+ other
+
+ PATENTE INDUSTRIA Y COMERCIO
+
+
+
+ 2181001000
+
+
+ other
+
+ RESERVAS OPERATIVAS
+
+
+
+ 2181002000
+
+
+ other
+
+ RESERVAS FINANCIERAS
+
+
+
+ 2181003000
+
+
+ other
+
+ RESERVAS FISCALES
+
+
+
+ 2191001000
+
+
+ other
+
+ ISR ACUMULADOS GASTOS
+
+
+
+ 2191002000
+
+
+ other
+
+ DECLARACION ESTIMADAS
+
+
+
+ 2191003000
+
+
+ other
+
+ RAR AJUSTE INICIAL POR INFLACION
+
+
+
+ 2201111000
+
+
+ other
+
+ PASIVOS A CORTO PLAZO
+
+
+
+ 2201112000
+
+
+ other
+
+ 4% IVA RETENIDO FLETES
+
+
+
+ 2201113000
+
+
+ other
+
+ ISR RETENIDO SALARIOS
+
+
+
+ 2201114000
+
+
+ other
+
+ ISR RETENIDO ASIMILABLES
+
+
+
+ 2201115000
+
+
+ other
+
+ 10% ISR RETENIDO HONORARIOS
+
+
+
+ 2201116000
+
+
+ other
+
+ 10% ISR RETENIDO ARRENDAMIENTO
+
+
+
+ 2201117000
+
+
+ other
+
+ 10.67% IVA RETENIDO ARRENDAMIENTO
+
+
+
+ 2201118000
+
+
+ other
+
+ 10.67% IVA RETENIDO HONORARIOS
+
+
+
+ 2201119000
+
+
+ other
+
+ 1% DE RET CEDULAR ARRENDAMIETOS (GUANAJUATO)
+
+
+
+ 2202113000
+
+
+ other
+
+ IVA POR TRASLADAR o COBRADO
+
+
+
+ 2511001000
+
+
+ other
+
+ PASIVOS FINANCIEROS A LARGO PLAZO
+
+
+
+ 2521001000
+
+
+ other
+
+ INDEMNIZACIONES SENCILLAS
+
+
+
+ 2521002000
+
+
+ other
+
+ INDEMNIZACIONES DOBLES
+
+
+
+ 2581001000
+
+
+ other
+
+ PASIVOS INTERCOMPAÑIAS
+
+
+
+ 2591001000
+
+
+ other
+
+ OTROS PASIVOS A LARGO PLAZO
+
+
+
+ 3111001000
+
+
+ other
+
+ CAPITAL SOCIAL
+
+
+
+ 3111002000
+
+
+ other
+
+ ACTUALIZACION DEL VALOR
+
+
+
+ 3131001000
+
+
+ other
+
+ ACCIONES EN TESORERIA
+
+
+
+ 3131002000
+
+
+ other
+
+ ACTUALIZACION DE VALOR
+
+
+
+ 3211001000
+
+
+ other
+
+ UTILIDADES NO DISTRIBUIDAS
+
+
+
+ 3211002000
+
+
+ other
+
+ UTILIDADES DEL EJERCICIO
+
+
+
+ 3212003000
+
+
+ other
+
+ REAJUSTE POR INFLACION
+
+
+
+ 3212004000
+
+
+ other
+
+ ACTUALIZACION DEL PATRIMONIO
+
+
+
+ 3212005000
+
+
+ other
+
+ EXCLUSIONES FISCALES
+
+
+
+ 3311001000
+
+
+ other
+
+ VALOR ORIGINAL RESERVA LEGAL
+
+
+
+ 3311002000
+
+
+ other
+
+ RESERVA P/FUTURO AUMENTO DE CAPITAL
+
+
+
+ 3391001000
+
+
+ other
+
+ VALOR ORIGINAL
+
+
+
+ 3391002000
+
+
+ other
+
+ ACTUALIZACION DEL VALOR
+
+
+
+ 4111001000
+
+
+ other
+
+ CARTAS DE CREDITOS
+
+
+
+ 4111002000
+
+
+ other
+
+ MERCANCIAS EN CONSIGNACION
+
+
+
+ 4111003000
+
+
+ other
+
+ MERCANCIAS COMPRADAS EN TRANSITO
+
+
+
+ 4511002000
+
+
+ other
+
+ MERCANCIA EN CONSIGNACION P. COMPRA
+
+
+
+ 4511003000
+
+
+ other
+
+ MERCANCIA VENDIDAS EN TRANSITO
+
+
+
+ 5111001000
+
+
+ other
+
+ VENTAS NACIONALES
+
+
+
+ 5111002000
+
+
+ other
+
+ VENTAS NACIONALES AL DETAL
+
+
+
+ 5111003000
+
+
+ other
+
+ VENTAS EXPORTACION
+
+
+
+ 5111004000
+
+
+ other
+
+ VENTAS INMUEBLES
+
+
+
+ 5112001000
+
+
+ other
+
+ INGRESOS POR SERVICIOS
+
+
+
+ 5114001000
+
+
+ other
+
+ DESCUENTOS EN VENTAS
+
+
+
+ 5114002000
+
+
+ other
+
+ DEVOLUCIONES EN VENTAS
+
+
+
+ 6111001000
+
+
+ other
+
+ COSTO DE VENTAS
+
+
+
+ 7111001000
+
+
+ other
+
+ DISTRIBUCION Y REPARTO LOCALES
+
+
+
+ 7111002000
+
+
+ other
+
+ PROMOCIONES
+
+
+
+ 7111003000
+
+
+ other
+
+ ACTIVIDADES REGIONALES
+
+
+
+ 7111004000
+
+
+ other
+
+ EVENTOS ESPECIALES
+
+
+
+ 7111005000
+
+
+ other
+
+ MATERIALES PROMOCIONALES
+
+
+
+ 7111006000
+
+
+ other
+
+ PUBLICIDAD
+
+
+
+ 7111007000
+
+
+ other
+
+ MEDIOS
+
+
+
+ 7111008000
+
+
+ other
+
+ PRODUCCION MATERIAL P.O.P.
+
+
+
+ 7111009000
+
+
+ other
+
+ CUENTAS INCOBRABLES NACIONALES
+
+
+
+ 7111010000
+
+
+ other
+
+ TRANSPORTE Y FLETES
+
+
+
+ 7111011000
+
+
+ other
+
+ PATENTE INDUSTRIA Y COMERCIO
+
+
+
+ 7131001000
+
+
+ other
+
+ SUELDOS EMPLEADOS
+
+
+
+ 7131002000
+
+
+ other
+
+ SUELDOS DIRECTIVOS
+
+
+
+ 7131003000
+
+
+ other
+
+ HORAS EXTRAS
+
+
+
+ 7131004000
+
+
+ other
+
+ HORAS EXTRAORDINARIAS
+
+
+
+ 7131005000
+
+
+ other
+
+ COMISION AL PERSONAL
+
+
+
+ 7131006000
+
+
+ other
+
+ TRANSPORTE Y ALIMENTACION
+
+
+
+ 7131007000
+
+
+ other
+
+ PROGRAMA DE ALIMENTACION EMPLEADOS
+
+
+
+ 7131008000
+
+
+ other
+
+ BENEFICIOS UNIFORMES
+
+
+
+ 7131009000
+
+
+ other
+
+ BENEFICIOS COMEDOR
+
+
+
+ 7131010000
+
+
+ other
+
+ BENEFICIOS SERVICIOS MEDICOS
+
+
+
+ 7131011000
+
+
+ other
+
+ BENEFICIOS AYUDAS ESCOLARES
+
+
+
+ 7131012000
+
+
+ other
+
+ BENEFICIOS ADIESTRAMIENTOS-CURSOS
+
+
+
+ 7131013000
+
+
+ other
+
+ BENEFICIOS BECAS
+
+
+
+ 7131016000
+
+
+ other
+
+ PRESTACIONES SOCIALES
+
+
+
+ 7131017000
+
+
+ other
+
+ INTERESES S/PRESTACIONES SOCIALES
+
+
+
+ 7131018000
+
+
+ other
+
+ UTILIDADES
+
+
+
+ 7131019000
+
+
+ other
+
+ VACACIONES
+
+
+
+ 7131020000
+
+
+ other
+
+ BONO VACACIONAL
+
+
+
+ 7131021000
+
+
+ other
+
+ CONTRIBUCIONES
+
+
+
+ 7131025000
+
+
+ other
+
+ BONIFICACION UNICA ESPECIAL
+
+
+
+ 7131030000
+
+
+ other
+
+ VIATICOS Y GASTOS DE REPRESENTACION
+
+
+
+ 7131031000
+
+
+ other
+
+ HONORARIOS POR PARTIPACION JUNTA DIRECTIVA
+
+
+
+ 7131033000
+
+
+ other
+
+ PRIMA POR RENDIMIENTO
+
+
+
+ 7131035000
+
+
+ other
+
+ GASTOS PERSONAL CONTRATADO
+
+
+
+ 7131036000
+
+
+ other
+
+ GASTOS PERSONAL TRANSFERIDOSR
+
+
+
+ 7151001000
+
+
+ other
+
+ SUMINISTROS DE EQUIPOS DE OFICINA
+
+
+
+ 7151002000
+
+
+ other
+
+ REPARACIONES
+
+
+
+ 7151003000
+
+
+ other
+
+ MANTENIMIENTOS
+
+
+
+ 7151004000
+
+
+ other
+
+ MANTENIMIENTO DE VEHICULOS
+
+
+
+ 7151005000
+
+
+ other
+
+ ARTICULOS DE OFICINA
+
+
+
+ 7151006000
+
+
+ other
+
+ UTILES DE LIMPIEZA
+
+
+
+ 7151007000
+
+
+ other
+
+ HONORARIOS PROFESIONALES
+
+
+
+ 7151009000
+
+
+ other
+
+ SERVICIOS PUBLICOS
+
+
+
+ 7151010000
+
+
+ other
+
+ ENERGIA ELECTRICA
+
+
+
+ 7151012000
+
+
+ other
+
+ TELEFONOS Y TELECOMUNICACIONES
+
+
+
+ 7151013000
+
+
+ other
+
+ AGUA POTABLE Y REFRIGERIO
+
+
+
+ 7151014000
+
+
+ other
+
+ ASEO URBANO
+
+
+
+ 7151015000
+
+
+ other
+
+ PALERIA Y FOTOCOPIADO
+
+
+
+ 7151016000
+
+
+ other
+
+ ASEO Y LIMPIEZA
+
+
+
+ 7151017000
+
+
+ other
+
+ PASAJES LOCALES Y EXT.DEDUCIBLES
+
+
+
+ 7151018000
+
+
+ other
+
+ PASAJE EXTERIOR NO DEDUCIBLE
+
+
+
+ 7151019000
+
+
+ other
+
+ VIATICOS DEDUCIBLES
+
+
+
+ 7151020000
+
+
+ other
+
+ VIATICOS NO DEDUCIBLES
+
+
+
+ 7151021000
+
+
+ other
+
+ GASTOS DE REPRESENTACION
+
+
+
+ 7151022000
+
+
+ other
+
+ HOSPEDAJE
+
+
+
+ 7151023000
+
+
+ other
+
+ EQUIPOS Y EVENTOS DEPORTIVOS
+
+
+
+ 7151024000
+
+
+ other
+
+ CONVENSION DE COMERCIALIZACION
+
+
+
+ 7151025000
+
+
+ other
+
+ OTROS GASTOS
+
+
+
+ 7151026000
+
+
+ other
+
+ ARRENDAMIENTO
+
+
+
+ 7151027000
+
+
+ other
+
+ AVERIAS-PRODUCTOS
+
+
+
+ 7151028000
+
+
+ other
+
+ AJUSTE DE INVENTARIOS DONADOS
+
+
+
+ 7151029000
+
+
+ other
+
+ AJUSTE DE INVENTARIOS OBSOLETOS
+
+
+
+ 7151030000
+
+
+ other
+
+ TRAMITES DE SOLVENCIAS
+
+
+
+ 7151031000
+
+
+ other
+
+ CONDOMINIOS
+
+
+
+ 7151032000
+
+
+ other
+
+ FLETES Y TRANSPORTES
+
+
+
+ 7151033000
+
+
+ other
+
+ ESTACIONAMINETO
+
+
+
+ 7151035000
+
+
+ other
+
+ TRAMITES LEGALES
+
+
+
+ 7151036000
+
+
+ other
+
+ GASTOS DE SISTEMAS
+
+
+
+ 7151037000
+
+
+ other
+
+ DERECHO DE FRENTE
+
+
+
+ 7151039000
+
+
+ other
+
+ COMIDAS, VIAJES Y TRASLADOS
+
+
+
+ 7151040000
+
+
+ other
+
+ COMBUSTIBLES
+
+
+
+ 7151041000
+
+
+ other
+
+ GASTOS DE ISR
+
+
+
+ 7151042000
+
+
+ other
+
+ REPAROS
+
+
+
+ 7151043000
+
+
+ other
+
+ SEGUROS
+
+
+
+ 7151044000
+
+
+ other
+
+ PARTIDAS NO DEDUCIBLES
+
+
+
+ 7151045000
+
+
+ other
+
+ SERVICIOS CONTRATADOS A TERCEROS
+
+
+
+ 7151046000
+
+
+ other
+
+ BONIFICACION UNICA ESPECIAL
+
+
+
+ 7151047000
+
+
+ other
+
+ SERVICIOS DE PUBLICIDAD
+
+
+
+ 7151048000
+
+
+ other
+
+ REMANENTES DISTRIBUIBLES
+
+
+
+ 7151049000
+
+
+ other
+
+ ASIMILABLES A SALARIOS
+
+
+
+ 7161002000
+
+
+ other
+
+ INMUEBLES
+
+
+
+ 7161003000
+
+
+ other
+
+ MAQUINARIAS Y EQUIPOS
+
+
+
+ 7161004000
+
+
+ other
+
+ VEHICULOS
+
+
+
+ 7161005000
+
+
+ other
+
+ MUEBLES Y ENSERES
+
+
+
+ 7161006000
+
+
+ other
+
+ LICENCIA Y SOFTWARE
+
+
+
+ 7161007000
+
+
+ other
+
+ MEJORAS A PROPIEDAD
+
+
+
+ 7162001000
+
+
+ other
+
+ SEGUROS
+
+
+
+ 9111001000
+
+
+ other
+
+ INTERESES BANCOS NACIONALES
+
+
+
+ 9111002000
+
+
+ other
+
+ COMISIONES Y GASTOS BANCARIOS
+
+
+
+ 9111003000
+
+
+ other
+
+ COMISIONES TICKET DE ALIMENTACION
+
+
+
+ 9111004000
+
+
+ other
+
+ INTERESES POR FINANCIAMIENTOS
+
+
+
+ 9111099000
+
+
+ other
+
+ OTROS EGRESOS
+
+
+
+ 9113002000
+
+
+ other
+
+ INTERESES S/PRESTACIONES SOCIALES
+
+
+
+ 9113003000
+
+
+ other
+
+ PERDIDAS EN VENTAS ACTIVOS FIJOS
+
+
+
+ 9113004000
+
+
+ other
+
+ PERDIDAS EN INVERSIONES DE BONOS P.
+
+
+
+ 9113005000
+
+
+ other
+
+ PERDIDAS EN VENTAS DE INVERSIONES
+
+
+
+ 9113006000
+
+
+ other
+
+ PERDIDAS EN DIFERENCIAL CAMBIARIO
+
+
+
+ 9113007000
+
+
+ other
+
+ AJUSTE DE AÑOS ANTERIORES
+
+
+
+ 9113010000
+
+
+ other
+
+ PERDIDA POR ROBO DE INVENTARIO
+
+
+
+ 9113012000
+
+
+ other
+
+ FLUCTUACION CAMBIARIA NO REALIZADAS
+
+
+
+ 9114001000
+
+
+ other
+
+ IMPUESTOS A LAS TRANSACIONES FINANCIERAS
+
+
+
+ 9211001000
+
+
+ other
+
+ INTERESES DE BANCOS NACIONALES
+
+
+
+ 9211002000
+
+
+ other
+
+ INTERESES DE BANCOS EXTRANJEROS
+
+
+
+ 9211003000
+
+
+ other
+
+ OTROS INGRESOS FINANCIEROS
+
+
+
+ 9212001000
+
+
+ other
+
+ GANANCIAS EN VENTAS DE ACTIVOS FIJOS
+
+
+
+ 9212002000
+
+
+ other
+
+ GANANCIAS EN VENTAS DE INVERSIONES
+
+
+
+ 9212003000
+
+
+ other
+
+ GANANCIAS EN DIFERENCIAL CAMBIARIO
+
+
+
+ 9212004000
+
+
+ other
+
+ INTERESES VARIOS
+
+
+
+ 9212005000
+
+
+ other
+
+ OTROS INGRESOS
+
+
+
+
+
+
+ Plan de Cuentas para Mexico
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/l10n_mx/data/account_tax.xml b/addons/l10n_mx/data/account_tax.xml
new file mode 100644
index 00000000000..d52e75168e2
--- /dev/null
+++ b/addons/l10n_mx/data/account_tax.xml
@@ -0,0 +1,172 @@
+
+
+
+
+
+ IVA(0%) VENTAS
+ 0
+ percent
+
+
+
+
+ sale
+
+
+
+
+
+
+ IVA(11%) VENTAS
+ 0.11
+ percent
+
+
+
+
+ sale
+
+
+
+
+
+
+ IVA(16%) VENTAS
+ 0.16
+ percent
+
+
+
+
+ sale
+
+
+
+
+
+
+ RET IVA FLETES 4%
+ -0.04
+ percent
+
+
+
+
+ purchase
+
+
+
+
+
+
+ RET IVA ARRENDAMIENTO 10%
+ -0.1
+ percent
+
+
+
+
+ purchase
+
+
+
+
+
+
+ RET ISR ARRENDAMIENTO 10%
+ -0.1
+ percent
+
+
+
+
+ purchase
+
+
+
+
+
+
+ RET ISR HONORARIOS 10%
+ -0.1
+ percent
+
+
+
+
+ purchase
+
+
+
+
+
+
+ RETENCION IVA ARRENDAMIENTO 10.67%
+ -0.1067
+ percent
+
+
+
+
+ purchase
+
+
+
+
+
+
+ RETENCION IVA HONORARIOS 10.67%
+ -0.1067
+ percent
+
+
+
+
+ purchase
+
+
+
+
+
+
+ IVA(0%) COMPRAS
+ 0
+ percent
+
+
+
+
+ purchase
+
+
+
+
+
+
+ IVA(11%) COMPRAS
+ 0.11
+ percent
+
+
+
+
+ purchase
+
+
+
+
+
+
+ IVA(16%) COMPRAS
+ 0.16
+ percent
+
+
+
+
+ purchase
+
+
+
+
+
diff --git a/addons/l10n_mx/data/account_tax_code.xml b/addons/l10n_mx/data/account_tax_code.xml
new file mode 100644
index 00000000000..625fda198db
--- /dev/null
+++ b/addons/l10n_mx/data/account_tax_code.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+ Impuestos
+
+
+
+ Balance de impuestos a pagar
+
+
+
+
+ Impuestos a pagar
+
+
+
+
+ Impuestos pagados
+
+
+
+
+ Base de impuestos
+
+
+
+
+
+ Base de impuestos en ventas
+
+
+
+
+
+ Base de impuestos en compras
+
+
+
+
+
diff --git a/addons/l10n_mx/data/l10n_chart_mx_wizard.xml b/addons/l10n_mx/data/l10n_chart_mx_wizard.xml
new file mode 100644
index 00000000000..e73c75c3506
--- /dev/null
+++ b/addons/l10n_mx/data/l10n_chart_mx_wizard.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ open
+
+
+
diff --git a/addons/l10n_mx/i18n/ar.po b/addons/l10n_mx/i18n/ar.po
deleted file mode 100644
index e74ffc09041..00000000000
--- a/addons/l10n_mx/i18n/ar.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# Arabic 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-01-17 10:56+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Arabic \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"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr "الدائنون"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr "الأسهم"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr "ضريبة"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr "نقدي"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr "مدفوعات"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr "أصل"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr "الدخل"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr "المصروفات"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr "عرض"
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "إعداد شجرة الحسابات من قالب. ستم سؤالك عن اسم المنشأة، القالب المتبع، و "
-#~ "إعداد أكواد الحسابات و البنوك، بالإضافة إلي يوميات العملة. و لذلك سيكون هناك "
-#~ "قالب جديد. \n"
-#~ "\tهذه لإعداد الحسابات."
diff --git a/addons/l10n_mx/i18n/bg.po b/addons/l10n_mx/i18n/bg.po
deleted file mode 100644
index 5029162ba26..00000000000
--- a/addons/l10n_mx/i18n/bg.po
+++ /dev/null
@@ -1,66 +0,0 @@
-# Bulgarian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
-#
-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: 2011-03-28 21:25+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Bulgarian \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"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr ""
-
-#~ msgid "Mexico - Chart of Account"
-#~ msgstr "Мексико - Сметкоплан"
diff --git a/addons/l10n_mx/i18n/ca.po b/addons/l10n_mx/i18n/ca.po
deleted file mode 100644
index 5a73fc7b775..00000000000
--- a/addons/l10n_mx/i18n/ca.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
-#
-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: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Catalan \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"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr ""
-
-#~ msgid "Mexico - Chart of Account"
-#~ msgstr "Mèxic - Pla comptable"
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Genera el pla de comptes des d'una plantilla de pla. Se us demanarà el nom "
-#~ "de l'empresa, la plantilla de pla a seguir, i el número de dígits per "
-#~ "generar el codi dels vostres comptes, compte bancari, i divisa per crear els "
-#~ "vostres diaris. Per tant, es genera una còpia directa de la plantilla del "
-#~ "pla de comptes.\n"
-#~ "\t Aquest és el mateix assistent que s'executa des de "
-#~ "Comptabilitat/Configuració/Comptabilitat financera/Comptes financers/Genera "
-#~ "pla comptable des d'una plantilla de pla comptable."
-
-#~ msgid ""
-#~ "This is the module to manage the accounting chart for Mexico in Open ERP."
-#~ msgstr ""
-#~ "Aquest és el mòdul per gestionar el pla comptable per a Mèxic amb OpenERP."
diff --git a/addons/l10n_mx/i18n/da.po b/addons/l10n_mx/i18n/da.po
deleted file mode 100644
index 091c7a19e0f..00000000000
--- a/addons/l10n_mx/i18n/da.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# Danish 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-01-27 09:01+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Danish \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"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr ""
diff --git a/addons/l10n_mx/i18n/es.po b/addons/l10n_mx/i18n/es.po
deleted file mode 100644
index 6f69151d94d..00000000000
--- a/addons/l10n_mx/i18n/es.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
-#
-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: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Spanish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr "A cobrar"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr "Valor neto"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr "Impuesto"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr "Efectivo"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr "A pagar"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr "Activo"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr "Ingreso"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr "Gasto"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr "Vista"
-
-#~ msgid "Mexico - Chart of Account"
-#~ msgstr "Méjico - Plan Contable"
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Generar Plan Contable a partir de una plantilla de Plan. Se le preguntará "
-#~ "por el nombre de la compañía, la plantilla de plan contable a seguir, el no. "
-#~ "de dígitos para generar el código de sus cuentas y la cuenta bancaria, la "
-#~ "divisa para crear Diarios. Por lo tanto, la copia exacta de la plantilla de "
-#~ "plan contable será generada.\n"
-#~ "Este es el mismo asistente que se ejecuta desde Gestión "
-#~ "Financiera/Configuración/Contabilidad Financiera/Contabilidad "
-#~ "Financiera/Generar Plan Contable a partir de una Plantilla de Plan."
-
-#~ msgid ""
-#~ "This is the module to manage the accounting chart for Mexico in Open ERP."
-#~ msgstr ""
-#~ "Este es el módulo para gestionar el plan contable para Méjico en Open ERP."
diff --git a/addons/l10n_mx/i18n/es_CR.po b/addons/l10n_mx/i18n/es_CR.po
deleted file mode 100644
index 4bc76067878..00000000000
--- a/addons/l10n_mx/i18n/es_CR.po
+++ /dev/null
@@ -1,90 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-17 19:23+0000\n"
-"Last-Translator: Freddy Gonzalez \n"
-"Language-Team: Spanish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-"Language: es\n"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr "A cobrar"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr "Patrimonio"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr "Impuesto"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr "Efectivo"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr "A pagar"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr "Activo"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr "Ingreso"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr "Gastos"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr "Vista"
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Generar Plan Contable a partir de una plantilla de Plan. Se le preguntará "
-#~ "por el nombre de la compañía, la plantilla de plan contable a seguir, el no. "
-#~ "de dígitos para generar el código de sus cuentas y la cuenta bancaria, la "
-#~ "divisa para crear Diarios. Por lo tanto, la copia exacta de la plantilla de "
-#~ "plan contable será generada.\n"
-#~ "Este es el mismo asistente que se ejecuta desde Gestión "
-#~ "Financiera/Configuración/Contabilidad Financiera/Contabilidad "
-#~ "Financiera/Generar Plan Contable a partir de una Plantilla de Plan."
-
-#~ msgid "Mexico - Chart of Account"
-#~ msgstr "Méjico - Plan Contable"
-
-#~ msgid ""
-#~ "This is the module to manage the accounting chart for Mexico in Open ERP."
-#~ msgstr ""
-#~ "Este es el módulo para gestionar el plan contable para Méjico en Open ERP."
diff --git a/addons/l10n_mx/i18n/es_MX.po b/addons/l10n_mx/i18n/es_MX.po
deleted file mode 100644
index c7768a80ff6..00000000000
--- a/addons/l10n_mx/i18n/es_MX.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# Spanish (Mexico) 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-10-22 22:58+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Spanish (Mexico) \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"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr "Por cobrar"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr "Capital"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr "Impuesto"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr "Efectivo"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr "A pagar"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr "Activo"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr "Ingreso"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr "Gasto"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr "Vista"
diff --git a/addons/l10n_mx/i18n/es_PY.po b/addons/l10n_mx/i18n/es_PY.po
deleted file mode 100644
index 81dfb2ccd0b..00000000000
--- a/addons/l10n_mx/i18n/es_PY.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
-#
-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: 2011-03-21 16:27+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Spanish (Paraguay) \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"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr ""
-
-#~ msgid "Mexico - Chart of Account"
-#~ msgstr "Méjico - Plan Contable"
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Generar el plan contable a partir de una plantilla de plan contable. Se le "
-#~ "pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
-#~ "el número de dígitos para generar el código de las cuentas y de la cuenta "
-#~ "bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
-#~ "exacta de la plantilla de plan contable.\n"
-#~ "\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
-#~ "Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
-#~ "plan contable a partir de una plantilla de plan contable."
-
-#~ msgid ""
-#~ "This is the module to manage the accounting chart for Mexico in Open ERP."
-#~ msgstr ""
-#~ "Este es el módulo para gestionar el plan contable para Méjico en Open ERP."
diff --git a/addons/l10n_mx/i18n/es_VE.po b/addons/l10n_mx/i18n/es_VE.po
deleted file mode 100644
index e9822e23498..00000000000
--- a/addons/l10n_mx/i18n/es_VE.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2011-01-07 06:07+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Spanish \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: l10n_mx
-#: model:ir.module.module,description:l10n_mx.module_meta_information
-msgid ""
-"This is the module to manage the accounting chart for Mexico in Open ERP."
-msgstr ""
-"Este es el módulo para gestionar el plan contable para Méjico en Open ERP."
-
-#. module: l10n_mx
-#: model:ir.actions.todo,note:l10n_mx.config_call_account_template_mx_chart
-msgid ""
-"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-"the name of the company, the chart template to follow, the no. of digits to "
-"generate the code for your accounts and Bank account, currency to create "
-"Journals. Thus,the pure copy of chart Template is generated.\n"
-"\tThis is the same wizard that runs from Financial "
-"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-"Chart of Accounts from a Chart Template."
-msgstr ""
-"Generar Plan Contable a partir de una plantilla de Plan. Se le preguntará "
-"por el nombre de la compañía, la plantilla de plan contable a seguir, el no. "
-"de dígitos para generar el código de sus cuentas y la cuenta bancaria, la "
-"divisa para crear Diarios. Por lo tanto, la copia exacta de la plantilla de "
-"plan contable será generada.\n"
-"Este es el mismo asistente que se ejecuta desde Gestión "
-"Financiera/Configuración/Contabilidad Financiera/Contabilidad "
-"Financiera/Generar Plan Contable a partir de una Plantilla de Plan."
-
-#. module: l10n_mx
-#: model:ir.module.module,shortdesc:l10n_mx.module_meta_information
-msgid "Mexico - Chart of Account"
-msgstr "Méjico - Plan Contable"
diff --git a/addons/l10n_mx/i18n/gl.po b/addons/l10n_mx/i18n/gl.po
deleted file mode 100644
index 06dcc17cc83..00000000000
--- a/addons/l10n_mx/i18n/gl.po
+++ /dev/null
@@ -1,87 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
-#
-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: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Galician \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"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr ""
-
-#~ msgid "Mexico - Chart of Account"
-#~ msgstr "México - Plan de Contas"
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Xera un plan de contas a partir dun modelo xenérico. Pediráselle o nome da "
-#~ "compañía, o modelo contable a seguir, o número de díxitos para xera-lo "
-#~ "código das súas contas e da súa conta e divisa bancaria para crea-los "
-#~ "diarios. Así, xerarase unha copia íntegra do modelo contable.\n"
-#~ "\t Este é o mesmo asistente que se executa desde 'Xestión "
-#~ "Financieira/Configuración/Contabilidade Financieira/Contas "
-#~ "Financieiras/Xerar plan de contas dende un modelo base."
-
-#~ msgid ""
-#~ "This is the module to manage the accounting chart for Mexico in Open ERP."
-#~ msgstr "Este é o módulo para xestiona-lo plan contable de México en OpenERP."
diff --git a/addons/l10n_mx/i18n/it.po b/addons/l10n_mx/i18n/it.po
deleted file mode 100644
index b303443e982..00000000000
--- a/addons/l10n_mx/i18n/it.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
-#
-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: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME \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:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr ""
-
-#~ msgid "Mexico - Chart of Account"
-#~ msgstr "Messico - Piano dei conti"
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Genera il Piano dei Conti da un Modello. Vi verrà richiesto di passare il "
-#~ "nome dell'azienda, il modello da seguire, il numero di decimali per generare "
-#~ "il codice dei tuoi conti e, per il conto della Banca, la valuta per creare "
-#~ "il Libro Giornale. Così una copia vergine del Piano dei Conti, derivatante "
-#~ "dal modello, viene generata.\n"
-#~ "\tQuesto è la stessa procedura automatica che viene lanciata da: Gestione "
-#~ "Finanziaria / Configurazione / Contabilità / Conti finanziari / Genera il "
-#~ "Piano dei conti da un modello."
-
-#~ msgid ""
-#~ "This is the module to manage the accounting chart for Mexico in Open ERP."
-#~ msgstr ""
-#~ "Questo è il modulo per gestire il piano dei conti per il Messico in OpenERP."
diff --git a/addons/l10n_mx/i18n/l10n_mx.pot b/addons/l10n_mx/i18n/l10n_mx.pot
deleted file mode 100644
index dc16d0225c2..00000000000
--- a/addons/l10n_mx/i18n/l10n_mx.pot
+++ /dev/null
@@ -1,62 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * l10n_mx
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-11-24 02:53+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr ""
-
diff --git a/addons/l10n_mx/i18n/pt.po b/addons/l10n_mx/i18n/pt.po
deleted file mode 100644
index 14fcc577226..00000000000
--- a/addons/l10n_mx/i18n/pt.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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-04-23 14:58+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: 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"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr "Recebível"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr "Imposto"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr "Dinheiro"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr "Pagável"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr "Despesas"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr "Vista"
diff --git a/addons/l10n_mx/i18n/pt_BR.po b/addons/l10n_mx/i18n/pt_BR.po
deleted file mode 100644
index 67308b36386..00000000000
--- a/addons/l10n_mx/i18n/pt_BR.po
+++ /dev/null
@@ -1,88 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
-#
-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: 2011-03-10 23:16+0000\n"
-"Last-Translator: Emerson \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"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr ""
-
-#~ msgid "Mexico - Chart of Account"
-#~ msgstr "Mexico - Chart of Account"
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-
-#~ msgid ""
-#~ "This is the module to manage the accounting chart for Mexico in Open ERP."
-#~ msgstr ""
-#~ "This is the module to manage the accounting chart for Mexico in Open ERP."
diff --git a/addons/l10n_mx/i18n/sr@latin.po b/addons/l10n_mx/i18n/sr@latin.po
deleted file mode 100644
index 217c8d8c40a..00000000000
--- a/addons/l10n_mx/i18n/sr@latin.po
+++ /dev/null
@@ -1,87 +0,0 @@
-# Serbian Latin translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
-#
-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: 2011-10-13 15:04+0000\n"
-"Last-Translator: Milan Milosevic \n"
-"Language-Team: Serbian Latin \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"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr ""
-
-#~ msgid "Mexico - Chart of Account"
-#~ msgstr "Meksiko - računske tabele"
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Generiše tabelu računâ iz šablona tabelâ. Bićete upitani za ime kompanije, "
-#~ "šablon tabelâ koji ćete pratiti, broj cifara za generisanje koda za Vaše "
-#~ "naloge i bankovni račun, valuta za pravljenje dnevnika. Na taj način se "
-#~ "generiše čista kopija šablona tabelâ.\n"
-#~ "\tTo je isti setup wizard koji se pokreće iz Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-
-#~ msgid ""
-#~ "This is the module to manage the accounting chart for Mexico in Open ERP."
-#~ msgstr "Ovo je modul za sređivanje računskih tabela za Meksiko u OPenERP-u."
diff --git a/addons/l10n_mx/i18n/tr.po b/addons/l10n_mx/i18n/tr.po
deleted file mode 100644
index 0f4f8255138..00000000000
--- a/addons/l10n_mx/i18n/tr.po
+++ /dev/null
@@ -1,87 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
-#
-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: 2011-06-08 10:22+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Turkish
\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"
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_mx
-#: model:account.account.type,name:l10n_mx.account_type_view
-msgid "View"
-msgstr ""
-
-#~ msgid "Mexico - Chart of Account"
-#~ msgstr "Meksika - Hesap planı"
-
-#~ msgid ""
-#~ "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-#~ "the name of the company, the chart template to follow, the no. of digits to "
-#~ "generate the code for your accounts and Bank account, currency to create "
-#~ "Journals. Thus,the pure copy of chart Template is generated.\n"
-#~ "\tThis is the same wizard that runs from Financial "
-#~ "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-#~ "Chart of Accounts from a Chart Template."
-#~ msgstr ""
-#~ "Bir Tablo Şablonundan bir Hesap Tablosu oluşturun. Firma adını girmeniz, "
-#~ "hesaplarınızın ve banka hesaplarınızın kodlarının oluşturulması için rakam "
-#~ "sayısını, yevmiyeleri oluşturmak için para birimini girmeniz istenecektir. "
-#~ "Böylece sade bir hesap planı oluşturumuş olur.\n"
-#~ "\t Bu sihirbaz, Mali Yönetim/Yapılandırma/Mali Muhasebe/Mali Hesaplar/Tablo "
-#~ "Şablonundan Hesap planı Oluşturma menüsünden çalıştırılan sihirbaz ile "
-#~ "aynıdır."
-
-#~ msgid ""
-#~ "This is the module to manage the accounting chart for Mexico in Open ERP."
-#~ msgstr "Meksika için hesap tablolarını yönetmek için temel OpenERP modülü."
diff --git a/addons/l10n_mx/l10n_chart_mx_wizard.xml b/addons/l10n_mx/l10n_chart_mx_wizard.xml
deleted file mode 100644
index 52aaa88fdab..00000000000
--- a/addons/l10n_mx/l10n_chart_mx_wizard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- open
-
-
-
-
diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/res_partner.py
index 009aa76b62f..098a92251f4 100644
--- a/addons/l10n_ro/res_partner.py
+++ b/addons/l10n_ro/res_partner.py
@@ -21,7 +21,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_partner(osv.osv):
_name = "res.partner"
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 1aa1f412736..0a693f50a3f 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -21,11 +21,11 @@
from xml.sax.saxutils import escape
import time
-from osv import osv, fields
+from openerp.osv import fields, osv
from datetime import datetime
from lxml import etree
-import tools
-from tools.translate import _
+from openerp import tools
+from openerp.tools.translate import _
class lunch_order(osv.Model):
"""
diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py
index abd5b2726a3..064fe8bc719 100644
--- a/addons/lunch/report/order.py
+++ b/addons/lunch/report/order.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-from report import report_sxw
-from osv import osv
+from openerp.report import report_sxw
+from openerp.osv import osv
class order(report_sxw.rml_parse):
diff --git a/addons/lunch/report/report_lunch_order.py b/addons/lunch/report/report_lunch_order.py
index 3a0875c1cd1..3a439a4a4dd 100644
--- a/addons/lunch/report/report_lunch_order.py
+++ b/addons/lunch/report/report_lunch_order.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields,osv
+from openerp import tools
+from openerp.osv import fields,osv
class report_lunch_order(osv.osv):
_name = "report.lunch.order.line"
diff --git a/addons/lunch/tests/test_lunch.py b/addons/lunch/tests/test_lunch.py
index 128e4796611..49e936848fe 100644
--- a/addons/lunch/tests/test_lunch.py
+++ b/addons/lunch/tests/test_lunch.py
@@ -19,7 +19,7 @@
#
##############################################################################
-import tools
+from openerp import tools
from openerp.tests import common
class Test_Lunch(common.TransactionCase):
diff --git a/addons/lunch/wizard/lunch_cancel.py b/addons/lunch/wizard/lunch_cancel.py
index 648ab4e2396..5da41175a56 100644
--- a/addons/lunch/wizard/lunch_cancel.py
+++ b/addons/lunch/wizard/lunch_cancel.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class lunch_cancel(osv.Model):
""" lunch cancel """
diff --git a/addons/lunch/wizard/lunch_order.py b/addons/lunch/wizard/lunch_order.py
index 767497bcc4b..aa595323c2e 100644
--- a/addons/lunch/wizard/lunch_order.py
+++ b/addons/lunch/wizard/lunch_order.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class lunch_order_order(osv.TransientModel):
""" lunch order meal """
diff --git a/addons/lunch/wizard/lunch_validation.py b/addons/lunch/wizard/lunch_validation.py
index f4b4b30747d..e1e888ee399 100644
--- a/addons/lunch/wizard/lunch_validation.py
+++ b/addons/lunch/wizard/lunch_validation.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class lunch_validation(osv.Model):
""" lunch validation """
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index ff86b7945ac..12fdc62c260 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -69,7 +69,6 @@ Main Features
'data/mail_group_demo_data.xml',
],
'installable': True,
- 'auto_install': True,
'application': True,
'images': [
'images/customer_history.jpeg',
diff --git a/addons/mail/doc/mail_message.rst b/addons/mail/doc/mail_message.rst
index 4a3d3634efa..14055f063e0 100644
--- a/addons/mail/doc/mail_message.rst
+++ b/addons/mail/doc/mail_message.rst
@@ -53,6 +53,7 @@ ClientAction (ir.actions.client)
- ``compose_placeholder`` : Message to display on the textareaboxes.
- ``show_link`` : Display partner (authors, followers...) on link or not
- ``compose_as_todo`` : The root composer mark automatically the message as todo
+ - ``readonly`` : Read only mode, hide all action buttons and composer
Fields
+++++++
diff --git a/addons/mail/i18n/et.po b/addons/mail/i18n/et.po
new file mode 100644
index 00000000000..dc7597eb4c4
--- /dev/null
+++ b/addons/mail/i18n/et.po
@@ -0,0 +1,1668 @@
+# Estonian 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:01+0000\n"
+"PO-Revision-Date: 2012-12-17 17:59+0000\n"
+"Last-Translator: Ahti Hinnov \n"
+"Language-Team: Estonian \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-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
+
+#. module: mail
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
+msgstr ""
+
+#. module: mail
+#: view:mail.followers:0
+msgid "Followers Form"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_publisher_warranty_contract
+msgid "publisher_warranty.contract"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,author_id:0
+#: field:mail.message,author_id:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Message Details"
+msgstr "Sõnumid detailid"
+
+#. module: mail
+#: help:mail.mail,email_to:0
+msgid "Message recipients"
+msgstr "Sõnumi saajad"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Comments"
+msgstr "Kommentaarid"
+
+#. module: mail
+#: view:mail.alias:0
+#: view:mail.mail:0
+msgid "Group By..."
+msgstr "Grupeeri..."
+
+#. module: mail
+#: help:mail.compose.message,body:0
+#: help:mail.message,body:0
+msgid "Automatically sanitized HTML contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_name:0
+msgid ""
+"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
+""
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
+#: view:mail.compose.message:0
+msgid "Compose Email"
+msgstr "Koosta e-kiri"
+
+#. module: mail
+#: constraint:mail.alias:0
+msgid ""
+"Invalid expression, it must be a literal python dictionary definition e.g. "
+"\"{'field': 'value'}\""
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group Name"
+msgstr "Grupi nimi"
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Public"
+msgstr "Avalik"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Body"
+msgstr "Sisu"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Show messages to read"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,email_from:0
+#: help:mail.message,email_from:0
+msgid ""
+"Email address of the sender. This field is set when no matching partner is "
+"found for incoming emails."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_unread:0
+#: field:mail.thread,message_unread:0
+#: field:res.partner,message_unread:0
+msgid "Unread Messages"
+msgstr "Lugemata sõnumid"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:247
+#, python-format
+msgid "show"
+msgstr "näita"
+
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Checked by default when subscribing."
+msgstr ""
+
+#. module: mail
+#: help:mail.group,group_ids:0
+msgid ""
+"Members of those groups will automatically added as followers. Note that "
+"they will be able to manage their subscription manually if necessary."
+msgstr ""
+
+#. 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 ""
+
+#. module: mail
+#: view:mail.message:0
+#: field:mail.notification,read:0
+msgid "Read"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Search Groups"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:134
+#, python-format
+msgid "followers"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:646
+#, python-format
+msgid "Access Denied"
+msgstr "Juurdepääs keelatud"
+
+#. module: mail
+#: help:mail.group,image_medium:0
+msgid ""
+"Medium-sized photo of the group. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
+msgstr "Vastu võetud"
+
+#. module: mail
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Thread"
+msgstr "Teema"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:37
+#, python-format
+msgid "Open the full mail composer"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:37
+#, python-format
+msgid "ò"
+msgstr ""
+
+#. module: mail
+#: field:base.config.settings,alias_domain:0
+msgid "Alias Domain"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,group_ids:0
+msgid "Auto Subscription"
+msgstr "Automaatne tellimus"
+
+#. module: mail
+#: field:mail.mail,references:0
+msgid "References"
+msgstr "Viited"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:179
+#, python-format
+msgid "No messages."
+msgstr "Sõnumeid pole."
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_group
+msgid "Discussion group"
+msgstr "Arutelu grupp"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:83
+#: code:addons/mail/static/src/xml/mail.xml:95
+#, python-format
+msgid "uploading"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:211
+#, python-format
+msgid "Set back to Inbox"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,type:0
+#: help:mail.message,type:0
+msgid ""
+"Message type: email for email message, notification for system message, "
+"comment for other messages such as user replies"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Cancelled"
+msgstr "Tühistatud"
+
+#. module: mail
+#: field:mail.mail,reply_to:0
+msgid "Reply-To"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:36
+#, python-format
+msgid "
You have been invited to follow %s.
"
+msgstr ""
+
+#. 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 ""
+
+#. module: mail
+#: field:mail.group,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. 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 "Minule"
+
+#. module: mail
+#: field:mail.message.subtype,name:0
+msgid "Message Type"
+msgstr "Sõnumi tüüp"
+
+#. module: mail
+#: field:mail.mail,auto_delete:0
+msgid "Auto Delete"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:12
+#: view:mail.group:0
+#, python-format
+msgid "Unfollow"
+msgstr "Lõpeta jälgimine"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:246
+#, python-format
+msgid "show one more message"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:71
+#: code:addons/mail/res_users.py:76
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:25
+#, python-format
+msgid "User img"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_mail
+#: model:ir.ui.menu,name:mail.menu_mail_mail
+#: view:mail.mail:0
+#: view:mail.message:0
+msgid "Emails"
+msgstr "E-kirjad"
+
+#. module: mail
+#: field:mail.followers,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_summary:0
+#: help:mail.thread,message_summary:0
+#: help:res.partner,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 ""
+
+#. module: mail
+#: help:mail.alias,alias_model_id:0
+msgid ""
+"The model (OpenERP Document Kind) to which this alias corresponds. Any "
+"incoming email that does not reply to an existing record will cause the "
+"creation of a new record of this model (e.g. a Project Task)"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: selection:mail.message,type:0
+msgid "System notification"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_partner
+#: view:mail.mail:0
+msgid "Partner"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_my_stuff
+msgid "Organizer"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subject:0
+#: field:mail.message,subject:0
+msgid "Subject"
+msgstr "Teema"
+
+#. module: mail
+#: field:mail.wizard.invite,partner_ids:0
+msgid "Partners"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Retry"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,email_from:0
+#: field:mail.mail,email_from:0
+#: field:mail.message,email_from:0
+msgid "From"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: view:mail.message.subtype:0
+msgid "Email message"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,favorite_user_ids:0
+#: help:mail.message,favorite_user_ids:0
+msgid "Users that set this message in their favorites"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+msgid "Send"
+msgstr "Saada"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:130
+#, python-format
+msgid "No followers"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Failed"
+msgstr ""
+
+#. module: mail
+#: model:mail.message.subtype,name:mail.mt_crm_won
+msgid "Won"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: model:ir.actions.act_window,name:mail.action_view_followers
+#: model:ir.ui.menu,name:mail.menu_email_followers
+#: view:mail.followers:0
+#: field:mail.group,message_follower_ids:0
+#: field:mail.thread,message_follower_ids:0
+#: field:res.partner,message_follower_ids:0
+#, python-format
+msgid "Followers"
+msgstr "Jälgijad"
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_archives_feeds
+#: model:ir.ui.menu,name:mail.mail_archivesfeeds
+msgid "Archives"
+msgstr "Arhiivid"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:82
+#, python-format
+msgid "Delete this attachment"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/mail_followers.js:132
+#, python-format
+msgid "One follower"
+msgstr "Üks jälgija"
+
+#. module: mail
+#: field:mail.compose.message,type:0
+#: field:mail.message,type:0
+msgid "Type"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Email"
+msgstr ""
+
+#. module: mail
+#: field:ir.ui.menu,mail_group_id:0
+msgid "Mail Group"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Comments and Emails"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_favorite
+msgid "Favorite messages"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/res_users.py:97
+#, python-format
+msgid "%s has joined the %s network."
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image_small:0
+msgid ""
+"Small-sized photo of the group. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: field:mail.message,partner_ids:0
+msgid "Recipients"
+msgstr "Saajad"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:126
+#, python-format
+msgid "<<<"
+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 "Kirjuta selle dokumendi jälgijatele..."
+
+#. module: mail
+#: field:mail.group,group_public_id:0
+msgid "Authorized Group"
+msgstr "Autoriseeritud Grupp"
+
+#. module: mail
+#: view:mail.group:0
+msgid "Join Group"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_from:0
+msgid "Message sender, taken from user preferences."
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/invite.py:39
+#, python-format
+msgid "
\n"
+" This list contains messages sent to you.\n"
+"
\n"
+" "
+msgstr ""
+"
\n"
+" Privaatsõnumeid pole.\n"
+"
\n"
+" See nimekiri sisaldab sinule saadetud sõnumeid.\n"
+"
\n"
+" "
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+msgid "R&D"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:61
+#, python-format
+msgid "/web/binary/upload_attachment"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_thread
+msgid "Email Thread"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Advanced"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/wizard/mail_compose_message.py:154
+#, python-format
+msgid "Re:"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:212
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/res_users.py:76
+#, python-format
+msgid ""
+"You may not create a user. To create new users, you should use the "
+"\"Settings > Users\" menu."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,res_model:0
+#: help:mail.wizard.invite,res_model:0
+msgid "Model of the followed resource"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:271
+#, python-format
+msgid "like"
+msgstr ""
+
+#. module: mail
+#: view:mail.compose.message:0
+#: view:mail.mail:0
+#: view:mail.wizard.invite:0
+msgid "Cancel"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:44
+#, python-format
+msgid "Share with my followers..."
+msgstr ""
+
+#. module: mail
+#: field:mail.notification,partner_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid ""
+"Only the invited followers can read the\n"
+" discussions on this group."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Has attachments"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "on"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:809
+#, python-format
+msgid ""
+"The following partners chosen as recipients for the email have no email "
+"address linked :"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_defaults:0
+msgid ""
+"A Python dictionary that will be evaluated to provide default values when "
+"creating new records for this alias."
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,notified_partner_ids:0
+#: help:mail.message,notified_partner_ids:0
+msgid ""
+"Partners that have a notification pushing this message in their mailboxes"
+msgstr ""
+
+#. module: mail
+#: selection:mail.compose.message,type:0
+#: view:mail.mail:0
+#: selection:mail.message,type:0
+msgid "Comment"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_inbox_feeds
+msgid ""
+"
\n"
+" Good Job! Your inbox is empty.\n"
+"
\n"
+" Your inbox contains private messages or emails sent to "
+"you\n"
+" as well as information related to documents or people "
+"you\n"
+" follow.\n"
+"
\n"
+" "
+msgstr ""
+"
\n"
+" Hea töö! Su sisendkaust on tühi.\n"
+"
\n"
+" Su sisendkaust sisaldab sulle saadetud sõnumeid ja e-"
+"kirju\n"
+" ning ka infot sinu jälgitavate dokumentide ja inimeste "
+"kohta.\n"
+"
\n"
+" "
+
+#. module: mail
+#: field:mail.mail,notification:0
+msgid "Is Notification"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:161
+#, python-format
+msgid "Compose a new message"
+msgstr "Koosta uus sõnum"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Send Now"
+msgstr "Saada kohe"
+
+#. module: mail
+#: code:addons/mail/mail_mail.py:71
+#, python-format
+msgid ""
+"Unable to send email, please configure the sender's email address or alias."
+msgstr ""
+
+#. module: mail
+#: help:res.users,alias_id:0
+msgid ""
+"Email address internally associated with this user. Incoming emails will "
+"appear in the user's notifications."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image:0
+msgid "Photo"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:164
+#: view:mail.compose.message:0
+#: view:mail.wizard.invite:0
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,vote_user_ids:0
+#: help:mail.message,vote_user_ids:0
+msgid "Users that voted for this message"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,alias_id:0
+msgid ""
+"The email address associated with this group. New emails received will "
+"automatically create new topics."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Month"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Email Search"
+msgstr ""
+
+#. module: mail
+#: model:mail.message.subtype,name:mail.mt_issue_canceled
+msgid "Canceled"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,child_ids:0
+#: field:mail.message,child_ids:0
+msgid "Child Messages"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Functional field to search for messages the current user has to read"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message
+#: field:mail.favorite,message_id:0
+#: field:mail.mail,mail_message_id:0
+#: view:mail.message:0
+#: field:mail.notification,message_id:0
+#: field:mail.vote,message_id:0
+#: field:mail.wizard.invite,message:0
+msgid "Message"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "Todo"
+msgstr "Teha"
+
+#. module: mail
+#: help:mail.followers,res_id:0
+#: help:mail.wizard.invite,res_id:0
+msgid "Id of the followed resource"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,body:0
+#: field:mail.message,body:0
+msgid "Contents"
+msgstr ""
+
+#. 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 ""
+
+#. module: mail
+#: field:mail.compose.message,vote_user_ids:0
+#: field:mail.message,vote_user_ids:0
+msgid "Votes"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,public:0
+msgid "Privacy"
+msgstr "Privaatsus"
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Notification"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: view:mail.wizard.invite:0
+msgid "Add Followers"
+msgstr ""
+
+#. module: mail
+#: model:mail.message.subtype,name:mail.mt_issue_closed
+msgid "Closed"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_force_thread_id:0
+msgid "Record Thread ID"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_group_root
+msgid "My Groups"
+msgstr "Minu grupid"
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_archives_feeds
+msgid ""
+"
\n"
+" No message found and no message sent yet.\n"
+"
\n"
+" Click on the top-right icon to compose a message. This\n"
+" message will be sent by email if it's an internal "
+"contact.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: field:mail.mail,state:0
+msgid "Status"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Outgoing"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "All feeds"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,record_name:0
+#: help:mail.message,record_name:0
+msgid "Name get of the related document."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_notifications
+#: model:ir.model,name:mail.model_mail_notification
+#: model:ir.ui.menu,name:mail.menu_email_notifications
+#: field:mail.compose.message,notification_ids:0
+#: view:mail.message:0
+#: field:mail.message,notification_ids:0
+#: view:mail.notification:0
+msgid "Notifications"
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+msgid "Search Alias"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_force_thread_id:0
+msgid ""
+"Optional ID of a thread (record) to which all incoming messages will be "
+"attached, even if they did not reply to it. If set, this will disable the "
+"creation of new records completely."
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,name:0
+msgid ""
+"Message subtype gives a more precise type on the message, especially for "
+"system notifications. For example, it can be a notification related to a new "
+"record (New), or to a stage change in a process (Stage change). Message "
+"subtypes allow to precisely tune the notifications the user want to receive "
+"on its wall."
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "by"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+msgid "Best Sales Practices"
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Selected Group Only"
+msgstr ""
+
+#. 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 ""
+
+#. module: mail
+#: view:mail.alias:0
+#: field:mail.favorite,user_id:0
+#: view:mail.mail:0
+#: field:mail.vote,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Groups"
+msgstr "Grupid"
+
+#. module: mail
+#: view:mail.message:0
+msgid "Messages Search"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,date:0
+#: field:mail.message,date:0
+msgid "Date"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:34
+#, python-format
+msgid "Post"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_comment_ids:0
+#: help:mail.group,message_comment_ids:0
+#: field:mail.thread,message_comment_ids:0
+#: help:mail.thread,message_comment_ids:0
+#: field:res.partner,message_comment_ids:0
+#: help:res.partner,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:107
+#, python-format
+msgid "To:"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:166
+#, python-format
+msgid "Write to my followers"
+msgstr "Kirjuta minu jälgijatele"
+
+#. module: mail
+#: model:ir.model,name:mail.model_res_groups
+msgid "Access Groups"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,default:0
+msgid "Default"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:245
+#, python-format
+msgid "show more message"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:213
+#, python-format
+msgid "Mark as Todo"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,message_summary:0
+#: field:mail.thread,message_summary:0
+#: field:res.partner,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,subtype_id:0
+#: field:mail.followers,subtype_ids:0
+#: field:mail.message,subtype_id:0
+#: view:mail.message.subtype:0
+msgid "Subtype"
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid "Group Form"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:247
+#, python-format
+msgid "more messages"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/update.py:93
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:13
+#, python-format
+msgid "Following"
+msgstr ""
+
+#. module: mail
+#: sql_constraint:mail.alias:0
+msgid ""
+"Unfortunately this email alias is already used, please choose a unique one"
+msgstr ""
+
+#. module: mail
+#: help:mail.alias,alias_user_id:0
+msgid ""
+"The owner of records created upon receiving emails on this alias. If this "
+"field is not set the system will attempt to find the right owner based on "
+"the sender (From) address, or will use the Administrator account if no "
+"system user is found for that address."
+msgstr ""
+
+#. module: mail
+#: view:mail.favorite:0
+msgid "Favorite Form"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,image:0
+msgid ""
+"This field holds the image used as photo for the group, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,attachment_ids:0
+#: view:mail.mail:0
+#: field:mail.message,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,record_name:0
+#: field:mail.message,record_name:0
+msgid "Message Record Name"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,email_cc:0
+msgid "Cc"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:110
+#: view:mail.compose.message:0
+#, python-format
+msgid "Followers of"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_group_feeds
+msgid "Discussion Group"
+msgstr "Arutelu Grupp"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:209
+#, python-format
+msgid "Done"
+msgstr ""
+
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid ""
+"Related model of the subtype. If False, this subtype exists for all models."
+msgstr ""
+
+#. module: mail
+#: model:mail.message.subtype,name:mail.mt_comment
+msgid "Discussions"
+msgstr "Arutelud"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:11
+#, python-format
+msgid "Follow"
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+msgid "Whole Company"
+msgstr "Terve Ettevõte"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:116
+#: view:mail.compose.message:0
+#, python-format
+msgid "and"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,body_html:0
+msgid "Rich-text/HTML message"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+msgid "Creation Month"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:257
+#, python-format
+msgid "Compose new Message"
+msgstr "Koosta uus sõnum"
+
+#. module: mail
+#: field:mail.group,menu_id:0
+msgid "Related Menu"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Content"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,email_to:0
+msgid "To"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "mail_message_subtype"
+msgstr ""
+
+#. module: mail
+#: selection:mail.group,public:0
+msgid "Private"
+msgstr "Isiklik"
+
+#. module: mail
+#: model:mail.message.subtype,name:mail.mt_issue_new
+msgid "New"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,notified_partner_ids:0
+#: field:mail.message,notified_partner_ids:0
+msgid "Notified partners"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
+#, python-format
+msgid "Invite others"
+msgstr ""
+
+#. module: mail
+#: help:mail.group,public:0
+msgid ""
+"This group is visible by non members. Invisible groups can add "
+"members through the invite button."
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+msgid "Board meetings"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_model_id:0
+msgid "Aliased Model"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,message_id:0
+#: help:mail.message,message_id:0
+msgid "Message unique identifier"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,description:0
+msgid "Description"
+msgstr ""
+
+#. module: mail
+#: model:mail.message.subtype,name:mail.mt_crm_stage
+#: model:mail.message.subtype,name:mail.mt_issue_change
+msgid "Stage Changed"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_followers
+msgid "Document Followers"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:647
+#, python-format
+msgid ""
+"The requested operation cannot be completed due to security restrictions. "
+"Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Never"
+msgstr ""
+
+#. module: mail
+#: field:mail.mail,mail_server_id:0
+msgid "Outgoing mail server"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:813
+#, python-format
+msgid "Partners email addresses not found"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Sent"
+msgstr ""
+
+#. 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 ""
+
+#. module: mail
+#: help:res.partner,notification_email_send:0
+msgid ""
+"Choose in which case you want to receive an email when you receive new feeds."
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_groups
+#: model:ir.ui.menu,name:mail.mail_allgroups
+msgid "Join a group"
+msgstr "Liitu grupiga"
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_group_feeds
+msgid ""
+"
\n"
+" No message in this group.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: mail
+#: view:mail.group:0
+msgid ""
+"This group is visible by everyone,\n"
+" including your customers if you "
+"installed\n"
+" the portal module."
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:210
+#, python-format
+msgid "Set back to Todo"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:113
+#, python-format
+msgid "this document"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: mail
+#: model:mail.message.subtype,name:mail.mt_crm_lost
+msgid "Lost"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
+msgstr ""
+
+#. module: mail
+#: help:base.config.settings,alias_domain:0
+msgid ""
+"If you have setup a catch-all email domain redirected to the OpenERP server, "
+"enter the domain name here."
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,favorite_user_ids:0
+#: field:mail.message,favorite_user_ids:0
+msgid "Favorite"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:125
+#, python-format
+msgid "others..."
+msgstr ""
+
+#. module: mail
+#: view:mail.alias:0
+#: field:mail.alias,alias_name:0
+#: field:mail.group,alias_id:0
+#: field:res.users,alias_id:0
+msgid "Alias"
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_mail
+msgid "Outgoing Mails"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,notification_ids:0
+#: help:mail.message,notification_ids:0
+msgid ""
+"Technical field holding the message notifications. Use notified_partner_ids "
+"to access notified partners."
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.mail_feeds
+#: model:ir.ui.menu,name:mail.mail_feeds_main
+msgid "Messaging"
+msgstr "Sõnumid"
+
+#. module: mail
+#: view:mail.alias:0
+#: field:mail.message.subtype,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: mail
+#: view:mail.message:0
+msgid "Unread"
+msgstr ""
+
+#. module: mail
+#: help:mail.followers,subtype_ids:0
+msgid ""
+"Message subtypes followed, meaning subtypes that will be pushed onto the "
+"user's Wall."
+msgstr ""
+
+#. module: mail
+#: help:mail.group,message_ids:0
+#: help:mail.thread,message_ids:0
+#: help:res.partner,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,composition_mode:0
+msgid "Composition mode"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,model:0
+#: field:mail.followers,res_model:0
+#: field:mail.message,model:0
+#: field:mail.wizard.invite,res_model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:272
+#, python-format
+msgid "unlike"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,author_id:0
+#: help:mail.message,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr ""
+
+#. module: mail
+#: field:mail.alias,alias_domain:0
+msgid "Alias domain"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/update.py:93
+#, python-format
+msgid "Error during communication with the publisher warranty server."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_vote
+msgid "Mail Vote"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.client,help:mail.action_mail_star_feeds
+msgid ""
+"
\n"
+" No todo.\n"
+"
\n"
+" When you process messages in your inbox, you can mark "
+"some\n"
+" as todo. From this menu, you can process all your "
+"todo.\n"
+"
\n"
+" "
+msgstr ""
+
+#. module: mail
+#: selection:mail.mail,state:0
+msgid "Delivery Failed"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,partner_ids:0
+msgid "Additional contacts"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,parent_id:0
+#: help:mail.message,parent_id:0
+msgid "Initial thread message."
+msgstr ""
+
+#. module: mail
+#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+msgid "HR Policies"
+msgstr ""
+
+#. module: mail
+#: selection:res.partner,notification_email_send:0
+msgid "Emails only"
+msgstr "Ainult e-kirjad"
+
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_inbox_feeds
+#: model:ir.ui.menu,name:mail.mail_inboxfeeds
+msgid "Inbox"
+msgstr "Saabuvad"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:58
+#, python-format
+msgid "File"
+msgstr "Fail"
+
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/js/many2many_tags_email.js:63
+#, python-format
+msgid "Please complete partner's informations and Email"
+msgstr ""
+
+#. module: mail
+#: model:ir.actions.act_window,name:mail.action_view_message_subtype
+#: model:ir.ui.menu,name:mail.menu_message_subtype
+msgid "Subtypes"
+msgstr "Alamtüübid"
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_alias
+msgid "Email Aliases"
+msgstr ""
+
+#. module: mail
+#: field:mail.group,image_small:0
+msgid "Small-sized photo"
+msgstr ""
+
+#. module: mail
+#: help:mail.mail,reply_to:0
+msgid "Preferred response address for the message"
+msgstr "Eelistatud vastamisaadress sellele kirjale"
diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po
index 36ab6a88ade..e45f044f417 100644
--- a/addons/mail/i18n/pl.po
+++ b/addons/mail/i18n/pl.po
@@ -8,24 +8,24 @@ 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-16 18:34+0000\n"
+"PO-Revision-Date: 2012-12-17 19:55+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n"
"Language-Team: Polish \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-17 04:47+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: mail
#: field:res.partner,notification_email_send:0
msgid "Receive Feeds by Email"
-msgstr ""
+msgstr "Otrzymuj zgłoszenia mailowo"
#. module: mail
#: view:mail.followers:0
msgid "Followers Form"
-msgstr ""
+msgstr "Formularz obserwatorów"
#. module: mail
#: model:ir.model,name:mail.model_publisher_warranty_contract
@@ -71,6 +71,8 @@ msgid ""
"The name of the email alias, e.g. 'jobs' if you want to catch emails for "
""
msgstr ""
+"Nazwa aliasu adresu, np. 'jobs' jeśli chcesz mieć adresy dla "
+""
#. module: mail
#: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
@@ -84,6 +86,8 @@ msgid ""
"Invalid expression, it must be a literal python dictionary definition e.g. "
"\"{'field': 'value'}\""
msgstr ""
+"Niedozwolone wyrażenie, to musi być python dictionary np. \"{'field': "
+"'value'}\""
#. module: mail
#: view:mail.group:0
@@ -112,6 +116,8 @@ msgid ""
"Email address of the sender. This field is set when no matching partner is "
"found for incoming emails."
msgstr ""
+"Adres nadawcy: To pole jest ustawiane, kiedy żaden partner nie może być "
+"zidentyfikowany na podstawie przychodzącej wiadomości."
#. module: mail
#: model:ir.model,name:mail.model_mail_compose_message
@@ -130,12 +136,12 @@ msgstr "Nieprzeczytane wiadomości"
#: code:addons/mail/static/src/xml/mail.xml:247
#, python-format
msgid "show"
-msgstr ""
+msgstr "pokaż"
#. module: mail
#: help:mail.message.subtype,default:0
msgid "Checked by default when subscribing."
-msgstr ""
+msgstr "Zaznaczone domyślnie kiedy jest subskrypcja."
#. module: mail
#: help:mail.group,group_ids:0
@@ -143,6 +149,8 @@ msgid ""
"Members of those groups will automatically added as followers. Note that "
"they will be able to manage their subscription manually if necessary."
msgstr ""
+"Członkowie tych grup będą automatycznie dodani jako obserwatorzy. Zwróć "
+"uwagę, że oni sami mogą zmieniać swoje ustawienia do subskrypcji."
#. module: mail
#. openerp-web
@@ -182,6 +190,9 @@ msgid ""
"image, with aspect ratio preserved. Use this field in form views or some "
"kanban views."
msgstr ""
+"Średniej wielkości zdjęcie grupy. Automatycznie skalowane do 128x128pikseli "
+"z zachowaniem proporcji. Stosuj to pole w widokach formularza i niektórych "
+"kanban."
#. module: mail
#: view:mail.mail:0
@@ -192,7 +203,7 @@ msgstr "Odebrane"
#. module: mail
#: field:mail.mail,body_html:0
msgid "Rich-text Contents"
-msgstr ""
+msgstr "Zawartość Rich-text"
#. module: mail
#: view:mail.mail:0
@@ -216,7 +227,7 @@ msgstr ""
#. module: mail
#: field:base.config.settings,alias_domain:0
msgid "Alias Domain"
-msgstr ""
+msgstr "Alisa domeny"
#. module: mail
#: field:mail.group,group_ids:0
@@ -246,7 +257,7 @@ msgstr "Grupa dyskusyjna"
#: code:addons/mail/static/src/xml/mail.xml:95
#, python-format
msgid "uploading"
-msgstr ""
+msgstr "wysyłanie"
#. module: mail
#. openerp-web
@@ -262,6 +273,8 @@ msgid ""
"Message type: email for email message, notification for system message, "
"comment for other messages such as user replies"
msgstr ""
+"Typ wiadomości: mail jako wiadomość, powiadomienie jako informacja "
+"systemowa, komentarz jako odpowiedź na inne wiadomości."
#. module: mail
#: model:ir.model,name:mail.model_mail_wizard_invite
@@ -294,13 +307,13 @@ msgstr "Jeśli zaznaczone, to wiadomość wymaga twojej uwagi"
#. module: mail
#: field:mail.group,image_medium:0
msgid "Medium-sized photo"
-msgstr ""
+msgstr "Zdjęcie średniej wielkości"
#. 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 "Do: mnie"
#. module: mail
#: field:mail.message.subtype,name:0
@@ -339,7 +352,7 @@ msgstr "Niedozwolona akcja!"
#: code:addons/mail/static/src/xml/mail.xml:25
#, python-format
msgid "User img"
-msgstr ""
+msgstr "Zdjęcie użytk."
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_mail_mail
@@ -362,6 +375,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 ""
+"Zawiera podsumowanie wypowiedzi (liczbę wiadomości, ...). To podsumowanie "
+"jest bezpośrednio w formacie html, aby można je było stosować w widokach "
+"kanban."
#. module: mail
#: help:mail.alias,alias_model_id:0
@@ -370,18 +386,21 @@ msgid ""
"incoming email that does not reply to an existing record will cause the "
"creation of a new record of this model (e.g. a Project Task)"
msgstr ""
+"Model (rodzaj dokumentu OpenERP), którego alias dotyczy. Maile przychodzące, "
+"które nie są odpowiedzią do istniejących rekordów spowodują utworzenie "
+"nowego rekordu w tym modelu np. Zadanie w projekcie."
#. module: mail
#: selection:mail.compose.message,type:0
#: selection:mail.message,type:0
msgid "System notification"
-msgstr ""
+msgstr "Powiadomienie systemowe"
#. module: mail
#: model:ir.model,name:mail.model_res_partner
#: view:mail.mail:0
msgid "Partner"
-msgstr ""
+msgstr "Partner"
#. module: mail
#: model:ir.ui.menu,name:mail.mail_my_stuff
@@ -397,7 +416,7 @@ msgstr "Temat"
#. module: mail
#: field:mail.wizard.invite,partner_ids:0
msgid "Partners"
-msgstr ""
+msgstr "Partnerzy"
#. module: mail
#: view:mail.mail:0
@@ -421,7 +440,7 @@ msgstr "Wiadomość"
#: help:mail.compose.message,favorite_user_ids:0
#: help:mail.message,favorite_user_ids:0
msgid "Users that set this message in their favorites"
-msgstr ""
+msgstr "Uzytkownicy, którzy ustawili tę wiadomość jako ulubioną"
#. module: mail
#: model:ir.model,name:mail.model_base_config_settings
@@ -493,7 +512,7 @@ msgstr ""
#: code:addons/mail/static/src/js/mail_followers.js:132
#, python-format
msgid "One follower"
-msgstr ""
+msgstr "Jeden obserwator"
#. module: mail
#: field:mail.compose.message,type:0
@@ -536,6 +555,9 @@ msgid ""
"image, with aspect ratio preserved. Use this field anywhere a small image is "
"required."
msgstr ""
+"Małe zdjęcie grupy. Będzie automatycznie przeskalowane do 64x64 pikseli z "
+"zachowaniem proporcji. Będzie stosowane wszędzie, gdzie małe zdjęcie jest "
+"wymagane."
#. module: mail
#: view:mail.compose.message:0
@@ -576,7 +598,7 @@ msgstr "Nadawca wiadomości pobrany z preferencji"
#: code:addons/mail/wizard/invite.py:39
#, python-format
msgid "
You have been invited to follow a new document.
"
-msgstr ""
+msgstr "
Zostałeś zaproszony do obserwacji nowego dokumentu.
\n"
+" Ta lista zawiera wiadomości wysłane do ciebie.\n"
+"
\n"
+" "
#. module: mail
#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
@@ -670,7 +698,7 @@ msgstr "Model następnego zasobu"
#: code:addons/mail/static/src/xml/mail.xml:271
#, python-format
msgid "like"
-msgstr "podobny do"
+msgstr "lubię"
#. module: mail
#: view:mail.compose.message:0
@@ -713,7 +741,7 @@ msgstr "Ma załączniki"
#. module: mail
#: view:mail.mail:0
msgid "on"
-msgstr ""
+msgstr "na"
#. module: mail
#: code:addons/mail/mail_message.py:809
@@ -729,13 +757,15 @@ msgid ""
"A Python dictionary that will be evaluated to provide default values when "
"creating new records for this alias."
msgstr ""
+"Słownik (dictionary) python, który będzie wyliczony i zastosowany jako "
+"wartości domyślne do tworzenia nowego rekordu w tym aliasie."
#. module: mail
#: help:mail.compose.message,notified_partner_ids:0
#: help:mail.message,notified_partner_ids:0
msgid ""
"Partners that have a notification pushing this message in their mailboxes"
-msgstr ""
+msgstr "Partnerzy, którzy mają powiadomienia w swoich skrzynkach."
#. module: mail
#: selection:mail.compose.message,type:0
@@ -762,7 +792,7 @@ msgstr ""
#. module: mail
#: field:mail.mail,notification:0
msgid "Is Notification"
-msgstr ""
+msgstr "Jest powiadomieniem"
#. module: mail
#. openerp-web
@@ -804,7 +834,7 @@ msgstr "Zdjęcie"
#: view:mail.wizard.invite:0
#, python-format
msgid "or"
-msgstr ""
+msgstr "lub"
#. module: mail
#: help:mail.compose.message,vote_user_ids:0
@@ -846,6 +876,7 @@ msgstr "Wiadomości podrzędne"
#: help:mail.message,to_read:0
msgid "Functional field to search for messages the current user has to read"
msgstr ""
+"Pole funkcyjne do szukania wiadomości, które użytkownik powinien przeczytać"
#. module: mail
#: field:mail.alias,alias_user_id:0
@@ -878,7 +909,7 @@ msgstr "Do zrobienia"
#: help:mail.followers,res_id:0
#: help:mail.wizard.invite,res_id:0
msgid "Id of the followed resource"
-msgstr ""
+msgstr "Id następującego zasobu"
#. module: mail
#: field:mail.compose.message,body:0
@@ -931,7 +962,7 @@ msgstr "Zamknięte"
#. module: mail
#: field:mail.alias,alias_force_thread_id:0
msgid "Record Thread ID"
-msgstr ""
+msgstr "ID wątku rekordu"
#. module: mail
#: model:ir.ui.menu,name:mail.mail_group_root
@@ -974,13 +1005,13 @@ msgstr "Wychodzące"
#. module: mail
#: selection:res.partner,notification_email_send:0
msgid "All feeds"
-msgstr ""
+msgstr "Wszystkie pobrania"
#. module: mail
#: help:mail.compose.message,record_name:0
#: help:mail.message,record_name:0
msgid "Name get of the related document."
-msgstr ""
+msgstr "Nazwa powiązanego dokumentu"
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_notifications
@@ -996,7 +1027,7 @@ msgstr "Powiadomienia"
#. module: mail
#: view:mail.alias:0
msgid "Search Alias"
-msgstr ""
+msgstr "Szykaj aliasów"
#. module: mail
#: help:mail.alias,alias_force_thread_id:0
@@ -1005,6 +1036,9 @@ msgid ""
"attached, even if they did not reply to it. If set, this will disable the "
"creation of new records completely."
msgstr ""
+"Opcjonalne ID wątku (rekordu), do którego przychodzące wiadomości będą "
+"dowiązane, nawet jeśli nie są odpowiedzią na ten rekord. Jeśli ustawione, to "
+"będzie zapobiegać tworzeniu nowych rekordów."
#. module: mail
#: help:mail.message.subtype,name:0
@@ -1015,6 +1049,9 @@ msgid ""
"subtypes allow to precisely tune the notifications the user want to receive "
"on its wall."
msgstr ""
+"Podtyp wiadomości precyzuje rodzaj wiadomości. W szczególności dla "
+"powiadomień. Na przykład: powiadomienie może dotyczyć nowego rekordu (Nowe), "
+"lub zmiany etapu (Zmiana etapu). Podtypy ułatwiają porządkowanie wiadomości."
#. module: mail
#: view:mail.mail:0
@@ -1036,7 +1073,7 @@ msgstr "Tylko wybrane grupy"
#: field:mail.thread,message_is_follower:0
#: field:res.partner,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Jest obserwatorem"
#. module: mail
#: view:mail.alias:0
@@ -1096,7 +1133,7 @@ msgstr "Do:"
#: code:addons/mail/static/src/xml/mail.xml:166
#, python-format
msgid "Write to my followers"
-msgstr "Napisz do mich obserwatorów"
+msgstr "Napisz do moich obserwatorów"
#. module: mail
#: model:ir.model,name:mail.model_res_groups
@@ -1160,7 +1197,7 @@ msgstr "Błąd"
#: code:addons/mail/static/src/xml/mail_followers.xml:13
#, python-format
msgid "Following"
-msgstr ""
+msgstr "Obserwacje"
#. module: mail
#: sql_constraint:mail.alias:0
@@ -1176,11 +1213,14 @@ msgid ""
"the sender (From) address, or will use the Administrator account if no "
"system user is found for that address."
msgstr ""
+"Właściciel rekordów utworzonych z wiadomości. Jeśli pole nie będzie "
+"wypełnione, to system spróbuje przypisać użytkownika na podstawie adresu "
+"nadawcy. Jeśli nie znajdzie takiego użytkownika, to przypisze Administratora."
#. module: mail
#: view:mail.favorite:0
msgid "Favorite Form"
-msgstr ""
+msgstr "Ulubiony formularz"
#. module: mail
#: help:mail.group,image:0
@@ -1188,6 +1228,7 @@ msgid ""
"This field holds the image used as photo for the group, limited to "
"1024x1024px."
msgstr ""
+"To pole zawiera obrazek stosowany jak zdjęcie grupy. Rozmiar 1024x1024."
#. module: mail
#: field:mail.compose.message,attachment_ids:0
@@ -1200,7 +1241,7 @@ msgstr "Załączniki"
#: field:mail.compose.message,record_name:0
#: field:mail.message,record_name:0
msgid "Message Record Name"
-msgstr ""
+msgstr "Nazwa rekordu wiadomości"
#. module: mail
#: field:mail.mail,email_cc:0
@@ -1237,6 +1278,8 @@ msgstr "Wykonano"
msgid ""
"Related model of the subtype. If False, this subtype exists for all models."
msgstr ""
+"Model dla podtypu. Jeśli pole jest puste, to podtyp dotyczy wszystkich "
+"modeli."
#. module: mail
#: model:mail.message.subtype,name:mail.mt_comment
@@ -1248,7 +1291,7 @@ msgstr "Dyskusje"
#: code:addons/mail/static/src/xml/mail_followers.xml:11
#, python-format
msgid "Follow"
-msgstr ""
+msgstr "Obserwuj"
#. module: mail
#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
@@ -1261,12 +1304,12 @@ msgstr "Cała firma"
#: view:mail.compose.message:0
#, python-format
msgid "and"
-msgstr ""
+msgstr "i"
#. module: mail
#: help:mail.mail,body_html:0
msgid "Rich-text/HTML message"
-msgstr ""
+msgstr "Wiadomość Rich-text/HTML"
#. module: mail
#: view:mail.mail:0
@@ -1340,7 +1383,7 @@ msgstr "Spotkania"
#. module: mail
#: field:mail.alias,alias_model_id:0
msgid "Aliased Model"
-msgstr ""
+msgstr "Aliasowane modele"
#. module: mail
#: help:mail.compose.message,message_id:0
@@ -1373,6 +1416,10 @@ msgid ""
"\n"
"(Document type: %s, Operation: %s)"
msgstr ""
+"Operacja nie może być wykonana z powodu ograniczeń odstępu. Skontaktuj się "
+"ze swoim administratorem.\n"
+"\n"
+"(Typ dokumentu: %s, Operacja: %s)"
#. module: mail
#: selection:res.partner,notification_email_send:0
@@ -1394,7 +1441,7 @@ msgstr "Nie znaleziono adresów partnerów"
#: view:mail.mail:0
#: selection:mail.mail,state:0
msgid "Sent"
-msgstr "Wysłane"
+msgstr "Wysłano"
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_favorites
@@ -1407,7 +1454,7 @@ msgstr "Ulubione"
#: help:res.partner,notification_email_send:0
msgid ""
"Choose in which case you want to receive an email when you receive new feeds."
-msgstr "Wybierz gdzie chcesz otrzymywać pocztę przy pobieraniu."
+msgstr "Wybierz, jak chcesz otrzymywać pocztę przy pobieraniu."
#. module: mail
#: model:ir.actions.act_window,name:mail.action_view_groups
@@ -1453,7 +1500,7 @@ msgstr "Ustaw z powrotem na Do zrobienia"
#: code:addons/mail/static/src/xml/mail.xml:113
#, python-format
msgid "this document"
-msgstr "ten dokument"
+msgstr "tego dokumentu"
#. module: mail
#: field:mail.compose.message,filter_id:0
@@ -1476,6 +1523,8 @@ msgid ""
"If you have setup a catch-all email domain redirected to the OpenERP server, "
"enter the domain name here."
msgstr ""
+"Jeśli masz pobieranie wszystkich maili domeny do serwera OpenERP, to podaj "
+"tę domenę tutaj."
#. module: mail
#: field:mail.compose.message,favorite_user_ids:0
@@ -1496,7 +1545,7 @@ msgstr "inni..."
#: 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
@@ -1510,6 +1559,8 @@ msgid ""
"Technical field holding the message notifications. Use notified_partner_ids "
"to access notified partners."
msgstr ""
+"Pole techniczne zawierające powiadomienie. Stosuj notified_partner_ids, aby "
+"zobaczyć powiadomionych partnerów."
#. module: mail
#: model:ir.ui.menu,name:mail.mail_feeds
@@ -1521,7 +1572,7 @@ msgstr "Wiadomości"
#: view:mail.alias:0
#: field:mail.message.subtype,res_model:0
msgid "Model"
-msgstr ""
+msgstr "Model"
#. module: mail
#: view:mail.message:0
@@ -1534,6 +1585,7 @@ msgid ""
"Message subtypes followed, meaning subtypes that will be pushed onto the "
"user's Wall."
msgstr ""
+"Obserwowane podtypy wiadomości, które pojawią się na ekranie użytkownika."
#. module: mail
#: help:mail.group,message_ids:0
@@ -1545,7 +1597,7 @@ msgstr "Wiadomości i historia komunikacji"
#. module: mail
#: help:mail.mail,references:0
msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Odnośniki wiadomości, jak identyfikator poprzedniej wiadomości."
#. module: mail
#: field:mail.compose.message,composition_mode:0
@@ -1558,14 +1610,14 @@ msgstr "Tryb pisania"
#: field:mail.message,model:0
#: field:mail.wizard.invite,res_model:0
msgid "Related Document Model"
-msgstr ""
+msgstr "Powiązany model dokumentu"
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:272
#, python-format
msgid "unlike"
-msgstr "nie podobny do"
+msgstr "nie lubię"
#. module: mail
#: help:mail.compose.message,author_id:0
@@ -1574,16 +1626,18 @@ msgid ""
"Author of the message. If not set, email_from may hold an email address that "
"did not match any partner."
msgstr ""
+"Autor wiadomości. Jeśli nie ustawione, to znaczy że pole email_from nie "
+"pasuje do żadnego partnera."
#. module: mail
#: help:mail.mail,email_cc:0
msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Odiorcy kopii wiadomości"
#. module: mail
#: field:mail.alias,alias_domain:0
msgid "Alias domain"
-msgstr ""
+msgstr "Domena aliasowa"
#. module: mail
#: code:addons/mail/update.py:93
@@ -1609,6 +1663,15 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Do zrobienia.\n"
+"
\n"
+" Kiedy przetwarzasz wiadomości w Przychodzących, to "
+"możesz\n"
+" niektóre oznaczyć jako do zrobienia. Z tego menu\n"
+" możesz przetwarzać je.\n"
+"
\n"
+" "
#. module: mail
#: selection:mail.mail,state:0
@@ -1629,7 +1692,7 @@ msgstr "Wiadomość inicjująca wątek"
#. module: mail
#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
msgid "HR Policies"
-msgstr ""
+msgstr "Zasady kadrowe"
#. module: mail
#: selection:res.partner,notification_email_send:0
@@ -1670,7 +1733,7 @@ msgstr "Aliasy email"
#. module: mail
#: field:mail.group,image_small:0
msgid "Small-sized photo"
-msgstr ""
+msgstr "Małe zdjęcie"
#. module: mail
#: help:mail.mail,reply_to:0
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index 14ce006fd5b..e0d07e8c36c 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -18,11 +18,8 @@
# along with this program. If not, see
#
##############################################################################
-
-from openerp import SUPERUSER_ID
from openerp.osv import osv, fields
-from openerp import tools
-
+from openerp import tools, SUPERUSER_ID
class mail_followers(osv.Model):
""" mail_followers holds the data related to the follow mechanism inside
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index af900684754..e171c9cc14c 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -21,8 +21,8 @@
import openerp
import openerp.tools as tools
-from osv import osv
-from osv import fields
+from openerp.osv import osv
+from openerp.osv import fields
from openerp import SUPERUSER_ID
diff --git a/addons/mail/mail_group_menu.py b/addons/mail/mail_group_menu.py
index 253fa76d998..56d4b5dd564 100644
--- a/addons/mail/mail_group_menu.py
+++ b/addons/mail/mail_group_menu.py
@@ -20,8 +20,8 @@
##############################################################################
from openerp import SUPERUSER_ID
-from osv import osv
-from osv import fields
+from openerp.osv import osv
+from openerp.osv import fields
class ir_ui_menu(osv.osv):
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index 8df12707ad6..ac9c026728e 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -21,11 +21,11 @@
import base64
import logging
-import tools
+from openerp import tools
from openerp import SUPERUSER_ID
-from osv import osv, fields
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
_logger = logging.getLogger(__name__)
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index cabbcf97dd2..d545f3782b4 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -20,7 +20,7 @@
##############################################################################
import logging
-import tools
+from openerp import tools
from email.header import decode_header
from openerp import SUPERUSER_ID
diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py
index e37e20259f8..8a9bac86f0c 100644
--- a/addons/mail/mail_message_subtype.py
+++ b/addons/mail/mail_message_subtype.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv
-from osv import fields
+from openerp.osv import osv
+from openerp.osv import fields
class mail_message_subtype(osv.osv):
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 63043f992f3..fc2a5547bd2 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -25,14 +25,14 @@ import email
import logging
import pytz
import time
-import tools
+from openerp import tools
import xmlrpclib
from email.message import Message
from mail_message import decode
from openerp import SUPERUSER_ID
-from osv import osv, fields
-from tools.safe_eval import safe_eval as eval
+from openerp.osv import fields, osv
+from openerp.tools.safe_eval import safe_eval as eval
_logger = logging.getLogger(__name__)
@@ -338,8 +338,9 @@ class mail_thread(osv.AbstractModel):
# 2. Look for a matching mail.alias entry
# Delivered-To is a safe bet in most modern MTAs, but we have to fallback on To + Cc values
# for all the odd MTAs out there, as there is no standard header for the envelope's `rcpt_to` value.
- rcpt_tos = decode_header(message, 'Delivered-To') or \
- ','.join([decode_header(message, 'To'),
+ rcpt_tos = \
+ ','.join([decode_header(message, 'Delivered-To'),
+ decode_header(message, 'To'),
decode_header(message, 'Cc'),
decode_header(message, 'Resent-To'),
decode_header(message, 'Resent-Cc')])
diff --git a/addons/mail/mail_vote.py b/addons/mail/mail_vote.py
new file mode 100644
index 00000000000..bde46f8a90d
--- /dev/null
+++ b/addons/mail/mail_vote.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2012-Today OpenERP SA ().
+#
+# 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
+#
+##############################################################################
+
+from openerp.osv import fields, osv
+
+
+class mail_vote(osv.Model):
+ ''' Mail vote feature allow users to like and unlike messages attached
+ to a document. This allows for example to build a ranking-based
+ displaying of messages, for FAQ. '''
+
+ _name = 'mail.vote'
+ _description = 'Mail Vote'
+ _columns = {
+ 'message_id': fields.many2one('mail.message', 'Message', select=1,
+ ondelete='cascade', required=True),
+ 'user_id': fields.many2one('res.users', 'User', select=1,
+ ondelete='cascade', required=True),
+ }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index 060adc291de..cf9a2272a98 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class res_partner_mail(osv.Model):
""" Update partner to add a field about notification preferences """
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 33a6b56342c..4c6bf6e150d 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
from openerp import SUPERUSER_ID
-from tools.translate import _
+from openerp.tools.translate import _
class res_users(osv.Model):
""" Update of res.users class
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index dc5583eb951..f873daff9c3 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1414,6 +1414,7 @@ openerp.mail = function (session) {
* @param {String} [no_message] Message to display when there are no message
* @param {Boolean} [show_link] Display partner (authors, followers...) on link or not
* @param {Boolean} [compose_as_todo] The root composer mark automatically the message as todo
+ * @param {Boolean} [readonly] Read only mode, hide all action buttons and composer
*/
init: function (parent, action) {
this._super(parent, action);
@@ -1435,6 +1436,7 @@ openerp.mail = function (session) {
'view_inbox': false,
'message_ids': undefined,
'compose_as_todo' : false,
+ 'readonly' : false,
}, this.action.params);
this.action.params.help = this.action.help || false;
@@ -1507,6 +1509,9 @@ openerp.mail = function (session) {
if (this.node.attrs.placeholder) {
this.node.params.compose_placeholder = this.node.attrs.placeholder;
}
+ if (this.node.attrs.readonly) {
+ this.node.params.readonly = this.node.attrs.readonly;
+ }
this.domain = this.node.params && this.node.params.domain || [];
},
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 542e4eec7b7..3c510813029 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -20,7 +20,7 @@
mail.compose_message when focus on textarea
-->
-
\n"
+" Klicken Sie, um neuen Arbeitsauftrag zu erstellen.\n"
+"
\n"
+" Arbeitsaufträge repräsentieren die Auflistung der "
+"durchzuführenden Vorgänge für einen\n"
+" Fertigungsauftrag. Sobald Sie den ersten Arbeitsauftrag zu einem "
+"Fertigungsauftrag starten,\n"
+" wird dieser automatisch mit gestartet. Sobald Sie den letzten "
+"Arbeitsvorgang beenden,\n"
+" wird ebenso der Fertigungsauftrag abgeschlossen sowie die "
+"produzierte Menge als Bestand\n"
+" gebucht.\n"
+"
\n"
+" "
#. module: mrp_operations
#: help:mrp.production.workcenter.line,delay:0
@@ -356,6 +374,7 @@ msgstr "Dezember"
#, python-format
msgid "Work order has been done for production order %s."
msgstr ""
+"Arbeitsauftrag wurde erledigt für den Fertigungsauftrag ."
#. module: mrp_operations
#: view:mrp.workorder:0
@@ -392,7 +411,7 @@ msgstr "Erwartet Material"
#. module: mrp_operations
#: field:mrp.production.workcenter.line,production_state:0
msgid "Production Status"
-msgstr ""
+msgstr "Status der Produktion"
#. module: mrp_operations
#: selection:mrp.workorder,state:0
@@ -468,6 +487,8 @@ msgid ""
"Operation has already started! You can either Pause/Finish/Cancel the "
"operation."
msgstr ""
+"Der Arbeitsauftrag wurde bereits gestartet! Sie können jetzt entweder "
+"unterbrechen / erledigen / stornieren."
#. module: mrp_operations
#: selection:mrp.workorder,month:0
@@ -632,12 +653,21 @@ msgid ""
"* When order is completely processed that time it is set in 'Finished' "
"status."
msgstr ""
+"* Wenn ein Arbeitsauftrag erstellt wurde, befindet er sich zunächst im "
+"Status 'Entwurf'.\n"
+"* Wenn ein Anwender den Arbeitsauftrag dann started, ist der Auftrag dadurch "
+"'in Bearbeitung'.\n"
+"* Ein Auftrag in Bearbeitung kann durch Unterbrechung oder Anpassung in den "
+"'Wiedervorlage\" Status versetzt werden.\n"
+"* Durch Abbrechen des Arbeitsauftrags kann er 'Storniert' werden.\n"
+"* Wenn der Auftrag fertig gestellt wird, kann er dadurch 'Erledigt' werden."
#. module: mrp_operations
#: code:addons/mrp_operations/mrp_operations.py:214
#, python-format
msgid "Work order has been created for production order %s."
msgstr ""
+"Arbeitsauftrag wurde erstellt für den Fertigungsauftrag %s."
#. module: mrp_operations
#: model:process.node,name:mrp_operations.process_node_startoperation0
@@ -665,6 +695,20 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Klicken Sie zur Erstellung eines neuen Arbeitsauftrags.\n"
+"
\n"
+" Zur Herstellung oder zur Montage von Produkten, unter Verwendung "
+"von Komponenten\n"
+" oder Halbfertigprodukten sind oft verschiedene Arbeitsvorgänge "
+"zu verrichten. Diese\n"
+" Vorgänge werden häufig als Arbeitsaufträge bezeichnet. Diese "
+"verschiedenen Vorgänge\n"
+" haben diverse Auswirkungen auf Herstellkosten und "
+"Ressourcenplanung in Abhängigkeit von\n"
+" der Auslastungssituation.\n"
+"
\n"
+" Klicken Sie zur Erstellung eines neuen Reparaturauftrags.\n"
+"
\n"
+" Mit einem Reparaturauftrag können Sie die ausgetauschten "
+"und\n"
+" reparierten Komponenten, sowie die zur Reparatur benötigten "
+"Zeiten\n"
+" erfassen.\n"
+"
\n"
+" Ein Reparaturauftrag nutzt ebenso das Garantiedatum der "
+"bekannten\n"
+" Seriennummer, um hierüber zu erkennen, inwieweit "
+"möglicherweise\n"
+" die Reparatur berechnet wird. \n"
+"
\n"
+" "
#. module: mrp_repair
#: help:mrp.repair.line,state:0
@@ -206,6 +223,13 @@ msgid ""
" \n"
"* The 'Cancelled' status is set automatically when user cancel repair order."
msgstr ""
+" * Der 'Entwurf' Status wird automatisch durch die Erstellung einer "
+"Reparatur angezeigt.\n"
+"* Der Status 'Bestätigt' erfolgt durch eine Annahme der Reparatur.\n"
+"* Der 'Erledigt' Status wird automatisch eingetragen, wenn der Vorgang "
+"erfolgreich beendet wird.\n"
+"* Der 'Storniert' Status wird automatisch für den Fall des Abbruch einer "
+"Reparatur eingetragen."
#. module: mrp_repair
#: field:mrp.repair,move_id:0
@@ -216,7 +240,7 @@ msgstr "Lieferauftrag"
#: code:addons/mrp_repair/mrp_repair.py:579
#, python-format
msgid "Repair Order for %s has been started."
-msgstr ""
+msgstr "Reparaturauftrag für %s ist in Reparatur."
#. module: mrp_repair
#: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -235,6 +259,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 ""
+"Hier finden Sie die Nachrichtenübersicht (Anzahl Nachrichten etc., ...) im "
+"html Format, um Sie später in einer Kanban Ansicht einfügen zu können."
#. module: mrp_repair
#: view:mrp.repair:0
@@ -253,7 +279,7 @@ msgstr "Warnung !"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "(update)"
-msgstr ""
+msgstr "(aktualisieren)"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -288,6 +314,17 @@ msgid ""
"* The 'Done' status is set when repairing is completed. \n"
"* The 'Cancelled' status is used when user cancel repair order."
msgstr ""
+" * Der 'Angebot' Status wird bei Eingabe einer noch nicht durch Annahme "
+"bestätigten Reparatur angezeigt.\n"
+"* Durch Annahme der Reparatur ist der Status automatisch 'Bestätigt'.\n"
+"* Nach der Annahme kann der Benutzer durch Beginn der Reparatur den Status "
+"'in Reparatur' aktivieren.\n"
+"* In den Status 'Abzurechnen' kann entweder vor Beginn oder dem Ende der "
+"Reparatur gewechselt werden.\n"
+"* In den Status 'Erledigt' wechselt der Auftrag nach Beendigung der "
+"Reparatur.\n"
+"* Der 'Storniert' Status wird erlangt, wenn der Benutzer eine Reparatur "
+"abbricht."
#. module: mrp_repair
#: view:mrp.repair:0
@@ -297,13 +334,14 @@ msgstr "Reparaturauftrag"
#. module: mrp_repair
#: report:repair.order:0
msgid "Tax"
-msgstr ""
+msgstr "Steuer"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:336
#, python-format
msgid "Serial number is required for operation line with product '%s'"
msgstr ""
+"Eine Seriennummer ist erforderlich für Auftragsposition mit Produkt '%s'"
#. module: mrp_repair
#: report:repair.order:0
@@ -320,7 +358,7 @@ msgstr "Losnummer"
#. module: mrp_repair
#: field:mrp.repair,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Followers"
#. module: mrp_repair
#: field:mrp.repair,fees_lines:0
@@ -398,7 +436,7 @@ msgstr "Reparaturposition"
#: code:addons/mrp_repair/mrp_repair.py:596
#, python-format
msgid "Repair has been cancelled."
-msgstr ""
+msgstr "Reparatur wurde storniert."
#. module: mrp_repair
#: report:repair.order:0
@@ -441,7 +479,7 @@ msgstr "Ja"
#: code:addons/mrp_repair/mrp_repair.py:573
#, python-format
msgid "Repair Order for %s has been created."
-msgstr ""
+msgstr "Reparaturauftrag für %s wurde erstellt."
#. module: mrp_repair
#: view:mrp.repair:0
@@ -455,7 +493,7 @@ msgstr "Abgerechnet"
#: field:mrp.repair.fee,product_uom:0
#: field:mrp.repair.line,product_uom:0
msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Produkt Einheit"
#. module: mrp_repair
#: view:mrp.repair.make_invoice:0
@@ -510,22 +548,26 @@ msgid ""
"invoice before or after the repair is done respectively. 'No invoice' means "
"you don't want to generate invoice for this repair order."
msgstr ""
+"Durch Auswahl der Einstellung 'Vor Reparatur' oder 'Nach Reparatur' können "
+"Sie steuern, ob Sie die Rechnung vor oder nach der Reparatur erstellen "
+"möchten . 'Keine Rechnung' bedeutet, dass Sie darauf verzichten, eine "
+"Rechnung zu generieren."
#. module: mrp_repair
#: field:mrp.repair,guarantee_limit:0
msgid "Warranty Expiration"
-msgstr ""
+msgstr "Garantie Ablauf"
#. module: mrp_repair
#: help:mrp.repair,pricelist_id:0
msgid "Pricelist of the selected partner."
-msgstr ""
+msgstr "Preisliste des ausgewählten Partners"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:606
#, python-format
msgid "Repair Order is closed."
-msgstr ""
+msgstr "Reparaturauftrag wurde beendet."
#. module: mrp_repair
#: report:repair.order:0
@@ -552,18 +594,18 @@ msgstr "Nach Reparatur"
#: code:addons/mrp_repair/wizard/cancel_repair.py:41
#, python-format
msgid "Active ID not Found"
-msgstr ""
+msgstr "Die aktive ID wurde nicht gefunden"
#. module: mrp_repair
#: field:mrp.repair,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Ist ein Follower"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:591
#, python-format
msgid "Repair Order for %s has been accepted."
-msgstr ""
+msgstr "Reparaturauftrag für %s wurde angenommen."
#. module: mrp_repair
#: view:mrp.repair:0
@@ -579,13 +621,13 @@ msgstr "Reparaturaufwendungen"
#: field:mrp.repair,message_comment_ids:0
#: help:mrp.repair,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Kommentare und EMails"
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:585
#, python-format
msgid "Draft Invoice of %s %s waiting for validation."
-msgstr ""
+msgstr "Rechnungsentwurf %s %s wartet auf Bestätigung."
#. module: mrp_repair
#: report:repair.order:0
@@ -595,7 +637,7 @@ msgstr "Angebot Reparatur"
#. module: mrp_repair
#: field:mrp.repair,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Zusammenfassung"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -625,7 +667,7 @@ msgstr "Menge"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Product Information"
-msgstr ""
+msgstr "Produktinformationen"
#. module: mrp_repair
#: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice
@@ -694,6 +736,10 @@ msgid ""
"repaired and create a picking with selected product. Note that you can "
"select the locations in the Info tab, if you have the extended view."
msgstr ""
+"Aktivieren Sie diese Option, wenn eine Auslieferung nach der Reparatur "
+"erfolgen soll und eine Pickliste für das ausgewählte Produkt erstellt werden "
+"soll. Beachten Sie dabei, daß Sie Lagerorte auf dem Zusatzinfo Aktenreiter "
+"spezifizieren können, wenn Sie entsprechende Ansicht Berechtigungen haben."
#. module: mrp_repair
#: help:mrp.repair,guarantee_limit:0
@@ -703,6 +749,10 @@ msgid ""
"expiration limit, each operation and fee you will add will be set as 'not to "
"invoiced' by default. Note that you can change manually afterwards."
msgstr ""
+"Der Garantieablauf wird wie folgt berechnet: Letztes Datum einer Lieferung + "
+"Garantie Laufzeit des Produkts. Sollte das Tagesdatum geringer sein als der "
+"Ablauf der Garantie, sind die Reparaturen kostenfrei und werden deshalb "
+"automatisch auf 'Keine Rechnung' abgeändert."
#. module: mrp_repair
#: view:mrp.repair.make_invoice:0
@@ -712,7 +762,7 @@ msgstr "Erzeuge Rechnung"
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Reair Orders"
-msgstr ""
+msgstr "Reparaturaufträge"
#. module: mrp_repair
#: field:mrp.repair.fee,name:0
@@ -767,7 +817,7 @@ msgstr "Wollen Sie wirklich die Rechnung(en) erstellen ?"
#: code:addons/mrp_repair/mrp_repair.py:350
#, python-format
msgid "Repair order is already invoiced."
-msgstr ""
+msgstr "Reparatur wurde bereits abgerechnet."
#. module: mrp_repair
#: view:mrp.repair:0
@@ -810,7 +860,7 @@ msgstr "Ausbau"
#: code:addons/mrp_repair/mrp_repair.py:601
#, python-format
msgid "Repair Order is now ready to repair."
-msgstr ""
+msgstr "Reparaturauftrag ist jetzt startbereit."
#. module: mrp_repair
#: field:mrp.repair,partner_invoice_id:0
@@ -820,7 +870,7 @@ msgstr "Rechnungsanschrift"
#. module: mrp_repair
#: help:mrp.repair,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Nachrichten und Kommunikations-Historie"
#. module: mrp_repair
#: view:mrp.repair:0
@@ -847,7 +897,7 @@ msgstr "Keine Rechnung"
#: view:mrp.repair.cancel:0
#: view:mrp.repair.make_invoice:0
msgid "or"
-msgstr ""
+msgstr "oder"
#. module: mrp_repair
#: field:mrp.repair,amount_total:0
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index cd783509bd4..78af4ab5f58 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -19,12 +19,12 @@
#
##############################################################################
-from osv import fields,osv
-import netsvc
+from openerp.osv import fields,osv
+from openerp import netsvc
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from tools.translate import _
-import decimal_precision as dp
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
class mrp_repair(osv.osv):
_name = 'mrp.repair'
diff --git a/addons/mrp_repair/report/order.py b/addons/mrp_repair/report/order.py
index d6edc1f01e4..818a55f0070 100644
--- a/addons/mrp_repair/report/order.py
+++ b/addons/mrp_repair/report/order.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class order(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index af8b2278c63..12b85efd202 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import osv,fields
-from tools.translate import _
+from openerp.osv import osv,fields
+from openerp.tools.translate import _
class repair_cancel(osv.osv_memory):
_name = 'mrp.repair.cancel'
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py
index b14230fcaf4..a6e93aca064 100644
--- a/addons/mrp_repair/wizard/make_invoice.py
+++ b/addons/mrp_repair/wizard/make_invoice.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import netsvc
-from osv import osv, fields
+from openerp import netsvc
+from openerp.osv import fields, osv
class make_invoice(osv.osv_memory):
_name = 'mrp.repair.make_invoice'
diff --git a/addons/multi_company/i18n/pt.po b/addons/multi_company/i18n/pt.po
index 224c624ded0..39b02d05669 100644
--- a/addons/multi_company/i18n/pt.po
+++ b/addons/multi_company/i18n/pt.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 10:25+0000\n"
-"PO-Revision-Date: 2011-07-30 14:12+0000\n"
-"Last-Translator: Daniel Reis (SECURITAS SA) \n"
+"PO-Revision-Date: 2012-12-17 12:35+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) \n"
"Language-Team: 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:44+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: multi_company
#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
@@ -45,6 +45,16 @@ msgid ""
"Thank you in advance for your cooperation.\n"
"Best Regards,"
msgstr ""
+"Caro Sr./Sra.,\n"
+"\n"
+"Os nossos registos indicam que possui na sua conta pagamentos pendentes. Por "
+"favor, confira os detalhes abaixo.\n"
+"Se o valor já tiver sido pago, pedimos-lhe que ignore este aviso. Caso "
+"contrário, envie-nos a quantia total indicada.\n"
+"Se tiver questões relacionadas com a sua conta, por favor, contacte-nos.\n"
+"\n"
+"Obrigado pela sua cooperação.\n"
+"Com os melhores cumprimentos,"
#. module: multi_company
#: view:multi_company.default:0
diff --git a/addons/note/i18n/it.po b/addons/note/i18n/it.po
new file mode 100644
index 00000000000..c6cb2dc42dc
--- /dev/null
+++ b/addons/note/i18n/it.po
@@ -0,0 +1,308 @@
+# Italian 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-17 07:15+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-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr "Contenuto nota"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr "Fasi delle note"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+#: model:note.stage,name:note.note_stage_02
+msgid "This Week"
+msgstr "Questa settimana"
+
+#. module: note
+#: model:ir.model,name:note.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
+msgstr "Tag nota"
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr "Note / modo fancy"
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr "Ragguppa per..."
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr "Followers"
+
+#. 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 ""
+"
\n"
+" Cliccare per aggiungere una nota personale.\n"
+"
\n"
+" Usa le note per organizzare le note e le attività personale. "
+"Tutte\n"
+" le note sono private; nessun altro sarà in grado di vederle. "
+"Tuttavia\n"
+" puoi condividere alcune note con altre persone invitando "
+"followers\n"
+" sulle note. (Utile per verbali appuntamenti, specialmente se\n"
+" hai attivato la funzionalità pad per la scrittura "
+"collaborativa).\n"
+"
\n"
+" Puoi personalizzare come processare le note/attività "
+"aggiungendo,\n"
+" rimuovendo o modificando le colonne.\n"
+"
\n"
+" Klicken Sie zur Definition einer neuen Kategorie.\n"
+"
\n"
+" Die Kategorien erleichtern die Navigation und die Suche nach "
+"Produkten\n"
+" insbesondere bei Nutzung einer Touchscreen Oberfläche.\n"
+"
\n"
+" Wenn Sie Fotos bei Produkten zuordnen, ändert sich "
+"automatisch auch \n"
+" die Anzeige auf dem Touchscreen Arbeitsplatz. Wir empfehlen "
+"Ihnen hierbei \n"
+" keine Fotos zu verwenden, wenn der Bildschirm eine sehr "
+"kleine Auflösung \n"
+" (1024x768) hat. \n"
+"
\n"
+" "
#. module: point_of_sale
#: view:pos.receipt:0
@@ -51,7 +68,7 @@ msgstr "Drucke Quittung für Barverkauf"
#. module: point_of_sale
#: field:pos.session,cash_register_balance_end:0
msgid "Computed Balance"
-msgstr ""
+msgstr "Errechneter Saldo"
#. module: point_of_sale
#: view:pos.session:0
@@ -62,7 +79,7 @@ msgstr "Heute"
#. module: point_of_sale
#: field:pos.config,iface_electronic_scale:0
msgid "Electronic Scale Interface"
-msgstr ""
+msgstr "Anbindung elektronische Waage"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.plain_water
@@ -85,7 +102,7 @@ msgstr ""
#: field:pos.config,journal_id:0
#: field:pos.order,sale_journal:0
msgid "Sale Journal"
-msgstr ""
+msgstr "Verkaufsjournal"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.spa_2l_product_template
@@ -103,6 +120,7 @@ msgstr "Verkauf Details"
#: constraint:pos.config:0
msgid "You cannot have two cash controls in one Point Of Sale !"
msgstr ""
+"Sie können kein weiteres Kartenlesegerät an einem Point Of Sale einsetzen."
#. module: point_of_sale
#: field:pos.payment.report.user,user_id:0
@@ -111,7 +129,7 @@ msgstr ""
#: view:report.pos.order:0
#: field:report.pos.order,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Verkäufer"
#. module: point_of_sale
#: view:report.pos.order:0
@@ -134,7 +152,7 @@ msgstr ""
#: code:addons/point_of_sale/point_of_sale.py:1343
#, python-format
msgid "Assign a Custom EAN"
-msgstr ""
+msgstr "Eine benutzerdefinierte EAN zuweisen"
#. module: point_of_sale
#: view:pos.session.opening:0
@@ -143,6 +161,9 @@ msgid ""
" being able to start selling through the "
"touchscreen interface."
msgstr ""
+"Sie müssen zuerst Ihren Bargeldbestand in der Kasse überprüfen, bevor Sie\n"
+" über Ihren Touchscreen mit dem Verkauf beginnen "
+"können."
#. module: point_of_sale
#: report:account.statement:0
@@ -164,12 +185,12 @@ msgstr "Geld entnehmen"
#: code:addons/point_of_sale/point_of_sale.py:107
#, python-format
msgid "not used"
-msgstr ""
+msgstr "nicht genutzt"
#. module: point_of_sale
#: field:pos.config,iface_vkeyboard:0
msgid "Virtual KeyBoard Interface"
-msgstr ""
+msgstr "Virtuelle Tastatur Schnittstelle"
#. module: point_of_sale
#. openerp-web
@@ -181,7 +202,7 @@ msgstr "+/−"
#. module: point_of_sale
#: field:pos.ean_wizard,ean13_pattern:0
msgid "Reference"
-msgstr ""
+msgstr "Referenz"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:1040
@@ -201,13 +222,14 @@ msgstr "Startdatum"
#: constraint:pos.session:0
msgid "You cannot create two active sessions with the same responsible!"
msgstr ""
+"Sie können nicht für den selben Benutzer zwei gleichzeitige Sitzungen öffnen"
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:479
#, python-format
msgid "Weighting"
-msgstr ""
+msgstr "Abwiegen"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.fenouil_fenouil_product_template
@@ -219,13 +241,13 @@ msgstr ""
#: code:addons/point_of_sale/static/src/xml/pos.xml:478
#, python-format
msgid "Help needed"
-msgstr ""
+msgstr "Es wird Hilfe benötigt"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:741
#, python-format
msgid "Configuration Error!"
-msgstr ""
+msgstr "Konfigurationsfehler!"
#. module: point_of_sale
#: report:account.statement:0
@@ -237,7 +259,7 @@ msgstr "Partner"
#. module: point_of_sale
#: view:pos.session:0
msgid "Closing Cash Control"
-msgstr ""
+msgstr "Kasse abschließen"
#. module: point_of_sale
#: report:pos.details:0
@@ -259,7 +281,7 @@ msgstr "Finanzbuchhaltung Info"
#. module: point_of_sale
#: field:pos.session.opening,show_config:0
msgid "Show Config"
-msgstr ""
+msgstr "Konfiguration anzeigen"
#. module: point_of_sale
#: report:pos.lines:0
@@ -318,7 +340,7 @@ msgstr "Rabatt (%)"
#: code:addons/point_of_sale/point_of_sale.py:1005
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Weisen Sie ein Ertragskonto für dieses Produkt zu: \"%s\" (id:%d)."
#. module: point_of_sale
#: view:report.pos.order:0
@@ -337,6 +359,9 @@ msgid ""
"Check this if this point of sale should open by default in a self checkout "
"mode. If unchecked, OpenERP uses the normal cashier mode by default."
msgstr ""
+"Aktivieren Sie diese Option, wenn im Standard ein Self-Checkout durch Kunden "
+"erfolgen soll. Durch Nicht-Aktivierungen belassen Sie den normalen "
+"Kassiermodus."
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
@@ -353,7 +378,7 @@ msgstr "Getränke"
#: model:ir.actions.act_window,name:point_of_sale.action_pos_session_opening
#: model:ir.ui.menu,name:point_of_sale.menu_pos_session_opening
msgid "Your Session"
-msgstr ""
+msgstr "Ihre eigene Sitzung"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.stella_50cl_product_template
@@ -375,12 +400,12 @@ msgstr "Übergeordnete Kategorie"
#: code:addons/point_of_sale/static/src/xml/pos.xml:488
#, python-format
msgid "Open Cashbox"
-msgstr ""
+msgstr "Öffnen der Kasse"
#. module: point_of_sale
#: view:pos.session.opening:0
msgid "Select your Point of Sale"
-msgstr ""
+msgstr "Auswahl Ihres Point Of Sale"
#. module: point_of_sale
#: field:report.sales.by.margin.pos,total:0
@@ -404,25 +429,25 @@ msgstr "Dr. Oetker Ristorante Speciale"
#: code:addons/point_of_sale/static/src/xml/pos.xml:486
#, python-format
msgid "Payment Request"
-msgstr ""
+msgstr "Zahlungsaufforderung"
#. module: point_of_sale
#: field:product.product,to_weight:0
msgid "To Weight"
-msgstr ""
+msgstr "Abwiegen"
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:482
#, python-format
msgid "Hardware Events"
-msgstr ""
+msgstr "Hardware Ereignis"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:303
#, python-format
msgid "You should assign a Point of Sale to your session."
-msgstr ""
+msgstr "Sie müssen einen Point Of Sale für Ihre Sitzung auswählen."
#. module: point_of_sale
#: view:pos.order.line:0
@@ -443,13 +468,17 @@ msgid ""
"close this session, you can update the 'Closing Cash Control' to avoid any "
"difference."
msgstr ""
+"Bitte hinterlegen Sie Erlös und Aufwand Konten für die Zahlungsmethode '%s'. "
+"Hierdurch kann OpenERP eine Differenz bis zu %.2f für den Kassenabschluss "
+"berücksichtigen. Um die Kasse abzuschließen, können Sie die 'Kassenabschluss "
+"Prüfung' nutzen, um Differenzen zu vermeiden."
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:317
#: code:addons/point_of_sale/point_of_sale.py:514
#, python-format
msgid "error!"
-msgstr ""
+msgstr "Fehler!"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
@@ -462,11 +491,13 @@ msgid ""
"Difference between the counted cash control at the closing and the computed "
"balance."
msgstr ""
+"Differenz zwischen dem gezählten Bestand bei Kassenabschluss und dem "
+"errechneten Endsaldo."
#. module: point_of_sale
#: view:pos.session.opening:0
msgid ") is \""
-msgstr ""
+msgstr ") ist \""
#. module: point_of_sale
#: model:product.template,name:point_of_sale.Onions_product_template
@@ -484,18 +515,18 @@ msgstr ""
#: selection:pos.session.opening,pos_state:0
#, python-format
msgid "In Progress"
-msgstr ""
+msgstr "In Bearbeitung"
#. module: point_of_sale
#: view:pos.session:0
#: field:pos.session,opening_details_ids:0
msgid "Opening Cash Control"
-msgstr ""
+msgstr "Kasseneröffnung Prüfung"
#. module: point_of_sale
#: help:res.users,ean13:0
msgid "BarCode"
-msgstr ""
+msgstr "Barcode"
#. module: point_of_sale
#: help:pos.category,image_medium:0
@@ -504,16 +535,19 @@ msgid ""
"128x128px image, with aspect ratio preserved. Use this field in form views "
"or some kanban views."
msgstr ""
+"Bild mittlerer Größe für diese Kategorie. Es wird automatisch auf 128x128px "
+"skaliert, bei Beibehaltung des Formats. Sie können das Feld in einigen "
+"Formular- oder Kanban Ansichten verwenden."
#. module: point_of_sale
#: view:pos.session.opening:0
msgid "Open Session"
-msgstr ""
+msgstr "Sitzung öffnen"
#. module: point_of_sale
#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
msgid "Daily Operations"
-msgstr "Tagesvorfälle"
+msgstr "Kassiervorgänge"
#. module: point_of_sale
#. openerp-web
@@ -543,7 +577,7 @@ msgstr "Suche Kassenauszug"
#: field:pos.session.opening,pos_state_str:0
#: field:report.pos.order,state:0
msgid "Status"
-msgstr ""
+msgstr "Status"
#. module: point_of_sale
#: selection:report.pos.order,month:0
@@ -568,14 +602,14 @@ msgstr "POS Auftragsposition"
#. module: point_of_sale
#: view:pos.config:0
msgid "Point of Sale Configuration"
-msgstr ""
+msgstr "Point Of Sale Konfiguration"
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:369
#, python-format
msgid "Your order has to be validated by a cashier."
-msgstr ""
+msgstr "Ihre Bestellung muss durch einen Kassierer quittiert werden"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template
@@ -607,6 +641,20 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Klicken Sie zur Eröffnung einer neuen Kassensitzung\n"
+"
\n"
+" Eine Kassensitzung ist eine bestimmte Zeitspanne, "
+"normalerweise über die Dauer eines Tages,\n"
+" während der am Point Of Sale verkauft wird. Der Benutzer muss "
+"zur Eröffnung und zum Abschluss\n"
+" der Kasse den Geldbestand zählen. \n"
+"
\n"
+" Beachten Sie den Hinweis, dass Sie über das Menü Ihre "
+"eigene Sitzung sehr schnell\n"
+" eine eigene Sitzung eröffnen können.\n"
+"
\n"
+" "
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:870
@@ -620,6 +668,9 @@ msgid ""
"You can continue sales from the touchscreen interface by clicking on \"Start "
"Selling\" or close the cash register session."
msgstr ""
+"Sie können den Verkauf sehr einfach über den Touchscreen Bildschirm "
+"fortsetzen, indem Sie auf 'Starte Verkauf' klicken oder eine laufende "
+"Kassensitzung abschließen."
#. module: point_of_sale
#: report:account.statement:0
@@ -631,7 +682,7 @@ msgstr "Kassenabschluss"
#. module: point_of_sale
#: view:pos.session:0
msgid "Opening Cashbox Lines"
-msgstr ""
+msgstr "Kasseneröffnung Positionen"
#. module: point_of_sale
#: selection:report.pos.order,month:0
@@ -678,7 +729,7 @@ msgstr "Zeile Nr."
#: code:addons/point_of_sale/static/src/xml/pos.xml:459
#, python-format
msgid "Set Weight"
-msgstr ""
+msgstr "Gewicht eintragen"
#. module: point_of_sale
#: view:account.bank.statement:0
@@ -693,7 +744,7 @@ msgstr "Summe Netto:"
#. module: point_of_sale
#: model:ir.actions.client,name:point_of_sale.action_client_pos_menu
msgid "Open POS Menu"
-msgstr ""
+msgstr "Öffnen POS Menü"
#. module: point_of_sale
#: report:pos.details_summary:0
@@ -710,7 +761,7 @@ msgstr "Verbuche POS Buchungen"
#: code:addons/point_of_sale/static/src/xml/pos.xml:463
#, python-format
msgid "Barcode Scanner"
-msgstr ""
+msgstr "Barcode Lesegerät"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.pomme_granny_smith_product_template
@@ -723,6 +774,9 @@ msgid ""
"Check if, this is a product you can use to take cash from a statement for "
"the point of sale backend, example: money lost, transfer to bank, etc."
msgstr ""
+"Aktivieren Sie diese Option, wenn dieses Produkt verwendet werden kann, um "
+"aus der Kasse am Point Of Sale Arbeitsplatz Bargeld zu entnehmen, z.B. "
+"Ausgleich Kassendifferenz, Einzahlung auf Bankkonto etc."
#. module: point_of_sale
#: view:report.pos.order:0
@@ -739,11 +793,14 @@ msgid ""
"use\n"
" a modern browser like"
msgstr ""
+"Der Point Of Sale wird nicht von Microsoft Internet Explorer unterstützt. "
+"Bitte benutzen Sie einen\n"
+" modernen Browser wie"
#. module: point_of_sale
#: view:pos.session.opening:0
msgid "Click to start a session."
-msgstr ""
+msgstr "Klicken Sie zum Starten einer Sitzung."
#. module: point_of_sale
#: view:pos.details:0
@@ -751,7 +808,7 @@ msgstr ""
#: view:pos.payment.report.user:0
#: view:pos.sale.user:0
msgid "Print Report"
-msgstr "Drucke Report"
+msgstr "Drucke Bericht"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.oetker_bolognese_product_template
@@ -768,12 +825,12 @@ msgstr "Pizza"
#: code:addons/point_of_sale/wizard/pos_return.py:240
#, python-format
msgid "Add Product"
-msgstr "Hinzuf. Produkt"
+msgstr "Hinzufügen Produkt"
#. module: point_of_sale
#: field:pos.config,name:0
msgid "Point of Sale Name"
-msgstr ""
+msgstr "Point Of Sale Bezeichnung"
#. module: point_of_sale
#: field:report.transaction.pos,invoice_am:0
@@ -802,7 +859,7 @@ msgstr "Quittung"
#: field:report.sales.by.margin.pos,net_margin_per_qty:0
#: field:report.sales.by.margin.pos.month,net_margin_per_qty:0
msgid "Net margin per Qty"
-msgstr "Nettomarge pro Stk"
+msgstr "Netto Marge pro Stk"
#. module: point_of_sale
#: view:pos.confirm:0
@@ -820,7 +877,7 @@ msgstr "Endsaldo"
#: code:addons/point_of_sale/wizard/pos_box_out.py:89
#, python-format
msgid "please check that account is set to %s."
-msgstr ""
+msgstr "bitte überprüfen Sie, ob das Konto für %s eingetragen ist."
#. module: point_of_sale
#: help:pos.category,image:0
@@ -828,6 +885,8 @@ msgid ""
"This field holds the image used as image for the cateogry, limited to "
"1024x1024px."
msgstr ""
+"In diesem Feld wird das Bild einer Produktkategorie abgespeichert, limitiert "
+"auf die Größe 1024x1024px."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.pepsi_max_50cl_product_template
@@ -849,6 +908,13 @@ msgid ""
"Method\" from the \"Point of Sale\" tab. You can also create new payment "
"methods directly from menu \"PoS Backend / Configuration / Payment Methods\"."
msgstr ""
+"Sie müssen die Zahlungsmethoden bestimmen, die an Ihrem Point Of Sale "
+"akzeptiert werden, indem Sie die vorhandene Bank und Kasse über \"Finanzen / "
+"Konfiguration / Journale / Journale\" verwenden. Wählen Sie hier ein Journal "
+"aus und aktivieren Sie die Option \"POS Zahlungsmethode\" über den "
+"Aktenreiter \"Point Of Sale\". Sie können des weiteren neue Zahlungsmethoden "
+"direkt über das Menü \"POS Backend / Konfiguration / Zahlungsmethoden\" "
+"erstellen."
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.rouges_noyau_fruits
@@ -858,7 +924,7 @@ msgstr ""
#. module: point_of_sale
#: view:pos.ean_wizard:0
msgid "Ean13 Generator"
-msgstr ""
+msgstr "EAN13 Generator"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.spa_1l_product_template
@@ -911,7 +977,7 @@ msgstr ""
#. module: point_of_sale
#: report:pos.details:0
msgid "Sales total(Revenue)"
-msgstr "Gesamtumsatz"
+msgstr "Gesamte Verkäufe (Umsatz)"
#. module: point_of_sale
#: help:pos.config,group_by:0
@@ -919,6 +985,8 @@ msgid ""
"Check this if you want to group the Journal Items by Product while closing a "
"Session"
msgstr ""
+"Aktivieren Sie diese Option, wenn Sie beim Kassenabschluss die Journal "
+"Buchungszeilen nach Produkten zusammen fassen möchten."
#. module: point_of_sale
#: report:pos.details:0
@@ -934,13 +1002,13 @@ msgstr ""
#. module: point_of_sale
#: view:res.users:0
msgid "Edit EAN"
-msgstr ""
+msgstr "Bearbeite EAN"
#. module: point_of_sale
#: code:addons/point_of_sale/wizard/pos_open_statement.py:80
#, python-format
msgid "List of Cash Registers"
-msgstr "Liste der Kassabücher"
+msgstr "Liste der Kassenbücher"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.maes_50cl_product_template
@@ -950,7 +1018,7 @@ msgstr ""
#. module: point_of_sale
#: view:report.pos.order:0
msgid "Not Invoiced"
-msgstr "Nicht in Rechnung gestellt"
+msgstr "Nicht abgerechnet"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.lays_pickles_250g_product_template
@@ -960,7 +1028,7 @@ msgstr ""
#. module: point_of_sale
#: field:pos.session.opening,pos_session_id:0
msgid "PoS Session"
-msgstr ""
+msgstr "PoS Sitzung"
#. module: point_of_sale
#: selection:report.pos.order,month:0
@@ -979,12 +1047,14 @@ msgstr "Produkte des Benutzers"
msgid ""
"You have to select a pricelist in the sale form !\n"
"Please set one before choosing a product."
-msgstr "Sie müssen noch eine Preisliste beim Verkaufsauftrag wählen !"
+msgstr ""
+"Sie müssen noch eine Preisliste beim Verkaufsauftrag wählen !\n"
+"Bitte wählen Sie eine vor Ihrer Produktauswahl."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.fanta_orange_2l_product_template
msgid "Fanta Orange 2L"
-msgstr "Copy text \t Fanta Orange 2L"
+msgstr "Fanta Orange 2L"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.perrier_1l_product_template
@@ -999,12 +1069,12 @@ msgstr ""
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_discount
msgid "Add a Global Discount"
-msgstr "Füge allg. Rabatt hinzu"
+msgstr ""
#. module: point_of_sale
#: view:pos.config:0
msgid "Journals"
-msgstr ""
+msgstr "Journale"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.oetker_prosciutto_product_template
@@ -1029,19 +1099,19 @@ msgstr ""
#: code:addons/point_of_sale/static/src/xml/pos.xml:747
#, python-format
msgid "return"
-msgstr ""
+msgstr "zurück"
#. module: point_of_sale
#: view:product.product:0
msgid "Set a Custom EAN"
-msgstr ""
+msgstr "Definieren Sie eine benutzerdefinierte EAN"
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:237
#, python-format
msgid "Remaining:"
-msgstr ""
+msgstr "Verbleibend:"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.legumes
@@ -1051,14 +1121,14 @@ msgstr ""
#. module: point_of_sale
#: view:pos.session:0
msgid "tab of the"
-msgstr ""
+msgstr "Aktenreiter der"
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:484
#, python-format
msgid "Scan Item Success"
-msgstr ""
+msgstr "Artikelscan erfolgreich"
#. module: point_of_sale
#: report:account.statement:0
@@ -1075,17 +1145,17 @@ msgstr ""
#. module: point_of_sale
#: sql_constraint:pos.session:0
msgid "The name of this POS Session must be unique !"
-msgstr ""
+msgstr "Die Bezeichnung der POS Sitzung muss eindeutig sein."
#. module: point_of_sale
#: view:pos.session:0
msgid "Opening Subtotal"
-msgstr ""
+msgstr "Kasseneröffnung Saldo"
#. module: point_of_sale
#: view:pos.session:0
msgid "payment method."
-msgstr ""
+msgstr "Zahlungsmethode"
#. module: point_of_sale
#: view:pos.order:0
@@ -1118,19 +1188,19 @@ msgstr "Zahlung"
#: view:report.pos.order:0
#: field:report.pos.order,nbr:0
msgid "# of Lines"
-msgstr "# Positionen"
+msgstr "Anzahl Positionen"
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:83
#, python-format
msgid "Disc"
-msgstr "Rabatt (%)"
+msgstr "Rabatt"
#. module: point_of_sale
#: view:pos.order:0
msgid "(update)"
-msgstr ""
+msgstr "(aktualisieren)"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template
@@ -1154,7 +1224,7 @@ msgstr ""
#: code:addons/point_of_sale/wizard/pos_session_opening.py:34
#, python-format
msgid "Start Point Of Sale"
-msgstr ""
+msgstr "Starte Point Of Sale"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.pils
@@ -1164,7 +1234,7 @@ msgstr ""
#. module: point_of_sale
#: help:pos.session,cash_register_balance_end_real:0
msgid "Computed using the cash control lines"
-msgstr ""
+msgstr "Errechnet aus Kassenabschluss Prüfpositionen"
#. module: point_of_sale
#: report:all.closed.cashbox.of.the.day:0
@@ -1208,7 +1278,7 @@ msgstr ""
#: code:addons/point_of_sale/static/src/xml/pos.xml:491
#, python-format
msgid "Read Weighting Scale"
-msgstr ""
+msgstr "Lese Wiegeergebnis"
#. module: point_of_sale
#. openerp-web
@@ -1233,7 +1303,7 @@ msgstr "Heutige Verkäufe"
#: code:addons/point_of_sale/static/src/xml/pos.xml:334
#, python-format
msgid "Welcome"
-msgstr ""
+msgstr "Herzlich Willkommen"
#. module: point_of_sale
#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
@@ -1290,7 +1360,7 @@ msgstr "Summe berechnet"
#: model:ir.model,name:point_of_sale.model_pos_category
#: field:product.product,pos_categ_id:0
msgid "Point of Sale Category"
-msgstr ""
+msgstr "Point of Sale Kategorie"
#. module: point_of_sale
#: view:report.pos.order:0
@@ -1304,6 +1374,8 @@ msgid ""
"This sequence is automatically created by OpenERP but you can change it to "
"customize the reference numbers of your orders."
msgstr ""
+"Diese Sequenz wird normalerweise durch OpenERP automatisch erzeugt, sie "
+"können diese aber auch anpassen, um Ihre eigene Referenznummer einzutragen."
#. module: point_of_sale
#. openerp-web
@@ -1347,7 +1419,7 @@ msgstr ""
#: code:addons/point_of_sale/static/src/xml/pos.xml:485
#, python-format
msgid "Scan Item Unrecognized"
-msgstr ""
+msgstr "Eingescannter Artikel wurde nicht erkannt"
#. module: point_of_sale
#: report:all.closed.cashbox.of.the.day:0
@@ -1358,7 +1430,7 @@ msgstr "Heutige Kassenabschlüsse"
#: code:addons/point_of_sale/point_of_sale.py:900
#, python-format
msgid "Selected orders do not have the same session!"
-msgstr ""
+msgstr "Die ausgewählten Aufträge haben nicht die gleiche Sitzung"
#. module: point_of_sale
#: report:pos.invoice:0
@@ -1391,14 +1463,14 @@ msgstr "Eröffnungsdatum"
#: model:ir.actions.act_window,name:point_of_sale.action_pos_session
#: model:ir.ui.menu,name:point_of_sale.menu_pos_session_all
msgid "All Sessions"
-msgstr ""
+msgstr "Alle Sitzungen"
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:666
#, python-format
msgid "tab"
-msgstr ""
+msgstr "Aktenreiter"
#. module: point_of_sale
#: report:pos.lines:0
@@ -1410,7 +1482,7 @@ msgstr "Umsatzsteuer:"
#: code:addons/point_of_sale/static/src/xml/pos.xml:281
#, python-format
msgid "Thank you for shopping with us."
-msgstr ""
+msgstr "Vielen Dank für Ihren Einkauf."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.coca_light_2l_product_template
@@ -1426,12 +1498,12 @@ msgstr ""
#: model:ir.actions.act_window,name:point_of_sale.pos_category_action
#: model:ir.ui.menu,name:point_of_sale.menu_pos_category
msgid "Product Categories"
-msgstr ""
+msgstr "Produkte Kategorien"
#. module: point_of_sale
#: help:pos.config,journal_id:0
msgid "Accounting journal used to post sales entries."
-msgstr ""
+msgstr "Finanzbuchhaltung Journal für die Verkäufe"
#. module: point_of_sale
#: field:report.transaction.pos,disc:0
@@ -1443,7 +1515,7 @@ msgstr "Rabatt (%)"
#: code:addons/point_of_sale/static/src/xml/pos.xml:473
#, python-format
msgid "Invalid Ean"
-msgstr ""
+msgstr "Ungültige EAN"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template
@@ -1453,7 +1525,7 @@ msgstr ""
#. module: point_of_sale
#: view:pos.config:0
msgid "Point of Sale Config"
-msgstr ""
+msgstr "Point Of Sale Konfiguration"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.coca_zero_33cl_product_template
@@ -1494,7 +1566,7 @@ msgstr "unbekannt"
#. module: point_of_sale
#: field:product.product,income_pdt:0
msgid "Point of Sale Cash In"
-msgstr ""
+msgstr "Point Of Sale Einzahlung"
#. module: point_of_sale
#. openerp-web
@@ -1506,7 +1578,7 @@ msgstr "Steuern:"
#. module: point_of_sale
#: view:pos.session:0
msgid "+ Transactions"
-msgstr ""
+msgstr "+ Transaktionen"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
@@ -1541,7 +1613,7 @@ msgstr ""
#. module: point_of_sale
#: field:product.product,available_in_pos:0
msgid "Available in the Point of Sale"
-msgstr ""
+msgstr "Verfügbar am Point Of Sale"
#. module: point_of_sale
#: selection:pos.config,state:0
@@ -1558,12 +1630,12 @@ msgstr ""
#: code:addons/point_of_sale/static/src/xml/pos.xml:348
#, python-format
msgid "The scanned product was not recognized"
-msgstr ""
+msgstr "Das eigescannte Produkt wurde nicht erkannt"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_report_transaction_pos
msgid "transaction for the pos"
-msgstr "Transaktion"
+msgstr "Transaktionen für das POS"
#. module: point_of_sale
#: report:pos.details:0
@@ -1592,11 +1664,13 @@ msgid ""
"Enter a reference, it will be converted\n"
" automatically to a valid EAN number."
msgstr ""
+"Geben Sie hier eine Referenz ein, sie wird automatisch\n"
+" in eine gültige EAN Nummer umgewandelt."
#. module: point_of_sale
#: field:product.product,expense_pdt:0
msgid "Point of Sale Cash Out"
-msgstr ""
+msgstr "Point Of Sale Auszahlung"
#. module: point_of_sale
#: selection:report.pos.order,month:0
@@ -1608,7 +1682,7 @@ msgstr "November"
#: code:addons/point_of_sale/static/src/xml/pos.xml:277
#, python-format
msgid "Please scan an item or your member card"
-msgstr ""
+msgstr "Bitte scannen Sie einen Artikel oder eine Mitgliedskarte ein"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.poivron_verts_product_template
@@ -1627,11 +1701,14 @@ msgid ""
"Your ending balance is too different from the theorical cash closing (%.2f), "
"the maximum allowed is: %.2f. You can contact your manager to force it."
msgstr ""
+"Die Abweichung des Endsaldos weicht zu stark vom theoretischen Saldo (%.2f) "
+"ab, die maximal zulässige Abweichung ist: %.2f. Kontaktieren Sie die "
+"Kassenaufsicht, um die Sitzung abzuschließen."
#. module: point_of_sale
#: view:pos.session:0
msgid "Validate Closing & Post Entries"
-msgstr ""
+msgstr "Abschluss Quittieren & Buchen"
#. module: point_of_sale
#: field:report.transaction.pos,no_trans:0
@@ -1645,12 +1722,14 @@ msgid ""
"There is no receivable account defined to make payment for the partner: "
"\"%s\" (id:%d)."
msgstr ""
+"Es wurde kein Debitorenkonto für die Zahlung des Partners angelegt: \"%s\" "
+"(id:%d)."
#. module: point_of_sale
#: view:pos.config:0
#: selection:pos.config,state:0
msgid "Inactive"
-msgstr ""
+msgstr "Inaktiv"
#. module: point_of_sale
#. openerp-web
@@ -1674,7 +1753,7 @@ msgstr "Abbrechen"
#: code:addons/point_of_sale/static/src/xml/pos.xml:306
#, python-format
msgid "Please put your product on the scale"
-msgstr ""
+msgstr "Bitte legen Sie das Produkt auf die Waage"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
@@ -1694,7 +1773,7 @@ msgstr ""
#. module: point_of_sale
#: field:pos.config,sequence_id:0
msgid "Order IDs Sequence"
-msgstr ""
+msgstr "Auftrag Kürzel Nummernfolge"
#. module: point_of_sale
#: report:pos.invoice:0
@@ -1709,7 +1788,7 @@ msgstr "Preis pro Einheit"
#: code:addons/point_of_sale/static/src/xml/pos.xml:184
#, python-format
msgid "Product Weighting"
-msgstr ""
+msgstr "Abwiegen Produkt"
#. module: point_of_sale
#. openerp-web
@@ -1717,12 +1796,12 @@ msgstr ""
#: code:addons/point_of_sale/static/src/xml/pos.xml:749
#, python-format
msgid "close"
-msgstr ""
+msgstr "Schließen"
#. module: point_of_sale
#: model:ir.actions.report.xml,name:point_of_sale.report_user_label
msgid "User Labels"
-msgstr ""
+msgstr "Benutzer Kennzeichnung"
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_pos_order_line
@@ -1738,7 +1817,7 @@ msgstr "Gesamtbetrag"
#. module: point_of_sale
#: view:pos.session:0
msgid "End of Session"
-msgstr ""
+msgstr "Ende der Sitzung"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
@@ -1749,14 +1828,14 @@ msgstr "Barkassen"
#. module: point_of_sale
#: help:pos.session,cash_register_balance_end:0
msgid "Computed with the initial cash control and the sum of all payments."
-msgstr ""
+msgstr "Berechnet durch den Startsaldo und die Summer aller Zahlungen"
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:480
#, python-format
msgid "In Transaction"
-msgstr ""
+msgstr "In Bearbeitung"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.food
@@ -1807,7 +1886,7 @@ msgstr ""
#. module: point_of_sale
#: field:pos.session,cash_register_difference:0
msgid "Difference"
-msgstr ""
+msgstr "Differenz"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:531
@@ -1852,12 +1931,12 @@ msgstr ""
#. module: point_of_sale
#: model:product.template,name:point_of_sale.unreferenced_product_product_template
msgid "Unreferenced Products"
-msgstr ""
+msgstr "Nicht referenzierende Produkte"
#. module: point_of_sale
#: view:pos.ean_wizard:0
msgid "Apply"
-msgstr ""
+msgstr "Anwenden"
#. module: point_of_sale
#. openerp-web
@@ -1868,6 +1947,9 @@ msgid ""
"complete\n"
" your purchase"
msgstr ""
+"Bitte stecken Sie Ihre Karte in das Lesegerät und folgen Sie den Anweisungen "
+"zur Komplettierung\n"
+" Ihres Einkaufs."
#. module: point_of_sale
#: help:product.product,income_pdt:0
@@ -1875,6 +1957,8 @@ msgid ""
"Check if, this is a product you can use to put cash into a statement for the "
"point of sale backend."
msgstr ""
+"Prüfen Sie in der Point Of Sale Verwaltung, ob Sie dieses Produkt für "
+"Bargeldeinlagen nutzen können."
#. module: point_of_sale
#: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
@@ -1884,20 +1968,20 @@ msgstr ""
#. module: point_of_sale
#: field:pos.session,cash_control:0
msgid "Has Cash Control"
-msgstr ""
+msgstr "Wurde geprüft"
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
#: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all
msgid "Orders Analysis"
-msgstr ""
+msgstr "Statistik Verkäufe"
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:569
#, python-format
msgid "User:"
-msgstr ""
+msgstr "Benutzer:"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:318
@@ -1906,6 +1990,8 @@ msgid ""
"Unable to open the session. You have to assign a sale journal to your point "
"of sale."
msgstr ""
+"Es ist nicht möglich die Kasse zu eröffnen. Sie müssen zuerst Ihrem Point Of "
+"Sale ein Verkaufsjournal zuweisen."
#. module: point_of_sale
#: view:report.pos.order:0
@@ -1952,12 +2038,12 @@ msgstr "Gruppierung..."
#: code:addons/point_of_sale/static/src/xml/pos.xml:570
#, python-format
msgid "Shop:"
-msgstr ""
+msgstr "Shop:"
#. module: point_of_sale
#: field:account.journal,self_checkout_payment_method:0
msgid "Self Checkout Payment Method"
-msgstr ""
+msgstr "Self-Checkout Zahlungsmethode"
#. module: point_of_sale
#: view:pos.order:0
@@ -1972,7 +2058,7 @@ msgstr "Alle abgeschlossenen Kassen"
#. module: point_of_sale
#: field:pos.details,user_ids:0
msgid "Salespeople"
-msgstr ""
+msgstr "Verkäufer"
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:758
@@ -1980,7 +2066,7 @@ msgstr ""
#: code:addons/point_of_sale/wizard/pos_box_out.py:91
#, python-format
msgid "You have to open at least one cashbox."
-msgstr ""
+msgstr "Sie sollten mindestens eine Kasse eröffnen."
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:1141
@@ -1998,7 +2084,7 @@ msgstr ""
#: code:addons/point_of_sale/static/src/xml/pos.xml:680
#, python-format
msgid "caps lock"
-msgstr ""
+msgstr "Feststelltaste"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template
@@ -2040,6 +2126,8 @@ msgstr "Keine Kassa definiert."
msgid ""
"No cash statement found for this session. Unable to record returned cash."
msgstr ""
+"Es wurde kein Kassenbuch für diese Sitzung gefunden. Es kann keine "
+"Aufzeichnung einer Geldrückgabe erfolgen."
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.oignons_ail_echalotes
@@ -2108,7 +2196,7 @@ msgstr ""
#. module: point_of_sale
#: model:ir.actions.client,name:point_of_sale.action_pos_pos
msgid "Start Point of Sale"
-msgstr ""
+msgstr "Starte Point Of Sale"
#. module: point_of_sale
#. openerp-web
@@ -2137,7 +2225,7 @@ msgstr "Bestelldatum"
#. module: point_of_sale
#: view:pos.order:0
msgid "Point of Sale Orders"
-msgstr ""
+msgstr "Point Of Sale Verkäufe"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
@@ -2149,7 +2237,7 @@ msgstr ""
#: field:pos.config,journal_ids:0
#: field:pos.session,journal_ids:0
msgid "Available Payment Methods"
-msgstr ""
+msgstr "Vorhandene Zahlungsmethoden"
#. module: point_of_sale
#: model:ir.actions.act_window,help:point_of_sale.product_normal_action
@@ -2169,6 +2257,22 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Klicken Sie hier, um ein neues Produkt anzulegen.\n"
+"
\n"
+" Sie müssen ein Produkt für sämtliche Verkäufe aus Ihrem "
+"Point\n"
+" Of Sale anlegen.\n"
+"
\n"
+" Vergessen Sie dabei nicht, den Preis und die "
+"korrespondierende \n"
+" Verkaufskategorie, in der dieser Umsatz auftauchen soll, "
+"festzulegen.\n"
+" Wenn das Produkt keinen explizit zugewiesenen Point Of Sale "
+"hat,\n"
+" können Sie es hierüber verkaufen.\n"
+"
\n"
" "
msgstr ""
+"
\n"
+" Klicken Sie zur Erstellung eines neuen Kassenbuchs.\n"
+"
\n"
+" Benutzen Sie dieses Menü, um durch vorherige Kassenbücher zu "
+"browsen. Um neue Kassenbücher\n"
+" aufzuzeichnen, sollten Sie besser das Menü Ihre eigenen "
+"Sitzungen für die Touchscreen \n"
+" Eingabe einsetzen. \n"
+"
\n"
+" "
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:456
#, python-format
msgid "Electronic Scale"
-msgstr ""
+msgstr "Elektronische Verkäufe"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.spa_gazeuse_50cl_product_template
@@ -3497,13 +3622,13 @@ msgstr ""
#. module: point_of_sale
#: field:res.users,pos_config:0
msgid "Default Point of Sale"
-msgstr ""
+msgstr "Standard Point Of Sale"
#. module: point_of_sale
#: code:addons/point_of_sale/wizard/pos_box.py:23
#, python-format
msgid "There is no cash register for this PoS Session"
-msgstr ""
+msgstr "Es existiert keine Kasse für diese PoS Session"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.special_beers
@@ -3518,7 +3643,7 @@ msgstr "Rabatthinweis"
#. module: point_of_sale
#: view:account.bank.statement:0
msgid "Cash Statement"
-msgstr ""
+msgstr "Kassenbuch"
#. module: point_of_sale
#: report:pos.details_summary:0
@@ -3557,7 +3682,7 @@ msgstr "Fruchtige Biere"
#. module: point_of_sale
#: view:pos.session:0
msgid "You can define another list of available currencies on the"
-msgstr ""
+msgstr "Sie können eine andere Liste mit verfügbaren Währungen verwenden"
#. module: point_of_sale
#. openerp-web
@@ -3569,7 +3694,7 @@ msgstr ""
#. module: point_of_sale
#: help:pos.session,cash_register_balance_start:0
msgid "Computed using the cash control at the opening."
-msgstr ""
+msgstr "Berechnet unter Nutzung der Kasseneröffnung Prüfung"
#. module: point_of_sale
#: model:pos.category,name:point_of_sale.raisins
@@ -3599,7 +3724,7 @@ msgstr "Drucke Quittung"
#: code:addons/point_of_sale/point_of_sale.py:419
#, python-format
msgid "Point of Sale Loss"
-msgstr ""
+msgstr "Point Of Sale Verlust"
#. module: point_of_sale
#: field:pos.make.payment,payment_date:0
@@ -3629,7 +3754,7 @@ msgstr ""
#. module: point_of_sale
#: field:pos.session,details_ids:0
msgid "Cash Control"
-msgstr ""
+msgstr "Kassenprüfung"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.oetker_vegetale_product_template
@@ -3656,7 +3781,7 @@ msgstr "Gutschrift"
#: code:addons/point_of_sale/static/src/xml/pos.xml:427
#, python-format
msgid "Your shopping cart is empty"
-msgstr ""
+msgstr "Ihre Shopping Karte ist leer."
#. module: point_of_sale
#: code:addons/point_of_sale/report/pos_invoice.py:46
@@ -3678,7 +3803,7 @@ msgstr "Rabatt(%)"
#. module: point_of_sale
#: view:pos.session.opening:0
msgid "The session"
-msgstr ""
+msgstr "Die Sitzung"
#. module: point_of_sale
#: view:pos.order:0
@@ -3693,7 +3818,7 @@ msgstr "Zwischensummen"
#. module: point_of_sale
#: view:pos.session.opening:0
msgid "Close Session"
-msgstr ""
+msgstr "Beende Sitzung"
#. module: point_of_sale
#: view:pos.order:0
@@ -3703,12 +3828,12 @@ msgstr "Auftragszeilen"
#. module: point_of_sale
#: view:pos.session.opening:0
msgid "PoS Session Opening"
-msgstr ""
+msgstr "PoS Kasseneröffnung"
#. module: point_of_sale
#: field:pos.order.line,price_subtotal:0
msgid "Subtotal w/o Tax"
-msgstr "Zwischensumme w/o Steuer"
+msgstr "Zwischensumme mit/ohne Steuer"
#. module: point_of_sale
#. openerp-web
@@ -3716,7 +3841,7 @@ msgstr "Zwischensumme w/o Steuer"
#: code:addons/point_of_sale/static/src/xml/pos.xml:742
#, python-format
msgid "delete"
-msgstr ""
+msgstr "löschen"
#. module: point_of_sale
#: model:product.template,name:point_of_sale.spa_50cl_product_template
@@ -3742,7 +3867,7 @@ msgstr ""
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
msgid "Pyament Report"
-msgstr "Zahlungsausertung"
+msgstr "Zahlungsauswertung"
#. module: point_of_sale
#: field:report.transaction.pos,jl_id:0
@@ -3752,12 +3877,12 @@ msgstr "Journal Kasse"
#. module: point_of_sale
#: view:pos.session:0
msgid "Session:"
-msgstr ""
+msgstr "Sitzung:"
#. module: point_of_sale
#: field:pos.config,iface_print_via_proxy:0
msgid "Print via Proxy"
-msgstr ""
+msgstr "Drucke via Proxy"
#. module: point_of_sale
#: report:pos.sales.user.today:0
@@ -3779,7 +3904,7 @@ msgstr "Beschreibung"
#: model:ir.actions.act_window,name:point_of_sale.act_pos_config_sessions
#: field:pos.config,session_ids:0
msgid "Sessions"
-msgstr ""
+msgstr "Sitzungen"
#. module: point_of_sale
#: selection:report.pos.order,month:0
@@ -3808,11 +3933,14 @@ msgid ""
"image, with aspect ratio preserved. Use this field anywhere a small image is "
"required."
msgstr ""
+"Kleines Bild dieser Kategorie. Es wird automatisch auf 64x64px skaliert "
+"unter Beibehaltung der Optik. Benutzen Sie dieses Feld immer dann, wenn Sie "
+"ein keines Bild benötigen."
#. module: point_of_sale
#: field:pos.session.opening,pos_state:0
msgid "Session Status"
-msgstr ""
+msgstr "Sitzung Starten"
#. module: point_of_sale
#: field:pos.order,picking_id:0
@@ -3835,6 +3963,16 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Klicken Sie um Zahlungsmethode zu ergänzen.\n"
+"
\n"
+" Zahlungsmethoden werden durch Journale definiert, die "
+"optional PoS Zahlungsmethode aktiviert \n"
+" haben müssen. Um für das Touchscreen Interface "
+"funktionsfähig zu sein, müssen Sie dort die Zahlungsmethode am\n"
+" konfigurieren.\n"
+"
\n"
+"Aquí puede gestionar todas las recepciones de producto de los pedidos de "
+"compra cuya facturación es \"Basada en envíos entrantes\", y para las que "
+"aún no haya recibido una factura de proveedor.\n"
+"Puede generar facturas de proveedor basadas en estas recepciones.\n"
+"
\n"
+" "
#. module: purchase
#: view:purchase.report:0
@@ -284,7 +291,7 @@ msgstr "Categoría"
#. module: purchase
#: view:purchase.order:0
msgid "Quotation "
-msgstr "Cotización "
+msgstr "Presupuesto "
#. module: purchase
#: code:addons/purchase/purchase.py:810
@@ -292,7 +299,7 @@ msgstr "Cotización "
msgid ""
"Quotation for %sconverted to a Purchase Order of %s %s."
msgstr ""
-"Cotización para %sconvertida a pedido de compra de %s %s."
+"Presupuesto para %sconvertido a pedido de compra de %s %s."
#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -447,6 +454,14 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+"Pulse para registrar una factura de proveedor.\n"
+"
\n"
+"Las factura de proveedor pueden ser pre-generadas basadas en pedidos de "
+"compra o en recepciones. Esto permite controlar las facturas recibidas de "
+"los proveedores acorde con los documentos borrador en OpenERP.\n"
+"
\n"
+"Aquí puede seguir todas las líneas de los pedidos de compra cuya facturación "
+"sea \"Basada en las líneas de pedido de compra\", y para las cuales aún no "
+"ha recibido factura de proveedor. Puede generar facturas de compra borrador "
+"basadas en las líneas de esta lista.\n"
+"
\n"
+"Pulse para crear un presupuesto que será convertido en pedido de venta.\n"
+"
\n"
+"Use este menú para buscar sus pedidos de compra por referencias, proveedor, "
+"productos, etc. Para cada pedido de venta, puede controlar la discusión "
+"relativa con el proveedor, controlar los productos recibidos y controlar las "
+"facturas de proveedor.\n"
+"
\n"
+" "
#. module: purchase
#: view:purchase.order.line:0
@@ -704,7 +735,7 @@ msgstr "No se ha podido cancelar este pedido de compra."
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
msgid "Invoice Control"
-msgstr "Control factura"
+msgstr "Control de facturas"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -806,7 +837,7 @@ msgstr "Esperando aceptación proveedor"
#. module: purchase
#: report:purchase.quotation:0
msgid "Request for Quotation :"
-msgstr "Presupuesto solicitado:"
+msgstr "Solicitud de presupuesto:"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
@@ -986,12 +1017,12 @@ msgstr "Fecha aprobación"
#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation created."
-msgstr "Petición de cotización creada."
+msgstr "Solicitud de presupuesto creada."
#. module: purchase
#: view:product.product:0
msgid "a draft purchase order"
-msgstr ""
+msgstr "un pedido de compra en borrador"
#. module: purchase
#: view:purchase.report:0
@@ -1001,13 +1032,13 @@ msgstr "Pedidos del año"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
msgid "RFQs and Purchases"
-msgstr ""
+msgstr "PdO y compras"
#. module: purchase
#: field:account.config.settings,group_analytic_account_for_purchases:0
#: field:purchase.config.settings,group_analytic_account_for_purchases:0
msgid "Analytic accounting for purchases"
-msgstr ""
+msgstr "Contabilidad analítica para compras"
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1026,33 +1057,36 @@ msgid ""
" Example: 10% for retailers, promotion of 5 EUR on this "
"product, etc."
msgstr ""
+"Permite gestionar diferentes precios basados en reglas por categoría de "
+"proveedor.\n"
+"Ejemplo: 10% para minoristas, promoción de 5 EUR en este producto, etc."
#. module: purchase
#: model:ir.model,name:purchase.model_mail_mail
msgid "Outgoing Mails"
-msgstr ""
+msgstr "Correos salientes"
#. module: purchase
#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
-msgstr ""
+msgstr "No puede confirmar un pedido de compra que no tiene líneas."
#. module: purchase
#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
msgid "Purchase: Mark unread"
-msgstr ""
+msgstr "Compras: Marcar como no leído"
#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Mensajes e historial de comunicación"
#. module: purchase
#: field:purchase.order,warehouse_id:0
#: field:stock.picking.in,warehouse_id:0
msgid "Destination Warehouse"
-msgstr ""
+msgstr "Almacén destino"
#. module: purchase
#: code:addons/purchase/purchase.py:973
@@ -1061,6 +1095,8 @@ msgid ""
"Selected Unit of Measure does not belong to the same category as the product "
"Unit of Measure."
msgstr ""
+"La unidad de medida seleccionada no pertenece a la misma categoría que la "
+"unidad de medida del producto."
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
@@ -1071,13 +1107,13 @@ msgstr "Unidades de medida"
#. module: purchase
#: field:purchase.config.settings,group_purchase_pricelist:0
msgid "Manage pricelist per supplier"
-msgstr ""
+msgstr "Gestionar tarifas por proveedor"
#. module: purchase
#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to draft."
-msgstr ""
+msgstr "El pedido de compra se ha establecido como borrador."
#. module: purchase
#: view:board.board:0
@@ -1089,11 +1125,12 @@ msgstr "Tablero de compras"
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
+"Primero cancele todas las recepciones relativas a este pedido de compra."
#. module: purchase
#: view:purchase.order:0
msgid "Approve Order"
-msgstr ""
+msgstr "Aprobar pedido"
#. module: purchase
#: help:purchase.report,date:0
@@ -1121,7 +1158,7 @@ msgstr "Estadísticas pedidos de compra"
#: view:purchase.order:0
#: field:purchase.order,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Mensajes sin leer"
#. module: purchase
#: view:purchase.order.line_invoice:0
@@ -1141,7 +1178,7 @@ msgstr "Notas"
#. module: purchase
#: field:purchase.config.settings,module_purchase_requisition:0
msgid "Manage purchase requisitions"
-msgstr ""
+msgstr "Gestionar solicitudes de compra"
#. module: purchase
#: report:purchase.order:0
@@ -1166,7 +1203,7 @@ msgstr "Moviemiento de stock"
#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "¡Acción no válida!"
#. module: purchase
#: field:purchase.order,validator:0
@@ -1189,12 +1226,12 @@ msgstr "Pedidos de compra que están en estado de excepción"
#: model:process.node,note:purchase.process_node_draftpurchaseorder0
#: model:process.node,note:purchase.process_node_draftpurchaseorder1
msgid "Request for Quotations."
-msgstr "Solicitud de presupuesto"
+msgstr "Solicitud de presupuestos."
#. module: purchase
#: view:purchase.order:0
msgid "Source"
-msgstr ""
+msgstr "Origen"
#. module: purchase
#: model:ir.model,name:purchase.model_stock_picking
@@ -1215,12 +1252,14 @@ msgstr "Facturas generadas para un pedido de compra"
#. module: purchase
#: selection:purchase.config.settings,default_invoice_method:0
msgid "Pre-generate draft invoices based on purchase orders"
-msgstr ""
+msgstr "Pre-generar facturas borrador basadas en los pedidos de compra"
#. module: purchase
#: help:product.template,purchase_ok:0
msgid "Specify if the product can be selected in a purchase order line."
msgstr ""
+"Especifica si el producto puede ser seleccionado en una línea de un pedido "
+"de compra."
#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
@@ -1256,19 +1295,21 @@ msgid ""
"received the\n"
" products."
msgstr ""
+"para comprar las cantidades requeridas al proveedor.\n"
+"La orden de entrega estará lista después de haber recibido los productos."
#. module: purchase
#: view:product.product:0
msgid ""
"a draft\n"
" purchase order"
-msgstr ""
+msgstr "un pedido de compra en borrador"
#. module: purchase
#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
-msgstr ""
+msgstr "Por favor, cree facturas."
#. module: purchase
#: model:ir.model,name:purchase.model_procurement_order
@@ -1289,7 +1330,7 @@ msgstr "Marzo"
#. module: purchase
#: view:purchase.order:0
msgid "Receive Invoice"
-msgstr ""
+msgstr "Recibir factura"
#. module: purchase
#: view:purchase.order:0
@@ -1316,7 +1357,7 @@ msgstr "Para ser revisado por el contable."
#. module: purchase
#: model:ir.model,name:purchase.model_purchase_config_settings
msgid "purchase.config.settings"
-msgstr ""
+msgstr "Parámetros de configuración de compra"
#. module: purchase
#: model:process.node,note:purchase.process_node_approvepurchaseorder0
@@ -1327,7 +1368,7 @@ msgstr "Estado del pedido de compra."
#. module: purchase
#: field:purchase.order.line,product_uom:0
msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unidad de medida del producto"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_pricelist_version_action
@@ -1343,6 +1384,14 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+"Pulse para añadir una versión de tarifa.\n"
+"
\n"
+"Puede haber más de una versión de tarifa, que será válida durante cierto "
+"periodo de tiempo. Algunos ejemplos de versiones son: precios principales, "
+"2010, 2011, ventas de verano, etc.\n"
+"
\n"
+" "
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
@@ -1363,18 +1412,18 @@ msgstr "PC: %s"
#. module: purchase
#: view:purchase.order:0
msgid "Send by EMail"
-msgstr ""
+msgstr "Enviar por correo electrónico"
#. module: purchase
#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Defina el diario de compras para esta compañía: \"%s\" (id: %d)."
#. module: purchase
#: view:purchase.order:0
msgid "Purchase Order "
-msgstr ""
+msgstr "Pedido de compra "
#. module: purchase
#: view:purchase.order.line:0
@@ -1385,12 +1434,12 @@ msgstr "Facturas manuales"
#: model:ir.actions.act_window,name:purchase.action_purchase_configuration
#: view:purchase.config.settings:0
msgid "Configure Purchases"
-msgstr ""
+msgstr "Configurar compras"
#. module: purchase
#: view:purchase.order:0
msgid "Untaxed"
-msgstr ""
+msgstr "Base imponible"
#. module: purchase
#: model:process.transition,name:purchase.process_transition_createpackinglist0
@@ -1401,7 +1450,7 @@ msgstr "Albarán generado"
#: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
#: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
msgid "On Purchase Order Lines"
-msgstr ""
+msgstr "En las líneas del pedido de compra"
#. module: purchase
#: report:purchase.quotation:0
@@ -1414,16 +1463,18 @@ msgid ""
"This is the list of incoming shipments that have been generated for this "
"purchase order."
msgstr ""
+"Ésta es la lista de los envíos entrantes que se han generado para este "
+"pedido de compra."
#. module: purchase
#: field:purchase.config.settings,module_purchase_double_validation:0
msgid "Force two levels of approvals"
-msgstr ""
+msgstr "Forzar dos niveles de aprobación"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
msgid "Price Types"
-msgstr ""
+msgstr "Tipos de precio"
#. module: purchase
#: help:purchase.order,date_approve:0
@@ -1477,6 +1528,17 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+"Pulse para crear una solicitud de presupuesto.\n"
+"
\n"
+"El presupuesto contiene el historial de la discusión/negociación que tiene "
+"con su proveedor. Una vez confirmada, la solicitud de presupuesto se "
+"convierte en un pedido de compra.\n"
+"
\n"
+"La mayoría de propuestas de pedidos de compra se crean automáticamente por "
+"OpenERP basadas en las necesidades de inventario.\n"
+"
\n"
+" "
#. module: purchase
#: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
@@ -1507,7 +1569,7 @@ msgstr "Fusionar pedidos"
#. module: purchase
#: field:purchase.config.settings,module_purchase_analytic_plans:0
msgid "Use multiple analytic accounts on purchase orders"
-msgstr ""
+msgstr "Usar múltiples cuentas analíticas en los pedidos de compra"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_procurement_management
@@ -1530,7 +1592,7 @@ msgstr "Corregido manualmente"
#. module: purchase
#: field:purchase.config.settings,group_costing_method:0
msgid "Compute product cost price based on average cost"
-msgstr ""
+msgstr "Calcular precio de coste del producto basado en el coste medio"
#. module: purchase
#: code:addons/purchase/purchase.py:340
@@ -1559,7 +1621,7 @@ msgstr "Confirmación"
#. module: purchase
#: report:purchase.order:0
msgid "TIN :"
-msgstr ""
+msgstr "TIN :"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
@@ -1578,11 +1640,19 @@ msgid ""
"* The 'Cancelled' status is set automatically when user cancel purchase "
"order."
msgstr ""
+" * El estado 'Borrador' se establece automáticamente cuando se crea el "
+"pedido de compra.\n"
+"* El estado 'Confirmado' se establece cuando se confirma el pedido de "
+"compra.\n"
+"* El estado 'Realizado' se establece automáticamente cuando el pedido de "
+"compra se realiza.\n"
+"* El estado 'Cancelado' se establece cuando el usuario cancela el pedido de "
+"compra."
#. module: purchase
#: field:purchase.order,invoiced:0
msgid "Invoice Received"
-msgstr ""
+msgstr "Factura recibida"
#. module: purchase
#: field:purchase.order,invoice_method:0
@@ -1627,6 +1697,10 @@ msgid ""
"lines on a purchase order between several accounts and analytic plans.\n"
" This installs the module purchase_analytic_plans."
msgstr ""
+"Permitir al usuario mantener varios planes analíticos, de tal forma que las "
+"líneas de los pedidos de compra se pueden separar entre varias cuentas y "
+"planes analíticos.\n"
+"Esto instalará el módulo 'purchase_analytic_plans'."
#. module: purchase
#: field:purchase.order,location_id:0
@@ -1638,17 +1712,17 @@ msgstr "Destino"
#. module: purchase
#: field:purchase.order,dest_address_id:0
msgid "Customer Address (Direct Delivery)"
-msgstr ""
+msgstr "Dirección del cliente (Envío directo)"
#. module: purchase
#: model:ir.actions.client,name:purchase.action_client_purchase_menu
msgid "Open Purchase Menu"
-msgstr ""
+msgstr "Abrir menú 'Compras'"
#. module: purchase
#: model:ir.model,name:purchase.model_mail_compose_message
msgid "Email composition wizard"
-msgstr ""
+msgstr "Asistente de redacción de correo electrónico."
#. module: purchase
#: field:purchase.order,company_id:0
@@ -1702,7 +1776,7 @@ msgstr "Análisis recepciones"
#. module: purchase
#: field:purchase.order,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Mensajes"
#. module: purchase
#: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -1727,7 +1801,7 @@ msgstr "Pedido de compra"
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "¡Error!"
#. module: purchase
#: report:purchase.order:0
@@ -1744,6 +1818,13 @@ msgid ""
"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."
msgstr ""
+"Estado del pedido de compra o de la solicitud de presupuesto. Un presupuesto "
+"en un pedido de venta en estado 'Borrador'. Entonces el pedido debe ser "
+"confirmado por el usuario, y el estado pasa a 'Confirmado'. El proveedor "
+"debe confirmar el pedido para pasar a estado 'Aprobado'. Cuando el pedido se "
+"paga y se recibe, entonces el estado pasa a ser 'Realizado'. Si una acción "
+"de cancelación ocurre en la factura o en la recepción de los bienes, el "
+"estado se convierte a en excepción."
#. module: purchase
#: model:process.transition,note:purchase.process_transition_packinginvoice0
@@ -1764,13 +1845,13 @@ msgstr "Cancelado"
#. module: purchase
#: field:res.partner,purchase_order_count:0
msgid "# of Purchase Order"
-msgstr ""
+msgstr "Nº de pedido de compra"
#. module: purchase
#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment received."
-msgstr ""
+msgstr "Envío recibido"
#. module: purchase
#: report:purchase.quotation:0
@@ -1780,7 +1861,7 @@ msgstr "Tel.:"
#. module: purchase
#: view:purchase.order:0
msgid "Resend Purchase Order"
-msgstr ""
+msgstr "Reenviar pedido de compra"
#. module: purchase
#: report:purchase.order:0
@@ -1824,7 +1905,7 @@ msgstr ""
#. module: purchase
#: field:purchase.order,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
#. module: purchase
#: help:purchase.config.settings,module_purchase_requisition:0
@@ -1836,6 +1917,11 @@ msgid ""
" to one supplier or if you want a purchase requisition to "
"negotiate with several suppliers."
msgstr ""
+"Las solicitudes de presupuesto se usan cuando se solicita cotizaciones de "
+"varios proveedores para un conjunto dado de productos.\n"
+"Puede configurar por producto si directamente se realiza una solicitud de "
+"presupuesto a un proveedor o si desear negociar la compra con varios "
+"proveedores."
#. module: purchase
#: field:purchase.order.line,invoice_lines:0
@@ -1857,7 +1943,7 @@ msgstr ""
#. module: purchase
#: model:email.template,report_name:purchase.email_template_edi_purchase
msgid "RFQ_${(object.name or '').replace('/','_')}"
-msgstr ""
+msgstr "PdO_${(object.name or '').replace('/','_')}"
#. module: purchase
#: code:addons/purchase/purchase.py:988
@@ -1887,6 +1973,9 @@ msgid ""
"amount.\n"
" This installs the module purchase_double_validation."
msgstr ""
+"Provee un mecanismo de doble validación para las compras que exceden un "
+"importe máximo.\n"
+"Esto instala el módulo 'purchase_double_validation'."
#. module: purchase
#: code:addons/purchase/edi/purchase_order.py:132
@@ -1898,7 +1987,7 @@ msgstr "Tarifa EDI (%s)"
#: view:purchase.report:0
#: field:purchase.report,product_uom:0
msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Unidad de medida de referencia"
#. module: purchase
#: model:process.node,note:purchase.process_node_packinginvoice0
@@ -1945,7 +2034,7 @@ msgstr "Lista de productos solicitados."
#. module: purchase
#: view:purchase.order:0
msgid "Incoming Shipments & Invoices"
-msgstr ""
+msgstr "Envíos y facturas entrantes"
#. module: purchase
#: selection:purchase.order,state:0
@@ -1998,6 +2087,7 @@ msgstr "Noviembre"
#: help:purchase.config.settings,group_costing_method:0
msgid "Allows you to compute product cost price based on average cost."
msgstr ""
+"Permite calcular el precio de coste del producto basado en el coste medio."
#. module: purchase
#: report:purchase.order:0
@@ -2018,6 +2108,13 @@ msgid ""
"Bases on incoming shipments: let you create an invoice when receptions are "
"validated."
msgstr ""
+"Basado en las líneas del pedido de compra: coloca líneas individuales en "
+"'Control de facturas > Basado en líneas de pedidos de compra' desde las que "
+"se puede crear selectivamente una factura.\n"
+"Basado en el borrador de factura generado: crea una factura borrador que se "
+"puede validar más tarde.\n"
+"Basada en envíos entrantes: deja crear una factura cuando las recepciones "
+"son validadas."
#. module: purchase
#: help:purchase.order,origin:0
@@ -2025,6 +2122,8 @@ msgid ""
"Reference of the document that generated this purchase order request; a sale "
"order or an internal procurement request."
msgstr ""
+"Referencia del documento que genera esta petición de pedido de compra: un "
+"pedido de venta o una petición interna de abastecimiento."
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
@@ -2039,12 +2138,12 @@ msgstr "Estado del pedido"
#. module: purchase
#: report:purchase.order:0
msgid "Request for Quotation N°"
-msgstr "Petición de presupuesto Nº"
+msgstr "Solicitud de presupuesto Nº"
#. module: purchase
#: view:purchase.config.settings:0
msgid "Invoicing Settings"
-msgstr ""
+msgstr "Configuración de facturación"
#. module: purchase
#: model:email.template,body_html:purchase.email_template_edi_purchase
@@ -2128,6 +2227,84 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+"
\n"
+"\n"
+"
Hola ${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},
\n"
+" \n"
+"
Aquí le enviamos ${object.state in ('draft', 'sent') and 'una "
+"solicitud de presupuesto' or 'una confirmación de pedido de compra'} de "
+"${object.company_id.name}:
\n"
+" \n"
+"
\n"
+" REFERENCIAS \n"
+" Nº de pedido: ${object.name} \n"
+" Total del pedido: ${object.amount_total} "
+"${object.pricelist_id.currency_id.name} \n"
+" Fecha del pedido: ${object.date_order} \n"
+" % if object.origin:\n"
+" Referencia del pedido: ${object.origin} \n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" Su referencia: ${object.partner_ref} \n"
+" % endif\n"
+" % if object.validator:\n"
+" Su contacto: ${object.validator.name}\n"
+" % endif\n"
+"
\n"
+"\n"
+" \n"
+"
Si tiene alguna duda, no dude en contactarnos.
\n"
+"
¡Gracias!
\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"
+" Teléfono: ${object.company_id.phone}\n"
+"
\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+"
\n"
+" "
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
@@ -2137,7 +2314,7 @@ msgstr "Total pedidos por usuario mensual"
#. module: purchase
#: selection:purchase.order,invoice_method:0
msgid "Based on incoming shipments"
-msgstr ""
+msgstr "Basado en envíos entrantes"
#. module: purchase
#: view:purchase.report:0
@@ -2152,6 +2329,10 @@ msgid ""
"used to do the matching when you receive the products as this reference is "
"usually written on the delivery order sent by your supplier."
msgstr ""
+"Referencia del pedido de venta o presupuesto enviado por el proveedor. Se "
+"usa principalmente para casar documentos cuando recibe los productos, ya que "
+"esta referencia se escribe habitualmente en la orden de entrega enviada por "
+"el proveedor."
#. module: purchase
#: code:addons/purchase/purchase.py:991
@@ -2184,7 +2365,7 @@ msgstr "Febrero"
#: model:ir.actions.act_window,name:purchase.action_invoice_pending
#: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
msgid "On Draft Invoices"
-msgstr ""
+msgstr "Sobre facturas borrador"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
@@ -2210,7 +2391,7 @@ msgstr "Importe total"
#. module: purchase
#: model:ir.model,name:purchase.model_product_template
msgid "Product Template"
-msgstr ""
+msgstr "Plantilla de producto"
#. module: purchase
#: view:purchase.order.group:0
@@ -2243,7 +2424,7 @@ msgstr ""
#. module: purchase
#: view:product.product:0
msgid "When you sell this service to a customer,"
-msgstr ""
+msgstr "Cuando vende este servicio al cliente,"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2265,7 +2446,7 @@ msgstr "Año"
#. module: purchase
#: selection:purchase.config.settings,default_invoice_method:0
msgid "Based on purchase order lines"
-msgstr ""
+msgstr "Basado en las líneas de pedido de compra"
#. module: purchase
#: model:ir.actions.act_window,help:purchase.act_res_partner_2_purchase_order
@@ -2282,6 +2463,15 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+"Este proveedor no tiene ningún pedido de venta. Pulse para crear una nueva "
+"SdP.\n"
+"
\n"
+"La solicitud de presupuesto (SdP) es el primer paso en el flujo de compras. "
+"Una vez convertida en un pedido de compra, será capaz de gestionar la "
+"recepción de los productos y la factura de proveedor.\n"
+"
-
+
% endif
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 1f7edf204d6..a1947fba5ee 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -7,20 +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 17:38+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
+"PO-Revision-Date: 2012-12-17 18:38+0000\n"
+"Last-Translator: Pedro Manuel Baeza \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-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: sale
#: model:ir.model,name:sale.model_account_config_settings
msgid "account.config.settings"
-msgstr ""
+msgstr "Parámetros de configuración contable"
#. module: sale
#: view:sale.order.line:0
@@ -45,7 +44,7 @@ msgstr "UdV"
#: view:sale.report:0
#: field:sale.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Comercial"
#. module: sale
#: help:sale.order,pricelist_id:0
@@ -60,6 +59,7 @@ msgstr "Día"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
msgid "Cancel Order"
msgstr "Cancelar pedido"
@@ -67,28 +67,28 @@ msgstr "Cancelar pedido"
#: 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 importe avanzado debe ser positivo."
#. module: sale
#: help:sale.order,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Si está marcado, hay nuevos mensajes que 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
@@ -102,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
@@ -114,6 +115,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 ""
+"Contiene el resumen del chatter (nº de mensajes, ...). Este resumen viene "
+"directamente en formato HTML para poder ser insertado en las vistas kanban."
#. module: sale
#: view:sale.report:0
@@ -124,7 +127,7 @@ msgstr "Nº de ctdad"
#. 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 por línea de pedido de venta."
#. module: sale
#: help:sale.config.settings,group_sale_pricelist:0
@@ -132,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 gestionar diferentes precios basados en reglas por categoría de "
+"clientes.\n"
+"Ejemplo: 10% para minoristas, promoción de 5 EUR en este producto, etc."
#. module: sale
#: field:sale.shop,payment_default_id:0
@@ -142,17 +148,17 @@ msgstr "Plazo de pago por defecto"
#: 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 "Permite usar 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
@@ -164,6 +170,7 @@ msgstr "Desc.(%)"
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d)."
msgstr ""
+"Defina por favor la cuenta de ingresos para este producto:\"%s\"(id: %id)."
#. module: sale
#: view:sale.report:0
@@ -212,17 +219,17 @@ msgstr "Otra información"
#: 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 completa"
#. module: sale
#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -235,6 +242,8 @@ msgstr "Presupuestos y pedidos"
msgid ""
"Allows you to select and maintain different units of measure for products."
msgstr ""
+"Le permite seleccionar y configurar diferentes unidades de medida para los "
+"productos."
#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
@@ -255,7 +264,7 @@ msgstr "Descuento (%)"
#. module: sale
#: view:sale.order.line.make.invoice:0
msgid "Create & View Invoice"
-msgstr ""
+msgstr "Crear y ver factura"
#. module: sale
#: view:board.board:0
@@ -266,7 +275,7 @@ msgstr "Mis presupuestos"
#. 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
@@ -291,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 "Avance de %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 "Empresa para la que el producto en particular necesita ser asignado."
#. module: sale
#: view:sale.order:0
@@ -337,6 +346,14 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+"Pulse para crear un presupuesto que puede ser convertido en un pedido de "
+"venta.\n"
+"
\n"
+"OpenERP le permitirá manejar eficientemente el flujo completo de ventas: "
+"presupuesto, pedido de venta, envío, facturación y pago.\n"
+"
\n"
+" "
#. module: sale
#: selection:sale.report,month:0
@@ -361,23 +378,23 @@ 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 de %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"
@@ -386,14 +403,13 @@ 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 el pedido de ventas actual."
#. module: sale
#: report:sale.order:0
@@ -411,6 +427,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"
@@ -419,7 +436,7 @@ msgstr "En proceso"
#: code:addons/sale/sale.py:667
#, python-format
msgid "Draft Invoice of %s %s waiting for validation."
-msgstr ""
+msgstr "La factura en borrador de %s %s espera validación."
#. module: sale
#: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -435,6 +452,7 @@ msgstr ""
#, python-format
msgid "You cannot cancel a sale order line that has already been invoiced."
msgstr ""
+"No puede cancelar una línea de pedido de venta que ya ha sido facturada."
#. module: sale
#: report:sale.order:0
@@ -449,12 +467,12 @@ msgstr "Dirección de facturación para el pedido de venta actual."
#. module: sale
#: model:ir.model,name:sale.model_sale_config_settings
msgid "sale.config.settings"
-msgstr ""
+msgstr "Parámetros de configuración de las ventas"
#. 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
@@ -467,17 +485,17 @@ msgstr ""
#. module: sale
#: model:res.groups,name:sale.group_delivery_invoice_address
msgid "Addresses in Sale Orders"
-msgstr ""
+msgstr "Direcciones en los pedidos de venta"
#. module: sale
#: field:sale.order,project_id:0
msgid "Contract / Analytic"
-msgstr ""
+msgstr "Contrato / Analítica"
#. module: sale
#: model:res.groups,name:sale.group_invoice_so_lines
msgid "Enable Invoicing Sale order lines"
-msgstr ""
+msgstr "Habilitar facturar líneas de pedido de venta"
#. module: sale
#: view:sale.report:0
@@ -497,10 +515,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"
@@ -509,7 +526,7 @@ msgstr "Facturado"
#. module: sale
#: model:res.groups,name:sale.group_analytic_accounting
msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "Contabilidad analítica para las ventas"
#. module: sale
#: field:sale.order,date_confirm:0
@@ -524,7 +541,7 @@ msgstr "Ubicación empresa"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
msgid "Invoice Order"
-msgstr ""
+msgstr "Orden de facturación"
#. module: sale
#: selection:sale.report,month:0
@@ -534,7 +551,7 @@ msgstr "Marzo"
#. module: sale
#: model:ir.actions.server,name:sale.actions_server_sale_order_read
msgid "Sale: Mark read"
-msgstr ""
+msgstr "Ventas: Marcar como leídos"
#. module: sale
#: help:sale.order,amount_total:0
@@ -545,6 +562,7 @@ msgstr "El importe total."
#: field:sale.config.settings,module_sale_journal:0
msgid "Allow batch invoicing of delivery orders through journals"
msgstr ""
+"Permitir facturación en lote de órdenes de entrega a través de los diarios"
#. module: sale
#: field:sale.order.line,price_subtotal:0
@@ -555,6 +573,7 @@ msgstr "Subtotal"
#: field:sale.config.settings,group_discount_per_so_line:0
msgid "Allow setting a discount on the sale order lines"
msgstr ""
+"Permite establecer un descuento en las líneas de los pedidos de venta"
#. module: sale
#: report:sale.order:0
@@ -564,12 +583,12 @@ msgstr "Dirección de factura :"
#. 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 de tiempo de trabajo por defecto para los servicios es"
#. module: sale
#: field:sale.order,partner_invoice_id:0
@@ -594,26 +613,30 @@ msgid ""
" or a fixed price (for advances) directly from the sale "
"order form if you prefer."
msgstr ""
+"Todos estos elementos en estas líneas de pedido serán facturados. También "
+"puede facturar un porcentaje del pedido de venta o un precio fijo (para "
+"avances) directamente desde el formulario del pedido de venta si lo prefiere."
#. module: sale
#: view:sale.order:0
msgid "(update)"
-msgstr ""
+msgstr "(actualizar)"
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
msgid "Sales Order Line"
msgstr "Línea pedido de venta"
#. module: sale
#: field:sale.config.settings,module_analytic_user_function:0
msgid "One employee can have different roles per contract"
-msgstr ""
+msgstr "Un empleado puede tener diferentes roles por contrato"
#. module: sale
#: view:sale.order:0
msgid "Print"
-msgstr ""
+msgstr "Imprimir"
#. module: sale
#: report:sale.order:0
@@ -621,7 +644,6 @@ msgid "Order N°"
msgstr "Pedido Nº"
#. module: sale
-#: view:sale.order:0
#: field:sale.order,order_line:0
msgid "Order Lines"
msgstr "Líneas del pedido"
@@ -629,7 +651,7 @@ msgstr "Líneas del pedido"
#. module: sale
#: field:account.config.settings,module_sale_analytic_plans:0
msgid "Use multiple analytic accounts on sales"
-msgstr ""
+msgstr "Usar múltiples cuentas analíticas en las ventas"
#. module: sale
#: help:sale.config.settings,module_sale_journal:0
@@ -639,6 +661,9 @@ msgid ""
" and perform batch operations on journals.\n"
" This installs the module sale_journal."
msgstr ""
+"Permite categorizar las ventas y entregas (albaranes) entre los diferentes "
+"diarios, y realizar tareas en lote en los mismos.\n"
+"Esto instala el módulo 'sale_journal'."
#. module: sale
#: field:sale.order,create_date:0
@@ -649,7 +674,7 @@ msgstr "Fecha creación"
#: code:addons/sale/sale.py:659
#, python-format
msgid "Sale Order for %s set to Done"
-msgstr ""
+msgstr "Pedido de venta para %srealizado."
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -699,7 +724,7 @@ msgstr ""
#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
#, python-format
msgid "Configuration Error!"
-msgstr ""
+msgstr "¡Error de configuración!"
#. module: sale
#: view:sale.order:0
@@ -719,6 +744,7 @@ msgstr "Fecha pedido"
#. module: sale
#: view:sale.order.line:0
+#: field:sale.report,shipped:0
msgid "Shipped"
msgstr "Enviado"
@@ -730,7 +756,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"
@@ -767,7 +792,7 @@ msgid "You cannot confirm a sale order which has no line."
msgstr "No puede confirmar un pedido de venta sin lineas."
#. 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"
@@ -813,12 +838,12 @@ msgstr ""
#. module: sale
#: field:sale.order,currency_id:0
msgid "unknown"
-msgstr ""
+msgstr "desconocido"
#. module: sale
#: field:sale.order,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Es un seguidor"
#. module: sale
#: field:sale.order,date_order:0
@@ -861,7 +886,7 @@ msgstr "¡No se ha encontrado una linea de tarifa valida!"
#. module: sale
#: field:sale.config.settings,module_sale_margin:0
msgid "Display margins on sales orders"
-msgstr ""
+msgstr "Mostrar márgenes en los pedidos de venta"
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -880,6 +905,7 @@ msgid "Your Reference"
msgstr "Su referencia"
#. module: sale
+#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Ctdad"
@@ -891,9 +917,10 @@ msgstr "Mis lineas de pedidos de venta"
#. 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"
@@ -914,10 +941,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"
@@ -941,16 +967,19 @@ msgid ""
"${object.company_id.name} ${object.state in ('draft', 'sent') and "
"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Presupuesto' or 'Pedido'} (Ref ${object.name or 'n/a' })"
#. module: sale
#: report:sale.order:0
+#: view:sale.order.line:0
msgid "Price"
msgstr "Precio"
#. module: sale
#: view:sale.order:0
msgid "Quotation Number"
-msgstr ""
+msgstr "Número de presupuesto"
#. module: sale
#: selection:sale.order.line,type:0
@@ -965,7 +994,7 @@ msgstr "Dirección de envío :"
#. 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 "Permite especificar una cuenta analítica en los pedidos de venta."
#. module: sale
#: model:process.node,note:sale.process_node_quotation0
@@ -1079,6 +1108,7 @@ msgid "Sale Order"
msgstr "Pedido de venta"
#. module: sale
+#: view:sale.order:0
#: field:sale.order,amount_tax:0
#: field:sale.order.line,tax_id:0
msgid "Taxes"
@@ -1148,6 +1178,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 "Realizar facturas"
@@ -1252,7 +1283,7 @@ msgstr "Análisis de ventas"
#. 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 "Presupuesto"
@@ -1401,10 +1432,8 @@ msgid "Customer Invoices"
msgstr "Facturas de cliente"
#. 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"
@@ -1426,7 +1455,6 @@ msgid "Unit Price"
msgstr "Precio unidad"
#. module: sale
-#: view:sale.order:0
#: selection:sale.order,state:0
#: view:sale.order.line:0
#: selection:sale.order.line,state:0
@@ -1435,10 +1463,8 @@ msgid "Done"
msgstr "Realizado"
#. 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"
@@ -1514,6 +1540,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"
@@ -1662,7 +1689,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!"
@@ -1739,6 +1766,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
@@ -1762,15 +1790,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 venta"
@@ -1805,6 +1830,7 @@ msgid "Followers"
msgstr ""
#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,invoice_lines:0
msgid "Invoice Lines"
msgstr "Líneas de factura"
@@ -1816,7 +1842,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"
@@ -1890,7 +1915,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 "
@@ -1915,6 +1940,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"
@@ -1946,7 +1973,10 @@ msgid "Untaxed Amount"
msgstr "Base imponible"
#. 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"
@@ -1987,6 +2017,8 @@ msgid "Email Templates"
msgstr "Plantillas 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 ventas"
@@ -2024,7 +2056,7 @@ msgid "January"
msgstr "Enero"
#. 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 "Pedidos de ventas en proceso"
@@ -2204,6 +2236,7 @@ msgid "Quotation N°"
msgstr "Presupuesto Nº"
#. module: sale
+#: field:sale.order,picked_rate:0
#: view:sale.report:0
msgid "Picked"
msgstr "Enviada"
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index 49a01de4876..f5be73f9498 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/i18n/et.po
@@ -7,17 +7,16 @@ 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: 2011-10-11 18:12+0000\n"
-"Last-Translator: Aare Vesi \n"
+"PO-Revision-Date: 2012-12-17 18:40+0000\n"
+"Last-Translator: Ahti Hinnov \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-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: sale
-#: view:sale.order:0
#: field:sale.order,order_line:0
msgid "Order Lines"
msgstr "Korralduse read"
@@ -33,6 +32,8 @@ msgid "Untaxed Amount"
msgstr "Maksustamata summa"
#. 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 "Müügitellimused"
@@ -113,6 +114,7 @@ msgstr ""
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
msgid "Cancel Order"
msgstr "Tühista korraldus"
@@ -155,6 +157,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
@@ -258,7 +261,7 @@ msgstr "Korralduse viide"
#. module: sale
#: view:sale.order:0
msgid "Other Information"
-msgstr ""
+msgstr "Muu info"
#. module: sale
#: code:addons/sale/wizard/sale_line_invoice.py:109
@@ -281,7 +284,7 @@ msgstr ""
#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
#: view:res.partner:0
msgid "Quotations and Sales"
-msgstr ""
+msgstr "Pakkumused ja Müügid"
#. module: sale
#: help:sale.config.settings,group_uom:0
@@ -314,7 +317,7 @@ msgstr ""
#: view:board.board:0
#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
msgid "My Quotations"
-msgstr "Minu hinnapakkumised"
+msgstr "Minu pakkumised"
#. module: sale
#: field:sale.config.settings,module_warning:0
@@ -344,7 +347,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Quotation "
-msgstr ""
+msgstr "Pakkumine "
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
@@ -353,7 +356,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 "Müügid erandis"
@@ -429,17 +432,16 @@ 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"
-msgstr ""
+msgstr "Pakkumised"
#. module: sale
#: field:sale.advance.payment.inv,qtty:0
#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
msgid "Quantity"
msgstr "Kogus"
@@ -464,6 +466,7 @@ msgid "Fiscal Position"
msgstr "Finantspositsioon"
#. module: sale
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "In Progress"
msgstr "Töös"
@@ -550,7 +553,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"
@@ -634,7 +636,7 @@ msgstr ""
#. module: sale
#: model:ir.actions.report.xml,name:sale.report_sale_order
msgid "Quotation / Order"
-msgstr "Hinnapakkumine / Korraldus"
+msgstr "Pakkumine / Korraldus"
#. module: sale
#: view:sale.order.line.make.invoice:0
@@ -652,6 +654,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 ""
@@ -763,6 +766,7 @@ msgstr ""
#. module: sale
#: view:sale.order.line:0
+#: field:sale.report,shipped:0
msgid "Shipped"
msgstr ""
@@ -774,7 +778,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"
@@ -802,7 +805,7 @@ msgstr ""
#. module: sale
#: report:sale.order:0
msgid "Quotation Date"
-msgstr ""
+msgstr "Pakkumise kuupäev"
#. module: sale
#: code:addons/sale/sale.py:590
@@ -811,7 +814,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"
@@ -919,6 +922,7 @@ msgid "Your Reference"
msgstr "Teie viide"
#. module: sale
+#: view:sale.order:0
#: view:sale.order.line:0
msgid "Qty"
msgstr "Kogus"
@@ -930,9 +934,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"
@@ -953,10 +958,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 "Loo arve"
@@ -964,7 +968,7 @@ msgstr "Loo arve"
#. module: sale
#: view:sale.order.line:0
msgid "Order reference"
-msgstr ""
+msgstr "Korralduse viide"
#. module: sale
#: help:sale.config.settings,module_sale_stock:0
@@ -983,13 +987,14 @@ msgstr ""
#. module: sale
#: report:sale.order:0
+#: view:sale.order.line:0
msgid "Price"
msgstr "Hind"
#. module: sale
#: view:sale.order:0
msgid "Quotation Number"
-msgstr ""
+msgstr "Pakkumise number"
#. module: sale
#: selection:sale.order.line,type:0
@@ -1025,7 +1030,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "New Copy of Quotation"
-msgstr ""
+msgstr "Uus koopia pakkumisest"
#. module: sale
#: code:addons/sale/sale.py:1007
@@ -1059,7 +1064,7 @@ msgstr ""
#. module: sale
#: model:process.transition,name:sale.process_transition_confirmquotation0
msgid "Confirm Quotation"
-msgstr "Kinnita hinnapakkumine"
+msgstr "Kinnita pakkumine"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree2
@@ -1110,7 +1115,7 @@ msgstr ""
#. module: sale
#: selection:sale.order,state:0
msgid "Draft Quotation"
-msgstr ""
+msgstr "Pakkumise mustan"
#. module: sale
#: selection:sale.order,state:0
@@ -1118,6 +1123,7 @@ msgid "Sale Order"
msgstr "Müügikorraldus"
#. module: sale
+#: view:sale.order:0
#: field:sale.order,amount_tax:0
#: field:sale.order.line,tax_id:0
msgid "Taxes"
@@ -1185,6 +1191,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 ""
@@ -1273,7 +1280,7 @@ msgstr ""
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree
msgid "Old Quotations"
-msgstr ""
+msgstr "Vanad pakkumised"
#. module: sale
#: field:sale.order,invoiced:0
@@ -1289,10 +1296,10 @@ 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 "Hinnapakkumine"
+msgstr "Pakkumine"
#. module: sale
#: model:process.transition,note:sale.process_transition_invoice0
@@ -1435,10 +1442,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"
@@ -1460,7 +1465,6 @@ msgid "Unit Price"
msgstr "Ühiku hind"
#. module: sale
-#: view:sale.order:0
#: selection:sale.order,state:0
#: view:sale.order.line:0
#: selection:sale.order.line,state:0
@@ -1469,10 +1473,8 @@ msgid "Done"
msgstr "Valmis"
#. 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 "Arve"
@@ -1548,6 +1550,7 @@ msgid "Product UoS"
msgstr "Toote TÜ"
#. module: sale
+#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "Manual In Progress"
msgstr "Edenemisel käsitsi"
@@ -1599,7 +1602,7 @@ msgstr ""
#. module: sale
#: field:sale.order,client_order_ref:0
msgid "Customer Reference"
-msgstr ""
+msgstr "Kliendi viide"
#. module: sale
#: field:sale.order,amount_total:0
@@ -1668,7 +1671,7 @@ msgstr ""
#: field:sale.report,company_id:0
#: field:sale.shop,company_id:0
msgid "Company"
-msgstr ""
+msgstr "Ettevõte"
#. module: sale
#: field:sale.make.invoice,invoice_date:0
@@ -1687,7 +1690,7 @@ msgid "Invoice Exception"
msgstr "Arve erand"
#. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
#, python-format
msgid "No Customer Defined !"
msgstr "Klienti pole määratud!"
@@ -1755,7 +1758,7 @@ msgstr ""
#. module: sale
#: selection:sale.order,state:0
msgid "Quotation Sent"
-msgstr ""
+msgstr "Pakkumine saadetud"
#. module: sale
#: model:ir.model,name:sale.model_mail_compose_message
@@ -1764,6 +1767,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
@@ -1787,15 +1791,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 ""
@@ -1830,6 +1831,7 @@ msgid "Followers"
msgstr ""
#. module: sale
+#: view:sale.order:0
#: field:sale.order.line,invoice_lines:0
msgid "Invoice Lines"
msgstr "Arve read"
@@ -1841,7 +1843,6 @@ msgid "# of Lines"
msgstr "Ridade arv"
#. 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"
@@ -1915,7 +1916,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 "
@@ -1935,6 +1936,8 @@ msgid "Weight"
msgstr "Kaal"
#. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
#: field:sale.order,invoice_ids:0
msgid "Invoices"
msgstr "Arved"
@@ -1961,7 +1964,10 @@ msgid "Drives procurement and invoicing"
msgstr ""
#. 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 "Ettemaksuarve"
@@ -2034,7 +2040,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 "Edenemisel müügikorraldused"
@@ -2204,9 +2210,10 @@ msgstr ""
#. module: sale
#: report:sale.order:0
msgid "Quotation N°"
-msgstr "Hinnapakkumine Nr"
+msgstr "Pakkumine Nr"
#. module: sale
+#: field:sale.order,picked_rate:0
#: view:sale.report:0
msgid "Picked"
msgstr "Nopitud"
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index 5e9c6f32d26..34b19da00e7 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-15 10:48+0000\n"
-"Last-Translator: Leen Sonneveld \n"
+"PO-Revision-Date: 2012-12-17 14:54+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-16 04:48+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: sale
@@ -129,6 +129,7 @@ msgstr "# Aantal"
#: help:sale.config.settings,group_discount_per_so_line:0
msgid "Allows you to apply some discount per sale order line."
msgstr ""
+"Geeft u de mogelijkheid om een korting in te geven per verkooporderregel."
#. module: sale
#: help:sale.config.settings,group_sale_pricelist:0
@@ -341,6 +342,16 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Klik om een offerte te maken welke kan worden omgezet in "
+"een\n"
+" verkooporder.\n"
+"
\n"
+" OpenERP helpt u met het efficiënt beheersen van uw "
+"verkoopproces:\n"
+" Offerte, Verkooporder, Levering, Facturering en betaling\n"
+"
\n"
+" "
#. module: sale
#: selection:sale.report,month:0
@@ -439,6 +450,8 @@ msgstr ""
#, python-format
msgid "You cannot cancel a sale order line that has already been invoiced."
msgstr ""
+"Het is niet mogelijk een verkooporderregel te annuleren welke al is "
+"gefactureerd."
#. module: sale
#: report:sale.order:0
@@ -481,7 +494,7 @@ msgstr "Contract / Kostenplaats"
#. module: sale
#: model:res.groups,name:sale.group_invoice_so_lines
msgid "Enable Invoicing Sale order lines"
-msgstr ""
+msgstr "Activeren van facturering van verkooporderregels"
#. module: sale
#: view:sale.report:0
@@ -513,7 +526,7 @@ msgstr "Gefactureerd"
#. module: sale
#: model:res.groups,name:sale.group_analytic_accounting
msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "Kostenplaatsen voor verkoop"
#. module: sale
#: field:sale.order,date_confirm:0
@@ -538,7 +551,7 @@ msgstr "Maart"
#. module: sale
#: model:ir.actions.server,name:sale.actions_server_sale_order_read
msgid "Sale: Mark read"
-msgstr ""
+msgstr "Verkoop: Markeer als gelezen"
#. module: sale
#: help:sale.order,amount_total:0
@@ -573,7 +586,7 @@ msgstr "Maateenheid "
#. module: sale
#: field:sale.config.settings,time_unit:0
msgid "The default working time unit for services is"
-msgstr ""
+msgstr "De standaard werktijd maateenheid voor diensten is"
#. module: sale
#: field:sale.order,partner_invoice_id:0
@@ -633,7 +646,7 @@ msgstr "Orderregels"
#. module: sale
#: field:account.config.settings,module_sale_analytic_plans:0
msgid "Use multiple analytic accounts on sales"
-msgstr ""
+msgstr "Gebruik meerdere kostenplaatsen bij verkoop"
#. module: sale
#: help:sale.config.settings,module_sale_journal:0
@@ -972,6 +985,7 @@ msgstr "Afleveradres :"
#: help:account.config.settings,group_analytic_account_for_sales:0
msgid "Allows you to specify an analytic account on sale orders."
msgstr ""
+"Geeft u de mogelijkheid om een kostenplaats te definieren per verkooporder"
#. module: sale
#: model:process.node,note:sale.process_node_quotation0
@@ -1005,7 +1019,7 @@ msgstr ""
#. module: sale
#: model:res.groups,name:sale.group_mrp_properties
msgid "Properties on lines"
-msgstr ""
+msgstr "Eigenschappen op regels"
#. module: sale
#: code:addons/sale/sale.py:888
@@ -1527,7 +1541,7 @@ msgstr "Handmatig in behandeling"
#. module: sale
#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
msgid "Sale: Mark unread"
-msgstr ""
+msgstr "Verkoop: Markeer ongelezen"
#. module: sale
#: view:sale.order.line:0
@@ -1769,7 +1783,7 @@ msgstr ""
#. module: sale
#: view:sale.config.settings:0
msgid "Contract Features"
-msgstr ""
+msgstr "Contract mogelijkheden"
#. module: sale
#: model:ir.model,name:sale.model_sale_order
@@ -1884,7 +1898,7 @@ msgstr ""
#. module: sale
#: selection:sale.order,order_policy:0
msgid "On Delivery Order"
-msgstr ""
+msgstr "Bij uitgaande levering"
#. module: sale
#: view:sale.report:0
@@ -2059,13 +2073,13 @@ msgstr "Lopende verkooporders"
#. module: sale
#: field:sale.config.settings,timesheet:0
msgid "Prepare invoices based on timesheets"
-msgstr ""
+msgstr "Voorbereiden van facturen op urenstaten"
#. module: sale
#: code:addons/sale/sale.py:655
#, python-format
msgid "Sale Order for %scancelled."
-msgstr ""
+msgstr "Verkooporder voor %sgeannuleerd."
#. module: sale
#: help:sale.order,origin:0
@@ -2919,9 +2933,6 @@ msgstr ""
#~ msgid " Year "
#~ msgstr " Jaar "
-#~ msgid "Security Days"
-#~ msgstr "Dagen veiligheidsmarge"
-
#~ msgid "Do you really want to create the invoice(s) ?"
#~ msgstr "Wilt u echt de facturen aanmaken?"
@@ -3122,9 +3133,6 @@ msgstr ""
#~ msgid "Warning"
#~ msgstr "Waarschuwing"
-#~ msgid "Delivery Lead Time"
-#~ msgstr "Leveringstermijn"
-
#~ msgid "Error! You can not create recursive companies."
#~ msgstr "Fout ! U kunt geen recursieve bedrijven maken."
@@ -3812,3 +3820,9 @@ msgstr ""
#~ msgid "Properties"
#~ msgstr "Eigenschappen"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Levertijd (dagen)"
+
+#~ msgid "Security Days"
+#~ msgstr "Extra dagen levertijd verkoop"
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index 7a23221a4d0..7f5ed2a6b4c 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.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-12-05 09:56+0000\n"
-"Last-Translator: Andrei Talpa (multibase.pt) \n"
+"PO-Revision-Date: 2012-12-17 14:20+0000\n"
+"Last-Translator: Rui Franco (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-06 04:40+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\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
@@ -44,7 +44,7 @@ msgstr "UoS"
#: view:sale.report:0
#: field:sale.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Vendedor"
#. module: sale
#: help:sale.order,pricelist_id:0
@@ -67,7 +67,7 @@ msgstr "Cancelar Ordem de Venda"
#: 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
@@ -143,7 +143,7 @@ msgstr "Termos 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
@@ -213,12 +213,12 @@ msgstr "Outra informação"
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Aviso!"
#. module: sale
#: view:sale.config.settings:0
msgid "Invoicing Process"
-msgstr ""
+msgstr "Processo de faturação"
#. module: sale
#: view:sale.order:0
@@ -256,7 +256,7 @@ msgstr "Desconto (%)"
#. module: sale
#: view:sale.order.line.make.invoice:0
msgid "Create & View Invoice"
-msgstr ""
+msgstr "Criar & ver fatura"
#. module: sale
#: view:board.board:0
@@ -292,7 +292,7 @@ msgstr ""
#. module: sale
#: view:sale.order:0
msgid "Quotation "
-msgstr ""
+msgstr "Orçamento "
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
@@ -450,7 +450,7 @@ msgstr "Morada de faturação para esta ordem de venda."
#. 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
@@ -498,7 +498,7 @@ msgstr ""
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "or"
-msgstr ""
+msgstr "ou"
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -739,7 +739,7 @@ msgstr "Parceiro"
#. module: sale
#: view:sale.advance.payment.inv:0
msgid "Create and View Invoice"
-msgstr ""
+msgstr "Criar e ver fatura"
#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
@@ -787,7 +787,7 @@ msgstr "Categoria do artigo"
#: code:addons/sale/sale.py:555
#, python-format
msgid "Cannot cancel this sales order!"
-msgstr ""
+msgstr "Não é possível cancelar esta ordem de venda!"
#. module: sale
#: view:sale.order:0
@@ -809,7 +809,7 @@ msgstr "Impostos :"
#. module: sale
#: selection:sale.order,order_policy:0
msgid "On Demand"
-msgstr ""
+msgstr "A pedido"
#. module: sale
#: field:sale.order,currency_id:0
@@ -819,7 +819,7 @@ msgstr "desconhecido"
#. module: sale
#: field:sale.order,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "É um seguidor"
#. module: sale
#: field:sale.order,date_order:0
@@ -1062,18 +1062,18 @@ msgstr "Método de aquisição"
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
msgid "Invoice the whole sale order"
-msgstr ""
+msgstr "Fatura a ordem de venda inteira"
#. module: sale
#: view:sale.order:0
#: field:sale.order,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens por ler"
#. module: sale
#: selection:sale.order,state:0
msgid "Draft Quotation"
-msgstr ""
+msgstr "Rascunho de orçamento"
#. module: sale
#: selection:sale.order,state:0
@@ -1121,7 +1121,7 @@ msgstr "Criar Faturas"
#: code:addons/sale/sale.py:1007
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Ação inválida!"
#. module: sale
#: report:sale.order:0
@@ -1208,12 +1208,12 @@ msgstr ""
#. module: sale
#: view:sale.advance.payment.inv:0
msgid "Invoice Sale Order"
-msgstr ""
+msgstr "Faturar ordem de venda"
#. module: sale
#: view:sale.config.settings:0
msgid "Contracts Management"
-msgstr ""
+msgstr "Gestão de contratos"
#. module: sale
#: view:sale.report:0
@@ -1472,7 +1472,7 @@ msgstr "Artigo"
#. module: sale
#: field:sale.config.settings,group_invoice_so_lines:0
msgid "Generate invoices based on the sale order lines"
-msgstr ""
+msgstr "Gerar faturas com base nas linhas da ordem de venda"
#. module: sale
#: help:sale.order,order_policy:0
@@ -1564,7 +1564,7 @@ msgstr ""
#. module: sale
#: view:res.partner:0
msgid "sale.group_delivery_invoice_address"
-msgstr ""
+msgstr "sale.group_delivery_invoice_address"
#. module: sale
#: model:res.groups,name:sale.group_discount_per_so_line
@@ -1624,6 +1624,8 @@ msgid ""
"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
"'draft' or ''}"
msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
#. module: sale
#: help:sale.order,date_confirm:0
@@ -1670,7 +1672,7 @@ msgstr "Nenhum Cliente Definido !"
#. module: sale
#: field:sale.order,partner_shipping_id:0
msgid "Delivery Address"
-msgstr ""
+msgstr "Endereço de entrega"
#. module: sale
#: selection:sale.order,state:0
@@ -1730,7 +1732,7 @@ msgstr "Procurar linhas não faturadas"
#. module: sale
#: selection:sale.order,state:0
msgid "Quotation Sent"
-msgstr ""
+msgstr "Orçamento enviado"
#. module: sale
#: model:ir.model,name:sale.model_mail_compose_message
@@ -1957,7 +1959,7 @@ msgstr "Adiantamento da Fatura"
#. module: sale
#: model:ir.actions.client,name:sale.action_client_sale_menu
msgid "Open Sale Menu"
-msgstr ""
+msgstr "Abrir menu de vendas"
#. module: sale
#: selection:sale.order.line,state:0
@@ -1977,7 +1979,7 @@ msgstr "O valor do imposto."
#. module: sale
#: view:sale.order:0
msgid "Sale Order "
-msgstr ""
+msgstr "Ordem de venda "
#. module: sale
#: view:sale.order.line:0
@@ -2011,7 +2013,7 @@ msgstr "Novembro"
#: field:sale.order,message_comment_ids:0
#: help:sale.order,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Comentários e emails"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -2095,7 +2097,7 @@ msgstr "Sem Lista de Preços ! : "
#: model:ir.actions.act_window,name:sale.action_orders
#: model:ir.ui.menu,name:sale.menu_sale_order
msgid "Sale Orders"
-msgstr ""
+msgstr "Ordens de venda"
#. module: sale
#: field:sale.config.settings,module_account_analytic_analysis:0
@@ -2168,7 +2170,7 @@ msgstr "Procurar ordens de venda"
#. module: sale
#: field:sale.advance.payment.inv,advance_payment_method:0
msgid "What do you want to invoice?"
-msgstr ""
+msgstr "Quer faturar o quê?"
#. module: sale
#: field:sale.order.line,sequence:0
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index 034499bc17f..0db7d9f9885 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,14 +8,15 @@ 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-06 18:10+0000\n"
-"Last-Translator: Cristiano Korndörfer \n"
+"PO-Revision-Date: 2012-12-18 00:47+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"\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-07 04:35+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: sale
#: model:ir.model,name:sale.model_account_config_settings
@@ -74,12 +75,12 @@ msgstr "Dados Incorretos"
#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
#, python-format
msgid "The value of Advance Amount must be positive."
-msgstr "O valor da Soma Avançada deve ser positivo."
+msgstr "O valor do Adiantamento deve ser positivo."
#. module: sale
#: help:sale.order,message_unread:0
msgid "If checked new messages require your attention."
-msgstr "Se marcado novas mensagens requerem sua atenção"
+msgstr "Se marcado novas mensagens solicitarão sua atenção."
#. module: sale
#: view:res.partner:0
@@ -205,6 +206,11 @@ msgid ""
"user-wise as well as month wise.\n"
" This installs the module account_analytic_analysis."
msgstr ""
+"Para modificar as contas analíticas para mostrar informações importantes "
+"para o gerente de projetos de empresas de serviço.\n"
+" Você pode também visualizar o resumo do relatório da conta "
+"analítica por usuário ou mês.\n"
+" Isto irá instalar o módulo account_analytic_analysis."
#. module: sale
#: selection:sale.order,invoice_quantity:0
@@ -227,17 +233,17 @@ msgstr "Outras Informações"
#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Aviso!"
#. module: sale
#: view:sale.config.settings:0
msgid "Invoicing Process"
-msgstr ""
+msgstr "Processo de Faturamento"
#. module: sale
#: view:sale.order:0
msgid "Sales Order done"
-msgstr ""
+msgstr "Pedido de Venda concluído"
#. module: sale
#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -250,6 +256,8 @@ msgstr "Cotação e Vendas"
msgid ""
"Allows you to select and maintain different units of measure for products."
msgstr ""
+"Permite a você escolher e manter diferentes unidades de medidas para os "
+"produtos."
#. module: sale
#: model:ir.model,name:sale.model_sale_make_invoice
@@ -270,7 +278,7 @@ msgstr "Desconto (%)"
#. module: sale
#: view:sale.order.line.make.invoice:0
msgid "Create & View Invoice"
-msgstr ""
+msgstr "Criar & Visualizar Fatura"
#. module: sale
#: view:board.board:0
@@ -281,12 +289,12 @@ msgstr "Minhas Cotações"
#. module: sale
#: field:sale.config.settings,module_warning:0
msgid "Allow configuring alerts by customer or products"
-msgstr ""
+msgstr "Permite configurar alertas por cliente ou produtos"
#. module: sale
#: field:sale.shop,name:0
msgid "Shop Name"
-msgstr "Nome da Loja"
+msgstr "Nome do Estabelecimento"
#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_line_tree2
@@ -302,17 +310,26 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Aqui estão uma lista com cada linha de pedido de vendas para "
+"faturar.\n"
+" Você pode faturar parcialmente, por linha de pedido. Você "
+"não precisa\n"
+" dessa lista se você fatura por ordem de entrega ou se fatura "
+"o pedido total.\n"
+"
\n"
+" "
#. module: sale
#: view:sale.order:0
msgid "Quotation "
-msgstr ""
+msgstr "Cotação "
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
#, python-format
msgid "Advance of %s %%"
-msgstr ""
+msgstr "Avanço de %s %%"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_tree2
@@ -322,7 +339,7 @@ msgstr "Vendas em Exceção"
#. module: sale
#: help:sale.order.line,address_allotment_id:0
msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
+msgstr "Um parceiro a quem o produto específico precisa ser alocado."
#. module: sale
#: view:sale.order:0
@@ -331,7 +348,7 @@ msgstr ""
#: field:sale.order.line,state:0
#: view:sale.report:0
msgid "Status"
-msgstr "Situação atual"
+msgstr "Situação"
#. module: sale
#: selection:sale.report,month:0
@@ -352,6 +369,15 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Clique para criar uma cotação que pode ser convertida em um\n"
+" pedido de venda.\n"
+"
\n"
+" O OpenERP vai ajudá-lo a lidar eficientemente com o fluxo "
+"de vendas:\n"
+" cotação, pedido de venda, entrega, faturamento e pagamento.\n"
+"
\n"
+" "
#. module: sale
#: selection:sale.report,month:0
@@ -376,19 +402,19 @@ msgstr "Outubro"
#. module: sale
#: field:sale.order,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Resumo"
#. module: sale
#: view:sale.order:0
msgid "View Invoice"
-msgstr ""
+msgstr "Ver Fatura"
#. 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 "Adiantamento de %s %s"
#. module: sale
#: view:board.board:0
@@ -407,7 +433,7 @@ msgstr "Quantidade"
#. module: sale
#: help:sale.order,partner_shipping_id:0
msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "Endereço de entrega para o pedido de venda atual."
#. module: sale
#: report:sale.order:0
@@ -428,13 +454,13 @@ msgstr "Posição Fiscal"
#: selection:sale.order,state:0
#: selection:sale.report,state:0
msgid "In Progress"
-msgstr "Em Progresso"
+msgstr "Em Andamento"
#. module: sale
#: code:addons/sale/sale.py:667
#, python-format
msgid "Draft Invoice of %s %s waiting for validation."
-msgstr ""
+msgstr "Pedido de Venda Provisório de %s %s aguardando validação."
#. module: sale
#: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -442,7 +468,7 @@ msgid ""
"The salesman confirms the quotation. The state of the sales order becomes "
"'In progress' or 'Manual in progress'."
msgstr ""
-"O vendedor confirma a cotação. O status do pedido de vendas se torna 'em "
+"O vendedor confirma a cotação. A situação do pedido de vendas se torna 'Em "
"progresso' ou 'Manual em progresso'."
#. module: sale
@@ -450,6 +476,7 @@ msgstr ""
#, python-format
msgid "You cannot cancel a sale order line that has already been invoiced."
msgstr ""
+"Você não pode cancelar uma linha de um pedido de venda que já foi faturado."
#. module: sale
#: report:sale.order:0
@@ -464,12 +491,12 @@ msgstr "Endereço de fatura para o pedido de venda atual."
#. 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 "Antes da Entrega"
#. module: sale
#: code:addons/sale/sale.py:804
@@ -478,21 +505,23 @@ msgid ""
"There is no Fiscal Position defined or Income category account defined for "
"default properties of Product categories."
msgstr ""
+"Não existe uma Posição Fiscal definida ou Conta de Recebimento definidos "
+"para as propriedades padrão de categorias de produtos."
#. module: sale
#: model:res.groups,name:sale.group_delivery_invoice_address
msgid "Addresses in Sale Orders"
-msgstr ""
+msgstr "Endereço no Pedido de Vendas"
#. module: sale
#: field:sale.order,project_id:0
msgid "Contract / Analytic"
-msgstr ""
+msgstr "Contrato / Analítico"
#. module: sale
#: model:res.groups,name:sale.group_invoice_so_lines
msgid "Enable Invoicing Sale order lines"
-msgstr ""
+msgstr "Habilitar o Faturamento de linhas do Pedido de Venda"
#. module: sale
#: view:sale.report:0
@@ -512,7 +541,7 @@ msgstr ""
#: view:sale.make.invoice:0
#: view:sale.order.line.make.invoice:0
msgid "or"
-msgstr ""
+msgstr "ou"
#. module: sale
#: field:sale.order,invoiced_rate:0
@@ -523,7 +552,7 @@ msgstr "Faturado"
#. module: sale
#: model:res.groups,name:sale.group_analytic_accounting
msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "Contabilidade Analítica para Vendas"
#. module: sale
#: field:sale.order,date_confirm:0
@@ -548,7 +577,7 @@ msgstr "Março"
#. module: sale
#: model:ir.actions.server,name:sale.actions_server_sale_order_read
msgid "Sale: Mark read"
-msgstr ""
+msgstr "Venda: Marcar como lido"
#. module: sale
#: help:sale.order,amount_total:0
@@ -558,7 +587,7 @@ msgstr "Valor total."
#. module: sale
#: field:sale.config.settings,module_sale_journal:0
msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
+msgstr "Permite faturar em lote de ordens de entrega através de diários"
#. module: sale
#: field:sale.order.line,price_subtotal:0
@@ -568,7 +597,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 definir um desconto na linha do pedido de vendas"
#. module: sale
#: report:sale.order:0
@@ -578,12 +607,12 @@ msgstr "Endereço de Cobrança:"
#. module: sale
#: field:sale.order.line,product_uom:0
msgid "Unit of Measure "
-msgstr ""
+msgstr "Unidade de Medida "
#. module: sale
#: field:sale.config.settings,time_unit:0
msgid "The default working time unit for services is"
-msgstr ""
+msgstr "O tempo de medida padrão para cada unidade de serviço é"
#. module: sale
#: field:sale.order,partner_invoice_id:0
@@ -608,11 +637,15 @@ msgid ""
" or a fixed price (for advances) directly from the sale "
"order form if you prefer."
msgstr ""
+"Todos os itens dessas linhas de pedido serão faturados. Você também pode "
+"faturar um percentual do pedido de venda\n"
+" ou um preço fixo (para adiantamentos) diretamente do "
+"formulário de pedido de venda, se você preferir."
#. module: sale
#: view:sale.order:0
msgid "(update)"
-msgstr ""
+msgstr "(atualizar)"
#. module: sale
#: model:ir.model,name:sale.model_sale_order_line
@@ -623,12 +656,12 @@ msgstr "Linha de Pedido de Vendas"
#. module: sale
#: field:sale.config.settings,module_analytic_user_function:0
msgid "One employee can have different roles per contract"
-msgstr ""
+msgstr "Um funcionário pode ter diferentes papéis por contrato"
#. module: sale
#: view:sale.order:0
msgid "Print"
-msgstr ""
+msgstr "Imprimir"
#. module: sale
#: report:sale.order:0
@@ -643,7 +676,7 @@ msgstr "Itens do Pedido"
#. module: sale
#: field:account.config.settings,module_sale_analytic_plans:0
msgid "Use multiple analytic accounts on sales"
-msgstr ""
+msgstr "Usar múltiplas contas analíticas em vendas"
#. module: sale
#: help:sale.config.settings,module_sale_journal:0
@@ -653,6 +686,10 @@ msgid ""
" and perform batch operations on journals.\n"
" This installs the module sale_journal."
msgstr ""
+"Permite categorizar suas vendas e entregas (listas de separação) entre "
+"diferentes diários,\n"
+" e realizar operações em lote nos diários.\n"
+" Irá instalar o módulo o sale_journal."
#. module: sale
#: field:sale.order,create_date:0
@@ -663,7 +700,7 @@ msgstr "Data de Criação"
#: code:addons/sale/sale.py:659
#, python-format
msgid "Sale Order for %s set to Done"
-msgstr ""
+msgstr "Pedido de Venda para %s definido como concluído"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -673,7 +710,7 @@ msgstr "Itens Entregues e não Faturados."
#. module: sale
#: report:sale.order:0
msgid "Total :"
-msgstr "Total :"
+msgstr "Total:"
#. module: sale
#: view:sale.report:0
@@ -700,12 +737,22 @@ msgid ""
" \n"
"* The 'Cancelled' status is set when a user cancel the sales order related."
msgstr ""
+"* A situação 'Provisório' é definido quando o pedido de vendas relacionado é "
+"provisório.\n"
+"* A situação 'Confirmado' é definido quando o pedido de vendas relacionado é "
+"confirmada.\n"
+"* A situação de 'Exceção' é definido quando o pedido de vendas relacionado é "
+"definido como exceção.\n"
+"* A situação 'Concluído' é definida quando o pedido de vendas foi separado.\n"
+"* A situação 'Cancelado' é definida quando o usuário cancelar o pedido de "
+"venda relacionado."
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
#, python-format
msgid "There is no income account defined as global property."
msgstr ""
+"Não existe nenhuma conta de recebimento definida como propriedade global."
#. module: sale
#: code:addons/sale/sale.py:984
@@ -713,12 +760,12 @@ msgstr ""
#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
#, python-format
msgid "Configuration Error!"
-msgstr ""
+msgstr "Erro de Configuração!"
#. module: sale
#: view:sale.order:0
msgid "Send by Email"
-msgstr ""
+msgstr "Enviar por e-mail"
#. module: sale
#: code:addons/sale/res_config.py:89
@@ -743,6 +790,8 @@ msgid ""
"To allow your salesman to make invoices for sale order lines using the menu "
"'Lines to Invoice'."
msgstr ""
+"Para permitir que o vendedor faça faturas de linhas de pedido de venda "
+"usando o menu 'Linhas para Faturar'."
#. module: sale
#: view:sale.report:0
@@ -753,7 +802,7 @@ msgstr "Parceiro"
#. module: sale
#: view:sale.advance.payment.inv:0
msgid "Create and View Invoice"
-msgstr ""
+msgstr "Criar e Visualizar a Fatura"
#. module: sale
#: model:ir.actions.act_window,help:sale.action_shop_form
@@ -768,6 +817,16 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Clique para definir um novo estabelecimento.\n"
+"
\n"
+" Cada cotação ou pedido de venda deve ser associado a um "
+"estabelecimento.\n"
+" O estabelecimento também define o armazém a partir do qual "
+"os produtos\n"
+" serão entregues para cada venda em particular.\n"
+"
\n"
+" "
#. module: sale
#: report:sale.order:0
@@ -803,7 +862,7 @@ msgstr "Categoria de Produtos"
#: code:addons/sale/sale.py:555
#, python-format
msgid "Cannot cancel this sales order!"
-msgstr ""
+msgstr "Não é possível cancelar este pedido de venda!"
#. module: sale
#: view:sale.order:0
@@ -816,26 +875,28 @@ msgstr "Recriar Fatura"
msgid ""
"In order to delete a confirmed sale order, you must cancel it before !"
msgstr ""
+"Para poder excluir um pedido de venda confirmado, você precisa cancelar ele "
+"antes!"
#. module: sale
#: report:sale.order:0
msgid "Taxes :"
-msgstr "Impostos :"
+msgstr "Impostos:"
#. module: sale
#: selection:sale.order,order_policy:0
msgid "On Demand"
-msgstr ""
+msgstr "Sob Demanda"
#. module: sale
#: field:sale.order,currency_id:0
msgid "unknown"
-msgstr ""
+msgstr "desconhecido"
#. module: sale
#: field:sale.order,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
#. module: sale
#: field:sale.order,date_order:0
@@ -859,6 +920,9 @@ msgid ""
" You may have to create it and set it as a default value on "
"this field."
msgstr ""
+"Selecione um produto do tipo serviço que é chamado 'Avançar Produto'.\n"
+" Você poderá ter que criá-lo "
+"e defini-lo um valor padrão neste campo."
#. module: sale
#: help:sale.config.settings,module_warning:0
@@ -868,6 +932,10 @@ msgid ""
"Example: Product: this product is deprecated, do not purchase more than 5.\n"
" Supplier: don't forget to ask for an express delivery."
msgstr ""
+"Permite configurar notificação sobre os produtos e dispará-los quando um "
+"usuário quer vender um determinado produto ou a um determinado cliente.\n"
+"Exemplo: Produto: este produto é obsoleto, não comprar mais do que 5.\n"
+" Fornecedor: não se esqueça de pedir uma entrega expressa."
#. module: sale
#: code:addons/sale/sale.py:979
@@ -878,7 +946,7 @@ msgstr "Não foi encontrada uma linha de preço válida!"
#. module: sale
#: field:sale.config.settings,module_sale_margin:0
msgid "Display margins on sales orders"
-msgstr ""
+msgstr "Mostrar margens nos pedidos de vendas"
#. module: sale
#: help:sale.order,invoice_ids:0
@@ -929,6 +997,9 @@ 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 ""
+"Não é possível encontrar uma linha na lista de preços correspondente a este "
+"produto e quantidade.\n"
+"Você tem que mudar ou o produto, a quantidade ou a lista de preços."
#. module: sale
#: model:process.transition,name:sale.process_transition_invoice0
@@ -951,6 +1022,9 @@ msgid ""
"Manage Related Stock.\n"
" This installs the module sale_stock."
msgstr ""
+"Permite que você faça uma Cotação, Pedido de Venda, usando políticas "
+"diferentes e gerenciar estoques relacionados.\n"
+" Isso instala o módulo sale_stock ."
#. module: sale
#: model:email.template,subject:sale.email_template_edi_sale
@@ -958,6 +1032,8 @@ msgid ""
"${object.company_id.name} ${object.state in ('draft', 'sent') and "
"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
#. module: sale
#: report:sale.order:0
@@ -968,7 +1044,7 @@ msgstr "Preço"
#. module: sale
#: view:sale.order:0
msgid "Quotation Number"
-msgstr ""
+msgstr "Cotação Número"
#. module: sale
#: selection:sale.order.line,type:0
@@ -983,39 +1059,39 @@ msgstr "Endereço de Entrega:"
#. 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 "Permite escolher uma conta analítica no pedido de vendas."
#. module: sale
#: model:process.node,note:sale.process_node_quotation0
msgid "Draft state of sales order"
-msgstr "Status provisório de pedidos de venda"
+msgstr "Situação provisória dos pedidos de venda"
#. module: sale
#: code:addons/sale/sale.py:647
#, python-format
msgid "Quotation for %screated."
-msgstr ""
+msgstr "Cotação para %scriada."
#. module: sale
#: help:sale.order,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
#. module: sale
#: view:sale.order:0
msgid "New Copy of Quotation"
-msgstr ""
+msgstr "Nova Cópia da Cotação"
#. module: sale
#: code:addons/sale/sale.py:1007
#, python-format
msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
+msgstr "Não é possível excluir uma linha do pedido de vendas no estado '%s'."
#. module: sale
#: model:res.groups,name:sale.group_mrp_properties
msgid "Properties on lines"
-msgstr ""
+msgstr "Propriedades nas linhas"
#. module: sale
#: code:addons/sale/sale.py:888
@@ -1024,6 +1100,8 @@ msgid ""
"Before choosing a product,\n"
" select a customer in the sales form."
msgstr ""
+"Antes de escolher um produto,\n"
+" selecione um cliente no formulário de vendas."
#. module: sale
#: view:sale.order:0
@@ -1044,19 +1122,19 @@ msgstr "Confirmar Cotação"
#: 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 "Linhas do Pedido para Faturar"
#. module: sale
#: view:sale.order:0
#: view:sale.order.line:0
#: view:sale.report:0
msgid "Group By..."
-msgstr "Agrupado Por..."
+msgstr "Agrupar Por..."
#. module: sale
#: view:sale.config.settings:0
msgid "Product Features"
-msgstr ""
+msgstr "Características do Produto"
#. module: sale
#: selection:sale.order,state:0
@@ -1068,7 +1146,7 @@ msgstr "Aguardando Programação"
#: view:sale.order.line:0
#: field:sale.report,product_uom:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida"
#. module: sale
#: field:sale.order.line,type:0
@@ -1078,18 +1156,18 @@ msgstr "Método de Aquisição"
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
msgid "Invoice the whole sale order"
-msgstr ""
+msgstr "Faturar o Pedido de Venda inteiro"
#. module: sale
#: view:sale.order:0
#: field:sale.order,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens não lidas"
#. module: sale
#: selection:sale.order,state:0
msgid "Draft Quotation"
-msgstr ""
+msgstr "Cotação Provisória"
#. module: sale
#: selection:sale.order,state:0
@@ -1119,6 +1197,14 @@ msgid ""
"available.\n"
" This installs the module analytic_user_function."
msgstr ""
+"Permite que você defina o que é a função padrão de um usuário específico em "
+"uma determinada conta.\n"
+" Isto é usado principalmente quando um usuário codifica seu "
+"quadro de horários. Os valores são recuperados e os campos são auto-"
+"completados.\n"
+" Mas a possibilidade de alterar esses valores ainda está "
+"disponível.\n"
+" Isso instala o módulo analytic_user_function."
#. module: sale
#: help:sale.order,create_date:0
@@ -1137,12 +1223,12 @@ msgstr "Criar Notas Fiscais"
#: code:addons/sale/sale.py:1007
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Ação Inválida!"
#. module: sale
#: report:sale.order:0
msgid "Fax :"
-msgstr "Fax :"
+msgstr "Fax:"
#. module: sale
#: field:sale.advance.payment.inv,amount:0
@@ -1169,12 +1255,12 @@ msgstr ""
#: 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"
+msgstr "Gerar Faturas"
#. module: sale
#: field:res.partner,sale_order_count:0
msgid "# of Sales Order"
-msgstr ""
+msgstr "# de Pedidos de Vendas"
#. module: sale
#: view:sale.order:0
@@ -1198,11 +1284,13 @@ msgid ""
"After clicking 'Show Lines to Invoice', select lines to invoice and create "
"the invoice from the 'More' dropdown menu."
msgstr ""
+"Após clicar em 'Mostrar linhas para Faturar', escolha as linhas para faturar "
+"e criar a fatura a partir do menu dropdown 'Mais'."
#. module: sale
#: help:sale.order,invoice_exists:0
msgid "It indicates that sale order has at least one invoice."
-msgstr ""
+msgstr "Isto indica que o pedido de venda possui pelo menos uma fatura."
#. module: sale
#: selection:sale.order,state:0
@@ -1220,16 +1308,17 @@ msgstr "Agrupar Notas Fiscais"
#, python-format
msgid "Quotation for %sconverted to Sale Order of %s %s."
msgstr ""
+"A cotação para %sconvertida para Pedido de Vendas de %s %s."
#. module: sale
#: view:sale.advance.payment.inv:0
msgid "Invoice Sale Order"
-msgstr ""
+msgstr "Faturar Pedido de Vendas"
#. module: sale
#: view:sale.config.settings:0
msgid "Contracts Management"
-msgstr ""
+msgstr "Gestão de Contratos"
#. module: sale
#: view:sale.report:0
@@ -1395,11 +1484,115 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+"
\n"
+"\n"
+"
Olá${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
+"''},
\n"
+" \n"
+"
Aqui está o seu ${object.state in ('draft', 'sent') and 'quotation' "
+"or 'order confirmation'} from ${object.company_id.name}:
\n"
+"\n"
+"
\n"
+" REFERENCIAS \n"
+" Número do pedido: ${object.name} \n"
+" 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"
+" "
#. module: sale
#: field:sale.config.settings,group_sale_pricelist:0
msgid "Use pricelists to adapt your price per customers"
-msgstr ""
+msgstr "Use listas de preços para adaptar seu preço por clientes"
#. module: sale
#: view:sale.order.line:0
@@ -1413,6 +1606,8 @@ msgid ""
"invoice). You have to choose "
"if you want your invoice based on ordered "
msgstr ""
+"O pedido de venda vai criar automaticamente a proposição de fatura (fatura "
+"provisória). Você tem que escolher se você quer faturar com base no pedido "
#. module: sale
#: code:addons/sale/sale.py:435
@@ -1436,6 +1631,10 @@ msgid ""
"between the Unit Price and Cost Price.\n"
" This installs the module sale_margin."
msgstr ""
+"Isso adiciona a \"margem\" no pedido de venda.\n"
+" Isso dá a rentabilidade através do cálculo da diferença "
+"entre o preço unitário e o preço de custo.\n"
+" Isso instala o módulo sale_margin ."
#. module: sale
#: report:sale.order:0
@@ -1465,7 +1664,7 @@ msgstr "Documento de Origem"
#. module: sale
#: view:sale.order.line:0
msgid "To Do"
-msgstr "Por Fazer"
+msgstr "A Fazer"
#. module: sale
#: help:sale.order,amount_untaxed:0
@@ -1488,7 +1687,7 @@ msgstr "Produto"
#. module: sale
#: field:sale.config.settings,group_invoice_so_lines:0
msgid "Generate invoices based on the sale order lines"
-msgstr ""
+msgstr "Gerar faturas com base em linhas do pedido de vendas"
#. module: sale
#: help:sale.order,order_policy:0
@@ -1500,6 +1699,12 @@ msgid ""
"Before delivery: A draft invoice is created from the sales order and must be "
"paid before the products can be delivered."
msgstr ""
+"Sob demanda: Uma fatura provisória pode ser criada a partir do pedido de "
+"venda, quando necessário.\n"
+"Em ordem de entrega: A fatura provisória pode ser criada a partir da ordem "
+"de entrega, quando os produtos foram entregues.\n"
+"Antes da entrega: Uma fatura provisória é criada a partir do pedido de "
+"vendas e deve ser paga antes que os produtos possam ser entregues."
#. module: sale
#: view:account.invoice.report:0
@@ -1516,7 +1721,7 @@ msgstr "Faturar em"
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
msgid "Fixed price (deposit)"
-msgstr ""
+msgstr "Preço fixo (depósito)"
#. module: sale
#: report:sale.order:0
@@ -1526,7 +1731,7 @@ msgstr "Data do Pedido"
#. module: sale
#: field:sale.order.line,product_uos:0
msgid "Product UoS"
-msgstr "UdS Produto"
+msgstr "UdV do Produto"
#. module: sale
#: selection:sale.order,state:0
@@ -1537,7 +1742,7 @@ msgstr "Em Andamento Manual"
#. module: sale
#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
msgid "Sale: Mark unread"
-msgstr ""
+msgstr "Vendas: Marcar como não lido"
#. module: sale
#: view:sale.order.line:0
@@ -1547,7 +1752,7 @@ msgstr "Pedido"
#. module: sale
#: view:sale.order:0
msgid "Confirm Sale"
-msgstr ""
+msgstr "Confirmar Venda"
#. module: sale
#: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -1575,17 +1780,17 @@ msgstr ""
#. module: sale
#: selection:sale.advance.payment.inv,advance_payment_method:0
msgid "Some order lines"
-msgstr ""
+msgstr "Algumas linhas do pedido"
#. module: sale
#: view:res.partner:0
msgid "sale.group_delivery_invoice_address"
-msgstr ""
+msgstr "sale.group_delivery_invoice_address"
#. module: sale
#: model:res.groups,name:sale.group_discount_per_so_line
msgid "Discount on lines"
-msgstr ""
+msgstr "Desconto nas linhas"
#. module: sale
#: field:sale.order,client_order_ref:0
@@ -1605,6 +1810,11 @@ msgid ""
" will create a draft invoice that can be modified\n"
" before validation."
msgstr ""
+"Escolha como você deseja faturar este pedido.\n"
+" Isto "
+"irá criar uma fatura provisória que pode ser\n"
+" "
+"modificada antes da validação."
#. module: sale
#: view:board.board:0
@@ -1620,6 +1830,13 @@ msgid ""
" Use Some Order Lines to invoice a selection of the sale "
"order lines."
msgstr ""
+"Use tudo para criar a fatura final.\n"
+" Percentagem de utilização para faturar uma percentagem do "
+"valor total.\n"
+" Use Preço Fixo para faturar um valor específico com "
+"antecedência.\n"
+" Use Algumas linhas do Pedido para faturar uma seleção de as "
+"linhas de pedidos de venda."
#. module: sale
#: help:sale.config.settings,module_account_analytic_analysis:0
@@ -1633,6 +1850,15 @@ msgid ""
"invoice automatically.\n"
" It installs the account_analytic_analysis module."
msgstr ""
+"Permite definir as condições dos contratos de seus clientes : Método de "
+"Faturamento\n"
+" (preço fixo, por planilha de horas, faturar antecipadamente), o "
+"valor exato\n"
+" (R$ 120 / dia para um desenvolvedor), a duração (contrato de "
+"suporte de um ano).\n"
+" Você será capaz de acompanhar o andamento do contrato e faturar "
+"automaticamente.\n"
+" Ele instala o módulo account_analytic_analysis."
#. module: sale
#: model:email.template,report_name:sale.email_template_edi_sale
@@ -1640,6 +1866,8 @@ msgid ""
"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
"'draft' or ''}"
msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
#. module: sale
#: help:sale.order,date_confirm:0
@@ -1650,7 +1878,7 @@ msgstr "Data na qual o pedido de venda é confirmado."
#: code:addons/sale/sale.py:556
#, python-format
msgid "First cancel all invoices attached to this sales order."
-msgstr ""
+msgstr "Primeiro cancele todas as faturas anexadas a este pedido de vendas."
#. module: sale
#: field:sale.order,company_id:0
@@ -1669,7 +1897,7 @@ msgstr "Data da Fatura"
#. module: sale
#: help:sale.advance.payment.inv,amount:0
msgid "The amount to be invoiced in advance."
-msgstr "O montante a ser faturado antecipadamente."
+msgstr "O valor a ser faturado antecipadamente."
#. module: sale
#: selection:sale.order,state:0
@@ -1686,27 +1914,27 @@ msgstr "Sem Cliente definido!"
#. module: sale
#: field:sale.order,partner_shipping_id:0
msgid "Delivery Address"
-msgstr ""
+msgstr "Endereço de Entrega"
#. module: sale
#: selection:sale.order,state:0
msgid "Sale to Invoice"
-msgstr ""
+msgstr "Venda para Faturar"
#. module: sale
#: view:sale.config.settings:0
msgid "Warehouse Features"
-msgstr ""
+msgstr "Recursos do Armazém"
#. module: sale
#: field:sale.order,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
#. module: sale
#: field:sale.config.settings,module_project:0
msgid "Project"
-msgstr ""
+msgstr "Projeto"
#. module: sale
#: code:addons/sale/sale.py:354
@@ -1716,7 +1944,7 @@ msgstr ""
#: code:addons/sale/sale.py:803
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Erro!"
#. module: sale
#: report:sale.order:0
@@ -1730,6 +1958,9 @@ msgid ""
"replenishment.\n"
"On order: When needed, the product is purchased or produced."
msgstr ""
+"Do estoque: Quando necessário, o produto é retirado do estoque ou "
+"esperaremos a reposição.\n"
+"No pedido: Quando necessário, o produto é comprado ou produzido."
#. module: sale
#: selection:sale.order,state:0
@@ -1746,12 +1977,12 @@ msgstr "Buscar itens não Faturados"
#. module: sale
#: selection:sale.order,state:0
msgid "Quotation Sent"
-msgstr ""
+msgstr "Cotação Enviada"
#. module: sale
#: model:ir.model,name:sale.model_mail_compose_message
msgid "Email composition wizard"
-msgstr ""
+msgstr "Assistente de composição de Email"
#. module: sale
#: model:ir.actions.act_window,name:sale.action_shop_form
@@ -1772,11 +2003,12 @@ msgstr "Data de Confirmação"
#, python-format
msgid "Please define sales journal for this company: \"%s\" (id:%d)."
msgstr ""
+"Por favor defina o diário de vendas para esta empresa: \"%s\" (id:%d)."
#. module: sale
#: view:sale.config.settings:0
msgid "Contract Features"
-msgstr ""
+msgstr "Características do Contrato"
#. module: sale
#: model:ir.model,name:sale.model_sale_order
@@ -1791,12 +2023,12 @@ msgstr "Pedido de Venda"
#. module: sale
#: field:sale.order.line,product_uos_qty:0
msgid "Quantity (UoS)"
-msgstr "Quantidade (UdS)"
+msgstr "Quantidade (UdV)"
#. module: sale
#: view:sale.order.line:0
msgid "Sale Order Lines that are in 'done' state"
-msgstr "Linhas do Pedido que estão 'Feitas'"
+msgstr "Linhas do Pedido que estão 'Concluídas'"
#. module: sale
#: selection:sale.order.line,state:0
@@ -1806,7 +2038,7 @@ msgstr "Confirmada"
#. module: sale
#: field:sale.order,note:0
msgid "Terms and conditions"
-msgstr ""
+msgstr "Termos e condições"
#. module: sale
#: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1816,13 +2048,13 @@ msgstr "Confirmar"
#. module: sale
#: field:sale.order,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
#. module: sale
#: view:sale.order:0
#: field:sale.order.line,invoice_lines:0
msgid "Invoice Lines"
-msgstr "Linhas da Nota Fiscal"
+msgstr "Linhas da Fatura"
#. module: sale
#: view:sale.report:0
@@ -1839,12 +2071,12 @@ msgstr "Linhas do Pedido de Venda"
#. module: sale
#: view:sale.config.settings:0
msgid "Default Options"
-msgstr ""
+msgstr "Opções Padrão"
#. module: sale
#: field:account.config.settings,group_analytic_account_for_sales:0
msgid "Analytic accounting for sales"
-msgstr ""
+msgstr "Contabilidade Analítica para vendas"
#. module: sale
#: code:addons/sale/edi/sale_order.py:139
@@ -1872,16 +2104,29 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Clique para criar uma cotação ou pedido de venda para este "
+"cliente.\n"
+"
\n"
+" O OpenERP vai ajudá-lo a lidar eficientemente com o fluxo "
+"completo da venda:\n"
+" cotação, pedido de venda, entrega, faturação e "
+"pagamento.
\n"
+" A característica social ajuda a organizar debates sobre "
+"cada pedido de venda,\n"
+" e permite que o seu cliente acompanhe a evolução do pedido "
+"de venda.
\n"
+" "
#. module: sale
#: selection:sale.order,order_policy:0
msgid "On Delivery Order"
-msgstr ""
+msgstr "Pedido na Entrega"
#. module: sale
#: view:sale.report:0
msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Unidade de Medida referencial"
#. module: sale
#: model:ir.actions.act_window,help:sale.action_quotations
@@ -1902,6 +2147,20 @@ msgid ""
" \n"
" "
msgstr ""
+"
\n"
+" Clique para criar uma cotação, a primeira etapa de uma nova "
+"venda.\n"
+"
\n"
+" O OpenERP vai ajudá-lo a lidar eficientemente com o fluxo completo "
+"da venda:\n"
+" cotação, pedido de venda, entrega, faturação e pagamento.\n"
+"
\n"
+" A característica social ajuda a organizar debates sobre "
+"cada pedido de venda,\n"
+" e permite que o seu cliente acompanhe a evolução do pedido "
+"de venda.\n"
+"
\n"
+" "
#. module: sale
#: code:addons/sale/wizard/sale_line_invoice.py:111
@@ -1914,8 +2173,8 @@ msgid ""
msgstr ""
"A Fatura não pode ser criada para esta Linha de Pedido de Vendas devido a um "
"dos seguintes motivos:\n"
-"1.O status desta linha de pedido é \"provisória\" ou \"cancelada\"!\n"
-"1.A Linha do Pedido de Venda está faturada!"
+"1. A situação desta linha de pedido é \"provisória\" ou \"cancelada\"!\n"
+"2. A Linha do Pedido de Venda está faturada!"
#. module: sale
#: view:sale.order.line:0
@@ -1932,7 +2191,7 @@ msgstr "Peso"
#: view:sale.order:0
#: field:sale.order,invoice_ids:0
msgid "Invoices"
-msgstr "Notas Fiscais"
+msgstr "Faturas"
#. module: sale
#: selection:sale.report,month:0
@@ -1944,6 +2203,7 @@ msgstr "Dezembro"
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)."
msgstr ""
+"Não existe conta de entrada definida para este produto: \"%s\" (id:%d)."
#. module: sale
#: view:sale.order.line:0
@@ -1958,7 +2218,7 @@ msgstr "Avançar Compras e Notas Fiscais"
#. module: sale
#: field:sale.order,amount_untaxed:0
msgid "Untaxed Amount"
-msgstr "Total de Mercadorias"
+msgstr "Valor sem Impostos"
#. module: sale
#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
@@ -1972,7 +2232,7 @@ msgstr "Avançar Fatura"
#. module: sale
#: model:ir.actions.client,name:sale.action_client_sale_menu
msgid "Open Sale Menu"
-msgstr ""
+msgstr "Abrir Menu de Venda"
#. module: sale
#: selection:sale.order.line,state:0
@@ -1982,7 +2242,7 @@ msgstr "Provisório"
#. module: sale
#: field:sale.config.settings,module_sale_stock:0
msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
+msgstr "Dispara ordens de entrega automaticamente no pedido de vendas"
#. module: sale
#: help:sale.order,amount_tax:0
@@ -1992,7 +2252,7 @@ msgstr "Valor dos impostos."
#. module: sale
#: view:sale.order:0
msgid "Sale Order "
-msgstr ""
+msgstr "Pedido de Venda "
#. module: sale
#: view:sale.order.line:0
@@ -2015,7 +2275,7 @@ msgstr "Pedidos de Venda"
#: model:ir.model,name:sale.model_sale_shop
#: view:sale.shop:0
msgid "Sales Shop"
-msgstr "Loja de Vendas"
+msgstr "Estabelecimento da Venda"
#. module: sale
#: selection:sale.report,month:0
@@ -2026,7 +2286,7 @@ msgstr "Novembro"
#: field:sale.order,message_comment_ids:0
#: help:sale.order,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Comentários e emails"
#. module: sale
#: field:sale.advance.payment.inv,product_id:0
@@ -2037,6 +2297,7 @@ msgstr "Avançar o Produto"
#: help:sale.order.line,sequence:0
msgid "Gives the sequence order when displaying a list of sales order lines."
msgstr ""
+"Dá a ordem da seqüência ao exibir uma lista de linhas de pedidos de vendas."
#. module: sale
#: selection:sale.report,month:0
@@ -2051,13 +2312,13 @@ msgstr "Pedido de Venda em Processamento"
#. module: sale
#: field:sale.config.settings,timesheet:0
msgid "Prepare invoices based on timesheets"
-msgstr ""
+msgstr "Preparar faturas baseada em planilha de horas"
#. module: sale
#: code:addons/sale/sale.py:655
#, python-format
msgid "Sale Order for %scancelled."
-msgstr ""
+msgstr "Pedido de Vendas para %scancelado."
#. module: sale
#: help:sale.order,origin:0
@@ -2074,12 +2335,12 @@ msgstr "Compromisso Atrasado"
#. module: sale
#: field:sale.report,state:0
msgid "Order Status"
-msgstr ""
+msgstr "Situação de Pedido"
#. module: sale
#: view:sale.advance.payment.inv:0
msgid "Show Lines to Invoice"
-msgstr ""
+msgstr "Mostrar linhas para Faturar"
#. module: sale
#: field:sale.report,date:0
@@ -2105,18 +2366,18 @@ msgstr "do estoque"
#: code:addons/sale/sale.py:968
#, python-format
msgid "No Pricelist ! : "
-msgstr "Nenhuma Lista de Preços ! : "
+msgstr "Nenhuma Lista de Preços! : "
#. 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 "Pedidos de Venda"
#. module: sale
#: field:sale.config.settings,module_account_analytic_analysis:0
msgid "Use contracts management"
-msgstr ""
+msgstr "Usar gestão de contratos"
#. module: sale
#: help:sale.order,invoiced:0
@@ -2137,12 +2398,12 @@ msgstr "Maio"
#. module: sale
#: view:sale.make.invoice:0
msgid "Do you really want to create the invoice(s)?"
-msgstr "Deseja Criar Nota Fiscal ?"
+msgstr "Deseja Criar uma Fatura?"
#. module: sale
#: view:sale.order:0
msgid "Order Number"
-msgstr ""
+msgstr "Número do Pedido"
#. module: sale
#: view:sale.order:0
@@ -2174,6 +2435,11 @@ msgid ""
"with\n"
" your customer."
msgstr ""
+"Usar contrato para ser capaz de gerenciar seus serviços com\n"
+" "
+" múltiplas faturas como parte de um mesmo contrato\n"
+" "
+" com seu cliente."
#. module: sale
#: view:sale.order:0
@@ -2184,7 +2450,7 @@ msgstr "Procurar Pedido de Venda"
#. module: sale
#: field:sale.advance.payment.inv,advance_payment_method:0
msgid "What do you want to invoice?"
-msgstr ""
+msgstr "O que você deseja faturar?"
#. module: sale
#: field:sale.order.line,sequence:0
@@ -2200,7 +2466,7 @@ msgstr "Condições de Pagamento"
#. module: sale
#: help:account.config.settings,module_sale_analytic_plans:0
msgid "This allows install module sale_analytic_plans."
-msgstr ""
+msgstr "Isto irá instalar o módulo sale_analytic_plans."
#. module: sale
#: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2237,7 +2503,7 @@ msgstr "Ano"
#. module: sale
#: view:sale.order.line.make.invoice:0
msgid "Do you want to invoice the selected sale order lines?"
-msgstr ""
+msgstr "Você deseja faturar as linhas selecionadas do pedido de vendas?"
#~ msgid "Recreate Procurement"
#~ msgstr "Recriar Aquisição"
diff --git a/addons/sale/report/sale_order.py b/addons/sale/report/sale_order.py
index 430e1a03f76..b4f0b1589aa 100644
--- a/addons/sale/report/sale_order.py
+++ b/addons/sale/report/sale_order.py
@@ -21,7 +21,7 @@
import time
-from report import report_sxw
+from openerp.report import report_sxw
class order(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context=None):
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index f592a8fd66c..a20ba01f300 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-import tools
-from osv import fields, osv
+from openerp import tools
+from openerp.osv import fields, osv
class sale_report(osv.osv):
_name = "sale.report"
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index d8e9d0fef6f..52f38a23486 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields, osv
-import pooler
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import pooler
+from openerp.tools.translate import _
class sale_configuration(osv.osv_memory):
_inherit = 'sale.config.settings'
diff --git a/addons/sale/res_partner.py b/addons/sale/res_partner.py
index 5e8d05b62c1..1b37b609179 100644
--- a/addons/sale/res_partner.py
+++ b/addons/sale/res_partner.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields,osv
-from tools.translate import _
+from openerp.osv import fields,osv
+from openerp.tools.translate import _
class res_partner(osv.osv):
_inherit = 'res.partner'
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6f4d38685a6..dee770a6433 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -22,12 +22,12 @@
from datetime import datetime, timedelta
from dateutil.relativedelta import relativedelta
import time
-import pooler
-from osv import fields, osv
-from tools.translate import _
-from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
-import decimal_precision as dp
-import netsvc
+from openerp import pooler
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
+import openerp.addons.decimal_precision as dp
+from openerp import netsvc
class sale_shop(osv.osv):
_name = "sale.shop"
@@ -714,7 +714,7 @@ class sale_order_line(osv.osv):
_description = 'Sales Order Line'
_columns = {
'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
- 'name': fields.text('Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
+ 'name': fields.text('Description', required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."),
'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 3c07bb37f11..4aa58088129 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
-import netsvc
+from openerp.osv import osv, fields
+from openerp.tools.translate import _
+from openerp import netsvc
class sale_order_line_make_invoice(osv.osv_memory):
_name = "sale.order.line.make.invoice"
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index 1a20474b659..d60adbb7b25 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -18,9 +18,9 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
-import netsvc
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import netsvc
class sale_make_invoice(osv.osv_memory):
_name = "sale.make.invoice"
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 0fa4cd52cf2..2aa67fb465f 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -18,9 +18,9 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
-import decimal_precision as dp
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
class sale_advance_payment_inv(osv.osv_memory):
_name = "sale.advance.payment.inv"
diff --git a/addons/sale_analytic_plans/i18n/hr.po b/addons/sale_analytic_plans/i18n/hr.po
index ceb2abbfedf..ee7d1f13d27 100644
--- a/addons/sale_analytic_plans/i18n/hr.po
+++ b/addons/sale_analytic_plans/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:04+0000\n"
-"PO-Revision-Date: 2012-01-30 15:19+0000\n"
+"PO-Revision-Date: 2012-12-17 21:06+0000\n"
"Last-Translator: Goran Kliska \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:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
"Language: hr\n"
#. module: sale_analytic_plans
@@ -25,7 +25,7 @@ msgstr "Analitička raspodjela"
#. module: sale_analytic_plans
#: model:ir.model,name:sale_analytic_plans.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "Prodajni nalog"
#. module: sale_analytic_plans
#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
diff --git a/addons/sale_analytic_plans/i18n/pt.po b/addons/sale_analytic_plans/i18n/pt.po
index 44df76d1d47..a97bb8ce9d4 100644
--- a/addons/sale_analytic_plans/i18n/pt.po
+++ b/addons/sale_analytic_plans/i18n/pt.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: 2010-11-27 02:17+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2012-12-17 11:59+0000\n"
+"Last-Translator: Rui Franco (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:40+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\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 "Ordem de venda"
#. module: sale_analytic_plans
#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index 872e8b0bffc..2abbab7ab38 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class sale_order_line(osv.osv):
_inherit = 'sale.order.line'
diff --git a/addons/sale_crm/i18n/et.po b/addons/sale_crm/i18n/et.po
index ed9312c63d7..8c286f7f0f7 100644
--- a/addons/sale_crm/i18n/et.po
+++ b/addons/sale_crm/i18n/et.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: 2010-08-03 06:21+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2012-12-17 18:59+0000\n"
+"Last-Translator: Ahti Hinnov \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-18 05:00+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -69,7 +69,7 @@ msgstr ""
#: code:addons/sale_crm/wizard/crm_make_sale.py:135
#, python-format
msgid "Quotation"
-msgstr "Hinnapakkumine"
+msgstr "Pakkumine"
#. module: sale_crm
#: field:crm.make.sale,partner_id:0
@@ -126,22 +126,22 @@ msgstr ""
#. module: sale_crm
#: view:crm.lead:0
msgid "Create Quotation"
-msgstr ""
+msgstr "Loo pakkumine"
#. module: sale_crm
#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
msgid "Make Quotation"
-msgstr "loo Hinnapakkumine"
+msgstr "Loo pakkumine"
#. module: sale_crm
#: view:crm.make.sale:0
msgid "Cancel"
-msgstr "Loobu"
+msgstr "Tühista"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_sale_order
msgid "Sales Order"
-msgstr ""
+msgstr "Müügikorraldus"
#. module: sale_crm
#: view:crm.make.sale:0
diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po
index 9d18e5ea12e..a9b9accaf11 100644
--- a/addons/sale_crm/i18n/pt_BR.po
+++ b/addons/sale_crm/i18n/pt_BR.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:04+0000\n"
-"PO-Revision-Date: 2012-12-06 17:59+0000\n"
-"Last-Translator: Cristiano Korndörfer \n"
+"PO-Revision-Date: 2012-12-18 00:49+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"\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-07 04:34+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:90
@@ -36,7 +37,7 @@ msgstr "Estatísticas das Faturas"
#. module: sale_crm
#: field:crm.make.sale,close:0
msgid "Mark Won"
-msgstr "Marcar como Vencido"
+msgstr "Ganhamos!"
#. module: sale_crm
#: field:res.users,default_section_id:0
@@ -46,7 +47,7 @@ msgstr "Equipe de Vendas Padrão"
#. module: sale_crm
#: view:sale.order:0
msgid "My Sales Team(s)"
-msgstr "Minha(s) Equipe(s) de Vendas"
+msgstr "Minha Equipe de Vendas"
#. module: sale_crm
#: model:ir.model,name:sale_crm.model_res_users
diff --git a/addons/sale_crm/report/sales_crm_account_invoice_report.py b/addons/sale_crm/report/sales_crm_account_invoice_report.py
index 27da7640946..c12db9bfdb0 100644
--- a/addons/sale_crm/report/sales_crm_account_invoice_report.py
+++ b/addons/sale_crm/report/sales_crm_account_invoice_report.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import fields,osv
+from openerp.osv import fields,osv
class account_invoice_report(osv.osv):
_inherit = 'account.invoice.report'
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 3bca4053194..b1d50fc0270 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv,fields
+from openerp.osv import osv,fields
class sale_order(osv.osv):
_inherit = 'sale.order'
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 10225990229..02d36f14c21 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
class crm_make_sale(osv.osv_memory):
diff --git a/addons/sale_journal/i18n/pt.po b/addons/sale_journal/i18n/pt.po
index e9cf0724805..7428e759f5e 100644
--- a/addons/sale_journal/i18n/pt.po
+++ b/addons/sale_journal/i18n/pt.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-12-10 12:02+0000\n"
-"Last-Translator: Paulino Ascenção \n"
+"PO-Revision-Date: 2012-12-17 12:57+0000\n"
+"Last-Translator: Rui Franco (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:35+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: sale_journal
#: field:sale_journal.invoice.type,note:0
@@ -103,7 +103,7 @@ msgstr ""
#. module: sale_journal
#: help:sale.order,invoice_type_id:0
msgid "Generate invoice based on the selected option."
-msgstr ""
+msgstr "Gerar fatura com base na opção selecionada."
#. module: sale_journal
#: view:sale.order:0
@@ -137,7 +137,7 @@ msgstr "Ordem de Vendas"
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_stock_picking_out
msgid "Delivery Orders"
-msgstr ""
+msgstr "Ordens de entrega"
#~ msgid "Packing"
#~ msgstr "Embalagem"
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 3ae8e912efe..8463ab3f3bd 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class sale_journal_invoice_type(osv.osv):
_name = 'sale_journal.invoice.type'
diff --git a/addons/sale_margin/i18n/hr.po b/addons/sale_margin/i18n/hr.po
index a6b236b23a1..e35e4f83fdc 100644
--- a/addons/sale_margin/i18n/hr.po
+++ b/addons/sale_margin/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:04+0000\n"
-"PO-Revision-Date: 2011-12-10 07:37+0000\n"
-"Last-Translator: Tomislav Bosnjakovic \n"
+"PO-Revision-Date: 2012-12-17 21:05+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:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: sale_margin
#: field:sale.order.line,purchase_price:0
@@ -43,7 +43,7 @@ msgstr "Stavka prodajnog naloga"
msgid ""
"It gives profitability by calculating the difference between the Unit Price "
"and the cost price."
-msgstr ""
+msgstr "Daje razliku između prodajne i nabavne cijene."
#~ msgid ""
#~ " \n"
diff --git a/addons/sale_margin/i18n/pt_BR.po b/addons/sale_margin/i18n/pt_BR.po
index 111c3df5783..fb822d9c614 100644
--- a/addons/sale_margin/i18n/pt_BR.po
+++ b/addons/sale_margin/i18n/pt_BR.po
@@ -8,15 +8,15 @@ 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-07-28 19:50+0000\n"
+"PO-Revision-Date: 2012-12-18 00:52+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:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: sale_margin
#: field:sale.order.line,purchase_price:0
@@ -45,6 +45,8 @@ msgid ""
"It gives profitability by calculating the difference between the Unit Price "
"and the cost price."
msgstr ""
+"Fornece a rentabilidade por meio do cálculo da diferença entre o preço "
+"unitário e o preço de custo."
#~ msgid "Customer Refund"
#~ msgstr "Reembolso de Cliente"
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index bbb2df673ff..2879e45ca71 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -18,7 +18,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class sale_order_line(osv.osv):
_inherit = "sale.order.line"
diff --git a/addons/sale_mrp/i18n/pt_BR.po b/addons/sale_mrp/i18n/pt_BR.po
index e1383f2dda4..371b757174d 100644
--- a/addons/sale_mrp/i18n/pt_BR.po
+++ b/addons/sale_mrp/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:04+0000\n"
-"PO-Revision-Date: 2012-02-20 00:29+0000\n"
-"Last-Translator: tamnil \n"
+"PO-Revision-Date: 2012-12-18 00:53+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:46+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: sale_mrp
#: model:ir.model,name:sale_mrp.model_mrp_production
@@ -35,12 +36,12 @@ msgstr "Indica a Referência do Cliente no pedido de venda."
#. module: sale_mrp
#: field:mrp.production,sale_ref:0
msgid "Sale Reference"
-msgstr ""
+msgstr "Referência da Venda"
#. module: sale_mrp
#: field:mrp.production,sale_name:0
msgid "Sale Name"
-msgstr ""
+msgstr "Nome Venda"
#~ msgid "Sales and MRP Management"
#~ msgstr "Vendas e Gestão de MRP"
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index 7397edbec2b..a5043d3b7d5 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -20,7 +20,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class mrp_production(osv.osv):
_inherit = 'mrp.production'
diff --git a/addons/sale_order_dates/i18n/pt_BR.po b/addons/sale_order_dates/i18n/pt_BR.po
index 3ee3d52af19..29a7a97b76f 100644
--- a/addons/sale_order_dates/i18n/pt_BR.po
+++ b/addons/sale_order_dates/i18n/pt_BR.po
@@ -8,20 +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-07-28 19:51+0000\n"
+"PO-Revision-Date: 2012-12-18 00:54+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:51+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: sale_order_dates
#: view:sale.order:0
msgid "Dates"
-msgstr ""
+msgstr "Datas"
#. module: sale_order_dates
#: field:sale.order,commitment_date:0
@@ -41,7 +41,7 @@ msgstr "Data na qual a separação foi criada."
#. module: sale_order_dates
#: help:sale.order,requested_date:0
msgid "Date requested by the customer for the sale."
-msgstr ""
+msgstr "Data solicitada pelo cliente para a venda."
#. module: sale_order_dates
#: field:sale.order,requested_date:0
@@ -56,7 +56,7 @@ msgstr "Pedido de Venda"
#. module: sale_order_dates
#: help:sale.order,commitment_date:0
msgid "Committed date for delivery."
-msgstr ""
+msgstr "Data confirmada para a entrega."
#~ msgid "Order Reference must be unique !"
#~ msgstr "Referência de Pedido deve ser única !"
diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index 49e10eab787..d54eca88ca5 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -22,7 +22,7 @@
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from osv import fields, osv
+from openerp.osv import fields, osv
class sale_order_dates(osv.osv):
_inherit = 'sale.order'
diff --git a/addons/sale_stock/company.py b/addons/sale_stock/company.py
index b316269ac9a..67440ed6c67 100644
--- a/addons/sale_stock/company.py
+++ b/addons/sale_stock/company.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class company(osv.osv):
_inherit = 'res.company'
diff --git a/addons/sale_stock/i18n/nl.po b/addons/sale_stock/i18n/nl.po
index f43311cd0c8..91ac05d23a6 100644
--- a/addons/sale_stock/i18n/nl.po
+++ b/addons/sale_stock/i18n/nl.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:04+0000\n"
-"PO-Revision-Date: 2012-11-02 10:21+0000\n"
+"PO-Revision-Date: 2012-12-17 14:43+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:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: sale_stock
#: help:sale.config.settings,group_invoice_deli_orders:0
@@ -22,6 +22,9 @@ msgid ""
"To allow your salesman to make invoices for Delivery Orders using the menu "
"'Deliveries to Invoice'."
msgstr ""
+"Om uw verkoper rechten te geven om facturen te maken van uitgaande "
+"leveringen, gebruik makende van het menu \"Uitgaande leveringen te "
+"factureren\""
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:470
@@ -40,12 +43,14 @@ msgid ""
"Allows you to specify different delivery and invoice addresses on a sale "
"order."
msgstr ""
+"Geeft u de mogelijkheid om een afwijkend afleveradres en factuuradres te "
+"specificeren op een verkooporder."
#. module: sale_stock
#: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
#: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
msgid "Deliveries to Invoice"
-msgstr ""
+msgstr "Te factureren uitgaande leveringen"
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:569
@@ -93,6 +98,8 @@ msgstr "Bevestig"
msgid ""
"You must first cancel all delivery order(s) attached to this sales order."
msgstr ""
+"U dient eerst alle uitgaande leveringen, gekoppeld aan deze verkooporder, te "
+"annuleren."
#. module: sale_stock
#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
@@ -131,6 +138,8 @@ msgid ""
"You cannot make an advance on a sales order that is "
"defined as 'Automatic Invoice after delivery'."
msgstr ""
+"Het is niet mogelijk een vooruitbetaling te doen op een verkooporder welke "
+"is gekenmerkt als 'Automatische factuur na levering'"
#. module: sale_stock
#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
@@ -166,11 +175,15 @@ msgid ""
"prices.\n"
" This installs the module delivery."
msgstr ""
+"Geeft u de mogelijkheid om een levenswijze te koppelen aan een verkooporder "
+"en uitgaande levering.\n"
+" U kunt u eigen vervoerder en prijsstructuur maken.\n"
+" Dit installeert de module 'delivery'"
#. module: sale_stock
#: field:sale.config.settings,group_sale_delivery_address:0
msgid "Allow a different address for delivery and invoicing "
-msgstr ""
+msgstr "Sta een afwijkend adres voor afleveren en facturering toe "
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:571
@@ -275,7 +288,7 @@ msgstr "Standaard opties"
#. module: sale_stock
#: field:sale.config.settings,module_project_mrp:0
msgid "Project MRP"
-msgstr ""
+msgstr "Project MRP"
#. module: sale_stock
#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
@@ -319,7 +332,7 @@ msgstr ""
#. module: sale_stock
#: field:sale.config.settings,group_invoice_deli_orders:0
msgid "Generate invoices after and based on delivery orders"
-msgstr ""
+msgstr "Maak facturen na en gebaseerd op uitgaande leveringen."
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:473
@@ -348,16 +361,19 @@ msgid ""
"International Commercial Terms are a series of predefined commercial terms "
"used in international transactions."
msgstr ""
+"International Commercial Terms (INCOTERMS) zijn een set van "
+"voorgedefinieerde commerciële voorwaarden, welke worden gebruikt bij "
+"internationaal transport."
#. module: sale_stock
#: field:sale.config.settings,default_picking_policy:0
msgid "Deliver all at once when all products are available."
-msgstr ""
+msgstr "Lever alle producten tegelijk als deze beschikbaar zijn"
#. module: sale_stock
#: model:res.groups,name:sale_stock.group_invoice_deli_orders
msgid "Enable Invoicing Delivery orders"
-msgstr ""
+msgstr "Activeren van het factureren van uitgaande orders"
#. module: sale_stock
#: field:res.company,security_lead:0
@@ -374,12 +390,14 @@ msgstr "Verwerving van verkocht materiaal"
msgid ""
"Pick 'Deliver each product when available' if you allow partial delivery."
msgstr ""
+"selecteer de mogelijkheid 'Lever ieder product wanneer beschikbaar' indien u "
+"deelleveringen toestaat."
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:206
#, python-format
msgid "Cannot cancel sales order!"
-msgstr ""
+msgstr "Het is niet mogelijk de verkooporder te annuleren!"
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_sale_shop
@@ -403,7 +421,7 @@ msgstr "Waarden"
#. module: sale_stock
#: field:sale.config.settings,group_mrp_properties:0
msgid "Product properties on order lines"
-msgstr ""
+msgstr "Product eigenschappen van orderregel"
#. module: sale_stock
#: help:sale.config.settings,default_order_policy:0
@@ -461,6 +479,8 @@ msgid ""
"Number of days between the order confirmation and the shipping of the "
"products to the customer"
msgstr ""
+"Aantal dagen tussen het bevestigen van de order en het werkelijk leveren van "
+"de producten aan de klant."
#. module: sale_stock
#: help:sale.config.settings,default_picking_policy:0
@@ -469,6 +489,9 @@ msgid ""
"instead of delivering each product when it is available. This may have an "
"impact on the shipping price."
msgstr ""
+"Een verkooporder is standaard zo ingesteld dat alle producten in een keer "
+"worden geleverd, in plaats van het leveren van ieder product wanneer het "
+"beschikbaar is. Dit kan namelijk een impact hebben op de leveringskosten."
#. module: sale_stock
#: model:process.node,note:sale_stock.process_node_deliveryorder0
@@ -494,6 +517,9 @@ msgid ""
"In order to delete a confirmed sales order, you must cancel it.\n"
"To do so, you must first cancel related picking for delivery orders."
msgstr ""
+"Om een bevestigde verkooporder te verwijderen, dient u deze te annuleren.\n"
+"Om dit mogelijk te maken dient u eerst de gekoppelde uitgaande leveringen te "
+"annuleren."
#. module: sale_stock
#: field:sale.order.line,number_packages:0
@@ -514,11 +540,13 @@ msgstr "Maak factuur"
#: help:sale.config.settings,group_mrp_properties:0
msgid "Allows you to tag sale order lines with properties."
msgstr ""
+"Geeft u de mogelijkheid om een verkooporderregels te voorzien van een label "
+"met speciale kenmerken."
#. module: sale_stock
#: field:sale.config.settings,task_work:0
msgid "Prepare invoices based on task's activities"
-msgstr ""
+msgstr "Voorbereiden van facturen gebaseerd op taak activiteiten."
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
@@ -581,6 +609,8 @@ msgid ""
"This is a list of delivery orders that has been generated for this sales "
"order."
msgstr ""
+"Dit is een lijst van alle uitgaande orders welke zijn aangemaakt voor deze "
+"verkooporder."
#. module: sale_stock
#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
diff --git a/addons/sale_stock/i18n/pt_BR.po b/addons/sale_stock/i18n/pt_BR.po
index 95fbbfa4337..75bb1a50b2d 100644
--- a/addons/sale_stock/i18n/pt_BR.po
+++ b/addons/sale_stock/i18n/pt_BR.po
@@ -8,15 +8,15 @@ msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-09-21 14:04+0000\n"
+"PO-Revision-Date: 2012-12-18 01:14+0000\n"
"Last-Translator: Fábio Martinelli - http://zupy.com.br "
"\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:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: sale_stock
#: help:sale.config.settings,group_invoice_deli_orders:0
@@ -24,12 +24,14 @@ msgid ""
"To allow your salesman to make invoices for Delivery Orders using the menu "
"'Deliveries to Invoice'."
msgstr ""
+"Para permitir que o vendedor gere faturas nas ordens de entrega usando o "
+"menu 'Entregas para faturar'."
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:470
#, python-format
msgid "Delivery Order %sscheduled for %s."
-msgstr ""
+msgstr "Ordem de Entrega %sagendada para %s."
#. module: sale_stock
#: model:process.node,name:sale_stock.process_node_deliveryorder0
@@ -42,23 +44,25 @@ msgid ""
"Allows you to specify different delivery and invoice addresses on a sale "
"order."
msgstr ""
+"Permite especificar endereços de entrega e fatura diferentes em um pedido de "
+"venda."
#. module: sale_stock
#: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
#: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
msgid "Deliveries to Invoice"
-msgstr ""
+msgstr "Entregas para Faturar"
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:569
#, python-format
msgid "Picking Information ! : "
-msgstr "Informações de Separação ! : "
+msgstr "Informações de Separação! : "
#. module: sale_stock
#: model:process.node,name:sale_stock.process_node_packinglist0
msgid "Pick List"
-msgstr "Lista de Seleção"
+msgstr "Lista de Separação"
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:564
@@ -82,7 +86,7 @@ msgstr "Documento de movimento para a saída ou para o cliente."
#. module: sale_stock
#: field:sale.config.settings,group_multiple_shops:0
msgid "Manage multiple shops"
-msgstr ""
+msgstr "Gerenciar múltiplos estabelecimentos"
#. module: sale_stock
#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
@@ -95,6 +99,8 @@ msgstr "Validar"
msgid ""
"You must first cancel all delivery order(s) attached to this sales order."
msgstr ""
+"Você deve primeiro cancelar todas as ordens de entrega anexados a este "
+"pedido de vendas."
#. module: sale_stock
#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
@@ -119,7 +125,7 @@ msgstr ""
#: code:addons/sale_stock/sale_stock.py:640
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Erro!"
#. module: sale_stock
#: field:sale.order,picking_policy:0
@@ -133,6 +139,8 @@ msgid ""
"You cannot make an advance on a sales order that is "
"defined as 'Automatic Invoice after delivery'."
msgstr ""
+"Você não pode fazer uma antecipação em um pedido de vendas que está definido "
+"como 'Faturar automaticamente após a entrega'."
#. module: sale_stock
#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
@@ -153,12 +161,12 @@ msgstr "Movimentações de Estoque"
#: code:addons/sale_stock/sale_stock.py:161
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Ação Inválida!"
#. module: sale_stock
#: field:sale.config.settings,module_project_timesheet:0
msgid "Project Timesheet"
-msgstr ""
+msgstr "Planilha de Horas do Projeto"
#. module: sale_stock
#: help:sale.config.settings,module_delivery:0
@@ -168,18 +176,23 @@ msgid ""
"prices.\n"
" This installs the module delivery."
msgstr ""
+"Permite que você adicione métodos de entrega nos pedidos de venda e ordens "
+"de entrega.\n"
+" Você pode definir sua própria transportadora e redes de "
+"distribuição para os preços.\n"
+" Isso instala o módulo delivery."
#. module: sale_stock
#: field:sale.config.settings,group_sale_delivery_address:0
msgid "Allow a different address for delivery and invoicing "
-msgstr ""
+msgstr "Permite um endereço diferente para entrega e fatura "
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:571
#: code:addons/sale_stock/sale_stock.py:622
#, python-format
msgid "Configuration Error!"
-msgstr ""
+msgstr "Erro de Configuração!"
#. module: sale_stock
#: model:process.node,name:sale_stock.process_node_saleprocurement0
@@ -200,7 +213,7 @@ msgstr "Pedido de Venda"
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_stock_picking_out
msgid "Delivery Orders"
-msgstr ""
+msgstr "Ordens de Entrega"
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_sale_order_line
@@ -226,8 +239,8 @@ msgstr ""
msgid ""
"This is the days added to what you promise to customers for security purpose"
msgstr ""
-"Esta é a adição de dias aos que você promete para clientes, para fins de "
-"segurança."
+"Estes são os dias adicionados em que você comprometeu com clientes para fins "
+"de segurança"
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_stock_picking
@@ -237,7 +250,7 @@ msgstr "Lista de Separação"
#. module: sale_stock
#: field:sale.shop,warehouse_id:0
msgid "Warehouse"
-msgstr "Estoque"
+msgstr "Armazém"
#. module: sale_stock
#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
@@ -247,7 +260,7 @@ msgstr "Forçar Atribuição"
#. module: sale_stock
#: field:sale.config.settings,default_order_policy:0
msgid "The default invoicing method is"
-msgstr ""
+msgstr "O método padrão de fatura é"
#. module: sale_stock
#: field:sale.order.line,delay:0
@@ -257,12 +270,12 @@ msgstr "Prazo de Entrega"
#. module: sale_stock
#: view:sale.order:0
msgid "View Delivery Order"
-msgstr ""
+msgstr "Ver Ordem de Entrega"
#. module: sale_stock
#: selection:sale.config.settings,default_order_policy:0
msgid "Invoice based on sales orders"
-msgstr ""
+msgstr "Fatura baseada em pedidos de venda"
#. module: sale_stock
#: field:sale.order.line,move_ids:0
@@ -272,12 +285,12 @@ msgstr "Movimentação de Estoque"
#. module: sale_stock
#: view:sale.config.settings:0
msgid "Default Options"
-msgstr ""
+msgstr "Opções Padrão"
#. module: sale_stock
#: field:sale.config.settings,module_project_mrp:0
msgid "Project MRP"
-msgstr ""
+msgstr "Projeto MRP"
#. module: sale_stock
#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
@@ -321,23 +334,23 @@ msgstr ""
#. module: sale_stock
#: field:sale.config.settings,group_invoice_deli_orders:0
msgid "Generate invoices after and based on delivery orders"
-msgstr ""
+msgstr "Gerar faturas após e baseada em ordens de entrega"
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:473
#, python-format
msgid "Order delivered."
-msgstr ""
+msgstr "Pedido entregue."
#. module: sale_stock
#: field:sale.config.settings,module_delivery:0
msgid "Allow adding shipping costs"
-msgstr ""
+msgstr "Permite adicionar custos de entrega"
#. module: sale_stock
#: view:sale.order:0
msgid "days"
-msgstr ""
+msgstr "dias"
#. module: sale_stock
#: field:sale.order.line,product_packaging:0
@@ -350,16 +363,19 @@ msgid ""
"International Commercial Terms are a series of predefined commercial terms "
"used in international transactions."
msgstr ""
+"International Commercial Terms são uma série de termos comerciais pré-"
+"definidos utilizados em transações internacionais."
#. module: sale_stock
#: field:sale.config.settings,default_picking_policy:0
msgid "Deliver all at once when all products are available."
msgstr ""
+"Entregue tudo de uma vez quando todos os produtos estiverem disponíveis"
#. module: sale_stock
#: model:res.groups,name:sale_stock.group_invoice_deli_orders
msgid "Enable Invoicing Delivery orders"
-msgstr ""
+msgstr "Habilitar o Faturamento em Ordens de Entrega"
#. module: sale_stock
#: field:res.company,security_lead:0
@@ -376,17 +392,19 @@ msgstr "Compra de material vendido"
msgid ""
"Pick 'Deliver each product when available' if you allow partial delivery."
msgstr ""
+"Escolha 'Entregar cada produto quando disponível' se você permite entregas "
+"parciais."
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:206
#, python-format
msgid "Cannot cancel sales order!"
-msgstr ""
+msgstr "Não é possível cancelar pedidos de venda!"
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_sale_shop
msgid "Sales Shop"
-msgstr "Loja de Vendas"
+msgstr "Estabelecimento da Venda"
#. module: sale_stock
#: help:sale.order,shipped:0
@@ -405,15 +423,15 @@ msgstr "Propriedades"
#. module: sale_stock
#: field:sale.config.settings,group_mrp_properties:0
msgid "Product properties on order lines"
-msgstr ""
+msgstr "Propriedades do produto nas linhas do pedido"
#. module: sale_stock
#: help:sale.config.settings,default_order_policy:0
msgid ""
"You can generate invoices based on sales orders or based on shippings."
msgstr ""
-"Você pode gerar Notas Fiscais baseadas nos pedidos de venda ou baseada nos "
-"embarques."
+"Você pode gerar Notas Fiscais baseadas nos pedidos de venda ou baseada nas "
+"entregas."
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_sale_report
@@ -436,6 +454,13 @@ msgid ""
"lines.\n"
" This installs the modules project_timesheet and project_mrp."
msgstr ""
+"Permite transferir as entradas em tarefas definidas para a Gestão de "
+"Projetos\n"
+" As linhas de entrada na Planilha de horários para uma "
+"determinada data e determinado usuário com o efeito de criar, editar e "
+"excluir modos e cria automaticamente tarefas de projetos em linhas de "
+"aquisição.\n"
+" Isso instala os módulos project_timesheet e project_mrp."
#. module: sale_stock
#: model:process.node,note:sale_stock.process_node_saleprocurement0
@@ -455,7 +480,7 @@ msgstr "Designar"
#: code:addons/sale_stock/sale_stock.py:617
#, python-format
msgid "Not enough stock ! : "
-msgstr "Sem Estoque Suficiente ! : "
+msgstr "Sem Estoque Suficiente! : "
#. module: sale_stock
#: help:sale.order.line,delay:0
@@ -463,6 +488,8 @@ msgid ""
"Number of days between the order confirmation and the shipping of the "
"products to the customer"
msgstr ""
+"Número de dias entre a confirmação do pedido e a entrega dos produtos ao "
+"cliente"
#. module: sale_stock
#: help:sale.config.settings,default_picking_policy:0
@@ -471,11 +498,14 @@ msgid ""
"instead of delivering each product when it is available. This may have an "
"impact on the shipping price."
msgstr ""
+"Pedidos de Venda, por padrão serão configurados para entregar todos os "
+"produtos de uma vez ao invés de cada produto quando disponível. Isto pode "
+"impactar no valor da entrega."
#. module: sale_stock
#: model:process.node,note:sale_stock.process_node_deliveryorder0
msgid "Document of the move to the customer."
-msgstr "Documento de mudança para o cliente."
+msgstr "Documento de entrega para o cliente."
#. module: sale_stock
#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
@@ -496,6 +526,9 @@ msgid ""
"In order to delete a confirmed sales order, you must cancel it.\n"
"To do so, you must first cancel related picking for delivery orders."
msgstr ""
+"Para excluir um pedido de vendas confirmado, você precisa cancelá-lo.\n"
+"Para fazer isto, primeiro cancele a separação relacionada nas ordens de "
+"entrega."
#. module: sale_stock
#: field:sale.order.line,number_packages:0
@@ -510,17 +543,17 @@ msgstr "Entregue"
#. module: sale_stock
#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
msgid "Create Invoice"
-msgstr "Criar Nota Fiscal"
+msgstr "Criar Fatura"
#. module: sale_stock
#: help:sale.config.settings,group_mrp_properties:0
msgid "Allows you to tag sale order lines with properties."
-msgstr ""
+msgstr "Permite você marcar linhas do pedido de vendas com propriedades."
#. module: sale_stock
#: field:sale.config.settings,task_work:0
msgid "Prepare invoices based on task's activities"
-msgstr ""
+msgstr "Prepare faturas baseadas em atividades das tarefas"
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
@@ -544,13 +577,13 @@ msgstr "(n/a)"
#. module: sale_stock
#: field:sale.order,incoterm:0
msgid "Incoterm"
-msgstr "Forma de Entrega"
+msgstr "Incoterm"
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:521
#, python-format
msgid "Cannot cancel sales order line!"
-msgstr ""
+msgstr "Não é possível cancelar a linha do pedido de vendas!"
#. module: sale_stock
#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
@@ -575,7 +608,7 @@ msgstr "Separações Relacionadas"
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_sale_config_settings
msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
#. module: sale_stock
#: help:sale.order,picking_ids:0
@@ -583,6 +616,8 @@ msgid ""
"This is a list of delivery orders that has been generated for this sales "
"order."
msgstr ""
+"Esta é uma lista das ordens de entrega que foram geradas para este pedido de "
+"vendas."
#. module: sale_stock
#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
@@ -612,12 +647,12 @@ msgstr ""
#. module: sale_stock
#: view:sale.order:0
msgid "Recreate Delivery Order"
-msgstr ""
+msgstr "Recriar Ordem de Entrega"
#. module: sale_stock
#: help:sale.config.settings,group_multiple_shops:0
msgid "This allows to configure and use multiple shops."
-msgstr ""
+msgstr "Isto permite configurar e usar múltiplos estabelecimentos."
#. module: sale_stock
#: field:sale.order,picked_rate:0
@@ -632,7 +667,7 @@ msgstr "Entrega cada produto quando disponível"
#. module: sale_stock
#: model:process.transition,name:sale_stock.process_transition_packing0
msgid "Create Pick List"
-msgstr "Criar lista de Opções"
+msgstr "Criar Lista de Separação"
#. module: sale_stock
#: model:process.transition,note:sale_stock.process_transition_deliver0
diff --git a/addons/sale_stock/report/sale_report.py b/addons/sale_stock/report/sale_report.py
index a523c0551f2..ade84b269e6 100644
--- a/addons/sale_stock/report/sale_report.py
+++ b/addons/sale_stock/report/sale_report.py
@@ -19,8 +19,8 @@
#
##############################################################################
-from osv import fields, osv
-import tools
+from openerp.osv import fields, osv
+from openerp import tools
class sale_report(osv.osv):
_inherit = "sale.report"
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
index 43e1cfc6778..53cb0c2b8fa 100644
--- a/addons/sale_stock/res_config.py
+++ b/addons/sale_stock/res_config.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields, osv
-import pooler
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import pooler
+from openerp.tools.translate import _
class sale_configuration(osv.osv_memory):
_inherit = 'sale.config.settings'
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 49645364473..99967a432e4 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -20,11 +20,11 @@
#
##############################################################################
from datetime import datetime, timedelta
-from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
from dateutil.relativedelta import relativedelta
-from osv import fields, osv
-import netsvc
-from tools.translate import _
+from openerp.osv import fields, osv
+from openerp import netsvc
+from openerp.tools.translate import _
class sale_shop(osv.osv):
_inherit = "sale.shop"
@@ -266,7 +266,7 @@ class sale_order(osv.osv):
def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
return {
- 'name': line.name.split('\n')[0],
+ 'name': line.name,
'origin': order.name,
'date_planned': date_planned,
'product_id': line.product_id.id,
@@ -280,14 +280,14 @@ class sale_order(osv.osv):
'procure_method': line.type,
'move_id': move_id,
'company_id': order.company_id.id,
- 'note': '\n'.join(line.name.split('\n')[1:])
+ 'note': line.name,
}
def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):
location_id = order.shop_id.warehouse_id.lot_stock_id.id
output_id = order.shop_id.warehouse_id.lot_output_id.id
return {
- 'name': line.name.split('\n')[0][:250],
+ 'name': line.name,
'picking_id': picking_id,
'product_id': line.product_id.id,
'date': date_planned,
@@ -305,7 +305,6 @@ class sale_order(osv.osv):
'tracking_id': False,
'state': 'draft',
#'state': 'waiting',
- 'note': '\n'.join(line.name.split('\n')[1:]),
'company_id': order.company_id.id,
'price_unit': line.product_id.standard_price or 0.0
}
diff --git a/addons/sale_stock/stock.py b/addons/sale_stock/stock.py
index a06be3af6de..d569b51fe85 100644
--- a/addons/sale_stock/stock.py
+++ b/addons/sale_stock/stock.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import osv, fields
+from openerp.osv import fields, osv
class stock_move(osv.osv):
_inherit = 'stock.move'
diff --git a/addons/share/i18n/pl.po b/addons/share/i18n/pl.po
index cd59e473988..0279f8908c9 100644
--- a/addons/share/i18n/pl.po
+++ b/addons/share/i18n/pl.po
@@ -8,20 +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: 2011-04-03 11:52+0000\n"
+"PO-Revision-Date: 2012-12-17 19:48+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n"
"Language-Team: Polish \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:47+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: share
#: code:addons/share/wizard/share_wizard.py:837
#, python-format
msgid "Invitation to collaborate about %s"
-msgstr ""
+msgstr "Zaproszenie do współpracy przy %s"
#. module: share
#: code:addons/share/wizard/share_wizard.py:775
@@ -29,42 +29,44 @@ msgstr ""
msgid ""
"The share engine has not been able to fetch a record_id for your invitation."
msgstr ""
+"Funkcjonalność współdzielenia nie może pobrać record_id dla twojego "
+"zaproszenia."
#. module: share
#: view:share.wizard:0
msgid "Include an Optional Personal Message"
-msgstr ""
+msgstr "Wstaw opcjonalną wiadomość osobistą."
#. module: share
#: field:share.wizard,embed_option_title:0
msgid "Display title"
-msgstr ""
+msgstr "Wyświetl tytuł"
#. module: share
#: view:share.wizard:0
msgid "Access granted!"
-msgstr ""
+msgstr "Dostęp zagwarantowany!"
#. module: share
#: field:share.wizard,record_name:0
msgid "Record name"
-msgstr ""
+msgstr "Nazwa rekordu"
#. module: share
#: help:share.wizard,message:0
msgid ""
"An optional personal message, to be included in the email notification."
-msgstr ""
+msgstr "Opcjonalna wiadomość osobista do włączenia w powiadomienie mailowe."
#. module: share
#: field:share.wizard,user_type:0
msgid "Sharing method"
-msgstr ""
+msgstr "Metoda współdzielenia"
#. module: share
#: field:share.wizard,name:0
msgid "Share Title"
-msgstr ""
+msgstr "Współdziel tytuł"
#. module: share
#: code:addons/share/wizard/share_wizard.py:843
@@ -76,11 +78,15 @@ msgid ""
" %s\n"
"\n"
msgstr ""
+"Dokumenty nie są załączone. Możesz je oglądać bezpośrednio na naszym "
+"serwerze OpenERP jako:\n"
+" %s\n"
+"\n"
#. module: share
#: model:ir.module.category,name:share.module_category_share
msgid "Sharing"
-msgstr ""
+msgstr "Współdzielenie"
#. module: share
#: code:addons/share/wizard/share_wizard.py:838
@@ -90,60 +96,65 @@ msgid ""
"Hello,\n"
"\n"
msgstr ""
+"Witaj,\n"
+"\n"
#. module: share
#: field:share.wizard,share_root_url:0
msgid "Share Access URL"
-msgstr ""
+msgstr "URL dostępu"
#. module: share
#: field:share.wizard,email_1:0
#: field:share.wizard,email_2:0
#: field:share.wizard,email_3:0
msgid "New user email"
-msgstr ""
+msgstr "Mail nowego użytkownika"
#. module: share
#: code:addons/share/wizard/share_wizard.py:882
#, python-format
msgid "You may use your current login (%s) and password to view them.\n"
-msgstr ""
+msgstr "Możesz stosować swój obecny login (%s) i hasło do oglądania.\n"
#. module: share
#: code:addons/share/wizard/share_wizard.py:616
#, python-format
msgid "(Modified)"
-msgstr ""
+msgstr "(Zmodyfikowano)"
#. module: share
#: code:addons/share/wizard/share_wizard.py:660
#, python-format
msgid "You must be a member of the Share/User group to use the share wizard."
msgstr ""
+"Musisz być członkiem grupy Share/User group do stosowania kreatora "
+"współdzielenia."
#. module: share
#: code:addons/share/wizard/share_wizard.py:594
#, python-format
msgid "Sharing filter created by user %s (%s) for group %s"
msgstr ""
+"Filtr współdzielenia utworzony przez użytkownika %s (%s) dla grupy %s"
#. module: share
#: field:share.wizard,embed_url:0
#: field:share.wizard.result.line,share_url:0
msgid "Share URL"
-msgstr ""
+msgstr "URL współdzielenia"
#. module: share
#: code:addons/share/wizard/share_wizard.py:844
#: code:addons/share/wizard/share_wizard.py:876
#, python-format
msgid "These are your credentials to access this protected area:\n"
-msgstr ""
+msgstr "To są twoje dane dostępu do przestrzeni zastrzeżonej:\n"
#. module: share
#: view:share.wizard:0
msgid "Access info"
-msgstr ""
+msgstr "Informacja o dostępie"
#. module: share
#: view:share.wizard:0
@@ -154,19 +165,19 @@ msgstr "Udostępnij"
#: code:addons/share/wizard/share_wizard.py:566
#, python-format
msgid "(Duplicated for modified sharing permissions)"
-msgstr ""
+msgstr "(Zduplikowane dla zmodyfikowanych praw współdzielenia)"
#. module: share
#: code:addons/share/wizard/share_wizard.py:664
#, python-format
msgid ""
"Please indicate the emails of the persons to share with, one per line."
-msgstr ""
+msgstr "Wprowadź maile osób do współdzielenia, każdy w osobnym wierszu."
#. module: share
#: help:share.wizard,domain:0
msgid "Optional domain for further data filtering"
-msgstr ""
+msgstr "Opcjonalna domena do dalszego filtrowania"
#. module: share
#: view:share.wizard:0
@@ -177,7 +188,7 @@ msgstr "Następne"
#: code:addons/share/wizard/share_wizard.py:657
#, python-format
msgid "Action and Access Mode are required to create a shared access."
-msgstr ""
+msgstr "Akcja i Tryb dostępu są wymagane do tworzenia dostępu."
#. module: share
#: code:addons/share/wizard/share_wizard.py:845
@@ -189,24 +200,24 @@ msgstr "Nazwa użytkownika:"
#. module: share
#: view:share.wizard:0
msgid "Sharing Options"
-msgstr ""
+msgstr "Opcje współdzielenia"
#. module: share
#. openerp-web
#: code:addons/share/static/src/xml/share.xml:9
#, python-format
msgid "Invite"
-msgstr ""
+msgstr "Zaproś"
#. module: share
#: view:share.wizard:0
msgid "Embedded code options"
-msgstr ""
+msgstr "Opcje zagnieżdżonego kodu"
#. module: share
#: view:share.wizard:0
msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracja"
#. module: share
#: view:share.wizard:0
@@ -214,18 +225,19 @@ msgid ""
"Please select the action that opens the screen containing the data you want "
"to share."
msgstr ""
+"Wybierz akcję, która otwiera ekran zawierający dane do współdzielenia."
#. module: share
#: field:res.groups,share:0
msgid "Share Group"
-msgstr ""
+msgstr "Grupa współdzielenia"
#. module: share
#: code:addons/share/wizard/share_wizard.py:830
#: code:addons/share/wizard/share_wizard.py:861
#, python-format
msgid "Email required"
-msgstr ""
+msgstr "Wymagany email"
#. module: share
#: view:share.wizard:0
@@ -233,11 +245,13 @@ msgid ""
"Optionally, you may specify an additional domain restriction that will be "
"applied to the shared data."
msgstr ""
+"Opcjonalnie możesz podać domenę ograniczającą, która będzie zastosowana do "
+"współdzielonych danych."
#. module: share
#: view:res.groups:0
msgid "Non-Share Groups"
-msgstr ""
+msgstr "Grupy nie biorące udziału"
#. module: share
#: view:share.wizard:0
@@ -245,12 +259,13 @@ msgid ""
"An email notification with instructions has been sent to the following "
"people:"
msgstr ""
+"Mail powiadamiający z instrukcjami został wysłany do następujących ludzi:"
#. module: share
#: code:addons/share/wizard/share_wizard.py:77
#, python-format
msgid "Direct link or embed code"
-msgstr ""
+msgstr "Link bezpośredni lub kod zagnieżdżony"
#. module: share
#: code:addons/share/wizard/share_wizard.py:851
@@ -265,78 +280,81 @@ msgstr ""
#. module: share
#: field:share.wizard,action_id:0
msgid "Action to share"
-msgstr ""
+msgstr "Akcja do współdzielenia"
#. module: share
#: help:share.wizard,record_name:0
msgid "Name of the shared record, if sharing a precise record"
-msgstr ""
+msgstr "Nazwa współdzielonego rekordu, jeśli udostępniasz konkretny rekord."
#. module: share
#: field:res.users,share:0
msgid "Share User"
-msgstr ""
+msgstr "Użytkownik do współdzielenia"
#. module: share
#: field:share.wizard.result.line,user_id:0
msgid "unknown"
-msgstr ""
+msgstr "nieznane"
#. module: share
#: code:addons/share/wizard/share_wizard.py:61
#: code:addons/share/wizard/share_wizard.py:652
#, python-format
msgid "Sharing access cannot be created."
-msgstr ""
+msgstr "Nie można utworzyć dostępu współdzielenia."
#. module: share
#: code:addons/share/wizard/share_wizard.py:775
#, python-format
msgid "Record id not found"
-msgstr ""
+msgstr "Nie znaleziono id rekordu"
#. module: share
#: help:res.groups,share:0
msgid "Group created to set access rights for sharing data with some users."
-msgstr ""
+msgstr "Grupy utworzone do ustawiania dostępu do współdzielonych danych."
#. module: share
#: view:res.groups:0
msgid "Share Groups"
-msgstr ""
+msgstr "Grupy do współdzielenia"
#. module: share
#: help:share.wizard,action_id:0
msgid ""
"The action that opens the screen containing the data you wish to share."
-msgstr ""
+msgstr "Akcja otwierająca ekran zawierający udostępnione dane."
#. module: share
#: code:addons/share/wizard/share_wizard.py:541
#, python-format
msgid "(Copy for sharing)"
-msgstr ""
+msgstr "(Kopia do udostępnienia)"
#. module: share
#: field:share.wizard.result.line,newly_created:0
msgid "Newly created"
-msgstr ""
+msgstr "Nowo utworzone"
#. module: share
#: help:share.wizard,name:0
msgid "Title for the share (displayed to users as menu and shortcut name)"
msgstr ""
+"Tytuł dla współdzielenia (wyświetlany użytkownikom jako menu i nazwa skrótu)"
#. module: share
#: code:addons/share/wizard/share_wizard.py:631
#, python-format
msgid "Indirect sharing filter created by user %s (%s) for group %s"
msgstr ""
+"Niebezpośredni filtr współdzielenia utworzony przez użytkownika %s (%s) dla "
+"grupy %s"
#. module: share
#: help:share.wizard,share_root_url:0
msgid "Main access page for users that are granted shared access"
-msgstr ""
+msgstr "Strona głownego dostępu dla użytkowników, którym udostępniono dane"
#. module: share
#: code:addons/share/wizard/share_wizard.py:206
@@ -345,11 +363,13 @@ msgid ""
"You must configure your email address in the user preferences before using "
"the Share button."
msgstr ""
+"Musisz skonfigurować swój adres mailowy w preferencjach użytkownika przed "
+"zastosowaniem przycisku Udostępnij."
#. module: share
#: model:res.groups,name:share.group_share_user
msgid "User"
-msgstr ""
+msgstr "Użytkownik"
#. module: share
#: code:addons/share/wizard/share_wizard.py:653
@@ -359,11 +379,14 @@ msgid ""
"supported at the moment.\n"
"You may want to try a simpler filter."
msgstr ""
+"Przepraszamy, bieżący ekran i filtr, które próbujesz udostępnić nie są teraz "
+"obsługiwane.\n"
+"Może spróbujesz prostszy filtr."
#. module: share
#: view:share.wizard:0
msgid "Use this link"
-msgstr ""
+msgstr "Stosuj ten link"
#. module: share
#: code:addons/share/wizard/share_wizard.py:847
@@ -375,7 +398,7 @@ msgstr "Baza danych"
#. module: share
#: view:share.wizard:0
msgid "Share with these People (one email per line)"
-msgstr ""
+msgstr "Udostępnij tym ludziom (jeden adres w wierszu)"
#. module: share
#: field:share.wizard,domain:0
@@ -398,28 +421,31 @@ msgstr "Podsumowanie"
msgid ""
"Embed this code in your documents to provide a link to the shared document."
msgstr ""
+"Zagnieźdź ten kod w twoim dokumencie, aby dostarczyć link do udostępnionego "
+"dokumentu."
#. module: share
#: code:addons/share/wizard/share_wizard.py:508
#, python-format
msgid "Copied access for sharing"
-msgstr ""
+msgstr "Skopiowany dostęp do udostępnienia"
#. module: share
#: code:addons/share/wizard/share_wizard.py:812
#, python-format
msgid "Invitation"
-msgstr ""
+msgstr "Zaproszenie"
#. module: share
#: model:ir.actions.act_window,name:share.action_share_wizard_step1
msgid "Share your documents"
-msgstr ""
+msgstr "Udostępnij swoje dokumenty"
#. module: share
#: view:share.wizard:0
msgid "Or insert the following code where you want to embed your documents"
msgstr ""
+"Lub wstaw następujący kod w miejscu, gdzie chcesz zagnieździć swój dokument"
#. module: share
#: code:addons/share/wizard/share_wizard.py:881
@@ -428,6 +454,8 @@ msgid ""
"The documents have been automatically added to your current OpenERP "
"documents.\n"
msgstr ""
+"Dokumenty zostały automatycznie dodane do twoich beiżacych dokumentów "
+"OpenERP.\n"
#. module: share
#: model:ir.model,name:share.model_share_wizard_result_line
@@ -437,12 +465,12 @@ msgstr ""
#. module: share
#: field:share.wizard,embed_code:0
msgid "Code"
-msgstr ""
+msgstr "Kod"
#. module: share
#: help:share.wizard,user_type:0
msgid "Select the type of user(s) you would like to share data with."
-msgstr ""
+msgstr "Wybierz typ użytkowników, którym chcesz udostępnić dane."
#. module: share
#: code:addons/share/wizard/share_wizard.py:839
@@ -451,21 +479,23 @@ msgid ""
"I have shared %s (%s) with you!\n"
"\n"
msgstr ""
+"Udostępniłem Pani/Panu %s (%s) !\n"
+"\n"
#. module: share
#: field:share.wizard,view_type:0
msgid "Current View Type"
-msgstr ""
+msgstr "Bieżący typ widoku"
#. module: share
#: selection:share.wizard,access_mode:0
msgid "Can view"
-msgstr ""
+msgstr "Może widzieć"
#. module: share
#: selection:share.wizard,access_mode:0
msgid "Can edit"
-msgstr ""
+msgstr "Może edytować"
#. module: share
#: view:share.wizard:0
@@ -478,19 +508,21 @@ msgid ""
"External user with limited access, created only for the purpose of sharing "
"data."
msgstr ""
+"Zewnętrzny użytkownik z ograniczonymi prawami. Utworzony tylko do "
+"udostępnienia danych współdzielonych."
#. module: share
#: model:ir.actions.act_window,name:share.action_share_wizard
#: model:ir.model,name:share.model_share_wizard
#: field:share.wizard.result.line,share_wizard_id:0
msgid "Share Wizard"
-msgstr ""
+msgstr "Kreator udostępniania"
#. module: share
#: code:addons/share/wizard/share_wizard.py:788
#, python-format
msgid "Shared access created!"
-msgstr ""
+msgstr "Utworzono dostęp do współdzielenia!"
#. module: share
#: model:res.groups,comment:share.group_share_user
@@ -499,6 +531,10 @@ msgid ""
"Members of this groups have access to the sharing wizard, which allows them "
"to invite external users to view or edit some of their documents."
msgstr ""
+"\n"
+"Członkowie tej grupy mają dostęp do kreatora współdzielenia (udostępniania), "
+"który pozwala im zapraszać użytkowników zewnętrznych do oglądania lub "
+"edytowania niektórych ich dokumentów."
#. module: share
#: code:addons/share/wizard/share_wizard.py:848
@@ -507,11 +543,13 @@ msgid ""
"The documents have been automatically added to your subscriptions.\n"
"\n"
msgstr ""
+"Dokumenty zostały dodane automatycznie do twoich subskrypcji.\n"
+"\n"
#. module: share
#: model:ir.model,name:share.model_res_users
msgid "Users"
-msgstr ""
+msgstr "Użytkownicy"
#. module: share
#: code:addons/share/wizard/share_wizard.py:871
@@ -520,16 +558,18 @@ msgid ""
"I've shared %s with you!\n"
"\n"
msgstr ""
+"Udostępniłem Pani/Panu %s !\n"
+"\n"
#. module: share
#: model:ir.model,name:share.model_res_groups
msgid "Access Groups"
-msgstr ""
+msgstr "Grupy dostępu"
#. module: share
#: field:share.wizard,invite:0
msgid "Invite users to OpenSocial record"
-msgstr ""
+msgstr "Zaproś użytkowników do rekordu OpenSocial"
#. module: share
#: code:addons/share/wizard/share_wizard.py:846
@@ -544,17 +584,17 @@ msgstr "Hasło"
#: field:share.wizard,new_users:0
#, python-format
msgid "Emails"
-msgstr ""
+msgstr "Emaile"
#. module: share
#: field:share.wizard,embed_option_search:0
msgid "Display search view"
-msgstr ""
+msgstr "Wyświetla widok wyszukiwania"
#. module: share
#: field:share.wizard,message:0
msgid "Personal Message"
-msgstr ""
+msgstr "Wiadomość prywatna"
#. module: share
#: code:addons/share/wizard/share_wizard.py:830
@@ -564,32 +604,34 @@ msgid ""
"The current user must have an email address configured in User Preferences "
"to be able to send outgoing emails."
msgstr ""
+"Użytkownik musi mieć adres mailowy skonfigurowany w Preferencjach "
+"użytkownika, aby mógł wysyłać maile."
#. module: share
#: code:addons/share/wizard/share_wizard.py:205
#, python-format
msgid "No email address configured"
-msgstr ""
+msgstr "Brak skonfigurowanego adresu mailowego"
#. module: share
#: field:share.wizard.result.line,login:0
msgid "Login"
-msgstr ""
+msgstr "Logowanie"
#. module: share
#: view:res.users:0
msgid "Regular users only (no share user)"
-msgstr ""
+msgstr "Tylko użytkownicy regularni (nie zewnętrzni do współdzielenia)"
#. module: share
#: field:share.wizard,access_mode:0
msgid "Access Mode"
-msgstr ""
+msgstr "Tryb dostępu"
#. module: share
#: view:share.wizard:0
msgid "Sharing: preparation"
-msgstr ""
+msgstr "Współdzielenie: przygotowanie"
#. module: share
#: model:ir.model,name:share.model_ir_model_access
@@ -599,12 +641,12 @@ msgstr ""
#. module: share
#: view:share.wizard:0
msgid "or"
-msgstr ""
+msgstr "lub"
#. module: share
#: help:share.wizard,access_mode:0
msgid "Access rights to be granted on the shared documents."
-msgstr ""
+msgstr "Trzeba mieć prawa do udostępnionego dokumentu"
#~ msgid "Read & Write"
#~ msgstr "Do odczytu i zapisu"
diff --git a/addons/share/res_users.py b/addons/share/res_users.py
index db4184ce378..25fd25c234f 100644
--- a/addons/share/res_users.py
+++ b/addons/share/res_users.py
@@ -18,7 +18,7 @@
# along with this program. If not, see .
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_groups(osv.osv):
_name = "res.groups"
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 327efb9b9d8..aae13f66882 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -27,11 +27,11 @@ from openerp import SUPERUSER_ID
import simplejson
-import tools
-from osv import osv, fields
-from osv import expression
-from tools.translate import _
-from tools.safe_eval import safe_eval
+from openerp import tools
+from openerp.osv import fields, osv
+from openerp.osv import expression
+from openerp.tools.translate import _
+from openerp.tools.safe_eval import safe_eval
import openerp
_logger = logging.getLogger(__name__)
diff --git a/addons/stock/i18n/et.po b/addons/stock/i18n/et.po
index 41eb38842d7..9539b1ba140 100644
--- a/addons/stock/i18n/et.po
+++ b/addons/stock/i18n/et.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-05-10 17:33+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) \n"
+"PO-Revision-Date: 2012-12-17 18:08+0000\n"
+"Last-Translator: Ahti Hinnov \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:06+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-18 04:59+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
#. module: stock
#: field:stock.inventory.line.split,line_exist_ids:0
@@ -23,7 +23,7 @@ msgstr ""
#: field:stock.move.split,line_exist_ids:0
#: field:stock.move.split,line_ids:0
msgid "Serial Numbers"
-msgstr ""
+msgstr "Seerianumbrid"
#. module: stock
#: help:stock.config.settings,group_product_variant:0
@@ -57,12 +57,12 @@ msgstr ""
#: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
#: view:stock.change.product.qty:0
msgid "Update Product Quantity"
-msgstr ""
+msgstr "Uuenda toote kogust"
#. module: stock
#: field:stock.location,chained_location_id:0
msgid "Chained Location If Fixed"
-msgstr "Ahelasukoht kui fikseeritud"
+msgstr ""
#. module: stock
#: view:stock.inventory:0
@@ -332,7 +332,7 @@ msgstr ""
#. module: stock
#: view:product.product:0
msgid "Forecasted:"
-msgstr ""
+msgstr "Ennustatud:"
#. module: stock
#: view:stock.partial.move:0
@@ -2231,7 +2231,7 @@ msgstr "Vastuvõetud kogus"
#. module: stock
#: field:stock.production.lot,ref:0
msgid "Internal Reference"
-msgstr ""
+msgstr "Sisemine viide"
#. module: stock
#: help:stock.production.lot,prefix:0
@@ -3043,7 +3043,7 @@ msgstr ""
#. module: stock
#: field:stock.move,product_uos_qty:0
msgid "Quantity (UOS)"
-msgstr "Kogus (TÜ)"
+msgstr ""
#. module: stock
#: code:addons/stock/stock.py:1413
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 50b935319bb..9a77c3edf44 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.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-16 21:23+0000\n"
+"PO-Revision-Date: 2012-12-17 08:49+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \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-17 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 04:59+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: stock
@@ -5110,6 +5110,8 @@ msgid ""
"By default, the pack reference is generated following the sscc standard. "
"(Serial number + 1 check digit)"
msgstr ""
+"Domyślnie numer paczki jest generowany jako sssc . (Numer seryjny + 1 cyfra "
+"kontrolna)"
#. module: stock
#: model:ir.model,name:stock.model_stock_inventory
diff --git a/addons/stock/i18n/sl.po b/addons/stock/i18n/sl.po
index c8129c57e6f..2e7070620db 100644
--- a/addons/stock/i18n/sl.po
+++ b/addons/stock/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-14 23:44+0000\n"
+"PO-Revision-Date: 2012-12-17 16:13+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-16 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 04:59+0000\n"
"X-Generator: Launchpad (build 16372)\n"
#. module: stock
@@ -271,7 +271,7 @@ msgstr "Brezpredmetno"
#: help:stock.picking.in,message_unread:0
#: help:stock.picking.out,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Če je izbrano, zahtevajo nova sporočila vašo pozornost."
#. module: stock
#: help:stock.tracking,serial:0
@@ -382,7 +382,7 @@ msgstr "Združi po partnerjih"
#: help:stock.picking.in,move_type:0
#: help:stock.picking.out,move_type:0
msgid "It specifies goods to be deliver partially or all at once"
-msgstr ""
+msgstr "Določa ali bo blago dobavljeno delno ali v celoti"
#. module: stock
#: model:ir.model,name:stock.model_res_partner
@@ -819,7 +819,7 @@ msgstr ""
#: code:addons/stock/stock.py:1202
#, python-format
msgid "You cannot remove the picking which is in %s state!"
-msgstr ""
+msgstr "Ne morete odstraniti prevzema s statusom %s!"
#. module: stock
#: selection:report.stock.inventory,month:0
@@ -1045,7 +1045,7 @@ msgstr "Temu izdelku morate določiti serijsko številko."
#: code:addons/stock/stock.py:2326
#, python-format
msgid "Please define journal on the product category: \"%s\" (id: %d)"
-msgstr ""
+msgstr "Prosim, določite dnevnik na skupini izdelkov: \"%s\" (id: %d)"
#. module: stock
#: view:stock.move:0
@@ -1100,7 +1100,7 @@ msgstr ""
#. module: stock
#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
msgid "Create Draft Invoices"
-msgstr ""
+msgstr "Ustvari osnutke računov"
#. module: stock
#: help:stock.picking,location_id:0
@@ -1141,7 +1141,7 @@ msgstr "Zaloga po lokaciji"
#. module: stock
#: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
msgid "Receive/Deliver By Orders"
-msgstr ""
+msgstr "Prejem/dobava po nalogih"
#. module: stock
#: view:stock.production.lot:0
@@ -1220,7 +1220,7 @@ msgstr "Lokacija proizvodnje"
#: code:addons/stock/product.py:121
#, python-format
msgid "Please define journal on the product category: \"%s\" (id: %d)."
-msgstr ""
+msgstr "Prosim, določite dnevnik na skupini izdelkov: \"%s\" (id: %d)."
#. module: stock
#: field:report.stock.lines.date,date:0
@@ -3620,7 +3620,7 @@ msgstr "Računovodske vknjižbe"
#. module: stock
#: model:res.groups,name:stock.group_stock_manager
msgid "Manager"
-msgstr ""
+msgstr "Vodja"
#. module: stock
#: model:stock.location,name:stock.stock_location_intermediatelocation0
@@ -3635,7 +3635,7 @@ msgstr ""
#. module: stock
#: field:stock.change.standard.price,enable_stock_in_out_acc:0
msgid "Enable Related Account"
-msgstr ""
+msgstr "Omogoči povezani konto"
#. module: stock
#: field:stock.location.product,type:0
@@ -3733,7 +3733,7 @@ msgstr ""
#: model:ir.actions.act_window,name:stock.action_receive_move
#: view:product.product:0
msgid "Receptions"
-msgstr ""
+msgstr "Prevzemi"
#. module: stock
#: view:report.stock.move:0
@@ -3768,13 +3768,13 @@ msgstr ""
#: field:stock.move.consume,product_uom:0
#: field:stock.move.scrap,product_uom:0
msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Enota mere izdelka"
#. module: stock
#: code:addons/stock/stock.py:1426
#, python-format
msgid "Delivery order"
-msgstr ""
+msgstr "Dobavnica"
#. module: stock
#: view:stock.move:0
@@ -3789,7 +3789,7 @@ msgstr ""
#. module: stock
#: view:stock.move:0
msgid "Reason"
-msgstr ""
+msgstr "Vzrok"
#. module: stock
#: model:ir.model,name:stock.model_stock_partial_picking
@@ -3833,7 +3833,7 @@ msgstr ""
#: field:stock.picking.in,message_ids:0
#: field:stock.picking.out,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Sporočila"
#. module: stock
#: model:stock.location,name:stock.stock_location_8
@@ -3885,7 +3885,7 @@ msgstr ""
#: selection:stock.picking.in,state:0
#: selection:stock.picking.out,state:0
msgid "Cancelled"
-msgstr ""
+msgstr "Preklicano"
#. module: stock
#: view:stock.picking:0
@@ -4013,7 +4013,7 @@ msgstr ""
#: field:stock.picking.in,message_follower_ids:0
#: field:stock.picking.out,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Sledilci"
#. module: stock
#: code:addons/stock/stock.py:2655
@@ -4054,7 +4054,7 @@ msgstr ""
#: view:report.stock.move:0
#: field:report.stock.move,categ_id:0
msgid "Product Category"
-msgstr ""
+msgstr "Skupina izdelkov"
#. module: stock
#: code:addons/stock/stock.py:1407
@@ -4115,12 +4115,12 @@ msgstr ""
#: code:addons/stock/stock.py:773
#, python-format
msgid "Not enough stock, unable to reserve the products."
-msgstr ""
+msgstr "Nezadostna količina izdelkov na zalogi, rezervacija ni možna."
#. module: stock
#: view:report.stock.move:0
msgid "Outgoing"
-msgstr ""
+msgstr "Odhajajoča količina"
#. module: stock
#: help:stock.move,product_qty:0
@@ -4181,13 +4181,13 @@ msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_product_template
msgid "Product Template"
-msgstr ""
+msgstr "Predloga izdelka"
#. module: stock
#: selection:report.stock.inventory,month:0
#: selection:report.stock.move,month:0
msgid "December"
-msgstr ""
+msgstr "December"
#. module: stock
#: view:stock.production.lot:0
@@ -4237,7 +4237,7 @@ msgstr ""
#. module: stock
#: view:product.product:0
msgid "update"
-msgstr ""
+msgstr "posodobi"
#. module: stock
#: view:stock.change.product.qty:0
@@ -4256,7 +4256,7 @@ msgstr ""
#: view:stock.return.picking:0
#: view:stock.split.into:0
msgid "or"
-msgstr ""
+msgstr "ali"
#. module: stock
#: selection:stock.picking,invoice_state:0
@@ -4302,7 +4302,7 @@ msgstr ""
#. module: stock
#: report:stock.picking.list:0
msgid "Customer Address :"
-msgstr ""
+msgstr "Naslov kupca :"
#. module: stock
#: field:stock.location,chained_auto_packing:0
@@ -4398,7 +4398,7 @@ msgstr ""
#. module: stock
#: model:res.groups,name:stock.group_stock_user
msgid "User"
-msgstr ""
+msgstr "Uporabnik"
#. module: stock
#: field:stock.config.settings,module_stock_location:0
@@ -4415,7 +4415,7 @@ msgstr ""
#: selection:report.stock.inventory,month:0
#: selection:report.stock.move,month:0
msgid "November"
-msgstr ""
+msgstr "November"
#. module: stock
#: code:addons/stock/product.py:467
@@ -4433,7 +4433,7 @@ msgstr ""
#: field:stock.picking.out,message_comment_ids:0
#: help:stock.picking.out,message_comment_ids:0
msgid "Comments and emails"
-msgstr ""
+msgstr "Pripombe in e-pošta"
#. module: stock
#: field:stock.location,chained_company_id:0
@@ -4458,7 +4458,7 @@ msgstr ""
#: selection:report.stock.inventory,month:0
#: selection:report.stock.move,month:0
msgid "January"
-msgstr ""
+msgstr "Januar"
#. module: stock
#: constraint:stock.move:0
@@ -4556,7 +4556,7 @@ msgstr "Splošne informacije"
#. module: stock
#: field:stock.production.lot,prefix:0
msgid "Prefix"
-msgstr ""
+msgstr "Predpona"
#. module: stock
#: model:ir.actions.act_window,name:stock.track_line
@@ -4597,7 +4597,7 @@ msgstr "Ciljna lokacija"
#. module: stock
#: model:ir.actions.report.xml,name:stock.report_picking_list
msgid "Picking Slip"
-msgstr ""
+msgstr "Prevzemni list"
#. module: stock
#: help:stock.move,product_packaging:0
@@ -4624,7 +4624,7 @@ msgstr "Za"
#: selection:report.stock.inventory,month:0
#: selection:report.stock.move,month:0
msgid "October"
-msgstr ""
+msgstr "Oktober"
#. module: stock
#: view:stock.split.into:0
@@ -4634,7 +4634,7 @@ msgstr ""
#. module: stock
#: selection:stock.move,state:0
msgid "New"
-msgstr ""
+msgstr "Nov"
#. module: stock
#: view:report.stock.move:0
@@ -4657,7 +4657,7 @@ msgstr "Opis"
#: selection:report.stock.inventory,month:0
#: selection:report.stock.move,month:0
msgid "May"
-msgstr ""
+msgstr "Maj"
#. module: stock
#: code:addons/stock/product.py:110
@@ -4740,7 +4740,7 @@ msgstr "Stranka"
#: selection:report.stock.inventory,month:0
#: selection:report.stock.move,month:0
msgid "February"
-msgstr ""
+msgstr "Februar"
#. module: stock
#: model:ir.actions.act_window,help:stock.action_production_lot_form
@@ -4789,7 +4789,7 @@ msgstr ""
#: selection:report.stock.inventory,month:0
#: selection:report.stock.move,month:0
msgid "April"
-msgstr ""
+msgstr "April"
#. module: stock
#: view:report.stock.inventory:0
@@ -4860,7 +4860,7 @@ msgstr ""
#. module: stock
#: view:stock.picking.out:0
msgid "Print Delivery Slip"
-msgstr ""
+msgstr "Tiskanje dobavnice"
#. module: stock
#: view:report.stock.inventory:0
@@ -4868,7 +4868,7 @@ msgstr ""
#: view:report.stock.move:0
#: field:report.stock.move,year:0
msgid "Year"
-msgstr ""
+msgstr "Leto"
#. module: stock
#: model:stock.location,name:stock.stock_location_locations
diff --git a/addons/stock/partner.py b/addons/stock/partner.py
index 6cce00cf75c..f5f02b7cd19 100644
--- a/addons/stock/partner.py
+++ b/addons/stock/partner.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class res_partner(osv.osv):
_inherit = 'res.partner'
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 4d955495c28..3aed99c1dff 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -19,9 +19,9 @@
#
##############################################################################
-from osv import fields, osv
-from tools.translate import _
-import decimal_precision as dp
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
class product_product(osv.osv):
_inherit = "product.product"
@@ -530,7 +530,7 @@ class product_category(osv.osv):
_columns = {
'property_stock_journal': fields.property('account.journal',
relation='account.journal', type='many2one',
- string='Stock journal', view_load=True,
+ string='Stock Journal', view_load=True,
help="When doing real-time inventory valuation, this is the Accounting Journal in which entries will be automatically posted when stock moves are processed."),
'property_stock_account_input_categ': fields.property('account.account',
type='many2one', relation='account.account',
diff --git a/addons/stock/report/lot_overview.py b/addons/stock/report/lot_overview.py
index bf2fd32e32c..9d6626bbd14 100644
--- a/addons/stock/report/lot_overview.py
+++ b/addons/stock/report/lot_overview.py
@@ -18,9 +18,9 @@
# along with this program. If not, see .
#
##############################################################################
-import pooler
+from openerp import pooler
import time
-from report import report_sxw
+from openerp.report import report_sxw
class lot_overview(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/stock/report/lot_overview_all.py b/addons/stock/report/lot_overview_all.py
index 552949ec4b2..ca6611de89b 100644
--- a/addons/stock/report/lot_overview_all.py
+++ b/addons/stock/report/lot_overview_all.py
@@ -18,9 +18,9 @@
# along with this program. If not, see .
#
##############################################################################
-import pooler
+from openerp import pooler
import time
-from report import report_sxw
+from openerp.report import report_sxw
class lot_overview_all(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 711abbf6259..a33ec28cb35 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -20,9 +20,9 @@
##############################################################################
import time
-from report import report_sxw
-from osv import osv
-import pooler
+from openerp.report import report_sxw
+from openerp.osv import osv
+from openerp import pooler
class picking(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py
index 1d882ad632b..9ccda54b693 100644
--- a/addons/stock/report/product_stock.py
+++ b/addons/stock/report/product_stock.py
@@ -22,13 +22,13 @@
from datetime import datetime
from dateutil.relativedelta import relativedelta
-import osv
+from openerp import osv
import time
-from report.interface import report_int
-from report.render import render
+from openerp.report.interface import report_int
+from openerp.report.render import render
import stock_graph
-import pooler
+from openerp import pooler
import StringIO
class external_pdf(render):
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index 19fae806fc0..0aac0d6599b 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -19,10 +19,10 @@
#
##############################################################################
-from osv import osv, fields
-from tools.translate import _
-import tools
-from tools.sql import drop_view_if_exists
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import tools
+from openerp.tools.sql import drop_view_if_exists
class stock_report_prodlots(osv.osv):
_name = "stock.report.prodlots"
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index 4f8aedcd5a6..39591021735 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import tools
-from osv import fields,osv
-from decimal_precision import decimal_precision as dp
+from openerp import tools
+from openerp.osv import fields,osv
+from openerp.addons.decimal_precision import decimal_precision as dp
class report_stock_move(osv.osv):
diff --git a/addons/stock/report/stock_by_location.py b/addons/stock/report/stock_by_location.py
index 8ed8800fb29..7ca209c9ed2 100644
--- a/addons/stock/report/stock_by_location.py
+++ b/addons/stock/report/stock_by_location.py
@@ -19,9 +19,9 @@
#
##############################################################################
-import pooler
-from report.interface import report_rml
-from report.interface import toxml
+from openerp import pooler
+from openerp.report.interface import report_rml
+from openerp.report.interface import toxml
#FIXME: we should use toxml
diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py
index d92de2805b5..59b383b80e9 100644
--- a/addons/stock/report/stock_graph.py
+++ b/addons/stock/report/stock_graph.py
@@ -21,8 +21,8 @@
from pychart import *
import pychart.legend
import time
-from report.misc import choice_colors
-import tools
+from openerp.report.misc import choice_colors
+from openerp import tools
#
# Draw a graph for stocks
diff --git a/addons/stock/report/stock_inventory_move_report.py b/addons/stock/report/stock_inventory_move_report.py
index 762373f1250..21a7c458ecc 100644
--- a/addons/stock/report/stock_inventory_move_report.py
+++ b/addons/stock/report/stock_inventory_move_report.py
@@ -20,7 +20,7 @@
##############################################################################
import time
-from report import report_sxw
+from openerp.report import report_sxw
class stock_inventory_move(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index b150847153e..9653c284b4b 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from osv import fields, osv
+from openerp.osv import fields, osv
class stock_config_settings(osv.osv_memory):
_name = 'stock.config.settings'
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 8632901b50c..71c83344913 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -26,12 +26,12 @@ import time
from operator import itemgetter
from itertools import groupby
-from osv import fields, osv
-from tools.translate import _
-import netsvc
-import tools
-from tools import float_compare
-import decimal_precision as dp
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+from openerp import netsvc
+from openerp import tools
+from openerp.tools import float_compare
+import openerp.addons.decimal_precision as dp
import logging
_logger = logging.getLogger(__name__)
@@ -655,7 +655,7 @@ class stock_picking(osv.osv):
'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
store=True, type='datetime', string='Scheduled Time', select=1, help="Scheduled time for the shipment to be processed"),
'date': fields.datetime('Time', help="Creation time, usually the time of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
- 'date_done': fields.datetime('Date Done', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
+ 'date_done': fields.datetime('Date of Transfer', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
store=True, type='datetime', string='Max. Expected Date', select=2),
'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
@@ -1689,7 +1689,7 @@ class stock_move(osv.osv):
return True
_columns = {
- 'name': fields.char('Name', size=250, required=True, select=True),
+ 'name': fields.char('Description', required=True, select=True),
'priority': fields.selection([('0', 'Not urgent'), ('1', 'Urgent')], 'Priority'),
'create_date': fields.datetime('Creation Date', readonly=True, select=True),
'date': fields.datetime('Date', required=True, select=True, help="Move date: scheduled date until move is done, then date of actual move processing", states={'done': [('readonly', True)]}),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e0181d88a30..a559aad9aac 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -890,37 +890,37 @@
stock.picking.out
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-