diff --git a/addons/account/account.py b/addons/account/account.py index b77ddb17544..ebcf61edcf4 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -19,19 +19,19 @@ # ############################################################################## -import time +import logging from datetime import datetime from dateutil.relativedelta import relativedelta from operator import itemgetter +import time -import logging -import pooler -from osv import fields, osv -import decimal_precision as dp -from tools.translate import _ -from tools.float_utils import float_round from openerp import SUPERUSER_ID -import tools +from openerp import pooler, tools +from openerp.osv import fields, osv +from openerp.tools.translate import _ +from openerp.tools.float_utils import float_round + +import openerp.addons.decimal_precision as dp _logger = logging.getLogger(__name__) diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index 066f8d1abec..7120625d8ab 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -19,9 +19,9 @@ # ############################################################################## -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 account_analytic_line(osv.osv): _inherit = 'account.analytic.line' diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py index f0da630ec1d..f2bc9a5c9a1 100644 --- a/addons/account/account_bank.py +++ b/addons/account/account_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 class bank(osv.osv): _inherit = "res.partner.bank" diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index dc5dc504da4..58645536d66 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.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_bank_statement(osv.osv): def create(self, cr, uid, vals, context=None): diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index c1f30824461..a100c0e60ba 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -22,9 +22,9 @@ import time -from osv import osv, fields -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_cashbox_line(osv.osv): diff --git a/addons/account/account_financial_report.py b/addons/account/account_financial_report.py index 62bcf9dcbcd..28b5e08dc99 100644 --- a/addons/account/account_financial_report.py +++ b/addons/account/account_financial_report.py @@ -24,11 +24,11 @@ from datetime import datetime 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.translate import _ +from openerp import netsvc +from openerp import pooler +from openerp.osv import fields, osv +import openerp.addons.decimal_precision as dp +from openerp.tools.translate import _ # --------------------------------------------------------- # Account Financial Report diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 1404c2f0633..1e345cd9913 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -21,12 +21,12 @@ import time from lxml import etree -import decimal_precision as dp +import openerp.addons.decimal_precision as dp -import netsvc -import pooler -from osv import fields, osv, orm -from tools.translate import _ +from openerp import netsvc +from openerp import pooler +from openerp.osv import fields, osv, orm +from openerp.tools.translate import _ class account_invoice(osv.osv): def _amount_all(self, cr, uid, ids, name, args, context=None): diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 25c898f6c0d..94febb12bb1 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -26,11 +26,11 @@ from operator import itemgetter from lxml import etree -import netsvc -from osv import fields, osv, orm -from tools.translate import _ -import decimal_precision as dp -import tools +from openerp import netsvc +from openerp.osv import fields, osv, orm +from openerp.tools.translate import _ +import openerp.addons.decimal_precision as dp +from openerp import tools class account_move_line(osv.osv): _name = "account.move.line" diff --git a/addons/account/company.py b/addons/account/company.py index 409216f29f0..a4624ae5ad5 100644 --- a/addons/account/company.py +++ b/addons/account/company.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields, osv +from openerp.osv import fields, osv class res_company(osv.osv): _inherit = "res.company" diff --git a/addons/account/edi/invoice.py b/addons/account/edi/invoice.py index 3e27bc5ea99..91913920bac 100644 --- a/addons/account/edi/invoice.py +++ b/addons/account/edi/invoice.py @@ -18,9 +18,10 @@ # along with this program. If not, see . # ############################################################################## +from openerp.osv import osv, fields +from openerp.addons.edi import EDIMixin -from openerp.osv import osv -from edi import EDIMixin +from urllib import urlencode INVOICE_LINE_EDI_STRUCT = { 'name': True, @@ -258,6 +259,28 @@ class account_invoice(osv.osv, EDIMixin): pass return action + def _edi_paypal_url(self, cr, uid, ids, field, arg, context=None): + res = dict.fromkeys(ids, False) + for inv in self.browse(cr, uid, ids, context=context): + if inv.type == 'out_invoice' and inv.company_id.paypal_account: + params = { + "cmd": "_xclick", + "business": inv.company_id.paypal_account, + "item_name": inv.company_id.name + " Invoice " + inv.number, + "invoice": inv.number, + "amount": inv.residual, + "currency_code": inv.currency_id.name, + "button_subtype": "services", + "no_note": "1", + "bn": "OpenERP_Invoice_PayNow_" + inv.currency_id.name, + } + res[inv.id] = "https://www.paypal.com/cgi-bin/webscr?" + urlencode(params) + return res + + _columns = { + 'paypal_url': fields.function(_edi_paypal_url, type='char', string='Paypal Url'), + } + class account_invoice_line(osv.osv, EDIMixin): _inherit='account.invoice.line' diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml index c4b0c8103f1..18ac71f55ce 100644 --- a/addons/account/edi/invoice_action_data.xml +++ b/addons/account/edi/invoice_action_data.xml @@ -23,7 +23,7 @@ Invoice - Send by Email ${object.user_id.email or object.company_id.email or 'noreply@localhost'} - ${object.company_id.name} Invoice (Ref ${object.number or 'n/a' }) + ${object.company_id.name} Invoice (Ref ${object.number or 'n/a'}) ${object.partner_id.id} @@ -33,7 +33,7 @@ -

Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},

+

Hello ${object.partner_id.name},

A new invoice is available for you:

@@ -50,20 +50,10 @@ % endif

- % if object.company_id.paypal_account and object.type in ('out_invoice'): - <% - comp_name = quote(object.company_id.name) - inv_number = quote(object.number) - paypal_account = quote(object.company_id.paypal_account) - inv_amount = quote(str(object.residual)) - cur_name = quote(object.currency_id.name) - paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s&" \ - "invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Invoice_PayNow_%s" % \ - (paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name) - %> + % if object.paypal_url:

It is also possible to directly pay with Paypal:

- + % 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 += ''' - - - - - - - - - ''' % (currency.symbol) - total = 0 - for aml in currency_dict['line']: - block = aml['blocked'] and 'X' or ' ' - total += aml['balance'] - strbegin = "" - date = aml['date_maturity'] or aml['date'] - if date <= current_date and aml['balance'] > 0: - strbegin = "" - followup_table +="" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "" - total = rml_parse.formatLang(total, dp='Account', currency_obj=currency) - followup_table += ''' -
Invoice dateReferenceDue dateAmount (%s)Lit.
" - strend = "" - strend = "
-
Amount due: %s
''' % (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 += ''' + + + + + + + + + ''' % (currency.symbol) + total = 0 + for aml in currency_dict['line']: + block = aml['blocked'] and 'X' or ' ' + total += aml['balance'] + strbegin = "" + date = aml['date_maturity'] or aml['date'] + if date <= current_date and aml['balance'] > 0: + strbegin = "" + followup_table +="" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "" + total = rml_parse.formatLang(total, dp='Account', currency_obj=currency) + followup_table += ''' +
Invoice dateReferenceDue dateAmount (%s)Lit.
" + strend = "" + strend = "
+
Amount due: %s
''' % (total) + return followup_table + def action_done(self, cr, uid, ids, context=None): return self.write(cr, uid, ids, {'payment_next_action_date': False, 'payment_next_action':'', 'payment_responsible_id': False}, context=context) diff --git a/addons/account_followup/account_followup_data.xml b/addons/account_followup/account_followup_data.xml index 62ea7bce9c6..d7e6d029ae9 100644 --- a/addons/account_followup/account_followup_data.xml +++ b/addons/account_followup/account_followup_data.xml @@ -3,19 +3,19 @@ - - + + First polite 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},

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,

-${user.name | h} +${user.name}

-${ctx.get('followup_table','')} +${object.get_followup_table_html() | safe}
@@ -42,23 +42,21 @@ ${ctx.get('followup_table','')} ]]> - - - - + + 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,

-${user.name | h} +${user.name}

-${ctx.get('followup_table','')} +${object.get_followup_table_html() | safe}
]]> - + + Urging 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},

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,

-${user.name | h} +${user.name}

-${ctx.get('followup_table','')} +${object.get_followup_table_html() | safe}
@@ -121,19 +120,18 @@ ${ctx.get('followup_table','')} - - + Default payment follow-up reminder e-mail - ${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},

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 phone 3 @@ -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" +" " #. module: account_payment #: field:payment.line,currency:0 @@ -81,7 +89,7 @@ msgstr "Azienda" #. module: account_payment #: model:res.groups,name:account_payment.group_account_payment msgid "Accounting / Payments" -msgstr "" +msgstr "Contabilità / Pagamenti" #. module: account_payment #: selection:payment.line,state:0 @@ -97,7 +105,7 @@ msgstr "Movimenti" #. module: account_payment #: report:payment.order:0 msgid "Used Account" -msgstr "" +msgstr "Conto Usato" #. module: account_payment #: field:payment.line,ml_maturity_date:0 @@ -129,7 +137,7 @@ msgstr "" #: code:addons/account_payment/account_move_line.py:110 #, python-format msgid "Error!" -msgstr "" +msgstr "Errore!" #. module: account_payment #: report:payment.order:0 @@ -161,7 +169,7 @@ msgstr "Riferimento" #. module: account_payment #: sql_constraint:payment.line:0 msgid "The payment line name must be unique!" -msgstr "" +msgstr "La riga pagamento deve essere unica|" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree @@ -209,7 +217,7 @@ msgstr "Data fattura" #. module: account_payment #: report:payment.order:0 msgid "Execution Type" -msgstr "" +msgstr "Tipo esecuzione" #. module: account_payment #: selection:payment.line,state:0 @@ -219,7 +227,7 @@ msgstr "Strutturato" #. module: account_payment #: view:account.bank.statement:0 msgid "Import Payment Lines" -msgstr "" +msgstr "Importa righe pagamento" #. module: account_payment #: view:payment.line:0 @@ -258,7 +266,7 @@ msgstr "" #. module: account_payment #: field:payment.order,date_created:0 msgid "Creation Date" -msgstr "" +msgstr "Data creazione" #. module: account_payment #: help:payment.mode,journal:0 @@ -284,7 +292,7 @@ msgstr "Conto destinazione" #. module: account_payment #: view:payment.order:0 msgid "Search Payment Orders" -msgstr "" +msgstr "Cerca ordini di pagamento" #. module: account_payment #: field:payment.line,create_date:0 @@ -321,7 +329,7 @@ msgstr "Partner" #. module: account_payment #: field:payment.line,bank_statement_line_id:0 msgid "Bank statement line" -msgstr "" +msgstr "Riga estratto conto bancario" #. module: account_payment #: selection:payment.order,date_prefered:0 @@ -408,7 +416,7 @@ msgstr "" #. module: account_payment #: help:payment.line,info_partner:0 msgid "Address of the Ordering Customer." -msgstr "" +msgstr "Indirizzo del cliente ordinante" #. module: account_payment #: view:account.payment.populate.statement:0 @@ -429,7 +437,7 @@ msgstr "Righe pagamento" #. module: account_payment #: model:ir.model,name:account_payment.model_account_move_line msgid "Journal Items" -msgstr "" +msgstr "Voci sezionale" #. module: account_payment #: help:payment.line,move_line_id:0 @@ -446,7 +454,7 @@ msgstr "Cerca" #. module: account_payment #: field:payment.order,user_id:0 msgid "Responsible" -msgstr "" +msgstr "Responsabile" #. module: account_payment #: field:payment.line,date:0 @@ -461,7 +469,7 @@ msgstr "Totale:" #. module: account_payment #: field:payment.order,date_done:0 msgid "Execution Date" -msgstr "" +msgstr "Data esecuzione" #. module: account_payment #: view:account.payment.populate.statement:0 @@ -486,7 +494,7 @@ msgstr "Totale in valuta dell'azienda" #. module: account_payment #: help:payment.line,partner_id:0 msgid "The Ordering Customer" -msgstr "" +msgstr "Il cliente ordinante" #. module: account_payment #: model:ir.model,name:account_payment.model_account_payment_make_payment @@ -541,7 +549,7 @@ msgstr "Annulla" #. module: account_payment #: field:payment.line,bank_id:0 msgid "Destination Bank Account" -msgstr "" +msgstr "Conto bancario di destinazione" #. module: account_payment #: view:payment.line:0 @@ -579,7 +587,7 @@ msgstr "Comunicazione 2" #. module: account_payment #: field:payment.order,date_scheduled:0 msgid "Scheduled Date" -msgstr "" +msgstr "Data pianificata" #. module: account_payment #: view:account.payment.make.payment:0 @@ -600,7 +608,7 @@ msgstr "Conto bancario" #. module: account_payment #: view:payment.order:0 msgid "Confirm Payments" -msgstr "" +msgstr "Conferma pagamenti" #. module: account_payment #: field:payment.line,company_currency:0 @@ -618,12 +626,12 @@ msgstr "Pagamento" #. module: account_payment #: report:payment.order:0 msgid "Payment Order / Payment" -msgstr "" +msgstr "Ordine pagamento / Pagamento" #. module: account_payment #: field:payment.line,move_line_id:0 msgid "Entry line" -msgstr "" +msgstr "Registrazione" #. module: account_payment #: help:payment.line,communication:0 @@ -653,7 +661,7 @@ msgstr "" #. module: account_payment #: model:ir.model,name:account_payment.model_payment_order_create msgid "payment.order.create" -msgstr "" +msgstr "payment.order.create" #. module: account_payment #: field:payment.line,order_id:0 @@ -669,7 +677,7 @@ msgstr "Totale" #: view:account.payment.make.payment:0 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment msgid "Make Payment" -msgstr "" +msgstr "Emetti pagamento" #. module: account_payment #: field:payment.order,date_prefered:0 diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py index 5f9708f876c..c43ee4d1d23 100644 --- a/addons/account_payment/report/payment_order.py +++ b/addons/account_payment/report/payment_order.py @@ -21,8 +21,8 @@ import time -import pooler -from report import report_sxw +from openerp import pooler +from openerp.report import report_sxw class payment_order(report_sxw.rml_parse): diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py index 455475b0ae5..f4d695a05d1 100644 --- a/addons/account_payment/wizard/account_payment_order.py +++ b/addons/account_payment/wizard/account_payment_order.py @@ -22,7 +22,7 @@ import time from lxml import etree -from osv import osv, fields +from openerp.osv import fields, osv class payment_order_create(osv.osv_memory): """ diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py index 3c16618f3d2..03ff46125f5 100644 --- a/addons/account_payment/wizard/account_payment_pay.py +++ b/addons/account_payment/wizard/account_payment_pay.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import osv +from openerp.osv import osv #TODO:REMOVE this wizard is not used class account_payment_make_payment(osv.osv_memory): diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py index fffe6c17b92..edd47065e3a 100644 --- a/addons/account_payment/wizard/account_payment_populate_statement.py +++ b/addons/account_payment/wizard/account_payment_populate_statement.py @@ -22,7 +22,7 @@ import time from lxml import etree -from osv import osv, fields +from openerp.osv import fields, osv class account_payment_populate_statement(osv.osv_memory): _name = "account.payment.populate.statement" diff --git a/addons/account_sequence/account_sequence.py b/addons/account_sequence/account_sequence.py index 8b87b3f40ae..5b344600599 100644 --- a/addons/account_sequence/account_sequence.py +++ b/addons/account_sequence/account_sequence.py @@ -20,7 +20,7 @@ # ############################################################################## -from osv import osv, fields +from openerp.osv import fields, osv class account_move(osv.osv): _inherit = 'account.move' diff --git a/addons/account_sequence/account_sequence_installer.py b/addons/account_sequence/account_sequence_installer.py index 91eec5d58ad..e800bbad7ee 100644 --- a/addons/account_sequence/account_sequence_installer.py +++ b/addons/account_sequence/account_sequence_installer.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields, osv +from openerp.osv import fields, osv class account_sequence_installer(osv.osv_memory): _name = 'account.sequence.installer' diff --git a/addons/account_sequence/i18n/lv.po b/addons/account_sequence/i18n/lv.po index 9a3dea1befa..de7b862f088 100644 --- a/addons/account_sequence/i18n/lv.po +++ b/addons/account_sequence/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: 2011-09-12 20:40+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-12-17 13:46+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:53+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: account_sequence #: view:account.sequence.installer:0 @@ -52,7 +52,7 @@ msgstr "Sekvences nākamais numurs tiks palielināts par šo skaitli" #. module: account_sequence #: view:account.sequence.installer:0 msgid "Configure Your Account Sequence Application" -msgstr "Konfigurēt Tavu Konta Sesības Aplikāciju" +msgstr "Konfigurēt Grāmatvedības Kontu Iekšējo Numerāciju" #. module: account_sequence #: view:account.sequence.installer:0 diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py index bf925e8236a..7cea7b3afd6 100644 --- a/addons/account_test/account_test.py +++ b/addons/account_test/account_test.py @@ -28,7 +28,7 @@ # ############################################################################## -from osv import fields,osv +from openerp.osv import fields,osv import pooler import netsvc import time diff --git a/addons/account_test/report/account_test_report.py b/addons/account_test/report/account_test_report.py index ab683e18688..abf0385be86 100644 --- a/addons/account_test/report/account_test_report.py +++ b/addons/account_test/report/account_test_report.py @@ -23,7 +23,7 @@ import datetime import time from report import report_sxw -from tools.translate import _ +from openerp.tools.translate import _ # # Use period and Journal for selection or resources # diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index ffc7cf1769d..41d3476442e 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -22,10 +22,10 @@ import time from lxml import etree -import netsvc -from osv import osv, fields -import decimal_precision as dp -from tools.translate import _ +from openerp import netsvc +from openerp.osv import fields, osv +import openerp.addons.decimal_precision as dp +from openerp.tools.translate import _ class res_company(osv.osv): _inherit = "res.company" diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po index 888f19a667d..ea81277e895 100644 --- a/addons/account_voucher/i18n/pt_BR.po +++ b/addons/account_voucher/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: account_voucher diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py index af8405c1ec9..13c4b9aed9b 100644 --- a/addons/account_voucher/invoice.py +++ b/addons/account_voucher/invoice.py @@ -19,8 +19,8 @@ # ############################################################################## -from osv import osv -from tools.translate import _ +from openerp.osv import osv +from openerp.tools.translate import _ class invoice(osv.osv): _inherit = 'account.invoice' diff --git a/addons/account_voucher/report/account_voucher.py b/addons/account_voucher/report/account_voucher.py index 146fcbc258a..c23c7f4d384 100644 --- a/addons/account_voucher/report/account_voucher.py +++ b/addons/account_voucher/report/account_voucher.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_voucher(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): diff --git a/addons/account_voucher/report/account_voucher_print.py b/addons/account_voucher/report/account_voucher_print.py index 6a5762be493..1bc411947f6 100644 --- a/addons/account_voucher/report/account_voucher_print.py +++ b/addons/account_voucher/report/account_voucher_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_voucher_print(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py index fdadfc6bc94..2ab76c252f5 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt.py +++ b/addons/account_voucher/report/account_voucher_sales_receipt.py @@ -18,8 +18,8 @@ # ############################################################################## -from osv import fields, osv -import tools +from openerp.osv import fields, osv +from openerp import tools class sale_receipt_report(osv.osv): _name = "sale.receipt.report" diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py index 6002f74c6e0..b0f9bb34410 100644 --- a/addons/account_voucher/wizard/account_statement_from_invoice.py +++ b/addons/account_voucher/wizard/account_statement_from_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 account_statement_from_invoice_lines(osv.osv_memory): """ diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 420c6516b38..bae2d892526 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -22,10 +22,10 @@ import time from datetime import datetime -from osv import fields, osv -import tools -from tools.translate import _ -import decimal_precision as dp +from openerp.osv import fields, osv +from openerp import tools +from openerp.tools.translate import _ +import openerp.addons.decimal_precision as dp class account_analytic_account(osv.osv): _name = 'account.analytic.account' diff --git a/addons/analytic/i18n/pt_BR.po b/addons/analytic/i18n/pt_BR.po index 09fc8612d4e..b0f48e582f5 100644 --- a/addons/analytic/i18n/pt_BR.po +++ b/addons/analytic/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: analytic diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py index ee92b469744..93e8cc058a3 100644 --- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py +++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py @@ -18,13 +18,9 @@ # along with this program. If not, see . # ############################################################################## - -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 fields, osv +from openerp.osv.orm import intersect +from openerp.tools.translate import _ class account_analytic_account(osv.osv): _name = "account.analytic.account" diff --git a/addons/analytic_contract_hr_expense/i18n/de.po b/addons/analytic_contract_hr_expense/i18n/de.po index 5ca42f6dc52..1b0e311413c 100644 --- a/addons/analytic_contract_hr_expense/i18n/de.po +++ b/addons/analytic_contract_hr_expense/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-08 10:51+0000\n" +"PO-Revision-Date: 2012-12-17 21:47+0000\n" "Last-Translator: Thorsten Vocks (OpenBig.org) \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n" -"X-Generator: Launchpad (build 16341)\n" +"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n" +"X-Generator: Launchpad (build 16372)\n" #. module: analytic_contract_hr_expense #: view:account.analytic.account:0 @@ -26,7 +26,7 @@ msgstr "oder Ansicht" #. module: analytic_contract_hr_expense #: view:account.analytic.account:0 msgid "Nothing to invoice, create" -msgstr "" +msgstr "Nichts abzurechnen, erstelle" #. module: analytic_contract_hr_expense #: view:account.analytic.account:0 diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index c2a7ae8f05a..bc387b25859 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.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 analytic_user_funct_grid(osv.osv): _name="analytic.user.funct.grid" diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py index 8bbe867c111..a455bc835ce 100644 --- a/addons/anonymization/anonymization.py +++ b/addons/anonymization/anonymization.py @@ -29,8 +29,8 @@ except ImportError: import pickle import random import datetime -from osv import fields, osv -from tools.translate import _ +from openerp.osv import fields, osv +from openerp.tools.translate import _ from itertools import groupby from operator import itemgetter diff --git a/addons/anonymization/i18n/pt_BR.po b/addons/anonymization/i18n/pt_BR.po index af11558233b..1d554df77a8 100644 --- a/addons/anonymization/i18n/pt_BR.po +++ b/addons/anonymization/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: anonymization diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py index 7ca426a6e37..7364ea505f6 100644 --- a/addons/audittrail/audittrail.py +++ b/addons/audittrail/audittrail.py @@ -19,12 +19,12 @@ # ############################################################################## -from osv import fields, osv -from osv.osv import object_proxy -from tools.translate import _ -import pooler +from openerp.osv import fields, osv +from openerp.osv.osv import object_proxy +from openerp.tools.translate import _ +from openerp import pooler import time -import tools +from openerp import tools from openerp import SUPERUSER_ID class audittrail_rule(osv.osv): diff --git a/addons/audittrail/wizard/audittrail_view_log.py b/addons/audittrail/wizard/audittrail_view_log.py index 76284e75511..d06da281933 100644 --- a/addons/audittrail/wizard/audittrail_view_log.py +++ b/addons/audittrail/wizard/audittrail_view_log.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields, osv +from openerp.osv import fields, osv import time class audittrail_view_log(osv.osv_memory): diff --git a/addons/auth_anonymous/i18n/de.po b/addons/auth_anonymous/i18n/de.po deleted file mode 100644 index 78e3abfd1cc..00000000000 --- a/addons/auth_anonymous/i18n/de.po +++ /dev/null @@ -1,30 +0,0 @@ -# German translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-12-16 11:31+0000\n" -"Last-Translator: Felix Schubert \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-17 04:47+0000\n" -"X-Generator: Launchpad (build 16372)\n" - -#. module: auth_anonymous -#. openerp-web -#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9 -#, python-format -msgid "Login" -msgstr "Anmelden" - -#. module: auth_anonymous -#: model:res.groups,name:auth_anonymous.group_anonymous -msgid "Anonymous Group" -msgstr "" diff --git a/addons/auth_ldap/i18n/pt_BR.po b/addons/auth_ldap/i18n/pt_BR.po index 9e06c54b37f..85db8d35f84 100644 --- a/addons/auth_ldap/i18n/pt_BR.po +++ b/addons/auth_ldap/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: auth_ldap diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py index e1317c84c88..a63d52209ba 100644 --- a/addons/auth_ldap/users_ldap.py +++ b/addons/auth_ldap/users_ldap.py @@ -23,9 +23,9 @@ import logging from ldap.filter import filter_format import openerp.exceptions -import pooler -import tools -from osv import fields, osv +from openerp import pooler +from openerp import tools +from openerp.osv import fields, osv from openerp import SUPERUSER_ID _logger = logging.getLogger(__name__) diff --git a/addons/auth_openid/res_users.py b/addons/auth_openid/res_users.py index 9b02ce42991..feea2d8d396 100644 --- a/addons/auth_openid/res_users.py +++ b/addons/auth_openid/res_users.py @@ -21,7 +21,7 @@ from openerp.modules.registry import RegistryManager from openerp.osv import osv, fields import openerp.exceptions -import tools +from openerp import tools import utils diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 856d2626f69..a7798f40bb1 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -24,12 +24,12 @@ from datetime import timedelta import re import time -from osv import fields, osv, orm -from tools.translate import _ -from tools.safe_eval import safe_eval -from tools import ustr -import pooler -import tools +from openerp.osv import fields, osv, orm +from openerp.tools.translate import _ +from openerp.tools.safe_eval import safe_eval +from openerp.tools import ustr +from openerp import pooler +from openerp import tools def get_datetime(date_field): diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_action_rule/i18n/de.po index 88274801065..a48c2ac39ee 100644 --- a/addons/base_action_rule/i18n/de.po +++ b/addons/base_action_rule/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:03+0000\n" -"PO-Revision-Date: 2012-05-10 17:34+0000\n" -"Last-Translator: Raphael Collet (OpenERP) \n" +"PO-Revision-Date: 2012-12-17 21:56+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: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: base_action_rule #: field:base.action.rule,act_followers:0 @@ -27,6 +28,9 @@ msgid "" "The rule uses the AND operator. The model must match all non-empty fields so " "that the rule executes the action described in the 'Actions' tab." msgstr "" +"Diese Regel benutzt den AND Operator. Das Datenmodell sollte alle nicht " +"leeren Felder zuweisen, so daß dieses Regel die Aktion auslöst, die auf dem " +"'Aktion' Tabulator hinterlegt wurde." #. module: base_action_rule #: model:ir.model,name:base_action_rule.model_base_action_rule @@ -59,6 +63,8 @@ msgid "" "Server Actions to be Triggered (eg. Email Reminder, Call Object Method, " "etc...)" msgstr "" +"Auszuführende Serveraktionen (z.B. Email Reminder, Call Object Methode " +"etc.... )" #. module: base_action_rule #: field:base.action.rule,trg_date_range:0 @@ -82,7 +88,7 @@ msgstr "Bedingungen" #. module: base_action_rule #: field:base.action.rule,trg_state_from:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: base_action_rule #: view:base.action.rule:0 @@ -103,7 +109,7 @@ msgstr "Button Bestätigt" #. module: base_action_rule #: view:base.action.rule:0 msgid "Conditions on Status" -msgstr "" +msgstr "Bedingungen des Status" #. module: base_action_rule #: selection:base.action.rule,trg_date_type:0 @@ -126,6 +132,8 @@ msgid "" "Define Server actions.\n" "eg:Email Reminders, Call Object Service, etc.." msgstr "" +"Definieren Sie Server Actions:\n" +"(z.B. Email Erinnerungen, CallObject Service)" #. module: base_action_rule #: help:base.action.rule,trg_date_range:0 @@ -177,7 +185,7 @@ msgstr "Automatische Aktion" #. module: base_action_rule #: field:base.action.rule,model_id:0 msgid "Related Document Model" -msgstr "" +msgstr "verbundenes Datenmodell" #. module: base_action_rule #: help:base.action.rule,sequence:0 @@ -222,12 +230,12 @@ msgstr "RegEx für Ress. Bez." #. module: base_action_rule #: selection:base.action.rule,trg_date_type:0 msgid "Last Modified Date" -msgstr "" +msgstr "Letztes Änderungsdatum" #. module: base_action_rule #: field:base.action.rule,model:0 msgid "Model" -msgstr "" +msgstr "Modell" #. module: base_action_rule #: field:base.action.rule,last_run:0 diff --git a/addons/base_action_rule/i18n/pt_BR.po b/addons/base_action_rule/i18n/pt_BR.po index c85b3620e17..54f1663d8b1 100644 --- a/addons/base_action_rule/i18n/pt_BR.po +++ b/addons/base_action_rule/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_action_rule diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index b1f49dfabaf..a06bfd485bb 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -23,14 +23,13 @@ from datetime import datetime, timedelta, date from dateutil import parser from dateutil import rrule from dateutil.relativedelta import relativedelta -from osv import fields, osv -from service import web_services -from tools.translate import _ +from openerp.osv import fields, osv +from openerp.service import web_services +from openerp.tools.translate import _ import pytz import re import time -import tools -from openerp import SUPERUSER_ID +from openerp import tools, SUPERUSER_ID months = { 1: "January", 2: "February", 3: "March", 4: "April", \ @@ -303,7 +302,7 @@ class calendar_attendee(osv.osv): if name == 'language': user_obj = self.pool.get('res.users') lang = user_obj.read(cr, uid, uid, ['lang'], context=context)['lang'] - result[id][name] = lang.replace('_', '-') + result[id][name] = lang.replace('_', '-') if lang else False return result diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py index e9fe70f19ff..84a8911b44c 100644 --- a/addons/base_calendar/crm_meeting.py +++ b/addons/base_calendar/crm_meeting.py @@ -19,12 +19,12 @@ # ############################################################################## -from osv import osv, fields -import tools -from tools.translate import _ +from openerp.osv import fields, osv +from openerp import tools +from openerp.tools.translate import _ from base_calendar import get_real_ids, base_calendar_id2real_id -from base_status.base_state import base_state +from openerp.addons.base_status.base_state import base_state # # crm.meeting is defined here so that it may be used by modules other than crm, # without forcing the installation of crm. diff --git a/addons/base_calendar/i18n/de.po b/addons/base_calendar/i18n/de.po index 946b045b119..2049a530a67 100644 --- a/addons/base_calendar/i18n/de.po +++ b/addons/base_calendar/i18n/de.po @@ -7,13 +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-12-16 11:37+0000\n" -"Last-Translator: Felix Schubert \n" +"PO-Revision-Date: 2012-12-17 22:52+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-17 04:47+0000\n" +"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n" "X-Generator: Launchpad (build 16372)\n" #. module: base_calendar @@ -43,7 +44,7 @@ msgstr "" #: selection:calendar.todo,rrule_type:0 #: selection:crm.meeting,rrule_type:0 msgid "Week(s)" -msgstr "" +msgstr "Woche(n)" #. module: base_calendar #: field:calendar.event,we:0 @@ -67,13 +68,13 @@ msgstr "Wiederkehrender Termin" #. module: base_calendar #: model:crm.meeting.type,name:base_calendar.categ_meet5 msgid "Feedback Meeting" -msgstr "" +msgstr "Rückmeldung Meeting" #. module: base_calendar #: code:addons/base_calendar/crm_meeting.py:117 #, python-format msgid "Meeting completed." -msgstr "" +msgstr "Meeting wurde erledigt." #. module: base_calendar #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view @@ -150,7 +151,7 @@ msgstr "Definition Einladungstyps" #: view:crm.meeting:0 #: field:crm.meeting,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Ungelesene Mitteilungen" #. module: base_calendar #: selection:calendar.event,week_list:0 @@ -185,7 +186,7 @@ msgstr "Verfügbar" #. module: base_calendar #: help:crm.meeting,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Wenn aktiviert, erfordern neue Nachrichten Ihr Handeln." #. module: base_calendar #: help:calendar.attendee,rsvp:0 @@ -237,12 +238,12 @@ msgstr "Letzter" #. module: base_calendar #: help:crm.meeting,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Nachrichten und Kommunikations-Historie" #. module: base_calendar #: field:crm.meeting,message_ids:0 msgid "Messages" -msgstr "" +msgstr "Mitteilungen" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 @@ -269,7 +270,7 @@ msgstr "Veranstaltungsleitung" #. module: base_calendar #: view:crm.meeting:0 msgid "My Meetings" -msgstr "" +msgstr "Meine Mettings" #. module: base_calendar #: selection:calendar.alarm,action:0 @@ -301,17 +302,17 @@ msgstr "Status Teilnahme" #. module: base_calendar #: view:crm.meeting:0 msgid "Mail To" -msgstr "" +msgstr "Mail an" #. module: base_calendar #: field:crm.meeting,name:0 msgid "Meeting Subject" -msgstr "" +msgstr "Meeting Betreff" #. module: base_calendar #: view:calendar.event:0 msgid "End of Recurrence" -msgstr "" +msgstr "Ende der Wiederholung" #. module: base_calendar #: view:calendar.event:0 @@ -332,7 +333,7 @@ msgstr "Wähle Tag für Terminwiederholung" #: view:crm.meeting:0 #: model:ir.actions.act_window,name:base_calendar.action_crm_meeting msgid "Meetings" -msgstr "" +msgstr "Meetings" #. module: base_calendar #: selection:calendar.attendee,cutype:0 @@ -363,6 +364,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: base_calendar #: code:addons/base_calendar/base_calendar.py:388 @@ -486,7 +489,7 @@ msgstr "Tag im Monat" #. module: base_calendar #: field:crm.meeting,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Followers" #. module: base_calendar #: field:calendar.event,location:0 @@ -517,7 +520,7 @@ msgstr "E-Mail Adresse" #. module: base_calendar #: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread msgid "CRM Meeting: Mark unread" -msgstr "" +msgstr "CRM Meeting: Markiere als ungelesen" #. module: base_calendar #: selection:calendar.alarm,state:0 @@ -533,12 +536,12 @@ msgstr "Termin Erinnerung" #: code:addons/base_calendar/base_calendar.py:982 #, python-format msgid "Count cannot be negative or 0." -msgstr "" +msgstr "Sie können nicht negativ oder 0 sein" #. module: base_calendar #: field:crm.meeting,create_date:0 msgid "Creation Date" -msgstr "" +msgstr "Datum Erstellung" #. module: base_calendar #: code:addons/base_calendar/crm_meeting.py:111 @@ -547,14 +550,14 @@ msgstr "" #: model:res.request.link,name:base_calendar.request_link_meeting #, python-format msgid "Meeting" -msgstr "" +msgstr "Meeting" #. module: base_calendar #: selection:calendar.event,rrule_type:0 #: selection:calendar.todo,rrule_type:0 #: selection:crm.meeting,rrule_type:0 msgid "Month(s)" -msgstr "" +msgstr "Monat(e)" #. module: base_calendar #: view:calendar.event:0 @@ -602,7 +605,7 @@ msgstr "Do" #. module: base_calendar #: view:crm.meeting:0 msgid "Meeting Details" -msgstr "" +msgstr "Meeting Details" #. module: base_calendar #: field:calendar.attendee,child_ids:0 @@ -620,14 +623,14 @@ msgstr "Die folgenden Kontakte haben keine E-Mail Adresse hinterlegt:" #: selection:calendar.todo,rrule_type:0 #: selection:crm.meeting,rrule_type:0 msgid "Year(s)" -msgstr "" +msgstr "Jahr(e)" #. module: base_calendar #: view:crm.meeting.type:0 #: model:ir.actions.act_window,name:base_calendar.action_crm_meeting_type #: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_type msgid "Meeting Types" -msgstr "" +msgstr "Meeting Typen" #. module: base_calendar #: field:calendar.event,create_date:0 @@ -645,7 +648,7 @@ msgstr "Öffentlich für Mitarbeiter" #. module: base_calendar #: view:crm.meeting:0 msgid "hours" -msgstr "" +msgstr "Stunden" #. module: base_calendar #: field:calendar.attendee,partner_id:0 @@ -667,7 +670,7 @@ msgstr "Wiederhole Bis" #. module: base_calendar #: view:crm.meeting:0 msgid "Options" -msgstr "" +msgstr "Einstellungen" #. module: base_calendar #: selection:calendar.event,byday:0 @@ -706,7 +709,7 @@ msgstr "Dienstag" #. module: base_calendar #: field:crm.meeting,categ_ids:0 msgid "Tags" -msgstr "" +msgstr "Tags" #. module: base_calendar #: view:calendar.event:0 @@ -722,7 +725,7 @@ msgstr "Einzeltermin" #: code:addons/base_calendar/crm_meeting.py:114 #, python-format msgid "Meeting confirmed." -msgstr "" +msgstr "Meeting wurde bestätigt." #. module: base_calendar #: help:calendar.event,count:0 @@ -746,7 +749,7 @@ msgstr "Termin wird automatisch in diesem Intervall wiederholt" #. module: base_calendar #: model:ir.ui.menu,name:base_calendar.mail_menu_calendar msgid "Calendar" -msgstr "" +msgstr "Kalender" #. module: base_calendar #: field:calendar.attendee,cn:0 @@ -763,6 +766,8 @@ msgstr "Abgesagt" #, python-format msgid "Group by date is not supported, use the calendar view instead." msgstr "" +"Gruppieren nach Datum fehlt, es wird der Kalender View anstatt dessen " +"genommen." #. module: base_calendar #: view:calendar.event:0 @@ -846,7 +851,7 @@ msgstr "Anhang" #. module: base_calendar #: field:crm.meeting,date_closed:0 msgid "Closed" -msgstr "" +msgstr "Beendet" #. module: base_calendar #: view:calendar.event:0 @@ -871,7 +876,7 @@ msgstr "Anzahl der Wiederholungen" #. module: base_calendar #: model:crm.meeting.type,name:base_calendar.categ_meet2 msgid "Internal Meeting" -msgstr "" +msgstr "Internes Meeting" #. module: base_calendar #: view:calendar.event:0 @@ -888,7 +893,7 @@ msgstr "Ereignisse" #: field:calendar.todo,state:0 #: field:crm.meeting,state:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: base_calendar #: help:calendar.attendee,email:0 @@ -898,7 +903,7 @@ msgstr "E-Mail Adresse der eingel. Person" #. module: base_calendar #: model:crm.meeting.type,name:base_calendar.categ_meet1 msgid "Customer Meeting" -msgstr "" +msgstr "Kunden Meeting" #. module: base_calendar #: help:calendar.attendee,dir:0 @@ -926,7 +931,7 @@ msgstr "Montag" #. module: base_calendar #: model:crm.meeting.type,name:base_calendar.categ_meet4 msgid "Open Discussion" -msgstr "" +msgstr "Offene Diskussion" #. module: base_calendar #: model:ir.model,name:base_calendar.model_ir_model @@ -950,7 +955,7 @@ msgstr "Datum" #. module: base_calendar #: view:crm.meeting:0 msgid "Invitations" -msgstr "" +msgstr "Einladungen" #. module: base_calendar #: view:calendar.event:0 @@ -961,7 +966,7 @@ msgstr "Der" #. module: base_calendar #: field:crm.meeting,write_date:0 msgid "Write Date" -msgstr "" +msgstr "Erstellt am" #. module: base_calendar #: field:calendar.attendee,delegated_from:0 @@ -971,7 +976,7 @@ msgstr "Delegiert von" #. module: base_calendar #: field:crm.meeting,message_is_follower:0 msgid "Is a Follower" -msgstr "" +msgstr "Ist ein Follower" #. module: base_calendar #: field:calendar.attendee,user_id:0 @@ -1029,7 +1034,7 @@ msgstr "Unklar" #: constraint:calendar.todo:0 #: constraint:crm.meeting:0 msgid "Error ! End date cannot be set before start date." -msgstr "" +msgstr "Fehler ! Das Endedatum sollte nicht vor dem Startdatum sein" #. module: base_calendar #: field:calendar.alarm,trigger_occurs:0 @@ -1059,7 +1064,7 @@ msgstr "Intervalle" #. module: base_calendar #: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read msgid "CRM Meeting: Mark read" -msgstr "" +msgstr "CRM Meeting: Markiere als ungelesen" #. module: base_calendar #: selection:calendar.event,week_list:0 @@ -1128,7 +1133,7 @@ msgstr "Auszuf. Aktion die im Falle einer Warnung ausgelöst werden soll" #. module: base_calendar #: view:crm.meeting:0 msgid "Starting at" -msgstr "" +msgstr "beginnend mit" #. module: base_calendar #: selection:calendar.event,end_type:0 @@ -1157,12 +1162,12 @@ msgstr "" #: field:calendar.todo,end_type:0 #: field:crm.meeting,end_type:0 msgid "Recurrence Termination" -msgstr "" +msgstr "Erneute Absage" #. module: base_calendar #: view:crm.meeting:0 msgid "Until" -msgstr "" +msgstr "Bis" #. module: base_calendar #: view:res.alarm:0 @@ -1172,12 +1177,12 @@ msgstr "Erinnerung Details" #. module: base_calendar #: model:crm.meeting.type,name:base_calendar.categ_meet3 msgid "Off-site Meeting" -msgstr "" +msgstr "Off-Site Meeting" #. module: base_calendar #: view:crm.meeting:0 msgid "Day of Month" -msgstr "" +msgstr "Tag des Monats" #. module: base_calendar #: selection:calendar.alarm,state:0 @@ -1194,7 +1199,7 @@ msgstr "Wiederholungsintervall (Tag/Woche/Monat/Jahr)" #. module: base_calendar #: view:crm.meeting:0 msgid "All Day?" -msgstr "" +msgstr "Gesamter Tag?" #. module: base_calendar #: view:calendar.event:0 @@ -1215,6 +1220,14 @@ msgid "" "

\n" " " msgstr "" +"

\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" +" " #. module: base_calendar #: help:calendar.alarm,description:0 @@ -1234,7 +1247,7 @@ msgstr "Verantwortlich" #. module: base_calendar #: view:crm.meeting:0 msgid "Select Weekdays" -msgstr "" +msgstr "Auswahl Wochentage" #. module: base_calendar #: code:addons/base_calendar/base_calendar.py:1489 @@ -1314,7 +1327,7 @@ msgstr "Monat" #: selection:calendar.todo,rrule_type:0 #: selection:crm.meeting,rrule_type:0 msgid "Day(s)" -msgstr "" +msgstr "Tag(e)" #. module: base_calendar #: view:calendar.event:0 @@ -1363,12 +1376,12 @@ msgstr "ir.values" #. module: base_calendar #: view:crm.meeting:0 msgid "Search Meetings" -msgstr "" +msgstr "Suche Meetings" #. module: base_calendar #: model:ir.model,name:base_calendar.model_crm_meeting_type msgid "Meeting Type" -msgstr "" +msgstr "Veranstaltungstyp" #. module: base_calendar #: selection:calendar.attendee,state:0 @@ -1394,11 +1407,19 @@ msgid "" "

\n" " " msgstr "" +"

\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" +"

\n" +" " #. module: base_calendar #: selection:crm.meeting,state:0 msgid "Unconfirmed" -msgstr "" +msgstr "Nicht bestätigte Anmeldungen" #. module: base_calendar #: help:calendar.attendee,sent_by:0 @@ -1488,7 +1509,7 @@ msgstr "Wochentag" #: code:addons/base_calendar/base_calendar.py:980 #, python-format msgid "Interval cannot be negative." -msgstr "" +msgstr "Zeitraum kann nicht negativ sein" #. module: base_calendar #: field:calendar.event,byday:0 @@ -1501,7 +1522,7 @@ msgstr "Nach Tag" #: code:addons/base_calendar/base_calendar.py:417 #, python-format msgid "First you have to specify the date of the invitation." -msgstr "" +msgstr "Als erstes müssen Sie dann das Datum der Einladung akzeptieren." #. module: base_calendar #: field:calendar.alarm,model_id:0 @@ -1584,7 +1605,7 @@ msgstr "Samstag" #: field:calendar.todo,interval:0 #: field:crm.meeting,interval:0 msgid "Repeat Every" -msgstr "" +msgstr "Wiederhole alle" #. module: base_calendar #: selection:calendar.event,byday:0 diff --git a/addons/base_calendar/i18n/pt.po b/addons/base_calendar/i18n/pt.po index 152b7f48564..695586bfcd8 100644 --- a/addons/base_calendar/i18n/pt.po +++ b/addons/base_calendar/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-13 16:59+0000\n" -"Last-Translator: Tiago Baptista \n" +"PO-Revision-Date: 2012-12-17 12:32+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-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: base_calendar #: selection:calendar.alarm,trigger_related:0 @@ -151,7 +151,7 @@ msgstr "Especifique o tipo de convite" #: view:crm.meeting:0 #: field:crm.meeting,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Mensagens por ler" #. module: base_calendar #: selection:calendar.event,week_list:0 @@ -238,12 +238,12 @@ msgstr "Último" #. module: base_calendar #: help:crm.meeting,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Histórico de mensagens e comunicação" #. module: base_calendar #: field:crm.meeting,message_ids:0 msgid "Messages" -msgstr "" +msgstr "Mensagens" #. module: base_calendar #: selection:calendar.alarm,trigger_interval:0 @@ -270,7 +270,7 @@ msgstr "Presidente" #. module: base_calendar #: view:crm.meeting:0 msgid "My Meetings" -msgstr "" +msgstr "As minhas reuniões" #. module: base_calendar #: selection:calendar.alarm,action:0 @@ -333,7 +333,7 @@ msgstr "Escolha dia para repetir reunião" #: view:crm.meeting:0 #: model:ir.actions.act_window,name:base_calendar.action_crm_meeting msgid "Meetings" -msgstr "" +msgstr "Reuniões" #. module: base_calendar #: selection:calendar.attendee,cutype:0 @@ -487,7 +487,7 @@ msgstr "Dia do mês" #. module: base_calendar #: field:crm.meeting,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Seguidores" #. module: base_calendar #: field:calendar.event,location:0 @@ -539,7 +539,7 @@ msgstr "" #. module: base_calendar #: field:crm.meeting,create_date:0 msgid "Creation Date" -msgstr "" +msgstr "Data de criação" #. module: base_calendar #: code:addons/base_calendar/crm_meeting.py:111 @@ -548,14 +548,14 @@ msgstr "" #: model:res.request.link,name:base_calendar.request_link_meeting #, python-format msgid "Meeting" -msgstr "" +msgstr "Reunião" #. module: base_calendar #: selection:calendar.event,rrule_type:0 #: selection:calendar.todo,rrule_type:0 #: selection:crm.meeting,rrule_type:0 msgid "Month(s)" -msgstr "" +msgstr "Mês/Meses" #. module: base_calendar #: view:calendar.event:0 @@ -621,7 +621,7 @@ msgstr "" #: selection:calendar.todo,rrule_type:0 #: selection:crm.meeting,rrule_type:0 msgid "Year(s)" -msgstr "" +msgstr "Ano(s)" #. module: base_calendar #: view:crm.meeting.type:0 diff --git a/addons/base_calendar/i18n/pt_BR.po b/addons/base_calendar/i18n/pt_BR.po index ff731f623bc..6b36e32af9c 100644 --- a/addons/base_calendar/i18n/pt_BR.po +++ b/addons/base_calendar/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_calendar diff --git a/addons/base_crypt/__init__.py b/addons/base_crypt/__init__.py index 921c536b575..2534598a76f 100644 --- a/addons/base_crypt/__init__.py +++ b/addons/base_crypt/__init__.py @@ -18,7 +18,7 @@ # ############################################################################## -from service import security +from openerp.service import security import crypt diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py index 14e029eb988..45e6b396222 100644 --- a/addons/base_crypt/crypt.py +++ b/addons/base_crypt/crypt.py @@ -38,10 +38,10 @@ from random import seed, sample from string import ascii_letters, digits -from osv import fields,osv -import pooler -from tools.translate import _ -from service import security +from openerp.osv import fields,osv +from openerp import pooler +from openerp.tools.translate import _ +from openerp.service import security import logging magic_md5 = '$1$' diff --git a/addons/base_gengo/i18n/pt.po b/addons/base_gengo/i18n/pt.po new file mode 100644 index 00000000000..ed2b0a3a471 --- /dev/null +++ b/addons/base_gengo/i18n/pt.po @@ -0,0 +1,249 @@ +# 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-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-17 14:44+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-18 05:02+0000\n" +"X-Generator: Launchpad (build 16372)\n" + +#. module: base_gengo +#: view:res.company:0 +msgid "Comments for Translator" +msgstr "" + +#. module: base_gengo +#: field:ir.translation,job_id:0 +msgid "Gengo Job ID" +msgstr "" + +#. module: base_gengo +#: code:addons/base_gengo/wizard/base_gengo_translations.py:114 +#, python-format +msgid "This language is not supported by the Gengo translation services." +msgstr "" + +#. module: base_gengo +#: field:res.company,gengo_comment:0 +msgid "Comments" +msgstr "Comentários" + +#. module: base_gengo +#: field:res.company,gengo_private_key:0 +msgid "Gengo Private Key" +msgstr "" + +#. module: base_gengo +#: model:ir.model,name:base_gengo.model_base_gengo_translations +msgid "base.gengo.translations" +msgstr "base.gengo.translations" + +#. module: base_gengo +#: help:res.company,gengo_auto_approve:0 +msgid "Jobs are Automatically Approved by Gengo." +msgstr "" + +#. module: base_gengo +#: field:base.gengo.translations,lang_id:0 +msgid "Language" +msgstr "Idioma" + +#. module: base_gengo +#: field:ir.translation,gengo_comment:0 +msgid "Comments & Activity Linked to Gengo" +msgstr "" + +#. module: base_gengo +#: code:addons/base_gengo/wizard/base_gengo_translations.py:124 +#, python-format +msgid "Gengo Sync Translation (Response)" +msgstr "" + +#. module: base_gengo +#: code:addons/base_gengo/wizard/base_gengo_translations.py:72 +#, python-format +msgid "" +"Gengo `Public Key` or `Private Key` are missing. Enter your Gengo " +"authentication parameters under `Settings > Companies > Gengo Parameters`." +msgstr "" + +#. module: base_gengo +#: selection:ir.translation,gengo_translation:0 +msgid "Translation By Machine" +msgstr "" + +#. module: base_gengo +#: code:addons/base_gengo/wizard/base_gengo_translations.py:155 +#, python-format +msgid "" +"%s\n" +"\n" +"--\n" +" Commented on %s by %s." +msgstr "" + +#. module: base_gengo +#: field:ir.translation,gengo_translation:0 +msgid "Gengo Translation Service Level" +msgstr "" + +#. module: base_gengo +#: constraint:ir.translation:0 +msgid "" +"The Gengo translation service selected is not supported for this language." +msgstr "" + +#. module: base_gengo +#: selection:ir.translation,gengo_translation:0 +msgid "Standard" +msgstr "Padrão" + +#. module: base_gengo +#: help:ir.translation,gengo_translation:0 +msgid "" +"You can select here the service level you want for an automatic translation " +"using Gengo." +msgstr "" + +#. module: base_gengo +#: field:base.gengo.translations,restart_send_job:0 +msgid "Restart Sending Job" +msgstr "" + +#. module: base_gengo +#: view:ir.translation:0 +msgid "To Approve In Gengo" +msgstr "" + +#. module: base_gengo +#: view:res.company:0 +msgid "Private Key" +msgstr "Chave privada" + +#. module: base_gengo +#: view:res.company:0 +msgid "Public Key" +msgstr "Chave pública" + +#. module: base_gengo +#: field:res.company,gengo_public_key:0 +msgid "Gengo Public Key" +msgstr "Chave pública do Gengo" + +#. module: base_gengo +#: code:addons/base_gengo/wizard/base_gengo_translations.py:123 +#, python-format +msgid "Gengo Sync Translation (Request)" +msgstr "" + +#. module: base_gengo +#: view:ir.translation:0 +msgid "Translations" +msgstr "Traduções" + +#. module: base_gengo +#: field:res.company,gengo_auto_approve:0 +msgid "Auto Approve Translation ?" +msgstr "" + +#. module: base_gengo +#: model:ir.actions.act_window,name:base_gengo.action_wizard_base_gengo_translations +#: model:ir.ui.menu,name:base_gengo.menu_action_wizard_base_gengo_translations +msgid "Gengo: Manual Request of Translation" +msgstr "" + +#. module: base_gengo +#: code:addons/base_gengo/ir_translation.py:62 +#: code:addons/base_gengo/wizard/base_gengo_translations.py:109 +#, python-format +msgid "Gengo Authentication Error" +msgstr "" + +#. module: base_gengo +#: model:ir.model,name:base_gengo.model_res_company +msgid "Companies" +msgstr "Empresas" + +#. module: base_gengo +#: view:ir.translation:0 +msgid "" +"Note: If the translation state is 'In Progress', it means that the " +"translation has to be approved to be uploaded in this system. You are " +"supposed to do that directly by using your Gengo Account" +msgstr "" + +#. module: base_gengo +#: code:addons/base_gengo/wizard/base_gengo_translations.py:82 +#, python-format +msgid "" +"Gengo connection failed with this message:\n" +"``%s``" +msgstr "" + +#. module: base_gengo +#: view:res.company:0 +msgid "Gengo Parameters" +msgstr "" + +#. module: base_gengo +#: view:base.gengo.translations:0 +msgid "Send" +msgstr "Enviar" + +#. module: base_gengo +#: selection:ir.translation,gengo_translation:0 +msgid "Ultra" +msgstr "" + +#. module: base_gengo +#: model:ir.model,name:base_gengo.model_ir_translation +msgid "ir.translation" +msgstr "ir.translation" + +#. module: base_gengo +#: view:ir.translation:0 +msgid "Gengo Translation Service" +msgstr "" + +#. module: base_gengo +#: selection:ir.translation,gengo_translation:0 +msgid "Pro" +msgstr "Pro" + +#. module: base_gengo +#: view:base.gengo.translations:0 +msgid "Gengo Request Form" +msgstr "" + +#. module: base_gengo +#: code:addons/base_gengo/wizard/base_gengo_translations.py:114 +#, python-format +msgid "Warning" +msgstr "Aviso" + +#. module: base_gengo +#: help:res.company,gengo_comment:0 +msgid "" +"This comment will be automatically be enclosed in each an every request sent " +"to Gengo" +msgstr "" + +#. module: base_gengo +#: view:base.gengo.translations:0 +msgid "Cancel" +msgstr "Cancelar" + +#. module: base_gengo +#: view:base.gengo.translations:0 +msgid "or" +msgstr "ou" diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py index 7b864aba8ce..0ade9c54625 100644 --- a/addons/base_gengo/ir_translation.py +++ b/addons/base_gengo/ir_translation.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 _ LANG_CODE_MAPPING = { 'ar_SA': ('ar', 'Arabic'), diff --git a/addons/base_gengo/res_company.py b/addons/base_gengo/res_company.py index 22d7b343939..3d038ac0813 100644 --- a/addons/base_gengo/res_company.py +++ b/addons/base_gengo/res_company.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields, osv +from openerp.osv import fields, osv class res_company(osv.Model): diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py index ff492a8d34b..0872af2d0f3 100644 --- a/addons/base_iban/base_iban.py +++ b/addons/base_iban/base_iban.py @@ -20,8 +20,8 @@ ############################################################################## import string -from osv import fields, osv -from tools.translate import _ +from openerp.osv import fields, osv +from openerp.tools.translate import _ # Reference Examples of IBAN _ref_iban = { 'al':'ALkk BBBS SSSK CCCC CCCC CCCC CCCC', 'ad':'ADkk BBBB SSSS CCCC CCCC CCCC', diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py index 46a6e1fe870..825d1d29c4c 100644 --- a/addons/base_report_designer/base_report_designer.py +++ b/addons/base_report_designer/base_report_designer.py @@ -19,12 +19,12 @@ # ############################################################################## -from osv import osv +from openerp.osv import osv from openerp_sxw2rml import sxw2rml from StringIO import StringIO import base64 -import pooler -import addons +from openerp import pooler +from openerp import addons class report_xml(osv.osv): diff --git a/addons/base_report_designer/installer.py b/addons/base_report_designer/installer.py index d21fd11af00..bfda6e7a30f 100644 --- a/addons/base_report_designer/installer.py +++ b/addons/base_report_designer/installer.py @@ -19,11 +19,11 @@ # ############################################################################## -from osv import fields -from osv import osv +from openerp.osv import fields +from openerp.osv import osv import base64 -from tools.translate import _ -import addons +from openerp.tools.translate import _ +from openerp import addons class base_report_designer_installer(osv.osv_memory): _name = 'base_report_designer.installer' diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py index e88a48d6db3..abef384cd91 100644 --- a/addons/base_report_designer/wizard/base_report_designer_modify.py +++ b/addons/base_report_designer/wizard/base_report_designer_modify.py @@ -19,14 +19,14 @@ # along with this program. If not, see . # ############################################################################## -import time -import osv -import pooler -import urllib + import base64 -import tools -from tools.translate import _ -from osv import osv, fields +import time +import urllib + +from openerp import osv, pooler, tools +from openerp.osv import fields, osv +from openerp.tools.translate import _ class base_report_sxw(osv.osv_memory): """Base Report sxw """ diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py index e8e24969f2a..3e7c1d1f846 100644 --- a/addons/base_setup/base_setup.py +++ b/addons/base_setup/base_setup.py @@ -21,10 +21,10 @@ import simplejson import cgi -import pooler -import tools -from osv import fields, osv -from tools.translate import _ +from openerp import pooler +from openerp import tools +from openerp.osv import fields, osv +from openerp.tools.translate import _ from lxml import etree # Specify Your Terminology will move to 'partner' module diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po index fb0f374e733..b6bbea31161 100644 --- a/addons/base_setup/i18n/hr.po +++ b/addons/base_setup/i18n/hr.po @@ -7,20 +7,20 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-01-28 20:51+0000\n" +"PO-Revision-Date: 2012-12-17 20:31+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-11-25 05:52+0000\n" -"X-Generator: Launchpad (build 16293)\n" +"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n" +"X-Generator: Launchpad (build 16372)\n" "Language: hr\n" #. module: base_setup #: view:sale.config.settings:0 msgid "Emails Integration" -msgstr "" +msgstr "Integracija email-a" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -30,7 +30,7 @@ msgstr "Gost" #. module: base_setup #: view:sale.config.settings:0 msgid "Contacts" -msgstr "" +msgstr "Kontakti" #. module: base_setup #: model:ir.model,name:base_setup.model_base_config_settings @@ -42,6 +42,8 @@ msgstr "" msgid "" "Use external authentication providers, sign in with google, facebook, ..." msgstr "" +"Koristi vanjske davatelje usluga autentikacije, prijava s računom google, " +"facebook, ..." #. module: base_setup #: view:sale.config.settings:0 @@ -64,24 +66,24 @@ msgstr "Član" #. module: base_setup #: view:base.config.settings:0 msgid "Portal access" -msgstr "" +msgstr "Pristup portalu" #. module: base_setup #: view:base.config.settings:0 msgid "Authentication" -msgstr "" +msgstr "Autentifikacija" #. module: base_setup #: view:sale.config.settings:0 msgid "Quotations and Sales Orders" -msgstr "" +msgstr "Ponude i prodajni nalozi" #. module: base_setup #: view:base.config.settings:0 #: model:ir.actions.act_window,name:base_setup.action_general_configuration #: model:ir.ui.menu,name:base_setup.menu_general_configuration msgid "General Settings" -msgstr "" +msgstr "Opće postavke" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -91,12 +93,12 @@ msgstr "Donator" #. module: base_setup #: view:base.config.settings:0 msgid "Email" -msgstr "" +msgstr "E-mail" #. module: base_setup #: field:sale.config.settings,module_crm:0 msgid "CRM" -msgstr "" +msgstr "CRM" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -106,17 +108,17 @@ msgstr "Pacijent" #. module: base_setup #: field:base.config.settings,module_base_import:0 msgid "Allow users to import data from CSV files" -msgstr "" +msgstr "Dozvoli uvoz podataka iz CSV datoteka" #. module: base_setup #: field:base.config.settings,module_multi_company:0 msgid "Manage multiple companies" -msgstr "" +msgstr "Više organizacija (tvrtki)" #. module: base_setup #: help:base.config.settings,module_portal:0 msgid "Give access your customers and suppliers to their documents." -msgstr "" +msgstr "Dozvoli kupcima i dobavljačima pristup relevantnim dokumentima." #. module: base_setup #: view:sale.config.settings:0 @@ -126,12 +128,12 @@ msgstr "" #. module: base_setup #: field:sale.config.settings,module_web_linkedin:0 msgid "Get contacts automatically from linkedIn" -msgstr "" +msgstr "Automatski uitaj kontakte iz LinkedIn-a" #. module: base_setup #: field:sale.config.settings,module_plugin_thunderbird:0 msgid "Enable Thunderbird plug-in" -msgstr "" +msgstr "Omogući Thunderbird plug-in" #. module: base_setup #: view:base.setup.terminology:0 @@ -141,22 +143,22 @@ msgstr "" #. module: base_setup #: view:sale.config.settings:0 msgid "Customer Features" -msgstr "" +msgstr "Značajke kupca" #. module: base_setup #: view:base.config.settings:0 msgid "Import / Export" -msgstr "" +msgstr "Uvoz / Izvoz" #. module: base_setup #: view:sale.config.settings:0 msgid "Sale Features" -msgstr "" +msgstr "Značajke prodaje" #. module: base_setup #: field:sale.config.settings,module_plugin_outlook:0 msgid "Enable Outlook plug-in" -msgstr "" +msgstr "Omogući Outlook plug-in" #. module: base_setup #: view:base.setup.terminology:0 @@ -225,7 +227,7 @@ msgstr "Klijent" #. module: base_setup #: help:base.config.settings,module_auth_anonymous:0 msgid "Enable the public part of openerp, openerp becomes a public website." -msgstr "" +msgstr "Dozvoli javni dio OpenERP-a. Vaš OpenERP postaje javna web stranica." #. module: base_setup #: help:sale.config.settings,module_plugin_thunderbird:0 @@ -253,7 +255,7 @@ msgstr "Termin \"Kupac\"" #: model:ir.actions.act_window,name:base_setup.action_sale_config #: view:sale.config.settings:0 msgid "Configure Sales" -msgstr "" +msgstr "Postavke prodaje" #. module: base_setup #: help:sale.config.settings,module_plugin_outlook:0 @@ -270,22 +272,22 @@ msgstr "" #. module: base_setup #: view:base.config.settings:0 msgid "Options" -msgstr "" +msgstr "Opcije" #. module: base_setup #: field:base.config.settings,module_portal:0 msgid "Activate the customer/supplier portal" -msgstr "" +msgstr "Activiraj portal kupcima/dobavljačima" #. module: base_setup #: field:base.config.settings,module_share:0 msgid "Allow documents sharing" -msgstr "" +msgstr "Dozvoli dijeljenje dokumenata" #. module: base_setup #: field:base.config.settings,module_auth_anonymous:0 msgid "Activate the public portal" -msgstr "" +msgstr "Aktiviraj javni portal" #. module: base_setup #: view:base.config.settings:0 @@ -295,7 +297,7 @@ msgstr "" #. module: base_setup #: view:sale.config.settings:0 msgid "Social Network Integration" -msgstr "" +msgstr "Integracija društvenih mreža" #. module: base_setup #: view:base.config.settings:0 @@ -307,7 +309,7 @@ msgstr "Odustani" #: view:base.config.settings:0 #: view:sale.config.settings:0 msgid "Apply" -msgstr "" +msgstr "Primjeni" #. module: base_setup #: view:base.setup.terminology:0 @@ -318,12 +320,12 @@ msgstr "Termin" #: view:base.config.settings:0 #: view:sale.config.settings:0 msgid "or" -msgstr "" +msgstr "ili" #. module: base_setup #: view:base.config.settings:0 msgid "Configure your company data" -msgstr "" +msgstr "Upišite podatke o Vašoj organizaciji (tvrtci)" #~ msgid "Currency" #~ msgstr "Valuta" diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po index e32b736de9e..a0139638ab2 100644 --- a/addons/base_setup/i18n/pt.po +++ b/addons/base_setup/i18n/pt.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2011-11-07 12:42+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-12-17 14:06+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-11-25 05:52+0000\n" -"X-Generator: Launchpad (build 16293)\n" +"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n" +"X-Generator: Launchpad (build 16372)\n" #. module: base_setup #: view:sale.config.settings:0 @@ -29,12 +29,12 @@ msgstr "Convidado" #. module: base_setup #: view:sale.config.settings:0 msgid "Contacts" -msgstr "" +msgstr "Contactos" #. module: base_setup #: model:ir.model,name:base_setup.model_base_config_settings msgid "base.config.settings" -msgstr "" +msgstr "base.config.settings" #. module: base_setup #: field:base.config.settings,module_auth_oauth:0 @@ -68,19 +68,19 @@ msgstr "" #. module: base_setup #: view:base.config.settings:0 msgid "Authentication" -msgstr "" +msgstr "Autenticação" #. module: base_setup #: view:sale.config.settings:0 msgid "Quotations and Sales Orders" -msgstr "" +msgstr "Orçamentos e ordens de venda" #. module: base_setup #: view:base.config.settings:0 #: model:ir.actions.act_window,name:base_setup.action_general_configuration #: model:ir.ui.menu,name:base_setup.menu_general_configuration msgid "General Settings" -msgstr "" +msgstr "Configurações Gerais" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -105,12 +105,12 @@ msgstr "Paciente" #. module: base_setup #: field:base.config.settings,module_base_import:0 msgid "Allow users to import data from CSV files" -msgstr "" +msgstr "Permitir importação de dados através de ficheiros CSV" #. module: base_setup #: field:base.config.settings,module_multi_company:0 msgid "Manage multiple companies" -msgstr "" +msgstr "Gerir várias empresas" #. module: base_setup #: help:base.config.settings,module_portal:0 @@ -125,7 +125,7 @@ msgstr "" #. module: base_setup #: field:sale.config.settings,module_web_linkedin:0 msgid "Get contacts automatically from linkedIn" -msgstr "" +msgstr "Conseguir os contactos automaticamente (através do linkedIn)" #. module: base_setup #: field:sale.config.settings,module_plugin_thunderbird:0 @@ -145,7 +145,7 @@ msgstr "" #. module: base_setup #: view:base.config.settings:0 msgid "Import / Export" -msgstr "" +msgstr "Importar / Exportar" #. module: base_setup #: view:sale.config.settings:0 @@ -206,7 +206,7 @@ msgstr "" #. module: base_setup #: model:ir.model,name:base_setup.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: base_setup #: field:base.setup.terminology,partner:0 @@ -271,7 +271,7 @@ msgstr "" #. module: base_setup #: view:base.config.settings:0 msgid "Options" -msgstr "" +msgstr "Opções" #. module: base_setup #: field:base.config.settings,module_portal:0 @@ -281,7 +281,7 @@ msgstr "" #. module: base_setup #: field:base.config.settings,module_share:0 msgid "Allow documents sharing" -msgstr "" +msgstr "Permitir a partilha de documentos" #. module: base_setup #: field:base.config.settings,module_auth_anonymous:0 @@ -296,7 +296,7 @@ msgstr "" #. module: base_setup #: view:sale.config.settings:0 msgid "Social Network Integration" -msgstr "" +msgstr "Integração com redes sociais" #. module: base_setup #: view:base.config.settings:0 @@ -308,7 +308,7 @@ msgstr "Cancelar" #: view:base.config.settings:0 #: view:sale.config.settings:0 msgid "Apply" -msgstr "" +msgstr "Aplicar" #. module: base_setup #: view:base.setup.terminology:0 @@ -319,7 +319,7 @@ msgstr "Especifique a sua terminologia" #: view:base.config.settings:0 #: view:sale.config.settings:0 msgid "or" -msgstr "" +msgstr "ou" #. module: base_setup #: view:base.config.settings:0 diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po index bf3109c7873..71590a0bd33 100644 --- a/addons/base_setup/i18n/pt_BR.po +++ b/addons/base_setup/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_setup diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index bec7034c023..33c5aa863bf 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import osv, fields +from openerp.osv import fields, osv class base_config_settings(osv.osv_memory): _name = 'base.config.settings' 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" +" " + +#. module: contacts +#: model:ir.actions.act_window,name:contacts.action_contacts +#: model:ir.ui.menu,name:contacts.menu_contacts +msgid "Contacts" +msgstr "Kontakty" diff --git a/addons/contacts/i18n/pt.po b/addons/contacts/i18n/pt.po index 67200b67f9e..465f9e0936d 100644 --- a/addons/contacts/i18n/pt.po +++ b/addons/contacts/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-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-12-11 17:18+0000\n" +"PO-Revision-Date: 2012-12-17 14:10+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: contacts #: model:ir.actions.act_window,help:contacts.action_contacts @@ -29,6 +29,15 @@ msgid "" "

\n" " " msgstr "" +"

\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" +"

\n" +" " #. module: contacts #: model:ir.actions.act_window,name:contacts.action_contacts diff --git a/addons/contacts/i18n/pt_BR.po b/addons/contacts/i18n/pt_BR.po index d6ce95f99a2..45de98d2136 100644 --- a/addons/contacts/i18n/pt_BR.po +++ b/addons/contacts/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: contacts diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 5d61f57d505..df6d5e12b66 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -22,10 +22,10 @@ import base64 import time from lxml import etree -from osv import fields -from osv import osv -import tools -from tools.translate import _ +from openerp.osv import fields +from openerp.osv import osv +from openerp import tools +from openerp.tools.translate import _ MAX_LEVEL = 15 AVAILABLE_STATES = [ diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py index 4a8ee98fbae..b17ba5665d7 100644 --- a/addons/crm/crm_action_rule.py +++ b/addons/crm/crm_action_rule.py @@ -20,12 +20,12 @@ ############################################################################## import re -import tools +from openerp import tools -from tools.translate import _ -from tools import ustr -from osv import fields -from osv import osv +from openerp.tools.translate import _ +from openerp.tools import ustr +from openerp.osv import fields +from openerp.osv import osv import crm diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index ea7cc2ccc8a..76e3ca3dec5 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -19,14 +19,14 @@ # ############################################################################## -from base_status.base_stage import base_stage +from openerp.addons.base_status.base_stage import base_stage import crm from datetime import datetime -from osv import fields, osv +from openerp.osv import fields, osv import time -import tools -from tools.translate import _ -from tools import html2plaintext +from openerp import tools +from openerp.tools.translate import _ +from openerp.tools import html2plaintext from base.res.res_partner import format_address @@ -240,8 +240,8 @@ class crm_lead(base_stage, format_address, osv.osv): 'type':fields.selection([ ('lead','Lead'), ('opportunity','Opportunity'), ],'Type', help="Type is used to separate Leads and Opportunities"), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'date_closed': fields.datetime('Closed', readonly=True), - 'stage_id': fields.many2one('crm.case.stage', 'Stage',tracked=True, - domain="['&', ('fold', '=', False), '&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"), + 'stage_id': fields.many2one('crm.case.stage', 'Stage', tracked=True, + domain="[('fold', '=', False), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"), 'user_id': fields.many2one('res.users', 'Salesperson', tracked=True), 'referred': fields.char('Referred By', size=64), 'date_open': fields.datetime('Opened', readonly=True), diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index 62fc53364ee..cc10ba9a597 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -19,9 +19,9 @@ # ############################################################################## -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 _ import logging _logger = logging.getLogger(__name__) diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py index 0d17e0f3a68..322adc715ad 100644 --- a/addons/crm/crm_phonecall.py +++ b/addons/crm/crm_phonecall.py @@ -19,13 +19,13 @@ # ############################################################################## -from base_status.base_state import base_state +from openerp.addons.base_status.base_state import base_state import crm from datetime import datetime -from osv import fields, osv +from openerp.osv import fields, osv import time -from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP -from tools.translate import _ +from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP +from openerp.tools.translate import _ class crm_phonecall(base_state, osv.osv): """ Model for CRM phonecalls """ diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py index b87d6a3b653..b11fac31dcf 100644 --- a/addons/crm/crm_segmentation.py +++ b/addons/crm/crm_segmentation.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields,osv,orm +from openerp.osv import fields,osv,orm class crm_segmentation(osv.osv): ''' diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po index 2e0718be5cc..96fe22d9b4d 100644 --- a/addons/crm/i18n/pl.po +++ b/addons/crm/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:01+0000\n" -"PO-Revision-Date: 2012-12-15 20:11+0000\n" +"PO-Revision-Date: 2012-12-17 21:04+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-16 04:46+0000\n" +"X-Launchpad-Export-Date: 2012-12-18 04:59+0000\n" "X-Generator: Launchpad (build 16372)\n" #. module: crm @@ -2211,7 +2211,7 @@ msgstr "Oprogramowanie" #. module: crm #: field:crm.case.section,change_responsible:0 msgid "Reassign Escalated" -msgstr "Przpisz ponownie przydział" +msgstr "Przypisz ponownie przydział" #. module: crm #: view:crm.lead.report:0 diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po index 92732d07f66..0508280fca5 100644 --- a/addons/crm/i18n/pt_BR.po +++ b/addons/crm/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: crm diff --git a/addons/crm/i18n/ro.po b/addons/crm/i18n/ro.po index 30d0d39b033..3cac12cdd6b 100644 --- a/addons/crm/i18n/ro.po +++ b/addons/crm/i18n/ro.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:01+0000\n" -"PO-Revision-Date: 2011-01-21 16:31+0000\n" -"Last-Translator: Mihai Satmarean \n" +"PO-Revision-Date: 2012-12-17 10:02+0000\n" +"Last-Translator: Valentin \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:17+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: crm #: view:crm.lead.report:0 @@ -87,7 +87,7 @@ msgstr "" #: view:crm.lead.report:0 #: view:crm.phonecall.report:0 msgid "Salesperson" -msgstr "" +msgstr "Vânzător" #. module: crm #: model:ir.model,name:crm.model_crm_lead_report @@ -109,7 +109,7 @@ msgstr "Zi" #. module: crm #: view:crm.lead:0 msgid "Company Name" -msgstr "" +msgstr "Numele Companiei" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor6 @@ -466,7 +466,7 @@ msgstr "Intalnire obisnuita sau telefonica pentru oportunitate" #: view:crm.phonecall.report:0 #: field:crm.phonecall.report,state:0 msgid "Status" -msgstr "" +msgstr "Stare" #. module: crm #: view:crm.lead2opportunity.partner:0 diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py index 25598abc3ea..323d6e4c3d6 100644 --- a/addons/crm/report/crm_lead_report.py +++ b/addons/crm/report/crm_lead_report.py @@ -19,8 +19,8 @@ # ############################################################################## -from osv import fields,osv -import tools +from openerp.osv import fields,osv +from openerp import tools from .. import crm AVAILABLE_STATES = [ diff --git a/addons/crm/report/crm_phonecall_report.py b/addons/crm/report/crm_phonecall_report.py index 8ee32cfc416..c4b014bb86f 100644 --- a/addons/crm/report/crm_phonecall_report.py +++ b/addons/crm/report/crm_phonecall_report.py @@ -19,8 +19,8 @@ # ############################################################################## -from osv import fields,osv -import tools +from openerp.osv import fields,osv +from openerp import tools from .. import crm AVAILABLE_STATES = [ diff --git a/addons/crm/report/report_businessopp.py b/addons/crm/report/report_businessopp.py index 08d472c724d..45e36cf7046 100644 --- a/addons/crm/report/report_businessopp.py +++ b/addons/crm/report/report_businessopp.py @@ -20,13 +20,13 @@ ############################################################################## import os, time -import netsvc +from openerp import netsvc import random import StringIO -from report.render import render -from report.interface import report_int +from openerp.report.render import render +from openerp.report.interface import report_int from pychart import * theme.use_color = 1 diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py index 6f431b90cba..229ad0189ff 100644 --- a/addons/crm/res_config.py +++ b/addons/crm/res_config.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields, osv +from openerp.osv import fields, osv class crm_configuration(osv.osv_memory): _name = 'sale.config.settings' diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py index a1f84759493..501df20b027 100644 --- a/addons/crm/res_partner.py +++ b/addons/crm/res_partner.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields,osv +from openerp.osv import fields,osv class res_partner(osv.osv): """ Inherits partner and adds CRM information in the partner form """ diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index 431070ff8f8..e7129c98d6c 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -19,9 +19,9 @@ # ############################################################################## -from osv import osv, fields -from tools.translate import _ -import tools +from openerp.osv import fields, osv +from openerp.tools.translate import _ +from openerp import tools import re class crm_lead2opportunity_partner(osv.osv_memory): diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py index 38f88b1c083..8b78c039007 100644 --- a/addons/crm/wizard/crm_merge_opportunities.py +++ b/addons/crm/wizard/crm_merge_opportunities.py @@ -17,8 +17,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 crm_merge_opportunity(osv.osv_memory): """ diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py index 873dd6ab36e..ad9d30c80a4 100644 --- a/addons/crm/wizard/crm_opportunity_to_phonecall.py +++ b/addons/crm/wizard/crm_opportunity_to_phonecall.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 _ import time diff --git a/addons/crm/wizard/crm_partner_binding.py b/addons/crm/wizard/crm_partner_binding.py index bc686db40f4..efef0fa2611 100644 --- a/addons/crm/wizard/crm_partner_binding.py +++ b/addons/crm/wizard/crm_partner_binding.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 crm_partner_binding(osv.osv_memory): """ diff --git a/addons/crm/wizard/crm_phonecall_to_meeting.py b/addons/crm/wizard/crm_phonecall_to_meeting.py index a01765220b8..4e21e01b834 100644 --- a/addons/crm/wizard/crm_phonecall_to_meeting.py +++ b/addons/crm/wizard/crm_phonecall_to_meeting.py @@ -19,8 +19,8 @@ # ############################################################################## -from osv import osv -from tools.translate import _ +from openerp.osv import osv +from openerp.tools.translate import _ class crm_phonecall2meeting(osv.osv_memory): """ Phonecall to Meeting """ diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py index 2cdfb0387e6..d0bcd12dbb7 100644 --- a/addons/crm/wizard/crm_phonecall_to_phonecall.py +++ b/addons/crm/wizard/crm_phonecall_to_phonecall.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 _ import time diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py index 70dcc18baf7..20cadeca2f7 100644 --- a/addons/crm_claim/crm_claim.py +++ b/addons/crm_claim/crm_claim.py @@ -19,14 +19,14 @@ # ############################################################################## -from base_status.base_stage import base_stage +from openerp.addons.base_status.base_stage import base_stage import binascii -from crm import crm -from osv import fields, osv +from openerp.addons.crm import crm +from openerp.osv import fields, osv import time -import tools -from tools.translate import _ -from tools import html2plaintext +from openerp import tools +from openerp.tools.translate import _ +from openerp.tools import html2plaintext CRM_CLAIM_PENDING_STATES = ( crm.AVAILABLE_STATES[2][0], # Cancelled diff --git a/addons/crm_claim/i18n/pt_BR.po b/addons/crm_claim/i18n/pt_BR.po index f9b3d4e4e82..a1ae4f43caf 100644 --- a/addons/crm_claim/i18n/pt_BR.po +++ b/addons/crm_claim/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: crm_claim diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py index 4cda15c0969..ad56fa5e34e 100644 --- a/addons/crm_claim/report/crm_claim_report.py +++ b/addons/crm_claim/report/crm_claim_report.py @@ -19,8 +19,8 @@ # ############################################################################## -from osv import fields,osv -import tools +from openerp.osv import fields,osv +from openerp import tools AVAILABLE_STATES = [ ('draft','Draft'), diff --git a/addons/crm_claim/res_config.py b/addons/crm_claim/res_config.py index 92e474d6a46..aa0cb7ffa20 100644 --- a/addons/crm_claim/res_config.py +++ b/addons/crm_claim/res_config.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import osv, fields +from openerp.osv import fields, osv class crm_claim_settings(osv.osv_memory): _name = 'sale.config.settings' diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py index 373cf53aed6..6b444eab4f4 100644 --- a/addons/crm_helpdesk/crm_helpdesk.py +++ b/addons/crm_helpdesk/crm_helpdesk.py @@ -19,13 +19,13 @@ # ############################################################################## -from base_status.base_state import base_state -from base_status.base_stage import base_stage -from crm import crm -from osv import fields, osv -import tools -from tools.translate import _ -from tools import html2plaintext +from openerp.addons.base_status.base_state import base_state +from openerp.addons.base_status.base_stage import base_stage +from openerp.addons.crm import crm +from openerp.osv import fields, osv +from openerp import tools +from openerp.tools.translate import _ +from openerp.tools import html2plaintext CRM_HELPDESK_STATES = ( crm.AVAILABLE_STATES[2][0], # Cancelled diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py index 6496935c2d2..8d535fa07a0 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report.py +++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py @@ -19,8 +19,8 @@ # ############################################################################## -from osv import fields,osv -import tools +from openerp.osv import fields,osv +from openerp import tools AVAILABLE_STATES = [ diff --git a/addons/crm_partner_assign/i18n/pt_BR.po b/addons/crm_partner_assign/i18n/pt_BR.po index cf1d0fa031c..2ea4f5f7a1b 100644 --- a/addons/crm_partner_assign/i18n/pt_BR.po +++ b/addons/crm_partner_assign/i18n/pt_BR.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-03 16:03+0000\n" -"PO-Revision-Date: 2012-12-17 02:35+0000\n" +"PO-Revision-Date: 2012-12-17 21:56+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-17 04:47+0000\n" +"X-Launchpad-Export-Date: 2012-12-18 05:02+0000\n" "X-Generator: Launchpad (build 16372)\n" #. module: crm_partner_assign @@ -62,7 +62,7 @@ msgstr "Conteúdos HTML limpos automaticamente" #. module: crm_partner_assign #: view:crm.lead:0 msgid "Forward" -msgstr "Avançar" +msgstr "Encaminhar" #. module: crm_partner_assign #: view:res.partner:0 @@ -145,7 +145,7 @@ msgstr "Identificador da mensagem" #. module: crm_partner_assign #: field:res.partner,date_review_next:0 msgid "Next Partner Review" -msgstr "Próxima revisão do parceiro" +msgstr "Próxima Revisão de Parceiro" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,favorite_user_ids:0 @@ -194,7 +194,7 @@ msgid "" "Gives the probability to assign a lead to this partner. (0 means no " "assignation.)" msgstr "" -"Fornece a probabilidade para se atribuir o prospécto para este parceiro. (0 " +"Fornece a probabilidade para se atribuir o prospecto para este parceiro. (0 " "significa sem atribuição.)" #. module: crm_partner_assign @@ -211,7 +211,7 @@ msgstr "Notificação do sistema" #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77 #, python-format msgid "Lead forward" -msgstr "Encaminhamento de Prospecção de Negócio" +msgstr "Encaminhamento de prospecto" #. module: crm_partner_assign #: field:crm.lead.report.assign,probability:0 @@ -356,7 +356,7 @@ msgstr "Atribuição do Parceiro" #. module: crm_partner_assign #: help:crm.lead.report.assign,type:0 msgid "Type is used to separate Leads and Opportunities" -msgstr "Tipo é utilizado para separar Prospecções e Oportunidades" +msgstr "Tipo é utilizado para separar Prospectos e Oportunidades" #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py index 69b2ba406ca..37a317a46d0 100644 --- a/addons/crm_partner_assign/partner_geo_assign.py +++ b/addons/crm_partner_assign/partner_geo_assign.py @@ -19,12 +19,12 @@ # ############################################################################## -from osv import osv -from osv import fields +from openerp.osv import osv +from openerp.osv import fields import urllib,re import random, time -from tools.translate import _ -import tools +from openerp.tools.translate import _ +from openerp import tools def geo_find(addr): addr = addr.encode('utf8') diff --git a/addons/crm_partner_assign/report/crm_lead_report.py b/addons/crm_partner_assign/report/crm_lead_report.py index a2d6bbac2dd..2c208131b3a 100644 --- a/addons/crm_partner_assign/report/crm_lead_report.py +++ b/addons/crm_partner_assign/report/crm_lead_report.py @@ -19,9 +19,9 @@ # ############################################################################## -from osv import fields,osv -import tools -from crm import crm +from openerp.osv import fields,osv +from openerp import tools +from openerp.addons.crm import crm AVAILABLE_STATES = [ ('draft','Draft'), diff --git a/addons/crm_partner_assign/report/crm_partner_report.py b/addons/crm_partner_assign/report/crm_partner_report.py index 7dccab30da2..4611fdd06e4 100644 --- a/addons/crm_partner_assign/report/crm_partner_report.py +++ b/addons/crm_partner_assign/report/crm_partner_report.py @@ -18,8 +18,8 @@ # along with this program. If not, see . # ############################################################################## -from osv import fields,osv -import tools +from openerp.osv import fields,osv +from openerp import tools class crm_partner_report_assign(osv.osv): diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py index ab8f20a74f5..4ca3ba0a770 100644 --- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py +++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py @@ -22,10 +22,10 @@ import re import time -import tools +from openerp import tools -from osv import osv, fields -from tools.translate import _ +from openerp.osv import fields, osv +from openerp.tools.translate import _ class crm_lead_forward_to_partner(osv.osv_memory): """ Forward info history to partners. """ diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py index 7dc72f80289..8ea08601c9a 100644 --- a/addons/crm_profiling/crm_profiling.py +++ b/addons/crm_profiling/crm_profiling.py @@ -19,10 +19,10 @@ # ############################################################################## -from osv import fields,osv -from osv import orm +from openerp.osv import fields,osv +from openerp.osv import orm -from tools.translate import _ +from openerp.tools.translate import _ def _get_answers(cr, uid, ids): """ diff --git a/addons/crm_profiling/i18n/pt_BR.po b/addons/crm_profiling/i18n/pt_BR.po index ae565f1fbdc..345f9c663a3 100644 --- a/addons/crm_profiling/i18n/pt_BR.po +++ b/addons/crm_profiling/i18n/pt_BR.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:03+0000\n" -"PO-Revision-Date: 2012-12-07 22:42+0000\n" +"PO-Revision-Date: 2012-12-17 22:29+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-08 04:59+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: crm_profiling #: view:crm_profiling.questionnaire:0 @@ -54,7 +54,7 @@ msgstr "Pergunta" #: model:ir.actions.act_window,name:crm_profiling.action_open_questionnaire #: view:open.questionnaire:0 msgid "Open Questionnaire" -msgstr "Abrir questionário" +msgstr "Abrir Questionário" #. module: crm_profiling #: field:crm.segmentation,child_ids:0 diff --git a/addons/crm_profiling/wizard/open_questionnaire.py b/addons/crm_profiling/wizard/open_questionnaire.py index b13c67640fc..cb7ad220e3f 100644 --- a/addons/crm_profiling/wizard/open_questionnaire.py +++ b/addons/crm_profiling/wizard/open_questionnaire.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 open_questionnaire_line(osv.osv_memory): _name = 'open.questionnaire.line' diff --git a/addons/crm_todo/crm_todo.py b/addons/crm_todo/crm_todo.py index b1f6aa05af0..e11fa03193f 100644 --- a/addons/crm_todo/crm_todo.py +++ b/addons/crm_todo/crm_todo.py @@ -19,7 +19,7 @@ # ############################################################################## -from osv import fields, osv +from openerp.osv import fields, osv class project_task(osv.osv): _inherit = 'project.task' diff --git a/addons/crm_todo/i18n/pt_BR.po b/addons/crm_todo/i18n/pt_BR.po index eb001f1426c..6ec38a60b27 100644 --- a/addons/crm_todo/i18n/pt_BR.po +++ b/addons/crm_todo/i18n/pt_BR.po @@ -8,14 +8,15 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-03 16:03+0000\n" -"PO-Revision-Date: 2012-12-06 13:12+0000\n" -"Last-Translator: Cristiano Korndörfer \n" +"PO-Revision-Date: 2012-12-17 22:32+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-07 04:36+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: crm_todo #: model:ir.model,name:crm_todo.model_project_task @@ -77,7 +78,7 @@ msgstr "Prospecto / Oportunidade" #. module: crm_todo #: view:crm.lead:0 msgid "For changing to done state" -msgstr "Para mudar a situação para Concluído" +msgstr "Para mudar o estado para Concluído" #. module: crm_todo #: view:crm.lead:0 diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py index 93d69eb3093..64077ed3736 100644 --- a/addons/decimal_precision/decimal_precision.py +++ b/addons/decimal_precision/decimal_precision.py @@ -19,10 +19,9 @@ # ############################################################################## -from osv import osv, fields -import tools -import pooler from openerp import SUPERUSER_ID +from openerp import pooler, tools +from openerp.osv import osv, fields class decimal_precision(osv.osv): _name = 'decimal.precision' diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py index cf82011d27a..15a17b36775 100644 --- a/addons/delivery/delivery.py +++ b/addons/delivery/delivery.py @@ -20,9 +20,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 delivery_carrier(osv.osv): _name = "delivery.carrier" diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index d6ec48e7601..ff19659a830 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -243,8 +243,12 @@ - - + @@ -279,8 +283,12 @@ - - + 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="", + 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 shop 1 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 489f218532e..9a3b82e388a 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..a72ad2e5d39 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' 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 0d224ef3a8e..0b1fd867d2f 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 "
You have been invited to follow a new document.
" +msgstr "" + +#. module: mail +#: field:mail.compose.message,parent_id:0 +#: field:mail.message,parent_id:0 +msgid "Parent Message" +msgstr "" + +#. module: mail +#: field:mail.compose.message,res_id:0 +#: field:mail.followers,res_id:0 +#: field:mail.message,res_id:0 +#: field:mail.wizard.invite,res_id:0 +msgid "Related Document ID" +msgstr "" + +#. module: mail +#: model:ir.actions.client,help:mail.action_mail_to_me_feeds +msgid "" +"

\n" +" No private message.\n" +"

\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.
" #. module: mail #: field:mail.compose.message,parent_id:0 @@ -602,6 +624,12 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Nie ma prywatnych wiadomości.\n" +"

\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 0db7fbfc2db..47d807478d4 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -27,7 +27,7 @@ from functools import partial import logging import pytz import time -import tools +from openerp import tools import xmlrpclib from mako.template import Template as MakoTemplate @@ -35,9 +35,9 @@ from mako.template import Template as MakoTemplate from email.message import Message from mail_message import decode from openerp import SUPERUSER_ID -from osv import osv, fields +from openerp.osv import fields, osv from openerp.osv.orm import browse_record -from tools.safe_eval import safe_eval as eval +from openerp.tools.safe_eval import safe_eval as eval from tools.translate import _ _logger = logging.getLogger(__name__) 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 --> -
+
User img
@@ -38,7 +38,7 @@
-
+