savoirfairelinux-openerp team mailing list archive
-
savoirfairelinux-openerp team
-
Mailing list archive
-
Message #00078
lp:~savoirfairelinux-openerp/openobject-addons/fix_l10n_ca_70_tvq into lp:openobject-addons
Jonatan Cloutier has proposed merging lp:~savoirfairelinux-openerp/openobject-addons/fix_l10n_ca_70_tvq into lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/openobject-addons/fix_l10n_ca_70_tvq/+merge/162995
Fix the quebec, canada tax calculation
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~savoirfairelinux-openerp/openobject-addons/fix_l10n_ca_70_tvq/+merge/162995
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/openobject-addons/fix_l10n_ca_70_tvq.
=== modified file 'account/account.py'
--- account/account.py 2013-04-18 10:39:07 +0000
+++ account/account.py 2013-05-08 15:44:19 +0000
@@ -1670,7 +1670,7 @@
elif reconcile.line_partial_ids:
first_partner = reconcile.line_partial_ids[0].partner_id.id
move_lines = reconcile.line_partial_ids
- if any([line.partner_id.id != first_partner for line in move_lines]):
+ if any([(line.account_id.type in ('receivable', 'payable') and line.partner_id.id != first_partner) for line in move_lines]):
return False
return True
=== modified file 'account/account_financial_report_data.xml'
--- account/account_financial_report_data.xml 2012-01-31 13:36:57 +0000
+++ account/account_financial_report_data.xml 2013-05-08 15:44:19 +0000
@@ -6,16 +6,19 @@
-->
<record id="account_financial_report_profitandloss0" model="account.financial.report">
<field name="name">Profit and Loss</field>
+ <field name="sign" eval="-1" />
<field name="type">sum</field>
</record>
<record id="account_financial_report_income0" model="account.financial.report">
<field name="name">Income</field>
+ <field name="sign" eval="-1" />
<field name="parent_id" ref="account_financial_report_profitandloss0"/>
<field name="display_detail">detail_with_hierarchy</field>
<field name="type">account_type</field>
</record>
<record id="account_financial_report_expense0" model="account.financial.report">
<field name="name">Expense</field>
+ <field name="sign" eval="-1" />
<field name="parent_id" ref="account_financial_report_profitandloss0"/>
<field name="display_detail">detail_with_hierarchy</field>
<field name="type">account_type</field>
=== modified file 'account/account_installer.xml'
--- account/account_installer.xml 2012-11-29 22:26:45 +0000
+++ account/account_installer.xml 2013-05-08 15:44:19 +0000
@@ -20,10 +20,11 @@
</p>
<group>
<field name="charts" class="oe_inline"/>
+ <field name="company_id" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
</group>
<group string="Configure your Fiscal Year" groups="account.group_account_user">
<field name="has_default_company" invisible="1" />
- <field name="company_id" colspan="4" widget="selection" attrs="{'invisible' : [('has_default_company', '=', True)]}"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
+
<label for="date_start" string="Date Range"/>
<div>
<field name="date_start" on_change="on_change_start_date(date_start)" class="oe_inline"/> -
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2013-04-22 15:34:49 +0000
+++ account/account_move_line.py 2013-05-08 15:44:19 +0000
@@ -626,7 +626,7 @@
(_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']),
(_check_currency, 'The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.', ['currency_id']),
(_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']),
- (_check_currency_amount, 'The amount expressed in the secondary currency must be positif when journal item are debit and negatif when journal item are credit.', ['amount_currency']),
+ (_check_currency_amount, 'The amount expressed in the secondary currency must be positive when the journal item is a debit and negative when if it is a credit.', ['amount_currency']),
(_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
]
=== modified file 'account/account_view.xml'
--- account/account_view.xml 2013-04-22 15:34:49 +0000
+++ account/account_view.xml 2013-05-08 15:44:19 +0000
@@ -2111,10 +2111,8 @@
<group attrs="{'invisible': [('only_one_chart_template','=',True)]}">
<field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
</group>
- <group groups="base.group_multi_company">
+ <group>
<field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
- </group>
- <group>
<field name="currency_id" class="oe_inline"/>
<field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
<label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
=== modified file 'account/i18n/es_MX.po'
--- account/i18n/es_MX.po 2013-04-05 11:10:48 +0000
+++ account/i18n/es_MX.po 2013-05-08 15:44:19 +0000
@@ -7,15 +7,26 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-10-15 22:29+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-25 00:10+0000\n"
+"Last-Translator: Antonio Fregoso <antonio.fregoso.mx@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Spanish (Mexico) <es_MX@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:21+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-26 06:23+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -4969,7 +4980,7 @@
#: model:account.account.type,name:account.conf_account_type_chk
#: selection:account.bank.accounts.wizard,account_type:0
msgid "Check"
-msgstr ""
+msgstr "Cheque"
#. module: account
#: view:account.aged.trial.balance:0
=== modified file 'account/i18n/et.po'
--- account/i18n/et.po 2013-04-05 11:10:48 +0000
+++ account/i18n/et.po 2013-05-08 15:44:19 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-21 20:57+0000\n"
"Last-Translator: Ahti Hinnov <sipelgas@xxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-28 09:09+0000\n"
+"Last-Translator: Illimar Saatväli <is@xxxxxx>\n"
+"Language-Team: Estonian <et@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:13+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-29 06:04+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -78,7 +92,7 @@
#: code:addons/account/account_move_line.py:1213
#, python-format
msgid "Bad Account!"
-msgstr ""
+msgstr "Vigane konto!"
#. module: account
#: view:account.move:0
@@ -102,7 +116,7 @@
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:30
#, python-format
msgid "Reconcile"
-msgstr "Võrdlus"
+msgstr "Võrdle"
#. module: account
#: field:account.bank.statement,name:0
@@ -122,8 +136,8 @@
"If the active field is set to False, it will allow you to hide the payment "
"term without removing it."
msgstr ""
-"Kui aktiivne ala on väärne ( False ), siis see võimaldab teil peita/varjata "
-"maksetähtaeg seda kustutamata."
+"Kui aktiivne ala on väär, siis see võimaldab teil peita maksetähtaega seda "
+"kustutamata."
#. module: account
#: code:addons/account/account.py:641
=== modified file 'account/i18n/fr.po'
--- account/i18n/fr.po 2013-04-18 09:41:47 +0000
+++ account/i18n/fr.po 2013-05-08 15:44:19 +0000
@@ -4,15 +4,26 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2013-01-03 13:30+0000\n"
"Last-Translator: Numérigraphe <Unknown>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-23 12:11+0000\n"
+"Last-Translator: Frederic Clementi - Camptocamp.com "
+"<frederic.clementi@xxxxxxxxxxxxxx>\n"
+"Language-Team: French <fr@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:14+0000\n"
"X-Generator: Launchpad (build 16532)\n"
@@ -79,6 +90,10 @@
#, python-format
#~ msgid "Some entries are already reconciled !"
#~ msgstr "Certaines écritures sont déjà lettrées !"
+=======
+"X-Launchpad-Export-Date: 2013-04-24 05:28+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -1355,6 +1370,20 @@
" </p>\n"
" "
msgstr ""
+"< class=\"oe_view_nocontent_create\">\n"
+" Cliquer pour créer un nouvel historique de trésorerie\n"
+" </p><p>\n"
+" Un registre de trésorerie vous permet de gérer les entrées "
+"de trésorerie dans votre journal de \n"
+" trésorerie. Cette fonctionnalité vous permet de suivre "
+"facilement les paiements\n"
+" en espèce de façon journalière. Vous pouvez y enregistrer "
+"les pièces \n"
+" qui sont dans votre caisse, et ensuite écrire les entrées "
+"lorsque l'argent rentre ou\n"
+" sort de votre caisse.\n"
+" </p>\n"
+" "
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
@@ -2816,7 +2845,7 @@
#. module: account
#: view:account.analytic.line:0
msgid "Fin. Account"
-msgstr ""
+msgstr "Compte financier"
#. module: account
#: field:account.tax,tax_code_id:0
@@ -2903,6 +2932,7 @@
msgstr "Coordonnées bancaires"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_move_journal_line
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -2921,6 +2951,11 @@
" </p>\n"
" "
msgstr ""
+=======
+#: view:account.bank.statement:0
+msgid "Cancel CashBox"
+msgstr "Annulation Caisse"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.invoice,payment_term:0
@@ -3022,7 +3057,7 @@
#: code:addons/account/account_bank_statement.py:433
#, python-format
msgid "Statement %s confirmed, journal items were created."
-msgstr ""
+msgstr "Relevé %s confirmé, écritures comptables créées"
#. module: account
#: field:account.invoice.report,price_average:0
@@ -3221,7 +3256,7 @@
#: code:addons/account/account.py:1062
#, python-format
msgid "You should choose the periods that belong to the same company."
-msgstr ""
+msgstr "Veuillez choisir des périodes qui appartiennent à la même société"
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -4393,7 +4428,7 @@
#: code:addons/account/wizard/account_fiscalyear_close.py:88
#, python-format
msgid "The periods to generate opening entries cannot be found."
-msgstr ""
+msgstr "Aucune période d'ouverture n'a été trouvée"
#. module: account
#: model:process.node,name:account.process_node_supplierpaymentorder0
=== modified file 'account/i18n/he.po'
--- account/i18n/he.po 2013-04-05 11:10:48 +0000
+++ account/i18n/he.po 2013-05-08 15:44:19 +0000
@@ -7,15 +7,26 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-06-19 07:00+0000\n"
"Last-Translator: Natan Alter <Unknown>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-22 20:44+0000\n"
+"Last-Translator: omer pines <omerpines@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Hebrew <he@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:14+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -45,28 +56,28 @@
#: view:account.bank.statement:0
#: view:account.move.line:0
msgid "Account Statistics"
-msgstr ""
+msgstr "סטטיסטיקות של החשבון"
#. module: account
#: view:account.invoice:0
msgid "Proforma/Open/Paid Invoices"
-msgstr ""
+msgstr "פְּרוֹ-פוֹרְמָה/פתוח/חשבוניות ששולמו"
#. module: account
#: field:report.invoice.created,residual:0
msgid "Residual"
-msgstr ""
+msgstr "שארית"
#. module: account
#: code:addons/account/account_bank_statement.py:368
#, python-format
msgid "Journal item \"%s\" is not valid."
-msgstr ""
+msgstr "פריט היומן \"%s\" לא תקין."
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "גיול חייבים עד היום"
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
@@ -79,13 +90,13 @@
#: code:addons/account/account_move_line.py:1213
#, python-format
msgid "Bad Account!"
-msgstr ""
+msgstr "חשבון שגוי!"
#. module: account
#: view:account.move:0
#: view:account.move.line:0
msgid "Total Debit"
-msgstr ""
+msgstr "סה\"כ חיוב"
#. module: account
#: constraint:account.account.template:0
@@ -93,6 +104,8 @@
"Error!\n"
"You cannot create recursive account templates."
msgstr ""
+"שגיאה!\n"
+"לא ניתן לייצר תבניות חשבון רקורסיביות."
#. module: account
#. openerp-web
@@ -123,6 +136,7 @@
"If the active field is set to False, it will allow you to hide the payment "
"term without removing it."
msgstr ""
+"אם השדה הפעיל מוגדר כשלילי, יתאפשר לך להסתיר את תקופת התשלום בלי להסירה."
#. module: account
#: code:addons/account/account.py:641
@@ -145,7 +159,7 @@
#: code:addons/account/wizard/account_validate_account_move.py:61
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "אזהרה!"
#. module: account
#: code:addons/account/account.py:3159
@@ -161,12 +175,14 @@
"which is set after generating opening entries from 'Generate Opening "
"Entries'."
msgstr ""
+"עליך להגדיר את 'רישומי יומן לסוף השנה' לשנה הפיסקלית הזו, המוגדר אחרי יצירת "
+"רישומים פתוחים מ'צור רישומים פתוחים'"
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
#: field:account.fiscal.position.account.template,account_src_id:0
msgid "Account Source"
-msgstr ""
+msgstr "מקור החשבון"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_period
@@ -183,7 +199,7 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "חשבוניות שנוצרו במהלך 15 הימים האחרונים"
#. module: account
#: field:accounting.report,label_filter:0
@@ -276,7 +292,7 @@
#. module: account
#: view:account.analytic.chart:0
msgid "Select the Period for Analysis"
-msgstr ""
+msgstr "בחירת תקופה לניתוח"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree3
=== modified file 'account/i18n/hu.po'
--- account/i18n/hu.po 2013-04-15 08:43:02 +0000
+++ account/i18n/hu.po 2013-05-08 15:44:19 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-27 22:48+0000\n"
"Last-Translator: Balint (eSolve) <Unknown>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-05-02 07:53+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
+"Language-Team: Hungarian <hu@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:15+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-03 06:29+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -617,7 +631,7 @@
#: field:account.financial.report,account_report_id:0
#: selection:account.financial.report,type:0
msgid "Report Value"
-msgstr ""
+msgstr "Érték beszámoló"
#. module: account
#: code:addons/account/wizard/account_validate_account_move.py:39
@@ -789,7 +803,7 @@
#. module: account
#: selection:account.financial.report,display_detail:0
msgid "Display children with hierarchy"
-msgstr ""
+msgstr "Az alcsoportok mutatása rangsorral"
#. module: account
#: selection:account.payment.term.line,value:0
=== modified file 'account/i18n/lt.po'
--- account/i18n/lt.po 2013-04-05 11:10:48 +0000
+++ account/i18n/lt.po 2013-05-08 15:44:19 +0000
@@ -1,20 +1,39 @@
+<<<<<<< TREE
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account
+=======
+# Lithuanian 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.
+# Giedrius Slavinskas <giedrius@xxxxxxxxxx>, 2012.
+>>>>>>> MERGE-SOURCE
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-12 15:27+0000\n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-30 16:24+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Andrius Preimantas <andrius.preimantas@xxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:16+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -49,7 +68,7 @@
#. module: account
#: view:account.invoice:0
msgid "Proforma/Open/Paid Invoices"
-msgstr ""
+msgstr "Išankstinės/Atidarytos/Apmokėtos sąskaitos"
#. module: account
#: field:report.invoice.created,residual:0
@@ -104,7 +123,7 @@
#: code:addons/account/static/src/xml/account_move_reconciliation.xml:30
#, python-format
msgid "Reconcile"
-msgstr "Sugretinti"
+msgstr "Sudengti"
#. module: account
#: field:account.bank.statement,name:0
@@ -116,7 +135,7 @@
#: xsl:account.transfer:0
#: field:cash.box.in,ref:0
msgid "Reference"
-msgstr "Nuoroda"
+msgstr "Numeris"
#. module: account
#: help:account.payment.term,active:0
@@ -124,8 +143,8 @@
"If the active field is set to False, it will allow you to hide the payment "
"term without removing it."
msgstr ""
-"Jeigu aktyvus laukelis nustatytas kaip \"ne\", leidžiame paslėpti apmokėjimo "
-"terminą jo nepašalinus."
+"Jeigu aktyvus laukelis nustatytas kaip \"ne\", leidžiame paslėpti mokėjimo "
+"sąlygas, jų nepašalinus."
#. module: account
#: code:addons/account/account.py:641
@@ -169,7 +188,7 @@
#: field:account.fiscal.position.account,account_src_id:0
#: field:account.fiscal.position.account.template,account_src_id:0
msgid "Account Source"
-msgstr "Sąskaitos šaltinis"
+msgstr "Sąskaita"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_period
@@ -182,6 +201,14 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad sukurtumėte apskaitos periodą.\n"
+" </p><p>\n"
+" Apskaitos periodas dažniausiai būna mėnesis arba ketvirtis.\n"
+" Jis dažniausiai yra atitinkamas mokesčių deklaravimo "
+"periodams.\n"
+" </p>\n"
+" "
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -205,6 +232,8 @@
"invoice) to create analytic entries, OpenERP will look for a matching "
"journal of the same type."
msgstr ""
+"Nurodo analitinio žurnalo tipą. OpenERP automatiškai, pagal tipą, parinks "
+"žurnalus galimus įvedamam dokumentui (pvz. sąskaitai faktūrai)."
#. module: account
#: help:account.tax,account_analytic_collected_id:0
@@ -213,6 +242,9 @@
"lines for invoices. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
msgstr ""
+"Pasirinkite analitinę sąskaita, kuri bus nustatoma ant sąskaitų faktūrų "
+"mokesčių eilučių. Palikite tuščią, jeigu nenorite nustatyti numatytosios "
+"analitinės sąskaitos ant mokesčių eilučių."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -238,7 +270,7 @@
#. module: account
#: model:mail.message.subtype,name:account.mt_invoice_validated
msgid "Validated"
-msgstr ""
+msgstr "Patvirtinti"
#. module: account
#: model:account.account.type,name:account.account_type_income_view1
@@ -252,6 +284,9 @@
"legal reports, and set the rules to close a fiscal year and generate opening "
"entries."
msgstr ""
+"Sąskaitų tipas naudojamas informaciniais tikslais, spausdinant įstatymines "
+"ataskaitas ir nustatant uždarymo įrašų generavimo taisykles uždarant "
+"finansinius metus."
#. module: account
#: field:account.config.settings,sale_refund_sequence_next:0
@@ -269,17 +304,17 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
msgid "Manual Recurring"
-msgstr "Pasirinktinas pasikartojančių įrašų kūrimas"
+msgstr "Pasirinktinas pasikartojančių operacijų generavimas"
#. module: account
#: field:account.automatic.reconcile,allow_write_off:0
msgid "Allow write off"
-msgstr ""
+msgstr "Leisti daryti nurašymus"
#. module: account
#: view:account.analytic.chart:0
msgid "Select the Period for Analysis"
-msgstr ""
+msgstr "Pasirinkite analizuojam periodą"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -296,6 +331,18 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Paspauskite, kad sukurtumėte kliento kreditinę sąskaitą "
+"faktūrą. \n"
+" </p><p>\n"
+" Kreditinė sąskaita faktūra yra dokumentas, kuris kredituoja\n"
+" turimą sąskaitą faktūrą, pilnai arba dalinai.\n"
+" </p><p>\n"
+" Vietoj to, kad patys suvedinėtumėte kreditinę\n"
+" sąskaitą faktūrą, jūs galite ją sugeneruoti tiesiai iš\n"
+" susijusios sąskaitos faktūros.\n"
+" </p>\n"
+" "
#. module: account
#: help:account.installer,charts:0
@@ -326,6 +373,9 @@
"leave the automatic formatting, it will be computed based on the financial "
"reports hierarchy (auto-computed field 'level')."
msgstr ""
+"Jūs galite pasirinkti formatą, kuriuo rodyti šią ataskaitą. Jeigu paliksite "
+"automatinį formatavimą, jis bus parenkamas pagal finansinių ataskaitų "
+"hierarchiją (automatiškai apskaičiuojamas laukas „lygis“)."
#. module: account
#: field:account.config.settings,group_multi_currency:0
@@ -364,13 +414,13 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Pardavėjas"
#. module: account
#: view:account.bank.statement:0
#: view:account.invoice:0
msgid "Responsible"
-msgstr ""
+msgstr "Atsakingas asmuo"
#. module: account
#: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -384,14 +434,22 @@
msgstr "Sukūrimo data"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.invoice:0
+msgid "Cancel Invoice"
+msgstr "Atšaukti sąskaitą"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.journal,type:0
msgid "Purchase Refund"
-msgstr "Pirkimų grąžinimas"
+msgstr "Pirktų prekių grąžinimas"
#. module: account
#: selection:account.journal,type:0
msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Atidarymo/Uždarymo situacija"
#. module: account
#: help:account.journal,currency:0
@@ -430,7 +488,7 @@
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
#, python-format
msgid "Period :"
-msgstr ""
+msgstr "Periodas:"
#. module: account
#: field:account.account.template,chart_template_id:0
@@ -444,6 +502,8 @@
#: selection:account.invoice.refund,filter_refund:0
msgid "Modify: create refund, reconcile and create a new draft invoice"
msgstr ""
+"Keisti: sukurti kreditinę S/F, sudengti su šia S/F ir sukurti naują S/F "
+"juodraštį"
#. module: account
#: help:account.config.settings,tax_calculation_rounding_method:0
@@ -476,7 +536,7 @@
#. module: account
#: field:accounting.report,enable_filter:0
msgid "Enable Comparison"
-msgstr ""
+msgstr "Rodyti palyginimą"
#. module: account
#: view:account.analytic.line:0
@@ -562,13 +622,13 @@
#. module: account
#: field:account.automatic.reconcile,unreconciled:0
msgid "Not reconciled transactions"
-msgstr "Nesugretintos transakcijos"
+msgstr "Nesudengtos transakcijos"
#. module: account
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
msgid "Counterpart"
-msgstr ""
+msgstr "Koresponduoja"
#. module: account
#: view:account.fiscal.position:0
@@ -581,7 +641,7 @@
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
msgid "Close a Fiscal Year"
-msgstr "Fiskalinių metų pabaiga"
+msgstr "Finansinių metų pabaiga"
#. module: account
#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
@@ -615,7 +675,7 @@
#: field:account.financial.report,account_report_id:0
#: selection:account.financial.report,type:0
msgid "Report Value"
-msgstr ""
+msgstr "Ataskaitos reikšmė"
#. module: account
#: code:addons/account/wizard/account_validate_account_move.py:39
@@ -623,18 +683,18 @@
msgid ""
"Specified journal does not have any account move entries in draft state for "
"this period."
-msgstr ""
+msgstr "Pasirinktame žurnale nėra neužregistruotų įrašų šiam periodui."
#. module: account
#: view:account.fiscal.position:0
#: view:account.fiscal.position.template:0
msgid "Taxes Mapping"
-msgstr "Mokesčių nustatymai"
+msgstr "Mokesčių pakaitalai"
#. module: account
#: report:account.central.journal:0
msgid "Centralized Journal"
-msgstr "Centralizuotas žurnalas"
+msgstr "Bendrinis žurnalas"
#. module: account
#: sql_constraint:account.sequence.fiscalyear:0
@@ -651,7 +711,7 @@
#. module: account
#: field:account.journal,profit_account_id:0
msgid "Profit Account"
-msgstr ""
+msgstr "Pajamų sąskaita"
#. module: account
#: code:addons/account/account_move_line.py:1159
@@ -717,6 +777,9 @@
"lines for refunds. Leave empty if you don't want to use an analytic account "
"on the invoice tax lines by default."
msgstr ""
+"Pasirinkite analitinę sąskaita, kuri bus nustatoma ant kreditinių sąskaitų "
+"faktūrų mokesčių eilučių. Palikite tuščią, jeigu nenorite nustatyti "
+"numatytosios analitinės sąskaitos ant mokesčių eilučių."
#. module: account
#: view:account.account:0
@@ -727,7 +790,7 @@
#: code:addons/account/report/account_partner_balance.py:297
#, python-format
msgid "Receivable Accounts"
-msgstr "Debetinės sąskaitos"
+msgstr "Debitorių sąskaitos"
#. module: account
#: view:account.config.settings:0
@@ -737,7 +800,7 @@
#. module: account
#: view:account.invoice.refund:0
msgid "Create Refund"
-msgstr ""
+msgstr "Kredituoti"
#. module: account
#: constraint:account.move.line:0
@@ -770,7 +833,7 @@
#. module: account
#: view:account.invoice:0
msgid "Print Invoice"
-msgstr ""
+msgstr "Spausdinti S/F"
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:111
@@ -783,13 +846,13 @@
#. module: account
#: selection:account.financial.report,display_detail:0
msgid "Display children with hierarchy"
-msgstr ""
+msgstr "Rodyti vaikines ataskaitas hierarchiškai"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
msgid "Percent"
-msgstr "Procentų"
+msgstr "Procentai"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_charts
@@ -806,12 +869,12 @@
#. module: account
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Method"
-msgstr ""
+msgstr "Kreditavimo būdas"
#. module: account
#: model:ir.ui.menu,name:account.menu_account_report
msgid "Financial Report"
-msgstr ""
+msgstr "Finansinė ataskaita"
#. module: account
#: view:account.analytic.account:0
@@ -851,7 +914,7 @@
#. module: account
#: view:account.invoice.report:0
msgid "Supplier Invoices And Refunds"
-msgstr ""
+msgstr "Tiekėjo išrašytos S/F"
#. module: account
#: code:addons/account/account_move_line.py:854
@@ -864,7 +927,7 @@
#: view:account.unreconcile.reconcile:0
#: model:ir.model,name:account.model_account_move_line_unreconcile_select
msgid "Unreconciliation"
-msgstr "Išgretinimas"
+msgstr "Sudengimo panaikinimas"
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal_report
@@ -874,7 +937,7 @@
#. module: account
#: view:account.invoice:0
msgid "Send by Email"
-msgstr ""
+msgstr "Siųsti el. paštu"
#. module: account
#: help:account.central.journal,amount_currency:0
@@ -885,6 +948,8 @@
"Print Report with the currency column if the currency differs from the "
"company currency."
msgstr ""
+"Spausdinti ataskaita su valiutos stulpeliu, jeigu valiuta skiriasi nuo "
+"pagrindinės įmonės valiutos."
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
@@ -894,7 +959,7 @@
#. module: account
#: view:account.account:0
msgid "Account Code and Name"
-msgstr ""
+msgstr "Sąskaitos kodas ir pavadinimas"
#. module: account
#: selection:account.entries.report,month:0
@@ -908,7 +973,7 @@
#. module: account
#: selection:account.subscription,period_type:0
msgid "days"
-msgstr "dienų"
+msgstr "dienos"
#. module: account
#: help:account.account.template,nocreate:0
@@ -924,6 +989,10 @@
" </p>\n"
" "
msgstr ""
+"<p>\n"
+" Nerasta DK įrašų.\n"
+" </p>\n"
+" "
#. module: account
#: code:addons/account/account.py:1639
@@ -988,19 +1057,19 @@
#: view:account.move:0
#: view:report.invoice.created:0
msgid "Total Amount"
-msgstr ""
+msgstr "Iš viso"
#. module: account
#: help:account.invoice,supplier_invoice_number:0
msgid "The reference of this invoice as provided by the supplier."
-msgstr ""
+msgstr "Iš tiekėjo gautos sąskaitos faktūros numeris."
#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.entries.report,type:0
msgid "Consolidation"
-msgstr "Konsilidacija"
+msgstr "Konsolidacija"
#. module: account
#: model:account.account.type,name:account.data_account_type_liability
@@ -1018,27 +1087,27 @@
#. module: account
#: view:account.entries.report:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "Išplėstiniai filtrai..."
#. module: account
#: model:ir.ui.menu,name:account.menu_account_central_journal
msgid "Centralizing Journal"
-msgstr "Centralizavimo žurnalas"
+msgstr "Bendrinis žurnalas"
#. module: account
#: selection:account.journal,type:0
msgid "Sale Refund"
-msgstr ""
+msgstr "Parduotų prekių grąžinimas"
#. module: account
#: model:process.node,note:account.process_node_accountingstatemententries0
msgid "Bank statement"
-msgstr ""
+msgstr "Banko išrašas"
#. module: account
#: field:account.analytic.line,move_id:0
msgid "Move Line"
-msgstr "Didžiosios knygos įrašas"
+msgstr "DK įrašas"
#. module: account
#: help:account.move.line,tax_amount:0
@@ -1047,11 +1116,14 @@
"amount.If the tax account is base tax code, this field will contain the "
"basic amount(without tax)."
msgstr ""
+"Jeigu mokesčio sąskaita yra mokesčių kodo sąskaita, tuomet šiame lauke bus "
+"saugoma mokesčio suma. Jeigu mokesčio sąskaita yra mokesčių kodo bazė, "
+"tuomet šiame lauke bus saugoma bazinė suma (be mokesčių)."
#. module: account
#: view:account.analytic.line:0
msgid "Purchases"
-msgstr ""
+msgstr "Pirkimai"
#. module: account
#: field:account.model,lines_id:0
@@ -1114,6 +1186,19 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad pridėtumėte sąskaitą.\n"
+" </p><p>\n"
+" Atliekant tranzakcijas su antrinėmis valiutomis, jūs galite "
+"netekti arba gauti\n"
+" sumas dėl valiutos kursų svyravimo. Šiame meniu galite\n"
+" prognozuoti gaunamą pelną ar nuostolį, jeigu tos "
+"tranzakcijos\n"
+" būtų užbaigtos šiandien. Galioja tik sąskaitoms su "
+"antrinėmis\n"
+" valiutomis.\n"
+" </p>\n"
+" "
#. module: account
#: field:account.bank.accounts.wizard,acc_name:0
@@ -1123,7 +1208,7 @@
#. module: account
#: field:account.journal,with_last_closing_balance:0
msgid "Opening With Last Closing Balance"
-msgstr ""
+msgstr "Atidaryti su paskutiniu uždarymo balansu"
#. module: account
#: help:account.tax.code,notprintable:0
@@ -1131,6 +1216,8 @@
"Check this box if you don't want any tax related to this tax code to appear "
"on invoices"
msgstr ""
+"Pažymėkite šį lauką, jeigu nenorite, kad mokesčiai susiję su šiuo mokesčių "
+"kodu būtų rodomi sąskaitose faktūrose"
#. module: account
#: field:report.account.receivable,name:0
@@ -1145,7 +1232,7 @@
#. module: account
#: help:account.fiscalyear.close,fy_id:0
msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "Pasirinkite finansinius metus, kuriuos uždarysite"
#. module: account
#: help:account.account.template,user_type:0
@@ -1153,6 +1240,9 @@
"These types are defined according to your country. The type contains more "
"information about the account and its specificities."
msgstr ""
+"Sąskaitų tipas naudojamas informaciniais tikslais, spausdinant įstatymines "
+"ataskaitas ir nustatant uždarymo įrašų generavimo taisykles uždarant "
+"finansinius metus."
#. module: account
#: view:account.invoice:0
@@ -1180,12 +1270,12 @@
#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
#: model:ir.ui.menu,name:account.journal_cash_move_lines
msgid "Cash Registers"
-msgstr "Kasos aparatai"
+msgstr "Sąskaitų nustatymai"
#. module: account
#: field:account.config.settings,sale_refund_journal_id:0
msgid "Sale refund journal"
-msgstr "Pardavimo grąžinimų žurnalas"
+msgstr "Parduotų prekių grąžinimo žurnalas"
#. module: account
#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -1204,6 +1294,17 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad sukurtumėte kasos išrašą.\n"
+" </p><p>\n"
+" Kasos išrašas skirtas registruoti kasos knygos operacijas.\n"
+" Tai leidžia lengvai stebėti kasdienius grynųjų pinigų "
+"mokėjimui.\n"
+" Iš pradžių turite įvesti kupiūrų bei monetų kiekį kasoje, \n"
+" o vėliau registruoti įrašus, kuomet yra gaunami ar išmokami\n"
+" grynieji pinigai iš kasos.\n"
+" </p>\n"
+" "
#. module: account
#: model:account.account.type,name:account.data_account_type_bank
@@ -1211,7 +1312,7 @@
#: code:addons/account/account.py:3054
#, python-format
msgid "Bank"
-msgstr ""
+msgstr "Bankas"
#. module: account
#: field:account.period,date_start:0
@@ -1221,7 +1322,7 @@
#. module: account
#: view:account.tax:0
msgid "Refunds"
-msgstr ""
+msgstr "Gražinimai"
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -1244,7 +1345,7 @@
#: field:account.fiscal.position.tax,tax_dest_id:0
#: field:account.fiscal.position.tax.template,tax_dest_id:0
msgid "Replacement Tax"
-msgstr "Mokesčių pakeitimas"
+msgstr "Mokesčio pakaitalas"
#. module: account
#: selection:account.move.line,centralisation:0
@@ -1267,17 +1368,17 @@
#. module: account
#: view:account.invoice.cancel:0
msgid "Cancel Invoices"
-msgstr ""
+msgstr "Atšaukti sąskaitas"
#. module: account
#: help:account.journal,code:0
msgid "The code will be displayed on reports."
-msgstr ""
+msgstr "Kodas bus rodomas ataskaitose."
#. module: account
#: view:account.tax.template:0
msgid "Taxes used in Purchases"
-msgstr ""
+msgstr "Mokesčiai naudojami perkant"
#. module: account
#: field:account.invoice.tax,tax_code_id:0
@@ -1307,7 +1408,7 @@
#. module: account
#: help:account.move.line,move_id:0
msgid "The move of this entry line."
-msgstr "Šio įrašo eilutės perkėlimas"
+msgstr "Žurnalo įrašas, kuriame užfiksuotas šis DK įrašas."
#. module: account
#: field:account.move.line.reconcile,trans_nbr:0
@@ -1326,7 +1427,7 @@
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
-msgstr "Dokumento, kuris sugeneravo šią sąskaitą faktūrą nuoroda."
+msgstr "Dokumento numeris, pagal kurį sugeneruota ši sąskaita faktūra."
#. module: account
#: view:account.analytic.line:0
@@ -1337,7 +1438,7 @@
#. module: account
#: view:account.subscription:0
msgid "Draft Subscription"
-msgstr ""
+msgstr "Pasikartojančių operacijų juodraščiai"
#. module: account
#: view:account.account:0
@@ -1370,14 +1471,14 @@
#. module: account
#: field:account.tax,include_base_amount:0
msgid "Included in base amount"
-msgstr ""
+msgstr "Įtraukti į bazinę sumą"
#. module: account
#: view:account.entries.report:0
#: model:ir.actions.act_window,name:account.action_account_entries_report_all
#: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
msgid "Entries Analysis"
-msgstr ""
+msgstr "Įrašų analizė"
#. module: account
#: field:account.account,level:0
@@ -1415,7 +1516,7 @@
#: model:account.financial.report,name:account.account_financial_report_profitandloss0
#: model:ir.actions.act_window,name:account.action_account_report_pl
msgid "Profit and Loss"
-msgstr ""
+msgstr "Pelnas (nuostolis)"
#. module: account
#: model:ir.model,name:account.model_account_account_template
@@ -1425,20 +1526,20 @@
#. module: account
#: view:account.tax.code.template:0
msgid "Search tax template"
-msgstr ""
+msgstr "Ieškoti Mokesčių šablono"
#. module: account
#: view:account.move.reconcile:0
#: model:ir.actions.act_window,name:account.action_account_reconcile_select
#: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
msgid "Reconcile Entries"
-msgstr "Sugretinti įrašus"
+msgstr "Sudengti įrašus"
#. module: account
#: model:ir.actions.report.xml,name:account.account_overdue
#: view:res.company:0
msgid "Overdue Payments"
-msgstr "Priminimo pažyma"
+msgstr "Pradelsti mokėjimai"
#. module: account
#: report:account.third_party_ledger:0
@@ -1449,7 +1550,7 @@
#. module: account
#: view:account.invoice:0
msgid "Reset to Draft"
-msgstr ""
+msgstr "Atkurti kaip juodraštį"
#. module: account
#: view:account.aged.trial.balance:0
@@ -1460,7 +1561,7 @@
#. module: account
#: field:account.fiscalyear.close.state,fy_id:0
msgid "Fiscal Year to Close"
-msgstr ""
+msgstr "Uždaromi finansiniai metai"
#. module: account
#: field:account.config.settings,sale_sequence_prefix:0
@@ -1491,6 +1592,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.open.closed.fiscalyear:0
+#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
+msgid "Cancel Closing Entries"
+msgstr "Atšaukti uždarymo įrašus"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:account.bank.statement:0
#: model:ir.model,name:account.model_account_bank_statement
#: model:process.node,name:account.process_node_accountingstatemententries0
@@ -1510,7 +1621,7 @@
#: code:addons/account/account.py:768
#, python-format
msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopija)"
#. module: account
#: selection:account.balance.report,display_account:0
@@ -1546,7 +1657,7 @@
#. module: account
#: field:account.entries.report,nbr:0
msgid "# of Items"
-msgstr ""
+msgstr "# įrašų"
#. module: account
#: field:account.automatic.reconcile,max_amount:0
@@ -1572,7 +1683,7 @@
#. module: account
#: field:account.journal,entry_posted:0
msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "Automatinis įrašų patvirtinimas"
#. module: account
#: code:addons/account/report/common_report_header.py:92
@@ -1599,7 +1710,7 @@
#. module: account
#: view:account.entries.report:0
msgid "# of Entries "
-msgstr ""
+msgstr "Iš viso įrašų "
#. module: account
#: help:account.fiscal.position,active:0
@@ -1607,6 +1718,8 @@
"By unchecking the active field, you may hide a fiscal position without "
"deleting it."
msgstr ""
+"Nebenaudojamos mokestinės aplinkos gali būti paslėptos, vietoj to, kad "
+"ištrinti."
#. module: account
#: model:ir.model,name:account.model_temp_range
@@ -1617,7 +1730,7 @@
#: model:ir.actions.act_window,name:account.action_invoice_tree4
#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
msgid "Supplier Refunds"
-msgstr "Tiekėjo grąžinimai"
+msgstr "Grąžinimai tiekėjui"
#. module: account
#: field:account.tax.code,code:0
@@ -1644,7 +1757,7 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
msgid "Recurring Entries"
-msgstr "Pasikartojantys įrašai"
+msgstr "Pasikartojančios operacijos"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
@@ -1664,12 +1777,12 @@
#. module: account
#: field:report.invoice.created,amount_untaxed:0
msgid "Untaxed"
-msgstr "Suma be mokesčių"
+msgstr "Suma be PVM"
#. module: account
#: view:account.journal:0
msgid "Advanced Settings"
-msgstr ""
+msgstr "Papildomi nustatymai"
#. module: account
#: view:account.bank.statement:0
@@ -1679,7 +1792,7 @@
#. module: account
#: view:account.move.line:0
msgid "Unposted Journal Items"
-msgstr "Nepatvirtintos žurnalo eilutės"
+msgstr "Neužregistruoti DK įrašai"
#. module: account
#: view:account.chart.template:0
@@ -1691,7 +1804,7 @@
#: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account"
-msgstr "Grąžinimų mokesčio sąskaita"
+msgstr "Grąžintino mokesčio sąskaita"
#. module: account
#: model:ir.model,name:account.model_ir_sequence
@@ -1714,7 +1827,7 @@
#: view:analytic.entries.report:0
#: field:analytic.entries.report,general_account_id:0
msgid "General Account"
-msgstr "Bendroji sąskaita"
+msgstr "Finansinė sąskaita"
#. module: account
#: field:res.partner,debit_limit:0
@@ -1738,6 +1851,17 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad sukurtumėte sąskaitos tipą.\n"
+" </p><p>\n"
+" Sąskaitos tipas nusako taisykles, kaip sąskaita naudojama "
+"kiekviename\n"
+" žurnale. Metų pabaigos veiksmas nusako finansinių metų\n"
+" uždarymo veiksmus. Balanso bei pelno nuostolio ataskaitos\n"
+" naudoja ataskaitos kategoriją\n"
+" (pelnas/nuostolis arba balansas).\n"
+" </p>\n"
+" "
#. module: account
#: report:account.invoice:0
@@ -1747,7 +1871,7 @@
#: model:ir.model,name:account.model_account_invoice
#: model:res.request.link,name:account.req_link_invoice
msgid "Invoice"
-msgstr "Sąskaita faktūra"
+msgstr "PVM SĄSKAITA-FAKTŪRA"
#. module: account
#: field:account.move,balance:0
@@ -1768,7 +1892,7 @@
#. module: account
#: field:account.config.settings,group_analytic_accounting:0
msgid "Analytic accounting"
-msgstr ""
+msgstr "Analitinė apskaita"
#. module: account
#: report:account.overdue:0
@@ -1798,12 +1922,12 @@
#: model:account.payment.term,name:account.account_payment_term_15days
#: model:account.payment.term,note:account.account_payment_term_15days
msgid "15 Days"
-msgstr ""
+msgstr "15 dienų"
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_invoicing
msgid "Invoicing"
-msgstr ""
+msgstr "Apskaita"
#. module: account
#: code:addons/account/report/account_partner_balance.py:115
@@ -1856,7 +1980,7 @@
#: report:account.journal.period.print.sale.purchase:0
#: view:account.tax.template:0
msgid "Tax Declaration"
-msgstr "Mokesčių deklaracija"
+msgstr "Mokesčių deklaravimas"
#. module: account
#: help:account.journal.period,active:0
@@ -1864,11 +1988,13 @@
"If the active field is set to False, it will allow you to hide the journal "
"period without removing it."
msgstr ""
+"Jeigu aktyvus laukelis nustatytas kaip \"ne\", leidžiame paslėpti žurnalo "
+"periodą, jo nepašalinus."
#. module: account
#: field:account.report.general.ledger,sortby:0
msgid "Sort by"
-msgstr ""
+msgstr "Rūšiuoti pagal"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
@@ -1883,13 +2009,13 @@
#. module: account
#: view:account.period:0
msgid "Duration"
-msgstr ""
+msgstr "Laikotarpis"
#. module: account
#: view:account.bank.statement:0
#: field:account.bank.statement,last_closing_balance:0
msgid "Last Closing Balance"
-msgstr ""
+msgstr "Paskutinis uždarymo balansas"
#. module: account
#: model:ir.model,name:account.model_account_common_journal_report
@@ -1899,7 +2025,7 @@
#. module: account
#: selection:account.partner.balance,display_partner:0
msgid "All Partners"
-msgstr "Visi partneriai"
+msgstr "Visus partnerius"
#. module: account
#: view:account.analytic.chart:0
@@ -1909,7 +2035,7 @@
#. module: account
#: report:account.overdue:0
msgid "Customer Ref:"
-msgstr "Kliento nuoroda"
+msgstr "Pirkėjo ident.:"
#. module: account
#: help:account.tax,base_code_id:0
@@ -1921,7 +2047,7 @@
#: help:account.tax.template,ref_tax_code_id:0
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the tax declaration."
-msgstr ""
+msgstr "Kodas naudojamas mokesčių ataskaitoje."
#. module: account
#: help:account.period,special:0
@@ -1952,7 +2078,7 @@
#: field:account.bank.statement,message_ids:0
#: field:account.invoice,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Pranešimai"
#. module: account
#: view:account.vat.declaration:0
@@ -1964,6 +2090,13 @@
"useful because it enables you to preview at any time the tax that you owe at "
"the start and end of the month or quarter."
msgstr ""
+"Mokesčių ataskaita spausdinama pagal sąskaitas faktūras arba mokėjimus. "
+"Pasirinkite vieną ar keletą finansinių metų periodų. Informacija reikalinga "
+"mokesčių ataskaitai yra automatiškai sukuriame OpenERP iš sąskaitų faktūrų "
+"(arba, kai kuriose šalyse, iš mokėjimų). Šie duomenys atnaujinami realiu "
+"laiku. Tai labai pravartu, kadangi bet kuriuo metu galite peržiūrėti "
+"mokesčių sumas, kurias esate skolingas mėnesio ar ketvirčio pradžioje bei "
+"pabaigoje."
#. module: account
#: code:addons/account/account.py:409
@@ -2019,7 +2152,7 @@
#: code:addons/account/wizard/pos_box.py:36
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Klaida!"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -2045,7 +2178,7 @@
#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
msgid "Invoices Analysis"
-msgstr ""
+msgstr "Sąskaitų faktūrų analizė"
#. module: account
#: model:ir.model,name:account.model_mail_compose_message
@@ -2073,7 +2206,7 @@
#. module: account
#: field:account.vat.declaration,based_on:0
msgid "Based on"
-msgstr ""
+msgstr "Pagal"
#. module: account
#: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -2092,6 +2225,17 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad įvestumėte banko įšrašą.\n"
+" </p><p>\n"
+" Banko išrašas yra banko sąskaitos tranzakcijų suvestinė\n"
+" pagal tam tikrą laikotarpį. Šiuos išrašus\n"
+" turėtumėte periodiškai gauti iš savo banko.\n"
+" </p><p>\n"
+" OpenERP leidžia sudengti tranzakcijas su pardavimo\n"
+" bei pirkimo sąskaitomis faktūromis.\n"
+" </p>\n"
+" "
#. module: account
#: field:account.config.settings,currency_id:0
@@ -2108,7 +2252,7 @@
#. module: account
#: view:account.invoice:0
msgid "Unpaid"
-msgstr ""
+msgstr "Neapmokėta"
#. module: account
#: view:account.treasury.report:0
@@ -2116,12 +2260,12 @@
#: model:ir.model,name:account.model_account_treasury_report
#: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
msgid "Treasury Analysis"
-msgstr ""
+msgstr "Pinigų analizė"
#. module: account
#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
msgid "Sale/Purchase Journal"
-msgstr ""
+msgstr "Pirkimų/pardavimų žurnalas"
#. module: account
#: view:account.analytic.account:0
@@ -2144,18 +2288,18 @@
#: field:account.bank.statement,message_follower_ids:0
#: field:account.invoice,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Prenumeratoriai"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_journal
#: model:ir.model,name:account.model_account_print_journal
msgid "Account Print Journal"
-msgstr ""
+msgstr "Spausdinti žurnalą"
#. module: account
#: model:ir.model,name:account.model_product_category
msgid "Product Category"
-msgstr ""
+msgstr "Produkto kategorija"
#. module: account
#: code:addons/account/account.py:656
@@ -2173,14 +2317,14 @@
#. module: account
#: view:account.fiscalyear.close.state:0
msgid "Close Fiscal Year"
-msgstr ""
+msgstr "Uždaryti finansinius metus"
#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
#, python-format
msgid "Journal :"
-msgstr "Žurnalas :"
+msgstr "Žurnalas:"
#. module: account
#: sql_constraint:account.fiscal.position.tax:0
@@ -2202,7 +2346,7 @@
#. module: account
#: field:account.invoice.report,uom_name:0
msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Etaloninis matavimo vienetas"
#. module: account
#: help:account.journal,allow_date:0
@@ -2210,6 +2354,8 @@
"If set to True then do not accept the entry if the entry date is not into "
"the period dates"
msgstr ""
+"Pažymėjus šį lauką, nebus leidžia sukurti žurnalo įrašų, kurių periodas "
+"neatitinka įrašo datos"
#. module: account
#. openerp-web
@@ -2233,7 +2379,7 @@
#: code:addons/account/report/account_partner_balance.py:299
#, python-format
msgid "Payable Accounts"
-msgstr "Kreditinės sąskaitos"
+msgstr "Kreditorių sąskaitos"
#. module: account
#: constraint:account.move.line:0
@@ -2247,7 +2393,7 @@
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
-msgstr ""
+msgstr "Suma be mokesčių"
#. module: account
#: help:account.tax,active:0
@@ -2255,16 +2401,18 @@
"If the active field is set to False, it will allow you to hide the tax "
"without removing it."
msgstr ""
+"Jeigu aktyvus laukelis nustatytas kaip \"ne\", leidžiame paslėpti mokesčių "
+"taisyklę, jos nepašalinus."
#. module: account
#: view:account.analytic.line:0
msgid "Analytic Journal Items related to a sale journal."
-msgstr ""
+msgstr "Analitinio žurnalo įrašai susiję su pardavimo žurnalu."
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Italic Text (smaller)"
-msgstr ""
+msgstr "Kursyvas tekstas (mažesnis)"
#. module: account
#: help:account.journal,cash_control:0
@@ -2295,7 +2443,7 @@
#: view:account.fiscalyear:0
#: field:account.treasury.report,fiscalyear_id:0
msgid "Fiscalyear"
-msgstr "Fiskaliniai metai"
+msgstr "Finansiniai metai"
#. module: account
#: code:addons/account/wizard/account_move_bank_reconcile.py:53
@@ -2341,7 +2489,7 @@
#. module: account
#: view:account.entries.report:0
msgid "This F.Year"
-msgstr ""
+msgstr "Einamieji finansiniai metai"
#. module: account
#: view:account.tax.chart:0
@@ -2352,7 +2500,7 @@
#: model:account.payment.term,name:account.account_payment_term_net
#: model:account.payment.term,note:account.account_payment_term_net
msgid "30 Net Days"
-msgstr ""
+msgstr "30 dienų"
#. module: account
#: code:addons/account/account_cash_statement.py:256
@@ -2397,7 +2545,7 @@
#. module: account
#: report:account.invoice:0
msgid "Customer Code"
-msgstr ""
+msgstr "Pirkėjo identifikatorius"
#. module: account
#: view:account.account.type:0
@@ -2455,12 +2603,12 @@
#. module: account
#: view:account.entries.report:0
msgid "# of Products Qty "
-msgstr ""
+msgstr "# produktų "
#. module: account
#: model:ir.model,name:account.model_product_template
msgid "Product Template"
-msgstr ""
+msgstr "Produkto šablonas"
#. module: account
#: report:account.account.balance:0
@@ -2500,7 +2648,7 @@
#: field:accounting.report,fiscalyear_id_cmp:0
#: model:ir.model,name:account.model_account_fiscalyear
msgid "Fiscal Year"
-msgstr "Fiskaliniai metai"
+msgstr "Finansiniai metai"
#. module: account
#: help:account.aged.trial.balance,fiscalyear_id:0
@@ -2519,7 +2667,7 @@
#: help:accounting.report,fiscalyear_id:0
#: help:accounting.report,fiscalyear_id_cmp:0
msgid "Keep empty for all open fiscal year"
-msgstr "Palikite tuščią visiems atviriems fiskaliniams metams."
+msgstr "Palikite tuščią visiems atviriems finansiniams metams."
#. module: account
#: code:addons/account/account.py:653
@@ -2576,13 +2724,13 @@
#: field:account.payment.term.line,payment_id:0
#: model:ir.model,name:account.model_account_payment_term
msgid "Payment Term"
-msgstr "Mokėjimo terminas"
+msgstr "Mokėjimo sąlygos"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
-msgstr "Fiskalinė pozicija"
+msgstr "Mokestinės aplinkos"
#. module: account
#: code:addons/account/account_move_line.py:578
@@ -2609,12 +2757,12 @@
#. module: account
#: view:product.category:0
msgid "Account Properties"
-msgstr ""
+msgstr "Apskaitos savybės"
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Create a draft refund"
-msgstr ""
+msgstr "Sukurti kreditinės S/F juodraštį"
#. module: account
#: view:account.partner.reconcile.process:0
@@ -2624,7 +2772,7 @@
#. module: account
#: view:account.analytic.line:0
msgid "Fin. Account"
-msgstr ""
+msgstr "Fin. sąskaita"
#. module: account
#: field:account.tax,tax_code_id:0
@@ -2641,7 +2789,7 @@
#. module: account
#: view:account.entries.report:0
msgid "Unreconciled entries"
-msgstr "Nesugretinti įrašai"
+msgstr "Nesudengti įrašai"
#. module: account
#: field:account.invoice.tax,base_code_id:0
@@ -2680,7 +2828,7 @@
#: view:analytic.entries.report:0
#: field:analytic.entries.report,day:0
msgid "Day"
-msgstr ""
+msgstr "Data"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_renew_view
@@ -2709,6 +2857,7 @@
msgstr "Banko rekvizitai"
#. module: account
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account.action_move_journal_line
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -2727,6 +2876,11 @@
" </p>\n"
" "
msgstr ""
+=======
+#: view:account.bank.statement:0
+msgid "Cancel CashBox"
+msgstr "Atšaukti"
+>>>>>>> MERGE-SOURCE
#. module: account
#: help:account.invoice,payment_term:0
@@ -2736,6 +2890,10 @@
"date empty, it means direct payment. The payment term may compute several "
"due dates, for example 50% now, 50% in one month."
msgstr ""
+"Jeigu pasirinksite mokėjimo sąlygas, mokėjimo terminas bus paskaičiuotas "
+"automatiškai sukuriant DK įrašus. Nepasirinkus mokėjimo sąlygų bei mokėjimo "
+"termino, bus laikoma, kad apmokama iš karto. Mokėjimo sąlygos gali apibrėžti "
+"keletą mokėjimo terminų, pavyzdžiui 50% dabar, 50% per vieną mėnesį."
#. module: account
#: field:account.config.settings,purchase_sequence_next:0
@@ -2771,7 +2929,7 @@
#: view:account.tax:0
#: model:ir.model,name:account.model_account_tax
msgid "Tax"
-msgstr "Mokestis"
+msgstr "Mokesčiai"
#. module: account
#: view:account.analytic.account:0
@@ -2802,7 +2960,7 @@
#: model:ir.ui.menu,name:account.menu_action_account_form
#: model:ir.ui.menu,name:account.menu_analytic
msgid "Accounts"
-msgstr ""
+msgstr "Sąskaitos"
#. module: account
#: code:addons/account/account.py:3503
@@ -2816,7 +2974,7 @@
#: code:addons/account/account_move_line.py:535
#, python-format
msgid "Configuration Error!"
-msgstr ""
+msgstr "Klaida nustatymuose!"
#. module: account
#: code:addons/account/account_bank_statement.py:433
@@ -2828,7 +2986,7 @@
#: field:account.invoice.report,price_average:0
#: field:account.invoice.report,user_currency_price_average:0
msgid "Average Price"
-msgstr ""
+msgstr "Vidutinė suma"
#. module: account
#: report:account.overdue:0
@@ -2839,12 +2997,12 @@
#: report:account.journal.period.print:0
#: report:account.journal.period.print.sale.purchase:0
msgid "Label"
-msgstr "Žyma"
+msgstr "Pavadinimas"
#. module: account
#: view:res.partner.bank:0
msgid "Accounting Information"
-msgstr ""
+msgstr "Apskaitos informacija"
#. module: account
#: view:account.tax:0
@@ -2856,7 +3014,7 @@
#: view:account.move.bank.reconcile:0
#: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
msgid "Bank reconciliation"
-msgstr "Banko sugretinimas"
+msgstr "Banko sąskaitos sudengimas"
#. module: account
#: report:account.invoice:0
@@ -2870,7 +3028,7 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Ref"
-msgstr "Nuoroda"
+msgstr "Numeris"
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -2880,7 +3038,7 @@
#. module: account
#: help:account.move.line,tax_code_id:0
msgid "The Account can either be a base tax code or a tax code account."
-msgstr ""
+msgstr "Sąskaita gali būti tiek mokesčio bazė, tiek mokesčio suma."
#. module: account
#: sql_constraint:account.model.line:0
@@ -2896,12 +3054,12 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_automatic_reconcile
msgid "Automatic Reconciliation"
-msgstr ""
+msgstr "Automatizuotas sudengimas"
#. module: account
#: field:account.invoice,reconciled:0
msgid "Paid/Reconciled"
-msgstr "Apmokėta/Sugretinta"
+msgstr "Apmokėta/Sudengta"
#. module: account
#: field:account.tax,ref_base_code_id:0
@@ -2913,7 +3071,7 @@
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Bank Statements"
-msgstr "Banko sąskaitos išrašai"
+msgstr "Banko išrašai"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_fiscalyear
@@ -2934,6 +3092,21 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad sukurtumėte finansinius metus.\n"
+" </p><p>\n"
+" Apibrėžkite finasinius metus pagal įmonės poreikius.\n"
+" Finansiniai metai yra periodas, kuriam sudaroma įmonės "
+"finansinė\n"
+" atskaitomybė (dažniausiai 12 mėnesių). Finansiniai metai\n"
+" dažniausiai įvardijami pagal laikotarpio pabaigos datą.\n"
+" Pavyzdžiui, jei įmonės finansiniai metai baigiasi 2011 m.\n"
+" lapkričio 30 d., tuomet operacijos tarp 2010 m. gruodžio 1 "
+"d.\n"
+" ir 2011 m. lapkričio 30 d. bus priskirtos 2011 finansiniams "
+"metams.\n"
+" </p>\n"
+" "
#. module: account
#: view:account.common.report:0
@@ -2941,18 +3114,18 @@
#: view:account.move.line:0
#: view:accounting.report:0
msgid "Dates"
-msgstr ""
+msgstr "Datos"
#. module: account
#: field:account.chart.template,parent_id:0
msgid "Parent Chart Template"
-msgstr ""
+msgstr "Tėvinis sąskaitų plano šablonas"
#. module: account
#: field:account.tax,parent_id:0
#: field:account.tax.template,parent_id:0
msgid "Parent Tax Account"
-msgstr "Tėvinė mokesčių sąskaita"
+msgstr "Tėvinė mokesčio sąskaita"
#. module: account
#: view:account.aged.trial.balance:0
@@ -2986,6 +3159,10 @@
"Note that journal entries that are automatically created by the system are "
"always skipping that state."
msgstr ""
+"Pažymėjus šį lauką, visi ranka įvedami žurnalo įrašai bus iš karto "
+"patvirtinami.\n"
+"Pažymėtina, kad žurnalo įrašai, kuriuos sistema sukuria automatiškai, yra iš "
+"karto patvirtinami."
#. module: account
#: field:account.move.line.reconcile,writeoff:0
@@ -2996,7 +3173,7 @@
#: field:account.bank.statement,message_unread:0
#: field:account.invoice,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Neperžiūrėtos žinutės"
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:44
@@ -3028,7 +3205,7 @@
#. module: account
#: view:account.invoice:0
msgid "Accounting Period"
-msgstr ""
+msgstr "Periodas"
#. module: account
#: field:account.config.settings,sale_journal_id:0
@@ -3074,7 +3251,7 @@
#: model:ir.ui.menu,name:account.menu_account_customer
#: model:ir.ui.menu,name:account.menu_finance_receivables
msgid "Customers"
-msgstr "Klientai"
+msgstr "Pirkėjai"
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -3095,7 +3272,7 @@
#. module: account
#: field:accounting.report,debit_credit:0
msgid "Display Debit/Credit Columns"
-msgstr ""
+msgstr "Rodyti debeto/kredito skiltis"
#. module: account
#: selection:account.entries.report,month:0
@@ -3112,6 +3289,8 @@
"The optional quantity expressed by this line, eg: number of product sold. "
"The quantity is not a legal requirement but is very useful for some reports."
msgstr ""
+"Papildomas kiekis išreikštas šiuo DK įrašu, pvz. parduotų produktų kiekis. "
+"Šis kiekis nėra būtinas, tačiau naudingas kai kuriose ataskaitose."
#. module: account
#: view:account.unreconcile:0
@@ -3129,13 +3308,13 @@
#: field:product.category,property_account_expense_categ:0
#: field:product.template,property_account_expense:0
msgid "Expense Account"
-msgstr "Išlaidų sąskaita"
+msgstr "Sąnaudų sąskaita"
#. module: account
#: field:account.bank.statement,message_summary:0
#: field:account.invoice,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Santrauka"
#. module: account
#: help:account.invoice,period_id:0
@@ -3170,6 +3349,8 @@
"between the creation date or the creation date of the entries plus the "
"partner payment terms."
msgstr ""
+"Šio modelio sukurtų įrašų apmokėjimo data. Jūs galite pasirinkti tarp įrašo "
+"sukūrimo datos bei datos pagal partnerio mokėjimo sąlygas."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -3179,7 +3360,7 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_account_report_pl
msgid "Profit And Loss"
-msgstr ""
+msgstr "Pelnas (nuostolis)"
#. module: account
#: view:account.fiscal.position:0
@@ -3193,7 +3374,7 @@
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
-msgstr "Fiskalinė pozicija"
+msgstr "Mokestinė aplinka"
#. module: account
#: code:addons/account/account_invoice.py:791
@@ -3220,7 +3401,7 @@
#: model:ir.actions.report.xml,name:account.account_account_balance
#: model:ir.ui.menu,name:account.menu_general_Balance_report
msgid "Trial Balance"
-msgstr ""
+msgstr "Bandomasis balansas"
#. module: account
#: code:addons/account/account.py:431
@@ -3239,7 +3420,7 @@
#. module: account
#: model:ir.model,name:account.model_account_open_closed_fiscalyear
msgid "Choose Fiscal Year"
-msgstr "Pasirinkite mokestinius metus"
+msgstr "Pasirinkite finansinius metus"
#. module: account
#: view:account.config.settings:0
@@ -3261,7 +3442,7 @@
#: field:accounting.report,account_report_id:0
#: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
msgid "Account Reports"
-msgstr ""
+msgstr "Finansinė ataskaita"
#. module: account
#: field:account.payment.term,line_ids:0
@@ -3276,7 +3457,7 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
msgid "Sale/Purchase Journals"
-msgstr ""
+msgstr "Pirkimų/pardavimų žurnalai"
#. module: account
#: help:account.account,currency_mode:0
@@ -3287,6 +3468,11 @@
"software system you may have to use the rate at date. Incoming transactions "
"always use the rate at date."
msgstr ""
+"Pasirinkite kaip bus skaičiuojamas valiutų kursas mokamų sumų tranzakcijoms. "
+"Daugelyje valstybių yra leidžiamas „Vidutinio kurso“ metodas, tačiau tik "
+"nedaugelis sistemų gali tai atlikti. Taigi, jeigu importuojate duomenis iš "
+"kitos sistemos, turėtumėte naudoti metodą „Datai“. Gaunamų sumų tranzakcijos "
+"visados naudoja metodą „Datai“."
#. module: account
#: code:addons/account/account.py:2640
@@ -3303,7 +3489,7 @@
#. module: account
#: field:res.partner,property_supplier_payment_term:0
msgid "Supplier Payment Term"
-msgstr ""
+msgstr "Pirkimo mokėjimo sąlygos"
#. module: account
#: view:account.fiscalyear:0
@@ -3324,7 +3510,7 @@
#. module: account
#: view:account.analytic.line:0
msgid "Total Quantity"
-msgstr ""
+msgstr "Bendras kiekis"
#. module: account
#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
@@ -3349,7 +3535,7 @@
#: selection:account.entries.report,type:0
#: selection:account.financial.report,type:0
msgid "View"
-msgstr "Žiūrėti"
+msgstr "Rodinys"
#. module: account
#: code:addons/account/account.py:3422
@@ -3366,7 +3552,7 @@
#. module: account
#: view:account.invoice:0
msgid "Proforma Invoices"
-msgstr ""
+msgstr "Išankstinės sąskaitos"
#. module: account
#: model:process.node,name:account.process_node_electronicfile0
@@ -3376,7 +3562,7 @@
#. module: account
#: field:account.move.line,reconcile:0
msgid "Reconcile Ref"
-msgstr ""
+msgstr "Sudengimo Nr"
#. module: account
#: field:account.config.settings,has_chart_of_accounts:0
@@ -3488,7 +3674,7 @@
#: help:account.account.template,currency_id:0
#: help:account.bank.accounts.wizard,currency_id:0
msgid "Forces all moves for this account to have this secondary currency."
-msgstr ""
+msgstr "Visi šios sąskaitos DK įrašai privalės turėti šią antrinę valiutą."
#. module: account
#: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -3506,7 +3692,7 @@
#. module: account
#: view:account.bank.statement:0
msgid "Transactions"
-msgstr ""
+msgstr "Tranzakcijos"
#. module: account
#: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3526,6 +3712,15 @@
" 'Unreconciled' will copy only the journal items that were unreconciled on "
"the first day of the new fiscal year."
msgstr ""
+"Pasirinkite metodą, kuris bus naudojamas generuojant finansinių metų "
+"uždarymo įrašus sąskaitoms su šiuo tipu.\n"
+"\n"
+" „Nieko“ reiškia, kad nebus kuriami įrašai šiam tipui.\n"
+" „Balansas“ pagrinde bus naudojamas pinigų sąskaitoms.\n"
+" „Išsamiai“ metodas sukurs kiekvieno ankstesnių metų DK įrašo kopiją, net ir "
+"tų, kurie buvo sudengti.\n"
+" „Nesudengta“ metodas sukurs tik, iki naujų finansinių metų, nesudengtų DK "
+"įrašų kopijas."
#. module: account
#: view:account.tax.template:0
@@ -3598,7 +3793,7 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_vat_declaration
msgid "Account Tax Declaration"
-msgstr ""
+msgstr "Mokesčių deklaravimas"
#. module: account
#: help:account.bank.statement,name:0
@@ -3607,6 +3802,9 @@
"be with same name as statement name. This allows the statement entries to "
"have the same references than the statement itself"
msgstr ""
+"Jeigu įvesti kitą pavadinimą vietoj „/“, tuomet sukurtų DK įrašų pavadinimai "
+"bus tokie pat kaip ir šio banko išrašo. Banko išrašo tranzakcijų numeriai "
+"skirsis nuo banko išrašo numerio."
#. module: account
#: code:addons/account/account_invoice.py:984
@@ -3640,7 +3838,7 @@
#: view:account.bank.statement:0
#: field:account.cashbox.line,subtotal_opening:0
msgid "Opening Subtotal"
-msgstr ""
+msgstr "Atidarymo suma"
#. module: account
#: constraint:account.move.line:0
@@ -3652,7 +3850,7 @@
#. module: account
#: field:account.financial.report,display_detail:0
msgid "Display details"
-msgstr ""
+msgstr "Rodyti detaliai"
#. module: account
#: report:account.overdue:0
@@ -3665,6 +3863,8 @@
"The amount expressed in the related account currency if not equal to the "
"company one."
msgstr ""
+"Suma išreikšta susijusios finansinės sąskaitos valiuta, jeigu valiuta "
+"skiriasi nuo pagrindinės įmonės valiutos."
#. module: account
#: help:account.config.settings,paypal_account:0
@@ -3690,19 +3890,19 @@
#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
msgid "Unreconcile Entries"
-msgstr "Panaikinti sugretinimą"
+msgstr "Panaikinti sudengimą"
#. module: account
#: field:account.tax.code,notprintable:0
#: field:account.tax.code.template,notprintable:0
msgid "Not Printable in Invoice"
-msgstr "Sąskaitoje faktūroje nėra spausdinama"
+msgstr "Nespausdinti sąskaitoje faktūroje"
#. module: account
#: report:account.vat.declaration:0
#: field:account.vat.declaration,chart_tax_id:0
msgid "Chart of Tax"
-msgstr ""
+msgstr "Mokesčių lentelė"
#. module: account
#: view:account.journal:0
@@ -3734,6 +3934,8 @@
"by\n"
" your supplier/customer."
msgstr ""
+"Bus sukurtas kreditinė sąskaitos faktūros juodraštis, kurį galima keisti, "
+"patvirtinti, arba laukti kol šį dokumentą išrašys jūsų tiekėjas/pirkėjas."
#. module: account
#: view:validate.account.move.lines:0
@@ -3769,7 +3971,7 @@
#: view:cash.box.out:0
#: model:ir.actions.act_window,name:account.action_cash_box_out
msgid "Take Money Out"
-msgstr ""
+msgstr "Išimti pinigus"
#. module: account
#: report:account.vat.declaration:0
@@ -3799,6 +4001,22 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad sukurtumėte pirkėjo sąskaitą faktūrą.\n"
+" </p><p>\n"
+" OpenERP elektroninių sąskaitų faktūrų pagalba, pirkėjų "
+"mokėjimai\n"
+" surenkami patogiau ir greičiau. Jūsų pirkėjas gauna sąskaitą "
+"faktūrą\n"
+" el. paštu, kurią gali apmokėti internetu arba importuoti į "
+"savo\n"
+" naudojamą sistemą.\n"
+" </p><p>\n"
+" Bendravimo istorija su pirkėju automatiškai rodoma "
+"kiekvienos\n"
+" sąskaitos faktūros apačioje.\n"
+" </p>\n"
+" "
#. module: account
#: field:account.tax.code,name:0
@@ -3811,17 +4029,17 @@
#: view:account.invoice:0
#: model:process.node,name:account.process_node_draftinvoices0
msgid "Draft Invoice"
-msgstr "Sąskaitos faktūros juodraštis"
+msgstr "SĄSKAITOS JUODRAŠTIS"
#. module: account
#: view:account.config.settings:0
msgid "Options"
-msgstr "Nustatymai"
+msgstr "Pasirinkimai"
#. module: account
#: field:account.aged.trial.balance,period_length:0
msgid "Period Length (days)"
-msgstr ""
+msgstr "Laikotarpis (dienomis)"
#. module: account
#: code:addons/account/account.py:1327
@@ -3834,7 +4052,7 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
msgid "Print Sale/Purchase Journal"
-msgstr ""
+msgstr "Spausdinti pirkimų/pardavimų žurnalą"
#. module: account
#: view:account.installer:0
@@ -3845,7 +4063,7 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,categ_id:0
msgid "Category of Product"
-msgstr ""
+msgstr "Produkto kategorija"
#. module: account
#: code:addons/account/account.py:930
@@ -3875,7 +4093,7 @@
#. module: account
#: view:account.move.line:0
msgid "Unreconciled Journal Items"
-msgstr "Nesugretintos įrašų eilutės"
+msgstr "Nesudengti DK įrašai"
#. module: account
#: selection:account.account.type,close_method:0
@@ -3908,7 +4126,7 @@
#. module: account
#: view:account.tax.chart:0
msgid "(If you do not select period it will take all open periods)"
-msgstr ""
+msgstr "(Jeigu nenurodysite periodo, bus naudojami visi atviri periodai)"
#. module: account
#: model:ir.model,name:account.model_account_journal_cashbox_line
@@ -3924,7 +4142,7 @@
#: view:account.chart:0
msgid "(If you do not select Fiscal year it will take all open fiscal years)"
msgstr ""
-"(Jeigu nenurodysite fiskalinių metų, bus pasirinkti visi atviri fiskaliniai "
+"(Jeigu nenurodysite finansinių metų, bus naudojami visi atviri finansiniai "
"metai)"
#. module: account
@@ -3972,13 +4190,13 @@
#. module: account
#: view:account.move:0
msgid "Post"
-msgstr ""
+msgstr "Registruoti"
#. module: account
#: view:account.unreconcile:0
#: view:account.unreconcile.reconcile:0
msgid "Unreconcile"
-msgstr "Panaikinti sugretinimą"
+msgstr "Panaikinti sudengimą"
#. module: account
#: view:account.chart.template:0
@@ -4025,18 +4243,18 @@
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
msgid "No Filters"
-msgstr ""
+msgstr "Be filtro"
#. module: account
#: view:account.invoice.report:0
#: model:res.groups,name:account.group_proforma_invoices
msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "Išankstinės sąskaitos"
#. module: account
#: view:res.partner:0
msgid "History"
-msgstr ""
+msgstr "Istorija"
#. module: account
#: help:account.tax,applicable_type:0
@@ -4045,6 +4263,8 @@
"If not applicable (computed through a Python code), the tax won't appear on "
"the invoice."
msgstr ""
+"Jeigu netaikomas (apskaičiuota pagal Python kodą), mokestis nebus naudojamas "
+"sąskaitoje faktūroje."
#. module: account
#: field:account.config.settings,group_check_supplier_invoice_total:0
@@ -4068,7 +4288,7 @@
#: view:account.invoice.report:0
#: field:account.invoice.report,product_qty:0
msgid "Qty"
-msgstr ""
+msgstr "Kiekis"
#. module: account
#: help:account.tax.code,sign:0
@@ -4077,6 +4297,9 @@
"the amount of this case into its parent. For example, set 1/-1 if you want "
"to add/substract it."
msgstr ""
+"Įveskite koeficientą, kuris bus naudojamas tėviniame mokesčių kode "
+"konsoliduojant šio mokesčių kodo sumą. Pavyzdžiui, įvedus 1 suma bus "
+"pridedama, įvedus -1 suma bus atimama."
#. module: account
#: view:account.analytic.line:0
@@ -4104,14 +4327,13 @@
msgid ""
"Check this option if you want the user to reconcile entries in this account."
msgstr ""
-"Pažymėkite, jeigu norite, kad vartotojas galėtų kurti sugretinimo įrašus "
-"šiai sąskaitai."
+"Pažymėkite, jeigu norite, kad naudotojas galėtų kurti sudengti šią sąskaitą."
#. module: account
#: report:account.invoice:0
#: field:account.invoice.line,price_unit:0
msgid "Unit Price"
-msgstr "Vieneto kaina"
+msgstr "Kaina"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tree1
@@ -4121,7 +4343,7 @@
#. module: account
#: field:analytic.entries.report,nbr:0
msgid "#Entries"
-msgstr ""
+msgstr "# įrašų"
#. module: account
#: view:account.state.open:0
@@ -4136,7 +4358,7 @@
#. module: account
#: field:account.config.settings,complete_tax_set:0
msgid "Complete set of taxes"
-msgstr ""
+msgstr "Pilnas mokesčių rinkinys"
#. module: account
#: field:account.account,name:0
@@ -4176,7 +4398,7 @@
#: model:ir.actions.act_window,name:account.action_bank_tree
#: model:ir.ui.menu,name:account.menu_action_bank_tree
msgid "Setup your Bank Accounts"
-msgstr ""
+msgstr "Banko sąskaitų nustatymai"
#. module: account
#: xsl:account.transfer:0
@@ -4187,12 +4409,12 @@
#: help:account.bank.statement,message_ids:0
#: help:account.invoice,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Žinučių ir pranešimų istorija"
#. module: account
#: help:account.journal,analytic_journal_id:0
msgid "Journal for analytic entries"
-msgstr ""
+msgstr "Žurnalas analitiniams įrašams"
#. module: account
#: constraint:account.aged.trial.balance:0
@@ -4213,6 +4435,8 @@
"The fiscalyear, periods or chart of account chosen have to belong to the "
"same company."
msgstr ""
+"Pasirinkti finansiniai metai, periodai ar sąskaitų planas turi priklausyti "
+"tai pačiai įmonei."
#. module: account
#: help:account.tax.code.template,notprintable:0
@@ -4220,6 +4444,8 @@
"Check this box if you don't want any tax related to this tax Code to appear "
"on invoices."
msgstr ""
+"Pažymėkite šį lauką, jeigu nenorite, kad mokesčiai susiję su šiuo mokesčių "
+"kodu būtų rodomi sąskaitose faktūrose"
#. module: account
#: code:addons/account/account_move_line.py:1061
@@ -4245,7 +4471,7 @@
#. module: account
#: view:account.entries.report:0
msgid "Journal Entries with period in current year"
-msgstr ""
+msgstr "Žurnalų įrašai, kurių periodas įeina į einamuosius finansinius metus"
#. module: account
#: field:account.account,child_consol_ids:0
@@ -4269,7 +4495,7 @@
#. module: account
#: view:account.analytic.line:0
msgid "General Accounting"
-msgstr ""
+msgstr "Apskaita"
#. module: account
#: help:account.fiscalyear.close,journal_id:0
@@ -4279,17 +4505,21 @@
"debit/credit accounts, of type 'situation' and with a centralized "
"counterpart."
msgstr ""
+"Geriausia praktika yra naudoti žurnalą specialiai skirtą visų finansinių "
+"metų atidarymo įrašams. Pažymėtina, kad žurnalas privalo turėti nustatytas "
+"kreditinę/debetinę sąskaitas, žurnalo tipas „Atidarymo/Uždarymo situacija“ "
+"ir pažymėta „Bendras koresponduojantis įrašas“."
#. module: account
#: view:account.installer:0
msgid "title"
-msgstr ""
+msgstr "kreipinys"
#. module: account
#: view:account.invoice:0
#: view:account.subscription:0
msgid "Set to Draft"
-msgstr "Nustatyti kaip juodraštį"
+msgstr "Atstatyti į juodraštį"
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form
@@ -4299,7 +4529,7 @@
#. module: account
#: field:account.partner.balance,display_partner:0
msgid "Display Partners"
-msgstr "Atvaizduoti partnerius"
+msgstr "Rodyti partnerius"
#. module: account
#: view:account.invoice:0
@@ -4309,7 +4539,7 @@
#. module: account
#: model:account.financial.report,name:account.account_financial_report_assets0
msgid "Assets"
-msgstr ""
+msgstr "Ilgalaikis turtas"
#. module: account
#: view:account.config.settings:0
@@ -4331,23 +4561,23 @@
#: field:account.common.account.report,display_account:0
#: field:account.report.general.ledger,display_account:0
msgid "Display Accounts"
-msgstr ""
+msgstr "Rodyti sąskaitas"
#. module: account
#: view:account.state.open:0
msgid "(Invoice should be unreconciled if you want to open it)"
msgstr ""
-"(Sąskaita faktūra turi būti nesugretinta, jeigu Jūs norite ją atidaryti)"
+"(Sąskaita faktūra turi būti nesudengta, jeigu Jūs norite ją atidaryti)"
#. module: account
#: field:account.tax,account_analytic_collected_id:0
msgid "Invoice Tax Analytic Account"
-msgstr ""
+msgstr "Mokėtino mokesčio analitinė sąskaita"
#. module: account
#: field:account.chart,period_from:0
msgid "Start period"
-msgstr ""
+msgstr "Pradžios periodas"
#. module: account
#: field:account.tax,name:0
@@ -4380,6 +4610,9 @@
"This payment term will be used instead of the default one for sale orders "
"and customer invoices"
msgstr ""
+"Šios mokėjimo sąlygos naudojamos pardavimų sandėriuose, kai šis kontaktas "
+"yra pirkėjas. Kitu atveju, naudojamos numatytosios pardavimų mokėjimo "
+"sąlygos."
#. module: account
#: view:account.config.settings:0
@@ -4394,26 +4627,28 @@
"If the active field is set to False, it will allow you to hide the account "
"without removing it."
msgstr ""
+"Jeigu aktyvus laukelis nustatytas kaip \"ne\", leidžiame paslėpti sąskaitą, "
+"jos nepašalinus."
#. module: account
#: view:account.move.line:0
msgid "Posted Journal Items"
-msgstr "Patvirtintos įrašų eilutės"
+msgstr "Užregistruoti DK įrašai"
#. module: account
#: field:account.move.line,blocked:0
msgid "No Follow-up"
-msgstr ""
+msgstr "Ginčytinas"
#. module: account
#: view:account.tax.template:0
msgid "Search Tax Templates"
-msgstr ""
+msgstr "Ieškoti Mokesčių šablono"
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
msgid "Draft Entries"
-msgstr ""
+msgstr "Neužregistruoti įrašai"
#. module: account
#: help:account.config.settings,decimal_precision:0
@@ -4427,7 +4662,7 @@
#: field:account.account,shortcut:0
#: field:account.account.template,shortcut:0
msgid "Shortcut"
-msgstr "Nuoroda"
+msgstr "Trumpinys"
#. module: account
#: view:account.account:0
@@ -4483,8 +4718,45 @@
" </p>\n"
" "
msgstr ""
-
-#. module: account
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad nustatytumėte banko sąskaitą. \n"
+" </p><p>\n"
+" Sukonfigūruokite jūsų įmonės banko sąskaitą ir pasirinkite tas,\n"
+" kurios bus rodomos ataskaitų poraštėje.\n"
+" </p><p>\n"
+" Jeigu naudojate OpenERP apskaitos aplikaciją, žurnalai bei\n"
+" sąskaitos bus sukurti automatiškai pagal banko sąskaitos "
+"duomenis.\n"
+" </p>\n"
+" "
+
+#. module: account
+<<<<<<< TREE
+=======
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:423
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Uždaryti kasą"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: constraint:account.tax.code.template:0
msgid ""
"Error!\n"
@@ -4534,7 +4806,7 @@
#: view:analytic.entries.report:0
#: field:analytic.entries.report,product_uom_id:0
msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Matavimo vienetas"
#. module: account
#: field:res.company,paypal_account:0
@@ -4544,12 +4816,12 @@
#. module: account
#: view:account.entries.report:0
msgid "Acc.Type"
-msgstr ""
+msgstr "Sąskaitos tipas"
#. module: account
#: selection:account.journal,type:0
msgid "Bank and Checks"
-msgstr ""
+msgstr "Banko sąskaitos"
#. module: account
#: field:account.account.template,note:0
@@ -4559,30 +4831,30 @@
#. module: account
#: selection:account.financial.report,sign:0
msgid "Reverse balance sign"
-msgstr ""
+msgstr "Priešingas balanso ženklas"
#. module: account
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:191
#, python-format
msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "Balansas (nuosavas kapitalas ir įsipareigojimai)"
#. module: account
#: help:account.invoice,date_invoice:0
msgid "Keep empty to use the current date"
-msgstr ""
+msgstr "Palikite tuščią, jei norite naudoti šiandienos datą"
#. module: account
#: view:account.bank.statement:0
#: field:account.cashbox.line,subtotal_closing:0
msgid "Closing Subtotal"
-msgstr ""
+msgstr "Uždarymo suma"
#. module: account
#: field:account.tax,base_code_id:0
msgid "Account Base Code"
-msgstr ""
+msgstr "Bazės kodas"
#. module: account
#: code:addons/account/account_move_line.py:867
@@ -4616,7 +4888,7 @@
#: code:addons/account/report/common_report_header.py:68
#, python-format
msgid "All Posted Entries"
-msgstr "Visi registruoti įrašai"
+msgstr "Registruoti įrašai"
#. module: account
#: field:report.aged.receivable,name:0
@@ -4659,6 +4931,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Add an internal note..."
+msgstr "Įveskite vidines pastabas..."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
msgid "Set Your Accounting Options"
msgstr ""
@@ -4671,12 +4952,12 @@
#. module: account
#: field:account.invoice,reference_type:0
msgid "Payment Reference"
-msgstr ""
+msgstr "Mokėjimo numeris"
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Main Title 1 (bold, underlined)"
-msgstr ""
+msgstr "Pagrindinis pavadinimas 1 (pusjuodis, pabrauktas)"
#. module: account
#: report:account.analytic.account.balance:0
@@ -4687,7 +4968,7 @@
#. module: account
#: help:account.fiscalyear.close,report_name:0
msgid "Give name of the new entries"
-msgstr ""
+msgstr "Suteikite pavadinimą naujiems įrašams"
#. module: account
#: model:ir.model,name:account.model_account_invoice_report
@@ -4697,7 +4978,7 @@
#. module: account
#: field:account.account,exchange_rate:0
msgid "Exchange Rate"
-msgstr ""
+msgstr "Valiutos kursas"
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -4719,12 +5000,12 @@
#. module: account
#: view:account.bank.statement:0
msgid "Closing Balance"
-msgstr ""
+msgstr "Uždarymo balansas"
#. module: account
#: field:account.chart.template,visible:0
msgid "Can be Visible?"
-msgstr ""
+msgstr "Ar matomas?"
#. module: account
#: model:ir.model,name:account.model_account_journal_select
@@ -4740,7 +5021,7 @@
#: view:account.move.line:0
#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
msgid "Journal Items to Reconcile"
-msgstr ""
+msgstr "Nesudengti DK įrašai"
#. module: account
#: model:ir.model,name:account.model_account_tax_template
@@ -4760,7 +5041,7 @@
#. module: account
#: view:account.tax:0
msgid "Tax Computation"
-msgstr ""
+msgstr "Mokesčio apskaičiavimas"
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -4775,6 +5056,10 @@
"you want to generate accounts of this template only when loading its child "
"template."
msgstr ""
+"Nustatykite lauko reikšmę į neigiamą, jeigu nenorite, kad šis šablonas būtų "
+"matomas sąskaitų plano generavimo vedlyje. Tai naudinga tuomet, kai norite "
+"generuoti šio šablono sąskaitas tik tada, kai yra užkraunamas jo vaikinis "
+"šablonas."
#. module: account
#: view:account.use.model:0
@@ -4785,7 +5070,7 @@
#: field:account.account,reconcile:0
#: field:account.account.template,reconcile:0
msgid "Allow Reconciliation"
-msgstr "Leisti sugretinti"
+msgstr "Leisti sudengti"
#. module: account
#: constraint:account.account:0
@@ -4807,7 +5092,7 @@
#. module: account
#: report:account.vat.declaration:0
msgid "Based On"
-msgstr ""
+msgstr "Pagal"
#. module: account
#: code:addons/account/account.py:3166
@@ -4828,7 +5113,7 @@
#. module: account
#: view:account.tax:0
msgid "Children/Sub Taxes"
-msgstr ""
+msgstr "Vaikiniai mokesčiai"
#. module: account
#: xsl:account.transfer:0
@@ -4848,7 +5133,7 @@
#. module: account
#: view:cash.box.out:0
msgid "Describe why you take money from the cash register:"
-msgstr ""
+msgstr "Parašykite, kodėl pinigai išimami iš kasos:"
#. module: account
#: selection:account.invoice,state:0
@@ -4874,6 +5159,8 @@
"It adds the currency column on report if the currency differs from the "
"company currency."
msgstr ""
+"Ataskaitoje bus pridėta valiutos skiltis, jeigu įrašo valiuta skirsis nuo "
+"įmonės valiutos."
#. module: account
#: code:addons/account/account.py:3356
@@ -4886,12 +5173,12 @@
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
msgid "Generate Entries"
-msgstr ""
+msgstr "Generuoti įrašus"
#. module: account
#: help:account.vat.declaration,chart_tax_id:0
msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Pasirinkite mokesčių lentelę"
#. module: account
#: view:account.fiscal.position:0
@@ -4903,22 +5190,22 @@
#. module: account
#: view:account.bank.statement:0
msgid "Confirmed"
-msgstr ""
+msgstr "Patvirtinta"
#. module: account
#: report:account.invoice:0
msgid "Cancelled Invoice"
-msgstr ""
+msgstr "ATŠAUKTA SĄSKAITA"
#. module: account
#: view:account.invoice:0
msgid "My Invoices"
-msgstr ""
+msgstr "Mano sąskaitos faktūros"
#. module: account
#: selection:account.bank.statement,state:0
msgid "New"
-msgstr ""
+msgstr "Naujas"
#. module: account
#: view:wizard.multi.charts.accounts:0
@@ -4926,6 +5213,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.move:0
+msgid "Cancel Entry"
+msgstr "Atšaukti įrašą"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.tax,ref_tax_code_id:0
#: field:account.tax.template,ref_tax_code_id:0
msgid "Refund Tax Code"
@@ -4934,12 +5229,12 @@
#. module: account
#: view:account.invoice:0
msgid "Invoice "
-msgstr ""
+msgstr "Sąskaita faktūra "
#. module: account
#: field:account.chart.template,property_account_income:0
msgid "Income Account on Product Template"
-msgstr ""
+msgstr "Pajamų sąskaita produkto šablonui"
#. module: account
#: help:account.journal.period,state:0
@@ -4958,7 +5253,7 @@
#. module: account
#: field:account.fiscalyear.close,fy2_id:0
msgid "New Fiscal Year"
-msgstr "Nauji fiskaliniai metai"
+msgstr "Nauji finansiniai metai"
#. module: account
#: view:account.invoice:0
@@ -5022,17 +5317,17 @@
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "or"
-msgstr ""
+msgstr "arba"
#. module: account
#: view:account.invoice.report:0
msgid "Invoiced"
-msgstr ""
+msgstr "Sąskaitos faktūros"
#. module: account
#: view:account.move:0
msgid "Posted Journal Entries"
-msgstr "Patvirtinti įrašai"
+msgstr "Užregistruoti žurnalų įrašai"
#. module: account
#: view:account.use.model:0
@@ -5046,6 +5341,9 @@
"account if this is a Customer Invoice or Supplier Refund, otherwise a "
"Partner bank account number."
msgstr ""
+"Banko sąskaitos numeris, į kurį bus gautas šios sąskaitos apmokėjimas. "
+"Sąskaitos pirkėjui ar grąžinimo tiekėjui atvejais, tai bus įmonės banko "
+"sąskaita, kitais atvejais - kontakto banko sąskaita."
#. module: account
#: field:account.partner.reconcile.process,today_reconciled:0
@@ -5060,7 +5358,7 @@
#. module: account
#: view:account.addtmpl.wizard:0
msgid "Add"
-msgstr ""
+msgstr "Pridėti"
#. module: account
#: selection:account.invoice,state:0
@@ -5077,7 +5375,7 @@
#. module: account
#: help:account.move.line,statement_id:0
msgid "The bank statement used for bank reconciliation"
-msgstr "Banko sąskaitos išrašas naudojamas banko sugretinimui"
+msgstr "Banko sąskaitos išrašas naudojamas sąskaitų sudengimui"
#. module: account
#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
@@ -5090,17 +5388,19 @@
"Set the account that will be set by default on invoice tax lines for "
"invoices. Leave empty to use the expense account."
msgstr ""
+"Pasirinkite sąskaitą, kuri bus nustatoma ant sąskaitų faktūrų mokesčių "
+"eilučių. Palikus tuščią, bus naudojama sąnaudų sąskaita."
#. module: account
#: code:addons/account/account.py:890
#, python-format
msgid "Opening Period"
-msgstr ""
+msgstr "Atidarymo periodas"
#. module: account
#: view:account.move:0
msgid "Journal Entries to Review"
-msgstr "Įrašai peržiūrai"
+msgstr "Žurnalų įrašai, kuriuos reikia peržiūrėti"
#. module: account
#: selection:res.company,tax_calculation_rounding_method:0
@@ -5114,6 +5414,14 @@
msgstr "Skaičiuoti"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.invoice:0
+msgid "Additional notes..."
+msgstr "Papildomos pastabos..."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.tax,type_tax_use:0
msgid "Tax Application"
msgstr "Mokesčio taikymas"
@@ -5140,7 +5448,7 @@
#: view:account.bank.statement:0
#: field:account.journal,cash_control:0
msgid "Cash Control"
-msgstr ""
+msgstr "Pinigų kontrolė"
#. module: account
#: field:account.analytic.balance,date2:0
@@ -5167,10 +5475,16 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account_cash_statement.py:301
#, python-format
msgid "There is no %s Account on the journal %s."
msgstr ""
+=======
+#: view:account.fiscalyear.close:0
+msgid "Generate Fiscal Year Opening Entries"
+msgstr "Generuoti finansinių metų atidarymo įrašus"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:res.groups,name:account.group_account_user
@@ -5192,17 +5506,17 @@
#. module: account
#: field:account.journal,group_invoice_lines:0
msgid "Group Invoice Lines"
-msgstr ""
+msgstr "Grupuoti sąskaitos faktūros eilutes"
#. module: account
#: view:account.automatic.reconcile:0
msgid "Close"
-msgstr "Uždaryta"
+msgstr "Užverti"
#. module: account
#: field:account.bank.statement.line,move_ids:0
msgid "Moves"
-msgstr "DK įrašai"
+msgstr "Žurnalo įrašas"
#. module: account
#: field:account.bank.statement,details_ids:0
@@ -5216,6 +5530,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.bank.statement:0
+msgid "Cancel Statement"
+msgstr "Atšaukti išrašą"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.config.settings,module_account_accountant:0
msgid ""
"If you do not check this box, you will be able to do invoicing & payments, "
@@ -5225,7 +5547,7 @@
#. module: account
#: view:account.period:0
msgid "To Close"
-msgstr ""
+msgstr "Atidaryta"
#. module: account
#: field:account.treasury.report,date:0
@@ -5290,7 +5612,7 @@
#: field:account.vat.declaration,target_move:0
#: field:accounting.report,target_move:0
msgid "Target Moves"
-msgstr "Parinkti įrašai"
+msgstr "Rodyti įrašus"
#. module: account
#: code:addons/account/account.py:1416
@@ -5303,7 +5625,7 @@
#: view:account.bank.statement:0
#: help:account.cashbox.line,number_opening:0
msgid "Opening Unit Numbers"
-msgstr ""
+msgstr "Atidarymo kupiūrų kiekis"
#. module: account
#: field:account.subscription,period_type:0
@@ -5342,6 +5664,9 @@
"encode the sale and purchase rates or choose from list of taxes. This last "
"choice assumes that the set of tax defined on this template is complete"
msgstr ""
+"Šis laukas leidžia pasirinkti, ar naudotojas turės pats įvesti mokesčių "
+"tarifą ar pasirinkti iš mokesčių sąrašo. Pažymėtas laukas reikš, kad šiam "
+"šablonui yra apibrėžtas pilnas mokesčių rinkinys"
#. module: account
#: view:account.financial.report:0
@@ -5361,12 +5686,12 @@
#: view:report.account_type.sales:0
#: field:report.account_type.sales,name:0
msgid "Year"
-msgstr ""
+msgstr "Metai"
#. module: account
#: help:account.invoice,sent:0
msgid "It indicates that the invoice has been sent."
-msgstr ""
+msgstr "Tai parodo, kad sąskaita-faktūra buvo išsiųsta."
#. module: account
#: field:account.tax.template,description:0
@@ -5396,37 +5721,37 @@
#: view:account.move.line:0
#: field:account.partner.reconcile.process,next_partner_id:0
msgid "Next Partner to Reconcile"
-msgstr ""
+msgstr "Kitas partneris sudengimui"
#. module: account
#: field:account.invoice.tax,account_id:0
#: field:account.move.line,tax_code_id:0
msgid "Tax Account"
-msgstr "Mokesčių sąskaita"
+msgstr "Mokesčio sąskaita"
#. module: account
#: model:account.financial.report,name:account.account_financial_report_balancesheet0
#: model:ir.actions.act_window,name:account.action_account_report_bs
#: model:ir.ui.menu,name:account.menu_account_report_bs
msgid "Balance Sheet"
-msgstr ""
+msgstr "Balansas"
#. module: account
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:188
#, python-format
msgid "Profit & Loss (Income account)"
-msgstr ""
+msgstr "Pelnas/nuostolis (pajamų sąskaita)"
#. module: account
#: field:account.journal,allow_date:0
msgid "Check Date in Period"
-msgstr ""
+msgstr "Tikrinti periodą pagal datą"
#. module: account
#: model:ir.ui.menu,name:account.final_accounting_reports
msgid "Accounting Reports"
-msgstr "Apskaitos ataskaitos"
+msgstr "Finansinės ataskaitos"
#. module: account
#: field:account.move,line_id:0
@@ -5438,7 +5763,7 @@
#. module: account
#: view:account.entries.report:0
msgid "This Period"
-msgstr ""
+msgstr "Einamasis periodas"
#. module: account
#: view:account.tax.template:0
@@ -5486,13 +5811,13 @@
#: field:cash.box.in,amount:0
#: field:cash.box.out,amount:0
msgid "Amount"
-msgstr "Kiekis"
+msgstr "Suma"
#. module: account
#: code:addons/account/wizard/account_fiscalyear_close.py:41
#, python-format
msgid "End of Fiscal Year Entry"
-msgstr "Fiskalinių metų pabaigos įrašai"
+msgstr "Finansinių metų pabaigos operacijos"
#. module: account
#: model:process.transition,name:account.process_transition_customerinvoice0
@@ -5502,7 +5827,7 @@
#: model:process.transition,name:account.process_transition_suppliervalidentries0
#: model:process.transition,name:account.process_transition_validentries0
msgid "Validation"
-msgstr ""
+msgstr "Patvirtinimas"
#. module: account
#: help:account.bank.statement,message_summary:0
@@ -5511,12 +5836,14 @@
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Saugo pokalbių suvestinę (žinučių skaičius, ...). Ši apžvalga saugoma html "
+"formatu, kad būtų galima įterpti į kanban rodinius."
#. module: account
#: field:account.tax,child_depend:0
#: field:account.tax.template,child_depend:0
msgid "Tax on Children"
-msgstr ""
+msgstr "Pagal vaikinę vertę"
#. module: account
#: help:res.partner,last_reconciliation_date:0
@@ -5546,12 +5873,12 @@
#. module: account
#: field:account.tax.code,sign:0
msgid "Coefficent for parent"
-msgstr ""
+msgstr "Ženklas"
#. module: account
#: report:account.partner.balance:0
msgid "(Account/Partner) Name"
-msgstr ""
+msgstr "(Sąskaitos/Partnerio) pavadinimas"
#. module: account
#: field:account.partner.reconcile.process,progress:0
@@ -5571,7 +5898,7 @@
#. module: account
#: view:account.invoice:0
msgid "Recompute taxes and total"
-msgstr ""
+msgstr "Perskaičiuoti mokesčius bei bendrą sumą"
#. module: account
#: code:addons/account/account.py:1103
@@ -5582,12 +5909,12 @@
#. module: account
#: field:account.tax.template,include_base_amount:0
msgid "Include in Base Amount"
-msgstr "Įtraukti į pagrindinę sumą"
+msgstr "Įtraukti į bazinę sumą"
#. module: account
#: field:account.invoice,supplier_invoice_number:0
msgid "Supplier Invoice Number"
-msgstr ""
+msgstr "Tiekėjo SF numeris"
#. module: account
#: help:account.payment.term.line,days:0
@@ -5601,7 +5928,7 @@
#. module: account
#: view:account.payment.term.line:0
msgid "Amount Computation"
-msgstr ""
+msgstr "Sumos apskaičiavimas"
#. module: account
#: code:addons/account/account_move_line.py:1108
@@ -5665,12 +5992,15 @@
"that you should have your last line with the type 'Balance' to ensure that "
"the whole amount will be treated."
msgstr ""
+"Pasirinkite mokėjimo termino eilutės apskaičiavimo būdą. Pažymėtina, "
+"paskutinėje eilutėje reikia pasirinkti „Balansas“, tam kad užtikrintumėte, "
+"jog bus apdorota visa suma."
#. module: account
#: field:account.partner.ledger,initial_balance:0
#: field:account.report.general.ledger,initial_balance:0
msgid "Include Initial Balances"
-msgstr "Pridėti pradinį balansą"
+msgstr "Įtraukti pradinį balansą"
#. module: account
#: view:account.invoice.tax:0
@@ -5700,23 +6030,23 @@
#. module: account
#: field:account.fiscalyear,end_journal_period_id:0
msgid "End of Year Entries Journal"
-msgstr "Fiskalinių metų uždarymo įrašų žurnalas"
+msgstr "Finansinių metų uždarymo įrašų žurnalas"
#. module: account
#: view:account.invoice:0
msgid "Draft Refund "
-msgstr ""
+msgstr "Kreditinės sąskaitos faktūros juodraštis "
#. module: account
#: view:cash.box.in:0
msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Užpildykite šią formą norėdami įnešti pinigus į kasą:"
#. module: account
#: view:account.payment.term.line:0
#: field:account.payment.term.line,value_amount:0
msgid "Amount To Pay"
-msgstr ""
+msgstr "Mokama suma"
#. module: account
#: help:account.partner.reconcile.process,to_reconcile:0
@@ -5743,7 +6073,7 @@
#: selection:account.move,state:0
#: view:account.move.line:0
msgid "Unposted"
-msgstr "Nepatvirtinti"
+msgstr "Neužregistruota"
#. module: account
#: view:account.change.currency:0
@@ -5761,7 +6091,7 @@
#. module: account
#: view:account.invoice:0
msgid "Payment Date"
-msgstr ""
+msgstr "Apmokėjimo data"
#. module: account
#: view:account.bank.statement:0
@@ -5779,7 +6109,7 @@
#. module: account
#: view:account.invoice.report:0
msgid "Customer Invoices And Refunds"
-msgstr ""
+msgstr "Pirkėjui išrašytos S/F"
#. module: account
#: field:account.analytic.line,amount_currency:0
@@ -5813,11 +6143,27 @@
#: view:account.move.line:0
msgid "Number (Move)"
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad sukurtumėte žurnalo įrašą.\n"
+" </p><p>\n"
+" Žurnalo įrašas sudarytas iš keleto DK įrašų, kurių "
+"kiekvienas\n"
+" yra debitinė arba kreditinė tranzakcija.\n"
+" </p><p>\n"
+" OpenERP automatiškai sukuria žurnalų įrašus pagal "
+"dokumentus:\n"
+" sąskaita faktūra, kreditinė sąskaita faktūra, tiekėjo "
+"mokėjimas, banko išrašas\n"
+" ir t.t. Taigi, žurnalų įrašus rankiniu būdu kurkite "
+"tik/pagrinde \n"
+" išskirtinėms operacijoms.\n"
+" </p>\n"
+" "
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Normal Text"
-msgstr ""
+msgstr "Paprastas tekstas"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -5830,13 +6176,15 @@
"This payment term will be used instead of the default one for purchase "
"orders and supplier invoices"
msgstr ""
+"Šios mokėjimo sąlygos naudojamos pirkimų sandėriuose, kai šis kontaktas yra "
+"tiekėjas. Kitu atveju, naudojamos numatytosios pirkimų mokėjimo sąlygos."
#. module: account
#: help:account.automatic.reconcile,power:0
msgid ""
"Number of partial amounts that can be combined to find a balance point can "
"be chosen as the power of the automatic reconciliation"
-msgstr ""
+msgstr "Skaičius įrašų, kurie gali būti apjungti į sudengimą."
#. module: account
#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
@@ -5848,19 +6196,19 @@
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
-msgstr "Fiskalinės pozicijos šablonas"
+msgstr "Mokestinės aplinkos šablonas"
#. module: account
#: view:account.invoice:0
msgid "Draft Refund"
-msgstr ""
+msgstr "Kreditinės sąskaitos faktūros juodraštis"
#. module: account
#: view:account.analytic.chart:0
#: view:account.chart:0
#: view:account.tax.chart:0
msgid "Open Charts"
-msgstr "Aktyvūs planai"
+msgstr "Rodyti planą"
#. module: account
#: field:account.central.journal,amount_currency:0
@@ -5875,17 +6223,17 @@
#. module: account
#: view:account.bank.statement:0
msgid "Open CashBox"
-msgstr ""
+msgstr "Atidaryti kasą"
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Automatic formatting"
-msgstr ""
+msgstr "Automatinis formatavimas"
#. module: account
#: view:account.move.line.reconcile:0
msgid "Reconcile With Write-Off"
-msgstr "Sugretinti su nurašymu"
+msgstr "Sudengti su nurašymu"
#. module: account
#: constraint:account.move.line:0
@@ -5907,19 +6255,19 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
msgid "Account Automatic Reconcile"
-msgstr ""
+msgstr "Automatizuotas sąskaitų sudengimas"
#. module: account
#: view:account.move:0
#: view:account.move.line:0
msgid "Journal Item"
-msgstr "Įrašo eilutė"
+msgstr "DK įrašas"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
#: model:ir.ui.menu,name:account.menu_wizard_fy_close
msgid "Generate Opening Entries"
-msgstr ""
+msgstr "Generuoti atidarymo įrašus"
#. module: account
#: help:account.tax,type:0
@@ -5929,12 +6277,12 @@
#. module: account
#: view:account.payment.term.line:0
msgid "Due Date Computation"
-msgstr ""
+msgstr "Mokėjimo termino skaičiavimas"
#. module: account
#: field:report.invoice.created,create_date:0
msgid "Create Date"
-msgstr ""
+msgstr "Sukūrimo data"
#. module: account
#: view:account.analytic.journal:0
@@ -5942,7 +6290,7 @@
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
#: model:ir.ui.menu,name:account.account_def_analytic_journal
msgid "Analytic Journals"
-msgstr "Analitinis žurnalas"
+msgstr "Analitiniai žurnalai"
#. module: account
#: field:account.account,child_id:0
@@ -5965,12 +6313,12 @@
#. module: account
#: view:account.entries.report:0
msgid "entries"
-msgstr ""
+msgstr "Neužregistruoti įrašai"
#. module: account
#: field:res.partner,debit:0
msgid "Total Payable"
-msgstr "Visos mokėtinos sumos"
+msgstr "Bendra mokėtina suma"
#. module: account
#: model:account.account.type,name:account.data_account_type_income
@@ -6006,7 +6354,7 @@
#: code:addons/account/account_invoice.py:92
#, python-format
msgid "Free Reference"
-msgstr "Nuoroda"
+msgstr "Numeris"
#. module: account
#: selection:account.aged.trial.balance,result_selection:0
@@ -6016,7 +6364,7 @@
#: code:addons/account/report/account_partner_balance.py:301
#, python-format
msgid "Receivable and Payable Accounts"
-msgstr "Debetinės ir kreditinės sąskaitos"
+msgstr "Debitorių ir kreditorių sąskaitos"
#. module: account
#: field:account.fiscal.position.account.template,position_id:0
@@ -6043,7 +6391,7 @@
#: view:account.invoice:0
#: model:ir.actions.act_window,name:account.action_account_invoice_refund
msgid "Refund Invoice"
-msgstr "Grąžinti sąskaitą faktūrą"
+msgstr "Sąskaitos kreditavimas"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_entries_report_all
@@ -6085,17 +6433,31 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad sukurtumėte sąskaitą.\n"
+" </p><p>\n"
+" Sąskaita yra Didžiosios knygos dalis, kurioje "
+"registruojamos\n"
+" visų rūšių debetinės ir kreditinės operacijos.\n"
+" Įmonės pateikia savo metines sąskaitų suvestines šiose "
+"ataskaitose:\n"
+" balanso ataskaitoje bei pelno/nuostolio ataskaitoje (pajamų "
+"bei sąnaudų sąskaitoms).\n"
+" Metinės sąskaitų suvestinės sudaromos įstatymo reikalvimu,\n"
+" kad būtų atskleidžiama tam tikra informacija.\n"
+" </p>\n"
+" "
#. module: account
#: view:account.invoice.report:0
#: field:account.invoice.report,nbr:0
msgid "# of Lines"
-msgstr ""
+msgstr "# eilučių"
#. module: account
#: view:account.invoice:0
msgid "(update)"
-msgstr ""
+msgstr "(atnaujinti)"
#. module: account
#: field:account.aged.trial.balance,filter:0
@@ -6114,7 +6476,7 @@
#: field:accounting.report,filter:0
#: field:accounting.report,filter_cmp:0
msgid "Filter by"
-msgstr ""
+msgstr "Filtruoti pagal"
#. module: account
#: code:addons/account/account.py:2296
@@ -6130,24 +6492,24 @@
#. module: account
#: help:account.bank.statement,balance_end:0
msgid "Balance as calculated based on Starting Balance and transaction lines"
-msgstr ""
+msgstr "Balansas apskaičiuotas pagal pradžios likutį bei tranzakcijų eilutes"
#. module: account
#: field:account.journal,loss_account_id:0
msgid "Loss Account"
-msgstr ""
+msgstr "Sąnaudų sąskaita"
#. module: account
#: field:account.tax,account_collected_id:0
#: field:account.tax.template,account_collected_id:0
msgid "Invoice Tax Account"
-msgstr "Sąsk. fakt. mokesčių sąskaitą"
+msgstr "Mokėtino mokesčio sąskaita"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_general_journal
#: model:ir.model,name:account.model_account_general_journal
msgid "Account General Journal"
-msgstr "Sąskaitos bendrasis žurnalas"
+msgstr "Spausdinti bendrąjį žurnalą"
#. module: account
#: help:account.move,state:0
@@ -6175,7 +6537,7 @@
#. module: account
#: view:account.financial.report:0
msgid "Report"
-msgstr ""
+msgstr "Ataskaita"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
@@ -6204,12 +6566,12 @@
#: model:ir.actions.act_window,name:account.action_invoice_tree3
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
msgid "Customer Refunds"
-msgstr "Kliento grąžinimai"
+msgstr "Pirkėjo grąžinimai"
#. module: account
#: field:account.account,foreign_balance:0
msgid "Foreign Balance"
-msgstr ""
+msgstr "Balansas antrine valiuta"
#. module: account
#: field:account.journal.period,name:0
@@ -6234,7 +6596,7 @@
#. module: account
#: view:account.subscription:0
msgid "Running Subscription"
-msgstr ""
+msgstr "Aktyvios periodinės operacijos"
#. module: account
#: report:account.invoice:0
@@ -6246,7 +6608,7 @@
#: model:ir.actions.act_window,name:account.action_analytic_entries_report
#: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
msgid "Analytic Entries Analysis"
-msgstr ""
+msgstr "Analitinių įrašų analizė"
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
@@ -6259,6 +6621,8 @@
"This journal will be created automatically for this bank account when you "
"save the record"
msgstr ""
+"Žurnalas bus sukurtas automatiškai pagal šios banko sąskaitos duomenis, kai "
+"tik išsaugosite šį įrašą"
#. module: account
#: view:account.analytic.line:0
@@ -6269,12 +6633,12 @@
#: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Pranešimas apie pradelstą mokėjimą"
#. module: account
#: field:account.entries.report,date_created:0
msgid "Date Created"
-msgstr ""
+msgstr "Sukūrimo data"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
@@ -6308,7 +6672,7 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_action_model_form
msgid "Models"
-msgstr ""
+msgstr "Modeliai"
#. module: account
#: code:addons/account/account_invoice.py:1091
@@ -6326,7 +6690,7 @@
#. module: account
#: help:account.model,name:0
msgid "This is a model for recurring accounting entries"
-msgstr "Modelis skirtas pasikartojantiems sąskaitų įrašams"
+msgstr "Modelis skirtas pasikartojantiems DK įrašams"
#. module: account
#: field:wizard.multi.charts.accounts,sale_tax_rate:0
@@ -6336,7 +6700,7 @@
#. module: account
#: view:account.tax.code:0
msgid "Reporting Configuration"
-msgstr ""
+msgstr "Spausdinimo nustatymai"
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -6351,6 +6715,15 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad sukurtumėte iš tiekėjo gautą kreditinę S/F.\n"
+" </p><p>\n"
+" Vietoj to, kad įvestumėte tiekėjo kreditinę sąskaitą "
+"faktūrą, \n"
+" galite ją automatiškai sugeneruoti ir sudengti su susijusia "
+"tiekėjo S/F.\n"
+" </p>\n"
+" "
#. module: account
#: field:account.tax,type:0
@@ -6377,32 +6750,32 @@
#. module: account
#: report:account.vat.declaration:0
msgid "Tax Statement"
-msgstr ""
+msgstr "Mokesčių ataskaita"
#. module: account
#: model:ir.model,name:account.model_res_company
msgid "Companies"
-msgstr ""
+msgstr "Įmonės"
#. module: account
#: view:account.invoice.report:0
msgid "Open and Paid Invoices"
-msgstr ""
+msgstr "Atviros bei apmokėtos S/F"
#. module: account
#: selection:account.financial.report,display_detail:0
msgid "Display children flat"
-msgstr ""
+msgstr "Rodyti vaikines ataskaitas vientisai"
#. module: account
#: view:account.config.settings:0
msgid "Bank & Cash"
-msgstr ""
+msgstr "Pinigai"
#. module: account
#: help:account.fiscalyear.close.state,fy_id:0
msgid "Select a fiscal year to close"
-msgstr ""
+msgstr "Pasirinkite finansinius metus, kuriuos uždarysite"
#. module: account
#: help:account.chart.template,tax_template_ids:0
@@ -6423,7 +6796,7 @@
#: field:account.chart,fiscalyear:0
#: view:account.fiscalyear:0
msgid "Fiscal year"
-msgstr "Fiskaliniai metai"
+msgstr "Finansiniai metai"
#. module: account
#: view:account.move.reconcile:0
@@ -6528,7 +6901,7 @@
#. module: account
#: field:account.journal,internal_account_id:0
msgid "Internal Transfers Account"
-msgstr ""
+msgstr "Vidinio perkėlimo sąskaita"
#. module: account
#: code:addons/account/wizard/pos_box.py:33
@@ -6539,7 +6912,7 @@
#. module: account
#: selection:account.tax,type:0
msgid "Percentage"
-msgstr ""
+msgstr "Procentinė dalis"
#. module: account
#: selection:account.config.settings,tax_calculation_rounding_method:0
@@ -6563,6 +6936,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.invoice:0
+msgid "force period"
+msgstr "periodas"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: view:project.account.analytic.line:0
msgid "View Account Analytic Lines"
msgstr "Peržiūrėti sąskaitos analitinius įrašus"
@@ -6584,6 +6965,8 @@
"Indicates if the amount of tax must be included in the base amount for the "
"computation of the next taxes"
msgstr ""
+"Pasirinkite ar mokesčio suma turi būti pridėta prie bazinės sumos prieš "
+"skaičiuojant kitus mokesčius."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
@@ -6610,6 +6993,12 @@
"due date, make sure that the payment term is not set on the invoice. If you "
"keep the payment term and the due date empty, it means direct payment."
msgstr ""
+"Jeigu pasirinksite mokėjimo sąlygas, mokėjimo terminas bus paskaičiuotas "
+"automatiškai sukuriant DK įrašus. Mokėjimo sąlygos gali apibrėžti keletą "
+"mokėjimo terminų, pavyzdžiui 50% dabar, 50% per vieną mėnesį. Jeigu norite "
+"įvesti savo mokėjimo terminą, įsitikinkite, kad mokėjimo sąlygos nėra "
+"pasirinktos šioje sąskaitoje. Nepasirinkus mokėjimo sąlygų bei mokėjimo "
+"termino, bus laikoma, kad apmokama iš karto."
#. module: account
#: code:addons/account/account.py:414
@@ -6628,6 +7017,9 @@
"higher ones. The order is important if you have a tax that has several tax "
"children. In this case, the evaluation order is important."
msgstr ""
+"Sekos laukas naudojamas surikiuoti mokesčių eilutes nuo žemiausio iki "
+"aukščiausio. Seka yra svarbi jeigu jūs turite mokesčių su keletą vaikinių "
+"mokesčių. Šiuo atveju vertinimo seka yra svarbi."
#. module: account
#: code:addons/account/account.py:1410
@@ -6644,25 +7036,25 @@
#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
#, python-format
msgid "User Error!"
-msgstr ""
+msgstr "Naudotojo klaida!"
#. module: account
#: view:account.open.closed.fiscalyear:0
msgid "Discard"
-msgstr ""
+msgstr "Atmesti"
#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: view:account.journal:0
msgid "Liquidity"
-msgstr ""
+msgstr "Pinigai"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
#: model:ir.ui.menu,name:account.account_analytic_journal_entries
msgid "Analytic Journal Items"
-msgstr "Analitinių įrašų eilutės"
+msgstr "Analitinio žurnalo įrašai"
#. module: account
#: field:account.config.settings,has_default_company:0
@@ -6676,11 +7068,14 @@
"year. Note that you can run this wizard many times for the same fiscal year: "
"it will simply replace the old opening entries with the new ones."
msgstr ""
+"Šis vedlys sukurs pasirinktų finansinių metų uždarymo įrašus. Pažymėtina, "
+"kad vykdant šį veiksmą keletą kartų, tiems patiems finansiniams metams, bus "
+"tiesiog pakeičiami senesni atidarymo įrašais su naujesniais."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
msgid "Bank and Cash"
-msgstr "Bankas ir Kasa"
+msgstr "Pinigai"
#. module: account
#: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -6715,7 +7110,7 @@
#: selection:account.invoice.report,type:0
#: selection:report.invoice.created,type:0
msgid "Supplier Refund"
-msgstr "Grąžinimas tiekėjui"
+msgstr "TIEKĖJO KREDITINĖ SĄSKAITA"
#. module: account
#: field:account.bank.statement,move_line_ids:0
@@ -6748,7 +7143,7 @@
#: view:account.tax.code.template:0
#: view:analytic.entries.report:0
msgid "Group By..."
-msgstr ""
+msgstr "Grupuoti pagal..."
#. module: account
#: code:addons/account/account.py:1024
@@ -6771,6 +7166,8 @@
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
msgstr ""
+"Pažymėjus šį lauiką, sistema bandys sugrupuoti DK įrašus, kuomet jie kuriami "
+"pagal sąskaitą faktūrą."
#. module: account
#: field:account.installer,has_default_company:0
@@ -6797,7 +7194,7 @@
#. module: account
#: view:account.entries.report:0
msgid "Reconciled"
-msgstr ""
+msgstr "Sudengta"
#. module: account
#: constraint:account.payment.term.line:0
@@ -6820,7 +7217,7 @@
#. module: account
#: field:account.chart.template,property_account_expense_categ:0
msgid "Expense Category Account"
-msgstr "Išlaidų kategorijos sąskaita"
+msgstr "Sąnaudų kategorijos sąskaita"
#. module: account
#: sql_constraint:account.tax:0
@@ -6830,7 +7227,7 @@
#. module: account
#: view:account.bank.statement:0
msgid "Cash Transactions"
-msgstr ""
+msgstr "Pinigų tranzakcijos"
#. module: account
#: view:account.unreconcile:0
@@ -6864,7 +7261,7 @@
#. module: account
#: help:res.partner.bank,currency_id:0
msgid "Currency of the related account journal."
-msgstr ""
+msgstr "Susijusio žurnalo valiuta."
#. module: account
#: constraint:account.move.line:0
@@ -6883,7 +7280,7 @@
#: code:addons/account/account.py:190
#, python-format
msgid "Balance Sheet (Asset account)"
-msgstr ""
+msgstr "Balansas (turtas)"
#. module: account
#: model:process.node,note:account.process_node_draftstatement0
@@ -6898,7 +7295,7 @@
#. module: account
#: view:account.move.line:0
msgid "Next Partner Entries to reconcile"
-msgstr ""
+msgstr "Sudengti kito partnerio DK įrašus"
#. module: account
#: report:account.invoice:0
@@ -6910,8 +7307,7 @@
msgid ""
"This account will be used instead of the default one as the receivable "
"account for the current partner"
-msgstr ""
-"Ši sąskaita bus naudojama vietoj numatytosios, pirkėjo skolai žymėti."
+msgstr "Sąskaita naudojama apskaityti gautinoms sumoms iš šio kontakto."
#. module: account
#: field:account.tax,python_applicable:0
@@ -6927,7 +7323,7 @@
#. module: account
#: view:account.entries.report:0
msgid "Journal Entries with period in current period"
-msgstr ""
+msgstr "Einamojo periodo žurnalų įrašai"
#. module: account
#: help:account.journal,update_posted:0
@@ -6947,16 +7343,24 @@
msgstr "Sukurti įrašą"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.open.closed.fiscalyear:0
+msgid "Cancel Fiscal Year Closing Entries"
+msgstr "Atšaukti finansinių metų uždarymo įrašus"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: selection:account.account.type,report_type:0
#: code:addons/account/account.py:189
#, python-format
msgid "Profit & Loss (Expense account)"
-msgstr ""
+msgstr "Pelnas/nuostolis (sąnaudų sąskaita)"
#. module: account
#: field:account.bank.statement,total_entry_encoding:0
msgid "Total Transactions"
-msgstr ""
+msgstr "Viso tranzakcijų"
#. module: account
#: code:addons/account/account.py:636
@@ -6969,17 +7373,17 @@
#: code:addons/account/account_move_line.py:1108
#, python-format
msgid "Error !"
-msgstr "Klaida !"
+msgstr "Klaida!"
#. module: account
#: field:account.financial.report,style_overwrite:0
msgid "Financial Report Style"
-msgstr ""
+msgstr "Finansinės ataskaitos stilius"
#. module: account
#: selection:account.financial.report,sign:0
msgid "Preserve balance sign"
-msgstr ""
+msgstr "Išlaikyti balanso ženklą"
#. module: account
#: view:account.vat.declaration:0
@@ -7006,7 +7410,7 @@
#. module: account
#: selection:account.invoice.refund,filter_refund:0
msgid "Cancel: create refund and reconcile"
-msgstr ""
+msgstr "Atšaukti: sukurti kreditinę S/F ir sudengti su šia S/F"
#. module: account
#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7023,12 +7427,16 @@
"reconcile in a series of accounts. It finds entries for each partner where "
"the amounts correspond."
msgstr ""
+"Kad sąskaita faktūra būtų laikoma kaip apmokėta, susijusę DK įrašai turi "
+"būti sudengta su mokėjimais. Vykdant automatizuota sudengimą, OpenERP daro "
+"DK įrašų paiešką sąskaitų grupėse, surandant kontaktų operacijas su "
+"atitinkamomis sumomis."
#. module: account
#: view:account.move:0
#: field:account.move,to_check:0
msgid "To Review"
-msgstr ""
+msgstr "Peržiūrėti"
#. module: account
#: help:account.partner.ledger,initial_balance:0
@@ -7038,6 +7446,8 @@
"row to display the amount of debit/credit/balance that precedes the filter "
"you've set."
msgstr ""
+"Jeigu pasirinkote filtravimą pagal data ir periodą, šis pasirinkimas pridės "
+"eilutę, rodančią debetą/kreditą/balansą iki rodomo laikotarpio."
#. module: account
#: view:account.bank.statement:0
@@ -7046,7 +7456,7 @@
#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
#: model:ir.ui.menu,name:account.menu_finance_entries
msgid "Journal Entries"
-msgstr "Įrašai"
+msgstr "Žurnalų įrašai"
#. module: account
#: code:addons/account/wizard/account_invoice_refund.py:147
@@ -7057,7 +7467,7 @@
#. module: account
#: help:account.partner.ledger,page_split:0
msgid "Display Ledger Report with One partner per page"
-msgstr ""
+msgstr "Rodyti vieną partnerį per puslapį didžiojoje knygoje"
#. module: account
#: report:account.general.ledger:0
@@ -7065,7 +7475,7 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "JRNL"
-msgstr ""
+msgstr "ŽRNL"
#. module: account
#: view:account.state.open:0
@@ -7110,12 +7520,12 @@
#: code:addons/account/account.py:434
#, python-format
msgid "Opening Balance"
-msgstr ""
+msgstr "Atidarymo balansas"
#. module: account
#: model:ir.model,name:account.model_account_move_reconcile
msgid "Account Reconciliation"
-msgstr "Sąskaitos sugretinimas"
+msgstr "Sąskaitos sudengimas"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
@@ -7143,12 +7553,14 @@
"Check this box if you are unsure of that journal entry and if you want to "
"note it as 'to be reviewed' by an accounting expert."
msgstr ""
+"Pažymėkite šį lauką, jeigu nesate tikri dėl šio žurnalo įrašo ir norite "
+"pažymėti, kad šį įrašą turi peržiūrėti buhalteris."
#. module: account
#: field:account.chart.template,complete_tax_set:0
#: field:wizard.multi.charts.accounts,complete_tax_set:0
msgid "Complete Set of Taxes"
-msgstr ""
+msgstr "Pilnas mokesčių rinkinys"
#. module: account
#: code:addons/account/wizard/account_validate_account_move.py:61
@@ -7199,6 +7611,14 @@
"\n"
"e.g. My model on %(date)s"
msgstr ""
+"Modelio pavadinime galite nurodyti metus, mėnesį ar data naudojant šias "
+"žymas:\n"
+"\n"
+"%(year)s: nurodant metus\n"
+"%(month)s: nurodant mėnesį\n"
+"%(date)s: nurodant datą\n"
+"\n"
+"pvz. Mano modelis %(date)s"
#. module: account
#: field:account.invoice,paypal_url:0
@@ -7214,6 +7634,7 @@
#: help:report.invoice.created,origin:0
msgid "Reference of the document that generated this invoice report."
msgstr ""
+"Dokumento numeris, pagal kurį sugeneruota ši sąskaitos faktūros ataskaita."
#. module: account
#: field:account.tax.code,child_ids:0
@@ -7231,23 +7652,31 @@
#. module: account
#: view:account.tax.template:0
msgid "Taxes used in Sales"
-msgstr ""
-
-#. module: account
+msgstr "Mokesčiai naudojami parduodant"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.period:0
+msgid "Re-Open Period"
+msgstr "Atidaryti periodą"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
msgid "Customer Invoices"
-msgstr "Kliento sąskaitos"
+msgstr "Sąskaitos pirkėjui"
#. module: account
#: view:account.tax:0
msgid "Misc"
-msgstr ""
+msgstr "Įvairūs"
#. module: account
#: view:account.analytic.line:0
msgid "Sales"
-msgstr ""
+msgstr "Pardavimai"
#. module: account
#: selection:account.invoice.report,state:0
@@ -7281,18 +7710,36 @@
"you request an interval of 30 days OpenERP generates an analysis of "
"creditors for the past month, past two months, and so on. "
msgstr ""
+"Partnerio skolų balansas yra detalesnės gautinų sumų ataskaita. Prieš "
+"spausdinant ataskaitą reikia pasirinkti įmonę, finansinį periodą ir "
+"laikotarpį (dienomis), kuris bus analizuojamas. OpenERP sugeneruos lentelę "
+"su skolų balansu pagal laikotarpį. Taigi, jeigu pasirinkote 30 dienų "
+"laikotarpį, tuomet OpenERP sugeneruos skolų analizę paskutiniam mėnesiui, "
+"dviem paskutiniams mėnesiams ir t.t. "
#. module: account
#: field:account.invoice,origin:0
#: field:account.invoice.line,origin:0
#: field:report.invoice.created,origin:0
msgid "Source Document"
-msgstr ""
+msgstr "Susijęs dokumentas"
#. module: account
+<<<<<<< TREE
#: help:account.config.settings,company_footer:0
msgid "Bank accounts as printed in the footer of each printed document"
msgstr ""
+=======
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Internal notes..."
+msgstr "Vidinės pastabos..."
+>>>>>>> MERGE-SOURCE
#. module: account
#: constraint:account.account:0
@@ -7333,12 +7780,12 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "Finansinių ataskaitų hierarchiją"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
msgid "Monthly Turnover"
-msgstr ""
+msgstr "Mėnesinė apyvarta"
#. module: account
#: view:account.move:0
@@ -7370,12 +7817,12 @@
#. module: account
#: field:account.chart.template,property_account_expense_opening:0
msgid "Opening Entries Expense Account"
-msgstr ""
+msgstr "Uždarymo įrašų sąnaudų sąskaita"
#. module: account
#: view:account.invoice:0
msgid "Customer Reference"
-msgstr ""
+msgstr "Pirkėjo identifikatorius"
#. module: account
#: field:account.account.template,parent_id:0
@@ -7385,7 +7832,7 @@
#. module: account
#: report:account.invoice:0
msgid "Price"
-msgstr "Kaina"
+msgstr "Suma"
#. module: account
#: view:account.bank.statement:0
@@ -7409,12 +7856,12 @@
#. module: account
#: view:account.entries.report:0
msgid "Posted entries"
-msgstr ""
+msgstr "Užregistruoti įrašai"
#. module: account
#: help:account.payment.term.line,value_amount:0
msgid "For percent enter a ratio between 0-1."
-msgstr ""
+msgstr "Procentams įveskite koeficientą tarp 0-1."
#. module: account
#: report:account.invoice:0
@@ -7427,7 +7874,7 @@
#. module: account
#: view:account.invoice.report:0
msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "S/F išrašymo metai"
#. module: account
#: field:account.config.settings,purchase_tax_rate:0
@@ -7437,12 +7884,12 @@
#. module: account
#: help:res.partner,credit:0
msgid "Total amount this customer owes you."
-msgstr "Visa suma, kurią klientas skolingas Jums."
+msgstr "Suma, kurią pirkėjas yra skolingas jums."
#. module: account
#: view:account.move.line:0
msgid "Unbalanced Journal Items"
-msgstr "Nepatvirtintos įrašų eilutės"
+msgstr "Nesubalansuoti DK įrašai"
#. module: account
#: model:ir.actions.act_window,name:account.open_account_charts_modules
@@ -7471,11 +7918,14 @@
"new counterpart but will share the same counterpart. This is used in fiscal "
"year closing."
msgstr ""
+"Pažymėkite šį lauką, jei norite, kad žurnalo įrašai nekurtu naujų "
+"koresponduojančių įrašų, o naudotų tą patį koresponduojantį įrašą. Tai "
+"naudojamas uždarant finansinius metus."
#. module: account
#: field:account.bank.statement,closing_date:0
msgid "Closed On"
-msgstr ""
+msgstr "Uždarymo data"
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_line
@@ -7490,7 +7940,7 @@
#. module: account
#: field:account.chart.template,property_account_income_opening:0
msgid "Opening Entries Income Account"
-msgstr ""
+msgstr "Uždarymo įrašų pajamų sąskaita"
#. module: account
#: field:account.config.settings,group_proforma_invoices:0
@@ -7509,6 +7959,8 @@
"This field is only used if you develop your own module allowing developers "
"to create specific taxes in a custom domain."
msgstr ""
+"Šis laukas naudojamas tik, jeigu kuriate modulį. Tai leidžia kūrėjams "
+"apibrėžti specialius mokesčius su tam tikru domenu."
#. module: account
#: field:account.invoice,reference:0
@@ -7547,12 +7999,12 @@
#: code:addons/account/static/src/js/account_move_reconciliation.js:90
#, python-format
msgid "Warning"
-msgstr ""
+msgstr "Įspėjimas"
#. module: account
#: model:ir.actions.act_window,name:account.action_analytic_open
msgid "Contracts/Analytic Accounts"
-msgstr ""
+msgstr "Sutartys/Analitinės sąskaitos"
#. module: account
#: view:account.journal:0
@@ -7580,6 +8032,10 @@
" with the invoice. You will not be able "
"to modify the credit note."
msgstr ""
+"Naudokite šį pasirinkimą norėdami atšaukti sąskaitą faktūrą, kurią per "
+"klaidą išrašėte. Bus sukurta kreditinė sąskaita faktūra, patvirtinta ir "
+"sudengta su šia sąskaita faktūrą. Jūs negalėsite keisti kreditinės sąskaitos "
+"faktūros."
#. module: account
#: help:account.partner.reconcile.process,next_partner_id:0
@@ -7623,7 +8079,7 @@
#. module: account
#: view:account.invoice.report:0
msgid "Customer And Supplier Refunds"
-msgstr ""
+msgstr "Pirkėjui arba tiekėjo išrašytos kreditinės sąskaitos fatkūros"
#. module: account
#: field:account.financial.report,sign:0
@@ -7666,14 +8122,14 @@
#: report:account.invoice:0
#: view:account.invoice:0
msgid "PRO-FORMA"
-msgstr "Išankstinė sąskaita"
+msgstr "IŠANKSTINĖ SĄSKAITA"
#. module: account
#: selection:account.entries.report,move_line_state:0
#: view:account.move.line:0
#: selection:account.move.line,state:0
msgid "Unbalanced"
-msgstr "Nesugretinti"
+msgstr "Nesubalansuoti"
#. module: account
#: selection:account.move.line,centralisation:0
@@ -7684,7 +8140,7 @@
#: model:ir.actions.act_window,name:account.action_email_templates
#: model:ir.ui.menu,name:account.menu_email_templates
msgid "Email Templates"
-msgstr ""
+msgstr "El. laiškų šablonai"
#. module: account
#: view:account.move.line:0
@@ -7712,16 +8168,18 @@
"This field is used for payable and receivable journal entries. You can put "
"the limit date for the payment of this line."
msgstr ""
+"Šis laukas yra naudojamas mokėtinų ir gautinų sumų DK įrašuose. Galite "
+"nustatyti data, iki kurios privaloma apmokėti šį DK įrašą."
#. module: account
#: model:ir.ui.menu,name:account.menu_multi_currency
msgid "Multi-Currencies"
-msgstr ""
+msgstr "Valiutų kursų svyravimai"
#. module: account
#: field:account.model.line,date_maturity:0
msgid "Maturity Date"
-msgstr ""
+msgstr "Apmokėjimo data"
#. module: account
#: code:addons/account/account.py:3155
@@ -7744,7 +8202,7 @@
#: view:account.financial.report:0
#: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "Finansinių ataskaitų hierarchiją"
#. module: account
#: help:account.account.template,chart_template_id:0
@@ -7755,11 +8213,16 @@
"few new accounts (You don't need to define the whole structure that is "
"common to both several times)."
msgstr ""
+"Šis papildomas laukas leidžia susieti sąskaitos šabloną su tam tikru "
+"sąskaitų plano šablonu, kuris gali skirtis nuo tėvinio sąskaitų plano. Tai "
+"leidžia apibrėžti sąskaitų plano šabloną, kuris papildo kitą naujomis "
+"sąskaitomis (dėl to nereikia kelis kartus apibrėžti pilnos struktūros, "
+"kuomet tai tinka keliems šablonams)."
#. module: account
#: view:account.move:0
msgid "Unposted Journal Entries"
-msgstr "Nepatvirtinti įrašai"
+msgstr "Neužregistruoti žurnalų įrašai"
#. module: account
#: help:account.invoice.refund,date:0
@@ -7767,6 +8230,8 @@
"This date will be used as the invoice date for credit note and period will "
"be chosen accordingly!"
msgstr ""
+"Ši data naudojama kaip kreditinės S/F išrašymo data, pagal kurią parenkamas "
+"ataskaitinis periodas!"
#. module: account
#: view:product.template:0
@@ -7784,7 +8249,7 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_manual_reconcile
msgid "Manual Reconciliation"
-msgstr "Rankinis sugretinimas"
+msgstr "Rankinis sudengimas"
#. module: account
#: report:account.overdue:0
@@ -7807,7 +8272,7 @@
#. module: account
#: field:account.fiscalyear.close,fy_id:0
msgid "Fiscal Year to close"
-msgstr "Uždarytini fiskaliniai metai"
+msgstr "Uždaromi finansiniai metai"
#. module: account
#: view:account.invoice.cancel:0
@@ -7820,6 +8285,8 @@
msgid ""
"This field is used to generate legal reports: profit and loss, balance sheet."
msgstr ""
+"Šis laukas naudojamas spausdinant finansines ataskaitas: pelno nuostolio "
+"ataskaita, balanso ataskaita."
#. module: account
#: selection:account.entries.report,month:0
@@ -7847,6 +8314,8 @@
"The sequence field is used to order the resources from lower sequences to "
"higher ones."
msgstr ""
+"Sekos laukas naudojamas eilutčių išdėstymui nuo mažiausios iki didžiausios "
+"sekos reikšmės."
#. module: account
#: field:account.move.line,amount_residual_currency:0
@@ -7865,7 +8334,7 @@
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "Post Journal Entries"
-msgstr "Patvirtinti įrašus"
+msgstr "Registruoti žurnalų įrašus"
#. module: account
#: selection:account.bank.statement.line,type:0
@@ -7875,12 +8344,12 @@
#: code:addons/account/account_invoice.py:353
#, python-format
msgid "Customer"
-msgstr "Klientas"
+msgstr "Pirkėjas"
#. module: account
#: field:account.financial.report,name:0
msgid "Report Name"
-msgstr ""
+msgstr "Ataskaitos pavadinimas"
#. module: account
#: model:account.account.type,name:account.data_account_type_cash
@@ -7897,7 +8366,7 @@
#: field:account.fiscal.position.account,account_dest_id:0
#: field:account.fiscal.position.account.template,account_dest_id:0
msgid "Account Destination"
-msgstr "Sąskaita tikslas"
+msgstr "Sąskaitos pakaitalas"
#. module: account
#: help:account.invoice.refund,filter_refund:0
@@ -7905,6 +8374,8 @@
"Refund base on this type. You can not Modify and Cancel if the invoice is "
"already reconciled"
msgstr ""
+"Kredituoti pasirinktu būdu. Jūs negalite Keisti ar Atšaukti, jeigu sąskaita "
+"faktūra jau sudengta."
#. module: account
#: field:account.bank.statement.line,sequence:0
@@ -7927,12 +8398,12 @@
#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Journal Entry Number"
-msgstr "Įrašo numeris"
+msgstr "Žurnalo įrašo numeris"
#. module: account
#: view:account.financial.report:0
msgid "Parent Report"
-msgstr ""
+msgstr "Tėvinė ataskaita"
#. module: account
#: constraint:account.account:0
@@ -7950,7 +8421,7 @@
#. module: account
#: help:account.invoice,move_id:0
msgid "Link to the automatically generated Journal Items."
-msgstr ""
+msgstr "Nuorodą į automatiškai sukurtą žurnalo įrašą."
#. module: account
#: model:ir.model,name:account.model_account_config_settings
@@ -7961,24 +8432,24 @@
#: selection:account.config.settings,period:0
#: selection:account.installer,period:0
msgid "Monthly"
-msgstr ""
+msgstr "Kas mėnesį"
#. module: account
#: model:account.account.type,name:account.data_account_type_asset
msgid "Asset"
-msgstr "Turtas"
+msgstr "Ilg. turtas"
#. module: account
#: field:account.bank.statement,balance_end:0
msgid "Computed Balance"
-msgstr ""
+msgstr "Paskaičiuotas balansas"
#. module: account
#. openerp-web
#: code:addons/account/static/src/js/account_move_reconciliation.js:89
#, python-format
msgid "You must choose at least one record."
-msgstr ""
+msgstr "Turite pasirinkti bent vieną įrašą."
#. module: account
#: field:account.account,parent_id:0
@@ -7999,16 +8470,20 @@
"positive, it gives the day of the next month. Set 0 for net days (otherwise "
"it's based on the beginning of the month)."
msgstr ""
+"Nustatykite -1, kad būtų skaičiuojama paskutinė einamo mėnesio diena. Jeigu "
+"tai teigiamas skaičius, tuomet grąžins kito mėnesio dieną. Nustačius 0, bus "
+"grąžinamos grynos dienos (kitu atveju, terminas prasidės nuo mėnesio "
+"pradžios)."
#. module: account
#: view:account.move.line.reconcile:0
msgid "Reconciliation Transactions"
-msgstr "Gretinimo transakcijos"
+msgstr "Sudengimo transakcijos"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_legal_statement
msgid "Legal Reports"
-msgstr "Teisinės ataskaitos"
+msgstr "Įstatyminės ataskaitos"
#. module: account
#: field:account.tax.code,sum_period:0
@@ -8044,7 +8519,7 @@
#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
#: model:ir.ui.menu,name:account.menu_account_partner_ledger
msgid "Partner Ledger"
-msgstr "Partnerio knyga"
+msgstr "Partnerio dydžioji knyga"
#. module: account
#: selection:account.tax.template,type:0
@@ -8057,13 +8532,13 @@
#: code:addons/account/account.py:668
#, python-format
msgid "Warning !"
-msgstr "Įspėjimas!"
+msgstr "Perspėjimas!"
#. module: account
#: help:account.bank.statement,message_unread:0
#: help:account.invoice,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Jeigu pažymėta, naujos žinutės reikalaus jūsų dėmesio."
#. module: account
#: field:res.company,tax_calculation_rounding_method:0
@@ -8130,7 +8605,7 @@
#. module: account
#: view:account.financial.report:0
msgid "Report Type"
-msgstr ""
+msgstr "Ataskaitos tipas"
#. module: account
#: help:account.open.closed.fiscalyear,fyear_id:0
@@ -8138,11 +8613,12 @@
"Select Fiscal Year which you want to remove entries for its End of year "
"entries journal"
msgstr ""
+"Pasirinkite finansinius metus, kurių uždarymo įrašus norite pašalinti"
#. module: account
#: field:account.tax.template,type_tax_use:0
msgid "Tax Use In"
-msgstr ""
+msgstr "Naudojimas"
#. module: account
#: code:addons/account/account_bank_statement.py:381
@@ -8173,6 +8649,7 @@
msgid ""
"Check this box if this account allows reconciliation of journal items."
msgstr ""
+"Pažymėkite šį lauką, jeigu leidžiama sudengti šio sąskaitos DK įrašus."
#. module: account
#: report:account.analytic.account.inverted.balance:0
@@ -8216,7 +8693,7 @@
#. module: account
#: view:account.bank.statement:0
msgid "Opening Cash Control"
-msgstr ""
+msgstr "Pradžios likutis"
#. module: account
#: model:process.node,note:account.process_node_invoiceinvoice0
@@ -8261,7 +8738,7 @@
#. module: account
#: view:account.invoice:0
msgid "Proforma"
-msgstr ""
+msgstr "Išankstinė sąskaita"
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -8274,12 +8751,14 @@
"Set if the amount of tax must be included in the base amount before "
"computing the next taxes."
msgstr ""
+"Pasirinkite ar mokesčio suma turi būti pridėta prie bazinės sumos prieš "
+"skaičiuojant kitus mokesčius."
#. module: account
#: code:addons/account/account.py:3158
#, python-format
msgid "Purchase Refund Journal"
-msgstr ""
+msgstr "Pirktų prekių grąžinimo žurnalas"
#. module: account
#: code:addons/account/account.py:1297
@@ -8290,7 +8769,7 @@
#. module: account
#: help:account.tax.template,amount:0
msgid "For Tax Type percent enter % ratio between 0-1."
-msgstr ""
+msgstr "Procentiniam mokesčio tipui įveskite % koeficientą tarp 0-1."
#. module: account
#: view:account.analytic.account:0
@@ -8300,7 +8779,7 @@
#. module: account
#: view:account.invoice.report:0
msgid "Group by Invoice Date"
-msgstr ""
+msgstr "S/F išrašymo data"
#. module: account
#: help:account.journal,user_id:0
@@ -8338,7 +8817,7 @@
#: field:account.treasury.report,period_id:0
#: field:validate.account.move,period_id:0
msgid "Period"
-msgstr "Laikotarpis"
+msgstr "Periodas"
#. module: account
#: help:account.account,adjusted_balance:0
@@ -8350,7 +8829,7 @@
#. module: account
#: report:account.invoice:0
msgid "Net Total:"
-msgstr "Iš viso be mokesčių:"
+msgstr "Iš viso:"
#. module: account
#: code:addons/account/wizard/account_report_common.py:158
@@ -8376,23 +8855,23 @@
#. module: account
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
-msgstr "Įplaukų kategorijos sąskaita"
+msgstr "Pajamų kategorijos sąskaita"
#. module: account
#: field:account.account,adjusted_balance:0
msgid "Adjusted Balance"
-msgstr ""
+msgstr "Konvertuotas balansas"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
-msgstr "Fiskalinės pozicijos šablonai"
+msgstr "Mokestinės aplinkos šablonai"
#. module: account
#: view:account.entries.report:0
msgid "Int.Type"
-msgstr ""
+msgstr "Vidinis tipas"
#. module: account
#: field:account.move.line,tax_amount:0
@@ -8405,6 +8884,9 @@
"This wizard will remove the end of year journal entries of selected fiscal "
"year. Note that you can run this wizard many times for the same fiscal year."
msgstr ""
+"Šis vedlys pašalins pasirinktų finansinių metų uždarymo įrašus. Pažymėtina, "
+"kad galite vykdyti šiuos veiksmus daug kartų su tais pačiais finansiniais "
+"metais."
#. module: account
#: report:account.invoice:0
@@ -8433,18 +8915,18 @@
#: field:account.vat.declaration,chart_account_id:0
#: field:accounting.report,chart_account_id:0
msgid "Chart of Account"
-msgstr ""
+msgstr "Sąskaitų planas"
#. module: account
#: model:process.node,name:account.process_node_paymententries0
#: model:process.transition,name:account.process_transition_reconcilepaid0
msgid "Payment"
-msgstr ""
+msgstr "Mokėjimas"
#. module: account
#: view:account.automatic.reconcile:0
msgid "Reconciliation Result"
-msgstr "Sugretinimo rezultatas"
+msgstr "Sudengimo rezultatas"
#. module: account
#: field:account.bank.statement,balance_end_real:0
@@ -8455,7 +8937,7 @@
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralized Counterpart"
-msgstr ""
+msgstr "Bendras koresponduojantis įrašas"
#. module: account
#: help:account.move.line,blocked:0
@@ -8463,12 +8945,14 @@
"You can check this box to mark this journal item as a litigation with the "
"associated partner"
msgstr ""
+"Galite pažymėti šį DK įrašą kaip ginčytiną. DK įrašas nebebus įtraukiamas į "
+"skolų ataskaitas."
#. module: account
#: field:account.move.line,reconcile_partial_id:0
#: view:account.move.line.reconcile:0
msgid "Partial Reconcile"
-msgstr "Dalinis sugretinimas"
+msgstr "Dalinis sudengimas"
#. module: account
#: model:ir.model,name:account.model_account_analytic_inverted_balance
@@ -8490,6 +8974,10 @@
"invoice will be created \n"
" so that you can edit it."
msgstr ""
+"Naudokite šį pasirinkimą norėdami pataisyti išrašytą sąskaita faktūrą. "
+"Sukurta kreditinė sąskaita faktūra bus patvirtinta ir sugretinta su šia "
+"sąskaita faktūrą. Taip pat bus sukurta naujas sąskaitos faktūros juodraštis, "
+"kurį galėsite keisti."
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
@@ -8510,7 +8998,7 @@
#. module: account
#: view:account.config.settings:0
msgid "Apply"
-msgstr ""
+msgstr "Taikyti"
#. module: account
#: field:account.financial.report,account_type_ids:0
@@ -8535,7 +9023,7 @@
#. module: account
#: field:account.account.type,report_type:0
msgid "P&L / BS Category"
-msgstr ""
+msgstr "Ataskaitos kategorija"
#. module: account
#: view:account.automatic.reconcile:0
@@ -8549,7 +9037,7 @@
#: model:process.node,name:account.process_node_supplierreconciliation0
#, python-format
msgid "Reconciliation"
-msgstr "Gretinimas"
+msgstr "Sudengimas"
#. module: account
#: view:account.tax.template:0
@@ -8585,6 +9073,18 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad sukurtumėte žurnalą.\n"
+" </p><p>\n"
+" Žurnalas yra naudojamas apskaitos tranzakcijų "
+"registravimui.\n"
+" </p><p>\n"
+" Įprastai įmonės naudoja po atskirą žurnalą kiekvienam "
+"mokėjimo būdui (grynieji pinigai, banko sąskaitos, čekiai),\n"
+" pirkimų žurnalą, pardavimų žurnalą\n"
+" bei žurnalą kitoms operacijoms.\n"
+" </p>\n"
+" "
#. module: account
#: model:ir.model,name:account.model_account_fiscalyear_close_state
@@ -8604,7 +9104,7 @@
#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
msgid "Filter By"
-msgstr ""
+msgstr "Filtruoti pagal"
#. module: account
#: code:addons/account/wizard/account_period_close.py:51
@@ -8618,12 +9118,12 @@
#: view:board.board:0
#: model:ir.actions.act_window,name:account.action_company_analysis_tree
msgid "Company Analysis"
-msgstr ""
+msgstr "Įmonės finansų analizė"
#. module: account
#: help:account.invoice,account_id:0
msgid "The partner account used for this invoice."
-msgstr "Partnerio sąskaita naudojama šioje sąskaitoje faktūroje."
+msgstr "Kontakto sąskaita naudojama šioje sąskaitoje faktūroje."
#. module: account
#: code:addons/account/account.py:3353
@@ -8641,7 +9141,7 @@
#. module: account
#: model:ir.model,name:account.model_account_payment_term_line
msgid "Payment Term Line"
-msgstr "Mokėjimo terminų eilutės"
+msgstr "Mokėjimo sąlygų eilutės"
#. module: account
#: code:addons/account/account.py:3156
@@ -8652,12 +9152,12 @@
#. module: account
#: field:account.invoice,amount_untaxed:0
msgid "Subtotal"
-msgstr ""
+msgstr "Suma"
#. module: account
#: view:account.vat.declaration:0
msgid "Print Tax Statement"
-msgstr ""
+msgstr "Spausdinti ataskaitą"
#. module: account
#: view:account.model.line:0
@@ -8685,6 +9185,14 @@
msgstr "Leistini sąskaitų tipai (palikite tuščią, jei leistini visi)"
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.payment.term:0
+msgid "Payment term explanation for the customer..."
+msgstr "Mokėjimo sąlygų paaiškinimas pirkėjui..."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: help:account.move.line,amount_residual:0
msgid ""
"The residual amount on a receivable or payable of a journal entry expressed "
@@ -8694,7 +9202,7 @@
#. module: account
#: view:account.tax.code:0
msgid "Statistics"
-msgstr ""
+msgstr "Statistika"
#. module: account
#: field:account.analytic.chart,from_date:0
@@ -8709,6 +9217,9 @@
"computed. Because it is space consuming, we do not allow to use it while "
"doing a comparison."
msgstr ""
+"Šis pasirinkimas leidžia gauti daugiau duomenų apie tai, kaip buvo "
+"paskaičiuotas balansas. Kadangi tai užima vietą, šis pasirinkimas "
+"neleidžiamas atliekant palyginimą."
#. module: account
#: model:ir.model,name:account.model_account_fiscalyear_close
@@ -8730,7 +9241,7 @@
#: view:account.invoice:0
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
msgid "Unpaid Invoices"
-msgstr ""
+msgstr "Neamokėtos sąskaitos"
#. module: account
#: field:account.move.line.reconcile,debit:0
@@ -8769,7 +9280,7 @@
#: model:ir.actions.act_window,name:account.action_account_analytic_chart
#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
msgid "Chart of Analytic Accounts"
-msgstr ""
+msgstr "Analitinių sąskaitų planas"
#. module: account
#: model:ir.actions.act_window,help:account.action_subscription_form
@@ -8787,17 +9298,28 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad sukurtumėte pasikartojančią operaciją.\n"
+" </p><p>\n"
+" Pasikartojanti operacija vykdoma periodiškai nuo pasirinktos "
+"datos,\n"
+" pvz. nuo sutarties pasirašymo datos arba pagal susitartimą "
+"su pirkėju\n"
+" ar tiekėju. Jūs galite sukurti tokias operacijas, kad\n"
+" automatizuotumėte įrašų registravimą sistemoje.\n"
+" </p>\n"
+" "
#. module: account
#: view:account.journal:0
#: model:ir.ui.menu,name:account.menu_configuration_misc
msgid "Miscellaneous"
-msgstr ""
+msgstr "Įvairūs"
#. module: account
#: help:res.partner,debit:0
msgid "Total amount you have to pay to this supplier."
-msgstr "Visa suma, kurią Jūs esate skolingas šiam tiekėjui."
+msgstr "Suma, kurią jūs esate skolingas šiam tiekėjui."
#. module: account
#: model:process.node,name:account.process_node_analytic0
@@ -8821,7 +9343,7 @@
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Smallest Text"
-msgstr ""
+msgstr "Mažiausias tekstas"
#. module: account
#: help:account.config.settings,module_account_check_writing:0
@@ -8853,7 +9375,7 @@
#. module: account
#: help:account.chart,fiscalyear:0
msgid "Keep empty for all open fiscal years"
-msgstr ""
+msgstr "Palikite tuščią visiems atviriems finansiniams metams."
#. module: account
#: help:account.move.line,amount_currency:0
@@ -8907,6 +9429,9 @@
"created. If you leave that field empty, it will use the same journal as the "
"current invoice."
msgstr ""
+"Pasirinkite žurnalą, kuris bus naudojamas sukurtoje kreditinėje S/F. Palikus "
+"lauką tuščią, bus naudojama tas pats žurnalas kaip ir šiuoje sąskaitoje "
+"faktūroje."
#. module: account
#: help:account.bank.statement.line,sequence:0
@@ -8923,7 +9448,7 @@
#: view:account.entries.report:0
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
msgid "Reconciled entries"
-msgstr "Sugretinti įrašai"
+msgstr "Sudengti įrašai"
#. module: account
#: code:addons/account/account.py:2296
@@ -8935,12 +9460,12 @@
#: view:account.tax.code.template:0
#: view:account.tax.template:0
msgid "Tax Template"
-msgstr ""
+msgstr "Mokesčių šablonas"
#. module: account
#: field:account.invoice.refund,period:0
msgid "Force period"
-msgstr "Priverstinai naudoti periodą"
+msgstr "Periodas"
#. module: account
#: model:ir.model,name:account.model_account_partner_balance
@@ -8965,11 +9490,16 @@
"accounts that are typically more credited than debited and that you would "
"like to print as positive amounts in your reports; e.g.: Income account."
msgstr ""
+"Jeigu norite spausdinti neigiamą balansą sąskaitoms, kurios įprastai daugiau "
+"debetuojamos negu kredituojamos, pasirinkite „Priešingas balanso ženklas“, "
+"pvz. sąnaudų sąskaita. Tas pats galioja, jeigu norite spausdinti teigimą "
+"balansą sąskaitoms, kurios įprastai daugiau kredituojamos negu debetuojamos, "
+"pvz. pajamų sąskaita."
#. module: account
#: field:res.partner,contract_ids:0
msgid "Contracts"
-msgstr ""
+msgstr "Darbo sutartys"
#. module: account
#: field:account.cashbox.line,bank_statement_id:0
@@ -8978,14 +9508,14 @@
#: field:account.financial.report,credit:0
#: field:account.financial.report,debit:0
msgid "unknown"
-msgstr ""
+msgstr "nežinomas"
#. module: account
#: field:account.fiscalyear.close,journal_id:0
#: code:addons/account/account.py:3160
#, python-format
msgid "Opening Entries Journal"
-msgstr "Atidarymo įrašų žurnalas"
+msgstr "Žurnalas atidarymo įrašams"
#. module: account
#: model:process.transition,note:account.process_transition_customerinvoice0
@@ -8996,14 +9526,14 @@
#: field:account.bank.statement,message_is_follower:0
#: field:account.invoice,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Ar prenumeratorius"
#. module: account
#: view:account.move:0
#: field:account.move,narration:0
#: field:account.move.line,narration:0
msgid "Internal Note"
-msgstr ""
+msgstr "Vidinės pastabos"
#. module: account
#: constraint:account.account:0
@@ -9048,7 +9578,7 @@
#: view:account.invoice:0
#: field:account.move.line,amount_residual:0
msgid "Residual Amount"
-msgstr ""
+msgstr "Likutis"
#. module: account
#: field:account.invoice,move_lines:0
@@ -9059,7 +9589,7 @@
#. module: account
#: model:ir.actions.act_window,name:account.action_open_journal_button
msgid "Open Journal"
-msgstr ""
+msgstr "Aktyvūs žurnalai"
#. module: account
#: report:account.analytic.account.journal:0
@@ -9076,7 +9606,7 @@
#. module: account
#: field:account.cashbox.line,pieces:0
msgid "Unit of Currency"
-msgstr ""
+msgstr "Kupiūra"
#. module: account
#: code:addons/account/account.py:3157
@@ -9113,12 +9643,12 @@
#. module: account
#: field:account.config.settings,purchase_refund_journal_id:0
msgid "Purchase refund journal"
-msgstr ""
+msgstr "Pirktų prekių grąžinimo žurnalas"
#. module: account
#: view:account.analytic.line:0
msgid "Product Information"
-msgstr ""
+msgstr "Produkto duomenys"
#. module: account
#: report:account.analytic.account.journal:0
@@ -9132,7 +9662,7 @@
#: model:process.node,name:account.process_node_invoiceinvoice0
#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
msgid "Create Invoice"
-msgstr "Sukurti sąskaitą faktūrą"
+msgstr "Išrašyti sąskaitą"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_configuration_installer
@@ -9161,7 +9691,7 @@
#. module: account
#: field:account.vat.declaration,display_detail:0
msgid "Display Detail"
-msgstr ""
+msgstr "Rodyti detaliai"
#. module: account
#: code:addons/account/account.py:3165
@@ -9180,7 +9710,7 @@
#: view:account.analytic.line:0
#: view:analytic.entries.report:0
msgid "My Entries"
-msgstr ""
+msgstr "Mano įrašai"
#. module: account
#: help:account.invoice,state:0
@@ -9209,7 +9739,7 @@
#: model:ir.actions.act_window,name:account.action_account_report
#: model:ir.ui.menu,name:account.menu_account_reports
msgid "Financial Reports"
-msgstr ""
+msgstr "Finansinės ataskaitos"
#. module: account
#: model:account.account.type,name:account.account_type_liability_view1
@@ -9242,7 +9772,7 @@
#: field:accounting.report,period_from:0
#: field:accounting.report,period_from_cmp:0
msgid "Start Period"
-msgstr ""
+msgstr "Pradžios periodas"
#. module: account
#: model:ir.actions.report.xml,name:account.account_central_journal
@@ -9257,7 +9787,7 @@
#. module: account
#: field:res.partner,ref_companies:0
msgid "Companies that refers to partner"
-msgstr "Kompanijos susijusios su partneriu"
+msgstr "Kompanijos susijusios su kontaktu"
#. module: account
#: view:account.invoice:0
@@ -9287,7 +9817,7 @@
#. module: account
#: view:account.account.template:0
msgid "Receivale Accounts"
-msgstr ""
+msgstr "Debitorių sąskaitos"
#. module: account
#: field:account.config.settings,purchase_refund_sequence_prefix:0
@@ -9353,7 +9883,7 @@
#: field:report.account.receivable,balance:0
#: field:report.aged.receivable,balance:0
msgid "Balance"
-msgstr "Likutis"
+msgstr "Balansas"
#. module: account
#: model:process.node,note:account.process_node_supplierbankstatement0
@@ -9364,7 +9894,7 @@
#: report:account.account.balance:0
#: report:account.general.ledger_landscape:0
msgid "Display Account"
-msgstr ""
+msgstr "Sąskaitų rodymas"
#. module: account
#: selection:account.account,type:0
@@ -9372,7 +9902,7 @@
#: model:account.account.type,name:account.data_account_type_payable
#: selection:account.entries.report,type:0
msgid "Payable"
-msgstr "Kreditoriai"
+msgstr "Mokėtinos sumos"
#. module: account
#: view:board.board:0
@@ -9429,17 +9959,17 @@
#: code:addons/account/wizard/account_period_close.py:51
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Klaidingas veiksmas!"
#. module: account
#: view:account.bank.statement:0
msgid "Date / Period"
-msgstr ""
+msgstr "Data / Periodas"
#. module: account
#: report:account.central.journal:0
msgid "A/C No."
-msgstr ""
+msgstr "Sąsk."
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -9457,7 +9987,7 @@
#. module: account
#: report:account.overdue:0
msgid "There is nothing due with this customer."
-msgstr ""
+msgstr "Šis pirkėjas neturi pradelstų mokėjimų."
#. module: account
#: help:account.tax,account_paid_id:0
@@ -9465,6 +9995,8 @@
"Set the account that will be set by default on invoice tax lines for "
"refunds. Leave empty to use the expense account."
msgstr ""
+"Pasirinkite sąskaitą, kuri bus nustatoma ant kreditinių sąskaitų faktūrų "
+"mokesčių eilučių. Palikus tuščią, bus naudojama sąnaudų sąskaita."
#. module: account
#: help:account.addtmpl.wizard,cparent_id:0
@@ -9475,12 +10007,12 @@
#. module: account
#: report:account.invoice:0
msgid "Source"
-msgstr ""
+msgstr "Paėmimas"
#. module: account
#: selection:account.model.line,date_maturity:0
msgid "Date of the day"
-msgstr "Šios dienos data"
+msgstr "Sukūrimo data"
#. module: account
#: code:addons/account/wizard/account_move_bank_reconcile.py:49
@@ -9496,11 +10028,12 @@
"This field contains the information related to the numbering of the journal "
"entries of this journal."
msgstr ""
+"Šiame lauke saugoma informacija susijusi su šio žurnalo įrašų numeravimu."
#. module: account
#: field:account.invoice,sent:0
msgid "Sent"
-msgstr ""
+msgstr "Išsiųsta"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_common_menu
@@ -9527,12 +10060,12 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
msgid "Periodic Processing"
-msgstr ""
+msgstr "Periodinės operacijos"
#. module: account
#: view:account.invoice.report:0
msgid "Customer And Supplier Invoices"
-msgstr ""
+msgstr "Pirkėjui arba tiekėjo išrašytos sąskaitos faktūros"
#. module: account
#: model:process.node,note:account.process_node_paymententries0
@@ -9591,7 +10124,7 @@
#: field:accounting.report,period_to:0
#: field:accounting.report,period_to_cmp:0
msgid "End Period"
-msgstr ""
+msgstr "Pabaigos periodas"
#. module: account
#: model:account.account.type,name:account.account_type_expense_view1
@@ -9601,7 +10134,7 @@
#. module: account
#: field:account.move.line,date_maturity:0
msgid "Due date"
-msgstr ""
+msgstr "Mokėjimo terminas"
#. module: account
#: model:account.payment.term,name:account.account_payment_term_immediate
@@ -9624,6 +10157,12 @@
"journals. Select 'Opening/Closing Situation' for entries generated for new "
"fiscal years."
msgstr ""
+"Pasirinkite „Pardavimas“ pirkėjų sąskaitų faktūrų žurnalams. Pasirinkite "
+"„Pirkimai“ tiekėjo sąskaitų faktūrų žurnalams. Pasirinkite „Grynieji“ arba "
+"„Banko sąskaitos“ žurnalams, kurie naudojami pirkėjų ar tiekėjų mokėjimų "
+"registravimui. Pasirinkite „Bendra“ kitų operacijų žurnalams. Pasirinkite "
+"„Atidarymo/Uždarymo sitaucija“ sugeneruotiems įrašams finansinių metų "
+"uždarymo metu."
#. module: account
#: view:account.subscription:0
@@ -9634,7 +10173,7 @@
#. module: account
#: report:account.overdue:0
msgid "Maturity date"
-msgstr "Mokėjimo data"
+msgstr "Apmokėjimo data"
#. module: account
#: view:account.subscription:0
@@ -9683,20 +10222,20 @@
#: view:account.invoice.report:0
#: model:process.node,name:account.process_node_supplierdraftinvoices0
msgid "Draft Invoices"
-msgstr "Sąskaitų faktūrų juodraščiai"
+msgstr "Sąskaitų juodraščiai"
#. module: account
#: view:cash.box.in:0
#: model:ir.actions.act_window,name:account.action_cash_box_in
msgid "Put Money In"
-msgstr ""
+msgstr "Įnešti pinigus"
#. module: account
#: selection:account.account.type,close_method:0
#: view:account.entries.report:0
#: view:account.move.line:0
msgid "Unreconciled"
-msgstr "Nesugretinta"
+msgstr "Nesudengta"
#. module: account
#: code:addons/account/account_invoice.py:890
@@ -9720,6 +10259,13 @@
"open period. Close a period when you do not want to record new entries and "
"want to lock this period for tax related calculation."
msgstr ""
+"Periodas yra mokestinis laikotarpis, pagal kurį fiksuojamos su finansų "
+"apskaitą susijusios operacijos. Dažniausiai naudojami mėnesio periodai, bet "
+"priklausomai nuo valstybės ar įmonės poreikių, galima vesti apskaitą "
+"ketvirčio periodais. Uždarius periodą nebebus galima įvesti naujų DK įrašų, "
+"tad visi nauji įrašai bus registruojami kitame periode. Uždarykite periodą, "
+"tuomet kai visos laikotarpio operacijos yra suvestos ir norite atlikti "
+"skaičiavimus susijusius su mokesčiais."
#. module: account
#: view:account.analytic.account:0
@@ -9776,12 +10322,12 @@
#: model:ir.model,name:account.model_account_move_line
#: model:ir.ui.menu,name:account.menu_action_account_moves_all
msgid "Journal Items"
-msgstr "Įrašų eilutės"
+msgstr "DK įrašai"
#. module: account
#: view:accounting.report:0
msgid "Comparison"
-msgstr ""
+msgstr "Palyginimas"
#. module: account
#: code:addons/account/account_move_line.py:1122
@@ -9812,9 +10358,7 @@
msgid ""
"This account will be used instead of the default one as the payable account "
"for the current partner"
-msgstr ""
-"Ši sąskaita bus naudojama vietoj numatytosios kaip mokėtina sąskaita "
-"partneriui."
+msgstr "Sąskaita naudojama apskaityti mokėtinas sumas šiam kontaktui."
#. module: account
#: field:account.period,special:0
@@ -9860,12 +10404,12 @@
#. module: account
#: view:account.invoice:0
msgid "Draft Invoice "
-msgstr ""
+msgstr "Sąskaitos faktūros juodraštis "
#. module: account
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
-msgstr "Bendrieji žurnalai"
+msgstr "Bendrasis žurnalas"
#. module: account
#: view:account.model:0
@@ -9882,7 +10426,7 @@
#: field:account.invoice,number:0
#: field:account.move,name:0
msgid "Number"
-msgstr ""
+msgstr "Numeris"
#. module: account
#: report:account.analytic.account.journal:0
@@ -9897,7 +10441,7 @@
#: field:account.invoice.report,price_total:0
#: field:account.invoice.report,user_currency_price_total:0
msgid "Total Without Tax"
-msgstr ""
+msgstr "Iš viso be mokesčių"
#. module: account
#: selection:account.aged.trial.balance,filter:0
@@ -9936,6 +10480,14 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: view:account.config.settings:0
+msgid "e.g. sales@xxxxxxxxxxx"
+msgstr "pvz. sales@xxxxxxxxxxx"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.account,tax_ids:0
#: view:account.account.template:0
#: field:account.account.template,tax_ids:0
@@ -9976,7 +10528,7 @@
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Title 2 (bold)"
-msgstr ""
+msgstr "Pavadinimas 2 (pusjuodis)"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -10023,7 +10575,7 @@
#: selection:account.account.template,type:0
#: selection:account.entries.report,type:0
msgid "Regular"
-msgstr ""
+msgstr "Įprastinė"
#. module: account
#: view:account.account:0
@@ -10037,12 +10589,12 @@
#. module: account
#: field:account.subscription.generate,date:0
msgid "Generate Entries Before"
-msgstr ""
+msgstr "Generuoti įrašus iki"
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
-msgstr "Aktyvus periodiniai įrašai"
+msgstr "Aktyvios periodinės operacijos"
#. module: account
#: view:account.analytic.balance:0
@@ -10106,24 +10658,24 @@
#: field:account.fiscal.position.tax,tax_src_id:0
#: field:account.fiscal.position.tax.template,tax_src_id:0
msgid "Tax Source"
-msgstr ""
+msgstr "Mokestis"
#. module: account
#: view:ir.sequence:0
msgid "Fiscal Year Sequences"
-msgstr "Fiskalinių metų sekos"
+msgstr "Finansinių metų sekos"
#. module: account
#: selection:account.financial.report,display_detail:0
msgid "No detail"
-msgstr ""
+msgstr "Be detalių"
#. module: account
#: field:account.account,unrealized_gain_loss:0
#: model:ir.actions.act_window,name:account.action_account_gain_loss
#: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
msgid "Unrealized Gain or Loss"
-msgstr ""
+msgstr "Negautos pajamos"
#. module: account
#: view:account.move:0
@@ -10140,7 +10692,7 @@
#. module: account
#: field:account.invoice,check_total:0
msgid "Verification Total"
-msgstr ""
+msgstr "Patvirtinta bendra suma"
#. module: account
#: report:account.analytic.account.balance:0
@@ -10163,7 +10715,7 @@
#. module: account
#: field:account.tax,account_analytic_paid_id:0
msgid "Refund Tax Analytic Account"
-msgstr ""
+msgstr "Grąžintino mokesčio analitinė sąskaita"
#. module: account
#: view:account.move.bank.reconcile:0
@@ -10218,19 +10770,19 @@
#. module: account
#: model:ir.ui.menu,name:account.menu_action_subscription_form
msgid "Define Recurring Entries"
-msgstr "Apibrėžti pasikartojančius įrašus"
+msgstr "Apibrėžti pasikartojančias operacijas"
#. module: account
#: field:account.entries.report,date_maturity:0
msgid "Date Maturity"
-msgstr ""
+msgstr "Buhalterinė data"
#. module: account
#: field:account.invoice.refund,description:0
#: field:cash.box.in,name:0
#: field:cash.box.out,name:0
msgid "Reason"
-msgstr ""
+msgstr "Priežastis"
#. module: account
#: selection:account.partner.ledger,filter:0
@@ -10238,7 +10790,7 @@
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
#, python-format
msgid "Unreconciled Entries"
-msgstr ""
+msgstr "Nesudengti įrašai"
#. module: account
#: help:account.partner.reconcile.process,today_reconciled:0
@@ -10256,12 +10808,12 @@
#. module: account
#: field:account.tax.code.template,sign:0
msgid "Sign For Parent"
-msgstr ""
+msgstr "Ženklas"
#. module: account
#: model:ir.model,name:account.model_account_balance_report
msgid "Trial Balance Report"
-msgstr ""
+msgstr "Bandomojo balanso ataskaita"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -10305,7 +10857,7 @@
#. module: account
#: field:account.chart,period_to:0
msgid "End period"
-msgstr ""
+msgstr "Pabaigos periodas"
#. module: account
#: sql_constraint:account.journal:0
@@ -10329,7 +10881,7 @@
#: view:account.automatic.reconcile:0
#: view:account.move.line.reconcile.writeoff:0
msgid "Write-Off Move"
-msgstr "Nurašymų įrašai"
+msgstr "Nurašymai"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -10359,7 +10911,7 @@
#: model:process.process,name:account.process_process_supplierinvoiceprocess0
#: selection:report.invoice.created,type:0
msgid "Supplier Invoice"
-msgstr "Tiekėjo sąskaita faktūra"
+msgstr "TIEKĖJO SĄSKAITA"
#. module: account
#: field:account.account,debit:0
@@ -10388,13 +10940,13 @@
#. module: account
#: selection:account.financial.report,style_overwrite:0
msgid "Title 3 (bold, smaller)"
-msgstr ""
+msgstr "Pavadinimas 3 (pusjuodis, mažesnis)"
#. module: account
#: view:account.invoice:0
#: field:account.invoice,invoice_line:0
msgid "Invoice Lines"
-msgstr "Sąskaitos faktūros eilutės"
+msgstr "Sąskaitos eilutės"
#. module: account
#: help:account.model.line,quantity:0
@@ -10404,12 +10956,12 @@
#. module: account
#: field:account.automatic.reconcile,reconciled:0
msgid "Reconciled transactions"
-msgstr "Sugretintos transakcijos"
+msgstr "Sudengtos transakcijos"
#. module: account
#: model:ir.model,name:account.model_report_account_receivable
msgid "Receivable accounts"
-msgstr ""
+msgstr "Debitorių sąskaitos"
#. module: account
#: code:addons/account/account_move_line.py:783
@@ -10420,7 +10972,7 @@
#. module: account
#: selection:account.model.line,date_maturity:0
msgid "Partner Payment Term"
-msgstr "Partnerių apmokėjimo terminas"
+msgstr "Partnerių mokėjimo sąlygos"
#. module: account
#: field:temp.range,name:0
@@ -10430,7 +10982,7 @@
#. module: account
#: view:account.analytic.line:0
msgid "Analytic Journal Items related to a purchase journal."
-msgstr ""
+msgstr "Analitinio žurnalo įrašai susiję su pirkimo žurnalu."
#. module: account
#: help:account.account,type:0
@@ -10441,6 +10993,11 @@
"payable/receivable are for partners accounts (for debit/credit "
"computations), closed for depreciated accounts."
msgstr ""
+"Vidinis tipas naudojamas nusakyti tam tikrą funkcionalumą skirtingoms "
+"sąskaitų grupėms: rodiniai negali turėti DK įrašų, konsolidacinės sąskaitos "
+"gali turėti vaikines sąskaitas konsolidacijai tarp įmonių, mokėtinų/gautinų "
+"sumų sąskaitos naudojamos partnerių sąskaitoms (debeto/kredito "
+"skaičiavimui), „uždaryta“ - sąskaitoms, kurios nebenaudojamos."
#. module: account
#: selection:account.balance.report,display_account:0
@@ -10477,7 +11034,7 @@
#. module: account
#: view:account.invoice.report:0
msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "S/F išrašymo mėnuo"
#. module: account
#: code:addons/account/account_analytic_line.py:99
@@ -10516,7 +11073,7 @@
#: view:account.account:0
#: view:account.analytic.account:0
msgid "Parent Account"
-msgstr ""
+msgstr "Tėvinė sąskaita"
#. module: account
#: view:report.account.receivable:0
@@ -10536,7 +11093,7 @@
#. module: account
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted by"
-msgstr ""
+msgstr "Įrašai surikiuoti pagal"
#. module: account
#: code:addons/account/account_invoice.py:1515
@@ -10550,7 +11107,7 @@
#: view:account.fiscal.position:0
#: view:account.fiscal.position.template:0
msgid "Accounts Mapping"
-msgstr "Sąskaitų nustatymai"
+msgstr "Sąskaitų pakaitalai"
#. module: account
#: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -10568,6 +11125,16 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad sukurtumėte mokesčių kodą.\n"
+" </p><p>\n"
+" Priklausomai nuo šalies, mokesčių kodas dažniausiai yra "
+"eilutė\n"
+" mokesčių deklaracijoje. OpenERP įgalina aprašyti mokesčių\n"
+" struktūrą, kur kiekviena mokesčių suma bus užregistruota\n"
+" su vienu ar keletu mokesčių kodų.\n"
+" </p>\n"
+" "
#. module: account
#: selection:account.entries.report,month:0
@@ -10594,11 +11161,24 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Pasirinkite periodą bei žurnalą, kuriame norite "
+"užregistruoti įrašą.\n"
+" </p><p>\n"
+" Šis sąrašas gali būti naudojamas buhalterių, greitam įrašų "
+"įvedimui\n"
+" į OpenERP. Norėdami įvesti tiekėjo sąskaitą faktūrą,\n"
+" pradėkite nuo sąnaudų įvedimo. OpenERP automatiškai "
+"pasiūlys\n"
+" mokesčius susijusius su šia sąskaita bei korespondentinę\n"
+" mokėtinų sumų sąskaitą.\n"
+" </p>\n"
+" "
#. module: account
#: help:account.invoice.line,account_id:0
msgid "The income or expense account related to the selected product."
-msgstr "Pajamų ir išlaidų sąskaitos susijusios su pasirinktu produktu."
+msgstr "Pajamų ar sąnaudų sąskaitos susijusios su pasirinktu produktu."
#. module: account
#: view:account.config.settings:0
@@ -10621,7 +11201,7 @@
#: view:account.invoice:0
#: view:account.invoice.report:0
msgid "Refund"
-msgstr "Grąžinimas"
+msgstr "KREDITINĖ PVM SĄSKAITA-FAKTŪRA"
#. module: account
#: model:ir.model,name:account.model_res_partner_bank
@@ -10631,18 +11211,18 @@
#. module: account
#: field:res.partner,credit:0
msgid "Total Receivable"
-msgstr "Visos gautinos sumos"
+msgstr "Bendra gautina suma"
#. module: account
#: view:account.move.line:0
msgid "General Information"
-msgstr "Bendroji informacija"
+msgstr "Bendra informacija"
#. module: account
#: view:account.move:0
#: view:account.move.line:0
msgid "Accounting Documents"
-msgstr ""
+msgstr "Apskaitos dokumentai"
#. module: account
#: code:addons/account/account.py:641
@@ -10662,6 +11242,8 @@
msgid ""
"The fiscal position will determine taxes and accounts used for the partner."
msgstr ""
+"Mokestinė aplinka nurodo mokesčių kodus bei sąskaitas, kurios bus naudojamos "
+"vykdant komercinę veiklą su šiuo kontaktu."
#. module: account
#: model:process.node,note:account.process_node_supplierpaidinvoice0
@@ -10706,7 +11288,7 @@
#: code:addons/account/static/src/js/account_move_reconciliation.js:80
#, python-format
msgid "Never"
-msgstr ""
+msgstr "Niekada"
#. module: account
#: model:ir.model,name:account.model_account_addtmpl_wizard
@@ -10722,19 +11304,19 @@
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Partner's"
-msgstr ""
+msgstr "Partnerio"
#. module: account
#: field:account.account,note:0
msgid "Internal Notes"
-msgstr ""
+msgstr "Vidinės pastabos"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear
#: view:ir.sequence:0
#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear
msgid "Fiscal Years"
-msgstr "Fiskaliniai metai"
+msgstr "Finansiniai metai"
#. module: account
#: help:account.analytic.journal,active:0
@@ -10742,11 +11324,13 @@
"If the active field is set to False, it will allow you to hide the analytic "
"journal without removing it."
msgstr ""
+"Jeigu aktyvus laukelis nustatytas kaip \"ne\", leidžiame paslėpti analitinį "
+"žurnalą, jo nepašalinus."
#. module: account
#: field:account.analytic.line,ref:0
msgid "Ref."
-msgstr "Nuoroda"
+msgstr "Numeris"
#. module: account
#: field:account.use.model,model:0
@@ -10773,7 +11357,7 @@
#: view:account.bank.statement:0
#: help:account.cashbox.line,number_closing:0
msgid "Closing Unit Numbers"
-msgstr ""
+msgstr "Uždarymo kupiūrų kiekis"
#. module: account
#: field:account.bank.accounts.wizard,bank_account_id:0
@@ -10788,12 +11372,12 @@
#: model:ir.actions.act_window,name:account.action_account_central_journal
#: model:ir.model,name:account.model_account_central_journal
msgid "Account Central Journal"
-msgstr ""
+msgstr "Spausdinti didžiąją knygą"
#. module: account
#: report:account.overdue:0
msgid "Maturity"
-msgstr ""
+msgstr "Liko"
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
@@ -10825,12 +11409,12 @@
#. module: account
#: field:account.chart.template,property_account_expense:0
msgid "Expense Account on Product Template"
-msgstr "Išlaidų sąskaita produkto šablonui"
+msgstr "Sąnaudų sąskaita produkto šablonui"
#. module: account
#: field:res.partner,property_payment_term:0
msgid "Customer Payment Term"
-msgstr ""
+msgstr "Pardavimo mokėjimo sąlygos"
#. module: account
#: help:accounting.report,label_filter:0
@@ -10838,6 +11422,8 @@
"This label will be displayed on report to show the balance computed for the "
"given comparison filter."
msgstr ""
+"Šis pavadinimas bus naudojamas ataskaitos stulpelyje, kuriame rodomas "
+"paskaičiuotas balansas pagal palyginimo filtrą."
#. module: account
#: selection:account.config.settings,tax_calculation_rounding_method:0
=== modified file 'account/i18n/nl.po'
--- account/i18n/nl.po 2013-04-18 09:41:47 +0000
+++ account/i18n/nl.po 2013-05-08 15:44:19 +0000
@@ -4,21 +4,33 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-20 20:11+0000\n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-05-01 19:40+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:13+0000\n"
"X-Generator: Launchpad (build 16532)\n"
#, python-format
#~ msgid "Integrity Error !"
#~ msgstr "Integriteitsfout !"
+=======
+"X-Launchpad-Export-Date: 2013-05-02 06:08+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -404,7 +416,7 @@
#. module: account
#: help:account.config.settings,group_analytic_accounting:0
msgid "Allows you to use the analytic accounting."
-msgstr "stelt u in staat kostenplaatsen te gebruiken"
+msgstr "Stelt u in staat kostenplaatsen te gebruiken"
#. module: account
#: view:account.invoice:0
@@ -516,15 +528,12 @@
"Als u 'Afronden per regel' selecteert: voor elke BTW rekening wordt het BTW "
"bedrag eerst berekend en afgerond voor elke factuurregel. Vervolgens worden "
"deze afgeronde bedragen opgeteld, wat leidt tot het totale bedrag voor deze "
-"belasting.\r\n"
-"\r\n"
-"Als u 'Globaal afronden' selecteert: voor elke BTW rekening wordt het BTW "
-"bedrag berekend voor elke factuurregel. Vervolgens zullen deze bedragen "
-"worden opgeteld en uiteindelijk wordt dit totale BTW bedrag afgerond.\r\n"
-"\r\n"
-"Als u verkoopt met BTW inbegrepen, moet u kiezen voor 'afronden per regel', "
-"omdat U zeker wilt zijn dat de subtotalen van \r\n"
-"uw (BTW inbegrepen) regels gelijk zijn aan het totale bedrag met BTW."
+"belasting. Als u 'Globaal afronden' selecteert: voor elke BTW rekening wordt "
+"het BTW bedrag berekend voor elke factuurregel. Vervolgens zullen deze "
+"bedragen worden opgeteld en uiteindelijk wordt dit totale BTW bedrag "
+"afgerond. Als u verkoopt met BTW inbegrepen, moet u kiezen voor 'afronden "
+"per regel', omdat u zeker wilt zijn dat de subtotalen van uw (BTW "
+"inbegrepen) regels gelijk zijn aan het totale bedrag met BTW."
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1680,7 +1689,7 @@
#. module: account
#: field:account.automatic.reconcile,max_amount:0
msgid "Maximum write-off amount"
-msgstr "Maximaal af te boeken bedrag"
+msgstr "Maximaal afschrijf bedrag"
#. module: account
#. openerp-web
@@ -3257,7 +3266,7 @@
#. module: account
#: field:account.move.line.reconcile,writeoff:0
msgid "Write-Off amount"
-msgstr "Af te boeken bedrag"
+msgstr "Afschrijf bedrag"
#. module: account
#: field:account.bank.statement,message_unread:0
@@ -4243,7 +4252,7 @@
#. module: account
#: view:account.config.settings:0
msgid "Options"
-msgstr "Optie's"
+msgstr "Opties"
#. module: account
#: field:account.aged.trial.balance,period_length:0
@@ -5068,7 +5077,7 @@
msgid ""
"You have to provide an account for the write off/exchange difference entry."
msgstr ""
-"U dient ene rekening op te geven voor boeken van het betaal- en/of "
+"U dient een rekening op te geven voor het boeken van het betaal- en/of "
"koersverschil."
#. module: account
@@ -6469,7 +6478,7 @@
#: view:account.move:0
#: view:account.move.line:0
msgid "Journal Item"
-msgstr "Journaal item"
+msgstr "Boeking"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
@@ -6516,7 +6525,7 @@
#: code:addons/account/account_move_line.py:882
#, python-format
msgid "Write-Off"
-msgstr "Boek af"
+msgstr "Afschrijving"
#. module: account
#: view:account.entries.report:0
@@ -11234,7 +11243,7 @@
#: view:account.automatic.reconcile:0
#: view:account.move.line.reconcile.writeoff:0
msgid "Write-Off Move"
-msgstr "Afboekingen"
+msgstr "Afschrijvingen"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
=== modified file 'account/i18n/pt_BR.po'
--- account/i18n/pt_BR.po 2013-04-19 05:24:38 +0000
+++ account/i18n/pt_BR.po 2013-05-08 15:44:19 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2013-04-18 17:44+0000\n"
"Last-Translator: Thiago Tognoli <Unknown>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-22 03:12+0000\n"
+"Last-Translator: Thiago Tognoli <Unknown>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-04-19 05:24+0000\n"
"X-Generator: Launchpad (build 16567)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -9914,7 +9928,7 @@
#. module: account
#: field:account.config.settings,purchase_refund_journal_id:0
msgid "Purchase refund journal"
-msgstr "Diário de Devolução de Vendas"
+msgstr "Diário de Devolução de Compras"
#. module: account
#: view:account.analytic.line:0
=== modified file 'account/i18n/tr.po'
--- account/i18n/tr.po 2013-04-22 15:34:49 +0000
+++ account/i18n/tr.po 2013-05-08 15:44:19 +0000
@@ -4,17 +4,32 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-12-01 21:27+0000\n"
"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-05-02 09:36+0000\n"
+"Last-Translator: Ediz Duman <neps1192@xxxxxxxxx>\n"
+"Language-Team: OpenERP Türkiye Yerelleştirmesi\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:18+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-03 06:29+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+"Language: tr\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -1415,7 +1430,7 @@
#. module: account
#: selection:account.analytic.journal,type:0
msgid "Situation"
-msgstr "Durum"
+msgstr "Durumu"
#. module: account
#: help:account.move.line,move_id:0
@@ -4171,9 +4186,9 @@
" </p><p>\n"
" OpenERP'nin elektronik faturalama özelliği müşteri "
"ödemelerinin\n"
-" kolay ve hızlı bir şekilde tahsil edilmesine olanak verir.\n"
+" kolay ve hızlı bir şekilde tahsil edilmesine olanak sağlar.\n"
" Müşterileriniz faturaları e-posta olarak alıp, online olarak "
-"ödeyip \n"
+"ödeyerek \n"
" kendi sistemlerine aktarabilirler.\n"
" </p><p>\n"
" Müşterilerinizle yaptığınız mesajlaşmalar otomatik olarak "
@@ -6124,7 +6139,7 @@
#: selection:account.period,state:0
#: selection:report.invoice.created,state:0
msgid "Open"
-msgstr "Aç"
+msgstr "Açık"
#. module: account
#: view:account.config.settings:0
@@ -7025,7 +7040,7 @@
#. module: account
#: field:account.journal,default_credit_account_id:0
msgid "Default Credit Account"
-msgstr "Varsayılan Kredi Hesabı"
+msgstr "Varsayılan Alacak Hesabı"
#. module: account
#: help:account.analytic.line,currency_id:0
@@ -10639,7 +10654,7 @@
#: report:account.vat.declaration:0
#: field:report.account.receivable,credit:0
msgid "Credit"
-msgstr "Kredi"
+msgstr "Alacak"
#. module: account
#: view:account.invoice:0
@@ -10666,7 +10681,7 @@
#: field:account.invoice,number:0
#: field:account.move,name:0
msgid "Number"
-msgstr "Sayı"
+msgstr "Numarası"
#. module: account
#: report:account.analytic.account.journal:0
=== modified file 'account/res_config.py'
--- account/res_config.py 2013-02-13 16:41:57 +0000
+++ account/res_config.py 2013-05-08 15:44:19 +0000
@@ -25,6 +25,7 @@
from operator import itemgetter
from os.path import join as opj
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT as DF
from openerp.tools.translate import _
from openerp.osv import fields, osv
from openerp import tools
@@ -132,12 +133,43 @@
count = self.pool.get('res.company').search_count(cr, uid, [], context=context)
return bool(count == 1)
+ def _get_default_fiscalyear_data(self, cr, uid, company_id, context=None):
+ """Compute default period, starting and ending date for fiscalyear
+ - if in a fiscal year, use its period, starting and ending date
+ - if past fiscal year, use its period, and new dates [ending date of the latest +1 day ; ending date of the latest +1 year]
+ - if no fiscal year, use monthly, 1st jan, 31th dec of this year
+ :return: (date_start, date_stop, period) at format DEFAULT_SERVER_DATETIME_FORMAT
+ """
+ fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
+ [('date_start', '<=', time.strftime(DF)), ('date_stop', '>=', time.strftime(DF)),
+ ('company_id', '=', company_id)])
+ if fiscalyear_ids:
+ # is in a current fiscal year, use this one
+ fiscalyear = self.pool.get('account.fiscalyear').browse(cr, uid, fiscalyear_ids[0], context=context)
+ if len(fiscalyear.period_ids) == 5: # 4 periods of 3 months + opening period
+ period = '3months'
+ else:
+ period = 'month'
+ return (fiscalyear.date_start, fiscalyear.date_stop, period)
+ else:
+ past_fiscalyear_ids = self.pool.get('account.fiscalyear').search(cr, uid,
+ [('date_stop', '<=', time.strftime(DF)), ('company_id', '=', company_id)])
+ if past_fiscalyear_ids:
+ # use the latest fiscal, sorted by (start_date, id)
+ latest_year = self.pool.get('account.fiscalyear').browse(cr, uid, past_fiscalyear_ids[-1], context=context)
+ latest_stop = datetime.datetime.strptime(latest_year.date_stop, DF)
+ if len(latest_year.period_ids) == 5:
+ period = '3months'
+ else:
+ period = 'month'
+ return ((latest_stop+datetime.timedelta(days=1)).strftime(DF), latest_stop.replace(year=latest_stop.year+1).strftime(DF), period)
+ else:
+ return (time.strftime('%Y-01-01'), time.strftime('%Y-12-31'), 'month')
+
+
_defaults = {
'company_id': _default_company,
'has_default_company': _default_has_default_company,
- 'date_start': lambda *a: time.strftime('%Y-01-01'),
- 'date_stop': lambda *a: time.strftime('%Y-12-31'),
- 'period': 'month',
}
def create(self, cr, uid, values, context=None):
@@ -161,6 +193,7 @@
fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
[('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
('company_id', '=', company_id)])
+ date_start, date_stop, period = self._get_default_fiscalyear_data(cr, uid, company_id, context=context)
values = {
'expects_chart_of_accounts': company.expects_chart_of_accounts,
'currency_id': company.currency_id.id,
@@ -170,6 +203,9 @@
'has_fiscal_year': bool(fiscalyear_count),
'chart_template_id': False,
'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
+ 'date_start': date_start,
+ 'date_stop': date_stop,
+ 'period': period,
}
# update journals and sequences
for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
=== modified file 'account_accountant/i18n/lt.po'
--- account_accountant/i18n/lt.po 2013-04-05 11:10:48 +0000
+++ account_accountant/i18n/lt.po 2013-05-08 15:44:19 +0000
@@ -7,19 +7,31 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-04-25 15:45+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-24 18:15+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@xxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Lithuanian <lt@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:47+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_accountant
#: model:ir.actions.client,name:account_accountant.action_client_account_menu
msgid "Open Accounting Menu"
+<<<<<<< TREE
msgstr ""
#~ msgid ""
@@ -37,3 +49,6 @@
#~ msgid "Accountant"
#~ msgstr "Apskaitininkas"
+=======
+msgstr "Atverti apskaitos meniu"
+>>>>>>> MERGE-SOURCE
=== modified file 'account_analytic_analysis/account_analytic_analysis.py'
--- account_analytic_analysis/account_analytic_analysis.py 2013-04-04 09:52:57 +0000
+++ account_analytic_analysis/account_analytic_analysis.py 2013-05-08 15:44:19 +0000
@@ -259,17 +259,14 @@
return res
if child_ids:
- cr.execute("SELECT account_analytic_line.account_id, COALESCE(SUM(amount), 0.0) \
- FROM account_analytic_line \
- JOIN account_analytic_journal \
- ON account_analytic_line.journal_id = account_analytic_journal.id \
- WHERE account_analytic_line.account_id IN %s \
- AND account_analytic_journal.type = 'sale' \
- GROUP BY account_analytic_line.account_id", (child_ids,))
- for account_id, sum in cr.fetchall():
- res[account_id] = round(sum,2)
+ #Search all invoice lines not in cancelled state that refer to this analytic account
+ inv_line_obj = self.pool.get("account.invoice.line")
+ inv_lines = inv_line_obj.search(cr, uid, ['&', ('account_analytic_id', 'in', child_ids), ('invoice_id.state', '!=', 'cancel')], context=context)
+ for line in inv_line_obj.browse(cr, uid, inv_lines, context=context):
+ res[line.account_analytic_id.id] += line.price_subtotal
for acc in self.browse(cr, uid, res.keys(), context=context):
res[acc.id] = res[acc.id] - (acc.timesheet_ca_invoiced or 0.0)
+
res_final = res
return res_final
@@ -633,6 +630,7 @@
pass
return result
+<<<<<<< TREE
def _prepare_invoice(self, cr, uid, contract, context=None):
context = context or {}
@@ -713,6 +711,25 @@
self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
return True
+=======
+
+ def hr_to_invoice_timesheets(self, cr, uid, ids, context=None):
+ domain = [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general'), ('account_id', 'in', ids)]
+ names = [record.name for record in self.browse(cr, uid, ids, context=context)]
+ name = _('Timesheets to Invoice of %s') % ','.join(names)
+ return {
+ 'type': 'ir.actions.act_window',
+ 'name': name,
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'domain' : domain,
+ 'res_model': 'account.analytic.line',
+ 'nodestroy': True,
+ }
+
+
+
+>>>>>>> MERGE-SOURCE
class account_analytic_account_summary_user(osv.osv):
_name = "account_analytic_analysis.summary.user"
_description = "Hours Summary by User"
=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
--- account_analytic_analysis/account_analytic_analysis_view.xml 2013-04-22 15:34:49 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml 2013-05-08 15:44:19 +0000
@@ -98,8 +98,8 @@
<field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
</td><td class="oe_timesheet_action" attrs="{'invisible': ['|',('invoice_on_timesheets','=',False),('type','=','template')]}">
<span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
- <button name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
- type="action"
+ <button name="hr_to_invoice_timesheets"
+ type="object"
class="oe_link"
string="⇒ Invoice"/>
or view
=== modified file 'account_analytic_analysis/i18n/hu.po'
--- account_analytic_analysis/i18n/hu.po 2013-04-05 11:10:48 +0000
+++ account_analytic_analysis/i18n/hu.po 2013-05-08 15:44:19 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2011-01-30 15:04+0000\n"
"Last-Translator: Krisztian Eyssen <krisz@xxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-21 23:19+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
+"Language-Team: Hungarian <hu@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:25+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -38,6 +52,7 @@
#. module: account_analytic_analysis
#: view:account.analytic.account:0
+<<<<<<< TREE
msgid "Contracts in progress"
msgstr "Folyamatban lévő szerződések"
@@ -49,6 +64,10 @@
msgstr ""
"A legutolsó kiszámlázott munka vagy költség dátuma, ha a költségek alapján "
"számláznak."
+=======
+msgid "End date passed or prepaid unit consumed"
+msgstr "Határidő túllépett vagy az előre kifizetett egységek elfogytak"
+>>>>>>> MERGE-SOURCE
#. module: account_analytic_analysis
#: field:account.analytic.account,last_worked_date:0
@@ -107,12 +126,28 @@
msgstr "Ennek a szerződéshez tartozó időkimutatás számlázott sorai."
#. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: model:email.template,subject:account_analytic_analysis.account_analytic_cron_email_template
+msgid "Contract expiration reminder ${user.company_id.name}"
+msgstr "Figyelmeztetés a szerződés lejártára ${user.company_id.name}"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
#: code:addons/account_analytic_analysis/account_analytic_analysis.py:466
#, python-format
msgid "Sales Order Lines of %s"
msgstr "Megrendelés sorok ebből %s"
#. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "End date is in the next month"
+msgstr "A lejárat dátuma a következő hónapban lesz"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
#: help:account.analytic.account,revenue_per_hour:0
msgid "Computed using the formula: Invoiced Amount / Total Time"
msgstr "Számolva a következő formulával: Számlázott összeg / Teljes idő"
@@ -152,6 +187,20 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Kattintson új szerződés létrehozásához.\n"
+" </p><p>\n"
+" Itt találhatók a frissítendő szerződések, melyeknek a "
+"lejárati\n"
+" ideje túllépett, vagy a belelőlt energia nagyobb mint a\n"
+" maximum megengedett.\n"
+" </p><p>\n"
+" OpenERP automatikusan frissítésre állítja a függőben\n"
+" lévőket. A tárgyalás után, az értékesítőnek le kell zárnia "
+"vagy meg \n"
+" kell újítania a fügőben lévő szerződéseket.\n"
+" </p>\n"
+" "
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -234,7 +283,7 @@
#. module: account_analytic_analysis
#: model:res.groups,name:account_analytic_analysis.group_template_required
msgid "Mandatory use of templates in contracts"
-msgstr ""
+msgstr "Kizárólag sablonok használhatóak a szerződésekhez"
#. module: account_analytic_analysis
#: field:account.analytic.account,hours_quantity:0
@@ -272,6 +321,14 @@
msgstr "Gyűjtő főkönyvi szla."
#. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "Units Consumed"
+msgstr "Elfogyasztott egységek"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
#: field:account.analytic.account,month_ids:0
#: field:account_analytic_analysis.summary.month,month:0
msgid "Month"
@@ -325,6 +382,8 @@
"Number of time (hours/days) (from journal of type 'general') that can be "
"invoiced if you invoice based on analytic account."
msgstr ""
+"Idő mennyisége (órák/napok) (Az 'általános' típusú naplóból) melyek "
+"számlázhatóak, ha a számlázás a gyüjtőkódon alapszik."
#. module: account_analytic_analysis
#: view:account.analytic.account:0
@@ -389,6 +448,14 @@
msgstr "Felhasználó"
#. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "Cancelled contracts"
+msgstr "Visszavont szerződések"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,help:account_analytic_analysis.template_of_contract_action
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
@@ -401,6 +468,16 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Kattintson szerződés sablon létrehozásához.\n"
+" </p><p>\n"
+" Sablonokat használ a szerződések/projektek "
+"elképzelésénak kialakításához, \n"
+" melyeket az értékesítő kiválaszthat és gyorsan "
+"beállíthat a szerződés\n"
+" feltételeihez és részleteihez.\n"
+" </p>\n"
+" "
#. module: account_analytic_analysis
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -435,6 +512,14 @@
msgstr "Bevétel per idő (valós)"
#. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "Expired or consumed"
+msgstr "Lejárt vagy elfogyasztott"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue_all
msgid ""
"<p class=\"oe_view_nocontent_create\">\n"
=== modified file 'account_analytic_default/i18n/hu.po'
--- account_analytic_default/i18n/hu.po 2013-04-05 11:10:48 +0000
+++ account_analytic_default/i18n/hu.po 2013-05-08 15:44:19 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2012-10-09 13:58+0000\n"
"Last-Translator: krnkris <Unknown>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-21 23:02+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
+"Language-Team: Hungarian <hu@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:28+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_analytic_default
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -31,7 +45,7 @@
#. module: account_analytic_default
#: help:account.analytic.default,date_stop:0
msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Alapértelmezett befejező dátum ehhez a gyüjtőkódhoz."
#. module: account_analytic_default
#: help:account.analytic.default,product_id:0
@@ -40,6 +54,10 @@
"default (e.g. create new customer invoice or Sales order if we select this "
"product, it will automatically take this as an analytic account)"
msgstr ""
+"Válasszon terméket ami az alapértelmezett gyüjttőkódban meghatározott "
+"gyűjtőkódot fogja használni (pl. ennek a terméknek a kiválasztásakor "
+"létrehoz új vevői számlát vagy megrendelést, amit automatikusan mint "
+"gyűjtókódot vesz figyelembe)"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -64,6 +82,10 @@
"default (e.g. create new customer invoice or Sales order if we select this "
"partner, it will automatically take this as an analytic account)"
msgstr ""
+"Válasszon partnert aki az alapértelmezett gyüjttőkódban meghatározott "
+"gyűjtőkódot fogja használni (pl. ennek a terméknek a kiválasztásakor "
+"létrehoz új vevői számlát vagy megrendelést, amit automatikusan mint "
+"gyűjtókódot vesz figyelembe)"
#. module: account_analytic_default
#: view:account.analytic.default:0
@@ -104,6 +126,8 @@
msgid ""
"Select a user which will use analytic account specified in analytic default."
msgstr ""
+"Válasszon felhasználót aki az alapértelmezett gyüjttőkódban meghatározott "
+"gyűjtőkódot fogja használni"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_invoice_line
@@ -117,6 +141,10 @@
"default (e.g. create new customer invoice or Sales order if we select this "
"company, it will automatically take this as an analytic account)"
msgstr ""
+"Válasszon vállalatot aki az alapértelmezett gyüjttőkódban meghatározott "
+"gyűjtőkódot fogja használni (pl. ennek a terméknek a kiválasztásakor "
+"létrehoz új vevői számlát vagy megrendelést, amit automatikusan mint "
+"gyűjtókódot vesz figyelembe)"
#. module: account_analytic_default
#: view:account.analytic.default:0
@@ -132,7 +160,7 @@
#. module: account_analytic_default
#: help:account.analytic.default,date_start:0
msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "Alapértelmezett indulási dátum ehhez a gyüjtőkódhoz."
#. module: account_analytic_default
#: view:account.analytic.default:0
=== modified file 'account_analytic_default/i18n/lt.po'
--- account_analytic_default/i18n/lt.po 2013-04-05 11:10:48 +0000
+++ account_analytic_default/i18n/lt.po 2013-05-08 15:44:19 +0000
@@ -1,20 +1,41 @@
+<<<<<<< TREE
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_analytic_default
+=======
+# Lithuanian 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.
+# Giedrius Slavinskas <giedrius@xxxxxxxxxx>, 2012.
+>>>>>>> MERGE-SOURCE
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2010-09-09 07:15+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-30 16:26+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@xxxxxxxxxx>\n"
+"Language-Team: Lithuanian <lt@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:28+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_analytic_default
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -31,7 +52,7 @@
#. module: account_analytic_default
#: help:account.analytic.default,date_stop:0
msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Numatytoji pabaigos data šiai analitinei sąskaitai."
#. module: account_analytic_default
#: help:account.analytic.default,product_id:0
@@ -40,16 +61,19 @@
"default (e.g. create new customer invoice or Sales order if we select this "
"product, it will automatically take this as an analytic account)"
msgstr ""
+"Pasirinkite produktą, kuris naudos numatytąją analitinę sąskaitą (pvz. "
+"kuriant sąskaitą faktūrą ar užsakymą ir pasirinkus šį produktą, bus "
+"automatiškai pasirenkama numatytoji analitinė sąskaita)"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_stock_picking
msgid "Picking List"
-msgstr ""
+msgstr "Siunta"
#. module: account_analytic_default
#: view:account.analytic.default:0
msgid "Conditions"
-msgstr ""
+msgstr "Sąlygos"
#. module: account_analytic_default
#: view:account.analytic.default:0
@@ -64,6 +88,9 @@
"default (e.g. create new customer invoice or Sales order if we select this "
"partner, it will automatically take this as an analytic account)"
msgstr ""
+"Pasirinkite partnerį, kuris naudos numatytąją analitinę sąskaitą (pvz. "
+"kuriant sąskaitą faktūrą ar užsakymą ir pasirinkus šį partnerį, bus "
+"automatiškai pasirenkama numatytoji analitinė sąskaita)"
#. module: account_analytic_default
#: view:account.analytic.default:0
@@ -92,7 +119,7 @@
#: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
#: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
msgid "Analytic Defaults"
-msgstr ""
+msgstr "Numatytosios analitinės sąskaitos"
#. module: account_analytic_default
#: field:account.analytic.default,sequence:0
@@ -103,12 +130,12 @@
#: help:account.analytic.default,user_id:0
msgid ""
"Select a user which will use analytic account specified in analytic default."
-msgstr ""
+msgstr "Pasirinkite naudotoją, kuris naudos numatytąją analitinę sąskaitą."
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_invoice_line
msgid "Invoice Line"
-msgstr ""
+msgstr "Sąskaitos faktūros eilutė"
#. module: account_analytic_default
#: help:account.analytic.default,company_id:0
@@ -117,12 +144,15 @@
"default (e.g. create new customer invoice or Sales order if we select this "
"company, it will automatically take this as an analytic account)"
msgstr ""
+"Pasirinkite įmonę, kuri naudos numatytąją analitinę sąskaitą (pvz. kuriant "
+"sąskaitą faktūrą ar užsakymą ir pasirinkus šią įmonę, bus automatiškai "
+"pasirenkama numatytoji analitinė sąskaita)"
#. module: account_analytic_default
#: view:account.analytic.default:0
#: field:account.analytic.default,analytic_id:0
msgid "Analytic Account"
-msgstr ""
+msgstr "Analitinė sąskaita"
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_account_analytic_default
@@ -132,7 +162,7 @@
#. module: account_analytic_default
#: help:account.analytic.default,date_start:0
msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "Numatytoji pradžios data šiai analitinei sąskaitai."
#. module: account_analytic_default
#: view:account.analytic.default:0
@@ -154,11 +184,12 @@
#: help:account.analytic.default,sequence:0
msgid ""
"Gives the sequence order when displaying a list of analytic distribution"
-msgstr ""
+msgstr "Eilės tvarka, pagal kurią išdėstomas analitinio paskirstymo sąrašas."
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_sale_order_line
msgid "Sales Order Line"
+<<<<<<< TREE
msgstr ""
#~ msgid "Seq"
@@ -171,3 +202,6 @@
#~ "The Object name must start with x_ and not contain any special character !"
#~ msgstr ""
#~ "Objekto pavadinimas turi prasidėti x_ ir neturėti jokių specialių simbolių!"
+=======
+msgstr "Pardavimo užsakymo eilutė"
+>>>>>>> MERGE-SOURCE
=== modified file 'account_asset/i18n/lt.po'
--- account_asset/i18n/lt.po 2013-04-05 11:10:48 +0000
+++ account_asset/i18n/lt.po 2013-05-08 15:44:19 +0000
@@ -1,26 +1,37 @@
# Lithuanian 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 <EMAIL@ADDRESS>, 2012.
+# Giedrius Slavinskas <giedrius@xxxxxxxxxx>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-03-09 15:10+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-30 16:26+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@xxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Lithuanian <lt@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:50+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_asset
#: view:account.asset.asset:0
msgid "Assets in draft and open states"
-msgstr ""
+msgstr "Ilgalaikio turto juodraščiai bei vykdomi"
#. module: account_asset
#: field:account.asset.category,method_end:0
@@ -32,22 +43,22 @@
#. module: account_asset
#: field:account.asset.asset,value_residual:0
msgid "Residual Value"
-msgstr ""
+msgstr "Likutinė vertė"
#. module: account_asset
#: field:account.asset.category,account_expense_depreciation_id:0
msgid "Depr. Expense Account"
-msgstr ""
+msgstr "Nusidėv. sąnaudų sąskaita"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Group By..."
-msgstr ""
+msgstr "Grupuoti pagal..."
#. module: account_asset
#: field:asset.asset.report,gross_value:0
msgid "Gross Amount"
-msgstr ""
+msgstr "Įsigijimo kaina"
#. module: account_asset
#: view:account.asset.asset:0
@@ -58,7 +69,7 @@
#: field:asset.asset.report,asset_id:0
#: model:ir.model,name:account_asset.model_account_asset_asset
msgid "Asset"
-msgstr ""
+msgstr "Ilg. turtas"
#. module: account_asset
#: help:account.asset.asset,prorata:0
@@ -67,12 +78,13 @@
"Indicates that the first depreciation entry for this asset have to be done "
"from the purchase date instead of the first January"
msgstr ""
+"Skaičiuoti nusidėvėjimą nuo pirkimo datos, o ne nuo finansinių metų pradžios"
#. module: account_asset
#: selection:account.asset.asset,method:0
#: selection:account.asset.category,method:0
msgid "Linear"
-msgstr ""
+msgstr "Tiesinis"
#. module: account_asset
#: field:account.asset.asset,company_id:0
@@ -80,24 +92,24 @@
#: view:asset.asset.report:0
#: field:asset.asset.report,company_id:0
msgid "Company"
-msgstr ""
+msgstr "Įmonė"
#. module: account_asset
#: view:asset.modify:0
msgid "Modify"
-msgstr ""
+msgstr "Pakeisti"
#. module: account_asset
#: selection:account.asset.asset,state:0
#: view:asset.asset.report:0
#: selection:asset.asset.report,state:0
msgid "Running"
-msgstr ""
+msgstr "Veikiantis"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Set to Draft"
-msgstr ""
+msgstr "Nustatyti kaip juodraštį"
#. module: account_asset
#: view:asset.asset.report:0
@@ -105,24 +117,24 @@
#: model:ir.model,name:account_asset.model_asset_asset_report
#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
msgid "Assets Analysis"
-msgstr ""
+msgstr "Ilagalaikio turto analizė"
#. module: account_asset
#: field:asset.modify,name:0
msgid "Reason"
-msgstr ""
+msgstr "Priežastis"
#. module: account_asset
#: field:account.asset.asset,method_progress_factor:0
#: field:account.asset.category,method_progress_factor:0
msgid "Degressive Factor"
-msgstr ""
+msgstr "Nusidėvėjimo procentas"
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
msgid "Asset Categories"
-msgstr ""
+msgstr "Ilgalaikio turto kategorijos"
#. module: account_asset
#: view:account.asset.asset:0
@@ -130,30 +142,30 @@
#: field:account.move.line,entry_ids:0
#: model:ir.actions.act_window,name:account_asset.act_entries_open
msgid "Entries"
-msgstr ""
+msgstr "Įrašai"
#. module: account_asset
#: view:account.asset.asset:0
#: field:account.asset.asset,depreciation_line_ids:0
msgid "Depreciation Lines"
-msgstr ""
+msgstr "Nusidėvėjimo eilutės"
#. module: account_asset
#: help:account.asset.asset,salvage_value:0
msgid "It is the amount you plan to have that you cannot depreciate."
-msgstr ""
+msgstr "Tai suma iki kurios gali būti nudėvėtas ilgalaikis turtas."
#. module: account_asset
#: help:account.asset.asset,method_period:0
msgid "The amount of time between two depreciations, in months"
-msgstr ""
+msgstr "Laikotarpis mėnesiais tarp dviejų nusidėvėjimų"
#. module: account_asset
#: field:account.asset.depreciation.line,depreciation_date:0
#: view:asset.asset.report:0
#: field:asset.asset.report,depreciation_date:0
msgid "Depreciation Date"
-msgstr ""
+msgstr "Nusidėvėjimo data"
#. module: account_asset
#: constraint:account.asset.asset:0
@@ -163,7 +175,7 @@
#. module: account_asset
#: field:asset.asset.report,posted_value:0
msgid "Posted Amount"
-msgstr ""
+msgstr "Užregistruota suma"
#. module: account_asset
#: view:account.asset.asset:0
@@ -173,12 +185,12 @@
#: model:ir.ui.menu,name:account_asset.menu_finance_assets
#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
msgid "Assets"
-msgstr ""
+msgstr "Ilgalaikis turtas"
#. module: account_asset
#: field:account.asset.category,account_depreciation_id:0
msgid "Depreciation Account"
-msgstr ""
+msgstr "Nusidėvėjimo sąskaita"
#. module: account_asset
#: view:account.asset.asset:0
@@ -187,28 +199,37 @@
#: view:asset.modify:0
#: field:asset.modify,note:0
msgid "Notes"
-msgstr ""
+msgstr "Pastabos"
#. module: account_asset
#: field:account.asset.depreciation.line,move_id:0
msgid "Depreciation Entry"
-msgstr ""
-
-#. module: account_asset
+msgstr "Operacija"
+
+#. module: account_asset
+<<<<<<< TREE
+=======
+#: code:addons/account_asset/account_asset.py:82
+#, python-format
+msgid "Error!"
+msgstr "Klaida!"
+
+#. module: account_asset
+>>>>>>> MERGE-SOURCE
#: view:asset.asset.report:0
#: field:asset.asset.report,nbr:0
msgid "# of Depreciation Lines"
-msgstr ""
+msgstr "# nusidėvėjimo įrašų"
#. module: account_asset
#: field:account.asset.asset,method_period:0
msgid "Number of Months in a Period"
-msgstr ""
+msgstr "Mėnesių skaičius per periodą"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets in draft state"
-msgstr ""
+msgstr "Ilgalaikio turto juodraščiai"
#. module: account_asset
#: field:account.asset.asset,method_end:0
@@ -216,70 +237,70 @@
#: selection:account.asset.category,method_time:0
#: selection:account.asset.history,method_time:0
msgid "Ending Date"
-msgstr ""
+msgstr "Pabaigos data"
#. module: account_asset
#: field:account.asset.asset,code:0
msgid "Reference"
-msgstr ""
+msgstr "Numeris"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Account Asset"
-msgstr ""
+msgstr "Ilgalaikio turto sąskaita"
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
msgid "Compute Assets"
-msgstr ""
+msgstr "Skaičiuoti nusidėvėjimą"
#. module: account_asset
#: field:account.asset.category,method_period:0
#: field:account.asset.history,method_period:0
#: field:asset.modify,method_period:0
msgid "Period Length"
-msgstr ""
+msgstr "Periodo ilgis"
#. module: account_asset
#: selection:account.asset.asset,state:0
#: view:asset.asset.report:0
#: selection:asset.asset.report,state:0
msgid "Draft"
-msgstr ""
+msgstr "Juodraštis"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Date of asset purchase"
-msgstr ""
+msgstr "Ilgalaikio turto pirkimo data"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Change Duration"
-msgstr ""
+msgstr "Keisti laikotarpį"
#. module: account_asset
#: help:account.asset.asset,method_number:0
#: help:account.asset.category,method_number:0
#: help:account.asset.history,method_number:0
msgid "The number of depreciations needed to depreciate your asset"
-msgstr ""
+msgstr "Nusidėvėjimų skaičius per kuriuos nudėvimas ilgalaikis turtas"
#. module: account_asset
#: view:account.asset.category:0
msgid "Analytic Information"
-msgstr ""
+msgstr "Analitinė informacija"
#. module: account_asset
#: field:account.asset.category,account_analytic_id:0
msgid "Analytic account"
-msgstr ""
+msgstr "Analitinė sąskaita"
#. module: account_asset
#: field:account.asset.asset,method:0
#: field:account.asset.category,method:0
msgid "Computation Method"
-msgstr ""
+msgstr "Skaičiavimo metodas"
#. module: account_asset
#: constraint:account.asset.asset:0
@@ -291,7 +312,7 @@
#. module: account_asset
#: field:account.asset.depreciation.line,remaining_value:0
msgid "Next Period Depreciation"
-msgstr ""
+msgstr "Likutinė vertė"
#. module: account_asset
#: help:account.asset.history,method_period:0
@@ -303,12 +324,12 @@
#: model:ir.actions.act_window,name:account_asset.action_asset_modify
#: model:ir.model,name:account_asset.model_asset_modify
msgid "Modify Asset"
-msgstr ""
+msgstr "Pakeisti ilgalaikio turto nusidėvėjimo laikotarpį"
#. module: account_asset
#: field:account.asset.asset,salvage_value:0
msgid "Salvage Value"
-msgstr ""
+msgstr "Likvidacinė kaina"
#. module: account_asset
#: field:account.asset.asset,category_id:0
@@ -316,23 +337,23 @@
#: field:account.invoice.line,asset_category_id:0
#: view:asset.asset.report:0
msgid "Asset Category"
-msgstr ""
+msgstr "Ilgalaikio turto kategorija"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Assets in closed state"
-msgstr ""
+msgstr "Uždarytos ilgalaikio turto kortelės"
#. module: account_asset
#: field:account.asset.asset,parent_id:0
msgid "Parent Asset"
-msgstr ""
+msgstr "Tėvinis ilgalaikis turtas"
#. module: account_asset
#: view:account.asset.history:0
#: model:ir.model,name:account_asset.model_account_asset_history
msgid "Asset history"
-msgstr ""
+msgstr "Ilgalaikio turto istorija"
#. module: account_asset
#: view:account.asset.category:0
@@ -342,17 +363,17 @@
#. module: account_asset
#: view:asset.modify:0
msgid "months"
-msgstr ""
+msgstr "mėnesiai"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_invoice_line
msgid "Invoice Line"
-msgstr ""
+msgstr "Sąskaitos faktūros eilutė"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Depreciation Board"
-msgstr ""
+msgstr "Nusidėvėjimo lenta"
#. module: account_asset
#: field:asset.asset.report,unposted_value:0
@@ -364,20 +385,20 @@
#: field:account.asset.category,method_time:0
#: field:account.asset.history,method_time:0
msgid "Time Method"
-msgstr ""
+msgstr "Laikotarpio metodas"
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
#: view:asset.modify:0
msgid "or"
-msgstr ""
+msgstr "arba"
#. module: account_asset
#: field:account.asset.asset,note:0
#: field:account.asset.category,note:0
#: field:account.asset.history,note:0
msgid "Note"
-msgstr ""
+msgstr "Pastaba"
#. module: account_asset
#: help:account.asset.history,method_time:0
@@ -388,6 +409,12 @@
"Ending Date: Choose the time between 2 depreciations and the date the "
"depreciations won't go beyond."
msgstr ""
+"Metodas naudojamas paskaičiuoti datas ir kartus, per kiek nusidėvės "
+"ilgalaikis turtas.\n"
+"Periodų skaičius: Fiksuotas kartų skaičius ir laikotarpis tarp dviejų "
+"nusidėvėjimo skaičiavimų.\n"
+"Pabaigos data: Pasirinkite laikotarpį tarp dviejų nusidėvėjimo skaičiavimų "
+"ir turtas bus nudėvėtas iki šios datos."
#. module: account_asset
#: help:account.asset.asset,method_time:0
@@ -400,16 +427,22 @@
" * Ending Date: Choose the time between 2 depreciations and the date the "
"depreciations won't go beyond."
msgstr ""
+"Pasirinkite metodą naudojamą paskaičiuoti datas ir kartus, per kiek "
+"nusidėvės ilgalaikis turtas.\n"
+" * Periodų skaičius: Fiksuotas kartų skaičius ir laikotarpis tarp dviejų "
+"nusidėvėjimo skaičiavimų.\n"
+" * Pabaigos data: Pasirinkite laikotarpį tarp dviejų nusidėvėjimo "
+"skaičiavimų ir turtas bus nudėvėtas iki šios datos."
#. module: account_asset
#: view:asset.asset.report:0
msgid "Assets in running state"
-msgstr ""
+msgstr "Naudojamas ilgalaikis turtas"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Closed"
-msgstr ""
+msgstr "Uždaryta"
#. module: account_asset
#: help:account.asset.asset,state:0
@@ -425,18 +458,18 @@
#: field:account.asset.asset,state:0
#: field:asset.asset.report,state:0
msgid "Status"
-msgstr ""
+msgstr "Būsena"
#. module: account_asset
#: field:account.asset.asset,partner_id:0
#: field:asset.asset.report,partner_id:0
msgid "Partner"
-msgstr ""
+msgstr "Partneris"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Posted depreciation lines"
-msgstr ""
+msgstr "Užregistruoti nusidėvėjimo DK įrašai"
#. module: account_asset
#: field:account.asset.asset,child_ids:0
@@ -446,33 +479,33 @@
#. module: account_asset
#: view:asset.asset.report:0
msgid "Date of depreciation"
-msgstr ""
+msgstr "Nusidėvėjimo data"
#. module: account_asset
#: field:account.asset.history,user_id:0
msgid "User"
-msgstr ""
+msgstr "Naudotojas"
#. module: account_asset
#: field:account.asset.category,account_asset_id:0
msgid "Asset Account"
-msgstr ""
+msgstr "Ilgalaikio turto sąskaita"
#. module: account_asset
#: view:asset.asset.report:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "Išplėstiniai filtrai..."
#. module: account_asset
#: view:account.asset.asset:0
#: view:asset.depreciation.confirmation.wizard:0
msgid "Compute"
-msgstr ""
+msgstr "Skaičiuoti"
#. module: account_asset
#: view:account.asset.history:0
msgid "Asset History"
-msgstr ""
+msgstr "Ilgalaikio turto istorija"
#. module: account_asset
#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
@@ -482,7 +515,7 @@
#. module: account_asset
#: field:account.asset.asset,active:0
msgid "Active"
-msgstr ""
+msgstr "Aktyvus"
#. module: account_asset
#: field:account.asset.depreciation.line,parent_state:0
@@ -492,28 +525,28 @@
#. module: account_asset
#: field:account.asset.depreciation.line,name:0
msgid "Depreciation Name"
-msgstr ""
+msgstr "Pavadinimas"
#. module: account_asset
#: view:account.asset.asset:0
#: field:account.asset.asset,history_ids:0
msgid "History"
-msgstr ""
+msgstr "Istorija"
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
msgid "Compute Asset"
-msgstr ""
+msgstr "Skaičiuoti nusidėvėjimą"
#. module: account_asset
#: field:asset.depreciation.confirmation.wizard,period_id:0
msgid "Period"
-msgstr ""
+msgstr "Periodas"
#. module: account_asset
#: view:account.asset.asset:0
msgid "General"
-msgstr ""
+msgstr "Bendra"
#. module: account_asset
#: field:account.asset.asset,prorata:0
@@ -524,47 +557,47 @@
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_invoice
msgid "Invoice"
-msgstr ""
+msgstr "Sąskaita-faktūra"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Set to Close"
-msgstr ""
+msgstr "Užbaigti vykdymą"
#. module: account_asset
#: view:asset.depreciation.confirmation.wizard:0
#: view:asset.modify:0
msgid "Cancel"
-msgstr ""
+msgstr "Atšaukti"
#. module: account_asset
#: selection:account.asset.asset,state:0
#: selection:asset.asset.report,state:0
msgid "Close"
-msgstr ""
+msgstr "Uždaryta"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_move_line
msgid "Journal Items"
-msgstr ""
+msgstr "DK įrašai"
#. module: account_asset
#: view:asset.modify:0
msgid "Asset Durations to Modify"
-msgstr ""
+msgstr "Pakeisti ilgalaikio turto nusidėvėjimo laikotarpį"
#. module: account_asset
#: field:account.asset.asset,purchase_date:0
#: view:asset.asset.report:0
#: field:asset.asset.report,purchase_date:0
msgid "Purchase Date"
-msgstr ""
+msgstr "Pirkimo data"
#. module: account_asset
#: selection:account.asset.asset,method:0
#: selection:account.asset.category,method:0
msgid "Degressive"
-msgstr ""
+msgstr "Dvigubo balanso"
#. module: account_asset
#: help:asset.depreciation.confirmation.wizard,period_id:0
@@ -572,56 +605,58 @@
"Choose the period for which you want to automatically post the depreciation "
"lines of running assets"
msgstr ""
+"Pasirinkite periodą, kuriame užregistruoti naudojamo ilgalaikio turto "
+"nusidėvėjimą DK įrašus"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Current"
-msgstr ""
+msgstr "Naudojami"
#. module: account_asset
#: view:account.asset.category:0
msgid "Depreciation Method"
-msgstr ""
+msgstr "Nusidėvėjimo metodas"
#. module: account_asset
#: field:account.asset.depreciation.line,amount:0
msgid "Current Depreciation"
-msgstr ""
+msgstr "Nusidėvėjimas"
#. module: account_asset
#: field:account.asset.asset,name:0
msgid "Asset Name"
-msgstr ""
+msgstr "Ilgalaikio turto pavadinimas"
#. module: account_asset
#: field:account.asset.category,open_asset:0
msgid "Skip Draft State"
-msgstr ""
+msgstr "Patvirtinti automatiškai"
#. module: account_asset
#: view:account.asset.category:0
msgid "Depreciation Dates"
-msgstr ""
+msgstr "Nusidėvėjimo datos"
#. module: account_asset
#: field:account.asset.asset,currency_id:0
msgid "Currency"
-msgstr ""
+msgstr "Valiuta"
#. module: account_asset
#: field:account.asset.category,journal_id:0
msgid "Journal"
-msgstr ""
+msgstr "Žurnalas"
#. module: account_asset
#: field:account.asset.history,name:0
msgid "History name"
-msgstr ""
+msgstr "Pavadinimas"
#. module: account_asset
#: field:account.asset.depreciation.line,depreciated_value:0
msgid "Amount Already Depreciated"
-msgstr ""
+msgstr "Nudėvėta"
#. module: account_asset
#: help:account.asset.asset,method:0
@@ -631,13 +666,16 @@
" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
" * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
msgstr ""
+"Pasirinkite metodą naudojamą nusidėvėjimo eilučių skaičiavimui.\n"
+" * Tiesinis: Skaičiuojama pagal: Įsigijimo kaina / Periodų skaičius\n"
+" * Dvigubo balanso: Skaičiuojama: Likutinė vertė * Nusidėvėjimo procentas"
#. module: account_asset
#: field:account.asset.depreciation.line,move_check:0
#: view:asset.asset.report:0
#: field:asset.asset.report,move_check:0
msgid "Posted"
-msgstr ""
+msgstr "Užregistruota"
#. module: account_asset
#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
@@ -655,12 +693,12 @@
#. module: account_asset
#: field:account.asset.asset,purchase_value:0
msgid "Gross Value"
-msgstr ""
+msgstr "Įsigijimo kaina"
#. module: account_asset
#: field:account.asset.category,name:0
msgid "Name"
-msgstr ""
+msgstr "Pavadinimas"
#. module: account_asset
#: help:account.asset.category,open_asset:0
@@ -668,11 +706,13 @@
"Check this if you want to automatically confirm the assets of this category "
"when created by invoices."
msgstr ""
+"Ilgalaikis turtas sukurtas iš sąskaitos faktūros ir priklausantis šiai "
+"kategorijai bus automatiškai patvirtintas."
#. module: account_asset
#: field:asset.asset.report,name:0
msgid "Year"
-msgstr ""
+msgstr "Metai"
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -684,13 +724,13 @@
#: field:asset.asset.report,asset_category_id:0
#: model:ir.model,name:account_asset.model_account_asset_category
msgid "Asset category"
-msgstr ""
+msgstr "Ilgalaikio turto kategorija"
#. module: account_asset
#: view:asset.asset.report:0
#: field:asset.asset.report,depreciation_value:0
msgid "Amount of Depreciation Lines"
-msgstr ""
+msgstr "Nusidėvėjusi vertė"
#. module: account_asset
#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
@@ -699,19 +739,27 @@
msgstr ""
#. module: account_asset
+<<<<<<< TREE
+=======
+#: view:account.asset.asset:0
+msgid "Add an internal note here..."
+msgstr "Įveskite vidines pastabas..."
+
+#. module: account_asset
+>>>>>>> MERGE-SOURCE
#: field:account.asset.depreciation.line,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Seka"
#. module: account_asset
#: help:account.asset.category,method_period:0
msgid "State here the time between 2 depreciations, in months"
-msgstr ""
+msgstr "Laikotarpis tarp dviejų nusidėvėjimų, mėnesiais"
#. module: account_asset
#: field:account.asset.history,date:0
msgid "Date"
-msgstr ""
+msgstr "Data"
#. module: account_asset
#: field:account.asset.asset,method_number:0
@@ -722,20 +770,20 @@
#: selection:account.asset.history,method_time:0
#: field:asset.modify,method_number:0
msgid "Number of Depreciations"
-msgstr ""
+msgstr "Periodų skaičius"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Create Move"
-msgstr ""
+msgstr "Sukurti įrašus"
#. module: account_asset
#: view:account.asset.asset:0
msgid "Confirm Asset"
-msgstr ""
+msgstr "Patvirtinti ilgalaikį turtą"
#. module: account_asset
#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
msgid "Asset Hierarchy"
-msgstr ""
+msgstr "Ilgalaikio turto hierarchija"
=== modified file 'account_bank_statement_extensions/i18n/de.po'
--- account_bank_statement_extensions/i18n/de.po 2013-04-05 11:10:48 +0000
+++ account_bank_statement_extensions/i18n/de.po 2013-05-08 15:44:19 +0000
@@ -7,21 +7,33 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2012-12-06 23:53+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
"consulting.net>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-21 18:55+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: German <de@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:50+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_bank_statement_extensions
#: help:account.bank.statement.line.global,name:0
msgid "Originator to Beneficiary Information"
-msgstr ""
+msgstr "Auftrageber oder Begünstigter"
#. module: account_bank_statement_extensions
#: view:account.bank.statement.line:0
=== added file 'account_bank_statement_extensions/i18n/hu.po'
--- account_bank_statement_extensions/i18n/hu.po 1970-01-01 00:00:00 +0000
+++ account_bank_statement_extensions/i18n/hu.po 2013-05-08 15:44:19 +0000
@@ -0,0 +1,362 @@
+# Hungarian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-05-05 22:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <hu@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-06 06:35+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
+msgstr "Kezdeményezőtől a kedvezményezetthez intézett információ"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Jóváhagyott"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "Globális ID azonosító"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Szülő kód"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Tartozik"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Kiválasztott számlakivonat sorok visszavonása"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Value Date"
+msgstr "Értéknap"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Csoportosítás ezzel..."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Tervezet"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Kivonat"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Kiválasztott bankszámla kivonat sorok jóváhagyása"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Bank kivonat egyenleg kimutatás"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Sorok elvetése"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Köptegelt fizetés információ"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "Status"
+msgstr "Állapot"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
+#, python-format
+msgid ""
+"Delete operation not allowed. Please go to the associated bank "
+"statement in order to delete and/or modify bank statement line."
+msgstr ""
+"A törlés végrehajtás nem engedélyezett. Kérem menjen az ide vonatkozó banki "
+"kivonathoz, hogy azt törölhesse és/vagy módosíthassa."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "or"
+msgstr "vagy"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Jóváhagyott sorok5"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Tranzakciók"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Típus"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Napló"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Jóváhagyott kivonat sorok"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Jóváírási tranzakció"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "kiválasztott kivonat sorok visszavonása"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Ellanoldali szám"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Záró egyenleg"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Dátum"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "Globális összeg"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Terhelés tranzakciók"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Kiterjesztett szűrők…"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Jóváhagyott sorokat enm lehet többé megváltoztatni."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"Biztos benne, hogy vissza akarja vonni a kijelölt banki kivonat sorokat?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Név"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr "OBI"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Jegyzetek"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Kézi"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Bank Transaction"
+msgstr "Banki tranzakciók"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Jóváírás"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Összeg"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Főkönyvi számla"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Ellenoldal pénzneme"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "Ellenoldali BIC"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Alárendelt kódok"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Banki tranzakciók keresése"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr "Biztos, hogy jóvá akarja hagyni a kiválasztott banki kivonat sorait?"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Ugynahhoz, a kötegelt utaláson belüli, globalizált szinthez tartozó "
+"tranzakció azonosító kód"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Tervezet kivonat sorok."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr ""
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Bankkivonat sor"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Kód"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Ellenoldal megnevezése"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bankszámlák"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Bankszámlakivonat"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Kivonat sor"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "A kódnak egyedinek kell lennie !"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Bankkivonat sorai"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
+#, python-format
+msgid "Warning!"
+msgstr "Figyelem!"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Alárendelt kötegelt utalások"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Mégse"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Kivonat sorai"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Teljes érték"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "Globalizált ID azonosító"
=== renamed file 'account_bank_statement_extensions/i18n/hu.po' => 'account_bank_statement_extensions/i18n/hu.po.moved'
=== modified file 'account_budget/i18n/de.po'
--- account_budget/i18n/de.po 2013-04-05 11:10:48 +0000
+++ account_budget/i18n/de.po 2013-05-08 15:44:19 +0000
@@ -4,6 +4,7 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
@@ -11,11 +12,25 @@
"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
"consulting.net>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-21 18:55+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+"Language-Team: German <de@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_budget
#: view:account.budget.analytic:0
@@ -336,10 +351,16 @@
msgstr "oder"
#. module: account_budget
+<<<<<<< TREE
#: field:crossovered.budget.lines,analytic_account_id:0
#: model:ir.model,name:account_budget.model_account_analytic_account
msgid "Analytic Account"
msgstr "Analytisches Konto"
+=======
+#: view:crossovered.budget:0
+msgid "Cancel Budget"
+msgstr "Abbrechen Budgetierung"
+>>>>>>> MERGE-SOURCE
#. module: account_budget
#: report:account.budget:0
=== modified file 'account_budget/i18n/fr.po'
--- account_budget/i18n/fr.po 2013-04-05 11:10:48 +0000
+++ account_budget/i18n/fr.po 2013-05-08 15:44:19 +0000
@@ -4,6 +4,7 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
@@ -11,11 +12,24 @@
"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
"<maxime.chambreuil@xxxxxxxxxxxxxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-05-02 13:25+0000\n"
+"Last-Translator: WANTELLET Sylvain <Swantellet@xxxxxxxxxxxxxx>\n"
+"Language-Team: French <fr@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-03 06:29+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_budget
#: view:account.budget.analytic:0
@@ -39,7 +53,7 @@
#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
#: model:ir.ui.menu,name:account_budget.menu_budget_post_form
msgid "Budgetary Positions"
-msgstr "Positions budgétaires"
+msgstr "Postes Budgétaires"
#. module: account_budget
#: report:account.budget:0
@@ -285,7 +299,7 @@
#: field:crossovered.budget.lines,general_budget_id:0
#: model:ir.model,name:account_budget.model_account_budget_post
msgid "Budgetary Position"
-msgstr "Position budgétaire"
+msgstr "Poste Budgétaire"
#. module: account_budget
#: field:account.budget.analytic,date_from:0
@@ -336,10 +350,16 @@
msgstr "ou"
#. module: account_budget
+<<<<<<< TREE
#: field:crossovered.budget.lines,analytic_account_id:0
#: model:ir.model,name:account_budget.model_account_analytic_account
msgid "Analytic Account"
msgstr "Compte Analytique"
+=======
+#: view:crossovered.budget:0
+msgid "Cancel Budget"
+msgstr "Annuler le budget"
+>>>>>>> MERGE-SOURCE
#. module: account_budget
#: report:account.budget:0
=== modified file 'account_budget/i18n/pl.po'
--- account_budget/i18n/pl.po 2013-04-05 11:10:48 +0000
+++ account_budget/i18n/pl.po 2013-05-08 15:44:19 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2012-12-13 20:42+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@xxxxxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-05-05 11:45+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@xxxxxxxxxxxx>\n"
+"Language-Team: Polish <pl@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:34+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-06 06:35+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_budget
#: view:account.budget.analytic:0
@@ -38,7 +52,7 @@
#: model:ir.actions.act_window,name:account_budget.open_budget_post_form
#: model:ir.ui.menu,name:account_budget.menu_budget_post_form
msgid "Budgetary Positions"
-msgstr "Pozycje budżetowe"
+msgstr "Składniki budżetowe"
#. module: account_budget
#: report:account.budget:0
@@ -284,7 +298,7 @@
#: field:crossovered.budget.lines,general_budget_id:0
#: model:ir.model,name:account_budget.model_account_budget_post
msgid "Budgetary Position"
-msgstr "Pozycja budżetu"
+msgstr "Składnik budżetu"
#. module: account_budget
#: field:account.budget.analytic,date_from:0
=== modified file 'account_cancel/i18n/de.po'
--- account_cancel/i18n/de.po 2013-04-05 11:10:48 +0000
+++ account_cancel/i18n/de.po 2013-05-08 15:44:19 +0000
@@ -7,18 +7,31 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2012-01-13 19:21+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-21 18:56+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: German <de@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:42+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_cancel
#: view:account.invoice:0
+<<<<<<< TREE
msgid "Cancel"
msgstr "Abbrechen"
@@ -35,3 +48,10 @@
#~ " Das Modul ermöglicht Buchungen zu stornieren. Das Kennzeichen wird je "
#~ "Journal gesetzt.\n"
#~ " "
+=======
+msgid "Cancel Invoice"
+msgstr "Rechnung abbrechen"
+
+#~ msgid "Cancel"
+#~ msgstr "Abbrechen"
+>>>>>>> MERGE-SOURCE
=== modified file 'account_cancel/i18n/lt.po'
--- account_cancel/i18n/lt.po 2013-04-05 11:10:48 +0000
+++ account_cancel/i18n/lt.po 2013-05-08 15:44:19 +0000
@@ -7,17 +7,36 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2012-03-09 15:21+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-24 18:25+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@xxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Lithuanian <lt@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:42+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_cancel
#: view:account.invoice:0
+<<<<<<< TREE
msgid "Cancel"
msgstr "Atšaukti"
+=======
+msgid "Cancel Invoice"
+msgstr "Atšaukti sąskaita-faktūrą"
+
+#~ msgid "Cancel"
+#~ msgstr "Atšaukti"
+>>>>>>> MERGE-SOURCE
=== modified file 'account_followup/i18n/fr.po'
--- account_followup/i18n/fr.po 2013-04-05 11:10:48 +0000
+++ account_followup/i18n/fr.po 2013-05-08 15:44:19 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2012-12-12 09:17+0000\n"
"Last-Translator: WANTELLET Sylvain <Swantellet@xxxxxxxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-22 15:39+0000\n"
+"Last-Translator: Bertrand Rétif <Unknown>\n"
+"Language-Team: French <fr@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:11+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -107,9 +121,16 @@
msgstr "Étapes de relance"
#. module: account_followup
+<<<<<<< TREE
#: field:account_followup.print,email_body:0
msgid "Email Body"
msgstr "Corps du courriel"
+=======
+#: code:addons/account_followup/account_followup.py:262
+#, python-format
+msgid "Due Date"
+msgstr "Date d'échéance"
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
@@ -117,6 +138,17 @@
msgstr "Envoyer les relances"
#. module: account_followup
+<<<<<<< TREE
+=======
+#: code:addons/account_followup/account_followup.py:313
+#: code:addons/account_followup/account_followup.py:319
+#: code:addons/account_followup/report/account_followup_print.py:86
+#, python-format
+msgid "Error!"
+msgstr "Erreur !"
+
+#. module: account_followup
+>>>>>>> MERGE-SOURCE
#: report:account_followup.followup.print:0
#: code:addons/account_followup/account_followup.py:263
#, python-format
@@ -161,6 +193,24 @@
"\n"
"Best Regards,\n"
msgstr ""
+"\n"
+"Cher %(partner_name)s,\n"
+"\n"
+"Nous constatons avec regret que malgré notre précédent rappel, votre compte "
+"est toujours débiteur.\n"
+"\n"
+" Nous vous mettons donc en demeure de nous régler sous huitaine "
+"l’intégralité de la somme. Passé ce délai, nous bloquerons votre compte ce "
+"qui signifie que vous ne pourrez plus passer de commandes auprès de notre "
+"société (articles/services).\n"
+"\n"
+"Si pour une raison qui nous est inconnue vous ne pouvez régler ces factures, "
+"n'hésitez pas à prendre contact avec notre service comptable afin que nous "
+"trouvions une solution rapide à ce problème.\n"
+"\n"
+"Le détail des factures impayées est listé ci-dessous.\n"
+"\n"
+"Veuillez agréer nos salutations distinguées,\n"
#. module: account_followup
#: model:email.template,body_html:account_followup.email_template_account_followup_level0
@@ -198,8 +248,51 @@
"</div>\n"
" "
msgstr ""
-
-#. module: account_followup
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Cher ${object.name},</p>\n"
+" <p>\n"
+" A l'examen de votre compte, nous constatons que sauf erreur ou omission "
+"de notre part, nous n'avons toujours pas reçu à ce jour de règlement des "
+"factures reprises sur le relevé ci-dessous. Nous vous remercions de bien "
+"vouloir régulariser cette situation sous huitaine.\n"
+"\n"
+"\n"
+"Au cas où votre règlement se serait croisé avec la présente, nous vous "
+"prions de ne pas en tenir compte. N'hésitez pas à contacter notre service "
+"comptable.\n"
+"\n"
+" </p>\n"
+"<br/>\n"
+"Veuillez agréer nos salutations distinguées,\n"
+"<br/>\n"
+" <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+" <br/>\n"
+"\n"
+"</div>\n"
+" "
+
+#. module: account_followup
+<<<<<<< TREE
+=======
+#: code:addons/account_followup/account_followup.py:261
+#, python-format
+msgid "Reference"
+msgstr "Référence"
+
+#. module: account_followup
+>>>>>>> MERGE-SOURCE
#: view:account_followup.stat.by.partner:0
msgid "Balance > 0"
msgstr "Balance > 0"
@@ -293,7 +386,7 @@
#. module: account_followup
#: view:account_followup.stat:0
msgid "Not Litigation"
-msgstr "Non contentieux"
+msgstr "Pas de litige"
#. module: account_followup
#: view:account_followup.print:0
@@ -350,6 +443,43 @@
"</div>\n"
" "
msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+" \n"
+" <p>Cher ${object.name},</p>\n"
+" <p>\n"
+" Nous constatons avec regret que malgré notre précédent rappel, votre "
+"compte est toujours débiteur.\n"
+"Nous vous mettons donc en demeure de nous régler sous huitaine l’intégralité "
+"de la somme. Passé ce délai,\n"
+"nous bloquerons votre compte ce qui signifie que vous ne pourrez plus passer "
+"de commandes\n"
+"auprès de notre société (articles/services).\n"
+"Si pour une raison qui nous est inconnue vous ne pouvez régler ces factures, "
+"n'hésitez pas à prendre contact\n"
+"avec notre service comptable afin que nous trouvions une solution rapide à "
+"ce problème.\n"
+"\n"
+"Le détail des factures impayées est listé ci-dessous.\n"
+" </p>\n"
+"<br/>\n"
+"Veuillez agréer nos salutations distinguées,\n"
+" \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+" \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+" <br/>\n"
+"\n"
+"</div>\n"
+" "
#. module: account_followup
#: field:account_followup.stat,debit:0
@@ -401,6 +531,19 @@
msgstr "Relances de paiement"
#. module: account_followup
+<<<<<<< TREE
+=======
+#: code:addons/account_followup/report/account_followup_print.py:86
+#, python-format
+msgid ""
+"The followup plan defined for the current company does not have any followup "
+"action."
+msgstr ""
+"Les niveaux de relances définis pour la société actuelle ne contiennent "
+"aucune action de relance."
+
+#. module: account_followup
+>>>>>>> MERGE-SOURCE
#: field:account_followup.followup.line,delay:0
msgid "Due Days"
msgstr "Retard d'échéance"
@@ -468,6 +611,14 @@
msgstr "Imprimer le Message"
#. module: account_followup
+<<<<<<< TREE
+=======
+#: view:res.partner:0
+msgid "Responsible of credit collection"
+msgstr "Responsable du recouvrement"
+
+#. module: account_followup
+>>>>>>> MERGE-SOURCE
#: code:addons/account_followup/wizard/account_followup_print.py:155
#, python-format
msgid "Anybody"
@@ -551,6 +702,18 @@
#. module: account_followup
#: view:res.partner:0
+<<<<<<< TREE
+=======
+msgid ""
+"He said the problem was temporary and promised to pay 50% before 15th of "
+"May, balance before 1st of July."
+msgstr ""
+"Il dit que le problème n'est que passager et il a promis de payer 50% avant "
+"le 15 mai, et le solde avant le 1er juilet."
+
+#. module: account_followup
+#: view:res.partner:0
+>>>>>>> MERGE-SOURCE
msgid "Account Move line"
msgstr "Écriture comtable"
@@ -590,6 +753,15 @@
msgstr "Analyse des relances"
#. module: account_followup
+<<<<<<< TREE
+=======
+#: view:res.partner:0
+msgid "Action to be taken e.g. Give a phonecall, Check if it's paid, ..."
+msgstr ""
+"Action à lancer. Par ex: Appeler, vérifier si le paiement est arrivé, ..."
+
+#. module: account_followup
+>>>>>>> MERGE-SOURCE
#: help:res.partner,payment_next_action_date:0
msgid ""
"This is when the manual follow-up is needed. The date will be set to the "
@@ -602,6 +774,7 @@
#: view:res.partner:0
msgid "Print overdue payments report independent of follow-up line"
msgstr ""
+"Imprimer les relances de paiement indépendamment de la ligne de relance"
#. module: account_followup
#: help:account_followup.print,date:0
@@ -656,6 +829,38 @@
"</div>\n"
" "
msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+" \n"
+" <p>Cher ${object.name},</p>\n"
+" <p>\n"
+" Malgré plusieurs rappels, votre compte est toujours débiteur.\n"
+"Nous vous mettons donc en demeure de nous régler sous huitaine l’intégralité "
+"de la somme. Passé ce délai,\n"
+"nous mettrons en œuvre toutes les démarches légales nécessaires au "
+"recouvrement de notre créance sans nouvelle notification.\n"
+"J'espère que ces actions ne seront pas nécessaires et vous trouverez le "
+"détail des factures impayées ci-dessous.\n"
+"Pour toutes questions concernant ce sujet. n'hésitez pas à prendre contact "
+"avec notre service comptable.\n"
+"</p>\n"
+"<br/>\n"
+"Veuillez agréer nos salutations distinguées,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+" <br/>\n"
+"\n"
+"</div>\n"
+" "
#. module: account_followup
#: report:account_followup.followup.print:0
@@ -688,6 +893,24 @@
"Best Regards,\n"
" "
msgstr ""
+"\n"
+"Cher %(partner_name)s,\n"
+"\n"
+"Malgré plusieurs rappels, votre compte est toujours débiteur.\n"
+"\n"
+"Nous vous mettons donc en demeure de nous régler sous huitaine l’intégralité "
+"de la somme. Passé ce délai,\n"
+"nous mettrons en œuvre toutes les démarches légales nécessaires au "
+"recouvrement de notre créance sans nouvelle notification.\n"
+"\n"
+"J'espère que ces actions ne seront pas nécessaires et vous trouverez le "
+"détail des factures impayées ci-dessous.\n"
+"\n"
+"Pour toutes questions concernant ce sujet. n'hésitez pas à prendre contact "
+"avec notre service comptable.\n"
+"\n"
+"Veuillez agréer nos salutations distinguées,\n"
+" "
#. module: account_followup
#: field:res.partner,payment_amount_due:0
@@ -717,6 +940,17 @@
msgstr "Imprimer le rapport des retards de paiement"
#. module: account_followup
+<<<<<<< TREE
+=======
+#: code:addons/account_followup/account_followup.py:291
+#, python-format
+msgid ""
+"You became responsible to do the next action for the payment follow-up of"
+msgstr ""
+"Vous êtes maintenant en charge de la prochaine relance de paiement de"
+
+#. module: account_followup
+>>>>>>> MERGE-SOURCE
#: help:account_followup.followup.line,manual_action:0
msgid ""
"When processing, it will set the manual action to be taken for that "
@@ -731,6 +965,10 @@
" order to exclude it from the next follow-up "
"actions."
msgstr ""
+"Ci-dessous se trouve l'historique des transactions de ce \n"
+" client. Vous pouvez sélectionner \"Aucun "
+"suivi\" afin \n"
+" de le retirer de la prochaine action de relance."
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:171
@@ -750,6 +988,15 @@
msgstr "Lignes d'écriture"
#. module: account_followup
+<<<<<<< TREE
+=======
+#: code:addons/account_followup/account_followup.py:281
+#, python-format
+msgid "Amount due"
+msgstr "Montant dû"
+
+#. module: account_followup
+>>>>>>> MERGE-SOURCE
#: report:account_followup.followup.print:0
msgid "Total:"
msgstr "Total :"
@@ -781,11 +1028,21 @@
msgstr "Montant en retard"
#. module: account_followup
+<<<<<<< TREE
+=======
+#: code:addons/account_followup/account_followup.py:264
+#, python-format
+msgid "Lit."
+msgstr "Lit."
+
+#. module: account_followup
+>>>>>>> MERGE-SOURCE
#: help:res.partner,latest_followup_level_id_without_lit:0
msgid ""
"The maximum follow-up level without taking into account the account move "
"lines with litigation"
msgstr ""
+"Le degré maximal de relance sans prendre en compte les écritures en litige"
#. module: account_followup
#: view:account_followup.stat:0
@@ -824,6 +1081,34 @@
"</div>\n"
" "
msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+" \n"
+" <p>Dear ${object.name},</p>\n"
+" <p>\n"
+" A l'examen de votre compte, nous constatons que sauf erreur ou omission "
+"de notre part, nous n'avons toujours pas reçu à ce jour de règlement des "
+"factures reprises sur le relevé ci-dessous. Nous vous remercions de bien "
+"vouloir régulariser cette situation sous huitaine.\n"
+"Au cas où votre règlement se serait croisé avec ce courriel, nous vous "
+"prions de ne pas en tenir compte. N'hésitez pas à contacter notre service "
+"comptable. \n"
+" </p>\n"
+"<br/>\n"
+"Veuillez agréer nos salutations distinguées,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+"<br/>\n"
+"</div>\n"
+" "
#. module: account_followup
#: field:account.move.line,result:0
@@ -864,6 +1149,19 @@
"\n"
"Best Regards,\n"
msgstr ""
+"\n"
+"Cher %(partner_name)s,\n"
+"\n"
+"A l'examen de votre compte, nous constatons que sauf erreur ou omission de "
+"notre part, nous n'avons toujours pas reçu à ce jour de règlement des "
+"factures reprises sur le relevé ci-dessous. Nous vous remercions de bien "
+"vouloir régulariser cette situation dans les 8 jours.\n"
+"\n"
+"Au cas où votre règlement se serait croisé avec la présente, nous vous "
+"prions de ne pas en tenir compte. N'hésitez pas à contacter notre service "
+"comptable.\n"
+"\n"
+"Veuillez agréer nos salutations distinguées,\n"
#. module: account_followup
#: field:account_followup.stat,date_move_last:0
@@ -885,7 +1183,7 @@
#. module: account_followup
#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
msgid "Follow-up Report"
-msgstr ""
+msgstr "Rapport du suivi des paiements"
#. module: account_followup
#: view:res.partner:0
@@ -985,7 +1283,7 @@
#. module: account_followup
#: field:res.partner,latest_followup_level_id_without_lit:0
msgid "Latest Follow-up Level without litigation"
-msgstr "Dernière relance avant action en justice"
+msgstr "Dernier niveau de suivi sans litige"
#. module: account_followup
#: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable
@@ -1081,9 +1379,16 @@
msgstr " lettres dans le rapport"
#. module: account_followup
+<<<<<<< TREE
#: view:res.partner:0
msgid "Partners with Overdue Credits"
msgstr "Partenaires avec un crédit en retard"
+=======
+#: model:ir.actions.act_window,name:account_followup.action_customer_my_followup
+#: model:ir.ui.menu,name:account_followup.menu_sale_followup
+msgid "My Follow-Ups"
+msgstr "Mes relances de paiement"
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: view:res.partner:0
@@ -1144,7 +1449,7 @@
#. module: account_followup
#: report:account_followup.followup.print:0
msgid "Maturity Date"
-msgstr "Date de Maturité"
+msgstr "Date d'échéance"
#. module: account_followup
#: help:account_followup.followup.line,delay:0
@@ -1180,9 +1485,27 @@
msgstr "Comptabilité"
#. module: account_followup
+<<<<<<< TREE
#: field:account_followup.stat,blocked:0
msgid "Blocked"
msgstr "Bloqué"
+=======
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
+"Sauf indication contraire sur le dernier niveau de relance, le modèle par "
+"défaut sera utilisé pour l'envoi"
+
+#. module: account_followup
+#: code:addons/account_followup/account_followup.py:319
+#, python-format
+msgid "There is no followup plan defined for the current company."
+msgstr ""
+"Il n'y a aucun plan de suivi des paiements défini pour la société utilisée "
+"actuellement."
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: field:res.partner,payment_note:0
=== modified file 'account_followup/i18n/nl_BE.po'
--- account_followup/i18n/nl_BE.po 2013-04-17 05:15:50 +0000
+++ account_followup/i18n/nl_BE.po 2013-05-08 15:44:19 +0000
@@ -1,21 +1,42 @@
+<<<<<<< TREE
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_followup
# Els Van Vossel <evv@xxxxxxxxxx>, 2013.
+=======
+# Dutch (Belgium) 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 <EMAIL@ADDRESS>, 2012.
+# Els Van Vossel <evv@xxxxxxxxxx>, 2013.
+>>>>>>> MERGE-SOURCE
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2013-04-15 23:02+0000\n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-29 18:37+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
"Language-Team: Els Van Vossel\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-04-17 05:15+0000\n"
"X-Generator: Launchpad (build 16567)\n"
"Language: nl\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-30 06:36+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+"Language: nl\n"
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -34,12 +55,12 @@
#: view:account_followup.stat:0
#: view:res.partner:0
msgid "Group By..."
-msgstr "Groepeer op..."
+msgstr "Groeperen op..."
#. module: account_followup
#: field:account_followup.print,followup_id:0
msgid "Follow-Up"
-msgstr "Aanmanen"
+msgstr "Aanmaningen"
#. module: account_followup
#: view:account_followup.followup.line:0
@@ -108,14 +129,33 @@
msgstr "Aanmaningsstappen"
#. module: account_followup
+<<<<<<< TREE
#: field:account_followup.print,email_body:0
msgid "Email Body"
msgstr "E-mailbericht"
+=======
+#: code:addons/account_followup/account_followup.py:262
+#, python-format
+msgid "Due Date"
+msgstr "Vervaldatum"
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
msgid "Send Follow-Ups"
-msgstr "Aanmaningen versturen"
+<<<<<<< TREE
+msgstr "Aanmaningen versturen"
+=======
+msgstr "Aanmaningen versturen"
+
+#. module: account_followup
+#: code:addons/account_followup/account_followup.py:313
+#: code:addons/account_followup/account_followup.py:319
+#: code:addons/account_followup/report/account_followup_print.py:86
+#, python-format
+msgid "Error!"
+msgstr "Fout"
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: report:account_followup.followup.print:0
@@ -217,6 +257,7 @@
"</div>\n"
" "
msgstr ""
+<<<<<<< TREE
"\n"
"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
@@ -249,6 +290,46 @@
"\n"
"</div>\n"
" "
+=======
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+" <p>Beste ${object.name},</p>\n"
+" <p>\n"
+" Volgens onze informatie, heeft u nog een openstaand saldo. Wij verzoeken "
+"u het nodige te doen om dit bedrag binnen de 8 dagen over te schrijven op "
+"onze rekening.\n"
+"\n"
+"Indien uw betaling deze e-mail heeft gekruist, mag u dit bericht als "
+"onbestaand beschouwen. Neem gerust contact op met onze boekhouding mocht u "
+"nog vragen hebben.\n"
+"\n"
+" </p>\n"
+"<br/>\n"
+"Met vriendelijke groeten,\n"
+"<br/>\n"
+" <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+" <br/>\n"
+"\n"
+"</div>\n"
+" "
+
+#. module: account_followup
+#: code:addons/account_followup/account_followup.py:261
+#, python-format
+msgid "Reference"
+msgstr "Referentie"
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: view:account_followup.stat.by.partner:0
@@ -352,7 +433,7 @@
#. module: account_followup
#: field:res.partner,payment_earliest_due_date:0
msgid "Worst Due Date"
-msgstr "Slechtste vervaldatum"
+msgstr "Hoogste vervaldatum"
#. module: account_followup
#: view:account_followup.stat:0
@@ -414,6 +495,7 @@
"</div>\n"
" "
msgstr ""
+<<<<<<< TREE
"\n"
"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
@@ -450,6 +532,44 @@
"\n"
"</div>\n"
" "
+=======
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+" \n"
+" <p>Beste ${object.name},</p>\n"
+" <p>\n"
+" Het spijt ons te moeten vaststellen dat u, ondanks een eerdere "
+"aanmaning, nog steeds een openstaand saldo hebt.\n"
+"Wij verzoeken u dringend het openstaande saldo te betalen. Bij gebrek aan "
+"betaling, zijn wij genoodzaakt de verdere levering van goederen en diensten "
+"stop te zetten.\n"
+"Gelieve de betalingen uit te voeren binnen de 8 dagen.\n"
+"\n"
+"Als er een probleem is rond de betaling waarvan wij niet op de hoogte zijn, "
+"kunt u steeds contact opnemen met onze boekhouding, zodat dit snel kan "
+"worden opgelost.\n"
+"\n"
+"Hierna vindt u een overzicht van de vervallen documenten.\n"
+" </p>\n"
+"<br/>\n"
+"Hoogachtend,\n"
+" \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+" \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+" <br/>\n"
+"\n"
+"</div>\n"
+" "
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: field:account_followup.stat,debit:0
@@ -507,7 +627,7 @@
#: field:account.move.line,followup_line_id:0
#: view:account_followup.stat:0
msgid "Follow-up Level"
-msgstr "Niveau aanmaning"
+msgstr "Aanmaningsniveau"
#. module: account_followup
#: field:account_followup.stat,date_followup:0
@@ -690,6 +810,15 @@
msgstr "Aanmaningsanalyse"
#. module: account_followup
+<<<<<<< TREE
+=======
+#: view:res.partner:0
+msgid "Action to be taken e.g. Give a phonecall, Check if it's paid, ..."
+msgstr ""
+"Uit te voeren actie, vb. bellen, nakijken of betaling is gebeurd, ..."
+
+#. module: account_followup
+>>>>>>> MERGE-SOURCE
#: help:res.partner,payment_next_action_date:0
msgid ""
"This is when the manual follow-up is needed. The date will be set to the "
@@ -761,6 +890,7 @@
"</div>\n"
" "
msgstr ""
+<<<<<<< TREE
"\n"
"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
@@ -793,6 +923,40 @@
"\n"
"</div>\n"
" "
+=======
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+" \n"
+" <p>Beste ${object.name},</p>\n"
+" <p>\n"
+" Ondanks het feit dat wij u meerdere aanmaningen hebben gestuurd, is uw "
+"openstaand saldo nog steeds niet betaald.\n"
+"Indien dit bedrag niet binnen de 8 dagen op onze rekening staat, schakelen "
+"wij een advocaat in om het verschuldigde saldo bij u te innen. U ontvangt "
+"hierover geen verdere communicatie.\n"
+"Wij gaan ervan uit dat deze stap niet nodig zal zijn. De details van de "
+"openstaande betalingen vindt u hierna.\n"
+"Aarzel niet contact op te nemen met onze boekhouding als u nog vragen "
+"heeft.\n"
+"</p>\n"
+"<br/>\n"
+"Hoogachtend,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+" <br/>\n"
+"\n"
+"</div>\n"
+" "
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: report:account_followup.followup.print:0
@@ -870,6 +1034,17 @@
msgstr "Afgedrukt aanmaningsrapport"
#. module: account_followup
+<<<<<<< TREE
+=======
+#: code:addons/account_followup/account_followup.py:291
+#, python-format
+msgid ""
+"You became responsible to do the next action for the payment follow-up of"
+msgstr ""
+"U bent nu verantwoordelijk voor de volgende actie voor de aanmaning van"
+
+#. module: account_followup
+>>>>>>> MERGE-SOURCE
#: help:account_followup.followup.line,manual_action:0
msgid ""
"When processing, it will set the manual action to be taken for that "
@@ -1125,9 +1300,18 @@
msgstr " had een onbekend e-mailadres"
#. module: account_followup
+<<<<<<< TREE
#: view:res.partner:0
msgid "Responsible"
msgstr "Verantwoordelijke"
+=======
+#: help:account_followup.print,test_print:0
+msgid ""
+"Check if you want to print follow-ups without changing follow-up level."
+msgstr ""
+"Schakel deze optie in als u aanmaningen wilt drukken zonder het niveau aan "
+"te passen."
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: model:ir.ui.menu,name:account_followup.menu_finance_followup
@@ -1195,6 +1379,7 @@
msgstr "Laatste aanmaningsniveau met betwisting"
#. module: account_followup
+<<<<<<< TREE
#: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable
msgid ""
"<p>\n"
@@ -1206,11 +1391,25 @@
" Geen boekingen gevonden.\n"
" </p>\n"
" "
+=======
+#: view:res.partner:0
+msgid "⇾ Mark as Done"
+msgstr "⇾ Als Gedaan markeren"
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: view:account.move.line:0
msgid "Partner entries"
-msgstr "Relatieboekingen"
+<<<<<<< TREE
+msgstr "Relatieboekingen"
+=======
+msgstr "Relatieboekingen"
+
+#. module: account_followup
+#: view:account_followup.followup.line:0
+msgid "e.g. Call the customer, check if it's paid, ..."
+msgstr "vb. bellen, nakijken of betaling is gebeurd, ..."
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: view:account_followup.stat:0
@@ -1313,9 +1512,16 @@
msgstr " brieven in rapport"
#. module: account_followup
+<<<<<<< TREE
#: view:res.partner:0
msgid "Partners with Overdue Credits"
msgstr "Klanten met openstaande facturen"
+=======
+#: model:ir.actions.act_window,name:account_followup.action_customer_my_followup
+#: model:ir.ui.menu,name:account_followup.menu_sale_followup
+msgid "My Follow-Ups"
+msgstr "Mijn aanmaningen"
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: view:res.partner:0
@@ -1366,7 +1572,20 @@
#. module: account_followup
#: view:account.move.line:0
msgid "Total credit"
-msgstr "Totaal credit"
+<<<<<<< TREE
+msgstr "Totaal credit"
+=======
+msgstr "Totaal credit"
+
+#. module: account_followup
+#: code:addons/account_followup/account_followup.py:313
+#, python-format
+msgid ""
+"The partner does not have any accounting entries to print in the overdue "
+"report for the current company."
+msgstr ""
+"Voor deze relatie zijn er geen boekingen die moeten worden aangemaand."
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: field:account_followup.followup.line,sequence:0
@@ -1413,21 +1632,45 @@
#. module: account_followup
#: view:account_followup.followup.line:0
msgid ": User Name"
+<<<<<<< TREE
msgstr ": Gberuikersnaam"
+=======
+msgstr ": Gebruikersnaam"
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: view:res.partner:0
msgid "Accounting"
+<<<<<<< TREE
msgstr "Boekhouding"
#. module: account_followup
#: field:account_followup.stat,blocked:0
msgid "Blocked"
msgstr "Geblokkeerd"
+=======
+msgstr "Boekhouding"
+
+#. module: account_followup
+#: view:res.partner:0
+msgid ""
+"If not specified by the latest follow-up level, it will send from the "
+"default email template"
+msgstr ""
+"Indien dit niet is ingesteld via de laatste aanmaning, dan wordt de "
+"standaard e-mailsjabloon gebruikt."
+
+#. module: account_followup
+#: code:addons/account_followup/account_followup.py:319
+#, python-format
+msgid "There is no followup plan defined for the current company."
+msgstr "Er zijn geen aanmaningsniveaus ingesteld voor deze firma."
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: field:res.partner,payment_note:0
msgid "Customer Payment Promise"
+<<<<<<< TREE
msgstr "Betalingsbelofte klant"
#~ msgid "All payable entries"
@@ -1738,3 +1981,26 @@
#~ msgid "Type of Term"
#~ msgstr "Soort termijn"
+=======
+msgstr "Betalingsbelofte klant"
+
+#~ msgid ""
+#~ "Check if you want to print follow-ups without changing follow-ups level."
+#~ msgstr ""
+#~ "Schakel dit veld in als u aanmaningen wilt afdrukken zonder het niveau te "
+#~ "veranderen."
+
+#~ msgid "Responsible"
+#~ msgstr "Verantwoordelijke"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ " No journal items found.\n"
+#~ " </p>\n"
+#~ " "
+#~ msgstr ""
+#~ "<p>\n"
+#~ " Geen boekingen gevonden.\n"
+#~ " </p>\n"
+#~ " "
+>>>>>>> MERGE-SOURCE
=== modified file 'account_followup/i18n/pt_BR.po'
--- account_followup/i18n/pt_BR.po 2013-04-05 11:10:48 +0000
+++ account_followup/i18n/pt_BR.po 2013-05-08 15:44:19 +0000
@@ -4,6 +4,7 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
@@ -11,11 +12,24 @@
"Last-Translator: Fábio Martinelli - http://zupy.com.br "
"<webmaster@xxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-22 03:25+0000\n"
+"Last-Translator: Thiago Tognoli <Unknown>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:11+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: model:email.template,subject:account_followup.email_template_account_followup_default
@@ -937,6 +951,15 @@
msgstr "Valor em Atraso"
#. module: account_followup
+<<<<<<< TREE
+=======
+#: code:addons/account_followup/account_followup.py:264
+#, python-format
+msgid "Lit."
+msgstr "Lit."
+
+#. module: account_followup
+>>>>>>> MERGE-SOURCE
#: help:res.partner,latest_followup_level_id_without_lit:0
msgid ""
"The maximum follow-up level without taking into account the account move "
=== modified file 'account_payment/i18n/de.po'
--- account_payment/i18n/de.po 2013-04-05 11:10:48 +0000
+++ account_payment/i18n/de.po 2013-05-08 15:44:19 +0000
@@ -4,6 +4,7 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
@@ -11,11 +12,25 @@
"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
"consulting.net>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-21 18:57+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+"Language-Team: German <de@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:26+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_payment
#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -679,6 +694,14 @@
msgstr "Auftrag"
#. module: account_payment
+<<<<<<< TREE
+=======
+#: view:payment.order:0
+msgid "Cancel Payments"
+msgstr "Abbrechen Zahlung"
+
+#. module: account_payment
+>>>>>>> MERGE-SOURCE
#: field:payment.order,total:0
msgid "Total"
msgstr "Betrag gesammt"
=== added directory 'account_report_company'
=== added file 'account_report_company/account_report_company.py.OTHER'
--- account_report_company/account_report_company.py.OTHER 1970-01-01 00:00:00 +0000
+++ account_report_company/account_report_company.py.OTHER 2013-05-08 15:44:19 +0000
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Business Applications
+# Copyright (c) 2013 S.A. <http://openerp.com>
+#
+# 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 <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+
+class res_partner(osv.Model):
+ _inherit = 'res.partner'
+ _order = 'display_name'
+
+ def _display_name_compute(self, cr, uid, ids, name, args, context=None):
+ return dict(self.name_get(cr, uid, ids, context=context))
+
+ _display_name_store_triggers = {
+ 'res.partner': (lambda self,cr,uid,ids,context=None: self.search(cr, uid, [('id','child_of',ids)]),
+ ['parent_id', 'is_company', 'name'], 10)
+ }
+
+ # indirection to avoid passing a copy of the overridable method when declaring the function field
+ _display_name = lambda self, *args, **kwargs: self._display_name_compute(*args, **kwargs)
+
+ _columns = {
+ # extra field to allow ORDER BY to match visible names
+ 'display_name': fields.function(_display_name, type='char', string='Name', store=_display_name_store_triggers),
+ }
+
+class account_invoice(osv.Model):
+ _inherit = 'account.invoice'
+
+ _columns = {
+ 'commercial_partner_id': fields.related('partner_id', 'commercial_partner_id', string='Commercial Entity', type='many2one',
+ relation='res.partner', store=True, readonly=True,
+ help="The commercial entity that will be used on Journal Entries for this invoice")
+ }
=== added file 'account_report_company/res_partner_view.xml.OTHER'
--- account_report_company/res_partner_view.xml.OTHER 1970-01-01 00:00:00 +0000
+++ account_report_company/res_partner_view.xml.OTHER 2013-05-08 15:44:19 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<openerp>
+ <data>
+ <record model="ir.ui.view" id="account_report_copmany_partner_tree_view">
+ <field name="model">res.partner</field>
+ <field name="inherit_id" ref="base.view_partner_tree"/>
+ <field name="arch" type="xml">
+ <field name="name" position="attributes">
+ <attribute name="invisible">True</attribute>
+ </field>
+ <field name="name" position="before">
+ <field name="display_name"/>
+ </field>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="account_report_copmany_partner_kanban_view">
+ <field name="model">res.partner</field>
+ <field name="inherit_id" ref="base.res_partner_kanban_view"/>
+ <field name="arch" type="xml">
+ <xpath expr="//templates//field[@name='name']" position="replace">
+ <field name="display_name"/>
+ </xpath>
+ </field>
+ </record>
+ </data>
+</openerp>
\ No newline at end of file
=== modified file 'account_voucher/__openerp__.py'
--- account_voucher/__openerp__.py 2013-01-31 18:41:41 +0000
+++ account_voucher/__openerp__.py 2013-05-08 15:44:19 +0000
@@ -67,6 +67,7 @@
'test/sales_payment.yml',
'test/account_voucher_report.yml',
'test/case1_usd_usd.yml',
+ 'test/case1_usd_usd_payment_rate.yml',
'test/case2_usd_eur_debtor_in_eur.yml',
'test/case2_usd_eur_debtor_in_usd.yml',
'test/case3_eur_eur.yml',
=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py 2013-04-18 10:39:07 +0000
+++ account_voucher/account_voucher.py 2013-05-08 15:44:19 +0000
@@ -27,6 +27,24 @@
from openerp.tools.translate import _
from openerp.tools import float_compare
+class res_currency(osv.osv):
+ _inherit = "res.currency"
+
+ def _current_rate(self, cr, uid, ids, name, arg, context=None):
+ if context is None:
+ context = {}
+ res = super(res_currency, self)._current_rate(cr, uid, ids, name, arg, context=context)
+ if context.get('voucher_special_currency') in ids and context.get('voucher_special_currency_rate'):
+ res[context.get('voucher_special_currency')] = context.get('voucher_special_currency_rate')
+ return res
+
+ _columns = {
+ # same definition of rate that in base in order to just overwrite the function
+ 'rate': fields.function(_current_rate, string='Current Rate', digits=(12,6),
+ help='The rate of the currency to the currency of rate 1.'),
+ }
+
+
class res_company(osv.osv):
_inherit = "res.company"
_columns = {
@@ -153,7 +171,7 @@
journal = journal_pool.browse(cr, uid, journal_id, context=context)
if journal.currency:
return journal.currency.id
- return False
+ return self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
def _get_partner(self, cr, uid, context=None):
if context is None: context = {}
@@ -222,26 +240,27 @@
def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount, voucher_currency, type, context=None):
context = context or {}
if not line_dr_ids and not line_cr_ids:
- return {'value':{}}
+ return {'value':{'writeoff_amount': 0.0}}
line_osv = self.pool.get("account.voucher.line")
line_dr_ids = resolve_o2m_operations(cr, uid, line_osv, line_dr_ids, ['amount'], context)
line_cr_ids = resolve_o2m_operations(cr, uid, line_osv, line_cr_ids, ['amount'], context)
#compute the field is_multi_currency that is used to hide/display options linked to secondary currency on the voucher
is_multi_currency = False
- if voucher_currency:
- # if the voucher currency is not False, it means it is different than the company currency and we need to display the options
- is_multi_currency = True
- else:
- #loop on the voucher lines to see if one of these has a secondary currency. If yes, we need to define the options
- for voucher_line in line_dr_ids+line_cr_ids:
- company_currency = False
- company_currency = voucher_line.get('move_line_id', False) and self.pool.get('account.move.line').browse(cr, uid, voucher_line.get('move_line_id'), context=context).company_id.currency_id.id
- if voucher_line.get('currency_id', company_currency) != company_currency:
- is_multi_currency = True
- break
+ #loop on the voucher lines to see if one of these has a secondary currency. If yes, we need to see the options
+ for voucher_line in line_dr_ids+line_cr_ids:
+ line_currency = voucher_line.get('move_line_id', False) and self.pool.get('account.move.line').browse(cr, uid, voucher_line.get('move_line_id'), context=context).currency_id
+ if line_currency:
+ is_multi_currency = True
+ break
return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount, type), 'is_multi_currency': is_multi_currency}}
+ def _get_journal_currency(self, cr, uid, ids, name, args, context=None):
+ res = {}
+ for voucher in self.browse(cr, uid, ids, context=context):
+ res[voucher.id] = voucher.journal_id.currency and voucher.journal_id.currency.id or voucher.company_id.currency_id.id
+ return res
+
def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None):
if not ids: return {}
currency_obj = self.pool.get('res.currency')
@@ -258,20 +277,18 @@
return res
def _paid_amount_in_company_currency(self, cr, uid, ids, name, args, context=None):
- if not ids: return {}
+ if context is None:
+ context = {}
res = {}
- rate = 1.0
- for voucher in self.browse(cr, uid, ids, context=context):
- if voucher.currency_id:
- if voucher.company_id.currency_id.id == voucher.payment_rate_currency_id.id:
- rate = 1 / voucher.payment_rate
- else:
- ctx = context.copy()
- ctx.update({'date': voucher.date})
- voucher_rate = self.browse(cr, uid, voucher.id, context=ctx).currency_id.rate
- company_currency_rate = voucher.company_id.currency_id.rate
- rate = voucher_rate * company_currency_rate
- res[voucher.id] = voucher.amount / rate
+ ctx = context.copy()
+ for v in self.browse(cr, uid, ids, context=context):
+ ctx.update({'date': v.date})
+ #make a new call to browse in order to have the right date in the context, to get the right currency rate
+ voucher = self.browse(cr, uid, v.id, context=ctx)
+ ctx.update({
+ 'voucher_special_currency': voucher.payment_rate_currency_id and voucher.payment_rate_currency_id.id or False,
+ 'voucher_special_currency_rate': voucher.currency_id.rate * voucher.payment_rate,})
+ res[voucher.id] = self.pool.get('res.currency').compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, voucher.amount, context=ctx)
return res
_name = 'account.voucher'
@@ -304,8 +321,7 @@
domain=[('type','=','dr')], context={'default_type':'dr'}, readonly=True, states={'draft':[('readonly',False)]}),
'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'narration':fields.text('Notes', readonly=True, states={'draft':[('readonly',False)]}),
-# 'currency_id':fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
- 'currency_id': fields.related('journal_id','currency', type='many2one', relation='res.currency', string='Currency', readonly=True),
+ 'currency_id': fields.function(_get_journal_currency, type='many2one', relation='res.currency', string='Currency', readonly=True, required=True),
'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'state':fields.selection(
[('draft','Draft'),
@@ -422,6 +438,8 @@
partner_pool = self.pool.get('res.partner')
position_pool = self.pool.get('account.fiscal.position')
line_pool = self.pool.get('account.voucher.line')
+ if not line_ids:
+ line_ids = []
res = {
'tax_amount': False,
'amount': False,
@@ -517,22 +535,25 @@
def onchange_rate(self, cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=None):
res = {'value': {'paid_amount_in_company_currency': amount}}
- company_currency = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id
- if rate and amount and currency_id:# and currency_id == payment_rate_currency_id:
- voucher_rate = self.pool.get('res.currency').browse(cr, uid, currency_id, context).rate
- if company_currency.id == payment_rate_currency_id:
- company_rate = rate
- else:
- company_rate = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.rate
- res['value']['paid_amount_in_company_currency'] = amount / voucher_rate * company_rate
+ if rate and amount and currency_id:
+ company_currency = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id
+ #context should contain the date, the payment currency and the payment rate specified on the voucher
+ amount_in_company_currency = self.pool.get('res.currency').compute(cr, uid, currency_id, company_currency.id, amount, context=context)
+ res['value']['paid_amount_in_company_currency'] = amount_in_company_currency
return res
def onchange_amount(self, cr, uid, ids, amount, rate, partner_id, journal_id, currency_id, ttype, date, payment_rate_currency_id, company_id, context=None):
if context is None:
context = {}
- res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
ctx = context.copy()
ctx.update({'date': date})
+ #read the voucher rate with the right date in the context
+ currency_id = currency_id or self.pool.get('res.company').browse(cr, uid, company_id, context=ctx).currency_id.id
+ voucher_rate = self.pool.get('res.currency').read(cr, uid, currency_id, ['rate'], context=ctx)['rate']
+ ctx.update({
+ 'voucher_special_currency': payment_rate_currency_id,
+ 'voucher_special_currency_rate': rate * voucher_rate})
+ res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=ctx)
vals = self.onchange_rate(cr, uid, ids, rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
for key in vals.keys():
res[key].update(vals[key])
@@ -546,6 +567,7 @@
journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
company_id = journal.company_id.id
payment_rate = 1.0
+ currency_id = currency_id or journal.company_id.currency_id.id
payment_rate_currency_id = currency_id
ctx = context.copy()
ctx.update({'date': date})
@@ -561,24 +583,62 @@
# is not in the voucher currency
payment_rate_currency_id = voucher_line['currency_id']
tmp = currency_obj.browse(cr, uid, payment_rate_currency_id, context=ctx).rate
- voucher_currency_id = currency_id or journal.company_id.currency_id.id
- payment_rate = tmp / currency_obj.browse(cr, uid, voucher_currency_id, context=ctx).rate
+ payment_rate = tmp / currency_obj.browse(cr, uid, currency_id, context=ctx).rate
break
+ vals['value'].update({
+ 'payment_rate': payment_rate,
+ 'currency_id': currency_id,
+ 'payment_rate_currency_id': payment_rate_currency_id
+ })
+ #read the voucher rate with the right date in the context
+ voucher_rate = self.pool.get('res.currency').read(cr, uid, currency_id, ['rate'], context=ctx)['rate']
+ ctx.update({
+ 'voucher_special_currency_rate': payment_rate * voucher_rate,
+ 'voucher_special_currency': payment_rate_currency_id})
res = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
for key in res.keys():
vals[key].update(res[key])
- vals['value'].update({'payment_rate': payment_rate})
- if payment_rate_currency_id:
- vals['value'].update({'payment_rate_currency_id': payment_rate_currency_id})
return vals
+ def basic_onchange_partner(self, cr, uid, ids, partner_id, journal_id, ttype, context=None):
+ partner_pool = self.pool.get('res.partner')
+ journal_pool = self.pool.get('account.journal')
+ res = {'value': {'account_id': False}}
+ if not partner_id or not journal_id:
+ return res
+
+ journal = journal_pool.browse(cr, uid, journal_id, context=context)
+ partner = partner_pool.browse(cr, uid, partner_id, context=context)
+ account_id = False
+ if journal.type in ('sale','sale_refund'):
+ account_id = partner.property_account_receivable.id
+ elif journal.type in ('purchase', 'purchase_refund','expense'):
+ account_id = partner.property_account_payable.id
+ else:
+ account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
+
+ res['value']['account_id'] = account_id
+ return res
+
def onchange_partner_id(self, cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=None):
if not journal_id:
return {}
- res = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=context)
- vals = self.recompute_payment_rate(cr, uid, ids, res, currency_id, date, ttype, journal_id, amount, context=context)
+ if context is None:
+ context = {}
+ #TODO: comment me and use me directly in the sales/purchases views
+ res = self.basic_onchange_partner(cr, uid, ids, partner_id, journal_id, ttype, context=context)
+ if ttype in ['sale', 'purchase']:
+ return res
+ ctx = context.copy()
+ # not passing the payment_rate currency and the payment_rate in the context but it's ok because they are reset in recompute_payment_rate
+ ctx.update({'date': date})
+ vals = self.recompute_voucher_lines(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context=ctx)
+ vals2 = self.recompute_payment_rate(cr, uid, ids, vals, currency_id, date, ttype, journal_id, amount, context=context)
for key in vals.keys():
res[key].update(vals[key])
+ for key in vals2.keys():
+ res[key].update(vals2[key])
+ #TODO: can probably be removed now
#TODO: onchange_partner_id() should not returns [pre_line, line_dr_ids, payment_rate...] for type sale, and not
# [pre_line, line_cr_ids, payment_rate...] for type purchase.
# We should definitively split account.voucher object in two and make distinct on_change functions. In the
@@ -621,8 +681,6 @@
if context is None:
context = {}
context_multi_currency = context.copy()
- if date:
- context_multi_currency.update({'date': date})
currency_pool = self.pool.get('res.currency')
move_line_pool = self.pool.get('account.move.line')
@@ -646,18 +704,6 @@
journal = journal_pool.browse(cr, uid, journal_id, context=context)
partner = partner_pool.browse(cr, uid, partner_id, context=context)
currency_id = currency_id or journal.company_id.currency_id.id
- account_id = False
- if journal.type in ('sale','sale_refund'):
- account_id = partner.property_account_receivable.id
- elif journal.type in ('purchase', 'purchase_refund','expense'):
- account_id = partner.property_account_payable.id
- else:
- account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
-
- default['value']['account_id'] = account_id
-
- if journal.type not in ('cash', 'bank'):
- return default
total_credit = 0.0
total_debit = 0.0
@@ -715,12 +761,13 @@
if _remove_noise_in_o2m():
continue
- if line.currency_id and currency_id==line.currency_id.id:
+ if line.currency_id and currency_id == line.currency_id.id:
amount_original = abs(line.amount_currency)
amount_unreconciled = abs(line.amount_residual_currency)
else:
- amount_original = currency_pool.compute(cr, uid, company_currency, currency_id, line.credit or line.debit or 0.0)
- amount_unreconciled = currency_pool.compute(cr, uid, company_currency, currency_id, abs(line.amount_residual))
+ #always use the amount booked in the company currency as the basis of the conversion into the voucher currency
+ amount_original = currency_pool.compute(cr, uid, company_currency, currency_id, line.credit or line.debit or 0.0, context=context_multi_currency)
+ amount_unreconciled = currency_pool.compute(cr, uid, company_currency, currency_id, abs(line.amount_residual), context=context_multi_currency)
line_currency_id = line.currency_id and line.currency_id.id or company_currency
rs = {
'name':line.move_id.name,
@@ -766,10 +813,15 @@
if context is None:
context = {}
res = {'value': {}}
- #set the default payment rate of the voucher and compute the paid amount in company currency
if currency_id and currency_id == payment_rate_currency_id:
+ #set the default payment rate of the voucher and compute the paid amount in company currency
ctx = context.copy()
ctx.update({'date': date})
+ #read the voucher rate with the right date in the context
+ voucher_rate = self.pool.get('res.currency').read(cr, uid, currency_id, ['rate'], context=ctx)['rate']
+ ctx.update({
+ 'voucher_special_currency_rate': payment_rate * voucher_rate,
+ 'voucher_special_currency': payment_rate_currency_id})
vals = self.onchange_rate(cr, uid, ids, payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context=ctx)
for key in vals.keys():
res[key].update(vals[key])
@@ -789,7 +841,12 @@
period_pool = self.pool.get('account.period')
currency_obj = self.pool.get('res.currency')
ctx = context.copy()
+<<<<<<< TREE
ctx.update({'company_id': company_id})
+=======
+ ctx.update({'company_id': company_id, 'account_period_prefer_normal': True})
+ voucher_currency_id = currency_id or self.pool.get('res.company').browse(cr, uid, company_id, context=ctx).currency_id.id
+>>>>>>> MERGE-SOURCE
pids = period_pool.find(cr, uid, date, context=ctx)
if pids:
res['value'].update({'period_id':pids[0]})
@@ -798,9 +855,8 @@
payment_rate = 1.0
if payment_rate_currency_id != currency_id:
tmp = currency_obj.browse(cr, uid, payment_rate_currency_id, context=ctx).rate
- voucher_currency_id = currency_id or self.pool.get('res.company').browse(cr, uid, company_id, context=ctx).currency_id.id
payment_rate = tmp / currency_obj.browse(cr, uid, voucher_currency_id, context=ctx).rate
- vals = self.onchange_payment_rate_currency(cr, uid, ids, currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context=context)
+ vals = self.onchange_payment_rate_currency(cr, uid, ids, voucher_currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context=context)
vals['value'].update({'payment_rate': payment_rate})
for key in vals.keys():
res[key].update(vals[key])
@@ -823,6 +879,8 @@
currency_id = False
if journal.currency:
currency_id = journal.currency.id
+ else:
+ currency_id = journal.company_id.currency_id.id
vals['value'].update({'currency_id': currency_id})
res = self.onchange_partner_id(cr, uid, ids, partner_id, journal_id, amount, currency_id, ttype, date, context)
for key in res.keys():
@@ -905,8 +963,8 @@
current_currency = self._get_current_currency(cr, uid, voucher_id, context)
if current_currency <> company_currency:
context_multi_currency = context.copy()
- voucher_brw = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
- context_multi_currency.update({'date': voucher_brw.date})
+ voucher = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
+ context_multi_currency.update({'date': voucher.date})
return context_multi_currency
return context
@@ -921,33 +979,33 @@
:return: mapping between fieldname and value of account move line to create
:rtype: dict
'''
- voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+ voucher = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
debit = credit = 0.0
# TODO: is there any other alternative then the voucher type ??
# ANSWER: We can have payment and receipt "In Advance".
# TODO: Make this logic available.
# -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt
- if voucher_brw.type in ('purchase', 'payment'):
- credit = voucher_brw.paid_amount_in_company_currency
- elif voucher_brw.type in ('sale', 'receipt'):
- debit = voucher_brw.paid_amount_in_company_currency
+ if voucher.type in ('purchase', 'payment'):
+ credit = voucher.paid_amount_in_company_currency
+ elif voucher.type in ('sale', 'receipt'):
+ debit = voucher.paid_amount_in_company_currency
if debit < 0: credit = -debit; debit = 0.0
if credit < 0: debit = -credit; credit = 0.0
sign = debit - credit < 0 and -1 or 1
#set the first line of the voucher
move_line = {
- 'name': voucher_brw.name or '/',
+ 'name': voucher.name or '/',
'debit': debit,
'credit': credit,
- 'account_id': voucher_brw.account_id.id,
+ 'account_id': voucher.account_id.id,
'move_id': move_id,
- 'journal_id': voucher_brw.journal_id.id,
- 'period_id': voucher_brw.period_id.id,
- 'partner_id': voucher_brw.partner_id.id,
+ 'journal_id': voucher.journal_id.id,
+ 'period_id': voucher.period_id.id,
+ 'partner_id': voucher.partner_id.id,
'currency_id': company_currency <> current_currency and current_currency or False,
- 'amount_currency': company_currency <> current_currency and sign * voucher_brw.amount or 0.0,
- 'date': voucher_brw.date,
- 'date_maturity': voucher_brw.date_due
+ 'amount_currency': company_currency <> current_currency and sign * voucher.amount or 0.0,
+ 'date': voucher.date,
+ 'date_maturity': voucher.date_due
}
return move_line
@@ -960,31 +1018,31 @@
:rtype: dict
'''
seq_obj = self.pool.get('ir.sequence')
- voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
- if voucher_brw.number:
- name = voucher_brw.number
- elif voucher_brw.journal_id.sequence_id:
- if not voucher_brw.journal_id.sequence_id.active:
+ voucher = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+ if voucher.number:
+ name = voucher.number
+ elif voucher.journal_id.sequence_id:
+ if not voucher.journal_id.sequence_id.active:
raise osv.except_osv(_('Configuration Error !'),
_('Please activate the sequence of selected journal !'))
c = dict(context)
- c.update({'fiscalyear_id': voucher_brw.period_id.fiscalyear_id.id})
- name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id, context=c)
+ c.update({'fiscalyear_id': voucher.period_id.fiscalyear_id.id})
+ name = seq_obj.next_by_id(cr, uid, voucher.journal_id.sequence_id.id, context=c)
else:
raise osv.except_osv(_('Error!'),
_('Please define a sequence on the journal.'))
- if not voucher_brw.reference:
+ if not voucher.reference:
ref = name.replace('/','')
else:
- ref = voucher_brw.reference
+ ref = voucher.reference
move = {
'name': name,
- 'journal_id': voucher_brw.journal_id.id,
- 'narration': voucher_brw.narration,
- 'date': voucher_brw.date,
+ 'journal_id': voucher.journal_id.id,
+ 'narration': voucher.narration,
+ 'date': voucher.date,
'ref': ref,
- 'period_id': voucher_brw.period_id.id,
+ 'period_id': voucher.period_id.id,
}
return move
@@ -1011,7 +1069,10 @@
raise osv.except_osv(_('Insufficient Configuration!'),_("You should configure the 'Gain Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."))
# Even if the amount_currency is never filled, we need to pass the foreign currency because otherwise
# the receivable/payable account may have a secondary currency, which render this field mandatory
- account_currency_id = company_currency <> current_currency and current_currency or False
+ if line.account_id.currency_id:
+ account_currency_id = line.account_id.currency_id.id
+ else:
+ account_currency_id = company_currency <> current_currency and current_currency or False
move_line = {
'journal_id': line.voucher_id.journal_id.id,
'period_id': line.voucher_id.period_id.id,
@@ -1054,16 +1115,11 @@
:return: the amount in the currency of the voucher's company
:rtype: float
'''
+ if context is None:
+ context = {}
currency_obj = self.pool.get('res.currency')
voucher = self.browse(cr, uid, voucher_id, context=context)
- res = amount
- if voucher.payment_rate_currency_id.id == voucher.company_id.currency_id.id:
- # the rate specified on the voucher is for the company currency
- res = currency_obj.round(cr, uid, voucher.company_id.currency_id, (amount * voucher.payment_rate))
- else:
- # the rate specified on the voucher is not relevant, we use all the rates in the system
- res = currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=context)
- return res
+ return currency_obj.compute(cr, uid, voucher.currency_id.id, voucher.company_id.currency_id.id, amount, context=context)
def voucher_move_line_create(self, cr, uid, voucher_id, line_total, move_id, company_currency, current_currency, context=None):
'''
@@ -1087,39 +1143,45 @@
tot_line = line_total
rec_lst_ids = []
- voucher_brw = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context)
+ date = self.read(cr, uid, voucher_id, ['date'], context=context)['date']
ctx = context.copy()
- ctx.update({'date': voucher_brw.date})
+ ctx.update({'date': date})
+ voucher = self.pool.get('account.voucher').browse(cr, uid, voucher_id, context=ctx)
+ voucher_currency = voucher.journal_id.currency or voucher.company_id.currency_id
+ ctx.update({
+ 'voucher_special_currency_rate': voucher_currency.rate * voucher.payment_rate ,
+ 'voucher_special_currency': voucher.payment_rate_currency_id and voucher.payment_rate_currency_id.id or False,})
prec = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
- for line in voucher_brw.line_ids:
+ for line in voucher.line_ids:
#create one move line per voucher line where amount is not 0.0
# AND (second part of the clause) only if the original move line was not having debit = credit = 0 (which is a legal value)
if not line.amount and not (line.move_line_id and not float_compare(line.move_line_id.debit, line.move_line_id.credit, precision_rounding=prec) and not float_compare(line.move_line_id.debit, 0.0, precision_rounding=prec)):
continue
# convert the amount set on the voucher line into the currency of the voucher's company
- amount = self._convert_amount(cr, uid, line.untax_amount or line.amount, voucher_brw.id, context=ctx)
+ # this calls res_curreny.compute() with the right context, so that it will take either the rate on the voucher if it is relevant or will use the default behaviour
+ amount = self._convert_amount(cr, uid, line.untax_amount or line.amount, voucher.id, context=ctx)
# if the amount encoded in voucher is equal to the amount unreconciled, we need to compute the
# currency rate difference
if line.amount == line.amount_unreconciled:
if not line.move_line_id:
raise osv.except_osv(_('Wrong voucher line'),_("The invoice you are willing to pay is not valid anymore."))
- sign = voucher_brw.type in ('payment', 'purchase') and -1 or 1
+ sign = voucher.type in ('payment', 'purchase') and -1 or 1
currency_rate_difference = sign * (line.move_line_id.amount_residual - amount)
else:
currency_rate_difference = 0.0
move_line = {
- 'journal_id': voucher_brw.journal_id.id,
- 'period_id': voucher_brw.period_id.id,
+ 'journal_id': voucher.journal_id.id,
+ 'period_id': voucher.period_id.id,
'name': line.name or '/',
'account_id': line.account_id.id,
'move_id': move_id,
- 'partner_id': voucher_brw.partner_id.id,
+ 'partner_id': voucher.partner_id.id,
'currency_id': line.move_line_id and (company_currency <> line.move_line_id.currency_id.id and line.move_line_id.currency_id.id) or False,
'analytic_account_id': line.account_analytic_id and line.account_analytic_id.id or False,
'quantity': 1,
'credit': 0.0,
'debit': 0.0,
- 'date': voucher_brw.date
+ 'date': voucher.date
}
if amount < 0:
amount = -amount
@@ -1135,9 +1197,9 @@
tot_line -= amount
move_line['credit'] = amount
- if voucher_brw.tax_id and voucher_brw.type in ('sale', 'purchase'):
+ if voucher.tax_id and voucher.type in ('sale', 'purchase'):
move_line.update({
- 'account_tax_id': voucher_brw.tax_id.id,
+ 'account_tax_id': voucher.tax_id.id,
})
if move_line.get('account_tax_id', False):
@@ -1149,7 +1211,6 @@
foreign_currency_diff = 0.0
amount_currency = False
if line.move_line_id:
- voucher_currency = voucher_brw.currency_id and voucher_brw.currency_id.id or voucher_brw.journal_id.company_id.currency_id.id
# We want to set it on the account move line as soon as the original line had a foreign currency
if line.move_line_id.currency_id and line.move_line_id.currency_id.id != company_currency:
# we compute the amount in that foreign currency.
@@ -1157,22 +1218,19 @@
# if the voucher and the voucher line share the same currency, there is no computation to do
sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1
amount_currency = sign * (line.amount)
- elif line.move_line_id.currency_id.id == voucher_brw.payment_rate_currency_id.id:
- # if the rate is specified on the voucher, we must use it
- voucher_rate = currency_obj.browse(cr, uid, voucher_currency, context=ctx).rate
- amount_currency = (move_line['debit'] - move_line['credit']) * voucher_brw.payment_rate * voucher_rate
else:
- # otherwise we use the rates of the system (giving the voucher date in the context)
+ # if the rate is specified on the voucher, it will be used thanks to the special keys in the context
+ # otherwise we use the rates of the system
amount_currency = currency_obj.compute(cr, uid, company_currency, line.move_line_id.currency_id.id, move_line['debit']-move_line['credit'], context=ctx)
- if line.amount == line.amount_unreconciled and line.move_line_id.currency_id.id == voucher_currency:
- sign = voucher_brw.type in ('payment', 'purchase') and -1 or 1
+ if line.amount == line.amount_unreconciled:
+ sign = voucher.type in ('payment', 'purchase') and -1 or 1
foreign_currency_diff = sign * line.move_line_id.amount_residual_currency + amount_currency
move_line['amount_currency'] = amount_currency
voucher_line = move_line_obj.create(cr, uid, move_line)
rec_ids = [voucher_line, line.move_line_id.id]
- if not currency_obj.is_zero(cr, uid, voucher_brw.company_id.currency_id, currency_rate_difference):
+ if not currency_obj.is_zero(cr, uid, voucher.company_id.currency_id, currency_rate_difference):
# Change difference entry in company currency
exch_lines = self._get_exchange_lines(cr, uid, line, move_id, currency_rate_difference, company_currency, current_currency, context=context)
new_id = move_line_obj.create(cr, uid, exch_lines[0],context)
@@ -1219,32 +1277,32 @@
currency_obj = self.pool.get('res.currency')
move_line = {}
- voucher_brw = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
- current_currency_obj = voucher_brw.currency_id or voucher_brw.journal_id.company_id.currency_id
+ voucher = self.pool.get('account.voucher').browse(cr,uid,voucher_id,context)
+ current_currency_obj = voucher.currency_id or voucher.journal_id.company_id.currency_id
if not currency_obj.is_zero(cr, uid, current_currency_obj, line_total):
diff = line_total
account_id = False
write_off_name = ''
- if voucher_brw.payment_option == 'with_writeoff':
- account_id = voucher_brw.writeoff_acc_id.id
- write_off_name = voucher_brw.comment
- elif voucher_brw.type in ('sale', 'receipt'):
- account_id = voucher_brw.partner_id.property_account_receivable.id
+ if voucher.payment_option == 'with_writeoff':
+ account_id = voucher.writeoff_acc_id.id
+ write_off_name = voucher.comment
+ elif voucher.type in ('sale', 'receipt'):
+ account_id = voucher.partner_id.property_account_receivable.id
else:
- account_id = voucher_brw.partner_id.property_account_payable.id
- sign = voucher_brw.type == 'payment' and -1 or 1
+ account_id = voucher.partner_id.property_account_payable.id
+ sign = voucher.type == 'payment' and -1 or 1
move_line = {
'name': write_off_name or name,
'account_id': account_id,
'move_id': move_id,
- 'partner_id': voucher_brw.partner_id.id,
- 'date': voucher_brw.date,
+ 'partner_id': voucher.partner_id.id,
+ 'date': voucher.date,
'credit': diff > 0 and diff or 0.0,
'debit': diff < 0 and -diff or 0.0,
- 'amount_currency': company_currency <> current_currency and (sign * -1 * voucher_brw.writeoff_amount) or False,
+ 'amount_currency': company_currency <> current_currency and (sign * -1 * voucher.writeoff_amount) or False,
'currency_id': company_currency <> current_currency and current_currency or False,
- 'analytic_account_id': voucher_brw.analytic_id and voucher_brw.analytic_id.id or False,
+ 'analytic_account_id': voucher.analytic_id and voucher.analytic_id.id or False,
}
return move_line
@@ -1345,13 +1403,17 @@
_order = "move_line_id"
# If the payment is in the same currency than the invoice, we keep the same amount
- # Otherwise, we compute from company currency to payment currency
+ # Otherwise, we compute from invoice currency to payment currency
def _compute_balance(self, cr, uid, ids, name, args, context=None):
currency_pool = self.pool.get('res.currency')
rs_data = {}
for line in self.browse(cr, uid, ids, context=context):
ctx = context.copy()
ctx.update({'date': line.voucher_id.date})
+ voucher_rate = self.pool.get('res.currency').read(cr, uid, line.voucher_id.currency_id.id, ['rate'], context=ctx)['rate']
+ ctx.update({
+ 'voucher_special_currency': line.voucher_id.payment_rate_currency_id and line.voucher_id.payment_rate_currency_id.id or False,
+ 'voucher_special_currency_rate': line.voucher_id.payment_rate * voucher_rate})
res = {}
company_currency = line.voucher_id.journal_id.company_id.currency_id.id
voucher_currency = line.voucher_id.currency_id and line.voucher_id.currency_id.id or company_currency
@@ -1361,13 +1423,11 @@
res['amount_original'] = 0.0
res['amount_unreconciled'] = 0.0
elif move_line.currency_id and voucher_currency==move_line.currency_id.id:
- res['amount_original'] = currency_pool.compute(cr, uid, move_line.currency_id.id, voucher_currency, abs(move_line.amount_currency), context=ctx)
- res['amount_unreconciled'] = currency_pool.compute(cr, uid, move_line.currency_id and move_line.currency_id.id or company_currency, voucher_currency, abs(move_line.amount_residual_currency), context=ctx)
- elif move_line and move_line.credit > 0:
- res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit, context=ctx)
- res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, abs(move_line.amount_residual), context=ctx)
+ res['amount_original'] = abs(move_line.amount_currency)
+ res['amount_unreconciled'] = abs(move_line.amount_residual_currency)
else:
- res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.debit, context=ctx)
+ #always use the amount booked in the company currency as the basis of the conversion into the voucher currency
+ res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit or move_line.debit or 0.0, context=ctx)
res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, abs(move_line.amount_residual), context=ctx)
rs_data[line.id] = res
=== modified file 'account_voucher/i18n/lt.po'
--- account_voucher/i18n/lt.po 2013-04-05 11:10:48 +0000
+++ account_voucher/i18n/lt.po 2013-05-08 15:44:19 +0000
@@ -1,25 +1,46 @@
+<<<<<<< TREE
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * account_voucher
+=======
+# Lithuanian 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.
+# Giedrius Slavinskas <giedrius@xxxxxxxxxx>, 2012.
+>>>>>>> MERGE-SOURCE
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-11-29 13:01+0000\n"
"Last-Translator: Andrius Preimantas <andrius.preimantas@xxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-30 16:26+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@xxxxxxxxxx>\n"
+"Language-Team: Lithuanian <lt@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:33+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_voucher
#: field:account.bank.statement.line,voucher_id:0
msgid "Reconciliation"
-msgstr ""
+msgstr "Sudengimas"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_config_settings
@@ -35,12 +56,12 @@
#. module: account_voucher
#: view:account.voucher:0
msgid "Payment Ref"
-msgstr "Mokėjimo nuoroda"
+msgstr "Apmokėjimo numeris"
#. module: account_voucher
#: view:account.voucher:0
msgid "Total Amount"
-msgstr ""
+msgstr "Iš viso"
#. module: account_voucher
#: view:account.voucher:0
@@ -59,11 +80,12 @@
"Computed as the difference between the amount stated in the voucher and the "
"sum of allocation on the voucher lines."
msgstr ""
+"Paskaičiuotas skirtumas tarp sumokėtos bei eilutėse paskirstytos sumos."
#. module: account_voucher
#: view:account.voucher:0
msgid "(Update)"
-msgstr ""
+msgstr "(Atnaujinti)"
#. module: account_voucher
#: view:account.voucher:0
@@ -75,12 +97,12 @@
#: view:account.statement.from.invoice.lines:0
#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
msgid "Import Entries"
-msgstr ""
+msgstr "Įkelti DK įrašus"
#. module: account_voucher
#: view:account.voucher:0
msgid "Voucher Entry"
-msgstr ""
+msgstr "Apskaitos dokumento įrašai"
#. module: account_voucher
#: selection:sale.receipt.report,month:0
@@ -90,7 +112,7 @@
#. module: account_voucher
#: field:account.voucher,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Neperžiūrėtos žinutės"
#. module: account_voucher
#: view:account.voucher:0
@@ -100,28 +122,28 @@
#. module: account_voucher
#: view:account.voucher:0
msgid "Are you sure you want to cancel this receipt?"
-msgstr ""
+msgstr "Ar tikrai norite atšaukti šį kvitą?"
#. module: account_voucher
#: view:account.voucher:0
msgid "Set to Draft"
-msgstr "Nustatyti kaip juodraštį"
+msgstr "Atstatyti į juodraštį"
#. module: account_voucher
#: help:account.voucher,reference:0
msgid "Transaction reference number."
-msgstr ""
+msgstr "Apmokėjimo numeris."
#. module: account_voucher
#: view:sale.receipt.report:0
msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "S/F išrašymo metai"
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,user_id:0
msgid "Salesperson"
-msgstr ""
+msgstr "Pardavėjas"
#. module: account_voucher
#: view:account.voucher:0
@@ -145,7 +167,7 @@
#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
msgid "Supplier Payments"
-msgstr ""
+msgstr "Mokėjimai tiekėjams"
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
@@ -158,6 +180,13 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad įvestumėte pirkimo kvitą. \n"
+" </p><p>\n"
+" Patvirtinus pirkimo kvitą, galima įvesti mokėjimą tiekėjui,\n"
+" susijusį su šiuo kvitu.\n"
+" </p>\n"
+" "
#. module: account_voucher
#: view:account.voucher:0
@@ -167,7 +196,7 @@
#. module: account_voucher
#: field:account.voucher,writeoff_acc_id:0
msgid "Counterpart Account"
-msgstr ""
+msgstr "Nurašymo sąskaita"
#. module: account_voucher
#: field:account.voucher,account_id:0
@@ -179,17 +208,17 @@
#. module: account_voucher
#: field:account.voucher,line_dr_ids:0
msgid "Debits"
-msgstr ""
+msgstr "Debetavimas"
#. module: account_voucher
#: view:account.statement.from.invoice.lines:0
msgid "Ok"
-msgstr "OK"
+msgstr "Gerai"
#. module: account_voucher
#: field:account.voucher.line,reconcile:0
msgid "Full Reconcile"
-msgstr "Pilnas sugretinimas"
+msgstr "Pilnas sudengimas"
#. module: account_voucher
#: field:account.voucher,date_due:0
@@ -207,25 +236,25 @@
#. module: account_voucher
#: field:account.voucher,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Pranešimai"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
msgid "Purchase Receipts"
-msgstr ""
+msgstr "Pirkimo kvitai"
#. module: account_voucher
#: field:account.voucher.line,move_line_id:0
msgid "Journal Item"
-msgstr ""
+msgstr "DK įrašas"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:508
#: code:addons/account_voucher/account_voucher.py:981
#, python-format
msgid "Error!"
-msgstr ""
+msgstr "Klaida!"
#. module: account_voucher
#: field:account.voucher.line,amount:0
@@ -239,6 +268,14 @@
#. module: account_voucher
#: view:account.voucher:0
+<<<<<<< TREE
+=======
+msgid "e.g. 003/10"
+msgstr "pvz. 003/10"
+
+#. module: account_voucher
+#: view:account.voucher:0
+>>>>>>> MERGE-SOURCE
msgid "Other Information"
msgstr "Kita informacija"
@@ -267,11 +304,19 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad sukurtumėte pardavimo kvitą.\n"
+" </p><p>\n"
+" Patvirtinus pardavimo kvitą galima įvesti pirkėjo mokėjimą, "
+"\n"
+" susijusį su šiuo kvitu.\n"
+" </p>\n"
+" "
#. module: account_voucher
#: help:account.voucher,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Jeigu pažymėta, naujos žinutės reikalaus jūsų dėmesio."
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_bank_statement_line
@@ -282,24 +327,24 @@
#: view:sale.receipt.report:0
#: field:sale.receipt.report,day:0
msgid "Day"
-msgstr "Diena"
+msgstr "Data"
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher,tax_id:0
msgid "Tax"
-msgstr "Mokestis"
+msgstr "Mokesčiai"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:879
#, python-format
msgid "Invalid Action!"
-msgstr ""
+msgstr "Klaidingas veiksmas!"
#. module: account_voucher
#: field:account.voucher,comment:0
msgid "Counterpart Comment"
-msgstr ""
+msgstr "Nurašymo paaiškinimas"
#. module: account_voucher
#: field:account.voucher.line,account_analytic_id:0
@@ -312,6 +357,8 @@
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Saugo pokalbių suvestinę (žinučių skaičius, ...). Ši apžvalga saugoma html "
+"formatu, kad būtų galima įterpti į kanban rodinius."
#. module: account_voucher
#: view:account.voucher:0
@@ -321,12 +368,12 @@
#. module: account_voucher
#: view:account.voucher:0
msgid "Payment Information"
-msgstr "Mokėjimo informacija"
+msgstr "Mokėjimo duomenys"
#. module: account_voucher
#: view:account.voucher:0
msgid "(update)"
-msgstr ""
+msgstr "(atnaujinti)"
#. module: account_voucher
#: view:account.voucher:0
@@ -342,6 +389,14 @@
msgstr "Įkelti S/F"
#. module: account_voucher
+<<<<<<< TREE
+=======
+#: view:account.voucher:0
+msgid "e.g. Invoice SAJ/0042"
+msgstr "pvz. Sąskaita-faktūra SAJ/0042"
+
+#. module: account_voucher
+>>>>>>> MERGE-SOURCE
#: code:addons/account_voucher/account_voucher.py:1112
#, python-format
msgid "Wrong voucher line"
@@ -351,14 +406,14 @@
#: selection:account.voucher,pay_now:0
#: selection:sale.receipt.report,pay_now:0
msgid "Pay Later or Group Funds"
-msgstr ""
+msgstr "Mokėti vėliau arba bendras apmokėjimas"
#. module: account_voucher
#: view:account.voucher:0
#: selection:account.voucher,type:0
#: selection:sale.receipt.report,type:0
msgid "Receipt"
-msgstr ""
+msgstr "Kvitas"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:1018
@@ -376,6 +431,14 @@
#. module: account_voucher
#: view:account.voucher:0
+<<<<<<< TREE
+=======
+msgid "Cancel Voucher"
+msgstr "Atšaukti kvitą"
+
+#. module: account_voucher
+#: view:account.voucher:0
+>>>>>>> MERGE-SOURCE
#: field:account.voucher,period_id:0
msgid "Period"
msgstr "Periodas"
@@ -395,7 +458,7 @@
#. module: account_voucher
#: field:account.voucher,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Prenumeratoriai"
#. module: account_voucher
#: selection:account.voucher.line,type:0
@@ -412,7 +475,7 @@
#: view:sale.receipt.report:0
#: field:sale.receipt.report,nbr:0
msgid "# of Voucher Lines"
-msgstr ""
+msgstr "# eilučių"
#. module: account_voucher
#: view:sale.receipt.report:0
@@ -423,7 +486,7 @@
#. module: account_voucher
#: view:sale.receipt.report:0
msgid "Pro-forma Vouchers"
-msgstr ""
+msgstr "Išankstiniai kvitai"
#. module: account_voucher
#: view:account.voucher:0
@@ -442,6 +505,13 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad sukurtumėte mokėjimą tiekėjui.\n"
+" </p><p>\n"
+" OpenERP pagalba jūs galėsite paprasčiau sekti atliekamus "
+"mokėjimus bei skolas tiekėjams.\n"
+" </p>\n"
+" "
#. module: account_voucher
#: view:account.voucher:0
@@ -456,14 +526,22 @@
#. module: account_voucher
#: field:account.voucher,name:0
msgid "Memo"
-msgstr ""
+msgstr "Atmintinė"
#. module: account_voucher
#: view:account.voucher:0
msgid "Are you sure to unreconcile and cancel this record ?"
-msgstr ""
-
-#. module: account_voucher
+msgstr "Ar tikrai norite panaikinti sudengimą ir atšaukti šį įrašą?"
+
+#. module: account_voucher
+<<<<<<< TREE
+=======
+#: view:account.voucher:0
+msgid "Sales Receipt"
+msgstr "Pardavimo kvitas"
+
+#. module: account_voucher
+>>>>>>> MERGE-SOURCE
#: field:account.voucher,is_multi_currency:0
msgid "Multi Currency Voucher"
msgstr ""
@@ -471,12 +549,12 @@
#. module: account_voucher
#: view:account.voucher:0
msgid "Bill Information"
-msgstr "Sąskaitos informacija"
+msgstr "Kvito duomenys"
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "July"
-msgstr ""
+msgstr "Liepa"
#. module: account_voucher
#: help:account.voucher,state:0
@@ -494,13 +572,13 @@
#. module: account_voucher
#: field:account.voucher,writeoff_amount:0
msgid "Difference Amount"
-msgstr ""
+msgstr "Nesutampanti suma"
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,due_delay:0
msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Vid. apmokėjimo terminas"
#. module: account_voucher
#: code:addons/account_voucher/invoice.py:34
@@ -517,12 +595,12 @@
#. module: account_voucher
#: field:account.voucher,tax_amount:0
msgid "Tax Amount"
-msgstr ""
+msgstr "Mokesčių suma"
#. module: account_voucher
#: view:sale.receipt.report:0
msgid "Validated Vouchers"
-msgstr ""
+msgstr "Užregistruoti kvitai"
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
@@ -539,6 +617,15 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad užregistruotumėte apmokėjimą. \n"
+" </p><p>\n"
+" Įveskite pirkėją, pasirinkite mokėjimo būdą ir tuomet\n"
+" galėsite sukurti mokėjimo įrašus rankiniu būdu arba OpenERP\n"
+" pasiūlys automatinį mokėjimo sudengimą su neapmokėta S/F ar\n"
+" pardavimo kvitu.\n"
+" </p>\n"
+" "
#. module: account_voucher
#: field:account.config.settings,expense_currency_exchange_account_id:0
@@ -549,18 +636,18 @@
#. module: account_voucher
#: view:account.voucher:0
msgid "Paid Amount"
-msgstr ""
+msgstr "Sumokėta suma"
#. module: account_voucher
#: field:account.voucher,payment_option:0
msgid "Payment Difference"
-msgstr ""
+msgstr "Mokėjimo nesutapimas"
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher,audit:0
msgid "To Review"
-msgstr ""
+msgstr "Peržiūrėti"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:1025
@@ -599,28 +686,28 @@
#. module: account_voucher
#: view:account.invoice:0
msgid "Register Payment"
-msgstr ""
+msgstr "Užregistruoti mokėjimą"
#. module: account_voucher
#: field:account.statement.from.invoice.lines,line_ids:0
msgid "Invoices"
-msgstr ""
+msgstr "Sąskaitos faktūros"
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "December"
-msgstr ""
+msgstr "Gruodis"
#. module: account_voucher
#: view:sale.receipt.report:0
msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "S/F išrašymo mėnuo"
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,month:0
msgid "Month"
-msgstr ""
+msgstr "Mėnuo"
#. module: account_voucher
#: field:account.voucher,currency_id:0
@@ -632,7 +719,7 @@
#. module: account_voucher
#: view:account.statement.from.invoice.lines:0
msgid "Payable and Receivables"
-msgstr ""
+msgstr "Mokamos ir gautinos sumos"
#. module: account_voucher
#: view:account.voucher:0
@@ -665,9 +752,17 @@
#. module: account_voucher
#: selection:account.voucher,payment_option:0
msgid "Reconcile Payment Balance"
-msgstr ""
-
-#. module: account_voucher
+msgstr "Sudengti mokėjimo likutį"
+
+#. module: account_voucher
+<<<<<<< TREE
+=======
+#: view:account.voucher:0
+msgid "Cancel Receipt"
+msgstr "Atšaukti kvitą"
+
+#. module: account_voucher
+>>>>>>> MERGE-SOURCE
#: code:addons/account_voucher/account_voucher.py:975
#, python-format
msgid "Configuration Error !"
@@ -677,13 +772,13 @@
#: view:account.voucher:0
#: view:sale.receipt.report:0
msgid "Draft Vouchers"
-msgstr ""
+msgstr "Dokumento juodraštis"
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,price_total_tax:0
msgid "Total With Tax"
-msgstr ""
+msgstr "Iš viso"
#. module: account_voucher
#: view:account.voucher:0
@@ -695,23 +790,23 @@
#: field:account.voucher,state:0
#: view:sale.receipt.report:0
msgid "Status"
-msgstr ""
+msgstr "Būsena"
#. module: account_voucher
#: view:account.voucher:0
msgid "Allocation"
-msgstr ""
+msgstr "Paskirstymas"
#. module: account_voucher
#: view:account.statement.from.invoice.lines:0
#: view:account.voucher:0
msgid "or"
-msgstr ""
+msgstr "arba"
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "August"
-msgstr ""
+msgstr "Rugpjūtis"
#. module: account_voucher
#: view:account.voucher:0
@@ -728,7 +823,7 @@
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "October"
-msgstr ""
+msgstr "Spalis"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:976
@@ -739,7 +834,7 @@
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "June"
-msgstr ""
+msgstr "Birželis"
#. module: account_voucher
#: field:account.voucher,payment_rate_currency_id:0
@@ -749,23 +844,23 @@
#. module: account_voucher
#: field:account.voucher,paid:0
msgid "Paid"
-msgstr ""
+msgstr "Apmokėta"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
msgid "Sales Receipts"
-msgstr ""
+msgstr "Pardavimo kvitai"
#. module: account_voucher
#: field:account.voucher,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Ar prenumeratorius"
#. module: account_voucher
#: field:account.voucher,analytic_id:0
msgid "Write-Off Analytic Account"
-msgstr ""
+msgstr "Nurašymo analitinė sąskaita"
#. module: account_voucher
#: field:account.voucher,date:0
@@ -777,12 +872,12 @@
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "November"
-msgstr ""
+msgstr "Lapkritis"
#. module: account_voucher
#: view:sale.receipt.report:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "Išplėstiniai filtrai..."
#. module: account_voucher
#: field:account.voucher,paid_amount_in_company_currency:0
@@ -798,7 +893,7 @@
#: selection:account.voucher,pay_now:0
#: selection:sale.receipt.report,pay_now:0
msgid "Pay Directly"
-msgstr ""
+msgstr "Mokėti iškart"
#. module: account_voucher
#: field:account.voucher.line,type:0
@@ -819,28 +914,28 @@
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "January"
-msgstr ""
+msgstr "Sausis"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
msgid "Journal Vouchers"
-msgstr "Žurnalo kvitai"
+msgstr "Apskaitos dokumentai"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_res_company
msgid "Companies"
-msgstr ""
+msgstr "Įmonės"
#. module: account_voucher
#: field:account.voucher,message_summary:0
msgid "Summary"
-msgstr ""
+msgstr "Santrauka"
#. module: account_voucher
#: field:account.voucher,active:0
msgid "Active"
-msgstr ""
+msgstr "Aktyvus"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:982
@@ -853,24 +948,24 @@
#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
msgid "Customer Payments"
-msgstr ""
+msgstr "Pirkėjo mokėjimai"
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
#: view:sale.receipt.report:0
msgid "Sales Receipts Analysis"
-msgstr ""
+msgstr "Pardavimo kvitų analizė"
#. module: account_voucher
#: view:sale.receipt.report:0
msgid "Group by Invoice Date"
-msgstr ""
+msgstr "S/F išrašymo data"
#. module: account_voucher
#: view:account.voucher:0
msgid "Post"
-msgstr ""
+msgstr "Registruoti"
#. module: account_voucher
#: view:account.voucher:0
@@ -881,17 +976,17 @@
#: view:sale.receipt.report:0
#: field:sale.receipt.report,price_total:0
msgid "Total Without Tax"
-msgstr ""
+msgstr "Iš viso be mokesčių"
#. module: account_voucher
#: view:account.voucher:0
msgid "Bill Date"
-msgstr "Sąskaitos data"
+msgstr "Kvito data"
#. module: account_voucher
#: view:account.voucher:0
msgid "Unreconcile"
-msgstr "Panaikinti sugretinimą"
+msgstr "Panaikinti sudengimą"
#. module: account_voucher
#: view:account.voucher:0
@@ -912,7 +1007,7 @@
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_bank_statement
msgid "Bank Statement"
-msgstr ""
+msgstr "Banko sąskaitos išrašas"
#. module: account_voucher
#: view:account.bank.statement:0
@@ -922,12 +1017,12 @@
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "September"
-msgstr ""
+msgstr "Rugsėjis"
#. module: account_voucher
#: view:account.voucher:0
msgid "Sales Information"
-msgstr ""
+msgstr "Pardavimo informacija"
#. module: account_voucher
#: view:account.voucher:0
@@ -939,7 +1034,7 @@
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_invoice
msgid "Invoice"
-msgstr ""
+msgstr "Sąskaita-faktūra"
#. module: account_voucher
#: view:account.voucher:0
@@ -968,7 +1063,7 @@
#: view:account.voucher:0
#: field:account.voucher,move_ids:0
msgid "Journal Items"
-msgstr ""
+msgstr "DK įrašai"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:508
@@ -980,13 +1075,13 @@
#: selection:account.voucher,type:0
#: selection:sale.receipt.report,type:0
msgid "Purchase"
-msgstr ""
+msgstr "Pirkimai"
#. module: account_voucher
#: view:account.invoice:0
#: view:account.voucher:0
msgid "Pay"
-msgstr ""
+msgstr "Mokėti"
#. module: account_voucher
#: view:account.voucher:0
@@ -1001,6 +1096,9 @@
"either choose to keep open this difference on the partner's account, or "
"reconcile it with the payment(s)"
msgstr ""
+"Pasirinkite ką daryti su susidariusiu skirtumu tarp sumokėtos bei "
+"paskirstytos sumos. Galima pasirinkti, kad likutis liktų kontakto balanse, "
+"arba sudengti su kitu mokėjimu (-ais)."
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
@@ -1018,17 +1116,17 @@
#. module: account_voucher
#: view:account.voucher:0
msgid "Posted Vouchers"
-msgstr ""
+msgstr "Užregistruotas dokumentas"
#. module: account_voucher
#: field:account.voucher,payment_rate:0
msgid "Exchange Rate"
-msgstr ""
+msgstr "Valiutos kursas"
#. module: account_voucher
#: view:account.voucher:0
msgid "Payment Method"
-msgstr ""
+msgstr "Mokėjimo būdas"
#. module: account_voucher
#: field:account.voucher.line,name:0
@@ -1038,7 +1136,7 @@
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "May"
-msgstr ""
+msgstr "Gegužė"
#. module: account_voucher
#: view:account.voucher:0
@@ -1056,23 +1154,23 @@
#. module: account_voucher
#: view:account.voucher:0
msgid "Internal Notes"
-msgstr ""
+msgstr "Vidinės pastabos"
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher,line_cr_ids:0
msgid "Credits"
-msgstr ""
+msgstr "Kreditavimas"
#. module: account_voucher
#: field:account.voucher.line,amount_original:0
msgid "Original Amount"
-msgstr ""
+msgstr "Pirminė suma"
#. module: account_voucher
#: view:account.voucher:0
msgid "Purchase Receipt"
-msgstr "Pirkimo kvitas"
+msgstr "Pirkimo kvitai"
#. module: account_voucher
#: help:account.voucher,payment_rate:0
@@ -1088,7 +1186,7 @@
#: field:sale.receipt.report,pay_now:0
#: selection:sale.receipt.report,type:0
msgid "Payment"
-msgstr ""
+msgstr "Mokėjimas"
#. module: account_voucher
#: view:account.voucher:0
@@ -1101,12 +1199,12 @@
#. module: account_voucher
#: view:account.voucher:0
msgid "Customer"
-msgstr ""
+msgstr "Pirkėjas"
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "February"
-msgstr ""
+msgstr "Vasaris"
#. module: account_voucher
#: view:account.voucher:0
@@ -1116,13 +1214,13 @@
#. module: account_voucher
#: field:account.voucher,reference:0
msgid "Ref #"
-msgstr "Nuoroda"
+msgstr "Nr #"
#. module: account_voucher
#: view:sale.receipt.report:0
#: field:sale.receipt.report,year:0
msgid "Year"
-msgstr ""
+msgstr "Metai"
#. module: account_voucher
#: field:account.config.settings,income_currency_exchange_account_id:0
@@ -1139,22 +1237,22 @@
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "April"
-msgstr ""
+msgstr "Balandis"
#. module: account_voucher
#: help:account.voucher,tax_id:0
msgid "Only for tax excluded from price"
-msgstr ""
+msgstr "Tik tie mokesčiai, kurie neįtraukti į kainą"
#. module: account_voucher
#: field:account.voucher,type:0
msgid "Default Type"
-msgstr ""
+msgstr "Tipas"
#. module: account_voucher
#: help:account.voucher,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Žinučių ir pranešimų istorija"
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
@@ -1165,7 +1263,7 @@
#: view:account.voucher:0
#: field:account.voucher,amount:0
msgid "Total"
-msgstr ""
+msgstr "Iš viso"
#. module: account_voucher
#: field:account.voucher,move_id:0
@@ -1188,7 +1286,7 @@
#. module: account_voucher
#: help:account.voucher,date:0
msgid "Effective date for accounting entries"
-msgstr ""
+msgstr "DK įrašų įsigaliojimo data"
#. module: account_voucher
#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
@@ -1198,7 +1296,7 @@
#. module: account_voucher
#: selection:account.voucher,payment_option:0
msgid "Keep Open"
-msgstr ""
+msgstr "Palikti atvirą"
#. module: account_voucher
#: field:account.voucher,line_ids:0
@@ -1211,7 +1309,7 @@
#: view:sale.receipt.report:0
#: field:sale.receipt.report,delay_to_pay:0
msgid "Avg. Delay To Pay"
-msgstr ""
+msgstr "Vid. vėluojama apmokėti"
#. module: account_voucher
#: field:account.voucher.line,untax_amount:0
@@ -1235,7 +1333,7 @@
#. module: account_voucher
#: field:account.voucher.line,amount_unreconciled:0
msgid "Open Balance"
-msgstr ""
+msgstr "Likutis"
#. module: account_voucher
#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
=== modified file 'account_voucher/i18n/nl.po'
--- account_voucher/i18n/nl.po 2013-04-15 08:43:02 +0000
+++ account_voucher/i18n/nl.po 2013-05-08 15:44:19 +0000
@@ -4,17 +4,29 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2012-11-24 22:01+0000\n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-05-01 18:15+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:33+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-02 06:08+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_voucher
#: field:account.bank.statement.line,voucher_id:0
@@ -30,7 +42,7 @@
#: code:addons/account_voucher/account_voucher.py:369
#, python-format
msgid "Write-Off"
-msgstr "Boek af"
+msgstr "Afschrijving"
#. module: account_voucher
#: view:account.voucher:0
@@ -77,7 +89,7 @@
#: view:account.statement.from.invoice.lines:0
#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
msgid "Import Entries"
-msgstr "Importeer invoerregels"
+msgstr "Importeer boekingen"
#. module: account_voucher
#: view:account.voucher:0
@@ -190,7 +202,7 @@
#. module: account_voucher
#: field:account.voucher,line_dr_ids:0
msgid "Debits"
-msgstr "Debet"
+msgstr "Debet regels"
#. module: account_voucher
#: view:account.statement.from.invoice.lines:0
@@ -229,7 +241,7 @@
#. module: account_voucher
#: field:account.voucher.line,move_line_id:0
msgid "Journal Item"
-msgstr "Journaal item"
+msgstr "Boeking"
#. module: account_voucher
#: code:addons/account_voucher/account_voucher.py:508
@@ -1136,7 +1148,7 @@
#: view:account.voucher:0
#: field:account.voucher,line_cr_ids:0
msgid "Credits"
-msgstr "Credits"
+msgstr "Credit regels"
#. module: account_voucher
#: field:account.voucher.line,amount_original:0
=== modified file 'account_voucher/i18n/sl.po'
--- account_voucher/i18n/sl.po 2013-04-05 11:10:48 +0000
+++ account_voucher/i18n/sl.po 2013-05-08 15:44:19 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
"PO-Revision-Date: 2010-10-30 14:06+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@xxxxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-27 12:51+0000\n"
+"Last-Translator: Dušan Laznik (Mentis) <laznik@xxxxxxxxx>\n"
+"Language-Team: Slovenian <sl@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:33+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-28 05:41+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_voucher
#: field:account.bank.statement.line,voucher_id:0
@@ -59,6 +73,7 @@
"Computed as the difference between the amount stated in the voucher and the "
"sum of allocation on the voucher lines."
msgstr ""
+"Razlika med zneskom v glavi in vsemi razporejenimi zneski na postavkah."
#. module: account_voucher
#: view:account.voucher:0
=== modified file 'account_voucher/test/account_voucher.yml'
--- account_voucher/test/account_voucher.yml 2012-11-29 22:26:45 +0000
+++ account_voucher/test/account_voucher.yml 2013-05-08 15:44:19 +0000
@@ -6,7 +6,7 @@
account_id: account.cash
amount: 1000.0
company_id: base.main_company
- journal_id: account.bank_journal
+ journal_id: account.sales_journal
name: Voucher for Axelor
narration: Basic Pc
line_cr_ids:
=== added file 'account_voucher/test/case1_usd_usd_payment_rate.yml'
--- account_voucher/test/case1_usd_usd_payment_rate.yml 1970-01-01 00:00:00 +0000
+++ account_voucher/test/case1_usd_usd_payment_rate.yml 2013-05-08 15:44:19 +0000
@@ -0,0 +1,249 @@
+-
+ In order to check the Account_voucher module with multi-currency in OpenERP,
+ I create 2 Invoices in USD and make 1 Payment in USD based on the currency rating given by the bank which is slightly different that the one encoded in OpenERP
+-
+ I set the income and expense currency accounts on the main company
+-
+ !python {model: res.company}: |
+ from datetime import datetime
+ vals = {
+ 'income_currency_exchange_account_id': ref('account.o_expense'),
+ 'expense_currency_exchange_account_id': ref('account.o_expense')}
+ self.write(cr, uid, ref('base.main_company'), vals)
+-
+ I create currency USD in OpenERP for January of 1.333333 Rate
+-
+ !python {model: res.currency.rate}: |
+ from datetime import datetime
+ curr_id = self.pool.get('res.currency').search(cr, uid, [('name', '=', 'USD')])[0]
+ date = '%s-01-01' %(datetime.now().year)
+ ids = self.search(cr, uid, [('currency_id','=',curr_id), ('name', '=', date)])
+ self.write(cr, uid, ids, {'rate': 1.333333})
+-
+ I create currency USD in OpenERP for February of 1.250000 Rate
+-
+ !record {model: res.currency.rate, id: feb_usd}:
+ currency_id: base.USD
+ name: !eval "'%s-02-01' %(datetime.now().year)"
+ rate: 1.250000
+
+-
+ I create currency USD in OpenERP for March of 1.111111 Rate
+-
+ !record {model: res.currency.rate, id: mar_usd}:
+ currency_id: base.USD
+ name: !eval "'%s-03-01' %(datetime.now().year)"
+ rate: 1.111111
+
+-
+ I create currency USD in OpenERP for April of 1.052632 Rate
+-
+ !record {model: res.currency.rate, id: apr_usd}:
+ currency_id: base.USD
+ name: !eval "'%s-04-01' %(datetime.now().year)"
+ rate: 1.052632
+
+-
+ I create a cash account with currency USD
+-
+ !record {model: account.account, id: account_cash_usd_id}:
+ currency_id: base.USD
+ name: "cash account in usd"
+ code: "Xcash usd"
+ type: 'liquidity'
+ user_type: "account.data_account_type_cash"
+
+-
+ I create a bank journal with USD as currency
+-
+ !record {model: account.journal, id: bank_journal_USD}:
+ name: Bank Journal(USD)
+ code: BUSD
+ type: bank
+ analytic_journal_id: account.sit
+ sequence_id: account.sequence_bank_journal
+ default_debit_account_id: account_cash_usd_id
+ default_credit_account_id: account_cash_usd_id
+ currency: base.USD
+ company_id: base.main_company
+
+-
+ I create a new partner Kate Mc Kay
+-
+ !record {model: res.partner, id: res_partner_mc_kay}:
+ name: "Mc Kay Kate"
+ property_account_receivable: account.a_recv
+ property_account_payable: account.a_pay
+-
+ I create the first invoice on 1st January for 200 USD
+-
+ !record {model: account.invoice, id: account_invoice_jan_payment_rate}:
+ account_id: account.a_recv
+ company_id: base.main_company
+ currency_id: base.USD
+ date_invoice: !eval "'%s-01-01' %(datetime.now().year)"
+ period_id: account.period_1
+ invoice_line:
+ - account_id: account.a_sale
+ name: '[PCSC234] PC Assemble SC234'
+ price_unit: 200.0
+ quantity: 1.0
+ product_id: product.product_product_3
+ uos_id: product.product_uom_unit
+ journal_id: account.sales_journal
+ partner_id: res_partner_mc_kay
+ reference_type: none
+-
+ I Validate invoice by clicking on Validate button
+-
+ !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_jan_payment_rate}
+-
+ I check that first invoice move is correct for debtor account (debit - credit == 150.0)
+-
+ !python {model: account.invoice}: |
+ invoice_id = self.browse(cr, uid, ref("account_invoice_jan_payment_rate"))
+ assert invoice_id.move_id, "Move not created for open invoice"
+ move_line_obj = self.pool.get('account.move.line')
+ move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
+ move_line = move_line_obj.browse(cr, uid, move_lines[0])
+ assert (move_line.debit - move_line.credit == 150.0), "Invoice move is not correct for debtors account"
+-
+ I create the second invoice on 1st February for 100 USD
+-
+ !record {model: account.invoice, id: account_invoice_feb_payment_rate}:
+ account_id: account.a_recv
+ company_id: base.main_company
+ currency_id: base.USD
+ date_invoice: !eval "'%s-02-01' %(datetime.now().year)"
+ period_id: account.period_2
+ invoice_line:
+ - account_id: account.a_sale
+ name: '[PCSC234] PC Assemble SC234'
+ price_unit: 100.0
+ quantity: 1.0
+ product_id: product.product_product_3
+ uos_id: product.product_uom_unit
+ journal_id: account.sales_journal
+ partner_id: res_partner_mc_kay
+ reference_type: none
+-
+ I Validate invoice by clicking on Validate button
+-
+ !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_feb_payment_rate}
+-
+ I check that second invoice move is correct for debtor account (debit - credit == 80)
+-
+ !python {model: account.invoice}: |
+ invoice_id = self.browse(cr, uid, ref("account_invoice_feb_payment_rate"))
+ assert invoice_id.move_id, "Move not created for open invoice"
+ move_line_obj = self.pool.get('account.move.line')
+ move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
+ move_line = move_line_obj.browse(cr, uid, move_lines[0])
+ assert (move_line.debit - move_line.credit == 80), "Invoice move is not correct for debtors account"
+
+-
+ I set the context that will be used for the encoding of all the vouchers of this file
+-
+ !context
+ 'type': 'receipt'
+-
+ On the first March, I create the first voucher of payment with values 240 USD, journal USD, and specifying that $1 = 0.8€
+-
+ !record {model: account.voucher, id: account_voucher_1_case1_payment_rate, view: view_vendor_receipt_form}:
+ account_id: account.cash
+ amount: 240.0
+ company_id: base.main_company
+ journal_id: bank_journal_USD
+ name: 'Payment: Case 1 USD/USD payment rate'
+ partner_id: res_partner_mc_kay
+ period_id: account.period_3
+ date: !eval time.strftime("%Y-03-01")
+ payment_option: 'with_writeoff'
+ writeoff_acc_id: account.a_expense
+ comment: 'Write Off'
+ payment_rate: 0.8
+ payment_rate_currency_id: base.EUR
+
+-
+ I fill amounts 180 for the invoice of 200$ and 70 for the invoice of 100$>
+-
+ !python {model: account.voucher}: |
+ import netsvc, time
+ vals = {}
+ voucher_id = self.browse(cr, uid, ref('account_voucher_1_case1_payment_rate'))
+ data = []
+ for item in voucher_id.line_cr_ids:
+ if item.amount_unreconciled == 200.00:
+ data += [(item.id, 180.0)]
+ else:
+ data += [(item.id, 70.0)]
+ for line_id, amount in data:
+ self.pool.get('account.voucher.line').write(cr, uid, [line_id], {'amount': amount})
+ assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+ I check that writeoff amount computed is -10.0
+-
+ !python {model: account.voucher}: |
+ voucher = ref('account_voucher_1_case1_payment_rate')
+ voucher_id = self.browse(cr, uid, voucher)
+ assert (voucher_id.writeoff_amount == -10.0), "Writeoff amount is not -10.0"
+-
+ I confirm the voucher
+-
+ !python {model: account.voucher}: |
+ import netsvc
+ wf_service = netsvc.LocalService("workflow")
+ wf_service.trg_validate(uid, 'account.voucher', ref('account_voucher_1_case1_payment_rate'), 'proforma_voucher', cr)
+-
+ I check that the move of my first voucher is valid
+-
+ !python {model: account.voucher}: |
+ voucher = ref('account_voucher_1_case1_payment_rate')
+ voucher_id = self.browse(cr, uid, voucher)
+ move_line_obj = self.pool.get('account.move.line')
+ move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+ for move_line in move_line_obj.browse(cr, uid, move_lines):
+ assert move_line.state == 'valid', "Voucher move is not valid"
+-
+ I check that my debtor account is correct
+-
+ I check that the debtor account has 2 new lines with -180 and -70 as amount_currency columns and that their credit columns are respectively 144 and 56
+-
+ I check that my write-off is correct. 8 debit and 10 amount_currency
+-
+ !python {model: account.voucher}: |
+ voucher = ref('account_voucher_1_case1_payment_rate')
+ voucher_id = self.browse(cr, uid, voucher)
+ move_line_obj = self.pool.get('account.move.line')
+ move_lines = move_line_obj.search(cr, uid, [('move_id', '=', voucher_id.move_id.id)])
+ for move_line in move_line_obj.browse(cr, uid, move_lines):
+ if move_line.amount_currency == -180.00:
+ assert move_line.credit == 144.00, "Debtor account has wrong entry."
+ elif move_line.amount_currency == -70.00:
+ assert move_line.credit == 56.00, "Debtor account has wrong entry."
+ elif move_line.amount_currency == 10.00:
+ assert move_line.debit == 8.00, "Writeoff amount is wrong: Got a debit of %s (expected 8,00€)" % (move_line.debit)
+ elif move_line.amount_currency == 240.00:
+ assert move_line.debit == 192.00, "Bank entry is wrong."
+ else:
+ assert False, "Unrecognized journal entry"
+-
+ I check the residual amount of Invoice1, should be 20 in amount_currency and 6 in amount_residual
+-
+ !python {model: account.invoice}: |
+ invoice_id = self.browse(cr, uid, ref("account_invoice_jan_payment_rate"))
+ move_line_obj = self.pool.get('account.move.line')
+ move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
+ move_line = move_line_obj.browse(cr, uid, move_lines[0])
+ assert (move_line.amount_residual == 6.0) , "Residual amount is not correct for first Invoice"
+ assert (move_line.amount_residual_currency == 20.0) , "Residual amount in currency is not correct for first Invoice"
+-
+ I check the residual amuont of Invoice2, should be 30 in residual currency and 24 in amount_residual
+-
+ !python {model: account.invoice}: |
+ invoice_id = self.browse(cr, uid, ref("account_invoice_feb_payment_rate"))
+ move_line_obj = self.pool.get('account.move.line')
+ move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
+ move_line = move_line_obj.browse(cr, uid, move_lines[0])
+ assert (move_line.amount_residual == 24.0) , "Residual amount is not correct for second Invoice"
+ assert (move_line.amount_residual_currency == 30.0) , "Residual amount in currency is not correct for second Invoice"
=== modified file 'account_voucher/test/case2_usd_eur_debtor_in_eur.yml'
--- account_voucher/test/case2_usd_eur_debtor_in_eur.yml 2013-02-13 08:35:19 +0000
+++ account_voucher/test/case2_usd_eur_debtor_in_eur.yml 2013-05-08 15:44:19 +0000
@@ -201,7 +201,7 @@
move_line_obj = self.pool.get('account.move.line')
move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
move_line = move_line_obj.browse(cr, uid, move_lines[0])
- assert (move_line.amount_residual_currency == 55.56 and move_line.amount_residual == 20) , "Residual amount is not correct for first Invoice"
+ assert (move_line.amount_residual_currency == 55.56 and move_line.amount_residual == 20) , "Residual amount is not correct for first Invoice. Got %s USD (%s EUR)" %(move_line.amount_residual_currency, move_line.amount_residual)
-
I check the residual amuont of Invoice2, should be 22.22 in residual currency and 10 in amount_residual
-
=== modified file 'account_voucher/test/case4_cad_chf.yml'
--- account_voucher/test/case4_cad_chf.yml 2013-02-13 08:35:19 +0000
+++ account_voucher/test/case4_cad_chf.yml 2013-05-08 15:44:19 +0000
@@ -161,7 +161,7 @@
-
I check that the debtor account has 1 new line with -298.78 as amount_currency columns and 149.39 of credit and currency is CAD.
-
- I check that my currency rate difference is correct. 0 in debit with no amount_currency
+ I check that my currency rate difference is correct. 0 in debit with 98.78 CAD as amount_currency
-
I check that my writeoff is correct. 11.05 credit and -13.26 amount_currency
-
@@ -176,7 +176,8 @@
elif move_line.amount_currency == -298.78:
assert move_line.credit == 149.39, "Debtor account has wrong entry."
elif move_line.debit == 0.00 and move_line.credit == 0.00:
- assert move_line.amount_currency == 0.00, "Incorrect Currency Difference."
+ assert move_line.amount_currency == 98.78, "Incorrect Currency Difference, got %s as amount_currency (expected 98.78)." % (move_line.amount_currency)
+ assert move_line.currency_id.id == ref('base.CAD'), "Incorrect Currency Difference, got %s (expected 'CAD')" % (move_line.currency_id.name)
elif move_line.credit == 10.61:
assert move_line.amount_currency == -13.26, "Writeoff amount is wrong."
else:
=== modified file 'account_voucher/test/case_eur_usd.yml'
--- account_voucher/test/case_eur_usd.yml 2012-11-29 22:26:45 +0000
+++ account_voucher/test/case_eur_usd.yml 2013-05-08 15:44:19 +0000
@@ -41,7 +41,7 @@
currency: base.USD
company_id: base.main_company
-
- I create an invoice
+ On the first of January, I create an invoice of 1000€
-
!record {model: account.invoice, id: account_invoice_eur_usd}:
account_id: account.a_recv
@@ -79,7 +79,7 @@
!context
'type': 'receipt'
-
- I create the voucher of payment with values 1350 USD, journal USD,
+ On the first of February, I create the voucher of payment with values 1350 USD, journal USD,
-
!record {model: account.voucher, id: account_voucher_eur_usd_case, view: view_vendor_receipt_form}:
account_id: account.cash
=== modified file 'account_voucher/voucher_payment_receipt_view.xml'
--- account_voucher/voucher_payment_receipt_view.xml 2013-04-20 02:26:42 +0000
+++ account_voucher/voucher_payment_receipt_view.xml 2013-05-08 15:44:19 +0000
@@ -107,7 +107,7 @@
</group>
<group string="Other Information" col="4">
<field name="currency_id" colspan="4" groups="base.group_multi_currency"/>
- <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+ <field name="payment_rate" required="1" colspan="3" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
<field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
<field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
<field name="number" colspan="4"/>
@@ -157,7 +157,7 @@
<notebook>
<page string="Payment Information">
<label for="line_dr_ids"/>
- <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
+ <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
<tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)"
@@ -173,7 +173,7 @@
</tree>
</field>
<label for="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}"/>
- <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
+ <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
<tree string="Credits" editable="bottom" colors="gray:amount==0">
<field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
on_change="onchange_move_line_id(move_line_id)"
@@ -193,10 +193,10 @@
<field name="narration" colspan="2" nolabel="1"/>
</group>
<group>
- <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+ <group col="4" attrs="{'invisible':[('is_multi_currency','=',False)]}">
<separator string="Currency Options" colspan="4"/>
<field name="is_multi_currency" invisible="1"/>
- <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+ <field name="payment_rate" required="1" colspan="3" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
<field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
<field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
</group>
@@ -305,6 +305,7 @@
on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
string="Payment Method"/>
</group>
+
<group>
<field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
<field name="period_id"/>
@@ -319,6 +320,21 @@
<field name="type" invisible="True"/>
</group>
</group>
+ <group>
+ <group>
+ <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+ <field name="payment_option" required="1"/>
+ <field name="writeoff_acc_id"
+ attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+ domain="[('type','=','other')]"/>
+ <field name="comment"
+ attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+ <field name="analytic_id"
+ groups="analytic.group_analytic_accounting"/>
+ </group>
+ <group>
+ </group>
+ </group>
<notebook invisible="1">
<page string="Payment Information" groups="base.group_user">
<label for="line_cr_ids"/>
@@ -358,23 +374,12 @@
<group>
<field name="narration" colspan="2" nolabel="1"/>
</group>
- <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+ <group col="4" attrs="{'invisible':[('is_multi_currency','=',False)]}">
<field name="is_multi_currency" invisible="1"/>
- <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+ <field name="payment_rate" required="1" colspan="3" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
<field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
<field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
</group>
- <group>
- <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
- <field name="payment_option" required="1"/>
- <field name="writeoff_acc_id"
- attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
- domain="[('type','=','other')]"/>
- <field name="comment"
- attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
- <field name="analytic_id"
- groups="analytic.group_analytic_accounting"/>
- </group>
</group>
</page>
</notebook>
@@ -467,9 +472,9 @@
<group>
<field name="narration" colspan="2" nolabel="1"/>
</group>
- <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+ <group col="4" attrs="{'invisible':[('is_multi_currency','=',False)]}">
<field name="is_multi_currency" invisible="1"/>
- <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+ <field name="payment_rate" required="1" colspan="3" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
<field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
<field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
</group>
=== modified file 'account_voucher/voucher_sales_purchase_view.xml'
--- account_voucher/voucher_sales_purchase_view.xml 2013-04-20 02:26:42 +0000
+++ account_voucher/voucher_sales_purchase_view.xml 2013-05-08 15:44:19 +0000
@@ -145,6 +145,12 @@
</field>
</page>
</notebook>
+ <group col="4" invisible="1">
+ <field name="is_multi_currency" invisible="1"/>
+ <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3" invisible="1"/>
+ <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency" invisible="1"/>
+ <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+ </group>
</sheet>
<div class="oe_chatter">
<field name="message_follower_ids" widget="mail_followers"/>
=== added file 'analytic/i18n/lt.po'
--- analytic/i18n/lt.po 1970-01-01 00:00:00 +0000
+++ analytic/i18n/lt.po 2013-05-08 15:44:19 +0000
@@ -0,0 +1,412 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# Giedrius Slavinskas <giedrius@xxxxxxxxxx>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-30 16:26+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@xxxxxxxxxx>\n"
+"Language-Team: Lithuanian <lt@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Vaikinės sąskaitos"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "In Progress"
+msgstr "Vykdoma"
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
+msgstr "Sutartis: "
+
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract pending"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr ""
+
+#. module: analytic
+#: view:account.analytic.account:0
+msgid "End Date"
+msgstr "Pabaigos data"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr "Nurodo produkto kiekį."
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Debetas"
+
+#. module: analytic
+#: view:account.analytic.account:0
+msgid ""
+"Once the end date of the contract is\n"
+" passed or the maximum number of "
+"service\n"
+" units (e.g. support contract) is\n"
+" reached, the account manager is "
+"notified \n"
+" by email to renew the contract with "
+"the\n"
+" customer."
+msgstr ""
+"Kai tik pasibaigia sutartis\n"
+" arba maksimaliai kartų atlikus "
+"paslaugas\n"
+" (pvz. techninės pagalbos sutartis),\n"
+" sąskaitos valdytojas yra įspėjamas\n"
+" el. laišku, kad atnaujintų sutartį "
+"su\n"
+" pirkėju."
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr "Sutartis arba projektas"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
+msgstr "Sąskaitos/sutarties pavadinimas"
+
+#. module: analytic
+#: field:account.analytic.account,manager_id:0
+msgid "Account Manager"
+msgstr "Sąskaitos valdytojas"
+
+#. module: analytic
+#: field:account.analytic.account,message_follower_ids:0
+msgid "Followers"
+msgstr "Prenumeratoriai"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Uždaryta"
+
+#. module: analytic
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "New"
+msgstr "Naujas"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Project Manager"
+msgstr "Projekto vadovas"
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "Status"
+msgstr "Būsena"
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:271
+#, python-format
+msgid "%s (copy)"
+msgstr "%s (kopija)"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Aprašymas"
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:262
+#, python-format
+msgid "Quick account creation disallowed."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,message_unread:0
+msgid "Unread Messages"
+msgstr "Neperžiūrėtos žinutės"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You cannot create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Įmonė"
+
+#. module: analytic
+#: view:account.analytic.account:0
+msgid "Renewal"
+msgstr "Pratęsimas"
+
+#. module: analytic
+#: help:account.analytic.account,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 ""
+"Saugo pokalbių suvestinę (žinučių skaičius, ...). Ši apžvalga saugoma html "
+"formatu, kad būtų galima įterpti į kanban rodinius."
+
+#. module: analytic
+#: help:account.analytic.account,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Jeigu pažymėta, naujos žinutės reikalaus jūsų dėmesio."
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid ""
+"Sets the higher limit of time to work on the contract, based on the "
+"timesheet. (for instance, number of hours in a limited support contract.)"
+msgstr ""
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:160
+#, python-format
+msgid ""
+"If you set a company, the currency selected has to be the same as it's "
+"currency. \n"
+"You can remove the company belonging, and thus change the currency, only on "
+"analytic account of type 'view'. This can be really usefull for "
+"consolidation purposes of several companies charts with different "
+"currencies, for example."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Ar prenumeratorius"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Naudotojas"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Tėvinė analitinė sąskaita"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: analytic
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
+msgstr ""
+
+#. module: analytic
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr "Sąlygos"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+"Apskaičiuota dauginant kiekį iš nurodyto Produkto savikainos. Suma visada "
+"išreikšta pagrindine įmonės valiuta."
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Customer"
+msgstr "Pirkėjas"
+
+#. module: analytic
+#: field:account.analytic.account,child_complete_ids:0
+msgid "Account Hierarchy"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,message_ids:0
+msgid "Messages"
+msgstr "Pranešimai"
+
+#. module: analytic
+#: help:account.analytic.account,message_ids:0
+msgid "Messages and communication history"
+msgstr "Žinučių ir pranešimų istorija"
+
+#. module: analytic
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
+msgstr ""
+
+#. module: analytic
+#: view:account.analytic.account:0
+msgid "Contract Information"
+msgstr "Sutarties duomenys"
+
+#. module: analytic
+#: field:account.analytic.account,template_id:0
+#: selection:account.analytic.account,type:0
+msgid "Template of Contract"
+msgstr "Sutarties šablonas"
+
+#. module: analytic
+#: field:account.analytic.account,message_summary:0
+msgid "Summary"
+msgstr "Santrauka"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Prepaid Service Units"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Kreditas"
+
+#. module: analytic
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to "
+"use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage "
+"the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with "
+"default data that you can reuse easily."
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Atšauktas"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Analytic View"
+msgstr "Analitinė apžvalga"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Balansas"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Name"
+msgstr "Pilnas pavadinimas"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "To Renew"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Kiekis"
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Reference"
+msgstr "Numeris"
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:160
+#, python-format
+msgid "Error!"
+msgstr "Klaida!"
+
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract closed"
+msgstr ""
+
+#. module: analytic
+#: model:res.groups,name:analytic.group_analytic_accounting
+msgid "Analytic Accounting"
+msgstr "Analitinė apskaita"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Suma"
+
+#. module: analytic
+#: view:account.analytic.account:0
+#: selection:account.analytic.account,type:0
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analitinė sąskaita"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Currency"
+msgstr "Valiuta"
+
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Contract opened"
+msgstr ""
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:262
+#, python-format
+msgid "Warning"
+msgstr "Įspėjimas"
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Type of Account"
+msgstr "Sąskaitos tipas"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Start Date"
+msgstr "Pradžios data"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "Analitiniai įrašai"
=== renamed file 'analytic/i18n/lt.po' => 'analytic/i18n/lt.po.moved'
=== modified file 'anonymization/i18n/de.po'
--- anonymization/i18n/de.po 2013-04-05 11:10:48 +0000
+++ anonymization/i18n/de.po 2013-05-08 15:44:19 +0000
@@ -7,15 +7,27 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2012-12-18 06:59+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-21 19:08+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: German <de@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:49+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -50,6 +62,9 @@
"are anonymized, while some fields are not anonymized. You should try to "
"solve this problem before trying to create, write or delete fields."
msgstr ""
+"Die Datenbank Anonymisierung ist aktuell in einem Beta Stadium. Einige "
+"Felder werden korrekt anonymisiert, andere hingegen nicht. Sie sollten das "
+"Problem vor einer weiteren Bearbeitung oder Erstellung von Feldern lösen."
#. module: anonymization
#: field:ir.model.fields.anonymization,field_name:0
@@ -65,7 +80,7 @@
#. module: anonymization
#: selection:ir.model.fields.anonymization,state:0
msgid "New"
-msgstr ""
+msgstr "Neu"
#. module: anonymization
#: field:ir.model.fields.anonymize.wizard,file_import:0
@@ -84,6 +99,7 @@
"Before executing the anonymization process, you should make a backup of your "
"database."
msgstr ""
+"Vor der Anonymisierung der Datenbank sollten Sie ein Backup erstellen."
#. module: anonymization
#: field:ir.model.fields.anonymization.history,state:0
@@ -128,7 +144,7 @@
#: code:addons/anonymization/anonymization.py:448
#, python-format
msgid "Anonymized value is None. This cannot happens."
-msgstr ""
+msgstr "Es wurde keine Eintrag anonymisiert. Bitte prüfen Sie dieses."
#. module: anonymization
#: field:ir.model.fields.anonymization.history,filepath:0
@@ -166,6 +182,8 @@
"Cannot anonymize fields of these types: binary, many2many, many2one, "
"one2many, reference."
msgstr ""
+"Folgende Felder können nicht anonymisiert werden: Binärfelder, many2many, "
+"many2one, one2many, Referenzen."
#. module: anonymization
#: view:ir.model.fields.anonymize.wizard:0
@@ -201,6 +219,8 @@
"It is not possible to reverse the anonymization process without supplying "
"the anonymization export file."
msgstr ""
+"Ohne die exportierte Datei ist es nicht möglich eine Anonymisierung "
+"rückgängig zu machen."
#. module: anonymization
#: field:ir.model.fields.anonymize.wizard,summary:0
@@ -221,6 +241,9 @@
"are anonymized, while some fields are not anonymized. You should try to "
"solve this problem before trying to do anything."
msgstr ""
+"Die Datenbank Anonymisierung ist aktuell in einem Beta Stadium. Einige "
+"Felder werden korrekt anonymisiert, andere hingegen nicht. Sie sollten das "
+"Problem vor einer weiteren Bearbeitung oder Erstellung von Feldern lösen."
#. module: anonymization
#: selection:ir.model.fields.anonymize.wizard,state:0
@@ -267,13 +290,16 @@
"are anonymized, while some fields are not anonymized. You should try to "
"solve this problem before trying to do anything else."
msgstr ""
+"Die Datenbank Anonymisierung ist aktuell in einem Beta Stadium. Einige "
+"Felder werden korrekt anonymisiert, andere hingegen nicht. Sie sollten das "
+"Problem vor einer weiteren Bearbeitung oder Erstellung von Feldern lösen."
#. module: anonymization
#: code:addons/anonymization/anonymization.py:389
#: code:addons/anonymization/anonymization.py:448
#, python-format
msgid "Error !"
-msgstr ""
+msgstr "Fehler !"
#. module: anonymization
#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
@@ -306,6 +332,8 @@
#, python-format
msgid "The database is currently anonymized, you cannot anonymize it again."
msgstr ""
+"Die Datenbank ist bereits anonymisiert. Dieses kann nicht noch einmal "
+"erfolgen."
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,state:0
=== modified file 'audittrail/i18n/tr.po'
--- audittrail/i18n/tr.po 2013-04-05 11:10:48 +0000
+++ audittrail/i18n/tr.po 2013-05-08 15:44:19 +0000
@@ -4,17 +4,31 @@
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2010-09-09 07:16+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@xxxxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-05-02 10:18+0000\n"
+"Last-Translator: Ediz Duman <neps1192@xxxxxxxxx>\n"
+"Language-Team: Turkish <tr@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:32+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-03 06:29+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+>>>>>>> MERGE-SOURCE
#. module: audittrail
#: view:audittrail.log:0
@@ -49,7 +63,7 @@
#. module: audittrail
#: view:audittrail.rule:0
msgid "Subscribed Rule"
-msgstr ""
+msgstr "Abone Kural"
#. module: audittrail
#: view:audittrail.rule:0
@@ -103,6 +117,8 @@
"Select this if you want to keep track of read/open on any record of the "
"object of this rule"
msgstr ""
+"Bu kuralın nesnenin herhangi bir kayıt üzerinde açık okuma / takip etmek "
+"istiyorsanız bunu seçin"
#. module: audittrail
#: field:audittrail.log,method:0
@@ -112,22 +128,22 @@
#. module: audittrail
#: field:audittrail.view.log,from:0
msgid "Log From"
-msgstr ""
+msgstr "Günlüğünden"
#. module: audittrail
#: field:audittrail.log.line,log:0
msgid "Log ID"
-msgstr ""
+msgstr "Günlük ID"
#. module: audittrail
#: field:audittrail.log,res_id:0
msgid "Resource Id"
-msgstr ""
+msgstr "Kaynak Id"
#. module: audittrail
#: help:audittrail.rule,user_id:0
msgid "if User is not added then it will applicable for all users"
-msgstr ""
+msgstr "Kullanıcı ilave değilse o zaman tüm kullanıcılar için geçerli olacak"
#. module: audittrail
#: help:audittrail.rule,log_workflow:0
@@ -135,6 +151,8 @@
"Select this if you want to keep track of workflow on any record of the "
"object of this rule"
msgstr ""
+"Bu kuralın nesnenin herhangi bir kayıt iş akışı takip etmek istiyorsanız "
+"bunu seçin"
#. module: audittrail
#: field:audittrail.rule,user_id:0
@@ -144,7 +162,7 @@
#. module: audittrail
#: view:audittrail.log:0
msgid "Log Lines"
-msgstr ""
+msgstr "Günlük Saırları"
#. module: audittrail
#: view:audittrail.log:0
@@ -156,38 +174,38 @@
#. module: audittrail
#: view:audittrail.rule:0
msgid "AuditTrail Rule"
-msgstr ""
+msgstr "Denetim Takip Kural"
#. module: audittrail
#: field:audittrail.view.log,to:0
msgid "Log To"
-msgstr ""
+msgstr "için Günlük"
#. module: audittrail
#: view:audittrail.log:0
msgid "New Value Text: "
-msgstr ""
+msgstr "Yeni Değer Yazı: "
#. module: audittrail
#: view:audittrail.rule:0
msgid "Search Audittrail Rule"
-msgstr ""
+msgstr "Arama Denetim Takip Kuralı"
#. module: audittrail
#: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
msgid "Audit Rules"
-msgstr ""
+msgstr "Denetim Kuralları"
#. module: audittrail
#: view:audittrail.log:0
msgid "Old Value : "
-msgstr ""
+msgstr "Eski Değer: "
#. module: audittrail
#: field:audittrail.log,name:0
msgid "Resource Name"
-msgstr ""
+msgstr "Kaynak Adı"
#. module: audittrail
#: view:audittrail.log:0
@@ -201,42 +219,46 @@
"Select this if you want to keep track of modification on any record of the "
"object of this rule"
msgstr ""
+"Bu kuralın nesnenin herhangi bir kayıt üzerinde değişiklik izlemek "
+"istiyorsanız bunu seçin"
#. module: audittrail
#: view:audittrail.rule:0
msgid "AuditTrail Rules"
msgstr ""
+"Bu kuralın nesnenin herhangi bir kayıt üzerinde değişiklik izlemek "
+"istiyorsanız bunu seçin"
#. module: audittrail
#: help:audittrail.rule,object_id:0
msgid "Select object for which you want to generate log."
-msgstr ""
+msgstr "Günlük oluşturmak istediğiniz nesneyi seçin."
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_audit
msgid "Audit"
-msgstr ""
+msgstr "Denetim"
#. module: audittrail
#: field:audittrail.rule,log_workflow:0
msgid "Log Workflow"
-msgstr ""
+msgstr "İş Akışı Günlüğü"
#. module: audittrail
#: field:audittrail.rule,log_read:0
msgid "Log Reads"
-msgstr ""
+msgstr "Günlük Okumaları"
#. module: audittrail
#: code:addons/audittrail/audittrail.py:77
#, python-format
msgid "Change audittrail depends -- Setting rule as DRAFT"
-msgstr ""
+msgstr "Değişim denetim izi bağlıdır - TASLAK olarak ayarlama kural"
#. module: audittrail
#: field:audittrail.log,line_ids:0
msgid "Log lines"
-msgstr ""
+msgstr "Günlük satırları"
#. module: audittrail
#: field:audittrail.log.line,field_id:0
@@ -246,7 +268,7 @@
#. module: audittrail
#: field:audittrail.rule,log_create:0
msgid "Log Creates"
-msgstr ""
+msgstr "Günlük Oluştur"
#. module: audittrail
#: help:audittrail.rule,log_unlink:0
@@ -254,6 +276,8 @@
"Select this if you want to keep track of deletion on any record of the "
"object of this rule"
msgstr ""
+"Bu kuralın nesnenin herhangi bir kayıt silinmek takip etmek istiyorsanız "
+"bunu seçin"
#. module: audittrail
#: view:audittrail.log:0
@@ -264,17 +288,19 @@
#. module: audittrail
#: field:audittrail.rule,action_id:0
msgid "Action ID"
-msgstr ""
+msgstr "İşlem ID"
#. module: audittrail
#: view:audittrail.rule:0
msgid "Users (if User is not added then it will applicable for all users)"
msgstr ""
+"Kullanıcılar (Kullanıcı ilave değilse o zaman tüm kullanıcılar için geçerli "
+"olacak)"
#. module: audittrail
#: view:audittrail.rule:0
msgid "UnSubscribe"
-msgstr ""
+msgstr "ÜyeliktenÇık"
#. module: audittrail
#: sql_constraint:audittrail.rule:0
@@ -286,38 +312,38 @@
#. module: audittrail
#: field:audittrail.rule,log_unlink:0
msgid "Log Deletes"
-msgstr ""
+msgstr "Günlük Sil"
#. module: audittrail
#: view:audittrail.log:0
#: view:audittrail.rule:0
msgid "Model"
-msgstr ""
+msgstr "Model"
#. module: audittrail
#: field:audittrail.log.line,field_description:0
msgid "Field Description"
-msgstr ""
+msgstr "Alan Açıklaması"
#. module: audittrail
#: view:audittrail.log:0
msgid "Search Audittrail Log"
-msgstr ""
+msgstr "Arama Denetim Takip Günlük"
#. module: audittrail
#: field:audittrail.rule,log_write:0
msgid "Log Writes"
-msgstr ""
+msgstr "Günlük Yazıları"
#. module: audittrail
#: view:audittrail.view.log:0
msgid "Open Logs"
-msgstr ""
+msgstr "Günlükleri Aç"
#. module: audittrail
#: field:audittrail.log.line,new_value_text:0
msgid "New value Text"
-msgstr ""
+msgstr "Yeni değeri Yaz"
#. module: audittrail
#: field:audittrail.rule,name:0
@@ -327,45 +353,45 @@
#. module: audittrail
#: field:audittrail.log.line,new_value:0
msgid "New Value"
-msgstr ""
+msgstr "Yeni Değer"
#. module: audittrail
#: code:addons/audittrail/audittrail.py:223
#, python-format
msgid "'%s' field does not exist in '%s' model"
-msgstr ""
+msgstr "'% s' alan '% s' modelinde yok"
#. module: audittrail
#: view:audittrail.log:0
msgid "AuditTrail Logs"
-msgstr ""
+msgstr "Denetim Takip Günlükleri"
#. module: audittrail
#: view:audittrail.rule:0
msgid "Draft Rule"
-msgstr ""
+msgstr "Taslak Kural"
#. module: audittrail
#: view:audittrail.log:0
#: model:ir.model,name:audittrail.model_audittrail_log
msgid "Audittrail Log"
-msgstr ""
+msgstr "Denetim Takip Günlüğü"
#. module: audittrail
#: help:audittrail.rule,log_action:0
msgid ""
"Select this if you want to keep track of actions on the object of this rule"
-msgstr ""
+msgstr "Bu kuralın nesne eylemleri takip etmek istiyorsanız bunu seçin"
#. module: audittrail
#: view:audittrail.log:0
msgid "New Value : "
-msgstr ""
+msgstr "Yeni Değer: "
#. module: audittrail
#: field:audittrail.log.line,old_value_text:0
msgid "Old value Text"
-msgstr ""
+msgstr "Eski değer Yazı"
#. module: audittrail
#: view:audittrail.view.log:0
@@ -375,22 +401,22 @@
#. module: audittrail
#: model:ir.model,name:audittrail.model_audittrail_view_log
msgid "View Log"
-msgstr ""
+msgstr "Günlüğü Göster"
#. module: audittrail
#: model:ir.model,name:audittrail.model_audittrail_log_line
msgid "Log Line"
-msgstr ""
+msgstr "Günlük Satırı"
#. module: audittrail
#: view:audittrail.view.log:0
msgid "or"
-msgstr ""
+msgstr "veya"
#. module: audittrail
#: field:audittrail.rule,log_action:0
msgid "Log Action"
-msgstr ""
+msgstr "Günlük İşlemei"
#. module: audittrail
#: help:audittrail.rule,log_create:0
@@ -398,6 +424,7 @@
"Select this if you want to keep track of creation on any record of the "
"object of this rule"
msgstr ""
+<<<<<<< TREE
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
@@ -416,3 +443,7 @@
#~ msgid "Audit Trail"
#~ msgstr "Denetim Yolu"
+=======
+"Bu kuralın nesnenin herhangi bir kayıt oluşturma takip etmek istiyorsanız "
+"bunu seçin"
+>>>>>>> MERGE-SOURCE
=== added file 'auth_crypt/i18n/lt.po'
--- auth_crypt/i18n/lt.po 1970-01-01 00:00:00 +0000
+++ auth_crypt/i18n/lt.po 2013-05-08 15:44:19 +0000
@@ -0,0 +1,28 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-24 18:24+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@xxxxxxxxxx>\n"
+"Language-Team: Lithuanian <lt@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr "Užšifruotas slaptažodis"
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
+msgid "Users"
+msgstr "Naudotojai"
=== renamed file 'auth_crypt/i18n/lt.po' => 'auth_crypt/i18n/lt.po.moved'
=== added file 'auth_oauth_signup/i18n/lt.po'
--- auth_oauth_signup/i18n/lt.po 1970-01-01 00:00:00 +0000
+++ auth_oauth_signup/i18n/lt.po 2013-05-08 15:44:19 +0000
@@ -0,0 +1,23 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-24 18:21+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@xxxxxxxxxx>\n"
+"Language-Team: Lithuanian <lt@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: auth_oauth_signup
+#: model:ir.model,name:auth_oauth_signup.model_res_users
+msgid "Users"
+msgstr "Naudotojai"
=== renamed file 'auth_oauth_signup/i18n/lt.po' => 'auth_oauth_signup/i18n/lt.po.moved'
=== added file 'auth_signup/i18n/lt.po'
--- auth_signup/i18n/lt.po 1970-01-01 00:00:00 +0000
+++ auth_signup/i18n/lt.po 2013-05-08 15:44:19 +0000
@@ -0,0 +1,307 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# Giedrius Slavinskas <giedrius@xxxxxxxxxx>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-30 16:26+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@xxxxxxxxxx>\n"
+"Language-Team: Lithuanian <lt@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-05-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:16
+#, python-format
+msgid "Confirm Password"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up."
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:265
+#, python-format
+msgid "Cannot send email: user has no email address."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:28
+#, python-format
+msgid "Reset password"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.reset_password_email
+msgid "Password reset"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#, python-format
+msgid "Please enter a password and confirm it."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:26
+#, python-format
+msgid "Sign Up"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "New"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+msgstr "Būsena"
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.reset_password_email
+msgid ""
+"\n"
+"<p>A password reset was requested for the OpenERP account linked to this "
+"email.</p>\n"
+"\n"
+"<p>You may change your password by following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you do not expect this, you can safely ignore this email.</p>"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#, python-format
+msgid "Please enter a name."
+msgstr ""
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr "Naudotojai"
+
+#. module: auth_signup
+#: field:res.partner,signup_url:0
+msgid "Signup URL"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,body_html:auth_signup.set_password_email
+msgid ""
+"\n"
+" \n"
+" <p>\n"
+" ${object.name},\n"
+" </p>\n"
+" <p>\n"
+" You have been invited to connect to "
+"\"${object.company_id.name}\" in order to get access to your documents in "
+"OpenERP.\n"
+" </p>\n"
+" <p>\n"
+" To accept the invitation, click on the following "
+"link:\n"
+" </p>\n"
+" <ul>\n"
+" <li><a href=\"${object.signup_url}\">Accept "
+"invitation to \"${object.company_id.name}\"</a></li>\n"
+" </ul>\n"
+" <p>\n"
+" Thanks,\n"
+" </p>\n"
+" <pre>\n"
+"--\n"
+"${object.company_id.name or ''}\n"
+"${object.company_id.email or ''}\n"
+"${object.company_id.phone or ''}\n"
+" </pre>\n"
+" \n"
+" "
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#, python-format
+msgid "Please enter a username."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Active"
+msgstr ""
+
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:269
+#, python-format
+msgid ""
+"Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:174
+#, python-format
+msgid "An email has been sent with credentials to reset your password"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username"
+msgstr "Naudotojo vardas"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
+#, python-format
+msgid "Name"
+msgstr "Pavadinimas"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#, python-format
+msgid "Please enter a username or email address."
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
+#, python-format
+msgid "Username (Email)"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr ""
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_reset_password:0
+msgid "This allows users to trigger a password reset from the Login page."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
+#, python-format
+msgid "Log in"
+msgstr "Prisijungti"
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:108
+#: code:addons/auth_signup/static/src/js/auth_signup.js:111
+#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:167
+#: code:addons/auth_signup/static/src/js/auth_signup.js:170
+#, python-format
+msgid "Login"
+msgstr "Prisijungimas"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#, python-format
+msgid "Invalid signup token"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#, python-format
+msgid "Passwords do not match; please retype them."
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/js/auth_signup.js:108
+#: code:addons/auth_signup/static/src/js/auth_signup.js:167
+#, python-format
+msgid "No database selected !"
+msgstr ""
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_reset_password:0
+msgid "Enable password reset from Login page"
+msgstr ""
+
+#. module: auth_signup
+#: model:email.template,subject:auth_signup.set_password_email
+msgid "${object.company_id.name} invitation to connect on OpenERP"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
+#, python-format
+msgid "Back to Login"
+msgstr "Grįžti į prisijungimo puslapį"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_partner
+msgid "Partner"
+msgstr "Partneris"
+
+#. module: auth_signup
+#: view:res.users:0
+msgid "Send reset password instructions by email"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_token:0
+msgid "Signup Token"
+msgstr ""
=== renamed file 'auth_signup/i18n/lt.po' => 'auth_signup/i18n/lt.po.moved'
=== modified file 'base_action_rule/i18n/lt.po'
--- base_action_rule/i18n/lt.po 2013-04-05 11:10:48 +0000
+++ base_action_rule/i18n/lt.po 2013-05-08 15:44:19 +0000
@@ -1,26 +1,41 @@
# Lithuanian 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.
+<<<<<<< TREE
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+=======
+# Giedrius Slavinskas <giedrius@xxxxxxxxxx>, 2012.
+>>>>>>> MERGE-SOURCE
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2012-05-10 17:58+0000\n"
"Last-Translator: Paulius Sladkevičius <paulius@xxxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-30 16:26+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@xxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Lithuanian <lt@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: base_action_rule
#: selection:base.action.rule.lead.test,state:0
msgid "In Progress"
-msgstr ""
+msgstr "Vykdoma"
#. module: base_action_rule
#: view:base.action.rule:0
@@ -43,7 +58,7 @@
#. module: base_action_rule
#: field:base.action.rule.lead.test,user_id:0
msgid "Responsible"
-msgstr "Atsakingas"
+msgstr "Atsakingas asmuo"
#. module: base_action_rule
#: help:base.action.rule,server_action_ids:0
@@ -76,12 +91,12 @@
#. module: base_action_rule
#: selection:base.action.rule.lead.test,state:0
msgid "Closed"
-msgstr ""
+msgstr "Uždaryta"
#. module: base_action_rule
#: selection:base.action.rule.lead.test,state:0
msgid "New"
-msgstr ""
+msgstr "Naujas"
#. module: base_action_rule
#: field:base.action.rule,trg_date_range:0
@@ -96,12 +111,12 @@
#. module: base_action_rule
#: selection:base.action.rule.lead.test,state:0
msgid "Pending"
-msgstr ""
+msgstr "Laukianti"
#. module: base_action_rule
#: field:base.action.rule.lead.test,state:0
msgid "Status"
-msgstr ""
+msgstr "Būsena"
#. module: base_action_rule
#: field:base.action.rule,filter_pre_id:0
@@ -191,7 +206,7 @@
#. module: base_action_rule
#: help:base.action.rule,sequence:0
msgid "Gives the sequence order when displaying a list of rules."
-msgstr "Suteikia eilės tvarką, pagal kurį atvaizduojamas taisyklių sąrašas"
+msgstr "Eilės tvarka, pagal kurią išdėstomas taisyklių sąrašas."
#. module: base_action_rule
#: selection:base.action.rule,trg_date_range_type:0
@@ -226,12 +241,12 @@
#. module: base_action_rule
#: selection:base.action.rule.lead.test,state:0
msgid "Cancelled"
-msgstr ""
+msgstr "Atšauktas"
#. module: base_action_rule
#: field:base.action.rule,model:0
msgid "Model"
-msgstr ""
+msgstr "Modelis"
#. module: base_action_rule
#: field:base.action.rule,last_run:0
@@ -289,7 +304,7 @@
#. module: base_action_rule
#: field:base.action.rule.lead.test,date_action_last:0
msgid "Last Action"
-msgstr ""
+msgstr "Paskutinis veiksmas"
#. module: base_action_rule
#: field:base.action.rule.lead.test,partner_id:0
@@ -299,7 +314,7 @@
#. module: base_action_rule
#: field:base.action.rule,trg_date_id:0
msgid "Trigger Date"
-msgstr "Įvykio data"
+msgstr "Iššaukimo data"
#. module: base_action_rule
#: view:base.action.rule:0
@@ -310,6 +325,7 @@
#. module: base_action_rule
#: field:base.action.rule.lead.test,name:0
msgid "Subject"
+<<<<<<< TREE
msgstr ""
#~ msgid "Object"
@@ -573,3 +589,6 @@
#~ "Delsa po iškvietimo datos,nurodo, kad galite įterpti neigiamą skaičių. Jei "
#~ "Jums reikia delsos prieš iškvietimo datą, pavyzdžiui siųsti priminimą 15 "
#~ "min. prieš susitikimą."
+=======
+msgstr "Tema"
+>>>>>>> MERGE-SOURCE
=== modified file 'base_action_rule/i18n/nl.po'
--- base_action_rule/i18n/nl.po 2013-04-05 11:10:48 +0000
+++ base_action_rule/i18n/nl.po 2013-05-08 15:44:19 +0000
@@ -7,15 +7,25 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2012-12-12 20:36+0000\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-30 12:18+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
"Language-Team: Dutch <nl@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:46+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: base_action_rule
#: selection:base.action.rule.lead.test,state:0
@@ -302,13 +312,13 @@
"<p class=\"oe_view_nocontent_create\">\n"
" Klik om een nieuwe automatische actie regel in te stellen\n"
" </p><p>\n"
-" gebruik automatische acties, om automatisch acties aan te "
+" Gebruik automatische acties, om automatisch acties aan te "
"roepen\n"
" voor verschillende schermen. Bijvoorbeeld: Een lead "
"aangemaakt door\n"
" een specifieke gebruiker kan automatisch worden toegewezen "
"aan een\n"
-" specifiek verkoopteam. Of een prospect welke nog steeds d "
+" specifiek verkoopteam. Of een prospect welke nog steeds de "
"status 'in afwachting'\n"
" heeft na 14 dagen activeert een herinnering e-mail.\n"
" </p>\n"
=== modified file 'base_calendar/i18n/es_MX.po'
--- base_calendar/i18n/es_MX.po 2013-04-25 05:20:35 +0000
+++ base_calendar/i18n/es_MX.po 2013-05-08 15:44:19 +0000
@@ -7,15 +7,27 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2013-04-24 15:25+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Spanish (Mexico) <es_MX@xxxxxx>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-24 15:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-04-25 05:20+0000\n"
"X-Generator: Launchpad (build 16580)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-25 06:05+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: base_calendar
#: selection:calendar.alarm,trigger_related:0
@@ -97,6 +109,7 @@
#: selection:calendar.todo,byday:0
#: selection:crm.meeting,byday:0
msgid "Fourth"
+<<<<<<< TREE
msgstr ""
#. module: base_calendar
@@ -105,6 +118,11 @@
msgstr ""
#. module: base_calendar
+=======
+msgstr ""
+
+#. module: base_calendar
+>>>>>>> MERGE-SOURCE
#: field:calendar.event,day:0
#: selection:calendar.event,select1:0
#: field:calendar.todo,day:0
@@ -626,17 +644,36 @@
#. module: base_calendar
#: selection:calendar.event,class:0
#: selection:calendar.todo,class:0
-#: selection:crm.meeting,class:0
-msgid "Public for Employees"
-msgstr ""
-
-#. module: base_calendar
-#: view:crm.meeting:0
-msgid "hours"
-msgstr ""
-
-#. module: base_calendar
-#: field:calendar.attendee,partner_id:0
+<<<<<<< TREE
+#: selection:crm.meeting,class:0
+msgid "Public for Employees"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "hours"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,partner_id:0
+=======
+#: selection:crm.meeting,class:0
+msgid "Public for Employees"
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "hours"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Cancel Event"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,partner_id:0
+>>>>>>> MERGE-SOURCE
msgid "Contact"
msgstr ""
@@ -1154,6 +1191,7 @@
#: help:calendar.todo,interval:0
#: help:crm.meeting,interval:0
msgid "Repeat every (Days/Week/Month/Year)"
+<<<<<<< TREE
msgstr ""
#. module: base_calendar
@@ -1180,6 +1218,29 @@
" </p>\n"
" "
msgstr ""
+=======
+msgstr ""
+
+#. module: base_calendar
+#: view:crm.meeting:0
+msgid "All Day?"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,help:base_calendar.action_crm_meeting
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Click to schedule a new meeting.\n"
+" </p><p>\n"
+" The calendar is shared between employees and fully integrated "
+"with\n"
+" other applications such as the employee holidays or the "
+"business\n"
+" opportunities.\n"
+" </p>\n"
+" "
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: base_calendar
#: help:calendar.alarm,description:0
=== modified file 'base_calendar/i18n/lt.po'
--- base_calendar/i18n/lt.po 2013-04-05 11:10:48 +0000
+++ base_calendar/i18n/lt.po 2013-05-08 15:44:19 +0000
@@ -1,27 +1,42 @@
# Lithuanian 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.
+<<<<<<< TREE
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+=======
+# Giedrius Slavinskas <giedrius@xxxxxxxxxx>, 2012.
+>>>>>>> MERGE-SOURCE
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2012-05-10 18:21+0000\n"
"Last-Translator: Paulius Sladkevičius <paulius@xxxxxxxxxx>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-30 16:26+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@xxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Lithuanian <lt@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:45+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: base_calendar
#: selection:calendar.alarm,trigger_related:0
#: selection:res.alarm,trigger_related:0
msgid "The event starts"
-msgstr ""
+msgstr "Įvykio pradžia"
#. module: base_calendar
#: view:calendar.event:0
@@ -36,13 +51,15 @@
"This property defines the list of date/time exceptions for a recurring "
"calendar component."
msgstr ""
+"Šis nustatymas apibrėžia sąrašą datų/laikų išimčių pasikartojantiems "
+"įvykiams kalendoriuje."
#. module: base_calendar
#: selection:calendar.event,rrule_type:0
#: selection:calendar.todo,rrule_type:0
#: selection:crm.meeting,rrule_type:0
msgid "Week(s)"
-msgstr ""
+msgstr "Savaitė (-ės)"
#. module: base_calendar
#: field:calendar.event,we:0
@@ -61,12 +78,12 @@
#: help:calendar.todo,recurrency:0
#: help:crm.meeting,recurrency:0
msgid "Recurrent Meeting"
-msgstr ""
+msgstr "Pasikartojantis susitikimas"
#. module: base_calendar
#: model:crm.meeting.type,name:base_calendar.categ_meet5
msgid "Feedback Meeting"
-msgstr ""
+msgstr "Susitikimas dėl atsakymo"
#. module: base_calendar
#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
@@ -90,7 +107,7 @@
#: view:calendar.event:0
#: view:crm.meeting:0
msgid "Invitation details"
-msgstr ""
+msgstr "Pakvietimo informacija"
#. module: base_calendar
#: selection:calendar.event,byday:0
@@ -143,7 +160,7 @@
#: view:crm.meeting:0
#: field:crm.meeting,message_unread:0
msgid "Unread Messages"
-msgstr ""
+msgstr "Neperžiūrėtos žinutės"
#. module: base_calendar
#: selection:calendar.event,week_list:0
@@ -157,7 +174,7 @@
#: field:calendar.todo,allday:0
#: field:crm.meeting,allday:0
msgid "All Day"
-msgstr "Visa diena"
+msgstr "Visą dieną"
#. module: base_calendar
#: field:calendar.event,vtimezone:0
@@ -177,7 +194,7 @@
#. module: base_calendar
#: help:crm.meeting,message_unread:0
msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Jeigu pažymėta, naujos žinutės reikalaus jūsų dėmesio."
#. module: base_calendar
#: help:calendar.attendee,rsvp:0
@@ -217,7 +234,7 @@
#: selection:calendar.alarm,trigger_related:0
#: selection:res.alarm,trigger_related:0
msgid "The event ends"
-msgstr ""
+msgstr "Įvykio pabaiga"
#. module: base_calendar
#: selection:calendar.event,byday:0
@@ -229,12 +246,12 @@
#. module: base_calendar
#: help:crm.meeting,message_ids:0
msgid "Messages and communication history"
-msgstr ""
+msgstr "Žinučių ir pranešimų istorija"
#. module: base_calendar
#: field:crm.meeting,message_ids:0
msgid "Messages"
-msgstr ""
+msgstr "Pranešimai"
#. module: base_calendar
#: selection:calendar.alarm,trigger_interval:0
@@ -245,7 +262,7 @@
#. module: base_calendar
#: view:calendar.event:0
msgid "To"
-msgstr ""
+msgstr "Iki"
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:1260
@@ -256,12 +273,12 @@
#. module: base_calendar
#: selection:calendar.attendee,role:0
msgid "Chair Person"
-msgstr ""
+msgstr "Pirmininkas"
#. module: base_calendar
#: view:crm.meeting:0
msgid "My Meetings"
-msgstr ""
+msgstr "Mano susitikimai"
#. module: base_calendar
#: selection:calendar.alarm,action:0
@@ -300,17 +317,17 @@
#. module: base_calendar
#: view:crm.meeting:0
msgid "Mail To"
-msgstr ""
+msgstr "Siųsti kam"
#. module: base_calendar
#: field:crm.meeting,name:0
msgid "Meeting Subject"
-msgstr ""
+msgstr "Susitikimo tema"
#. module: base_calendar
#: view:calendar.event:0
msgid "End of Recurrence"
-msgstr ""
+msgstr "Pasikartojimo pabaiga"
#. module: base_calendar
#: view:calendar.event:0
@@ -320,7 +337,7 @@
#. module: base_calendar
#: view:calendar.event:0
msgid "Recurrency Option"
-msgstr ""
+msgstr "Pasikartojimo parinktys"
#. module: base_calendar
#: view:calendar.event:0
@@ -331,7 +348,7 @@
#: view:crm.meeting:0
#: model:ir.actions.act_window,name:base_calendar.action_crm_meeting
msgid "Meetings"
-msgstr ""
+msgstr "Susitikimai"
#. module: base_calendar
#: field:calendar.event,recurrent_id_date:0
@@ -349,7 +366,7 @@
#. module: base_calendar
#: selection:calendar.attendee,role:0
msgid "Optional Participation"
-msgstr ""
+msgstr "Nebūtinas dalyvavimas"
#. module: base_calendar
#: help:crm.meeting,message_summary:0
@@ -357,6 +374,8 @@
"Holds the Chatter summary (number of messages, ...). This summary is "
"directly in html format in order to be inserted in kanban views."
msgstr ""
+"Saugo pokalbių suvestinę (žinučių skaičius, ...). Ši apžvalga saugoma html "
+"formatu, kad būtų galima įterpti į kanban rodinius."
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:399
@@ -376,6 +395,8 @@
"If the active field is set to true, it will allow you to hide the "
"event alarm information without removing it."
msgstr ""
+"Nebenaudojama įvykių priminimų informacija gali būti paslėpta, vietoj to, "
+"kad būtų pašalinta."
#. module: base_calendar
#: field:calendar.alarm,repeat:0
@@ -402,7 +423,7 @@
#: field:calendar.todo,user_id:0
#: field:crm.meeting,user_id:0
msgid "Responsible"
-msgstr "Atsakingas"
+msgstr "Atsakingas asmuo"
#. module: base_calendar
#: view:calendar.event:0
@@ -461,7 +482,7 @@
#. module: base_calendar
#: view:res.alarm:0
msgid "Reminder details"
-msgstr ""
+msgstr "Priminimo nustatymai"
#. module: base_calendar
#: field:calendar.attendee,parent_ids:0
@@ -473,12 +494,12 @@
#: selection:calendar.todo,select1:0
#: selection:crm.meeting,select1:0
msgid "Day of month"
-msgstr ""
+msgstr "Mėnesio diena"
#. module: base_calendar
#: field:crm.meeting,message_follower_ids:0
msgid "Followers"
-msgstr ""
+msgstr "Prenumeratoriai"
#. module: base_calendar
#: field:calendar.event,location:0
@@ -490,7 +511,7 @@
#. module: base_calendar
#: selection:calendar.attendee,role:0
msgid "Participation required"
-msgstr ""
+msgstr "Būtinas dalyvavimas"
#. module: base_calendar
#: view:calendar.event:0
@@ -530,21 +551,21 @@
#. module: base_calendar
#: field:crm.meeting,create_date:0
msgid "Creation Date"
-msgstr ""
+msgstr "Sukūrimo data"
#. module: base_calendar
#: view:crm.meeting:0
#: model:ir.model,name:base_calendar.model_crm_meeting
#: model:res.request.link,name:base_calendar.request_link_meeting
msgid "Meeting"
-msgstr ""
+msgstr "Susitikimas"
#. 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ėnesis (-iai)"
#. module: base_calendar
#: view:calendar.event:0
@@ -590,7 +611,7 @@
#. module: base_calendar
#: view:crm.meeting:0
msgid "Meeting Details"
-msgstr ""
+msgstr "Susitikimo informacija"
#. module: base_calendar
#: field:calendar.attendee,child_ids:0
@@ -608,14 +629,14 @@
#: selection:calendar.todo,rrule_type:0
#: selection:crm.meeting,rrule_type:0
msgid "Year(s)"
-msgstr ""
+msgstr "Metai"
#. 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 "Susitikimo tipai"
#. module: base_calendar
#: field:calendar.event,create_date:0
@@ -628,7 +649,7 @@
#: selection:calendar.todo,class:0
#: selection:crm.meeting,class:0
msgid "Public for Employees"
-msgstr ""
+msgstr "Viešas darbuotojams"
#. module: base_calendar
#: view:crm.meeting:0
@@ -636,6 +657,14 @@
msgstr ""
#. module: base_calendar
+<<<<<<< TREE
+=======
+#: view:calendar.event:0
+msgid "Cancel Event"
+msgstr "Atšaukti įvykį"
+
+#. module: base_calendar
+>>>>>>> MERGE-SOURCE
#: field:calendar.attendee,partner_id:0
msgid "Contact"
msgstr "Kontaktas"
@@ -650,12 +679,12 @@
#: field:calendar.todo,end_date:0
#: field:crm.meeting,end_date:0
msgid "Repeat Until"
-msgstr ""
+msgstr "Kartoti iki"
#. module: base_calendar
#: view:crm.meeting:0
msgid "Options"
-msgstr ""
+msgstr "Pasirinkimai"
#. module: base_calendar
#: selection:calendar.event,byday:0
@@ -694,7 +723,7 @@
#. module: base_calendar
#: field:crm.meeting,categ_ids:0
msgid "Tags"
-msgstr ""
+msgstr "Žymos"
#. module: base_calendar
#: view:calendar.event:0
@@ -711,7 +740,7 @@
#: help:calendar.todo,count:0
#: help:crm.meeting,count:0
msgid "Repeat x times"
-msgstr "Kartoti x kartų"
+msgstr "Kiek kartų kartoti"
#. module: base_calendar
#: field:calendar.alarm,user_id:0
@@ -723,12 +752,12 @@
#: help:calendar.todo,rrule_type:0
#: help:crm.meeting,rrule_type:0
msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "Nustatykite įvykiui intervalą, kada būtų automatiškai pakartojamas"
#. module: base_calendar
#: model:ir.ui.menu,name:base_calendar.mail_menu_calendar
msgid "Calendar"
-msgstr ""
+msgstr "Kalendorius"
#. module: base_calendar
#: field:calendar.attendee,cn:0
@@ -770,7 +799,7 @@
#: field:calendar.todo,class:0
#: field:crm.meeting,class:0
msgid "Privacy"
-msgstr "Privatumas"
+msgstr "Slaptumas"
#. module: base_calendar
#: model:ir.model,name:base_calendar.model_res_alarm
@@ -787,7 +816,7 @@
#. module: base_calendar
#: view:calendar.event:0
msgid "Invitation Detail"
-msgstr ""
+msgstr "Pakvietimo informacija"
#. module: base_calendar
#: field:calendar.attendee,member:0
@@ -806,7 +835,7 @@
#: field:calendar.todo,rrule:0
#: field:crm.meeting,rrule:0
msgid "Recurrent Rule"
-msgstr ""
+msgstr "Pasikartojimo taisyklė"
#. module: base_calendar
#: selection:calendar.alarm,state:0
@@ -821,12 +850,12 @@
#. module: base_calendar
#: field:crm.meeting,date_closed:0
msgid "Closed"
-msgstr ""
+msgstr "Uždaryta"
#. module: base_calendar
#: view:calendar.event:0
msgid "From"
-msgstr ""
+msgstr "Nuo"
#. module: base_calendar
#: view:calendar.event:0
@@ -841,12 +870,12 @@
#: selection:calendar.todo,end_type:0
#: selection:crm.meeting,end_type:0
msgid "Number of repetitions"
-msgstr ""
+msgstr "Pakartojimų skaičius"
#. module: base_calendar
#: model:crm.meeting.type,name:base_calendar.categ_meet2
msgid "Internal Meeting"
-msgstr ""
+msgstr "Vidinis susitikimas"
#. module: base_calendar
#: view:calendar.event:0
@@ -863,17 +892,17 @@
#: field:calendar.todo,state:0
#: field:crm.meeting,state:0
msgid "Status"
-msgstr ""
+msgstr "Būsena"
#. module: base_calendar
#: help:calendar.attendee,email:0
msgid "Email of Invited Person"
-msgstr ""
+msgstr "Pakviesto asmens el. paštas"
#. module: base_calendar
#: model:crm.meeting.type,name:base_calendar.categ_meet1
msgid "Customer Meeting"
-msgstr ""
+msgstr "Susitikimas su pirkėju"
#. module: base_calendar
#: help:calendar.attendee,dir:0
@@ -899,12 +928,12 @@
#. module: base_calendar
#: model:crm.meeting.type,name:base_calendar.categ_meet4
msgid "Open Discussion"
-msgstr ""
+msgstr "Atvira diskusija"
#. module: base_calendar
#: model:ir.model,name:base_calendar.model_ir_model
msgid "Models"
-msgstr ""
+msgstr "Modeliai"
#. module: base_calendar
#: selection:calendar.event,month_list:0
@@ -918,12 +947,12 @@
#: field:calendar.attendee,event_date:0
#: view:calendar.event:0
msgid "Event Date"
-msgstr ""
+msgstr "Įvykio data"
#. module: base_calendar
#: view:crm.meeting:0
msgid "Invitations"
-msgstr ""
+msgstr "Pakvietimai"
#. module: base_calendar
#: view:calendar.event:0
@@ -934,7 +963,7 @@
#. module: base_calendar
#: field:crm.meeting,write_date:0
msgid "Write Date"
-msgstr ""
+msgstr "Įrašymo data"
#. module: base_calendar
#: field:calendar.attendee,delegated_from:0
@@ -944,7 +973,7 @@
#. module: base_calendar
#: field:crm.meeting,message_is_follower:0
msgid "Is a Follower"
-msgstr ""
+msgstr "Ar prenumeratorius"
#. module: base_calendar
#: field:calendar.attendee,user_id:0
@@ -996,7 +1025,7 @@
#: selection:calendar.todo,state:0
#: view:crm.meeting:0
msgid "Uncertain"
-msgstr ""
+msgstr "Neaiškus"
#. module: base_calendar
#: constraint:calendar.event:0
@@ -1009,7 +1038,7 @@
#: field:calendar.alarm,trigger_occurs:0
#: field:res.alarm,trigger_occurs:0
msgid "Triggers"
-msgstr ""
+msgstr "Įvykdymas"
#. module: base_calendar
#: selection:calendar.event,month_list:0
@@ -1022,7 +1051,7 @@
#: field:calendar.alarm,trigger_related:0
#: field:res.alarm,trigger_related:0
msgid "Related to"
-msgstr "Susijęs su"
+msgstr "Susietas su"
#. module: base_calendar
#: field:calendar.alarm,trigger_interval:0
@@ -1080,7 +1109,7 @@
#. module: base_calendar
#: help:calendar.attendee,role:0
msgid "Participation role for the calendar user"
-msgstr ""
+msgstr "Pakviesto asmens vaidmuo susitikime"
#. module: base_calendar
#: field:calendar.attendee,delegated_to:0
@@ -1095,14 +1124,14 @@
#. module: base_calendar
#: view:crm.meeting:0
msgid "Starting at"
-msgstr ""
+msgstr "Pradžia"
#. module: base_calendar
#: selection:calendar.event,end_type:0
#: selection:calendar.todo,end_type:0
#: selection:crm.meeting,end_type:0
msgid "End date"
-msgstr ""
+msgstr "Pabaigos data"
#. module: base_calendar
#: view:calendar.event:0
@@ -1116,28 +1145,30 @@
"If the active field is set to true, it will allow you to hide the event "
"alarm information without removing it."
msgstr ""
+"Nebenaudojama įvykių priminimų informacija gali būti paslėpta, vietoj to, "
+"kad būtų pašalinta."
#. module: base_calendar
#: field:calendar.event,end_type:0
#: field:calendar.todo,end_type:0
#: field:crm.meeting,end_type:0
msgid "Recurrence Termination"
-msgstr ""
+msgstr "Pasikartojimo nutraukimas"
#. module: base_calendar
#: view:crm.meeting:0
msgid "Until"
-msgstr ""
+msgstr "Iki"
#. module: base_calendar
#: view:res.alarm:0
msgid "Reminder Details"
-msgstr ""
+msgstr "Priminimo nustatymai"
#. module: base_calendar
#: model:crm.meeting.type,name:base_calendar.categ_meet3
msgid "Off-site Meeting"
-msgstr ""
+msgstr "Komandiruotė"
#. module: base_calendar
#: view:crm.meeting:0
@@ -1154,12 +1185,12 @@
#: help:calendar.todo,interval:0
#: help:crm.meeting,interval:0
msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "Kartoti kas (Dieną/Savaitę/Mėnesį/Metus)"
#. module: base_calendar
#: view:crm.meeting:0
msgid "All Day?"
-msgstr ""
+msgstr "Visą dieną?"
#. module: base_calendar
#: view:calendar.event:0
@@ -1180,6 +1211,14 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Paspauskite, kad suplanuotumėte susitikimą.\n"
+" </p><p>\n"
+" Kalendoriumi galima dalinti su darbuotojais. Taip pat jis pilnai "
+"intergruojamas\n"
+" su kitais moduliais kaip darbuotojų atostogų ar CRM moduliai.\n"
+" </p>\n"
+" "
#. module: base_calendar
#: help:calendar.alarm,description:0
@@ -1219,14 +1258,14 @@
#: field:calendar.todo,recurrency:0
#: field:crm.meeting,recurrency:0
msgid "Recurrent"
-msgstr ""
+msgstr "Pasikartojantis"
#. module: base_calendar
#: field:calendar.event,rrule_type:0
#: field:calendar.todo,rrule_type:0
#: field:crm.meeting,rrule_type:0
msgid "Recurrency"
-msgstr ""
+msgstr "Pasikartojimas"
#. module: base_calendar
#: selection:calendar.event,week_list:0
@@ -1240,7 +1279,7 @@
#: field:calendar.todo,exrule:0
#: field:crm.meeting,exrule:0
msgid "Exception Rule"
-msgstr ""
+msgstr "Išimtinė taisyklė"
#. module: base_calendar
#: help:calendar.attendee,language:0
@@ -1261,6 +1300,8 @@
"Defines a rule or repeating pattern of time to exclude from the recurring "
"rule."
msgstr ""
+"Nustatoma taisyklė ar laiko pasikartojimo išraiška tam, kad nenaudoti "
+"pasikartojimo taisyklėje."
#. module: base_calendar
#: field:calendar.event,month_list:0
@@ -1274,12 +1315,12 @@
#: selection:calendar.todo,rrule_type:0
#: selection:crm.meeting,rrule_type:0
msgid "Day(s)"
-msgstr ""
+msgstr "Diena (-os)"
#. module: base_calendar
#: view:calendar.event:0
msgid "Confirmed Events"
-msgstr ""
+msgstr "Patvirtinti įvykiai"
#. module: base_calendar
#: field:calendar.attendee,dir:0
@@ -1323,7 +1364,7 @@
#. module: base_calendar
#: view:crm.meeting:0
msgid "Search Meetings"
-msgstr ""
+msgstr "Susitikimų paieška"
#. module: base_calendar
#: model:ir.model,name:base_calendar.model_ir_attachment
@@ -1333,7 +1374,7 @@
#. module: base_calendar
#: model:ir.model,name:base_calendar.model_crm_meeting_type
msgid "Meeting Type"
-msgstr ""
+msgstr "Susitikimo tipai"
#. module: base_calendar
#: selection:calendar.attendee,state:0
@@ -1359,11 +1400,19 @@
" </p>\n"
" "
msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+" Spauskite, kad įvestumėte naują perspėjimo tipą.\n"
+" </p><p>\n"
+" Jūs galite įvesti papildomus įvykių perspėjimo tipus, kurie "
+"gali būti\n"
+" priskirti prie kalendoriaus įvykių ar susitikimų.\n"
+" </p>\n"
+" "
#. module: base_calendar
#: selection:crm.meeting,state:0
msgid "Unconfirmed"
-msgstr ""
+msgstr "Nepatvirtintas"
#. module: base_calendar
#: help:calendar.attendee,sent_by:0
@@ -1401,7 +1450,7 @@
#: field:calendar.todo,exdate:0
#: field:crm.meeting,exdate:0
msgid "Exception Date/Times"
-msgstr ""
+msgstr "Išimtinė (-is) data/laikas"
#. module: base_calendar
#: help:calendar.alarm,name:0
@@ -1413,7 +1462,7 @@
#. module: base_calendar
#: model:ir.model,name:base_calendar.model_mail_message
msgid "Message"
-msgstr ""
+msgstr "Pranešimas"
#. module: base_calendar
#: field:calendar.event,base_calendar_alarm_id:0
@@ -1443,7 +1492,7 @@
#. module: base_calendar
#: view:calendar.event:0
msgid "Recurrency period"
-msgstr ""
+msgstr "Pasikartojimo periodas"
#. module: base_calendar
#: field:calendar.event,week_list:0
@@ -1491,7 +1540,7 @@
#. module: base_calendar
#: selection:calendar.attendee,role:0
msgid "For information Purpose"
-msgstr ""
+msgstr "Informacinio pobūdžio"
#. module: base_calendar
#: field:calendar.event,select1:0
@@ -1532,7 +1581,7 @@
#: help:calendar.todo,alarm_id:0
#: help:crm.meeting,alarm_id:0
msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "Nustatykite priminimą šiuo laikui, prieš įvykstant įvykiui"
#. module: base_calendar
#: view:calendar.event:0
@@ -1552,7 +1601,7 @@
#: field:calendar.todo,interval:0
#: field:crm.meeting,interval:0
msgid "Repeat Every"
-msgstr ""
+msgstr "Kartoti kas"
#. module: base_calendar
#: selection:calendar.event,byday:0
@@ -1576,12 +1625,12 @@
#: field:res.alarm,duration:0
#: field:res.alarm,trigger_duration:0
msgid "Duration"
-msgstr "Trukmė"
+msgstr "Laikotarpis"
#. module: base_calendar
#: field:calendar.alarm,trigger_date:0
msgid "Trigger Date"
-msgstr "Įvykio data"
+msgstr "Iššaukimo data"
#. module: base_calendar
#: help:calendar.alarm,attach:0
=== modified file 'base_calendar/i18n/nl.po'
--- base_calendar/i18n/nl.po 2013-04-15 08:43:02 +0000
+++ base_calendar/i18n/nl.po 2013-05-08 15:44:19 +0000
@@ -7,15 +7,25 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2012-12-12 20:35+0000\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-05-04 16:53+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
"Language-Team: Dutch <nl@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:45+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-05 06:04+0000\n"
+"X-Generator: Launchpad (build 16598)\n"
+>>>>>>> MERGE-SOURCE
#. module: base_calendar
#: selection:calendar.alarm,trigger_related:0
@@ -51,7 +61,7 @@
#: field:calendar.todo,we:0
#: field:crm.meeting,we:0
msgid "Wed"
-msgstr "woe"
+msgstr "Woe"
#. module: base_calendar
#: selection:calendar.attendee,cutype:0
@@ -81,7 +91,7 @@
#: selection:calendar.todo,week_list:0
#: selection:crm.meeting,week_list:0
msgid "Sunday"
-msgstr "zondag"
+msgstr "Zondag"
#. module: base_calendar
#: field:calendar.attendee,role:0
@@ -134,7 +144,7 @@
#: selection:calendar.todo,month_list:0
#: selection:crm.meeting,month_list:0
msgid "March"
-msgstr "maart"
+msgstr "Maart"
#. module: base_calendar
#: help:calendar.attendee,cutype:0
@@ -152,7 +162,7 @@
#: selection:calendar.todo,week_list:0
#: selection:crm.meeting,week_list:0
msgid "Friday"
-msgstr "vrijdag"
+msgstr "Vrijdag"
#. module: base_calendar
#: field:calendar.event,allday:0
@@ -206,7 +216,7 @@
#: field:calendar.todo,tu:0
#: field:crm.meeting,tu:0
msgid "Tue"
-msgstr "din"
+msgstr "Din"
#. module: base_calendar
#: selection:calendar.event,byday:0
@@ -458,7 +468,7 @@
#: field:calendar.todo,su:0
#: field:crm.meeting,su:0
msgid "Sun"
-msgstr "zon"
+msgstr "Zon"
#. module: base_calendar
#: field:calendar.attendee,cutype:0
@@ -592,12 +602,12 @@
#: field:calendar.todo,th:0
#: field:crm.meeting,th:0
msgid "Thu"
-msgstr "don"
+msgstr "Don"
#. module: base_calendar
#: view:crm.meeting:0
msgid "Meeting Details"
-msgstr "Afspraak tdetails"
+msgstr "Afspraak details"
#. module: base_calendar
#: field:calendar.attendee,child_ids:0
@@ -1221,7 +1231,7 @@
#. module: base_calendar
#: view:crm.meeting:0
msgid "Select Weekdays"
-msgstr "Selecteer dagen van de qweek"
+msgstr "Selecteer dagen van de week"
#. module: base_calendar
#: code:addons/base_calendar/base_calendar.py:1519
@@ -1475,7 +1485,7 @@
#: code:addons/base_calendar/crm_meeting.py:106
#, python-format
msgid "Email addresses not found"
-msgstr "E-mail adressen neit gevonden"
+msgstr "E-mail adressen niet gevonden"
#. module: base_calendar
#: view:calendar.event:0
=== modified file 'base_gengo/i18n/de.po'
--- base_gengo/i18n/de.po 2013-04-05 11:10:48 +0000
+++ base_gengo/i18n/de.po 2013-05-08 15:44:19 +0000
@@ -7,16 +7,28 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2012-12-19 19:47+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
"consulting.net>\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-21 21:55+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: German <de@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:52+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: base_gengo
#: view:res.company:0
@@ -45,11 +57,34 @@
msgstr "Gengo Privater Schlüssel"
#. module: base_gengo
+<<<<<<< TREE
+=======
+#: constraint:ir.translation:0
+msgid ""
+"The Gengo translation service selected is not supported for this language."
+msgstr ""
+"Der Gengo Übersetzungsservice wird für diese Sprache nicht unterstützt"
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Add Gengo login Public Key..."
+msgstr "Hinzufügen Gengo Login Public Key"
+
+#. module: base_gengo
+>>>>>>> MERGE-SOURCE
#: model:ir.model,name:base_gengo.model_base_gengo_translations
msgid "base.gengo.translations"
msgstr "base.gengo.translations"
#. module: base_gengo
+<<<<<<< TREE
+=======
+#: view:ir.translation:0
+msgid "Gengo Comments & Activity..."
+msgstr "Gengo Kommentare & Aktivitäten"
+
+#. module: base_gengo
+>>>>>>> MERGE-SOURCE
#: help:res.company,gengo_auto_approve:0
msgid "Jobs are Automatically Approved by Gengo."
msgstr "Jobs werden automatisch durch Gengo geprüft."
@@ -87,6 +122,14 @@
msgstr "Maschinelle Vorhersage"
#. module: base_gengo
+<<<<<<< TREE
+=======
+#: view:res.company:0
+msgid "Add Gengo login Private Key..."
+msgstr "Gengo Login privater Schlüssel"
+
+#. module: base_gengo
+>>>>>>> MERGE-SOURCE
#: code:addons/base_gengo/wizard/base_gengo_translations.py:155
#, python-format
msgid ""
@@ -106,10 +149,16 @@
msgstr "Gengo Übersetzungssergvice"
#. module: base_gengo
+<<<<<<< TREE
#: constraint:ir.translation:0
msgid ""
"The Gengo translation service selected is not supported for this language."
msgstr ""
+=======
+#: view:res.company:0
+msgid "Add your comments here for translator...."
+msgstr "Hier Kommentare für den Übersetzer hinzufügen"
+>>>>>>> MERGE-SOURCE
#. module: base_gengo
#: selection:ir.translation,gengo_translation:0
@@ -218,7 +267,7 @@
#. module: base_gengo
#: selection:ir.translation,gengo_translation:0
msgid "Ultra"
-msgstr ""
+msgstr "Ultra"
#. module: base_gengo
#: model:ir.model,name:base_gengo.model_ir_translation
=== added file 'base_gengo/i18n/fr.po'
--- base_gengo/i18n/fr.po 1970-01-01 00:00:00 +0000
+++ base_gengo/i18n/fr.po 2013-05-08 15:44:19 +0000
@@ -0,0 +1,270 @@
+# French translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-23 12:12+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@xxxxxxxxxxxxxxxxxxxx>\n"
+"Language-Team: French <fr@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-24 05:28+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Comments for Translator"
+msgstr "Commentaires pour traducteur"
+
+#. module: base_gengo
+#: field:ir.translation,job_id:0
+msgid "Gengo Job ID"
+msgstr "Identifiant de la tâche Gengo"
+
+#. 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 "Cette langue n'est pas supportée par le service de traduction Gengo."
+
+#. module: base_gengo
+#: field:res.company,gengo_comment:0
+msgid "Comments"
+msgstr "Commentaires"
+
+#. module: base_gengo
+#: field:res.company,gengo_private_key:0
+msgid "Gengo Private Key"
+msgstr "Clé privée Gengo"
+
+#. module: base_gengo
+#: constraint:ir.translation:0
+msgid ""
+"The Gengo translation service selected is not supported for this language."
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Add Gengo login Public 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
+#: view:ir.translation:0
+msgid "Gengo Comments & Activity..."
+msgstr ""
+
+#. module: base_gengo
+#: help:res.company,gengo_auto_approve:0
+msgid "Jobs are Automatically Approved by Gengo."
+msgstr "Les travaux sont automatiquement validés par Gengo."
+
+#. module: base_gengo
+#: field:base.gengo.translations,lang_id:0
+msgid "Language"
+msgstr "Langue"
+
+#. module: base_gengo
+#: field:ir.translation,gengo_comment:0
+msgid "Comments & Activity Linked to Gengo"
+msgstr "Commentaires et activité liés à Gengo"
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:124
+#, python-format
+msgid "Gengo Sync Translation (Response)"
+msgstr "Synchronisation de la traduction Gengo (Réponse)"
+
+#. 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
+#: view:res.company:0
+msgid "Add Gengo login Private Key..."
+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
+#: view:res.company:0
+msgid "Add your comments here for translator...."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Standard"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Public Key"
+msgstr ""
+
+#. module: base_gengo
+#: field:res.company,gengo_public_key:0
+msgid "Gengo Public Key"
+msgstr ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Ultra"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_ir_translation
+msgid "ir.translation"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Gengo Translation Service"
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Pro"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Gengo Request Form"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. 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 ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "or"
+msgstr ""
=== renamed file 'base_gengo/i18n/fr.po' => 'base_gengo/i18n/fr.po.moved'
=== modified file 'base_iban/i18n/lt.po'
--- base_iban/i18n/lt.po 2013-04-05 11:10:48 +0000
+++ base_iban/i18n/lt.po 2013-05-08 15:44:19 +0000
@@ -1,20 +1,41 @@
+<<<<<<< TREE
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
# * base_iban
+=======
+# Lithuanian 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.
+# Giedrius Slavinskas <giedrius@xxxxxxxxxx>, 2012.
+>>>>>>> MERGE-SOURCE
#
msgid ""
msgstr ""
+<<<<<<< TREE
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2010-12-11 14:05+0000\n"
"Last-Translator: Donatas Stonys Blue Whale SEO <donatelonow@xxxxxxxxxxx>\n"
"Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-30 16:27+0000\n"
+"Last-Translator: Giedrius Slavinskas - inovera.lt <giedrius@xxxxxxxxxx>\n"
+"Language-Team: Lithuanian <lt@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:00+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-05-01 05:14+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: base_iban
#: constraint:res.partner.bank:0
@@ -43,7 +64,7 @@
#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
msgid "zip"
-msgstr "zip"
+msgstr "pašto kodas"
#. module: base_iban
#: help:res.partner.bank,iban:0
@@ -53,7 +74,7 @@
#. module: base_iban
#: model:ir.model,name:base_iban.model_res_partner_bank
msgid "Bank Accounts"
-msgstr ""
+msgstr "Banko sąskaitos"
#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
=== modified file 'base_import/i18n/de.po'
--- base_import/i18n/de.po 2013-04-05 11:10:48 +0000
+++ base_import/i18n/de.po 2013-05-08 15:44:19 +0000
@@ -7,16 +7,26 @@
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
"PO-Revision-Date: 2012-12-19 21:57+0000\n"
+=======
+"POT-Creation-Date: 2013-03-07 08:37+0000\n"
+"PO-Revision-Date: 2013-04-21 19:09+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
"consulting.net>\n"
"Language-Team: German <de@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2013-03-16 05:52+0000\n"
"X-Generator: Launchpad (build 16532)\n"
+=======
+"X-Launchpad-Export-Date: 2013-04-23 06:09+0000\n"
+"X-Generator: Launchpad (build 16580)\n"
+>>>>>>> MERGE-SOURCE
#. module: base_import
#. openerp-web
@@ -404,6 +414,16 @@
#. module: base_import
#. openerp-web
+<<<<<<< TREE
+=======
+#: code:addons/base_import/static/src/js/import.js:174
+#, python-format
+msgid "Semicolon"
+msgstr "Semikolon"
+
+#. module: base_import
+#. openerp-web
+>>>>>>> MERGE-SOURCE
#: code:addons/base_import/static/src/xml/import.xml:233
#, python-format
msgid "Suppliers and their respective contacts"
@@ -471,6 +491,16 @@
"(unter 'Speichern Unter' > Extra > Werkzeuge > Daten bearbeiten Aktenreiter)."
#. module: base_import
+<<<<<<< TREE
+=======
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:175
+#, python-format
+msgid "Tab"
+msgstr "Tabulator"
+
+#. module: base_import
+>>>>>>> MERGE-SOURCE
#: field:base_import.tests.models.preview,othervalue:0
msgid "Other Variable"
msgstr "Andere Variable"
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/About.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/About.py 2012-11-29 22:26:45 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/About.py 2013-05-08 15:44:19 +0000
@@ -1,49 +1,25 @@
-##########################################################################
-#
-# Portions of this file are under the following copyright and license:
-#
-#
-# Copyright (c) 2003-2004 Danny Brewer
-# d29583@xxxxxxxxxxxxxxxx
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See: http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-# OpenERP, Open Source Management Solution>..
-# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#########################################################################
+#
+# Copyright (c) 2003-2004 Danny Brewer d29583@xxxxxxxxxxxxxxxx
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See: http://www.gnu.org/licenses/lgpl.html
+#
+#############################################################################
import uno
from com.sun.star.task import XJobExecutor
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py 2012-11-29 22:26:45 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py 2013-05-08 15:44:19 +0000
@@ -1,49 +1,26 @@
-##########################################################################
-#
-# Portions of this file are under the following copyright and license:
-#
-#
-# Copyright (c) 2003-2004 Danny Brewer
-# d29583@xxxxxxxxxxxxxxxx
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See: http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-# OpenERP, Open Source Management Solution>..
-# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#########################################################################
+#
+# Copyright (c) 2003-2004 Danny Brewer d29583@xxxxxxxxxxxxxxxx
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See: http://www.gnu.org/licenses/lgpl.html
+#
+#############################################################################
+
import os
import uno
import unohelper
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/Change.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/Change.py 2012-11-29 22:26:45 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/Change.py 2013-05-08 15:44:19 +0000
@@ -1,49 +1,26 @@
-##########################################################################
-#
-# Portions of this file are under the following copyright and license:
-#
-#
-# Copyright (c) 2003-2004 Danny Brewer
-# d29583@xxxxxxxxxxxxxxxx
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See: http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-# OpenERP, Open Source Management Solution>..
-# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#########################################################################
+#
+# Copyright (c) 2003-2004 Danny Brewer d29583@xxxxxxxxxxxxxxxx
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See: http://www.gnu.org/licenses/lgpl.html
+#
+#############################################################################
+
import uno
import string
import unohelper
@@ -72,7 +49,7 @@
'XML-RPC': 'http://',
'XML-RPC secure': 'https://',
'NET-RPC': 'socket://',
- }
+ }
host=port=protocol=''
if docinfo.getUserFieldValue(0):
m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$', docinfo.getUserFieldValue(0) or '')
@@ -80,7 +57,7 @@
port = m.group(3)
protocol = m.group(1)
if protocol:
- for (key, value) in self.protocol.iteritems():
+ for (key, value) in self.protocol.iteritems():
if value==protocol:
protocol=key
break
@@ -102,7 +79,7 @@
self.win.addButton( 'btnNext', -2, -5, 30, 15, 'Next', actionListenerProc = self.btnNext_clicked )
self.win.addButton( 'btnCancel', -2 - 30 - 5 ,-5, 30, 15, 'Cancel', actionListenerProc = self.btnCancel_clicked )
-
+
for i in self.protocol.keys():
self.lstProtocol.addItem(i,self.lstProtocol.getItemCount() )
self.win.doModalDialog( "lstProtocol", protocol)
@@ -110,27 +87,27 @@
def btnNext_clicked(self, oActionEvent):
global url
aVal=''
- #aVal= Fetature used
+ #aVal= Fetature used
try:
url = self.protocol[self.win.getListBoxSelectedItem("lstProtocol")]+self.win.getEditText("txtHost")+":"+self.win.getEditText("txtPort")
self.sock=RPCSession(url)
desktop=getDesktop()
doc = desktop.getCurrentComponent()
- docinfo=doc.getDocumentInfo()
+ docinfo=doc.getDocumentInfo()
docinfo.setUserFieldValue(0,url)
res=self.sock.listdb()
self.win.endExecute()
ServerParameter(aVal,url)
except :
- import traceback,sys
+ import traceback,sys
info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
- self.logobj.log_write('ServerParameter', LOG_ERROR, info)
+ self.logobj.log_write('ServerParameter', LOG_ERROR, info)
ErrorDialog("Connection to server is fail. Please check your Server Parameter.", "", "Error!")
self.win.endExecute()
-
+
def btnCancel_clicked(self,oActionEvent):
self.win.endExecute()
-
+
if __name__<>"package" and __name__=="__main__":
Change(None)
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py 2012-11-29 22:26:45 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py 2013-05-08 15:44:19 +0000
@@ -1,49 +1,26 @@
-##########################################################################
-#
-# Portions of this file are under the following copyright and license:
-#
-#
-# Copyright (c) 2003-2004 Danny Brewer
-# d29583@xxxxxxxxxxxxxxxx
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See: http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-# OpenERP, Open Source Management Solution>..
-# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#########################################################################
+#
+# Copyright (c) 2003-2004 Danny Brewer d29583@xxxxxxxxxxxxxxxx
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See: http://www.gnu.org/licenses/lgpl.html
+#
+#############################################################################
+
import uno
import unohelper
import string
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py 2012-11-29 22:26:45 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py 2013-05-08 15:44:19 +0000
@@ -1,49 +1,25 @@
-##########################################################################
-#
-# Portions of this file are under the following copyright and license:
-#
-#
-# Copyright (c) 2003-2004 Danny Brewer
-# d29583@xxxxxxxxxxxxxxxx
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See: http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-# OpenERP, Open Source Management Solution>..
-# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#########################################################################
+#
+# Copyright (c) 2003-2004 Danny Brewer d29583@xxxxxxxxxxxxxxxx
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See: http://www.gnu.org/licenses/lgpl.html
+#
+#############################################################################
import uno
import unohelper
@@ -81,7 +57,7 @@
if __name__<>"package":
ConvertFieldsToBraces(None)
else:
- g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("com.sun.star.task.Job",),)
+ g_ImplementationHelper.addImplementation( ConvertFieldsToBraces, "org.openoffice.openerp.report.convertFB", ("com.sun.star.task.Job",),)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py 2013-03-04 17:31:32 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py 2013-05-08 15:44:19 +0000
@@ -1,49 +1,26 @@
-##########################################################################
-#
-# Portions of this file are under the following copyright and license:
-#
-#
-# Copyright (c) 2003-2004 Danny Brewer
-# d29583@xxxxxxxxxxxxxxxx
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See: http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-# OpenERP, Open Source Management Solution>..
-# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#########################################################################
+#
+# Copyright (c) 2003-2004 Danny Brewer d29583@xxxxxxxxxxxxxxxx
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See: http://www.gnu.org/licenses/lgpl.html
+#
+#############################################################################
+
import os
import uno
import unohelper
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py 2012-11-29 22:26:45 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py 2013-05-08 15:44:19 +0000
@@ -1,49 +1,26 @@
-##########################################################################
-#
-# Portions of this file are under the following copyright and license:
-#
-#
-# Copyright (c) 2003-2004 Danny Brewer
-# d29583@xxxxxxxxxxxxxxxx
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See: http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-# OpenERP, Open Source Management Solution>..
-# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#########################################################################
+#
+# Copyright (c) 2003-2004 Danny Brewer d29583@xxxxxxxxxxxxxxxx
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See: http://www.gnu.org/licenses/lgpl.html
+#
+#############################################################################
+
import uno
import string
import unohelper
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py 2013-03-04 17:31:32 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py 2013-05-08 15:44:19 +0000
@@ -1,50 +1,25 @@
-##########################################################################
-#
-# Portions of this file are under the following copyright and license:
-#
-#
-# Copyright (c) 2003-2004 Danny Brewer
-# d29583@xxxxxxxxxxxxxxxx
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See: http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-# OpenERP, Open Source Management Solution>..
-# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
-
+#########################################################################
+#
+# Copyright (c) 2003-2004 Danny Brewer d29583@xxxxxxxxxxxxxxxx
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See: http://www.gnu.org/licenses/lgpl.html
+#
+#############################################################################
import uno
import string
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py 2011-12-19 16:54:40 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/LoginTest.py 2013-05-08 15:44:19 +0000
@@ -1,49 +1,26 @@
-##########################################################################
-#
-# Portions of this file are under the following copyright and license:
-#
-#
-# Copyright (c) 2003-2004 Danny Brewer
-# d29583@xxxxxxxxxxxxxxxx
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See: http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-# OpenERP, Open Source Management Solution>..
-# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#########################################################################
+#
+# Copyright (c) 2003-2004 Danny Brewer d29583@xxxxxxxxxxxxxxxx
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See: http://www.gnu.org/licenses/lgpl.html
+#
+#############################################################################
+
if __name__<>"package":
from ServerParameter import *
from lib.gui import *
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py 2012-11-29 22:26:45 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py 2013-05-08 15:44:19 +0000
@@ -1,49 +1,25 @@
-##########################################################################
-#
-# Portions of this file are under the following copyright and license:
-#
-#
-# Copyright (c) 2003-2004 Danny Brewer
-# d29583@xxxxxxxxxxxxxxxx
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See: http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-# OpenERP, Open Source Management Solution>..
-# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#########################################################################
+#
+# Copyright (c) 2003-2004 Danny Brewer d29583@xxxxxxxxxxxxxxxx
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See: http://www.gnu.org/licenses/lgpl.html
+#
+#############################################################################
import uno
import string
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py 2012-11-29 22:26:45 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py 2013-05-08 15:44:19 +0000
@@ -1,49 +1,26 @@
-##########################################################################
-#
-# Portions of this file are under the following copyright and license:
-#
-#
-# Copyright (c) 2003-2004 Danny Brewer
-# d29583@xxxxxxxxxxxxxxxx
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See: http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-# OpenERP, Open Source Management Solution>..
-# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#########################################################################
+#
+# Copyright (c) 2003-2004 Danny Brewer d29583@xxxxxxxxxxxxxxxx
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See: http://www.gnu.org/licenses/lgpl.html
+#
+#############################################################################
+
import uno
import string
import unohelper
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py 2013-03-04 17:31:32 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py 2013-05-08 15:44:19 +0000
@@ -1,49 +1,26 @@
-##########################################################################
-#
-# Portions of this file are under the following copyright and license:
-#
-#
-# Copyright (c) 2003-2004 Danny Brewer
-# d29583@xxxxxxxxxxxxxxxx
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library 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
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See: http://www.gnu.org/licenses/lgpl.html
-#
-#
-# and other portions are under the following copyright and license:
-#
-#
-# OpenERP, Open Source Management Solution>..
-# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
-#
-# 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 <http://www.gnu.org/licenses/>.
-#
-#
-##############################################################################
+#########################################################################
+#
+# Copyright (c) 2003-2004 Danny Brewer d29583@xxxxxxxxxxxxxxxx
+# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library 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
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See: http://www.gnu.org/licenses/lgpl.html
+#
+#############################################################################
+
import uno
import string
import unohelper
=== modified file 'base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py'
--- base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py 2013-03-04 17:31:25 +0000
+++ base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py 2013-05-08 15:44:19 +0000
@@ -1,49 +1,25 @@
-##########################################################################
-#
-# Portions of this file are under the following copyright and license:
-#
-#
-# Copyright (c) 2003-2004 Danny Brewer
-# d29583@groovegarden.c
