odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] mail: from chm 

bzr revid: fva@openerp.com-20121107103530-qk0h13jqp9q2w1te
This commit is contained in:
Frédéric van der Essen 2012-11-07 11:35:30 +01:00
parent da9bb224a2 e9a24477a8
commit 41ccce3e53
5460 changed files with 51729 additions and 78813 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/account_bank_statement.py
View File

@ -61,7 +61,7 @@ class account_bank_statement(osv.osv):
return res
def _get_period(self, cr, uid, context=None):
periods = self.pool.get('account.period').find(cr, uid)
periods = self.pool.get('account.period').find(cr, uid,context=context)
if periods:
return periods[0]
return False

6
addons/account/account_cash_statement.py
View File

@ -78,7 +78,7 @@ class account_cash_statement(osv.osv):
"""
res = {}
for statement in self.browse(cr, uid, ids, context=context):
if statement.journal_id.type not in ('cash',):
if (statement.journal_id.type not in ('cash',)) or (not statement.journal_id.cash_control):
continue
start = end = 0
for line in statement.details_ids:
@ -289,13 +289,13 @@ class account_cash_statement(osv.osv):
super(account_cash_statement, self).button_confirm_bank(cr, uid, ids, context=context)
absl_proxy = self.pool.get('account.bank.statement.line')
TABLES = (('Profit', 'profit_account_id'), ('Loss', 'loss_account_id'),)
TABLES = ((_('Profit'), 'profit_account_id'), (_('Loss'), 'loss_account_id'),)
for obj in self.browse(cr, uid, ids, context=context):
if obj.difference == 0.0:
continue
for item_label, item_account in TALBES:
for item_label, item_account in TABLES:
if getattr(obj.journal_id, item_account):
raise osv.except_osv(_('Error!'),
_('There is no %s Account on the journal %s.') % (item_label, obj.journal_id.name,))

8
addons/account/account_view.xml
View File

@ -509,8 +509,8 @@
<page string="Cash Registers">
<group>
<group string="Accounts">
<field name="profit_account_id"/>
<field name="loss_account_id"/>
<field name="profit_account_id" domain="[('type','!=','view')]"/>
<field name="loss_account_id" domain="[('type','!=','view')]"/>
<field name="internal_account_id"/>
</group>
<group string="Miscellaneous">
@ -1230,8 +1230,8 @@
<field name="move_id" string="Number (Move)"/>
<field name="account_id"/>
<field name="partner_id"/>
<field name="journal_id" context="{'journal_id':self}"/>
<field name="period_id" context="{'period_id':self}"/>
<field name="journal_id" context="{'journal_id':self}" widget="selection"/> <!-- it's important to keep widget='selection' in this filter viewbecause without that the value passed in the context is not the ID but the textual value (name) of the selected journal -->
<field name="period_id" context="{'period_id':self}" widget="selection"/> <!-- it's important to keep the widget='selection' in this field, for the same reason as explained above -->
<group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>

560
addons/account/i18n/ar.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/bg.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/br.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/bs.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/ca.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/cs.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/da.po
View File

File diff suppressed because it is too large Load Diff

29
addons/account/i18n/de.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-14 04:39+0000\n"
"X-Generator: Launchpad (build 16137)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:01+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#. module: account
#: view:account.invoice.report:0
@ -759,6 +759,7 @@ msgstr "Zeige Hierarchie der Kinder"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
msgid "Percent"
msgstr "Prozent"
@ -1725,6 +1726,7 @@ msgid "Separated Journal Sequences"
msgstr "Unterteilte Folge von Journalen"
#. module: account
#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr "Verantwortlicher"
@ -2657,7 +2659,6 @@ msgid "Account move line reconcile (writeoff)"
msgstr "OP-Ausgleich (Abschreibung)"
#. module: account
#: model:account.account.type,name:account.account_type_tax
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: field:account.move.line,account_tax_id:0
@ -3672,6 +3673,7 @@ msgstr ""
#: report:account.analytic.account.journal:0
#: selection:account.balance.report,filter:0
#: field:account.bank.statement,date:0
#: field:account.bank.statement.line,date:0
#: selection:account.central.journal,filter:0
#: selection:account.common.account.report,filter:0
#: selection:account.common.journal.report,filter:0
@ -3703,6 +3705,8 @@ msgstr ""
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
#: code:addons/account/report/account_general_ledger.py:305
#: code:addons/account/report/account_general_ledger.py:308
#: code:addons/account/report/account_journal.py:195
#: code:addons/account/report/account_journal.py:198
#: code:addons/account/report/common_report_header.py:97
@ -3724,7 +3728,6 @@ msgstr "Storno Ausgleich"
#. 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
@ -5480,7 +5483,6 @@ msgstr "Standardauswertung Finanzen"
#. module: account
#: field:account.bank.statement.line,name:0
#: field:account.invoice,reference:0
msgid "Communication"
msgstr "Kommunikation"
@ -5615,7 +5617,6 @@ msgid "Customer Invoices And Refunds"
msgstr "Kunden Rechnungen und Gutschriften"
#. module: account
#: field:account.analytic.line,amount_currency:0
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@ -5645,8 +5646,6 @@ msgstr "Zu begleichende Buchungen"
#: field:account.invoice.line,quantity:0
#: field:account.model.line,quantity:0
#: field:account.move.line,quantity:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
#: view:analytic.entries.report:0
#: field:analytic.entries.report,unit_amount:0
#: field:report.account.sales,quantity:0
@ -5759,7 +5758,6 @@ msgstr "Ausgleichen durch Abschreibung"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Fixed Amount"
msgstr "Fester Betrag"
@ -5803,7 +5801,6 @@ msgstr "Bereits ausgeglichen"
#. module: account
#: help:account.tax,type:0
#: help:account.tax.template,type:0
msgid "The computation method for the tax amount."
msgstr "Die Berechnungsmethode für die Höhe der Steuern."
@ -5904,7 +5901,7 @@ msgstr "Berechnungsform"
#: selection:account.partner.ledger,result_selection:0
#: code:addons/account/report/account_aged_partner_balance.py:376
#: code:addons/account/report/account_partner_balance.py:301
#: code:addons/account/report/account_partner_ledger.py:398
#: code:addons/account/report/account_partner_ledger.py:399
#, python-format
msgid "Receivable and Payable Accounts"
msgstr "Debitoren und Kreditoren"
@ -6458,12 +6455,13 @@ msgstr "Buchwert"
#. module: account
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Percentage"
msgstr "Prozentsatz"
#. module: account
#: selection:account.report.general.ledger,sortby:0
#: code:addons/account/report/account_general_ledger.py:307
#, python-format
msgid "Journal & Partner"
msgstr "Journal & Partner"
@ -6515,6 +6513,7 @@ msgid "Applicable Type"
msgstr "Anwendbare Art"
#. module: account
#: field:account.invoice,reference:0
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Reference"
msgstr "Rechnungsbezug"
@ -7304,7 +7303,7 @@ msgstr "Sie können keine quittierten Buchungen löschen \"%s\"!"
#. module: account
#: selection:account.partner.ledger,filter:0
#: code:addons/account/report/account_partner_ledger.py:59
#: code:addons/account/report/account_partner_ledger.py:60
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
#, python-format
msgid "Unreconciled Entries"
@ -7919,7 +7918,7 @@ msgstr "Mai"
#: selection:account.partner.ledger,result_selection:0
#: code:addons/account/report/account_aged_partner_balance.py:374
#: code:addons/account/report/account_partner_balance.py:299
#: code:addons/account/report/account_partner_ledger.py:396
#: code:addons/account/report/account_partner_ledger.py:397
#, python-format
msgid "Payable Accounts"
msgstr "Kreditorenkonten"
@ -8780,6 +8779,7 @@ msgstr "Journal Gutschriften"
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
msgid "Filter By"
msgstr "Filter nach"
@ -9642,7 +9642,6 @@ msgstr ""
"beendet werden soll."
#. module: account
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
msgstr "Filter nach"

453
addons/account/i18n/el.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/en_GB.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/en_US.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/es.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/es_AR.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/es_CL.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/es_CR.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/es_DO.po
View File

File diff suppressed because it is too large Load Diff

29
addons/account/i18n/es_EC.po
View File

@ -16,8 +16,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-18 04:40+0000\n"
"X-Generator: Launchpad (build 16160)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:07+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#. module: account
#: view:account.invoice.report:0
@ -752,6 +752,7 @@ msgstr "Mostrar los hijos con herencia"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
msgid "Percent"
msgstr "Porcentaje"
@ -1711,6 +1712,7 @@ msgid "Separated Journal Sequences"
msgstr "Secuencias de diarios separadas"
#. module: account
#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr "Responsable"
@ -2635,7 +2637,6 @@ msgid "Account move line reconcile (writeoff)"
msgstr "Reconcilia linea de asiento (desajuste)"
#. module: account
#: model:account.account.type,name:account.account_type_tax
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: field:account.move.line,account_tax_id:0
@ -3632,6 +3633,7 @@ msgstr ""
#: report:account.analytic.account.journal:0
#: selection:account.balance.report,filter:0
#: field:account.bank.statement,date:0
#: field:account.bank.statement.line,date:0
#: selection:account.central.journal,filter:0
#: selection:account.common.account.report,filter:0
#: selection:account.common.journal.report,filter:0
@ -3663,6 +3665,8 @@ msgstr ""
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
#: code:addons/account/report/account_general_ledger.py:305
#: code:addons/account/report/account_general_ledger.py:308
#: code:addons/account/report/account_journal.py:195
#: code:addons/account/report/account_journal.py:198
#: code:addons/account/report/common_report_header.py:97
@ -3684,7 +3688,6 @@ msgstr "Romper conciliación"
#. 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
@ -5425,7 +5428,6 @@ msgstr "Cuenta Comun de Reporte Contable"
#. module: account
#: field:account.bank.statement.line,name:0
#: field:account.invoice,reference:0
msgid "Communication"
msgstr "Comunicación"
@ -5561,7 +5563,6 @@ msgid "Customer Invoices And Refunds"
msgstr "Facturas y Notas de Crédito"
#. module: account
#: field:account.analytic.line,amount_currency:0
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@ -5591,8 +5592,6 @@ msgstr "Líneas a Conciliar"
#: field:account.invoice.line,quantity:0
#: field:account.model.line,quantity:0
#: field:account.move.line,quantity:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
#: view:analytic.entries.report:0
#: field:analytic.entries.report,unit_amount:0
#: field:report.account.sales,quantity:0
@ -5701,7 +5700,6 @@ msgstr "Conciliar con ajuste"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Fixed Amount"
msgstr "Importe fijo"
@ -5745,7 +5743,6 @@ msgstr "Ya está conciliado"
#. module: account
#: help:account.tax,type:0
#: help:account.tax.template,type:0
msgid "The computation method for the tax amount."
msgstr "El método de cálculo del importe del impuesto."
@ -5846,7 +5843,7 @@ msgstr "Valuation"
#: selection:account.partner.ledger,result_selection:0
#: code:addons/account/report/account_aged_partner_balance.py:376
#: code:addons/account/report/account_partner_balance.py:301
#: code:addons/account/report/account_partner_ledger.py:398
#: code:addons/account/report/account_partner_ledger.py:399
#, python-format
msgid "Receivable and Payable Accounts"
msgstr "Receivable and Payable Accounts"
@ -6395,12 +6392,13 @@ msgstr "Patrimonio"
#. module: account
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Percentage"
msgstr "Porcentaje"
#. module: account
#: selection:account.report.general.ledger,sortby:0
#: code:addons/account/report/account_general_ledger.py:307
#, python-format
msgid "Journal & Partner"
msgstr "Journal & Partner"
@ -6452,6 +6450,7 @@ msgid "Applicable Type"
msgstr "Tipo aplicable"
#. module: account
#: field:account.invoice,reference:0
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Reference"
msgstr "Referencia factura"
@ -7234,7 +7233,7 @@ msgstr "¡No puede borrar un asiento asentado \"%s\"¡"
#. module: account
#: selection:account.partner.ledger,filter:0
#: code:addons/account/report/account_partner_ledger.py:59
#: code:addons/account/report/account_partner_ledger.py:60
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
#, python-format
msgid "Unreconciled Entries"
@ -7842,7 +7841,7 @@ msgstr "Mayo"
#: selection:account.partner.ledger,result_selection:0
#: code:addons/account/report/account_aged_partner_balance.py:374
#: code:addons/account/report/account_partner_balance.py:299
#: code:addons/account/report/account_partner_ledger.py:396
#: code:addons/account/report/account_partner_ledger.py:397
#, python-format
msgid "Payable Accounts"
msgstr "Cuentas por pagar"
@ -8708,6 +8707,7 @@ msgstr "Diario de Reembolsos"
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
msgid "Filter By"
msgstr "Filtrar por"
@ -9555,7 +9555,6 @@ msgstr ""
"period."
#. module: account
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
msgstr "Filtrado Por"

31
addons/account/i18n/es_MX.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-16 04:46+0000\n"
"X-Generator: Launchpad (build 16137)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:07+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#. module: account
#: view:account.invoice.report:0
@ -706,6 +706,7 @@ msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
msgid "Percent"
msgstr ""
@ -1625,6 +1626,7 @@ msgid "Separated Journal Sequences"
msgstr ""
#. module: account
#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@ -2483,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
msgstr ""
#. module: account
#: model:account.account.type,name:account.account_type_tax
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: field:account.move.line,account_tax_id:0
@ -3435,6 +3436,7 @@ msgstr ""
#: report:account.analytic.account.journal:0
#: selection:account.balance.report,filter:0
#: field:account.bank.statement,date:0
#: field:account.bank.statement.line,date:0
#: selection:account.central.journal,filter:0
#: selection:account.common.account.report,filter:0
#: selection:account.common.journal.report,filter:0
@ -3466,6 +3468,8 @@ msgstr ""
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
#: code:addons/account/report/account_general_ledger.py:305
#: code:addons/account/report/account_general_ledger.py:308
#: code:addons/account/report/account_journal.py:195
#: code:addons/account/report/account_journal.py:198
#: code:addons/account/report/common_report_header.py:97
@ -3487,7 +3491,6 @@ msgstr ""
#. 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
@ -5158,7 +5161,6 @@ msgstr ""
#. module: account
#: field:account.bank.statement.line,name:0
#: field:account.invoice,reference:0
msgid "Communication"
msgstr ""
@ -5290,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
msgstr ""
#. module: account
#: field:account.analytic.line,amount_currency:0
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@ -5318,8 +5319,6 @@ msgstr ""
#: field:account.invoice.line,quantity:0
#: field:account.model.line,quantity:0
#: field:account.move.line,quantity:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
#: view:analytic.entries.report:0
#: field:analytic.entries.report,unit_amount:0
#: field:report.account.sales,quantity:0
@ -5419,7 +5418,6 @@ msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Fixed Amount"
msgstr ""
@ -5463,7 +5461,6 @@ msgstr ""
#. module: account
#: help:account.tax,type:0
#: help:account.tax.template,type:0
msgid "The computation method for the tax amount."
msgstr ""
@ -5564,7 +5561,7 @@ msgstr ""
#: selection:account.partner.ledger,result_selection:0
#: code:addons/account/report/account_aged_partner_balance.py:376
#: code:addons/account/report/account_partner_balance.py:301
#: code:addons/account/report/account_partner_ledger.py:398
#: code:addons/account/report/account_partner_ledger.py:399
#, python-format
msgid "Receivable and Payable Accounts"
msgstr ""
@ -6079,16 +6076,17 @@ msgstr ""
#. module: account
#: model:account.account.type,name:account.account_type_cash_equity
msgid "Equity"
msgstr ""
msgstr "Capital"
#. module: account
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Percentage"
msgstr ""
#. module: account
#: selection:account.report.general.ledger,sortby:0
#: code:addons/account/report/account_general_ledger.py:307
#, python-format
msgid "Journal & Partner"
msgstr ""
@ -6138,6 +6136,7 @@ msgid "Applicable Type"
msgstr ""
#. module: account
#: field:account.invoice,reference:0
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Reference"
msgstr ""
@ -6849,7 +6848,7 @@ msgstr ""
#. module: account
#: selection:account.partner.ledger,filter:0
#: code:addons/account/report/account_partner_ledger.py:59
#: code:addons/account/report/account_partner_ledger.py:60
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
#, python-format
msgid "Unreconciled Entries"
@ -7414,7 +7413,7 @@ msgstr ""
#: selection:account.partner.ledger,result_selection:0
#: code:addons/account/report/account_aged_partner_balance.py:374
#: code:addons/account/report/account_partner_balance.py:299
#: code:addons/account/report/account_partner_ledger.py:396
#: code:addons/account/report/account_partner_ledger.py:397
#, python-format
msgid "Payable Accounts"
msgstr ""
@ -8205,6 +8204,7 @@ msgstr ""
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
msgid "Filter By"
msgstr ""
@ -8997,7 +8997,6 @@ msgid ""
msgstr ""
#. module: account
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
msgstr ""

448
addons/account/i18n/es_PY.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/es_UY.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/es_VE.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/et.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/eu.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/fa.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/fa_AF.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/fi.po
View File

File diff suppressed because it is too large Load Diff

511
addons/account/i18n/fr.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/fr_BE.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/gl.po
View File

File diff suppressed because it is too large Load Diff

29
addons/account/i18n/gu.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-18 04:40+0000\n"
"X-Generator: Launchpad (build 16160)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:01+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#. module: account
#: view:account.invoice.report:0
@ -706,6 +706,7 @@ msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
msgid "Percent"
msgstr "ટકાવારી"
@ -1625,6 +1626,7 @@ msgid "Separated Journal Sequences"
msgstr ""
#. module: account
#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr ""
@ -2483,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
msgstr ""
#. module: account
#: model:account.account.type,name:account.account_type_tax
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: field:account.move.line,account_tax_id:0
@ -3435,6 +3436,7 @@ msgstr ""
#: report:account.analytic.account.journal:0
#: selection:account.balance.report,filter:0
#: field:account.bank.statement,date:0
#: field:account.bank.statement.line,date:0
#: selection:account.central.journal,filter:0
#: selection:account.common.account.report,filter:0
#: selection:account.common.journal.report,filter:0
@ -3466,6 +3468,8 @@ msgstr ""
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
#: code:addons/account/report/account_general_ledger.py:305
#: code:addons/account/report/account_general_ledger.py:308
#: code:addons/account/report/account_journal.py:195
#: code:addons/account/report/account_journal.py:198
#: code:addons/account/report/common_report_header.py:97
@ -3487,7 +3491,6 @@ msgstr ""
#. 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
@ -5158,7 +5161,6 @@ msgstr ""
#. module: account
#: field:account.bank.statement.line,name:0
#: field:account.invoice,reference:0
msgid "Communication"
msgstr ""
@ -5290,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
msgstr ""
#. module: account
#: field:account.analytic.line,amount_currency:0
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@ -5318,8 +5319,6 @@ msgstr ""
#: field:account.invoice.line,quantity:0
#: field:account.model.line,quantity:0
#: field:account.move.line,quantity:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
#: view:analytic.entries.report:0
#: field:analytic.entries.report,unit_amount:0
#: field:report.account.sales,quantity:0
@ -5419,7 +5418,6 @@ msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Fixed Amount"
msgstr ""
@ -5463,7 +5461,6 @@ msgstr ""
#. module: account
#: help:account.tax,type:0
#: help:account.tax.template,type:0
msgid "The computation method for the tax amount."
msgstr ""
@ -5564,7 +5561,7 @@ msgstr ""
#: selection:account.partner.ledger,result_selection:0
#: code:addons/account/report/account_aged_partner_balance.py:376
#: code:addons/account/report/account_partner_balance.py:301
#: code:addons/account/report/account_partner_ledger.py:398
#: code:addons/account/report/account_partner_ledger.py:399
#, python-format
msgid "Receivable and Payable Accounts"
msgstr ""
@ -6083,12 +6080,13 @@ msgstr ""
#. module: account
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Percentage"
msgstr ""
#. module: account
#: selection:account.report.general.ledger,sortby:0
#: code:addons/account/report/account_general_ledger.py:307
#, python-format
msgid "Journal & Partner"
msgstr ""
@ -6138,6 +6136,7 @@ msgid "Applicable Type"
msgstr ""
#. module: account
#: field:account.invoice,reference:0
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Reference"
msgstr ""
@ -6849,7 +6848,7 @@ msgstr ""
#. module: account
#: selection:account.partner.ledger,filter:0
#: code:addons/account/report/account_partner_ledger.py:59
#: code:addons/account/report/account_partner_ledger.py:60
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
#, python-format
msgid "Unreconciled Entries"
@ -7414,7 +7413,7 @@ msgstr ""
#: selection:account.partner.ledger,result_selection:0
#: code:addons/account/report/account_aged_partner_balance.py:374
#: code:addons/account/report/account_partner_balance.py:299
#: code:addons/account/report/account_partner_ledger.py:396
#: code:addons/account/report/account_partner_ledger.py:397
#, python-format
msgid "Payable Accounts"
msgstr ""
@ -8205,6 +8204,7 @@ msgstr ""
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
msgid "Filter By"
msgstr ""
@ -8997,7 +8997,6 @@ msgid ""
msgstr ""
#. module: account
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
msgstr ""

448
addons/account/i18n/he.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/hi.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/hr.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/hu.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/id.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/it.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/ja.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/kab.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/kk.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/ko.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/lo.po
View File

File diff suppressed because it is too large Load Diff

497
addons/account/i18n/lt.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/lv.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/mk.po
View File

File diff suppressed because it is too large Load Diff

466
addons/account/i18n/mn.po
View File

File diff suppressed because it is too large Load Diff

654
addons/account/i18n/nb.po
View File

File diff suppressed because it is too large Load Diff

508
addons/account/i18n/nl.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/nl_BE.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/oc.po
View File

File diff suppressed because it is too large Load Diff

460
addons/account/i18n/pl.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/pt.po
View File

File diff suppressed because it is too large Load Diff

29
addons/account/i18n/pt_BR.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-18 04:40+0000\n"
"X-Generator: Launchpad (build 16160)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:06+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#. module: account
#: view:account.invoice.report:0
@ -754,6 +754,7 @@ msgstr "Visualiza subnível com a hierarquia"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
msgid "Percent"
msgstr "Percentual"
@ -1718,6 +1719,7 @@ msgid "Separated Journal Sequences"
msgstr "Sequências de diário separadas"
#. module: account
#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr "Responsável"
@ -2637,7 +2639,6 @@ msgid "Account move line reconcile (writeoff)"
msgstr "Reconciliar linha de movimentação de conta (baixa)"
#. module: account
#: model:account.account.type,name:account.account_type_tax
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: field:account.move.line,account_tax_id:0
@ -3647,6 +3648,7 @@ msgstr ""
#: report:account.analytic.account.journal:0
#: selection:account.balance.report,filter:0
#: field:account.bank.statement,date:0
#: field:account.bank.statement.line,date:0
#: selection:account.central.journal,filter:0
#: selection:account.common.account.report,filter:0
#: selection:account.common.journal.report,filter:0
@ -3678,6 +3680,8 @@ msgstr ""
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
#: code:addons/account/report/account_general_ledger.py:305
#: code:addons/account/report/account_general_ledger.py:308
#: code:addons/account/report/account_journal.py:195
#: code:addons/account/report/account_journal.py:198
#: code:addons/account/report/common_report_header.py:97
@ -3699,7 +3703,6 @@ msgstr "Não concilidado"
#. 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
@ -5451,7 +5454,6 @@ msgstr "Relatório de Contas da Contabilidade Geral"
#. module: account
#: field:account.bank.statement.line,name:0
#: field:account.invoice,reference:0
msgid "Communication"
msgstr "Comunicação"
@ -5587,7 +5589,6 @@ msgid "Customer Invoices And Refunds"
msgstr "Faturas de Clientes e Reembolsos"
#. module: account
#: field:account.analytic.line,amount_currency:0
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@ -5617,8 +5618,6 @@ msgstr "Linhas para reconciliar"
#: field:account.invoice.line,quantity:0
#: field:account.model.line,quantity:0
#: field:account.move.line,quantity:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
#: view:analytic.entries.report:0
#: field:analytic.entries.report,unit_amount:0
#: field:report.account.sales,quantity:0
@ -5728,7 +5727,6 @@ msgstr "Reconciliar com Baixa"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Fixed Amount"
msgstr "Quantidade fixa"
@ -5772,7 +5770,6 @@ msgstr "Já Reconciliado"
#. module: account
#: help:account.tax,type:0
#: help:account.tax.template,type:0
msgid "The computation method for the tax amount."
msgstr "O método de cálculo para o valor do imposto."
@ -5873,7 +5870,7 @@ msgstr "Valorização"
#: selection:account.partner.ledger,result_selection:0
#: code:addons/account/report/account_aged_partner_balance.py:376
#: code:addons/account/report/account_partner_balance.py:301
#: code:addons/account/report/account_partner_ledger.py:398
#: code:addons/account/report/account_partner_ledger.py:399
#, python-format
msgid "Receivable and Payable Accounts"
msgstr "Contas de Pagamento e Recebimento"
@ -6424,12 +6421,13 @@ msgstr "Patrimônio Líquido"
#. module: account
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Percentage"
msgstr "Porcentagem"
#. module: account
#: selection:account.report.general.ledger,sortby:0
#: code:addons/account/report/account_general_ledger.py:307
#, python-format
msgid "Journal & Partner"
msgstr "Diário & Parceiro"
@ -6481,6 +6479,7 @@ msgid "Applicable Type"
msgstr "Tipo aplicável"
#. module: account
#: field:account.invoice,reference:0
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Reference"
msgstr "Referência da Fatura"
@ -7263,7 +7262,7 @@ msgstr "Você não pode excluir um lançamento do diário publicado \"%s\"!"
#. module: account
#: selection:account.partner.ledger,filter:0
#: code:addons/account/report/account_partner_ledger.py:59
#: code:addons/account/report/account_partner_ledger.py:60
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
#, python-format
msgid "Unreconciled Entries"
@ -7870,7 +7869,7 @@ msgstr "Maio"
#: selection:account.partner.ledger,result_selection:0
#: code:addons/account/report/account_aged_partner_balance.py:374
#: code:addons/account/report/account_partner_balance.py:299
#: code:addons/account/report/account_partner_ledger.py:396
#: code:addons/account/report/account_partner_ledger.py:397
#, python-format
msgid "Payable Accounts"
msgstr "Contas a Pagar"
@ -8732,6 +8731,7 @@ msgstr "Diário de Devolução"
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
msgid "Filter By"
msgstr "Filtrar Por"
@ -9585,7 +9585,6 @@ msgstr ""
"empresa sobre um período específico."
#. module: account
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
msgstr "Filtros Por"

29
addons/account/i18n/ro.po
View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-18 04:40+0000\n"
"X-Generator: Launchpad (build 16160)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:04+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#. module: account
#: view:account.invoice.report:0
@ -756,6 +756,7 @@ msgstr "Afisati conturi secundare ierarhic"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax.template,type:0
msgid "Percent"
msgstr "Procent"
@ -1721,6 +1722,7 @@ msgid "Separated Journal Sequences"
msgstr "Secvente Separate de Jurnal"
#. module: account
#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
msgstr "Responsabil"
@ -2645,7 +2647,6 @@ msgid "Account move line reconcile (writeoff)"
msgstr "Reconciliere linie miscare cont (pierdere)"
#. module: account
#: model:account.account.type,name:account.account_type_tax
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: field:account.move.line,account_tax_id:0
@ -3655,6 +3656,7 @@ msgstr ""
#: report:account.analytic.account.journal:0
#: selection:account.balance.report,filter:0
#: field:account.bank.statement,date:0
#: field:account.bank.statement.line,date:0
#: selection:account.central.journal,filter:0
#: selection:account.common.account.report,filter:0
#: selection:account.common.journal.report,filter:0
@ -3686,6 +3688,8 @@ msgstr ""
#: selection:account.vat.declaration,filter:0
#: selection:accounting.report,filter:0
#: selection:accounting.report,filter_cmp:0
#: code:addons/account/report/account_general_ledger.py:305
#: code:addons/account/report/account_general_ledger.py:308
#: code:addons/account/report/account_journal.py:195
#: code:addons/account/report/account_journal.py:198
#: code:addons/account/report/common_report_header.py:97
@ -3707,7 +3711,6 @@ msgstr "Nereconciliere"
#. 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
@ -5461,7 +5464,6 @@ msgstr "Cont Comun Raport Cont"
#. module: account
#: field:account.bank.statement.line,name:0
#: field:account.invoice,reference:0
msgid "Communication"
msgstr "Comunicare"
@ -5597,7 +5599,6 @@ msgid "Customer Invoices And Refunds"
msgstr "Facturi si Rambursari Client"
#. module: account
#: field:account.analytic.line,amount_currency:0
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
@ -5627,8 +5628,6 @@ msgstr "Linii de reconciliat"
#: field:account.invoice.line,quantity:0
#: field:account.model.line,quantity:0
#: field:account.move.line,quantity:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
#: view:analytic.entries.report:0
#: field:analytic.entries.report,unit_amount:0
#: field:report.account.sales,quantity:0
@ -5739,7 +5738,6 @@ msgstr "Reconciliere cu Pierderea"
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Fixed Amount"
msgstr "Suma fixa"
@ -5783,7 +5781,6 @@ msgstr "Deja Reconciliat!"
#. module: account
#: help:account.tax,type:0
#: help:account.tax.template,type:0
msgid "The computation method for the tax amount."
msgstr "Metoda de calcul pentru valoarea impozitului."
@ -5884,7 +5881,7 @@ msgstr "Evaluare"
#: selection:account.partner.ledger,result_selection:0
#: code:addons/account/report/account_aged_partner_balance.py:376
#: code:addons/account/report/account_partner_balance.py:301
#: code:addons/account/report/account_partner_ledger.py:398
#: code:addons/account/report/account_partner_ledger.py:399
#, python-format
msgid "Receivable and Payable Accounts"
msgstr "Conturi Incasari si Plati"
@ -6437,12 +6434,13 @@ msgstr "Capital"
#. module: account
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "Percentage"
msgstr "Procentaj"
#. module: account
#: selection:account.report.general.ledger,sortby:0
#: code:addons/account/report/account_general_ledger.py:307
#, python-format
msgid "Journal & Partner"
msgstr "Jurnal & Partener"
@ -6494,6 +6492,7 @@ msgid "Applicable Type"
msgstr "Tipul aplicabil"
#. module: account
#: field:account.invoice,reference:0
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Reference"
msgstr "Referinta facturii"
@ -7283,7 +7282,7 @@ msgstr "Nu puteti sterge o inregistrare in jurnal \"%s\" afisata!"
#. module: account
#: selection:account.partner.ledger,filter:0
#: code:addons/account/report/account_partner_ledger.py:59
#: code:addons/account/report/account_partner_ledger.py:60
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
#, python-format
msgid "Unreconciled Entries"
@ -7893,7 +7892,7 @@ msgstr "Mai"
#: selection:account.partner.ledger,result_selection:0
#: code:addons/account/report/account_aged_partner_balance.py:374
#: code:addons/account/report/account_partner_balance.py:299
#: code:addons/account/report/account_partner_ledger.py:396
#: code:addons/account/report/account_partner_ledger.py:397
#, python-format
msgid "Payable Accounts"
msgstr "Conturi Plati"
@ -8759,6 +8758,7 @@ msgstr "Jurnal Rambursari"
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
msgid "Filter By"
msgstr "Filtrati dupa"
@ -9615,7 +9615,6 @@ msgstr ""
"companiei dumneavoastra de-a lungul unei perioade specifice."
#. module: account
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
msgstr "Filtre dupa"

292
addons/account/i18n/ru.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/si.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/sk.po
View File

File diff suppressed because it is too large Load Diff

466
addons/account/i18n/sl.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/sq.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/sr.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/sr@latin.po
View File

File diff suppressed because it is too large Load Diff

499
addons/account/i18n/sv.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/ta.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/te.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/th.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/tlh.po
View File

File diff suppressed because it is too large Load Diff

1115
addons/account/i18n/tr.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/ug.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/uk.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/ur.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/vi.po
View File

File diff suppressed because it is too large Load Diff

16
addons/account/i18n/zh_CN.po
View File

@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
"PO-Revision-Date: 2012-10-25 16:26+0000\n"
"Last-Translator: AllanWong <18895563@qq.com>\n"
"PO-Revision-Date: 2012-11-01 08:44+0000\n"
"Last-Translator: ccdos <ccdos@163.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-26 04:56+0000\n"
"X-Generator: Launchpad (build 16194)\n"
"X-Launchpad-Export-Date: 2012-11-03 05:04+0000\n"
"X-Generator: Launchpad (build 16218)\n"
#. module: account
#: view:account.invoice.report:0
@ -2330,7 +2330,7 @@ msgstr "筛选"
#: selection:report.invoice.created,state:0
#, python-format
msgid "Open"
msgstr "打开"
msgstr "待支付"
#. module: account
#: model:process.node,note:account.process_node_draftinvoices0
@ -4668,7 +4668,7 @@ msgstr "税适用"
#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
#, python-format
msgid "Journal Items"
msgstr "会计凭证行"
msgstr "会计凭证明细"
#. module: account
#: code:addons/account/account.py:1095
@ -9642,7 +9642,7 @@ msgstr "本报表让您打印或产生一个由所有账簿生成的总账"
#: selection:account.account.template,type:0
#: selection:account.entries.report,type:0
msgid "Regular"
msgstr "定期"
msgstr "常规科目"
#. module: account
#: view:account.account:0
@ -10557,7 +10557,7 @@ msgstr "前景"
#. module: account
#: view:account.move.line:0
msgid "Search Journal Items"
msgstr "搜索分录"
msgstr "搜索会计凭证明细"
#. module: account
#: help:account.tax,base_sign:0

448
addons/account/i18n/zh_HK.po
View File

File diff suppressed because it is too large Load Diff

448
addons/account/i18n/zh_TW.po
View File

File diff suppressed because it is too large Load Diff

2
addons/account/partner.py
View File

@ -209,7 +209,7 @@ class res_partner(osv.osv):
relation='account.fiscal.position',
string="Fiscal Position",
view_load=True,
help="The fiscal position will determine taxes and the accounts used for the partner.",
help="The fiscal position will determine taxes and accounts used for the partner.",
),
'property_payment_term': fields.property(
'account.payment.term',

10
addons/account/product.py
View File

@ -30,14 +30,14 @@ class product_category(osv.osv):
relation='account.account',
string="Income Account",
view_load=True,
help="This account will be used for invoices to value sales for the current product category"),
help="This account will be used for invoices to value sales."),
'property_account_expense_categ': fields.property(
'account.account',
'account.account',
type='many2one',
relation='account.account',
string="Expense Account",
view_load=True,
help="This account will be used for invoices to value expenses for the current product category"),
help="This account will be used for invoices to value expenses."),
}
product_category()
@ -60,14 +60,14 @@ class product_template(osv.osv):
relation='account.account',
string="Income Account",
view_load=True,
help="This account will be used for invoices instead of the default one to value sales for the current product"),
help="This account will be used for invoices instead of the default one to value sales for the current product."),
'property_account_expense': fields.property(
'account.account',
type='many2one',
relation='account.account',
string="Expense Account",
view_load=True,
help="This account will be used for invoices instead of the default one to value expenses for the current product"),
help="This account will be used for invoices instead of the default one to value expenses for the current product."),
}
product_template()

8
addons/account/product_view.xml
View File

@ -49,9 +49,11 @@
<field name="inherit_id" ref="product.product_category_form_view"/>
<field name="arch" type="xml">
<data>
<xpath expr="/form/sheet//group[@name='account_property']" position="inside">
<field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<xpath expr="//group[@name='parent']" position="inside">
<group name="account_property" string="Account Properties" colspan="2">
<field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
<field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
</group>
</xpath>
</data>
</field>

16
addons/account/project/analytic_account_demo.xml
View File

@ -94,8 +94,8 @@
<field name="state">open</field>
<field name="partner_id" ref="base.res_partner_19"/>
</record>
<record id="analytic_magasin_bml_1" model="account.analytic.account">
<field name="name">Magasin BML 1</field>
<record id="analytic_millennium_industries" model="account.analytic.account">
<field name="name">Millennium Industries</field>
<field name="parent_id" ref="analytic_integration"/>
<field name="type">normal</field>
<field name="partner_id" ref="base.res_partner_15"/>
@ -121,8 +121,8 @@
<field name="parent_id" ref="analytic_customers"/>
<field name="partner_id" ref="base.res_partner_1"/>
</record>
<record id="analytic_distripc" model="account.analytic.account">
<field name="name">DistriPC</field>
<record id="analytic_deltapc" model="account.analytic.account">
<field name="name">Delta PC</field>
<field name="parent_id" ref="analytic_customers"/>
<field name="type">normal</field>
<field name="partner_id" ref="base.res_partner_4"/>
@ -145,8 +145,8 @@
<field name="partner_id" ref="base.res_partner_17"/>
<field name="state">open</field>
</record>
<record id="analytic_leclerc" model="account.analytic.account">
<field name="name">Leclerc</field>
<record id="analytic_luminous_technologies" model="account.analytic.account">
<field name="name">Luminous Technologies</field>
<field eval="time.strftime('%Y-04-24')" name="date_start"/>
<field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
<field name="type">normal</field>
@ -161,8 +161,8 @@
<field name="parent_id" ref="analytic_partners"/>
<field name="partner_id" ref="base.res_partner_12"/>
</record>
<record id="analytic_tiny_at_work" model="account.analytic.account">
<field name="name">OpenERP SA AT Work</field>
<record id="analytic_think_big_systems" model="account.analytic.account">
<field name="name">Think Big Systems</field>
<field name="type">normal</field>
<field name="parent_id" ref="analytic_partners"/>
<field name="partner_id" ref="base.res_partner_18"/>

5
addons/account/project/project_view.xml
View File

@ -35,7 +35,6 @@
<field name="partner_id"/>
<field name="user_id"/>
<group expand="0" string="Group By...">
<filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
<filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Parent Account" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
<filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
@ -144,8 +143,8 @@
<field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
<label for="unit_amount"/>
<div>
<field name="unit_amount" class="oe_inline"/>
<field name="product_uom_id" class="oe_inline"/>
<field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
<field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
</div>
</group>
<group string="General Accounting">

2
addons/account/project/wizard/account_analytic_journal_report_view.xml
View File

@ -10,7 +10,7 @@
<group col="4">
<field name="date1"/>
<field name="date2"/>
<field name="analytic_account_journal_id" widget="many2many_tags" class="oe_inline" required="1"/>
<field name="analytic_account_journal_id" widget="many2many_tags" class="oe_inline" required="1" colspan="4"/>
</group>
<footer>
<button name="check_report" string="Print" type="object" class="oe_highlight"/>

2
addons/account/report/account_invoice_report_view.xml
View File

@ -42,7 +42,7 @@
<field name="arch" type="xml">
<graph string="Invoices Analysis" type="bar">
<field name="product_id"/>
<field name="user_currency_price_total"/>
<field name="price_total"/>
</graph>
</field>
</record>

2
addons/account/report/account_print_overdue.rml
View File

@ -277,7 +277,7 @@
<font color="white"> </font>
</para>
<section>
<para style="terp_default_Bold_9">[[ getLines(o) and removeParentNode('section')]]There is nothing due with this customer</para>
<para style="terp_default_Bold_9">[[ getLines(o) and removeParentNode('section')]]There is nothing due with this customer.</para>
</section>
<para style="terp_default_9">
<font color="white"> </font>

1
addons/account/res_config.py
View File

@ -262,6 +262,7 @@ class account_config_settings(osv.osv_memory):
'sale_tax_rate': config.sale_tax_rate,
'purchase_tax_rate': config.purchase_tax_rate,
'complete_tax_set': config.complete_tax_set,
'currency_id': config.currency_id.id,
}, context)
wizard.execute(cr, uid, [wizard_id], context)

2
addons/account/res_config_view.xml
View File

@ -268,7 +268,7 @@
<field name="target">inline</field>
</record>
<menuitem id="menu_account_config" name="Accounting" parent="base.menu_config"
<menuitem id="menu_account_config" name="Invoicing" parent="base.menu_config"
sequence="14" action="action_account_config"/>
</data>

1
addons/account_accountant/account_accountant_data.xml
View File

@ -5,6 +5,7 @@
<!-- Top menu item -->
<menuitem name="Accounting"
id="account.menu_finance"/>
<menuitem id="account.menu_account_config" name="Accounting" parent="base.menu_config"/>
</data>

4
addons/account_accountant/i18n/ar.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-19 05:35+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#~ msgid "Accountant"
#~ msgstr "محاسب"

4
addons/account_accountant/i18n/az.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-19 05:35+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#~ msgid ""
#~ "\n"

4
addons/account_accountant/i18n/bg.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-19 05:35+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#~ msgid "Accountant"
#~ msgstr "Счетоводител"

4
addons/account_accountant/i18n/bn.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-19 05:35+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#~ msgid ""
#~ "\n"

4
addons/account_accountant/i18n/bs.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-19 05:35+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#~ msgid ""
#~ "\n"

4
addons/account_accountant/i18n/ca.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-19 05:35+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#~ msgid "Accountant"
#~ msgstr "Comptable"

4
addons/account_accountant/i18n/cs.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-19 05:35+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#~ msgid "Accountant"
#~ msgstr "účetní"

4
addons/account_accountant/i18n/da.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-19 05:35+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#~ msgid "Accountant"
#~ msgstr "Bogholder"

4
addons/account_accountant/i18n/de.po
View File

@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-19 05:35+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#~ msgid "Accountant"
#~ msgstr "Finanzbuchhaltung Administrator"

4
addons/account_accountant/i18n/el.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-19 05:35+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#~ msgid "Accountant"
#~ msgstr "Λογιστής"

4
addons/account_accountant/i18n/en_GB.po
View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-19 05:35+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#~ msgid ""
#~ "\n"

4
addons/account_accountant/i18n/es.po
View File

@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-19 05:35+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
"X-Generator: Launchpad (build 16206)\n"
#~ msgid "Accountant"
#~ msgstr "Contable"

4
addons/account_accountant/i18n/es_CR.po
View File

@ -15,8 +15,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-19 05:35+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
"X-Generator: Launchpad (build 16206)\n"
"Language: es\n"
#~ msgid "Accountant"

Some files were not shown because too many files have changed in this diff Show More