openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #06768
[Merge] lp:~openerp-dev/openobject-addons/6.0-bug-733799-jap into lp:openobject-addons
Jagdish Panchal (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/6.0-bug-733799-jap into lp:openobject-addons.
Requested reviews:
Jay Vora (OpenERP) (jvo-openerp)
Related bugs:
Bug #733799 in OpenERP Addons: "Can't see report as non admin user"
https://bugs.launchpad.net/openobject-addons/+bug/733799
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-733799-jap/+merge/60900
Hello,
This fixes the issue in stable v6.
Thanks.
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-bug-733799-jap/+merge/60900
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-bug-733799-jap.
=== modified file 'account/account.py'
--- account/account.py 2011-05-05 14:43:40 +0000
+++ account/account.py 2011-05-13 11:11:47 +0000
@@ -1559,7 +1559,8 @@
AND move.id = line.move_id \
GROUP BY line.tax_code_id',
(parent_ids,) + where_params)
- res=dict(cr.fetchall())
+ res = dict(cr.fetchall())
+ res2 = {}
obj_precision = self.pool.get('decimal.precision')
res2 = {}
for record in self.browse(cr, uid, ids, context=context):
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py 2011-04-25 06:11:14 +0000
+++ account/account_move_line.py 2011-05-13 11:11:47 +0000
@@ -226,11 +226,14 @@
# Starts: Manual entry from account.move form
if context.get('lines',[]):
total_new = 0.00
- for i in context['lines']:
- if i[2]:
- total_new += (i[2]['debit'] or 0.00)- (i[2]['credit'] or 0.00)
- for item in i[2]:
- data[item] = i[2][item]
+ for line_record in context['lines']:
+ if not isinstance(line_record, (tuple, list)):
+ line_record_detail = self.read(cr, uid, line_record, ['analytic_account_id','debit','credit','name','reconcile_id','tax_code_id','tax_amount','account_id','ref','currency_id','date_maturity','amount_currency','partner_id', 'reconcile_partial_id'])
+ else:
+ line_record_detail = line_record[2]
+ total_new += (line_record_detail['debit'] or 0.00)- (line_record_detail['credit'] or 0.00)
+ for item in line_record_detail.keys():
+ data[item] = line_record_detail[item]
if context['journal']:
journal_data = journal_obj.browse(cr, uid, context['journal'], context=context)
if journal_data.type == 'purchase':
=== modified file 'account/i18n/account.pot'
--- account/i18n/account.pot 2011-03-09 04:58:22 +0000
+++ account/i18n/account.pot 2011-05-13 11:11:47 +0000
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
+"Project-Id-Version: OpenERP Server 6.0.2\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
-"POT-Creation-Date: 2011-01-11 11:14:28+0000\n"
-"PO-Revision-Date: 2011-01-11 11:14:28+0000\n"
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-05-09 10:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,13 +26,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid "You cannot remove/deactivate an account which is set as a property to any Partner."
msgstr ""
@@ -62,7 +56,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr ""
@@ -123,7 +117,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr ""
@@ -165,7 +159,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr ""
@@ -214,7 +208,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid "No period defined for this date: %s !\n"
"Please create a fiscal year."
@@ -237,7 +231,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -253,7 +247,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -291,7 +285,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -518,7 +512,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr ""
@@ -598,7 +592,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -631,8 +625,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -693,7 +687,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -791,7 +785,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid "You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !"
msgstr ""
@@ -908,11 +902,11 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -989,7 +983,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1071,6 +1064,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1078,7 +1072,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1216,7 +1210,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr ""
@@ -1246,7 +1239,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr ""
@@ -1334,7 +1327,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid "Cannot create the invoice !\n"
"The payment term defined gives a computed amount greater than the total invoiced amount."
@@ -1346,14 +1339,9 @@
msgstr ""
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
msgstr ""
#. module: account
@@ -1484,7 +1472,6 @@
msgstr ""
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@@ -1526,11 +1513,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr ""
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1546,7 +1528,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr ""
@@ -1577,7 +1559,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr ""
@@ -1593,11 +1575,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr ""
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr ""
@@ -1613,7 +1590,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1634,7 +1611,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr ""
@@ -1650,7 +1627,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid "You cannot change the type of account from 'Closed' to any other type which contains account entries!"
msgstr ""
@@ -1802,11 +1779,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr ""
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -1904,7 +1876,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid "There is no default default debit account defined \n"
"on journal \"%s\""
@@ -1947,7 +1919,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -1967,7 +1939,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -1978,6 +1950,7 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2006,6 +1979,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2113,7 +2087,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid "Can't find any account journal of %s type for this company.\n"
"\n"
@@ -2176,7 +2150,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2253,7 +2227,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2265,13 +2239,12 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr ""
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid "You cannot modify company of this journal as its related record exist in Entry Lines"
msgstr ""
@@ -2305,6 +2278,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2407,16 +2381,16 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2464,11 +2438,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr ""
@@ -2567,7 +2536,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid "No fiscal year defined for this date !\n"
"Please create one."
@@ -2676,6 +2645,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2683,6 +2653,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2767,6 +2740,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2785,6 +2764,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -2845,7 +2825,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -2873,11 +2853,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -2885,7 +2860,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -2925,17 +2899,12 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid "All selected journal entries will be validated and posted. It means you won't be able to modify their accounting fields anymore."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr ""
@@ -2951,8 +2920,10 @@
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
msgstr ""
#. module: account
@@ -2994,13 +2965,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid "You cannot change the type of account from '%s' to '%s' type as it contains account entries!"
msgstr ""
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr ""
@@ -3103,6 +3075,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3146,20 +3119,20 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n"
"Please define partner on it!"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid "You cannot validate a Journal Entry unless all journal items are in same chart of accounts !"
msgstr ""
@@ -3273,7 +3246,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3284,13 +3257,13 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid "You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
msgstr ""
@@ -3567,7 +3540,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr ""
@@ -3621,7 +3594,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -3795,7 +3768,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -3843,6 +3816,13 @@
msgstr ""
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid "Configuration Error! \n"
+"You cannot define children to an account with internal type different of \"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -3864,11 +3844,11 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -3921,12 +3901,6 @@
msgstr ""
#. module: account
-#: constraint:account.account:0
-msgid "You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -3971,7 +3945,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid "Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
msgstr ""
@@ -3998,6 +3972,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr ""
@@ -4030,7 +4013,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Please verify the price of the invoice !\n"
"The real total does not match the computed total."
@@ -4141,29 +4124,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
msgstr ""
#. module: account
@@ -4181,7 +4143,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr ""
@@ -4234,7 +4196,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid "You can not modify a posted entry of this journal !\n"
"You should set the journal to allow cancelling entries if you want to do that."
@@ -4251,7 +4213,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4281,6 +4243,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4362,7 +4325,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr ""
@@ -4500,12 +4463,7 @@
msgstr ""
#. module: account
-#: constraint:account.move.line:0
-msgid "You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4575,7 +4533,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4603,7 +4561,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid "You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !"
msgstr ""
@@ -4657,12 +4615,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -4734,7 +4692,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid "There is no default default credit account defined \n"
"on journal \"%s\""
@@ -4870,7 +4828,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -4904,7 +4862,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr ""
@@ -5029,7 +4987,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr ""
@@ -5054,14 +5012,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5096,7 +5054,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5297,7 +5255,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid "You cannot modify Company of account as its related record exist in Entry Lines"
msgstr ""
@@ -5549,9 +5507,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -5698,8 +5656,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr ""
@@ -5710,7 +5668,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -5738,7 +5696,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -5797,30 +5755,31 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -5874,6 +5833,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid "This report is an analysis done by a partner. It is a PDF report containing one line per partner representing the cumulative credit balance"
@@ -5921,7 +5885,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr ""
@@ -5938,9 +5902,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr ""
@@ -5987,7 +5953,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid "You can specify year, month and date in the name of the model using the following labels:\n"
"\n"
@@ -6015,7 +5981,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6147,7 +6113,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid "Can not find account chart for this company in invoice line account, Please Create account."
msgstr ""
@@ -6301,7 +6267,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6395,7 +6361,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -6418,7 +6384,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr ""
@@ -6428,10 +6393,8 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
msgstr ""
#. module: account
@@ -6446,6 +6409,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6469,13 +6433,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6493,7 +6457,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr ""
@@ -6714,17 +6678,17 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr ""
@@ -6747,15 +6711,11 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -6786,7 +6746,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -6833,7 +6793,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -6890,7 +6850,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -6952,7 +6912,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -6985,6 +6945,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7130,7 +7091,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr ""
@@ -7180,6 +7141,7 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
msgid "Filter By"
msgstr ""
@@ -7214,7 +7176,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7374,8 +7336,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr ""
@@ -7386,7 +7348,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -7405,6 +7367,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -7557,14 +7520,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid "You cannot modify company of this period as its related record exist in Entry Lines"
msgstr ""
@@ -7611,7 +7574,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -7627,7 +7590,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -7659,6 +7622,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -7668,7 +7632,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
@@ -7705,7 +7669,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid "You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!"
msgstr ""
@@ -7731,14 +7695,34 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
msgstr ""
#. module: account
@@ -7747,11 +7731,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr ""
@@ -7776,6 +7755,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -7794,6 +7774,7 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
msgid "Display Account"
msgstr ""
@@ -7875,11 +7856,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -7895,6 +7871,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -7902,7 +7879,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -7992,6 +7969,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8035,7 +8013,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid "Tax base different !\n"
"Click on compute to update tax base"
@@ -8061,6 +8039,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8089,7 +8068,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr ""
@@ -8140,13 +8119,13 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "You cannot validate a non-balanced entry !\n"
"Make sure you have configured Payment Term properly !\n"
@@ -8186,10 +8165,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8205,11 +8184,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -8381,11 +8355,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr ""
@@ -8412,7 +8381,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr ""
@@ -8431,6 +8399,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8484,7 +8453,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -8630,8 +8599,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -8649,14 +8618,14 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
msgstr ""
#. module: account
@@ -8695,10 +8664,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8719,18 +8688,12 @@
msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid "You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type \"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -8751,7 +8714,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "Can not create an automatic sequence for this piece !\n"
"\n"
@@ -8872,7 +8835,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -8897,7 +8860,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -9100,7 +9063,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
=== modified file 'account/i18n/ar.po'
--- account/i18n/ar.po 2011-04-29 05:56:18 +0000
+++ account/i18n/ar.po 2011-05-13 11:11:47 +0000
@@ -6,15 +6,25 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-01-19 11:12+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: bamuhrez <bamuhrez@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: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-05-10 07:12+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,13 +37,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr "لايوجد نهاية لسجل السنة للعام المØاسبي"
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -65,7 +69,7 @@
msgstr "متبقي"
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr ""
@@ -130,7 +134,7 @@
msgstr "المدخلات المØاسبية -"
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr ""
@@ -174,7 +178,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr "تØذير!"
@@ -226,7 +230,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
@@ -254,7 +258,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -270,7 +274,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -308,7 +312,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -550,7 +554,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr ""
@@ -632,7 +636,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -665,8 +669,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -727,7 +731,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -828,7 +832,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -950,11 +954,11 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -1033,7 +1037,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1119,6 +1122,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1126,7 +1130,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1264,7 +1268,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr ""
@@ -1294,7 +1297,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr ""
@@ -1387,7 +1390,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
@@ -1401,14 +1404,9 @@
msgstr ""
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
msgstr ""
#. module: account
@@ -1546,7 +1544,6 @@
msgstr ""
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@@ -1590,11 +1587,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr ""
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1613,7 +1605,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr ""
@@ -1646,7 +1638,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr ""
@@ -1662,11 +1654,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr ""
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr ""
@@ -1682,7 +1669,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1703,7 +1690,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr ""
@@ -1719,7 +1706,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1879,11 +1866,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr ""
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -1988,7 +1970,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2040,7 +2022,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2060,7 +2042,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2071,6 +2053,7 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2099,6 +2082,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2207,7 +2191,7 @@
msgstr "كود الØساب الضريبي"
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2277,7 +2261,7 @@
msgstr "إدخالات نماذج الØسابات"
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2361,7 +2345,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2373,13 +2357,12 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr ""
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
@@ -2415,6 +2398,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2523,16 +2507,16 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2581,11 +2565,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr ""
@@ -2692,7 +2671,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2809,6 +2788,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2816,6 +2796,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2906,6 +2889,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr "لايوجد نهاية لسجل السنة للعام المØاسبي"
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2924,6 +2913,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -2984,7 +2974,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3014,11 +3004,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3026,7 +3011,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -3066,11 +3050,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3078,7 +3057,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr ""
@@ -3094,8 +3073,10 @@
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
msgstr ""
#. module: account
@@ -3139,7 +3120,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3148,6 +3129,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr ""
@@ -3250,6 +3232,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3293,7 +3276,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3302,13 +3285,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
@@ -3428,7 +3411,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3439,14 +3422,14 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3740,7 +3723,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr ""
@@ -3799,7 +3782,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -3974,7 +3957,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -4024,6 +4007,15 @@
msgstr ""
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4045,11 +4037,11 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4102,13 +4094,6 @@
msgstr ""
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4153,7 +4138,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4185,6 +4170,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr ""
@@ -4218,7 +4212,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid ""
"Please verify the price of the invoice !\n"
@@ -4330,29 +4324,12 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
msgstr ""
#. module: account
@@ -4370,7 +4347,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr ""
@@ -4425,7 +4402,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4444,7 +4421,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4474,6 +4451,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4556,7 +4534,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr ""
@@ -4696,13 +4674,7 @@
msgstr ""
#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4774,7 +4746,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4802,7 +4774,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid ""
"You can not do this modification on a reconciled entry ! Please note that "
@@ -4858,12 +4830,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -4940,7 +4912,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid ""
"There is no default default credit account defined \n"
@@ -5087,7 +5059,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -5123,7 +5095,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr ""
@@ -5260,7 +5232,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr ""
@@ -5285,14 +5257,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5327,7 +5299,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5538,7 +5510,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid ""
"You cannot modify Company of account as its related record exist in Entry "
@@ -5804,9 +5776,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -5955,8 +5927,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr ""
@@ -5967,7 +5939,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -6005,7 +5977,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -6069,30 +6041,31 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6151,6 +6124,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6202,7 +6180,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr ""
@@ -6219,9 +6197,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr ""
@@ -6275,7 +6255,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6305,7 +6285,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6462,7 +6442,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid ""
"Can not find account chart for this company in invoice line account, Please "
@@ -6630,7 +6610,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6734,7 +6714,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -6763,7 +6743,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr ""
@@ -6775,10 +6754,8 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
msgstr ""
#. module: account
@@ -6793,6 +6770,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6818,13 +6796,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6842,7 +6820,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7079,17 +7057,17 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr ""
@@ -7112,15 +7090,11 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -7151,7 +7125,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7200,7 +7174,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -7261,7 +7235,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -7326,7 +7300,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -7361,6 +7335,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7523,7 +7498,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr ""
@@ -7573,6 +7548,7 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
msgid "Filter By"
msgstr ""
@@ -7611,7 +7587,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7778,8 +7754,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr ""
@@ -7790,7 +7766,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -7811,6 +7787,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -7983,14 +7960,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid ""
"You cannot modify company of this period as its related record exist in "
@@ -8039,7 +8016,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8055,7 +8032,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -8093,6 +8070,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8102,7 +8080,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
@@ -8139,7 +8117,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8167,18 +8145,34 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
msgstr ""
#. module: account
@@ -8187,11 +8181,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr ""
@@ -8216,6 +8205,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8234,6 +8224,7 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
msgid "Display Account"
msgstr ""
@@ -8328,11 +8319,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8348,6 +8334,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -8355,7 +8342,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -8449,6 +8436,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8492,7 +8480,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid ""
"Tax base different !\n"
@@ -8519,6 +8507,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8547,7 +8536,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr ""
@@ -8605,13 +8594,13 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid ""
"You cannot validate a non-balanced entry !\n"
@@ -8654,10 +8643,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8676,11 +8665,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -8862,11 +8846,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr ""
@@ -8893,7 +8872,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr ""
@@ -8912,6 +8890,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8965,7 +8944,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -9115,8 +9094,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9136,14 +9115,14 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
msgstr ""
#. module: account
@@ -9182,10 +9161,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9206,20 +9185,12 @@
msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -9240,7 +9211,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid ""
"Can not create an automatic sequence for this piece !\n"
@@ -9370,7 +9341,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -9395,7 +9366,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -9600,7 +9571,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
=== modified file 'account/i18n/bg.po'
--- account/i18n/bg.po 2011-05-02 18:46:43 +0000
+++ account/i18n/bg.po 2011-05-13 11:11:47 +0000
@@ -6,15 +6,25 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-03-02 06:18+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-04-01 09:39+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Dimitar Markov <dimitar.markov@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: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-05-10 07:12+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,13 +37,7 @@
msgstr "Други наÑтройки"
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr "Ðе е дефиниран край на финанÑовата година в Журнала"
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -67,7 +71,7 @@
msgstr "ОÑтатък"
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr "ÐœÐ¾Ð»Ñ Ð·Ñдайте поÑледователноÑÑ‚ за дневник фактури"
@@ -136,7 +140,7 @@
msgstr "Счетоводни запиÑи-"
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr "Ðе може да изтриете публикувано движение: \"%s\"!"
@@ -182,7 +186,7 @@
"без да го изтривате."
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr "Предупреждение!"
@@ -236,7 +240,7 @@
msgstr "account.tax"
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
@@ -269,7 +273,7 @@
"Отметнете ако не иÑкате в тази фактура да учаÑтват ДДС Ñвързани данъци"
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr "Фактура '%s' е чаÑтично платена: %s%s от %s%s (%s%s оÑтатък)"
@@ -285,7 +289,7 @@
msgstr "БелгийÑки отчети"
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr "Ðе може да добавÑте/променÑте запиÑи в затворен дневник."
@@ -323,7 +327,7 @@
msgstr "Ул."
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -572,7 +576,7 @@
msgstr "ÐÑма обединÑващи транзакции"
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr "БаланÑÑŠÑ‚ в каÑата не Ð¾Ñ‚Ð³Ð¾Ð²Ð°Ñ€Ñ Ð½Ð° изчиÑÐ»ÐµÐ½Ð¸Ñ Ð±Ð°Ð»Ð°Ð½Ñ!"
@@ -656,7 +660,7 @@
msgstr "Код на количеÑтво Ñума"
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -689,8 +693,8 @@
msgstr "Период на дневник"
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -751,7 +755,7 @@
msgstr "Ðналитични запиÑи по редове"
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr "Можете да ÑменÑте валутите Ñамо на фактури в проект"
@@ -853,7 +857,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -977,11 +981,11 @@
msgstr "Код"
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -1062,7 +1066,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1148,6 +1151,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1155,7 +1159,7 @@
msgstr "Етикет на запиÑ"
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr "Ðе може да променÑте/узтривате дневник ÑÑŠÑ Ð·Ð°Ð¿Ð¸Ñи от този период !"
@@ -1293,7 +1297,6 @@
msgstr "Ðнализ на журналните единици"
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr "Партньори"
@@ -1323,7 +1326,7 @@
msgstr "Централен дневник"
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr "Ðе може да използвате главна Ñметка за този дневник !"
@@ -1416,7 +1419,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
@@ -1433,15 +1436,10 @@
msgstr "Ðнгло-СакÑонÑко ÑчетоводÑтво"
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
-msgstr "Приключен"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Движение на отпиÑване"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1586,7 +1584,6 @@
msgstr "Разделени журнални поÑледователноÑти"
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr "Отговорник"
@@ -1630,11 +1627,6 @@
msgstr "Годишна Ñума"
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr "Отпечатване на ваучер"
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr "Този помощник ще промени валутата на фактурата"
@@ -1656,7 +1648,7 @@
msgstr "Грешка! Ðе можете да дефинирате заÑтъпващи Ñе финанÑови години."
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr "Сметката не е поÑочена за равнÑване!"
@@ -1689,7 +1681,7 @@
msgstr "Приходни и разходни"
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr "ТрÑбва да изберете Ñметка за запиÑа на отпиÑването !"
@@ -1705,11 +1697,6 @@
msgstr "Ð’Ñички партньори"
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr "Реф. :"
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr "Диаграми аналитична Ñметка"
@@ -1725,7 +1712,7 @@
msgstr "Отпратка към клиент:"
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1746,7 +1733,7 @@
msgstr "Данъчна декларациÑ: кредитни извеÑтиÑ"
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr "Ðе можете да деактивирате Ñметка коÑто Ñъдържа движениÑ."
@@ -1762,7 +1749,7 @@
msgstr "Ðе може да Ñъздадете ред за движение в приключена Ñметка."
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1924,11 +1911,6 @@
msgstr "Изображение"
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr "Отменени"
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -2035,7 +2017,7 @@
msgstr " Дневник"
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2087,7 +2069,7 @@
msgstr "ОпиÑание"
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2107,7 +2089,7 @@
msgstr "Приходна Ñметка"
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr "ÐÑма Ñчетоводен дневник за продажби/покупки!"
@@ -2118,6 +2100,7 @@
msgstr "Счетоводни ÑвойÑтва"
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2146,6 +2129,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2256,7 +2240,7 @@
msgstr "Данъчен код"
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2326,7 +2310,7 @@
msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð½Ð° модела на Ñметка"
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2417,7 +2401,7 @@
msgstr "Сметки"
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr "Грешка при наÑтройване!"
@@ -2429,13 +2413,12 @@
msgstr "Средна цена"
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr "Дата:"
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
@@ -2471,6 +2454,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2580,16 +2564,16 @@
msgstr "Този помощник ще Ñъздаде повтарÑщи Ñе Ñчетоводни запиÑи"
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr "Ðе Ñа зададени поÑледоватеноÑти за този дневник !"
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2638,11 +2622,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr "Ðомер:"
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr "Референтен номер"
@@ -2752,7 +2731,7 @@
msgstr "Ðналитични запиÑи"
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2878,6 +2857,7 @@
msgstr "Изглед"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2885,6 +2865,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2975,6 +2958,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr "Ðе е дефиниран край на финанÑовата година в Журнала"
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2993,6 +2982,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3053,7 +3043,7 @@
msgstr "Ðачален баланÑ"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr "Ðе е зададен партньор !"
@@ -3083,11 +3073,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr "Дневник:"
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3095,7 +3080,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -3135,11 +3119,6 @@
msgstr "година"
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3147,7 +3126,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr "Ðе може да изтриете фактура(и) които вече Ñа отворени или платени !"
@@ -3163,9 +3142,11 @@
msgstr "ТранÑфери"
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
-msgstr ""
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr "ÐебаланÑиран"
#. module: account
#: view:account.chart:0
@@ -3210,7 +3191,7 @@
"ÑÑŠÑтоÑние \"Отменени\" или \"Готови\"!"
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3221,6 +3202,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr "Съконтрагент"
@@ -3325,6 +3307,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3368,7 +3351,7 @@
msgstr "Диаграма на шаблони на Ñметка"
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3377,13 +3360,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr "ÐÑкой запиÑи вече Ñа били приравнени !"
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
@@ -3506,7 +3489,7 @@
msgstr "Ðналитични артикули"
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr "Ðе може да Ñе ÑÐ¼ÐµÐ½Ñ Ð´Ð°Ð½ÑŠÐºÐ° !"
@@ -3517,14 +3500,14 @@
msgstr "#ЗапиÑи"
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3820,7 +3803,7 @@
msgstr "Вид Ñметка"
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr "Общите данъци Ñа зададени, но не Ñа в редовете на фактурата !"
@@ -3879,7 +3862,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr "ÐÑма зададена Ñметка разходи за този продукт: \"%s\" (id:%d)"
@@ -4054,7 +4037,7 @@
msgstr "кредитни извеÑтиÑ"
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -4106,6 +4089,15 @@
msgstr "Данъци включени в цената"
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4127,11 +4119,11 @@
msgstr "ПромÑна"
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4184,13 +4176,6 @@
msgstr "Грешка! Ðе могат да бъдат Ñъздавани рекурÑивни Ñметки."
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4235,7 +4220,7 @@
msgstr "ТрÑбва да зададете аналитичен дневник от вид '%s' !"
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4267,6 +4252,15 @@
msgstr "Ð‘Ð°Ð»Ð°Ð½Ñ Ð¿Ð¾ Ñметка -"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr "Фактура "
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr "Ðачална дата"
@@ -4300,7 +4294,7 @@
msgstr "Фактури"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid ""
"Please verify the price of the invoice !\n"
@@ -4414,30 +4408,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
-msgstr "Грешка"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
+msgstr ""
#. module: account
#: field:account.analytic.Journal.report,date2:0
@@ -4454,7 +4431,7 @@
msgstr "Детайли за банката"
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr "ЛипÑват данъци !"
@@ -4509,7 +4486,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4530,7 +4507,7 @@
msgstr "Подчинени Ñметки за данъци"
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4560,6 +4537,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4643,7 +4621,7 @@
msgstr "Ред 1:"
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr "Грешка за цÑлоÑтноÑÑ‚ !"
@@ -4783,13 +4761,7 @@
msgstr "Данък върху подчинени"
#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4863,7 +4835,7 @@
"Дата=15.01, Брой дни=22, Ден от меÑеца=-1, тогава дата на изпъление е 28.02."
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4891,7 +4863,7 @@
msgstr "Ðачало на период"
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid ""
"You can not do this modification on a reconciled entry ! Please note that "
@@ -4949,12 +4921,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -5031,7 +5003,7 @@
msgstr "Сортиране по"
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid ""
"There is no default default credit account defined \n"
@@ -5181,7 +5153,7 @@
msgstr "Създаване на начални запиÑи"
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr "Вече равнено!"
@@ -5217,7 +5189,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr "ОтпиÑване"
@@ -5354,7 +5326,7 @@
msgstr "# Редове"
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr "Ðовата валута не е наÑтроена правилно!"
@@ -5379,14 +5351,14 @@
msgstr "Подреждане по"
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr "Ðе може да използвате неактивна Ñметка!"
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr "ЗапиÑите не Ñа от Ñъщата Ñметка или не Ñа изравнени ! "
@@ -5421,7 +5393,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr "Ðевалидно дейÑтвие !"
@@ -5632,7 +5604,7 @@
msgstr "ПредприÑтиÑ"
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid ""
"You cannot modify Company of account as its related record exist in Entry "
@@ -5904,9 +5876,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -6057,8 +6029,8 @@
msgstr "СтатиÑтика на аналитични запиÑи"
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr "ЗапиÑи: "
@@ -6069,7 +6041,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr "Ðе може да Ñъздаде движение между различни фирми"
@@ -6107,7 +6079,7 @@
msgstr "Общ дебит"
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr "Ð—Ð°Ð¿Ð¸Ñ \"%s\" е невалиден !"
@@ -6173,30 +6145,31 @@
msgstr " оценка: процент"
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6255,6 +6228,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6309,7 +6287,7 @@
msgstr "Избор на дневник"
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr "Текущата валута не е наÑтроена правилно!"
@@ -6326,9 +6304,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr "Главна Ñчетоводна книга"
@@ -6382,7 +6362,7 @@
msgstr "Общо:"
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6420,7 +6400,7 @@
msgstr "Подчинени кодове"
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6579,7 +6559,7 @@
msgstr "Редове"
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid ""
"Can not find account chart for this company in invoice line account, Please "
@@ -6752,7 +6732,7 @@
"програмиÑтите да Ñъздадат Ñпецифичен данък в потребителÑки домейн."
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6856,7 +6836,7 @@
msgstr "ÐŸÐ¾Ð´Ð¿Ð¸Ñ Ð²ÑŠÑ€Ñ…Ñƒ Ñправки"
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -6885,7 +6865,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr "Проформа"
@@ -6897,11 +6876,9 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
-msgstr "ÐебаланÑиран"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+msgstr ""
#. module: account
#: selection:account.move.line,centralisation:0
@@ -6915,6 +6892,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6942,13 +6920,13 @@
"крайна дата за плащането на този ред."
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr "Грешна Ñметка !"
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6966,7 +6944,7 @@
msgstr "Данък на фактура"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr "ÐÑма номер на цена !"
@@ -7208,17 +7186,17 @@
msgstr "ФикÑиран"
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr "Предупреждение !"
@@ -7241,15 +7219,11 @@
msgstr "ПреÑмÑтане на абонамент"
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr "Сума (Ñловом):"
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -7280,7 +7254,7 @@
msgstr "Ðе може да %s проект/проформа/отказ на фактура"
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr "ÐÑма фактурни редове!"
@@ -7329,7 +7303,7 @@
msgstr "Отложен метод"
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr "Фактура '%s' е платена."
@@ -7392,7 +7366,7 @@
msgstr "ÐÑоцииран партньор"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr "Първо Ñ‚Ñ€Ñбва да изберете партньор !"
@@ -7457,7 +7431,7 @@
msgstr "Изберете финанÑова година"
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -7492,6 +7466,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7658,7 +7633,7 @@
msgstr "Видове Ñметки"
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr ""
@@ -7709,6 +7684,7 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
msgid "Filter By"
msgstr "Филтриране по"
@@ -7747,7 +7723,7 @@
msgstr "Ред на уÑловие за плащане"
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7915,8 +7891,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr "Грешна Ñметка!"
@@ -7927,7 +7903,7 @@
msgstr "ОÑтавете празно за вÑички отворени данъчни години"
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr "Движение по Ñметка (%s) за централизиране е потвърдено!"
@@ -7949,6 +7925,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -8123,14 +8100,14 @@
msgstr "Период от"
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr "Дневник Ð¾Ð±ÐµÐ·Ñ‰ÐµÑ‚ÐµÐ½Ð¸Ñ Ð·Ð° продажби"
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid ""
"You cannot modify company of this period as its related record exist in "
@@ -8179,7 +8156,7 @@
msgstr "Данък покупка (%)"
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8195,7 +8172,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -8237,6 +8214,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8246,7 +8224,7 @@
msgstr "Ðачало на период"
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
@@ -8283,7 +8261,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8311,19 +8289,35 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr "Текущата валута не наÑтроена правилно!"
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
-msgstr ""
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
+msgstr "Грешка"
#. module: account
#: view:account.account.template:0
@@ -8331,11 +8325,6 @@
msgstr "Сметки вземаниÑ"
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr "Печалба и загуби (приходни Ñметки)"
@@ -8360,6 +8349,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8378,6 +8368,7 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
msgid "Display Account"
msgstr "Показване на Ñметка"
@@ -8472,11 +8463,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8492,6 +8478,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -8499,7 +8486,7 @@
msgstr "ПремеÑтване"
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -8596,6 +8583,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8639,7 +8627,7 @@
msgstr "Ðбонамент за Ñметка"
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid ""
"Tax base different !\n"
@@ -8668,6 +8656,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8696,7 +8685,7 @@
msgstr "Ðеприравнен"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr "Грешна обща Ñума !"
@@ -8754,13 +8743,13 @@
msgstr "Ðктивен"
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr "Ðепозната грешка"
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid ""
"You cannot validate a non-balanced entry !\n"
@@ -8805,10 +8794,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8827,11 +8816,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr "Чрез :"
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -9013,11 +8997,6 @@
msgstr "Вътрешен тип"
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr "СъÑтоÑние:"
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr "ИзпълнÑващи Ñе абонаменти"
@@ -9044,7 +9023,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr "Публикувано"
@@ -9063,6 +9041,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -9116,7 +9095,7 @@
msgstr "Този модел е за повтарÑщи Ñе запиÑи на Ñметка"
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr "ÐÑма зададена приходна Ñметка за продукта: \"%s\" (id:%d)"
@@ -9266,8 +9245,8 @@
msgstr "Край на периода"
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9287,15 +9266,15 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
-msgstr "Движение на отпиÑване"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Приключен"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -9333,10 +9312,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9357,20 +9336,12 @@
msgstr "Грешка! Ðе може да Ñъздавате рекурÑивни шаблони за Ñметки."
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr "ПовтарÑщо Ñе"
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr "ЗапиÑа вече е приравнен"
@@ -9391,7 +9362,7 @@
msgstr "Обхват"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid ""
"Can not create an automatic sequence for this piece !\n"
@@ -9521,7 +9492,7 @@
msgstr "Свързване на Ñметки"
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr "Фактура '%s' очаква проверка."
@@ -9546,7 +9517,7 @@
msgstr "Сметката за приходи или разходи Ñвързана Ñ Ð¸Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð´ÑƒÐºÑ‚."
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -9752,7 +9723,7 @@
"ТрÑбва да въведете дължина на период, коÑто не може да бъде 0 или по-малко."
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
@@ -9776,6 +9747,7 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
#~ msgid "Keep empty to use the period of the validation date."
#~ msgstr "ОÑтавете празно за да бъде изпозван периода на проверка на дадата."
@@ -10523,3 +10495,29 @@
#, python-format
#~ msgid "is validated."
#~ msgstr "е валидирано."
+=======
+
+#~ msgid "Print Voucher"
+#~ msgstr "Отпечатване на ваучер"
+
+#~ msgid "Ref. :"
+#~ msgstr "Реф. :"
+
+#~ msgid "Canceled"
+#~ msgstr "Отменени"
+
+#~ msgid "Number:"
+#~ msgstr "Ðомер:"
+
+#~ msgid "Journal:"
+#~ msgstr "Дневник:"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Сума (Ñловом):"
+
+#~ msgid "Through :"
+#~ msgstr "Чрез :"
+
+#~ msgid "State:"
+#~ msgstr "СъÑтоÑние:"
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/br.po'
--- account/i18n/br.po 2011-04-29 05:56:18 +0000
+++ account/i18n/br.po 2011-05-13 11:11:47 +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: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2010-12-12 09:25+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: Breton <br@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: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-05-10 07:12+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,13 +38,7 @@
msgstr "Kefluniadur all"
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -66,7 +70,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr ""
@@ -131,7 +135,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr ""
@@ -175,7 +179,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr ""
@@ -227,7 +231,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
@@ -255,7 +259,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -271,7 +275,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr "N'hallit ket ouzhpennañ/kemmañ enmontoù en ur marilh serr"
@@ -309,7 +313,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -551,7 +555,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr ""
@@ -633,7 +637,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -666,8 +670,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -728,7 +732,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -829,7 +833,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -951,11 +955,11 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -1034,7 +1038,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1120,6 +1123,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1127,7 +1131,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1265,7 +1269,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr ""
@@ -1295,7 +1298,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr ""
@@ -1388,7 +1391,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
@@ -1402,14 +1405,9 @@
msgstr ""
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
msgstr ""
#. module: account
@@ -1547,7 +1545,6 @@
msgstr ""
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@@ -1591,11 +1588,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr ""
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1614,7 +1606,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr ""
@@ -1647,7 +1639,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr ""
@@ -1663,11 +1655,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr ""
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr ""
@@ -1683,7 +1670,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1704,7 +1691,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr ""
@@ -1720,7 +1707,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1880,11 +1867,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr ""
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -1989,7 +1971,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2041,7 +2023,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2061,7 +2043,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2072,6 +2054,7 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2100,6 +2083,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2208,7 +2192,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2278,7 +2262,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2362,7 +2346,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2374,13 +2358,12 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr ""
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
@@ -2416,6 +2399,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2524,16 +2508,16 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2582,11 +2566,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr ""
@@ -2693,7 +2672,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2810,6 +2789,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2817,6 +2797,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2907,6 +2890,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2925,6 +2914,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -2985,7 +2975,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3015,11 +3005,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3027,7 +3012,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -3067,11 +3051,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3079,7 +3058,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr ""
@@ -3095,8 +3074,10 @@
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
msgstr ""
#. module: account
@@ -3140,7 +3121,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3149,6 +3130,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr ""
@@ -3251,6 +3233,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3294,7 +3277,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3303,13 +3286,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
@@ -3429,7 +3412,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3440,14 +3423,14 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3741,7 +3724,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr ""
@@ -3800,7 +3783,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -3975,7 +3958,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -4025,6 +4008,15 @@
msgstr ""
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4046,11 +4038,11 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4103,13 +4095,6 @@
msgstr ""
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4154,7 +4139,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4186,6 +4171,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr ""
@@ -4219,7 +4213,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid ""
"Please verify the price of the invoice !\n"
@@ -4331,29 +4325,12 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
msgstr ""
#. module: account
@@ -4371,7 +4348,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr ""
@@ -4426,7 +4403,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4445,7 +4422,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4475,6 +4452,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4557,7 +4535,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr ""
@@ -4697,13 +4675,7 @@
msgstr ""
#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4775,7 +4747,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4803,7 +4775,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid ""
"You can not do this modification on a reconciled entry ! Please note that "
@@ -4859,12 +4831,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -4941,7 +4913,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid ""
"There is no default default credit account defined \n"
@@ -5088,7 +5060,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -5124,7 +5096,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr ""
@@ -5261,7 +5233,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr ""
@@ -5286,14 +5258,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5328,7 +5300,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5539,7 +5511,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid ""
"You cannot modify Company of account as its related record exist in Entry "
@@ -5805,9 +5777,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -5956,8 +5928,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr ""
@@ -5968,7 +5940,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -6006,7 +5978,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -6070,30 +6042,31 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6152,6 +6125,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6203,7 +6181,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr ""
@@ -6220,9 +6198,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr ""
@@ -6276,7 +6256,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6306,7 +6286,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6463,7 +6443,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid ""
"Can not find account chart for this company in invoice line account, Please "
@@ -6631,7 +6611,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6735,7 +6715,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -6764,7 +6744,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr ""
@@ -6776,10 +6755,8 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
msgstr ""
#. module: account
@@ -6794,6 +6771,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6819,13 +6797,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6843,7 +6821,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7077,17 +7055,17 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr ""
@@ -7110,15 +7088,11 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -7149,7 +7123,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7198,7 +7172,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -7259,7 +7233,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -7324,7 +7298,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -7359,6 +7333,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7521,7 +7496,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr ""
@@ -7571,6 +7546,7 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
msgid "Filter By"
msgstr ""
@@ -7609,7 +7585,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7776,8 +7752,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr ""
@@ -7788,7 +7764,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -7809,6 +7785,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -7981,14 +7958,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid ""
"You cannot modify company of this period as its related record exist in "
@@ -8037,7 +8014,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8053,7 +8030,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -8091,6 +8068,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8100,7 +8078,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
@@ -8137,7 +8115,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8165,18 +8143,34 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
msgstr ""
#. module: account
@@ -8185,11 +8179,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr ""
@@ -8214,6 +8203,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8232,6 +8222,7 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
msgid "Display Account"
msgstr ""
@@ -8326,11 +8317,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8346,6 +8332,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -8353,7 +8340,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -8447,6 +8434,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8490,7 +8478,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid ""
"Tax base different !\n"
@@ -8517,6 +8505,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8545,7 +8534,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr ""
@@ -8603,13 +8592,13 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid ""
"You cannot validate a non-balanced entry !\n"
@@ -8652,10 +8641,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8674,11 +8663,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -8860,11 +8844,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr ""
@@ -8891,7 +8870,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr ""
@@ -8910,6 +8888,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8963,7 +8942,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -9113,8 +9092,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9134,14 +9113,14 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
msgstr ""
#. module: account
@@ -9180,10 +9159,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9204,20 +9183,12 @@
msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -9238,7 +9209,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid ""
"Can not create an automatic sequence for this piece !\n"
@@ -9368,7 +9339,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -9393,7 +9364,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -9598,7 +9569,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
=== modified file 'account/i18n/bs.po'
--- account/i18n/bs.po 2011-04-29 05:56:18 +0000
+++ account/i18n/bs.po 2011-05-13 11:11:47 +0000
@@ -6,15 +6,25 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2010-12-11 15:12+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Fabien (Open ERP) <fp@xxxxxxxxxxx>\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: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-05-10 07:12+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,13 +37,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -65,7 +69,7 @@
msgstr "Ostatak"
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr ""
@@ -130,7 +134,7 @@
msgstr "RaÄunovodstvene stavke-"
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr ""
@@ -174,7 +178,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr ""
@@ -226,7 +230,7 @@
msgstr "account.tax"
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
@@ -258,7 +262,7 @@
"pojavljuje na fakturama."
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -274,7 +278,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -312,7 +316,7 @@
msgstr "St."
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -554,7 +558,7 @@
msgstr "Neusklađene transakcije"
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr ""
@@ -638,7 +642,7 @@
msgstr "Iznos Å¡ifre poreza"
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -671,8 +675,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -733,7 +737,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -834,7 +838,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -956,11 +960,11 @@
msgstr "Å ifra"
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -1039,7 +1043,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1125,6 +1128,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1132,7 +1136,7 @@
msgstr "Oznaka stavke"
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1270,7 +1274,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr ""
@@ -1300,7 +1303,7 @@
msgstr "Glavni nalog za knjiženje"
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr ""
@@ -1393,7 +1396,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
@@ -1407,15 +1410,10 @@
msgstr ""
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
-msgstr "Zatvoreno"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Otpiši prijenos"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1552,7 +1550,6 @@
msgstr "Razdvojeni redoslijedi naloga za knjiženje"
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@@ -1596,11 +1593,6 @@
msgstr "Godišnja suma"
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr ""
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1619,7 +1611,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr ""
@@ -1652,7 +1644,7 @@
msgstr "Potraživanja i dugovanja"
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr ""
@@ -1668,11 +1660,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr ""
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr "AnalitiÄki kontni planovi"
@@ -1688,7 +1675,7 @@
msgstr "Referenca kupca"
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1709,7 +1696,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr ""
@@ -1725,7 +1712,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1887,11 +1874,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr ""
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -1998,7 +1980,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2050,7 +2032,7 @@
msgstr "Opis"
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2070,7 +2052,7 @@
msgstr "Konto prihoda"
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2081,6 +2063,7 @@
msgstr "Svojstva raÄunovodstva"
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2109,6 +2092,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2217,7 +2201,7 @@
msgstr "Å ifra poreza"
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2287,7 +2271,7 @@
msgstr "Stavke raÄuna modela"
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2376,7 +2360,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2388,13 +2372,12 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr "Datum:"
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
@@ -2430,6 +2413,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2538,16 +2522,16 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2596,11 +2580,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr "Broj reference"
@@ -2707,7 +2686,7 @@
msgstr "AnalitiÄke stavke"
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2831,6 +2810,7 @@
msgstr "Prikaz"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2838,6 +2818,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2928,6 +2911,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2946,6 +2935,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3006,7 +2996,7 @@
msgstr "PoÄetni saldo"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3036,11 +3026,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3048,7 +3033,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -3088,11 +3072,6 @@
msgstr "Godina"
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3100,7 +3079,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr ""
@@ -3116,8 +3095,10 @@
msgstr "Prijenosi"
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
msgstr ""
#. module: account
@@ -3161,7 +3142,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3170,6 +3151,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr ""
@@ -3273,6 +3255,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3316,7 +3299,7 @@
msgstr "Predložak kontnog plana"
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3325,13 +3308,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
@@ -3454,7 +3437,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3465,14 +3448,14 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3766,7 +3749,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr ""
@@ -3825,7 +3808,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -4000,7 +3983,7 @@
msgstr "Knjižna odobrenja"
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -4052,6 +4035,15 @@
msgstr "Porez ukljuÄen u cijenu"
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4073,11 +4065,11 @@
msgstr "Promjeni"
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4130,13 +4122,6 @@
msgstr "Greška: ne mogu se praviti rekurzivni nalozi."
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4181,7 +4166,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4213,6 +4198,15 @@
msgstr "Saldo raÄuna -"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr ""
@@ -4246,7 +4240,7 @@
msgstr "Fakture"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid ""
"Please verify the price of the invoice !\n"
@@ -4358,29 +4352,12 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
msgstr ""
#. module: account
@@ -4398,7 +4375,7 @@
msgstr "Detalji banke"
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr ""
@@ -4453,7 +4430,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4472,7 +4449,7 @@
msgstr "Konta potporeza."
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4502,6 +4479,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4584,7 +4562,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr ""
@@ -4724,13 +4702,7 @@
msgstr "DjeÄiji porez"
#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4804,7 +4776,7 @@
"dana=22, dan u mjesecu=-1, onda je datum dospjeća 28.02."
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4832,7 +4804,7 @@
msgstr "PoÄetak razdoblja"
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid ""
"You can not do this modification on a reconciled entry ! Please note that "
@@ -4888,12 +4860,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -4970,7 +4942,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid ""
"There is no default default credit account defined \n"
@@ -5119,7 +5091,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -5155,7 +5127,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr "Otpis"
@@ -5292,7 +5264,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr ""
@@ -5317,14 +5289,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5359,7 +5331,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5570,7 +5542,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid ""
"You cannot modify Company of account as its related record exist in Entry "
@@ -5840,9 +5812,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -5991,8 +5963,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr ""
@@ -6003,7 +5975,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -6041,7 +6013,7 @@
msgstr "Ukupan dug"
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -6107,30 +6079,31 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6189,6 +6162,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6240,7 +6218,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr ""
@@ -6257,9 +6235,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr "Glavna knjiga"
@@ -6313,7 +6293,7 @@
msgstr "Ukupno:"
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6343,7 +6323,7 @@
msgstr "Podšifre"
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6502,7 +6482,7 @@
msgstr "Retci"
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid ""
"Can not find account chart for this company in invoice line account, Please "
@@ -6675,7 +6655,7 @@
"razvijateljima da stvaraju posebne poreze u vlastitoj domeni."
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6779,7 +6759,7 @@
msgstr "Predznak u izvješćima"
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -6808,7 +6788,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr "PRO-FORMA"
@@ -6820,10 +6799,8 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
msgstr ""
#. module: account
@@ -6838,6 +6815,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6863,13 +6841,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6887,7 +6865,7 @@
msgstr "Porez fakture"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7129,17 +7107,17 @@
msgstr "Fiksno"
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr ""
@@ -7162,15 +7140,11 @@
msgstr "IzraÄun pretplate"
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -7201,7 +7175,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7250,7 +7224,7 @@
msgstr "NaÄin odgode"
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -7313,7 +7287,7 @@
msgstr "Vezani partner"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -7378,7 +7352,7 @@
msgstr "Odaberite fiskalnu godinu"
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -7413,6 +7387,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7577,7 +7552,7 @@
msgstr "Tipovi konta"
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr ""
@@ -7627,6 +7602,7 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
msgid "Filter By"
msgstr ""
@@ -7665,7 +7641,7 @@
msgstr "Redak uvjeta plaćanja"
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7833,8 +7809,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr ""
@@ -7845,7 +7821,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -7866,6 +7842,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -8040,14 +8017,14 @@
msgstr "Razdoblje od"
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid ""
"You cannot modify company of this period as its related record exist in "
@@ -8096,7 +8073,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8112,7 +8089,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -8150,6 +8127,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8159,7 +8137,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
@@ -8196,7 +8174,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8224,18 +8202,34 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
msgstr ""
#. module: account
@@ -8244,11 +8238,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr ""
@@ -8273,6 +8262,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8291,6 +8281,7 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
msgid "Display Account"
msgstr ""
@@ -8385,11 +8376,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8405,6 +8391,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -8412,7 +8399,7 @@
msgstr "Prijenos"
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -8506,6 +8493,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8549,7 +8537,7 @@
msgstr "Konto pretplate"
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid ""
"Tax base different !\n"
@@ -8576,6 +8564,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8604,7 +8593,7 @@
msgstr "Neusklađen"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr ""
@@ -8662,13 +8651,13 @@
msgstr "Aktivan"
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid ""
"You cannot validate a non-balanced entry !\n"
@@ -8713,10 +8702,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8735,11 +8724,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -8921,11 +8905,6 @@
msgstr "Interni tip"
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr "Pretplate koje su u tijeku"
@@ -8952,7 +8931,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr "Proknjiženo"
@@ -8971,6 +8949,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -9024,7 +9003,7 @@
msgstr "Ovo je model za ponavljajuće raÄunovodstvene unose"
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -9174,8 +9153,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9195,15 +9174,15 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
-msgstr "Otpiši prijenos"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Zatvoreno"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -9241,10 +9220,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9265,20 +9244,12 @@
msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -9299,7 +9270,7 @@
msgstr "Raspon"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid ""
"Can not create an automatic sequence for this piece !\n"
@@ -9429,7 +9400,7 @@
msgstr "Mapiranje konta"
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -9454,7 +9425,7 @@
msgstr "RaÄun prihoda ili troÅ¡kova vezan za odabrani proizvod."
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -9659,7 +9630,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
=== modified file 'account/i18n/ca.po'
--- account/i18n/ca.po 2011-04-29 05:56:18 +0000
+++ account/i18n/ca.po 2011-05-13 11:11:47 +0000
@@ -6,16 +6,26 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-03-26 18:10+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-02-24 17:24+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@xxxxxxxxxxxxxxx>\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: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-05-10 07:13+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,13 +38,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -66,7 +70,7 @@
msgstr "Pendent"
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr ""
@@ -131,7 +135,7 @@
msgstr "Assentaments comptables"
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr "No podeu eliminar el moviment fixat: \"%s\"!"
@@ -175,7 +179,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr ""
@@ -227,7 +231,7 @@
msgstr "account.tax"
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
@@ -259,7 +263,7 @@
"d'impost aparegui en les factures."
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -275,7 +279,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr "No podeu afegir/modificar assentaments en un diari tancat."
@@ -313,7 +317,7 @@
msgstr "Est."
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -555,7 +559,7 @@
msgstr "Transaccions no conciliades"
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr ""
@@ -640,7 +644,7 @@
msgstr "Import codi impost"
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -673,8 +677,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -735,7 +739,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -836,7 +840,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -960,11 +964,11 @@
msgstr "Codi"
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -1043,7 +1047,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1129,6 +1132,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1136,7 +1140,7 @@
msgstr "Etiqueta assentament"
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1275,7 +1279,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr ""
@@ -1305,7 +1308,7 @@
msgstr "Diari central"
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr "No podeu utilitzar aquest compte general en aquest diari!"
@@ -1398,7 +1401,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
@@ -1412,15 +1415,10 @@
msgstr ""
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
-msgstr "Tancament"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Moviment de desajust"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1557,7 +1555,6 @@
msgstr "Seqüències de diaris separades"
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@@ -1601,11 +1598,6 @@
msgstr "Suma de l'any"
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr ""
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1624,7 +1616,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr "El compte no s'ha definit per ser conciliat!"
@@ -1657,7 +1649,7 @@
msgstr "Comptes a cobrar i pagar"
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr "Heu d'indicar un compte per l'assentament d'ajust!"
@@ -1673,11 +1665,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr ""
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr "Plans de comptes analÃtics"
@@ -1693,7 +1680,7 @@
msgstr "Ref. client:"
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1714,7 +1701,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr "No podeu desactivar un compte que conté assentaments comptables."
@@ -1730,7 +1717,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1894,11 +1881,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr ""
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -2005,7 +1987,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2057,7 +2039,7 @@
msgstr "Descripció"
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2077,7 +2059,7 @@
msgstr "Compte d'ingressos"
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr "No s'ha definit un diari comptable de tipus Venda/Compra!"
@@ -2088,6 +2070,7 @@
msgstr "Propietats de comptabilitat"
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2116,6 +2099,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2226,7 +2210,7 @@
msgstr "Codi impost comptable"
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2296,7 +2280,7 @@
msgstr "LÃniees de model d'assentament"
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2385,7 +2369,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr "Error de configuració!"
@@ -2397,13 +2381,12 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr "Data:"
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
@@ -2439,6 +2422,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2547,16 +2531,16 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2605,11 +2589,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr "Número de referència"
@@ -2717,7 +2696,7 @@
msgstr "Entrades analÃtiques"
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2843,6 +2822,7 @@
msgstr "Vista"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2850,6 +2830,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2940,6 +2923,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2958,6 +2947,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3018,7 +3008,7 @@
msgstr "Saldo inicial"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr "No s'ha definit empresa!"
@@ -3048,11 +3038,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3060,7 +3045,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -3100,11 +3084,6 @@
msgstr "any"
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3112,7 +3091,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr "No es poden esborrar factures obertes o pagades!"
@@ -3128,8 +3107,10 @@
msgstr "Transferències"
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
msgstr ""
#. module: account
@@ -3173,7 +3154,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3184,6 +3165,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr ""
@@ -3288,6 +3270,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3331,7 +3314,7 @@
msgstr "Plantilla del pla comptable"
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3340,13 +3323,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr "Alguns assentaments ja estan conciliats!"
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
@@ -3470,7 +3453,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr "No ha estat possible canviar l'impost!"
@@ -3481,14 +3464,14 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3784,7 +3767,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr "Impostos globals definits, però no estan en lÃnies de la factura!"
@@ -3843,7 +3826,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -4018,7 +4001,7 @@
msgstr "Factures rectificatives (abonament)"
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -4070,6 +4053,15 @@
msgstr "Impostos inclosos en preu"
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4091,11 +4083,11 @@
msgstr "Canvia"
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4148,13 +4140,6 @@
msgstr "Error! No es poden crear comptes recursius."
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4199,7 +4184,7 @@
msgstr "Heu de definir un diari analÃtic de tipus «%s»!"
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4231,6 +4216,15 @@
msgstr "Balanç compte -"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr ""
@@ -4264,7 +4258,7 @@
msgstr "Factures"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid ""
"Please verify the price of the invoice !\n"
@@ -4378,30 +4372,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
-msgstr "Error"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
+msgstr ""
#. module: account
#: field:account.analytic.Journal.report,date2:0
@@ -4418,7 +4395,7 @@
msgstr "Detalls del banc"
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr "Falten impostos!"
@@ -4473,7 +4450,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4495,7 +4472,7 @@
msgstr "Comptes impostos filles"
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4525,6 +4502,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4607,7 +4585,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr "Error d'integritat!"
@@ -4747,13 +4725,7 @@
msgstr "Impost en fills"
#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4827,7 +4799,7 @@
"Número de dies=22, Dia de mes=-1, llavors la data de venciment és 28/02."
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4855,7 +4827,7 @@
msgstr "Inici del perÃode"
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid ""
"You can not do this modification on a reconciled entry ! Please note that "
@@ -4913,12 +4885,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -4995,7 +4967,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid ""
"There is no default default credit account defined \n"
@@ -5146,7 +5118,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -5182,7 +5154,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr "Desajust"
@@ -5319,7 +5291,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr ""
@@ -5344,14 +5316,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr "No podeu utilitzar un compte inactiu!"
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr "Assentaments no són del mateix compte o ja estan conciliats! "
@@ -5386,7 +5358,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr "Acció no và lida!"
@@ -5597,7 +5569,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid ""
"You cannot modify Company of account as its related record exist in Entry "
@@ -5866,9 +5838,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -6019,8 +5991,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr "Assentaments: "
@@ -6031,7 +6003,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr "No s'ha pogut crear moviment entre diferents companyies"
@@ -6069,7 +6041,7 @@
msgstr "Total deure"
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr "L'assentament \"%s\" no és và lid!"
@@ -6135,30 +6107,31 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6217,6 +6190,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6268,7 +6246,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr ""
@@ -6285,9 +6263,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr "Llibre major"
@@ -6341,7 +6321,7 @@
msgstr "Total:"
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6371,7 +6351,7 @@
msgstr "Codis fills"
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6532,7 +6512,7 @@
msgstr "LÃnies"
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid ""
"Can not find account chart for this company in invoice line account, Please "
@@ -6706,7 +6686,7 @@
"personalitzada."
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6810,7 +6790,7 @@
msgstr "Signe en informes"
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -6839,7 +6819,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr "PRO-FORMA"
@@ -6851,10 +6830,8 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
msgstr ""
#. module: account
@@ -6869,6 +6846,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6894,13 +6872,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr "Compte incorrecte!"
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6918,7 +6896,7 @@
msgstr "Impost de factura"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr "Cap tros de número!"
@@ -7160,17 +7138,17 @@
msgstr "Fix"
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr "Atenció!"
@@ -7193,15 +7171,11 @@
msgstr "Calcula assentaments periòdics"
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -7232,7 +7206,7 @@
msgstr "No es pot %s factura esborrany/proforma/cancel.lada."
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7281,7 +7255,7 @@
msgstr "Mètode tancament"
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -7344,7 +7318,7 @@
msgstr "Empresa associada"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr "Primer heu de seleccionar una empresa!"
@@ -7409,7 +7383,7 @@
msgstr "Escolliu l'exercici fiscal"
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -7445,6 +7419,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7609,7 +7584,7 @@
msgstr "Tipus de comptes"
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr "No es pot crear un assentament de factura en un compte centralitzat"
@@ -7659,6 +7634,7 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
msgid "Filter By"
msgstr ""
@@ -7697,7 +7673,7 @@
msgstr "LÃnia de termini de pagament"
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7865,8 +7841,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr "Compte incorrecte!"
@@ -7877,7 +7853,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -7900,6 +7876,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -8074,14 +8051,14 @@
msgstr "PerÃode des de"
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid ""
"You cannot modify company of this period as its related record exist in "
@@ -8130,7 +8107,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8146,7 +8123,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -8184,6 +8161,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8193,7 +8171,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
@@ -8230,7 +8208,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8260,19 +8238,35 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
-msgstr ""
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
+msgstr "Error"
#. module: account
#: view:account.account.template:0
@@ -8280,11 +8274,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr ""
@@ -8309,6 +8298,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8327,6 +8317,7 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
msgid "Display Account"
msgstr ""
@@ -8421,11 +8412,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8441,6 +8427,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -8448,7 +8435,7 @@
msgstr "Assent."
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr "No es pot canviar l'impost, ha d'eliminar i recrear les lÃnies!"
@@ -8544,6 +8531,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8587,7 +8575,7 @@
msgstr "Subscripció de comptabilitat"
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid ""
"Tax base different !\n"
@@ -8614,6 +8602,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8642,7 +8631,7 @@
msgstr "No conciliat"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr "Total erroni!"
@@ -8700,13 +8689,13 @@
msgstr "Actiu"
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid ""
"You cannot validate a non-balanced entry !\n"
@@ -8751,10 +8740,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8773,11 +8762,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -8959,11 +8943,6 @@
msgstr "Tipus intern"
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr "Assentaments periòdics en procés"
@@ -8990,7 +8969,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr "Fixat"
@@ -9009,6 +8987,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -9062,7 +9041,7 @@
msgstr "Aquest és un model per assentaments comptable recurrent"
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -9212,8 +9191,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9233,15 +9212,15 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
-msgstr "Moviment de desajust"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Tancament"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -9279,10 +9258,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9303,20 +9282,12 @@
msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr "L'assentament ja està conciliat"
@@ -9337,7 +9308,7 @@
msgstr "Rang"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid ""
"Can not create an automatic sequence for this piece !\n"
@@ -9471,7 +9442,7 @@
msgstr "Mapa de relacions de comptes"
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -9497,7 +9468,7 @@
"El compte d'ingressos o despeses relacionada amb el producte seleccionat."
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -9702,7 +9673,7 @@
msgstr "Heu d'introduir una longitud de perÃode que no pot ser 0 o inferior!"
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr "No podeu eliminar un compte que conté assentaments comptables. "
=== modified file 'account/i18n/cs.po'
--- account/i18n/cs.po 2011-05-02 18:46:43 +0000
+++ account/i18n/cs.po 2011-05-13 11:11:47 +0000
@@ -6,15 +6,26 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-01-26 09:56+0000\n"
"Last-Translator: Pavel Stejskal <Unknown>\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-03-28 13:20+0000\n"
+"Last-Translator: whiteagle <vomacko@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"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: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-05-10 07:13+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,13 +38,7 @@
msgstr "Ostatnà nastavenÃ"
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -67,7 +72,7 @@
msgstr "Zbytek"
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr "ProsÃm nadefinujte sekvenci knihy faktur"
@@ -134,7 +139,7 @@
msgstr "ÚÄetnà zápisy"
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr ""
@@ -178,7 +183,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr "VarovánÃ!"
@@ -230,7 +235,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
@@ -258,7 +263,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -274,7 +279,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -312,7 +317,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -554,7 +559,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr ""
@@ -636,7 +641,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -669,8 +674,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -731,7 +736,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -832,7 +837,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -954,11 +959,11 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -1037,7 +1042,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1123,6 +1127,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1130,7 +1135,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1268,7 +1273,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr ""
@@ -1298,7 +1302,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr ""
@@ -1391,7 +1395,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
@@ -1405,15 +1409,10 @@
msgstr ""
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
-msgstr ""
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Přesun odpisu(Write-Off Move)"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1550,7 +1549,6 @@
msgstr ""
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@@ -1594,11 +1592,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr ""
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1617,7 +1610,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr ""
@@ -1650,7 +1643,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr ""
@@ -1666,11 +1659,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr ""
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr ""
@@ -1686,7 +1674,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1707,7 +1695,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr ""
@@ -1723,7 +1711,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1883,11 +1871,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr ""
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -1992,7 +1975,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2044,7 +2027,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2064,7 +2047,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2075,6 +2058,7 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2103,6 +2087,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2211,7 +2196,7 @@
msgstr "Daňový kód úÄtu"
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2281,7 +2266,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2365,7 +2350,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr "KonfiguraÄnà chyba!"
@@ -2377,13 +2362,12 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr "Datum:"
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
@@ -2419,6 +2403,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2527,16 +2512,16 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2585,11 +2570,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr ""
@@ -2696,7 +2676,7 @@
msgstr "Analytická PÅ™ÃspÄ›vky"
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2813,6 +2793,7 @@
msgstr "Pohled"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2820,6 +2801,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2910,6 +2894,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2928,6 +2918,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -2988,7 +2979,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3018,11 +3009,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3030,7 +3016,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -3070,11 +3055,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3082,7 +3062,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr ""
@@ -3098,8 +3078,10 @@
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
msgstr ""
#. module: account
@@ -3143,7 +3125,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3152,6 +3134,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr ""
@@ -3254,6 +3237,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3297,7 +3281,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3306,13 +3290,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
@@ -3432,7 +3416,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3443,14 +3427,14 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3744,7 +3728,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr ""
@@ -3803,7 +3787,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -3978,7 +3962,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -4028,6 +4012,15 @@
msgstr ""
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4049,11 +4042,11 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4106,13 +4099,6 @@
msgstr ""
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4157,7 +4143,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4189,6 +4175,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr ""
@@ -4222,7 +4217,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid ""
"Please verify the price of the invoice !\n"
@@ -4334,29 +4329,12 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
msgstr ""
#. module: account
@@ -4374,7 +4352,7 @@
msgstr "Detaily o bance"
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr ""
@@ -4429,7 +4407,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4448,7 +4426,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4478,6 +4456,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4560,7 +4539,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr "Chyba integrity !"
@@ -4700,13 +4679,7 @@
msgstr "Daň z dÄ›tÃ"
#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4778,7 +4751,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4806,7 +4779,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid ""
"You can not do this modification on a reconciled entry ! Please note that "
@@ -4862,12 +4835,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -4944,7 +4917,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid ""
"There is no default default credit account defined \n"
@@ -5091,7 +5064,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -5127,7 +5100,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr "Odpis"
@@ -5264,7 +5237,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr ""
@@ -5289,14 +5262,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5331,7 +5304,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5542,7 +5515,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid ""
"You cannot modify Company of account as its related record exist in Entry "
@@ -5808,9 +5781,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -5959,8 +5932,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr ""
@@ -5971,7 +5944,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -6009,7 +5982,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -6073,30 +6046,31 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6155,6 +6129,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6206,7 +6185,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr ""
@@ -6223,9 +6202,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr ""
@@ -6279,7 +6260,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6309,7 +6290,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6466,7 +6447,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid ""
"Can not find account chart for this company in invoice line account, Please "
@@ -6634,7 +6615,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6738,7 +6719,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -6767,7 +6748,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr ""
@@ -6779,10 +6759,8 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
msgstr ""
#. module: account
@@ -6797,6 +6775,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6822,13 +6801,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6846,7 +6825,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7080,17 +7059,17 @@
msgstr "Pevné"
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr "Varovánà !"
@@ -7113,15 +7092,11 @@
msgstr "VypoÄÃtat pÅ™edpaltné(Subscription Compute)"
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -7152,7 +7127,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7201,7 +7176,7 @@
msgstr "Metoda zpoždÄ›nÃ"
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -7262,7 +7237,7 @@
msgstr "Přidruženého partnera"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -7327,7 +7302,7 @@
msgstr "Vyberte si fiskálnà rok"
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -7362,6 +7337,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7524,7 +7500,7 @@
msgstr "Typy úÄtů"
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr ""
@@ -7574,6 +7550,7 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
msgid "Filter By"
msgstr ""
@@ -7612,7 +7589,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7779,8 +7756,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr ""
@@ -7791,7 +7768,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -7812,6 +7789,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -7984,14 +7962,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid ""
"You cannot modify company of this period as its related record exist in "
@@ -8040,7 +8018,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8056,7 +8034,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -8094,6 +8072,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8103,7 +8082,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
@@ -8140,7 +8119,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8168,18 +8147,34 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
msgstr ""
#. module: account
@@ -8188,11 +8183,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr ""
@@ -8217,6 +8207,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8235,6 +8226,7 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
msgid "Display Account"
msgstr ""
@@ -8329,11 +8321,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8349,6 +8336,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -8356,7 +8344,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -8450,6 +8438,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8493,7 +8482,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid ""
"Tax base different !\n"
@@ -8520,6 +8509,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8548,7 +8538,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr ""
@@ -8606,13 +8596,13 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid ""
"You cannot validate a non-balanced entry !\n"
@@ -8655,10 +8645,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8677,11 +8667,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -8863,11 +8848,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr ""
@@ -8894,7 +8874,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr ""
@@ -8913,6 +8892,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8966,7 +8946,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -9116,8 +9096,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9137,17 +9117,17 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
msgstr ""
#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
-msgstr "Přesun odpisu(Write-Off Move)"
-
-#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
msgid "Invoice's state is Done"
msgstr ""
@@ -9183,10 +9163,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9207,20 +9187,12 @@
msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -9241,7 +9213,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid ""
"Can not create an automatic sequence for this piece !\n"
@@ -9371,7 +9343,7 @@
msgstr "Mapovánà úÄtů"
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -9396,7 +9368,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -9601,7 +9573,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
=== modified file 'account/i18n/da.po'
--- account/i18n/da.po 2011-04-29 05:56:18 +0000
+++ account/i18n/da.po 2011-05-13 11:11:47 +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: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2010-11-22 07:21+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Martin Pihl <martinpihl@xxxxxxxxx>\n"
"Language-Team: Danish <da@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: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-05-10 07:13+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,13 +38,7 @@
msgstr "Andre indstillinger"
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -66,7 +70,7 @@
msgstr "Resterende"
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr ""
@@ -131,7 +135,7 @@
msgstr "Konto posteringer-"
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr ""
@@ -175,7 +179,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr ""
@@ -227,7 +231,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
@@ -255,7 +259,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -271,7 +275,7 @@
msgstr "Belgiske rapporter"
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -309,7 +313,7 @@
msgstr "St."
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -551,7 +555,7 @@
msgstr "Ikke afstemt transaktioner"
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr ""
@@ -633,7 +637,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -666,8 +670,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -728,7 +732,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -829,7 +833,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -953,11 +957,11 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -1036,7 +1040,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1122,6 +1125,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1129,7 +1133,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1267,7 +1271,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr ""
@@ -1297,7 +1300,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr ""
@@ -1390,7 +1393,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
@@ -1404,14 +1407,9 @@
msgstr ""
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
msgstr ""
#. module: account
@@ -1549,7 +1547,6 @@
msgstr ""
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@@ -1593,11 +1590,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr ""
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1616,7 +1608,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr ""
@@ -1649,7 +1641,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr ""
@@ -1665,11 +1657,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr ""
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr ""
@@ -1685,7 +1672,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1706,7 +1693,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr ""
@@ -1722,7 +1709,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1882,11 +1869,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr ""
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -1991,7 +1973,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2043,7 +2025,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2063,7 +2045,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2074,6 +2056,7 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2102,6 +2085,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2210,7 +2194,7 @@
msgstr "Konto momsklasse"
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2280,7 +2264,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2369,7 +2353,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2381,13 +2365,12 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr "Dato:"
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
@@ -2423,6 +2406,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2531,16 +2515,16 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2589,11 +2573,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr ""
@@ -2700,7 +2679,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2823,6 +2802,7 @@
msgstr "Vis"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2830,6 +2810,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2920,6 +2903,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2938,6 +2927,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -2998,7 +2988,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3028,11 +3018,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3040,7 +3025,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -3080,11 +3064,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3092,7 +3071,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr ""
@@ -3108,8 +3087,10 @@
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
msgstr ""
#. module: account
@@ -3153,7 +3134,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3162,6 +3143,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr ""
@@ -3264,6 +3246,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3307,7 +3290,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3316,13 +3299,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
@@ -3442,7 +3425,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3453,14 +3436,14 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3754,7 +3737,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr ""
@@ -3813,7 +3796,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -3988,7 +3971,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -4038,6 +4021,15 @@
msgstr ""
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4059,11 +4051,11 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4116,13 +4108,6 @@
msgstr ""
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4167,7 +4152,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4199,6 +4184,15 @@
msgstr ""
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr ""
@@ -4232,7 +4226,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid ""
"Please verify the price of the invoice !\n"
@@ -4346,29 +4340,12 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
msgstr ""
#. module: account
@@ -4386,7 +4363,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr ""
@@ -4441,7 +4418,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4460,7 +4437,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4490,6 +4467,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4572,7 +4550,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr ""
@@ -4712,13 +4690,7 @@
msgstr ""
#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4790,7 +4762,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4818,7 +4790,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid ""
"You can not do this modification on a reconciled entry ! Please note that "
@@ -4874,12 +4846,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -4956,7 +4928,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid ""
"There is no default default credit account defined \n"
@@ -5103,7 +5075,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -5139,7 +5111,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr ""
@@ -5276,7 +5248,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr ""
@@ -5301,14 +5273,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5343,7 +5315,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -5554,7 +5526,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid ""
"You cannot modify Company of account as its related record exist in Entry "
@@ -5820,9 +5792,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -5971,8 +5943,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr ""
@@ -5983,7 +5955,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
@@ -6021,7 +5993,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -6085,30 +6057,31 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6167,6 +6140,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6218,7 +6196,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr ""
@@ -6235,9 +6213,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr ""
@@ -6291,7 +6271,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6321,7 +6301,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6478,7 +6458,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid ""
"Can not find account chart for this company in invoice line account, Please "
@@ -6646,7 +6626,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6750,7 +6730,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -6779,7 +6759,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr ""
@@ -6791,10 +6770,8 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
msgstr ""
#. module: account
@@ -6809,6 +6786,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6834,13 +6812,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6858,7 +6836,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7095,17 +7073,17 @@
msgstr "Fast"
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr "Advarsel !"
@@ -7128,15 +7106,11 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -7167,7 +7141,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7216,7 +7190,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -7277,7 +7251,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr "Du må først vælge en partner"
@@ -7342,7 +7316,7 @@
msgstr "Vælg regnskabs år"
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -7377,6 +7351,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7539,7 +7514,7 @@
msgstr "Kontotyper"
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr ""
@@ -7589,6 +7564,7 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
msgid "Filter By"
msgstr ""
@@ -7627,7 +7603,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7794,8 +7770,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr ""
@@ -7806,7 +7782,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -7827,6 +7803,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -7999,14 +7976,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid ""
"You cannot modify company of this period as its related record exist in "
@@ -8055,7 +8032,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8071,7 +8048,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -8109,6 +8086,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8118,7 +8096,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
@@ -8155,7 +8133,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8183,18 +8161,34 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
msgstr ""
#. module: account
@@ -8203,11 +8197,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr ""
@@ -8232,6 +8221,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8250,6 +8240,7 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
msgid "Display Account"
msgstr ""
@@ -8344,11 +8335,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8364,6 +8350,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -8371,7 +8358,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -8465,6 +8452,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8508,7 +8496,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid ""
"Tax base different !\n"
@@ -8535,6 +8523,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8563,7 +8552,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr ""
@@ -8621,13 +8610,13 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid ""
"You cannot validate a non-balanced entry !\n"
@@ -8670,10 +8659,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8692,11 +8681,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -8878,11 +8862,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr ""
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr ""
@@ -8909,7 +8888,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr ""
@@ -8928,6 +8906,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8981,7 +8960,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -9131,8 +9110,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9152,14 +9131,14 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr ""
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
msgstr ""
#. module: account
@@ -9198,10 +9177,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9222,20 +9201,12 @@
msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -9256,7 +9227,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid ""
"Can not create an automatic sequence for this piece !\n"
@@ -9386,7 +9357,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -9411,7 +9382,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -9616,7 +9587,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
=== modified file 'account/i18n/de.po'
--- account/i18n/de.po 2011-05-02 18:46:43 +0000
+++ account/i18n/de.po 2011-05-13 11:11:47 +0000
@@ -6,15 +6,25 @@
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
+<<<<<<< TREE
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-04-21 05:36+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-04-20 18:45+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Ferdinand @ Camptocamp <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: 2011-04-29 05:06+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-05-10 07:13+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -27,14 +37,7 @@
msgstr "Sonstige Konfiguration"
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr ""
-"Es ist kein Journal für den Jahresabschluss des Geschäftsjahres definiert"
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -68,7 +71,7 @@
msgstr "Restwert"
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr "Bitte definieren Sie den Sequenzer für das Rechnungsjournal."
@@ -138,7 +141,7 @@
msgstr "Buchungssätze-"
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr "Sie können keine gebuchten Vorgänge löschen: \"%s\"!"
@@ -184,7 +187,7 @@
"angezeigt."
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr "Achtung!"
@@ -240,7 +243,7 @@
msgstr "account.tax"
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
@@ -272,7 +275,7 @@
"Rechnung erscheinen sollen"
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -290,7 +293,7 @@
msgstr "Auswertungen für Belgien"
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -330,7 +333,7 @@
msgstr "Beleg"
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -594,7 +597,7 @@
msgstr "Nicht ausgeglichene Posten"
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr "Kassenbestand passt nicht zu Kontensaldo"
@@ -679,7 +682,7 @@
msgstr "Steuerbetrag"
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -712,8 +715,8 @@
msgstr "Journal Periode"
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -776,7 +779,7 @@
msgstr "Analytische Buchungsbelege"
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr "Sie können die Währung nur bei Rechnungen"
@@ -880,7 +883,7 @@
msgstr "Weiterer Partner für automat. Ausgleich"
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -1009,11 +1012,11 @@
msgstr "Kurzbezeichnung"
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -1095,7 +1098,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1186,6 +1188,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1193,7 +1196,7 @@
msgstr "Buchungstext"
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1333,7 +1336,6 @@
msgstr "Analyse der Journaleinträge"
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr "Partner"
@@ -1363,7 +1365,7 @@
msgstr "Zentrales Journal"
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr "Sie können dieses Sachkonto nicht in diesem Journal einsetzen."
@@ -1460,7 +1462,7 @@
msgstr "Beispiel: 14 Tage 2% Skonto, 30 Tage Netto"
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
@@ -1477,15 +1479,10 @@
msgstr "Angelsächsische Buchungslogik"
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
-msgstr "Beendet"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Buchung Abschreibung"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1631,7 +1628,6 @@
msgstr "Unterschiedliche Journal Sequenzer"
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr "Mitarbeiter"
@@ -1678,11 +1674,6 @@
msgstr "Summe Jahr"
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr "Druck Zahlungsbeleg"
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr "Dieser Assistent wird die Währung der Rechnung ändern"
@@ -1705,7 +1696,7 @@
msgstr "Fehler ! Sie können keine Überschneidungen bei Geschäftsjahren haben"
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr ""
@@ -1742,7 +1733,7 @@
msgstr "Debitoren & Kreditoren"
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr "Sie müssen ein Konto für die Forderungsabschreibung hinterlegen!"
@@ -1758,11 +1749,6 @@
msgstr "Alle Partner"
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr "Ref. :"
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr "Analytischer Kontenplan"
@@ -1778,7 +1764,7 @@
msgstr "Kundenreferenz:"
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr "Benutzer %s hat keinen Zugriff auf das %s Journal!"
@@ -1799,7 +1785,7 @@
msgstr "Steuermeldung: Ausweis von Gutschriften"
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr "Sie können kein Konto mit vorhandenen Buchungen deaktivieren."
@@ -1816,7 +1802,7 @@
"Sie können keine Buchung auf einem bereits abgeschlossenen Konto vornehmen."
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1986,11 +1972,6 @@
msgstr "Bild"
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr "Abgebrochen"
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -2101,7 +2082,7 @@
msgstr " Journal"
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2164,7 +2145,7 @@
msgstr "Buchungstext"
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2184,7 +2165,7 @@
msgstr "Erlöskonto"
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2197,6 +2178,7 @@
msgstr "Finanzbuchhaltung Eigenschaften"
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2225,6 +2207,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2333,7 +2316,7 @@
msgstr "Umsatzsteuer"
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2415,7 +2398,7 @@
msgstr "Buchungsvorlage"
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2507,7 +2490,7 @@
msgstr "Finanzkonten"
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr "Konfigurationsfehler !"
@@ -2519,13 +2502,12 @@
msgstr "Durchschnittspreis"
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr "Datum:"
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
@@ -2563,6 +2545,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2679,16 +2662,16 @@
msgstr "Diese Assistent erzeugt wiederkehrende Buchungen."
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr "Kein Sequenzer für dieses Journal definiert !"
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2740,11 +2723,6 @@
"Die Erfassung der Zahlung ist der zweite Schritt beim Zahlungsausgleich."
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr "Nummer:"
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr "Referenz"
@@ -2862,7 +2840,7 @@
msgstr "Analytische Buchungen"
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2988,6 +2966,7 @@
msgstr "Ansicht"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2995,6 +2974,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -3101,6 +3083,13 @@
"Geschäftsjahres."
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+"Es ist kein Journal für den Jahresabschluss des Geschäftsjahres definiert"
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -3119,6 +3108,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3179,7 +3169,7 @@
msgstr "Anfangssaldo"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr "Kein Partner definiert!"
@@ -3211,11 +3201,6 @@
"Unternehmenswährung eine andere ist."
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr "Journal:"
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3223,7 +3208,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -3263,11 +3247,6 @@
msgstr "Jahr"
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr "Authorisierung"
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3277,7 +3256,7 @@
"bedeutet, dass Sie Ihre einzelnen Buchungen nicht ändern können."
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr "Kann offene oder bezahlte Rechnungen nicht löschen"
@@ -3293,9 +3272,11 @@
msgstr "Ãœberweisungen"
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
-msgstr " Wert: k.A."
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr "Nicht Ausgeglichen"
#. module: account
#: view:account.chart:0
@@ -3340,7 +3321,7 @@
"'Abgebrochen' oder 'Erledigt' Status ist."
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3351,6 +3332,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr "Gegenbuchung"
@@ -3455,6 +3437,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3498,7 +3481,7 @@
msgstr "Vorlage Kontenplan"
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3510,13 +3493,13 @@
"Bitte ordnen Sie dem Partner eine Zahlungsbedingungen zu."
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr "Einige Einträge wurden bereits ausgeglichen!"
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
@@ -3644,7 +3627,7 @@
msgstr "Analytische Buchungen"
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr "Die Steuer kann nicht geändert werden!"
@@ -3655,7 +3638,7 @@
msgstr "# Buchungen"
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
@@ -3663,7 +3646,7 @@
"Sie haben eine Mengeneinheit gewählt, die nicht kompatibel zum Produkt ist."
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3977,7 +3960,7 @@
msgstr "Kontotyp"
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr ""
@@ -4042,7 +4025,7 @@
"Status unmittelbar 'Gebucht' ist."
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -4224,7 +4207,7 @@
msgstr "Gutschrift"
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -4276,6 +4259,15 @@
msgstr "Steuer Inklusive"
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr "Analytisches Journal für Kosten"
@@ -4297,11 +4289,11 @@
msgstr "Ändere Währung"
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4354,16 +4346,6 @@
msgstr "Fehler! Sie können keine rekursiven Konten definieren."
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-"Sie können kein Finanzkonto erzeugen!\n"
-"Stellen Sie sicher, dass Sie die Kontoart Ansicht verwenden, wenn es sich um "
-"ein übergeordnetes Konto handelt."
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4408,7 +4390,7 @@
msgstr "Ein Analytisches Journal vom Typ '%s' muss definiert werden"
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4445,6 +4427,15 @@
msgstr "Saldo"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr "Rechnung "
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr "Start Datum"
@@ -4480,7 +4471,7 @@
msgstr "Rechnung"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid ""
"Please verify the price of the invoice !\n"
@@ -4594,30 +4585,19 @@
msgstr "Drittwelt (Land)"
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
-msgstr "Fehler"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
+msgstr ""
+"Durch das Menü Lieferantengutschriften buchen Sie Gutschriften, die Sie von "
+"Ihren Lieferanten erhalten. Eine Gutschrift ist eine Beleg von Ihrem "
+"Lieferanten, der einen Teil oder sogar den gesamten Rechnungsbetrag als "
+"Guthaben auf Ihrem Konto beim Lieferanten ausweist. Sie können solche "
+"Gutschriften sehr einfach buchen und direkt in der Ansicht einer Rechnung "
+"auch den offenen Posten ausgleichen."
#. module: account
#: field:account.analytic.Journal.report,date2:0
@@ -4634,7 +4614,7 @@
msgstr "Bankkonto Details"
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr "Steuerkonfiguration fehlt!"
@@ -4694,7 +4674,7 @@
msgstr "Prüfe auf ein Datum nicht in Periode"
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4716,7 +4696,7 @@
msgstr "untergeordnete Steuerkonten"
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr "Beginn der Periode sollte kleiner sein als Ende der Periode"
@@ -4746,6 +4726,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4830,7 +4811,7 @@
msgstr "Zeile 1:"
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr "Integritätsfehler!"
@@ -4972,15 +4953,7 @@
msgstr "Steuer auf untergeordnete Datensätze"
#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-"Sie können keine Buchung auf Forderungs- oder Verbindlichkeitskonten ohne "
-"einen vorher vorhandenen Partner erstellen."
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -5057,7 +5030,7 @@
"->> Fälligkeitstag = 28.2"
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -5085,7 +5058,7 @@
msgstr "Start Periode"
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid ""
"You can not do this modification on a reconciled entry ! Please note that "
@@ -5144,12 +5117,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -5230,7 +5203,7 @@
msgstr "Sortiert nach"
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid ""
"There is no default default credit account defined \n"
@@ -5391,7 +5364,7 @@
msgstr "Erstelle Vortragsbuchungen"
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr "Bereits ausgeglichen"
@@ -5430,7 +5403,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr "Abschreibung"
@@ -5585,7 +5558,7 @@
msgstr "# Positionen"
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr "Neue Währung wurde nicht vollständig konfiguriert !"
@@ -5610,14 +5583,14 @@
msgstr "Filter durch"
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr "Sie können kein inaktives Konto verwenden!"
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5654,7 +5627,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr "Fehlerhafte Aktion"
@@ -5876,7 +5849,7 @@
msgstr "Unternehmen"
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid ""
"You cannot modify Company of account as its related record exist in Entry "
@@ -6157,9 +6130,9 @@
msgstr "Erzeuge optional"
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -6312,8 +6285,8 @@
msgstr "Auswertung analytische Buchungen"
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr "Buchungen: "
@@ -6324,7 +6297,7 @@
msgstr "Händisch wiederkehrende Buchungen in ein bestimmtes Journal buchen."
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr "Konnte keine überbetriebliche Buchung erzeugen"
@@ -6373,7 +6346,7 @@
msgstr "Gesamt Soll"
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr "Eintrag \"%s\" ist ungültig !"
@@ -6443,30 +6416,31 @@
msgstr " Wertansatz: Prozent"
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6531,6 +6505,11 @@
msgstr "Kontoauszug mit einem Partner pro Seite"
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6587,7 +6566,7 @@
msgstr "Wähle Journal"
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr "Die aktuelle Währung ist nicht korrekt konfiguriert !"
@@ -6604,9 +6583,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr "Umsätze nach Konten und Perioden"
@@ -6667,7 +6648,7 @@
msgstr "Summe:"
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6705,7 +6686,7 @@
msgstr "untergeordnete Codes"
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6896,7 +6877,7 @@
msgstr "Positionen"
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid ""
"Can not find account chart for this company in invoice line account, Please "
@@ -7095,7 +7076,7 @@
"Steuerberechnung gebraucht wird."
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -7214,7 +7195,7 @@
msgstr "Sign On Reports"
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -7251,7 +7232,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr "PRO-FORMA"
@@ -7266,11 +7246,9 @@
"Partner zu hinterlegen."
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
-msgstr "Nicht Ausgeglichen"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
+msgstr " Wert: k.A."
#. module: account
#: selection:account.move.line,centralisation:0
@@ -7284,6 +7262,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -7312,13 +7291,13 @@
"bezahlt werden soll."
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr "Falsches Konto!"
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -7336,7 +7315,7 @@
msgstr "Umsatzsteuer"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr "Keine Stückzahl!"
@@ -7582,17 +7561,17 @@
msgstr "Fest"
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr "Warnung"
@@ -7615,15 +7594,11 @@
msgstr "Wiederkehrende Buchungen"
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr "Betrag (in Worten)"
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -7654,7 +7629,7 @@
msgstr "Kann Entwurf/ProForma/Storno für Rechnung %s nicht durchführen"
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr "Keine Rechnungszeilen !"
@@ -7705,7 +7680,7 @@
msgstr "Abgrenzung Jahreswechsel"
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr "Rechnung '%s' wurde bezahlt."
@@ -7769,7 +7744,7 @@
msgstr "Zugehöriger Partner"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr "Sie müssen zuerst einen Partner wählen!"
@@ -7837,7 +7812,7 @@
msgstr "Wähle Geschäftsjahr"
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -7876,6 +7851,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -8057,7 +8033,7 @@
msgstr "Kontoartkonfiguration"
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr "Kann keine Rechnungsbuchungen in zentralisiertem Journal durchführen"
@@ -8107,6 +8083,7 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
msgid "Filter By"
msgstr "Filter nach"
@@ -8150,7 +8127,7 @@
msgstr "Zahlungsbedingungen"
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -8326,8 +8303,8 @@
"Bankauszug übereinstimmen."
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr "Falsches Konto!"
@@ -8338,7 +8315,7 @@
msgstr "Frei lassen für alle offenen Geschäftsjahre"
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr "Die Buchungszeile (%s)"
@@ -8361,6 +8338,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -8564,14 +8542,14 @@
msgstr "Gültig ab"
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr "Gutschriften Ausgangsrechnungen Journal"
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid ""
"You cannot modify company of this period as its related record exist in "
@@ -8621,7 +8599,7 @@
msgstr "Steuer Einkauf (%)"
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr "Bitte erstellen Sie einige Rechnungspositionen"
@@ -8637,7 +8615,7 @@
msgstr "Konfigurieren Sie die Anwendungen für die Finanzbuchhaltung"
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -8682,6 +8660,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8691,7 +8670,7 @@
msgstr "Start Periode"
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr "Kann keine Buchung auf einem Oberkonto vonehmen."
@@ -8729,7 +8708,7 @@
"Buchhalter verbucht und validiert die Buchungszeilen einer Rechnung. "
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8759,25 +8738,35 @@
msgstr "Sie können keine Buchungen auf Konten des Typs Ansicht erstellen."
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr "Aktuelle Währung ist nicht korrekt definiert"
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
-msgstr ""
-"Durch das Menü Lieferantengutschriften buchen Sie Gutschriften, die Sie von "
-"Ihren Lieferanten erhalten. Eine Gutschrift ist eine Beleg von Ihrem "
-"Lieferanten, der einen Teil oder sogar den gesamten Rechnungsbetrag als "
-"Guthaben auf Ihrem Konto beim Lieferanten ausweist. Sie können solche "
-"Gutschriften sehr einfach buchen und direkt in der Ansicht einer Rechnung "
-"auch den offenen Posten ausgleichen."
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
+msgstr "Fehler"
#. module: account
#: view:account.account.template:0
@@ -8785,11 +8774,6 @@
msgstr "Forderungskonten"
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr "Personenkonten"
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr "Gewinn & Verlust (Ertragskonten)"
@@ -8814,6 +8798,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8832,6 +8817,7 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
msgid "Display Account"
msgstr "Anzeige Konten"
@@ -8943,11 +8929,6 @@
"beendet werden soll."
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr "Empfänger Unterschrift"
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8963,6 +8944,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -8970,7 +8952,7 @@
msgstr "Buchung"
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr "Die Steuer kann nicht verändert werden. Löschen und Neuerstellen."
@@ -9070,6 +9052,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -9113,7 +9096,7 @@
msgstr "Konto Automatische Buchung"
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid ""
"Tax base different !\n"
@@ -9142,6 +9125,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -9170,7 +9154,7 @@
msgstr "Offene Posten"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr "Falsche Summe!"
@@ -9237,13 +9221,13 @@
msgstr "Aktiv"
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr "Unbekannter Fehler"
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid ""
"You cannot validate a non-balanced entry !\n"
@@ -9294,10 +9278,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9319,11 +9303,6 @@
"Rechnungsjournal als Buchungsjournal verwendet."
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr "Durch:"
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -9515,11 +9494,6 @@
msgstr "Kontotyp"
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr "Status:"
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr "Entwurf"
@@ -9546,7 +9520,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr "Gebucht"
@@ -9565,6 +9538,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -9618,7 +9592,7 @@
msgstr "Dieses ist ein Modell für wiederkehrende Buchungen."
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -9781,8 +9755,8 @@
msgstr "Ende Periode"
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9804,15 +9778,15 @@
"Produktkategorie zu erfassen."
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr "Bezüglich Konto:"
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
-msgstr "Buchung Abschreibung"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "Beendet"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -9850,10 +9824,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9874,23 +9848,12 @@
msgstr "Fehler ! Rekursive Finanzkontenvorlagen sind nicht erlaubt"
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
-"Sie können keinen Kontenplan erzeugen!\n"
-"Stellen Sie sicher, dass die Finanzkontovorlage eines übergeordneten Kontos "
-"den Typ \"Ansicht\" haben sollte. "
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr "Wiederkehrend"
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr "Buchung wurde bereits ausgeglichen"
@@ -9911,7 +9874,7 @@
msgstr "Bereich"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid ""
"Can not create an automatic sequence for this piece !\n"
@@ -10052,7 +10015,7 @@
msgstr "Zuordnung Finanzkonten"
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr "Rechnung '%s' wartet auf Buchungsfreigabe."
@@ -10077,7 +10040,7 @@
msgstr "Aufwand- und Erlöskonto des Produktes"
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -10287,7 +10250,7 @@
msgstr "Die Länge der Periode muss größer als 0 sein"
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
@@ -10322,6 +10285,7 @@
msgstr ""
"Der verbleibende Saldo auf einem Debitor oder Kreditor nach vorgenommenen "
"Buchung in der Landeswährung."
+<<<<<<< TREE
#~ msgid "Keep empty to use the period of the validation date."
#~ msgstr "Frei lassen für Periode des Validierungsdatums."
@@ -12289,3 +12253,64 @@
#~ "dem Geschäftsjahr verwendet (Bei vorläufigem Gewinn: Betrag wird "
#~ "gutgeschrieben, bei vorläufigem Verlust: Betrag wird belastet.) Der Betrag "
#~ "wird durch die Auswertung Gewinn & Verlust generiert."
+=======
+
+#~ msgid "Print Voucher"
+#~ msgstr "Druck Zahlungsbeleg"
+
+#~ msgid "Ref. :"
+#~ msgstr "Ref. :"
+
+#~ msgid "Canceled"
+#~ msgstr "Abgebrochen"
+
+#~ msgid "Number:"
+#~ msgstr "Nummer:"
+
+#~ msgid "Journal:"
+#~ msgstr "Journal:"
+
+#~ msgid "Authorised Signatory"
+#~ msgstr "Authorisierung"
+
+#~ msgid "Amount (in words) :"
+#~ msgstr "Betrag (in Worten)"
+
+#~ msgid "Particulars"
+#~ msgstr "Personenkonten"
+
+#~ msgid "Receiver's Signature"
+#~ msgstr "Empfänger Unterschrift"
+
+#~ msgid "Through :"
+#~ msgstr "Durch:"
+
+#~ msgid "State:"
+#~ msgstr "Status:"
+
+#~ msgid "On Account of :"
+#~ msgstr "Bezüglich Konto:"
+
+#~ msgid ""
+#~ "You can not create move line on receivable/payable account without partner"
+#~ msgstr ""
+#~ "Sie können keine Buchung auf Forderungs- oder Verbindlichkeitskonten ohne "
+#~ "einen vorher vorhandenen Partner erstellen."
+
+#~ msgid ""
+#~ "You cannot create an account! \n"
+#~ "Make sure if the account has children then it should be type \"View\"!"
+#~ msgstr ""
+#~ "Sie können kein Finanzkonto erzeugen!\n"
+#~ "Stellen Sie sicher, dass Sie die Kontoart Ansicht verwenden, wenn es sich um "
+#~ "ein übergeordnetes Konto handelt."
+
+#~ msgid ""
+#~ "You cannot create an account template! \n"
+#~ "Make sure if the account template has parent then it should be type "
+#~ "\"View\"! "
+#~ msgstr ""
+#~ "Sie können keinen Kontenplan erzeugen!\n"
+#~ "Stellen Sie sicher, dass die Finanzkontovorlage eines übergeordneten Kontos "
+#~ "den Typ \"Ansicht\" haben sollte. "
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/el.po'
--- account/i18n/el.po 2011-04-29 05:56:18 +0000
+++ account/i18n/el.po 2011-05-13 11:11:47 +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: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-01-24 20:02+0000\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-01-19 15:45+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Dimitris Andavoglou <dimitrisand@xxxxxxxxx>\n"
"Language-Team: Greek <el@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: 2011-04-29 05:06+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-05-10 07:13+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,13 +38,7 @@
msgstr "Άλλη ΠαÏαμετÏοποίηση"
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr "Δεν Îχει οÏιστεί Ï„Îλος χÏήσης στο οικονομικό Îτος"
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -68,7 +72,7 @@
msgstr "Υπόλοιπο"
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr "ΠαÏακαλοÏμε να οÏίσετε αλληλουχία στο τιμολόγιο ημεÏολογίου"
@@ -133,7 +137,7 @@
msgstr "ΕγγÏαφÎÏ‚ Λογιστικής-"
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr "Δεν μποÏείτε να διαγÏάψετε κινήσεις που Îχουν αποθηκευθεί: \"%s\"!"
@@ -179,7 +183,7 @@
"πληÏωμής χωÏίς να τον διαγÏάψετε."
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr "Î Ïοειδοποίηση"
@@ -231,7 +235,7 @@
msgstr "account.tax"
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
@@ -265,7 +269,7 @@
"σχετίζεται με αυτό τον Κωδικό ΦόÏου."
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -282,7 +286,7 @@
msgstr "ΑναφοÏÎÏ‚ Βελγίου"
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -321,7 +325,7 @@
msgstr "Κατ."
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -581,7 +585,7 @@
msgstr "Μή συμφωνηθείσες συναλλαγÎÏ‚"
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr "Το υπόλοιπο Ταμείου δεν συμφωνεί με το υπολογιζόμενο Υπόλοιπο"
@@ -665,7 +669,7 @@
msgstr "Ποσό ÎšÏ‰Î´Î¹ÎºÎ¿Ï Î¦ÏŒÏου"
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -698,8 +702,8 @@
msgstr "ΗμεÏολογιακή ΠεÏίοδος"
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -760,7 +764,7 @@
msgstr "ΑναλυτικÎÏ‚ ΕγγÏαφÎÏ‚ ανά γÏαμμή"
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -863,7 +867,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -987,11 +991,11 @@
msgstr "Κωδικός"
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -1070,7 +1074,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1156,6 +1159,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1163,7 +1167,7 @@
msgstr "ΕτικÎτα ΕγγÏαφής"
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1302,7 +1306,6 @@
msgstr "Ανάλυση Στοιχείων ΗμεÏολογίου"
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr "ΣυνεÏγάτες"
@@ -1332,7 +1335,7 @@
msgstr "ΚεντÏικό ΗμεÏολόγιο"
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr ""
@@ -1427,7 +1430,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
@@ -1444,15 +1447,10 @@
msgstr "Αγγλο- Σαχονικό ΣÏστημα Λογιστικής"
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
-msgstr "ΚλεισμÎνα"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr "Κίνηση ΠαÏαγÏαφής"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1589,7 +1587,6 @@
msgstr "ΔιαχωÏισμÎνες ΙεÏαÏχήσεις ΗμεÏολογίου"
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr "ΥπεÏθυνος"
@@ -1635,11 +1632,6 @@
msgstr "ΆθÏοισμα Έτους"
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr "ΕκτÏπωση παÏαστατικοÏ"
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr "Ο οδηγός θα αλλάξει το νόμισμα στο τιμολόγιο"
@@ -1658,7 +1650,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr "Ο λογαÏιασμός δεν οÏίζεται για συμψηφισμό !"
@@ -1691,7 +1683,7 @@
msgstr "ΕισπÏακτÎα & ΠληÏωτÎα"
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr "Î ÏÎπει να οÏίσετε λογαÏιασμό για την καταχώÏηση της παÏαγÏαφής"
@@ -1707,11 +1699,6 @@
msgstr "Όλοι οι ÎταιÏοι"
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr "Σχετ. :"
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr "Λογιστικά ΣχÎδια αναλυτικών λογαÏιασμών"
@@ -1727,7 +1714,7 @@
msgstr "ΠαÏ. Πελάτη:"
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1748,7 +1735,7 @@
msgstr "ΦοÏολογική Δήλωση:Πιστωτικά Σημειώματα"
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr "Δεν μποÏείτε να απενεÏγοποιήσετε Îναν λογαÏιασμό που Îχει κινηθεί"
@@ -1764,7 +1751,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1927,11 +1914,6 @@
msgstr "Εικόνα"
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr "ΑκυÏώθηκε"
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -2038,7 +2020,7 @@
msgstr " ΗμεÏολόγιο"
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2090,7 +2072,7 @@
msgstr "ΠεÏιγÏαφή"
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2110,7 +2092,7 @@
msgstr "ΛογαÏιασμός Εσόδων"
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2121,6 +2103,7 @@
msgstr "Λογιστικά ΧαÏακτηÏιστικά"
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2149,6 +2132,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2259,7 +2243,7 @@
msgstr "ΦοÏολογική Κλίμακα ΛογαÏιασμοÏ"
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2329,7 +2313,7 @@
msgstr "ΕγγÏαφÎÏ‚ ΜοντÎλου ΛογαÏιασμοÏ"
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2418,7 +2402,7 @@
msgstr "ΛογαÏιασμοί"
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2430,13 +2414,12 @@
msgstr "ÎœÎση Τιμή"
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr "ΗμεÏομηνία:"
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
@@ -2472,6 +2455,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2580,16 +2564,16 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2638,11 +2622,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr "ΑÏιθμός ΠαÏαπομπής"
@@ -2750,7 +2729,7 @@
msgstr "ΕγγÏαφÎÏ‚ Αναλυτικής"
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2877,6 +2856,7 @@
msgstr "Όψη"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2884,6 +2864,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2974,6 +2957,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr "Δεν Îχει οÏιστεί Ï„Îλος χÏήσης στο οικονομικό Îτος"
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2992,6 +2981,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
@@ -3052,7 +3042,7 @@
msgstr "ΙσοζÏγιο ΈναÏξης"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "No Partner Defined !"
msgstr "Δεν οÏίστηκε ΣυνεÏγάτης!"
@@ -3082,11 +3072,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr ""
-
-#. module: account
#: view:account.bank.statement:0
#: selection:account.bank.statement,state:0
#: view:account.invoice:0
@@ -3094,7 +3079,6 @@
#: view:account.invoice.report:0
#: selection:account.invoice.report,state:0
#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
#: view:account.subscription:0
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
@@ -3134,11 +3118,6 @@
msgstr "Îτος"
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr ""
-
-#. module: account
#: view:validate.account.move.lines:0
msgid ""
"All selected journal entries will be validated and posted. It means you "
@@ -3146,7 +3125,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr ""
@@ -3163,8 +3142,10 @@
msgstr "ΜεταφοÏÎÏ‚"
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
msgstr ""
#. module: account
@@ -3208,7 +3189,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
#, python-format
msgid ""
"You cannot change the type of account from '%s' to '%s' type as it contains "
@@ -3217,6 +3198,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
msgid "Counterpart"
msgstr ""
@@ -3321,6 +3303,7 @@
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
#: view:account.move:0
@@ -3365,7 +3348,7 @@
msgstr "Î Ïότυπα Λογιστικών Σχεδίων"
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2109
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3374,13 +3357,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:801
#, python-format
msgid "Some entries are already reconciled !"
msgstr "Κάποιες εγγÏαφÎÏ‚ είναι ήδη συμφωνημÎνες"
#. module: account
-#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1218
#, python-format
msgid ""
"You cannot validate a Journal Entry unless all journal items are in same "
@@ -3504,7 +3487,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "Unable to change tax !"
msgstr "ΑδÏνατη η αλλαγή φόÏου"
@@ -3515,14 +3498,14 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1422
+#: code:addons/account/invoice.py:1437
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#, python-format
msgid ""
"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
@@ -3817,7 +3800,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:714
+#: code:addons/account/invoice.py:722
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr ""
@@ -3877,7 +3860,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:91
+#: code:addons/account/account_analytic_line.py:90
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -4052,7 +4035,7 @@
msgstr "Πιστωτικά Τιμολόγια"
#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
@@ -4104,6 +4087,15 @@
msgstr "Ο ΦόÏος ΠεÏιÎχεται στην Τιμή"
#. module: account
+#: constraint:account.account:0
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error! \n"
+"You cannot define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
msgstr ""
@@ -4125,11 +4117,11 @@
msgstr "Αλλαγή"
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
+#: code:addons/account/account.py:1304
+#: code:addons/account/account.py:1332
+#: code:addons/account/account.py:1339
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/invoice.py:904
#: code:addons/account/wizard/account_automatic_reconcile.py:152
#: code:addons/account/wizard/account_fiscalyear_close.py:78
#: code:addons/account/wizard/account_fiscalyear_close.py:81
@@ -4183,13 +4175,6 @@
"Σφάλμα! Δεν μποÏείτε να χÏησιμοποιήσετε επαναλαμβανόμενους λογαÏιασμοÏÏ‚."
#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
-msgstr ""
-
-#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
@@ -4234,7 +4219,7 @@
msgstr "Î ÏÎπει να οÏίσετε αναλυτικό ημεÏολόγιο Ï„Ïπου '%s' !"
#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1411
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
@@ -4266,6 +4251,15 @@
msgstr "Account Balance -"
#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/invoice.py:997
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
msgstr ""
@@ -4299,7 +4293,7 @@
msgstr "Τιμολόγια"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid ""
"Please verify the price of the invoice !\n"
@@ -4415,30 +4409,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
-#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
-#, python-format
-msgid "Error"
-msgstr "Σφάλμα"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"With Supplier Refunds you can manage the credit notes you receive from your "
+"suppliers. A refund is a document that credits an invoice completely or "
+"partially. You can easily generate refunds and reconcile them directly from "
+"the invoice form."
+msgstr ""
#. module: account
#: field:account.analytic.Journal.report,date2:0
@@ -4455,7 +4432,7 @@
msgstr "Στοιχεία ΤÏάπεζας"
#. module: account
-#: code:addons/account/invoice.py:720
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Taxes missing !"
msgstr "Λείπουν φόÏοι!"
@@ -4510,7 +4487,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1224
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
@@ -4533,7 +4510,7 @@
msgstr "ΛογαÏιασμοί Υπο-φόÏων"
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:954
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4563,6 +4540,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
@@ -4645,7 +4623,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid "Integrity Error !"
msgstr "Σφάλμα ΑκεÏαιότητας !"
@@ -4785,13 +4763,7 @@
msgstr "ΦόÏοι σε ΥποκατηγοÏίες"
#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:2067
+#: code:addons/account/account.py:2081
#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
@@ -4866,7 +4838,7 @@
"λήξης θα είναι 28/02"
#. module: account
-#: code:addons/account/account.py:2896
+#: code:addons/account/account.py:2940
#: code:addons/account/installer.py:283
#: code:addons/account/installer.py:295
#, python-format
@@ -4894,7 +4866,7 @@
msgstr "ΈναÏξη πεÏιόδου"
#. module: account
-#: code:addons/account/account_move_line.py:1193
+#: code:addons/account/account_move_line.py:1199
#, python-format
msgid ""
"You can not do this modification on a reconciled entry ! Please note that "
@@ -4952,12 +4924,12 @@
#. module: account
#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/invoice.py:408
+#: code:addons/account/invoice.py:508
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:531
+#: code:addons/account/invoice.py:552
+#: code:addons/account/invoice.py:1361
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
@@ -5034,7 +5006,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1326
+#: code:addons/account/account.py:1340
#, python-format
msgid ""
"There is no default default credit account defined \n"
@@ -5185,7 +5157,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:729
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -5221,7 +5193,7 @@
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:821
#, python-format
msgid "Write-Off"
msgstr "ΠαÏαγÏαφή"
@@ -5358,7 +5330,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:59
#, python-format
msgid "New currency is not confirured properly !"
msgstr ""
@@ -5383,14 +5355,14 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "You can not use an inactive account!"
msgstr "ΑδÏνατη η χÏήση ανενεÏÎ³Î¿Ï Î»Î¿Î³Î±ÏιασμοÏ"
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:794
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr "Οι εγγÏαφÎÏ‚ δεν είναι του ίδιου λογαÏÎ¹Î±ÏƒÎ¼Î¿Ï Î® Îχουν ήδη συμφωνηθεί! "
@@ -5425,7 +5397,7 @@
#. module: account
#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/invoice.py:373
#, python-format
msgid "Invalid action !"
msgstr "ΆκυÏη ενÎÏγεια!"
@@ -5636,7 +5608,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:532
+#: code:addons/account/account.py:546
#, python-format
msgid ""
"You cannot modify Company of account as its related record exist in Entry "
@@ -5905,9 +5877,9 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
+#: code:addons/account/invoice.py:409
+#: code:addons/account/invoice.py:509
+#: code:addons/account/invoice.py:1362
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
@@ -6056,8 +6028,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_analytic_line.py:141
+#: code:addons/account/account_move_line.py:897
#, python-format
msgid "Entries: "
msgstr "ΕγγÏαφÎÏ‚: "
@@ -6068,7 +6040,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1407
#, python-format
msgid "Couldn't create move between different companies"
msgstr "ΑδÏνατη η δημιουÏγία κίνησης Î¼ÎµÏ„Î±Î¾Ï Î´Î¹Î±Ï†Î¿Ïετικών εταιÏειών"
@@ -6106,7 +6078,7 @@
msgstr "ΣÏνολο ΧÏεώσεων"
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:772
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr "Η εγγÏαφή \"%s\" δεν είναι ÎγκυÏη!"
@@ -6172,30 +6144,31 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
-#: code:addons/account/account_analytic_line.py:90
-#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account.py:509
+#: code:addons/account/account.py:511
+#: code:addons/account/account.py:836
+#: code:addons/account/account.py:915
+#: code:addons/account/account.py:990
+#: code:addons/account/account.py:1218
+#: code:addons/account/account.py:1224
+#: code:addons/account/account.py:2109
+#: code:addons/account/account.py:2357
+#: code:addons/account/account_analytic_line.py:89
+#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:292
#: code:addons/account/account_bank_statement.py:305
#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/account_cash_statement.py:329
+#: code:addons/account/account_cash_statement.py:349
+#: code:addons/account/account_move_line.py:1182
+#: code:addons/account/account_move_line.py:1197
+#: code:addons/account/account_move_line.py:1199
+#: code:addons/account/invoice.py:793
+#: code:addons/account/invoice.py:823
+#: code:addons/account/invoice.py:1014
#: code:addons/account/wizard/account_invoice_refund.py:100
#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
@@ -6254,6 +6227,11 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
+msgid "JRNL"
+msgstr ""
+
+#. module: account
#: view:account.partner.balance:0
#: view:account.partner.ledger:0
msgid ""
@@ -6305,7 +6283,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:64
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr ""
@@ -6322,9 +6300,11 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
msgstr "Γενικό Καθολικό"
@@ -6378,7 +6358,7 @@
msgstr "ΣÏνολο:"
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2064
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6408,7 +6388,7 @@
msgstr "Υποκωδικοί"
#. module: account
-#: code:addons/account/invoice.py:473
+#: code:addons/account/invoice.py:476
#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
@@ -6567,7 +6547,7 @@
msgstr "ΓÏαμμÎÏ‚"
#. module: account
-#: code:addons/account/invoice.py:521
+#: code:addons/account/invoice.py:524
#, python-format
msgid ""
"Can not find account chart for this company in invoice line account, Please "
@@ -6741,7 +6721,7 @@
"Ï€ÏοσαÏμοσμÎνο πεÏιβάλλον."
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:952
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6845,7 +6825,7 @@
msgstr "Î Ïόσημο στις ΑναφοÏÎÏ‚"
#. module: account
-#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_cash_statement.py:250
#, python-format
msgid "You can not have two open register for the same journal"
msgstr ""
@@ -6874,7 +6854,6 @@
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
msgstr "PRO-FORMA"
@@ -6886,10 +6865,8 @@
msgstr ""
#. module: account
-#: selection:account.entries.report,move_line_state:0
-#: view:account.move.line:0
-#: selection:account.move.line,state:0
-msgid "Unbalanced"
+#: view:account.payment.term.line:0
+msgid " value amount: n.a"
msgstr ""
#. module: account
@@ -6904,6 +6881,7 @@
#. module: account
#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
#: view:account.journal:0
#: field:account.journal,user_id:0
#: view:analytic.entries.report:0
@@ -6929,13 +6907,13 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "Bad account !"
msgstr "Λάθος λογαÏιασμός!"
#. module: account
-#: code:addons/account/account.py:2777
+#: code:addons/account/account.py:2821
#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
@@ -6953,7 +6931,7 @@
msgstr "ΦόÏος Τιμολογίου"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7193,17 +7171,17 @@
msgstr "ΣταθεÏÏŒ"
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
+#: code:addons/account/account.py:516
+#: code:addons/account/account.py:529
#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:546
+#: code:addons/account/account.py:654
+#: code:addons/account/account.py:941
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
+#: code:addons/account/invoice.py:722
+#: code:addons/account/invoice.py:725
+#: code:addons/account/invoice.py:728
#, python-format
msgid "Warning !"
msgstr "Î Ïοσοχή!"
@@ -7226,15 +7204,11 @@
msgstr "Υπολογισμός Ï€ÏοεγγÏαφής"
#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
#: field:account.entries.report,partner_id:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: field:account.invoice,partner_id:0
#: field:account.invoice.line,partner_id:0
@@ -7265,7 +7239,7 @@
msgstr "ΑδÏνατη η %s Ï€ÏοσωÏινοÏ/Ï€ÏοφόÏμα/ακυÏωμÎνου τιμολογίου"
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7315,7 +7289,7 @@
msgstr "ÎœÎθοδος Αναβολής"
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/invoice.py:360
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -7378,7 +7352,7 @@
msgstr "Συσχετιζόμενος ΣυνεÏγάτης"
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/invoice.py:1298
#, python-format
msgid "You must first select a partner !"
msgstr "Θα Ï€ÏÎπει Ï€Ïώτα να επιλÎξετε συνεÏγάτη!"
@@ -7443,7 +7417,7 @@
msgstr "Επιλογή Λογιστικής ΧÏήσης"
#. module: account
-#: code:addons/account/account.py:2841
+#: code:addons/account/account.py:2885
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
@@ -7478,6 +7452,7 @@
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
@@ -7642,7 +7617,7 @@
msgstr "ΤÏποι ΛογαÏιασμών"
#. module: account
-#: code:addons/account/invoice.py:897
+#: code:addons/account/invoice.py:905
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr ""
@@ -7693,6 +7668,7 @@
#: report:account.account.balance:0
#: report:account.central.journal:0
#: report:account.general.journal:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
msgid "Filter By"
msgstr ""
@@ -7731,7 +7707,7 @@
msgstr "ΓÏαμμή ÎŒÏων ΠληÏωμής"
#. module: account
-#: code:addons/account/account.py:2794
+#: code:addons/account/account.py:2838
#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
@@ -7901,8 +7877,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1137
+#: code:addons/account/account_move_line.py:1220
#, python-format
msgid "Bad account!"
msgstr "Λάθος λογαÏιασμός!"
@@ -7913,7 +7889,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1062
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -7936,6 +7912,7 @@
#: field:account.entries.report,currency_id:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice,currency_id:0
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
@@ -8110,14 +8087,14 @@
msgstr "ΠεÏίοδος από"
#. module: account
-#: code:addons/account/account.py:2817
+#: code:addons/account/account.py:2861
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:927
+#: code:addons/account/account.py:941
#, python-format
msgid ""
"You cannot modify company of this period as its related record exist in "
@@ -8166,7 +8143,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/invoice.py:795
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8182,7 +8159,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
+#: code:addons/account/account.py:2864
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
@@ -8220,6 +8197,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8229,7 +8207,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:2357
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
@@ -8266,7 +8244,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1008
+#: code:addons/account/invoice.py:1014
#, python-format
msgid ""
"You cannot cancel the Invoice which is Partially Paid! You need to "
@@ -8294,19 +8272,35 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:70
#, python-format
msgid "Current currency is not confirured properly !"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid ""
-"With Supplier Refunds you can manage the credit notes you receive from your "
-"suppliers. A refund is a document that credits an invoice completely or "
-"partially. You can easily generate refunds and reconcile them directly from "
-"the invoice form."
-msgstr ""
+#: code:addons/account/account.py:952
+#: code:addons/account/account.py:954
+#: code:addons/account/account.py:1195
+#: code:addons/account/account.py:1407
+#: code:addons/account/account.py:1411
+#: code:addons/account/account_cash_statement.py:250
+#: code:addons/account/account_move_line.py:771
+#: code:addons/account/account_move_line.py:794
+#: code:addons/account/account_move_line.py:796
+#: code:addons/account/account_move_line.py:799
+#: code:addons/account/account_move_line.py:801
+#: code:addons/account/account_move_line.py:1123
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
+msgstr "Σφάλμα"
#. module: account
#: view:account.account.template:0
@@ -8314,11 +8308,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr ""
-
-#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
msgstr ""
@@ -8343,6 +8332,7 @@
#: field:account.entries.report,balance:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
@@ -8361,6 +8351,7 @@
#. module: account
#: report:account.account.balance:0
+#: report:account.general.ledger_landscape:0
msgid "Display Account"
msgstr ""
@@ -8455,11 +8446,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr ""
-
-#. module: account
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
@@ -8475,6 +8461,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
@@ -8482,7 +8469,7 @@
msgstr "Μετακίνηση"
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1134
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -8580,6 +8567,7 @@
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
@@ -8623,7 +8611,7 @@
msgstr "Î ÏοεγγÏαφή λογαÏιασμοÏ"
#. module: account
-#: code:addons/account/invoice.py:717
+#: code:addons/account/invoice.py:725
#, python-format
msgid ""
"Tax base different !\n"
@@ -8650,6 +8638,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -8678,7 +8667,7 @@
msgstr "Μη συμφωνημÎνα"
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/invoice.py:812
#, python-format
msgid "Bad total !"
msgstr "Λάθος ΣÏνολο!"
@@ -8736,13 +8725,13 @@
msgstr "ΕνεÏγό"
#. module: account
-#: code:addons/account/invoice.py:354
+#: code:addons/account/invoice.py:353
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1181
#, python-format
msgid ""
"You cannot validate a non-balanced entry !\n"
@@ -8787,10 +8776,10 @@
#: field:account.entries.report,credit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -8809,11 +8798,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr ""
-
-#. module: account
#: view:account.general.journal:0
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -8995,11 +8979,6 @@
msgstr "ΕσωτεÏικός ΤÏπος"
#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr "Κατάσταση:"
-
-#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
msgstr "Î ÏοεγγÏαφÎÏ‚ σε εξÎλιξη"
@@ -9026,7 +9005,6 @@
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
msgstr "ΑποθηεκευμÎνη"
@@ -9045,6 +9023,7 @@
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -9098,7 +9077,7 @@
msgstr "Αυτό είναι Îνα μοντÎλο για τακτικÎÏ‚ λογιστικÎÏ‚ εγγÏαφÎÏ‚"
#. module: account
-#: code:addons/account/account_analytic_line.py:100
+#: code:addons/account/account_analytic_line.py:99
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -9248,8 +9227,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:729
+#: code:addons/account/account_move_line.py:806
#: code:addons/account/wizard/account_invoice_state.py:44
#: code:addons/account/wizard/account_invoice_state.py:68
#: code:addons/account/wizard/account_report_balance_sheet.py:70
@@ -9269,15 +9248,15 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr "Σε ΛογαÏιασμό του :"
-
-#. module: account
-#: view:account.automatic.reconcile:0
-#: view:account.move.line.reconcile.writeoff:0
-msgid "Write-Off Move"
-msgstr "Κίνηση ΠαÏαγÏαφής"
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr "ΚλεισμÎνα"
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
@@ -9315,10 +9294,10 @@
#: field:account.entries.report,debit:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
@@ -9339,20 +9318,12 @@
msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
-msgstr ""
-
-#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account_move_line.py:796
#, python-format
msgid "Entry is already reconciled"
msgstr "Η εγγÏαφή Îχει ήδη συμφωνηθεί"
@@ -9373,7 +9344,7 @@
msgstr "ΕÏÏος"
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1252
#, python-format
msgid ""
"Can not create an automatic sequence for this piece !\n"
@@ -9507,7 +9478,7 @@
msgstr "ΧαÏτογÏάφηση ΛογαÏιασμών"
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/invoice.py:345
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr "Το Τιμολόγιο '%s' αναμÎνει επιβεβαίωση."
@@ -9533,7 +9504,7 @@
"Ο λογαÏιασμός εσόδων ή εξόδων που σχετίζεται με το επιλεγμÎνο Ï€Ïοϊόν."
#. module: account
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1123
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -9739,7 +9710,7 @@
msgstr "Το μήκος πεÏιόδου δεν μποÏεί να είναι 0 ή μικÏότεÏο!"
#. module: account
-#: code:addons/account/account.py:501
+#: code:addons/account/account.py:511
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr "Δεν μποÏείς να διαγÏάψεις Îναν λογαÏιασμό που Îχει κινηθεί!. "
@@ -9762,6 +9733,7 @@
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
+<<<<<<< TREE
#~ msgid "Entries Encoding"
#~ msgstr "Κωδικοποίηση ΕγγÏαφών"
@@ -11341,3 +11313,20 @@
#~ msgid "End of Year"
#~ msgstr "ΤÎλος του Έτους"
+=======
+
+#~ msgid "Ref. :"
+#~ msgstr "Σχετ. :"
+
+#~ msgid "Print Voucher"
+#~ msgstr "ΕκτÏπωση παÏαστατικοÏ"
+
+#~ msgid "Canceled"
+#~ msgstr "ΑκυÏώθηκε"
+
+#~ msgid "On Account of :"
+#~ msgstr "Σε ΛογαÏιασμό του :"
+
+#~ msgid "State:"
+#~ msgstr "Κατάσταση:"
+>>>>>>> MERGE-SOURCE
=== modified file 'account/i18n/en_US.po'
--- account/i18n/en_US.po 2011-04-29 05:56:18 +0000
+++ account/i18n/en_US.po 2011-05-13 11:11:47 +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: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-01-09 14:42+0000\n"
"Last-Translator: Raphaël Valyi - http://www.akretion.com <Unknown>\n"
+=======
+"POT-Creation-Date: 2011-05-09 10:18+0000\n"
+"PO-Revision-Date: 2011-01-19 12:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: English (United States) <en_US@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: 2011-04-29 05:13+0000\n"
"X-Generator: Launchpad (build 12758)\n"
+=======
+"X-Launchpad-Export-Date: 2011-05-10 07:17+0000\n"
+"X-Generator: Launchpad (build 12959)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -28,13 +39,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:506
+#: code:addons/account/account.py:516
#, python-format
msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
@@ -66,7 +71,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:785
+#: code:addons/account/invoice.py:793
#, python-format
msgid "Please define sequence on invoice journal"
msgstr ""
@@ -131,7 +136,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1291
+#: code:addons/account/account.py:1305
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr ""
@@ -175,7 +180,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/invoice.py:1436
#, python-format
msgid "Warning!"
msgstr ""
@@ -227,7 +232,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:901
+#: code:addons/account/account.py:915
#, python-format
msgid ""
"No period defined for this date: %s !\n"
@@ -255,7 +260,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/invoice.py:1224
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -271,7 +276,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1182
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -309,7 +314,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/invoice.py:532
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -551,7 +556,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_cash_statement.py:349
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr ""
@@ -633,7 +638,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2779
+#: code:addons/account/account.py:2823
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
@@ -666,8 +671,8 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:767
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -728,7 +733,7 @@
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -829,7 +834,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1191
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid ""
"You can not do this modification on a confirmed entry ! Please note that you "
@@ -951,11 +956,11 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
+#: code:addons/account/account_move_line.py:169
#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
@@ -1034,7 +1039,6 @@
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
@@ -1120,6 +1124,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
@@ -1127,7 +1132,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:990
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1265,7 +1270,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr ""
@@ -1295,7 +1299,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: code:addons/account/account_move_line.py:1277
#, python-format
msgid "You can not use this general account in this journal !"
msgstr ""
@@ -1388,7 +1392,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:815
+#: code:addons/account/invoice.py:823
#, python-format
msgid ""
"Cannot create the invoice !\n"
@@ -1402,14 +1406,9 @@
msgstr ""
#. module: account
-#: selection:account.account,type:0
-#: selection:account.account.template,type:0
-#: selection:account.bank.statement,state:0
-#: selection:account.entries.report,type:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.period,state:0
-msgid "Closed"
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
msgstr ""
#. module: account
@@ -1547,7 +1546,6 @@
msgstr ""
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@@ -1591,11 +1589,6 @@
msgstr ""
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr ""
-
-#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
msgstr ""
@@ -1614,7 +1607,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:799
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr ""
@@ -1647,7 +1640,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:815
+#: code:addons/account/account_move_line.py:806
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr ""
@@ -1663,11 +1656,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr ""
-
-#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr ""
@@ -1683,7 +1671,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:329
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1704,7 +1692,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:499
+#: code:addons/account/account.py:509
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr ""
@@ -1720,7 +1708,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:519
+#: code:addons/account/account.py:529
#, python-format
msgid ""
"You cannot change the type of account from 'Closed' to any other type which "
@@ -1882,11 +1870,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr ""
-
-#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
@@ -1991,7 +1974,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1333
#, python-format
msgid ""
"There is no default default debit account defined \n"
@@ -2043,7 +2026,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2844
+#: code:addons/account/account.py:2888
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
@@ -2063,7 +2046,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/invoice.py:351
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2074,6 +2057,7 @@
msgstr ""
#. module: account
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: field:account.print.journal,sort_selection:0
msgid "Entries Sorted By"
@@ -2102,6 +2086,7 @@
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
#: report:account.partner.balance:0
@@ -2210,7 +2195,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/invoice.py:552
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2280,7 +2265,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:2796
+#: code:addons/account/account.py:2840
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
@@ -2364,7 +2349,7 @@
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/invoice.py:350
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2376,13 +2361,12 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
msgstr ""
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:654
#, python-format
msgid ""
"You cannot modify company of this journal as its related record exist in "
@@ -2418,6 +2402,7 @@
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
@@ -2526,16 +2511,16 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1195
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
+#: code:addons/account/account.py:2097
#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
+#: code:addons/account/account_move_line.py:169
+#: code:addons/account/invoice.py:678
#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2584,11 +2569,6 @@
msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr ""
-
-#. module: account
#: selection:account.print.journal,sort_selection:0
msgid "Reference Number"
msgstr ""
@@ -2695,7 +2675,7 @@
msgstr ""
#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account.py:836
#, python-format
msgid ""
"No fiscal year defined for this date !\n"
@@ -2812,6 +2792,7 @@
msgstr ""
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
@@ -2819,6 +2800,9 @@
#. module: account
#: code:addons/account/account.py:2906
+=======
+#: code:addons/account/account.py:2950
+>>>>>>> MERGE-SOURCE
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
@@ -2909,6 +2893,12 @@
msgstr ""
#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
+
+#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
@@ -2927,6 +2917,7 @@
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
#: report:account.partner.balance:0
#: field:acco
Follow ups
