bzr revid: uco@tinyerp.com-20110503120949-k85hwrmgv4l61q4y
This commit is contained in:
Ujjvala Collins (OpenERP)
2011-05-03 17:39:49 +05:30
4901 changed files with 60742 additions and 40444 deletions
+11 -19
View File
@@ -926,9 +926,8 @@ class account_period(osv.osv):
def action_draft(self, cr, uid, ids, *args):
mode = 'draft'
for id in ids:
cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
cr.execute('update account_period set state=%s where id=%s', (mode, id))
cr.execute('update account_journal_period set state=%s where period_id in %s', (mode, tuple(ids),))
cr.execute('update account_period set state=%s where id in %s', (mode, tuple(ids),))
return True
def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
@@ -2146,8 +2145,8 @@ class account_model_line(osv.osv):
_description = "Account Model Entries"
_columns = {
'name': fields.char('Name', size=64, required=True),
'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones"),
'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries"),
'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones."),
'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries."),
'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade"),
@@ -2156,7 +2155,7 @@ class account_model_line(osv.osv):
'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency."),
'currency_id': fields.many2one('res.currency', 'Currency'),
'partner_id': fields.many2one('res.partner', 'Partner'),
'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity date', help="The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."),
'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity Date', help="The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."),
}
_order = 'sequence'
_sql_constraints = [
@@ -2659,8 +2658,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
res = super(wizard_multi_charts_accounts, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
configured_cmp = []
unconfigured_cmp = []
cmp_select = []
company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
#display in the widget selection of companies, only the companies that haven't been configured yet (but don't care about the demo chart of accounts)
@@ -2668,12 +2665,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
configured_cmp = [r[0] for r in cr.fetchall()]
unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
for field in res['fields']:
if field == 'company_id':
res['fields'][field]['domain'] = unconfigured_cmp
res['fields'][field]['selection'] = [('', '')]
if unconfigured_cmp:
cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
res['fields'][field]['selection'] = cmp_select
if field == 'company_id':
res['fields'][field]['domain'] = unconfigured_cmp
res['fields'][field]['selection'] = [('', '')]
if unconfigured_cmp:
cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
res['fields'][field]['selection'] = cmp_select
return res
def execute(self, cr, uid, ids, context=None):
@@ -2681,7 +2678,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
obj_acc = self.pool.get('account.account')
obj_acc_tax = self.pool.get('account.tax')
obj_journal = self.pool.get('account.journal')
obj_sequence = self.pool.get('ir.sequence')
obj_acc_template = self.pool.get('account.account.template')
obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
obj_fiscal_position = self.pool.get('account.fiscal.position')
@@ -2689,9 +2685,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
analytic_journal_obj = self.pool.get('account.analytic.journal')
obj_tax_code = self.pool.get('account.tax.code')
obj_tax_code_template = self.pool.get('account.tax.code.template')
obj_acc_journal_view = self.pool.get('account.journal.view')
ir_values = self.pool.get('ir.values')
obj_product = self.pool.get('product.product')
# Creating Account
obj_acc_root = obj_multi.chart_template_id.account_root_id
tax_code_root_id = obj_multi.chart_template_id.tax_code_root_id.id
@@ -2946,8 +2940,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
acc_cash_id = obj_acc.create(cr,uid,vals)
#create the bank journal
analytical_bank_ids = analytic_journal_obj.search(cr,uid,[('type','=','situation')])
analytical_journal_bank = analytical_bank_ids and analytical_bank_ids[0] or False
vals_journal = {
'name': vals['name'],
'code': _('BNK') + str(current_num),
+1 -1
View File
@@ -32,7 +32,7 @@ class account_analytic_line(osv.osv):
'product_uom_id': fields.many2one('product.uom', 'UoM'),
'product_id': fields.many2one('product.product', 'Product'),
'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='restrict', select=True),
'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
'code': fields.char('Code', size=8),
'ref': fields.char('Ref.', size=64),
+1
View File
@@ -161,6 +161,7 @@ class account_bank_statement(osv.osv):
'balance_start': _default_balance_start,
'journal_id': _default_journal_id,
'period_id': _get_period,
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.bank.statement',context=c),
}
def onchange_date(self, cr, user, ids, date, context=None):
+7 -3
View File
@@ -320,6 +320,7 @@ class account_cash_statement(osv.osv):
""" Changes statement state to Running.
@return: True
"""
obj_seq = self.pool.get('ir.sequence')
if context is None:
context = {}
statement_pool = self.pool.get('account.bank.statement')
@@ -329,15 +330,18 @@ class account_cash_statement(osv.osv):
raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))
if statement.name and statement.name == '/':
number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement')
if statement.journal_id.sequence_id:
c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
st_number = obj_seq.get_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
else:
st_number = obj_seq.get(cr, uid, 'account.cash.statement')
vals.update({
'name': number
'name': st_number
})
vals.update({
'date': time.strftime("%Y-%m-%d %H:%M:%S"),
'state': 'open',
})
self.write(cr, uid, [statement.id], vals, context=context)
return True
+5
View File
@@ -123,6 +123,7 @@
<field name="date_invoice"/>
<field name="number"/>
<field name="partner_id" groups="base.group_user"/>
<field name="reference" invisible="1"/>
<field name="name"/>
<field name="journal_id" invisible="1"/>
<field name="period_id" invisible="1" groups="account.group_account_user"/>
@@ -377,6 +378,10 @@
<field name="period_id" select='1' string="Period"/>
</group>
<newline/>
<group expand="0" string="Extended Filters..." name = "extended filter" >
<field name="reference" select="1" string="Invoice Reference"/>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+1 -1
View File
@@ -454,7 +454,7 @@
</group>
<group colspan="2" col="2" groups="base.group_extended">
<separator string="Sequence" colspan="4"/>
<field name="sequence_id" required="0"/>
<field name="sequence_id"/>
</group>
</page>
<page string="Entry Controls" groups="base.group_extended">
+2 -2
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: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+14 -14
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: 2011-03-18 04:48+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -1804,7 +1804,7 @@ msgstr "Записи по ред"
#. module: account
#: report:account.tax.code.entries:0
msgid "A/c Code"
msgstr ""
msgstr "Код на сметка"
#. module: account
#: field:account.invoice,move_id:0
@@ -3970,7 +3970,7 @@ msgstr ""
#. module: account
#: field:account.journal,view_id:0
msgid "Display Mode"
msgstr ""
msgstr "Режим на екрана"
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
@@ -4036,7 +4036,7 @@ msgstr "Приключващ баланс"
#: code:addons/account/report/common_report_header.py:92
#, python-format
msgid "Not implemented"
msgstr ""
msgstr "Не е реализирано"
#. module: account
#: model:ir.model,name:account.model_account_journal_select
@@ -4051,7 +4051,7 @@ msgstr "Отпечатване на фактура"
#. module: account
#: view:account.tax.template:0
msgid "Credit Notes"
msgstr "Бележки по кредит"
msgstr "кредитни известия"
#. module: account
#: code:addons/account/account.py:2067
@@ -5485,7 +5485,7 @@ msgstr ""
#: code:addons/account/wizard/account_report_common.py:126
#, python-format
msgid "not implemented"
msgstr ""
msgstr "не е реализирано"
#. module: account
#: help:account.journal,company_id:0
@@ -6238,7 +6238,7 @@ msgstr ""
#: view:account.move:0
#: field:account.move,to_check:0
msgid "To Review"
msgstr ""
msgstr "За преглед"
#. module: account
#: view:account.bank.statement:0
@@ -6869,7 +6869,7 @@ msgstr " ден от месеца= -1"
#. module: account
#: constraint:res.partner:0
msgid "Error ! You can not create recursive associated members."
msgstr ""
msgstr "Грешка ! Не може да създадете рекурсивно свързани членове"
#. module: account
#: help:account.journal,type:0
@@ -8482,7 +8482,7 @@ msgstr ""
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
msgstr ""
msgstr "Филтри по"
#. module: account
#: model:process.node,note:account.process_node_manually0
@@ -9001,7 +9001,7 @@ msgstr ""
#: selection:account.account.template,type:0
#: selection:account.entries.report,type:0
msgid "Regular"
msgstr ""
msgstr "Редовен"
#. module: account
#: view:account.account:0
@@ -9126,7 +9126,7 @@ msgstr "Няма зададена приходна сметка за проду
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "JNRL"
msgstr ""
msgstr "Журнал"
#. module: account
#: view:account.payment.term.line:0
@@ -9159,7 +9159,7 @@ msgstr "Общо"
#: code:addons/account/wizard/account_move_journal.py:97
#, python-format
msgid "Journal: All"
msgstr ""
msgstr "Журнал: Всички"
#. module: account
#: field:account.account,company_id:0
@@ -9475,7 +9475,7 @@ msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
msgid "Billing"
msgstr ""
msgstr "За плащане"
#. module: account
#: view:account.account:0
+2 -2
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: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-27 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+3 -3
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: 2011-03-18 04:48+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -181,7 +181,7 @@ msgstr ""
#: code:addons/account/invoice.py:1421
#, python-format
msgid "Warning!"
msgstr ""
msgstr "Varování!"
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
+2 -2
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: 2011-03-18 04:48+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+9 -9
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: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-04-03 09:24+0000\n"
"PO-Revision-Date: 2011-04-21 05:36+0000\n"
"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"
"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -911,7 +911,7 @@ msgstr "Erzeuge 3 Monats Periode"
#. module: account
#: report:account.overdue:0
msgid "Due"
msgstr "fällig am"
msgstr "Fällig"
#. module: account
#: view:account.invoice.report:0
@@ -2664,7 +2664,7 @@ msgstr ""
#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
#: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
msgid "New Company Financial Setting"
msgstr "Basiskonfiguration Unternehmen"
msgstr "Neue Firma Financial Rahmen"
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -4014,7 +4014,7 @@ msgstr "Fällige Analytische Konten"
#: selection:account.invoice,state:0
#: report:account.overdue:0
msgid "Paid"
msgstr "bezahlt am"
msgstr "bezahlt"
#. module: account
#: field:account.invoice,tax_line:0
@@ -4189,7 +4189,7 @@ msgstr "Storniere Abschreibung"
#: field:account.model.line,date_maturity:0
#: report:account.overdue:0
msgid "Maturity date"
msgstr "Fälligkeitstermin"
msgstr "Datum Fällig"
#. module: account
#: view:report.account.receivable:0
@@ -7355,7 +7355,7 @@ msgstr "Manueller Kontenausgleich"
#. module: account
#: report:account.overdue:0
msgid "Total amount due:"
msgstr "Gesamtbetrag (fällig):"
msgstr "Gesamtbetrag fällig:"
#. module: account
#: field:account.analytic.chart,to_date:0
@@ -8741,7 +8741,7 @@ msgstr ""
#. module: account
#: report:account.overdue:0
msgid "Best regards."
msgstr "Viele Grüsse."
msgstr "Beste Grüsse."
#. module: account
#: view:account.invoice:0
+6 -2
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: 2011-03-18 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10799,6 +10799,10 @@ msgstr ""
#~ msgid "Number of entries are generated"
#~ msgstr "ο αριθμός των εγγραφών δημιουργήθηκε"
#, python-format
#~ msgid "Can not pay draft/proforma/cancel invoice."
#~ msgstr "Αδύνατη η πληρωμή πρόχειρου/προφόρμας/τιμολογίου"
#~ msgid "Entries Encoding by Move"
#~ msgstr "Κωδικοποίηση Εγγραφών ανά Κίνηση"
+2 -2
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: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-28 04:36+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:57+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:57+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:52+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:57+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: code:addons/account/account.py:1291
+2 -2
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: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+5 -5
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-02-02 10:14+0000\n"
"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
"PO-Revision-Date: 2011-04-27 15:37+0000\n"
"Last-Translator: Xosé <Unknown>\n"
"Language-Team: Galician <gl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -2140,7 +2140,7 @@ msgstr ""
#: field:analytic.entries.report,name:0
#: field:report.invoice.created,name:0
msgid "Description"
msgstr "Descripción"
msgstr "Descrición"
#. module: account
#: code:addons/account/account.py:2844
+2 -2
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: 2011-03-18 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:06+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-19 05:19+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+17 -2
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: 2011-04-06 04:39+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -5170,6 +5170,8 @@ msgid ""
"According value related accounts will be display on respective reports "
"(Balance Sheet Profit & Loss Account)"
msgstr ""
"I valori di raccordo dei conti saranno mostrati nei rispettivi rapporti "
"(Conto Economico)"
#. module: account
#: field:account.report.general.ledger,sortby:0
@@ -10639,6 +10641,10 @@ msgstr ""
#~ msgid "Confirm statement from draft"
#~ msgstr "Conferma il rendiconto da bozza"
#, python-format
#~ msgid "No Data Available"
#~ msgstr "Nessun dato disponibile"
#~ msgid "Keep empty if the fiscal year belongs to several companies."
#~ msgstr "Lasciare vuoto se l'anno fiscale appartiene a più aziende"
@@ -11098,3 +11104,12 @@ msgstr ""
#~ msgstr ""
#~ "Questo conto verra' usato per le fatture al posto del conto di ricavo per la "
#~ "categoria prodotto"
#~ msgid "Header"
#~ msgstr "Intestazione"
#~ msgid "<drawRightString x=\"19.8cm\" y=\"28cm\">"
#~ msgstr "<drawRightString x=\"19.8cm\" y=\"28cm\">"
#~ msgid "</drawRightString>"
#~ msgstr "</drawRightString>"
+2 -2
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: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:07+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+11 -10
View File
@@ -8,13 +8,14 @@ msgstr ""
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2010-12-11 22:27+0000\n"
"Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
"Last-Translator: Giedrius Slavinskas - inovera.lt "
"<giedrius.slavinskas@gmail.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: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -289,7 +290,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_view_account_use_model
#: model:ir.ui.menu,name:account.menu_action_manual_recurring
msgid "Manual Recurring"
msgstr ""
msgstr "Pasirinktinas pasikartojančių įrašų kūrimas"
#. module: account
#: view:account.fiscalyear.close.state:0
@@ -1422,7 +1423,7 @@ msgstr "Uždaryta"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
msgid "Recurring Entries"
msgstr ""
msgstr "Pasikartojantys įrašai"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
@@ -3579,7 +3580,7 @@ msgstr "Nustatyti kaip juodraštį"
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form
msgid "Recurring Lines"
msgstr ""
msgstr "Pasikartojančios eilutės"
#. module: account
#: field:account.partner.balance,display_partner:0
@@ -4054,7 +4055,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_model_form
#: model:ir.ui.menu,name:account.menu_action_model_form
msgid "Recurring Models"
msgstr ""
msgstr "Pasikartojantys modeliai"
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -5995,7 +5996,7 @@ msgstr "Įrašai: "
#. module: account
#: view:account.use.model:0
msgid "Create manual recurring entries in a chosen journal."
msgstr ""
msgstr "Sukurti pasikartojančius įrašus pasirinktame žurnale."
#. module: account
#: code:addons/account/account.py:1393
@@ -9090,7 +9091,7 @@ msgstr "Įmonė"
#. module: account
#: model:ir.ui.menu,name:account.menu_action_subscription_form
msgid "Define Recurring Entries"
msgstr ""
msgstr "Apibrėžti pasikartojančius įrašus"
#. module: account
#: field:account.entries.report,date_maturity:0
@@ -9263,7 +9264,7 @@ msgstr ""
#. module: account
#: view:account.subscription:0
msgid "Recurring"
msgstr ""
msgstr "Pasikartojantis"
#. module: account
#: code:addons/account/account_move_line.py:805
+2 -2
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: 2011-04-02 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:51+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:08+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+1624 -960
View File
File diff suppressed because it is too large Load Diff
+2 -2
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: 2011-03-18 04:48+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:05+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: code:addons/account/account.py:1167
+2 -2
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: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:52+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:52+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+612 -184
View File
File diff suppressed because it is too large Load Diff
+44 -39
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: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-03-08 21:39+0000\n"
"PO-Revision-Date: 2011-05-01 19:01+0000\n"
"Last-Translator: Emerson <Unknown>\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: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-05-02 04:37+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -675,7 +675,7 @@ msgstr "Valor do Código do Imposto"
#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
msgstr "SAJ"
msgstr "DV"
#. module: account
#: help:account.bank.statement,balance_end_real:0
@@ -948,7 +948,7 @@ msgstr "Diário Centralizador"
#. module: account
#: selection:account.journal,type:0
msgid "Sale Refund"
msgstr "Reembolso de Vendas"
msgstr "Devolução de Venda"
#. module: account
#: model:process.node,note:account.process_node_accountingstatemententries0
@@ -1549,7 +1549,7 @@ msgstr "Conta pagável"
#: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account"
msgstr "Conta reembolso da taxa"
msgstr "Conta de Reembolso de Imposto"
#. module: account
#: view:account.bank.statement:0
@@ -1639,8 +1639,8 @@ msgid ""
"Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
"cancel the current invoice."
msgstr ""
"Cancelar Fatura: Cria uma Fatura de Reembolso, Valide e Reconcilie a mesma "
"para cancelar a Fatura Corrente."
"Cancelar Fatura: Crie a fatura de devolução, valide e a reconcilie para "
"cancelar a fatura atual."
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1843,7 +1843,7 @@ msgstr "Registros por Linha"
#. module: account
#: report:account.tax.code.entries:0
msgid "A/c Code"
msgstr ""
msgstr "Código A/C"
#. module: account
#: field:account.invoice,move_id:0
@@ -2148,7 +2148,7 @@ msgstr "Descrição"
#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
msgstr ""
msgstr "DRC"
#. module: account
#: view:account.subscription:0
@@ -2397,7 +2397,7 @@ msgstr "Modelo de entrada de contas"
#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
msgstr "EXJ"
msgstr "DC"
#. module: account
#: field:product.template,supplier_taxes_id:0
@@ -2567,7 +2567,7 @@ msgstr "Pago/Reconciliado"
#: field:account.tax,ref_base_code_id:0
#: field:account.tax.template,ref_base_code_id:0
msgid "Refund Base Code"
msgstr "Código base p/reembolso"
msgstr "Código Base para Devolução"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
@@ -2707,6 +2707,8 @@ msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
"O saldo final do extrato está incorreto!\n"
"O saldo experado (%.2f) é diferente do saldo calculado (%.2f)"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2964,14 +2966,14 @@ msgstr "Visualizar"
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
msgstr "BCO%s"
#. module: account
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
msgstr "BNK"
msgstr "BCO"
#. module: account
#: field:account.move.line,analytic_lines:0
@@ -4150,7 +4152,7 @@ msgstr "Extratos Bancários são lançados no sistema."
#: code:addons/account/wizard/account_reconcile.py:133
#, python-format
msgid "Reconcile Writeoff"
msgstr ""
msgstr "Reconcílie a amortização"
#. module: account
#: field:account.model.line,date_maturity:0
@@ -4394,7 +4396,7 @@ msgstr "Data da operação"
#: field:account.tax,ref_tax_code_id:0
#: field:account.tax.template,ref_tax_code_id:0
msgid "Refund Tax Code"
msgstr "Código da taxa de reembolso"
msgstr "Código do Imposto para Reembolso"
#. module: account
#: view:validate.account.move:0
@@ -4618,7 +4620,8 @@ msgstr ""
#. module: account
#: help:account.journal,refund_journal:0
msgid "Fill this if the journal is to be used for refunds of invoices."
msgstr "Preencha se o diário for usado para reembolso de faturas."
msgstr ""
"Preencha este campo se o diário deve ser usado para reembolsos de faturas."
#. module: account
#: view:account.fiscalyear.close:0
@@ -4956,7 +4959,7 @@ msgstr "Permite cancelar lançamentos"
#. module: account
#: field:account.tax.code,sign:0
msgid "Coefficent for parent"
msgstr ""
msgstr "Coeficiente para conta principal"
#. module: account
#: report:account.partner.balance:0
@@ -5074,7 +5077,7 @@ msgstr "Contabilidade Analítica"
#: selection:account.invoice.report,type:0
#: selection:report.invoice.created,type:0
msgid "Customer Refund"
msgstr "Reembolso do cliente"
msgstr "Reembolso a Cliente"
#. module: account
#: view:account.account:0
@@ -5641,7 +5644,7 @@ msgstr " 365 dias "
#: model:ir.actions.act_window,name:account.action_invoice_tree3
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
msgid "Customer Refunds"
msgstr "Reembolso a clientes"
msgstr "Reembolsos para Cliente"
#. module: account
#: view:account.payment.term.line:0
@@ -5980,7 +5983,7 @@ msgstr "Energia"
#. module: account
#: field:account.invoice.refund,filter_refund:0
msgid "Refund Type"
msgstr "Tipo de Reembolso"
msgstr "Tipo de Devolução"
#. module: account
#: report:account.invoice:0
@@ -6120,7 +6123,7 @@ msgstr "Entre com a Data Inicial !"
#: selection:account.invoice.report,type:0
#: selection:report.invoice.created,type:0
msgid "Supplier Refund"
msgstr "Reembolso a fornecedor"
msgstr "Devolução para Fornecedor"
#. module: account
#: model:ir.ui.menu,name:account.menu_dashboard_acc
@@ -6784,6 +6787,8 @@ msgid ""
"This date will be used as the invoice date for Refund Invoice and Period "
"will be chosen accordingly!"
msgstr ""
"Esta data será usada como a data da Fatura de Devolução e o período será "
"escolhido apropriadamente!"
#. module: account
#: field:account.aged.trial.balance,period_length:0
@@ -7010,9 +7015,9 @@ msgid ""
"Bank Account Number, Company bank account if Invoice is customer or supplier "
"refund, otherwise Partner bank account number."
msgstr ""
"Número da Conta Bancária. Conta bancária da Empresa se a fatura é um "
"reembolso de cliente ou fornecedor, senão é o número da conta bancária do "
"Parceiro."
"Número da Conta Bancária. Será a conta bancária da Empresa se for uma fatura "
"de devolução de cliente ou para fornecedor, senão será o número da conta "
"bancária do Parceiro."
#. module: account
#: help:account.tax,domain:0
@@ -7762,7 +7767,7 @@ msgstr "Escolha o Ano Fiscal"
#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
msgstr "Diário de Reembolso de Compra"
msgstr "Diário de Devolução de Compra"
#. module: account
#: help:account.tax.template,amount:0
@@ -7869,10 +7874,10 @@ msgid ""
"can easily generate refunds and reconcile them directly from the invoice "
"form."
msgstr ""
"Com o Reembolso de Clientes você pode gerenciar as notas de crédito para "
"Com os Reembolsos para Cliente você pode gerenciar as notas de crédito para "
"seus clientes. Um reembolso é um documento que credita completamente ou "
"parcialmente uma fatura. Você pode facilmente gerar reembolsos e reconciliá-"
"los diretamente da tela de faturamento."
"los diretamente a partir da tela de faturamento."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -8019,7 +8024,7 @@ msgstr ""
#: field:account.invoice.refund,journal_id:0
#: field:account.journal,refund_journal:0
msgid "Refund Journal"
msgstr "Diário de reembolso"
msgstr "Diário de Devolução"
#. module: account
#: report:account.account.balance:0
@@ -8072,7 +8077,7 @@ msgstr "Diário de compras"
#. module: account
#: view:account.invoice.refund:0
msgid "Refund Invoice: Creates the refund invoice, ready for editing."
msgstr "Fatura de Reembolso: Cria a fatura de reembolso pronta para edição."
msgstr "Fatura de Devolução: Cria a fatura de devolução pronta para edição."
#. module: account
#: field:account.invoice.line,price_subtotal:0
@@ -8468,7 +8473,7 @@ msgstr "Período de"
#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr "Diário de Reembolso de Vendas"
msgstr "Diário de Devolução de Vendas"
#. module: account
#: code:addons/account/account.py:927
@@ -8542,7 +8547,7 @@ msgstr "Configure sua Aplicação Contábil"
#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
msgstr ""
msgstr "DRV"
#. module: account
#: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -8671,10 +8676,10 @@ msgid ""
"partially. You can easily generate refunds and reconcile them directly from "
"the invoice form."
msgstr ""
"Com os Reembolsos de Fornecedor, você pode gerenciar as notas de créditos "
"que recebe dos seus fornecedores. Um reembolso é um documento que credita "
"uma fatura completamente ou parcialmente. Você pode facilmente gerar "
"reembolsos e reconciliá-los diretamente a partir da tela de faturas."
"Com os Reembolsos de Fornecedor você pode gerenciar as notas de crédito que "
"recebe dos seus fornecedores. Um reembolso é um documento que credita "
"completamente ou parcialmente uma fatura. Você pode facilmente gerar "
"reembolsos e reconciliá-los diretamente a partir da tela de faturamento."
#. module: account
#: view:account.account.template:0
@@ -9187,7 +9192,7 @@ msgid ""
"created. If you leave that field empty, it will use the same journal as the "
"current invoice."
msgstr ""
"Aqui você pode selecionar o diário para usar na fatura de reembolso a ser "
"Aqui você pode selecionar o diário para usar na fatura de devolução a ser "
"criada. Se você deixar em branco, será usado o mesmo diário da fatura atual."
#. module: account
@@ -9299,7 +9304,7 @@ msgid ""
"Refund invoice base on this type. You can not Modify and Cancel if the "
"invoice is already reconciled"
msgstr ""
"Faturas de Reembolso se baseiam neste tipo. Você não pode Modificar e "
"A faturas de devolução é baseada neste tipo. Você não pode Modificar e "
"Cancelar se a fatura já estiver reconciliada"
#. module: account
@@ -9967,7 +9972,7 @@ msgstr "Pesquisar Fatura"
#: view:account.invoice.report:0
#: model:ir.actions.act_window,name:account.action_account_invoice_refund
msgid "Refund"
msgstr "Reembolso"
msgstr "Devolução"
#. module: account
#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+2 -2
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: 2011-03-28 04:35+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+51 -29
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: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-03-20 16:41+0000\n"
"PO-Revision-Date: 2011-04-15 19:34+0000\n"
"Last-Translator: Chertykov Denis <chertykov@gmail.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: 2011-03-21 04:46+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:09+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -30,7 +30,7 @@ msgstr "Прочие настройки"
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#, python-format
msgid "No End of year journal defined for the fiscal year"
msgstr ""
msgstr "Не определен журнал конца года для финансового года"
#. module: account
#: code:addons/account/account.py:506
@@ -176,8 +176,8 @@ msgid ""
"If the active field is set to False, it will allow you to hide the payment "
"term without removing it."
msgstr ""
"Если в активном поле установлено значение Ложь, вы сможете скрыть срок "
"оплаты, не удаляя его."
"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть срок оплаты, не "
"удаляя его."
#. module: account
#: code:addons/account/invoice.py:1421
@@ -336,6 +336,8 @@ msgid ""
"Installs localized accounting charts to match as closely as possible the "
"accounting needs of your company based on your country."
msgstr ""
"Устанавливает локализованный план счетов, чтобы соответствовать как можно "
"ближе потребностям учета вашей компании на основе учета в вашей стране."
#. module: account
#: code:addons/account/wizard/account_move_journal.py:63
@@ -1665,6 +1667,8 @@ msgid ""
"If the active field is set to False, it will allow you to hide the journal "
"period without removing it."
msgstr ""
"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть период журнала, "
"не удаляя его."
#. module: account
#: view:res.partner:0
@@ -2890,7 +2894,7 @@ msgstr "Вид"
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr ""
msgstr "БНК%s"
#. module: account
#: code:addons/account/account.py:2906
@@ -3217,6 +3221,8 @@ msgid ""
"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
"or 'Done' state!"
msgstr ""
"Выбранные счета не могут быть отменены, поскольку они уже находятся в "
"состоянии \"Отменено\" или \"Сделано\" !"
#. module: account
#: code:addons/account/account.py:522
@@ -3599,7 +3605,7 @@ msgstr "Журнал аналитических проводок"
#: view:product.template:0
#: view:res.partner:0
msgid "Accounting"
msgstr "Бухгалтерский"
msgstr "Бухгалтерия"
#. module: account
#: help:account.central.journal,amount_currency:0
@@ -3747,11 +3753,13 @@ msgid ""
"If the active field is set to False, it will allow you to hide the account "
"without removing it."
msgstr ""
"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть счет, не удаляя "
"его."
#. module: account
#: view:account.tax.template:0
msgid "Search Tax Templates"
msgstr ""
msgstr "Искать шаблоны налогов"
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
@@ -3975,6 +3983,8 @@ msgid ""
"When new move line is created the state will be 'Draft'.\n"
"* When all the payments are done it will be in 'Valid' state."
msgstr ""
"Когда новое перемещение создается, его состояние 'Черновик'.\n"
"* Когда все платежи произведены состояние будет 'Проведено'."
#. module: account
#: field:account.journal,view_id:0
@@ -4547,7 +4557,7 @@ msgstr ""
#: code:addons/account/account.py:940
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
msgstr "Начало периода должно быть меньше, чем конец периода"
#. module: account
#: selection:account.automatic.reconcile,power:0
@@ -5090,7 +5100,7 @@ msgstr "Количество"
#. module: account
#: view:account.move.line:0
msgid "Number (Move)"
msgstr ""
msgstr "Номер (перемещение)"
#. module: account
#: view:account.invoice.refund:0
@@ -5164,7 +5174,7 @@ msgstr "Фиксированная величина"
#. module: account
#: view:account.subscription:0
msgid "Valid Up to"
msgstr ""
msgstr "Действительно до"
#. module: account
#: view:board.board:0
@@ -5191,7 +5201,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
#: model:ir.ui.menu,name:account.menu_wizard_fy_close
msgid "Generate Opening Entries"
msgstr ""
msgstr "Генерировать открывающие проводки"
#. module: account
#: code:addons/account/account_move_line.py:738
@@ -5261,7 +5271,7 @@ msgstr "Поставщик"
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "March"
msgstr ""
msgstr "Март"
#. module: account
#: view:account.account.template:0
@@ -5370,7 +5380,7 @@ msgstr "# строк"
#: code:addons/account/wizard/account_change_currency.py:60
#, python-format
msgid "New currency is not confirured properly !"
msgstr ""
msgstr "Новая валюта неправильно настроена !"
#. module: account
#: field:account.aged.trial.balance,filter:0
@@ -5624,7 +5634,7 @@ msgstr "Настройка отчетов"
#. module: account
#: constraint:account.move.line:0
msgid "Company must be same for its related account and period."
msgstr ""
msgstr "Для счета и периода должна быть одна компания."
#. module: account
#: field:account.tax,type:0
@@ -5927,7 +5937,7 @@ msgstr ""
#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
#, python-format
msgid "Enter a Start date !"
msgstr ""
msgstr "Введите дату начала !"
#. module: account
#: report:account.invoice:0
@@ -6141,6 +6151,8 @@ msgid ""
"This account will be used instead of the default one as the receivable "
"account for the current partner"
msgstr ""
"Этот счет будет использоваться, вместо счета по умолчанию, для дебиторской "
"задолженности по текущему контрагенту."
#. module: account
#: field:account.tax,python_applicable:0
@@ -6271,6 +6283,8 @@ 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"
msgstr ""
"Это отчет - анализ по контрагентам. Это PDF отчет состоящий из одной строки "
"на одного контрагента с совокупным кредитовым балансом."
#. module: account
#: code:addons/account/wizard/account_validate_account_move.py:61
@@ -6315,13 +6329,13 @@ msgstr ""
#. module: account
#: view:account.journal.select:0
msgid "Journal Select"
msgstr ""
msgstr "Выбор журнала"
#. module: account
#: code:addons/account/wizard/account_change_currency.py:65
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr ""
msgstr "Текущая валюта неправильно настроена !"
#. module: account
#: model:ir.model,name:account.model_account_move_reconcile
@@ -6362,6 +6376,8 @@ msgid ""
"Check this box if you are unsure of that journal entry and if you want to "
"note it as 'to be reviewed' by an accounting expert."
msgstr ""
"Отметьте этот квадрат, если вы не уверены в этой записи журнала и хотите "
"отметить её \"для проверки\" опытному бухгалтеру."
#. module: account
#: help:account.installer.modules,account_voucher:0
@@ -6463,12 +6479,12 @@ msgstr "Столбец журнала"
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
msgid "Done"
msgstr "Выполнено"
msgstr "Сделано"
#. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0
msgid "A statement with manual entries becomes a draft statement."
msgstr ""
msgstr "Документ с проводками вручную становится черновиком."
#. module: account
#: view:account.aged.trial.balance:0
@@ -6782,7 +6798,7 @@ msgstr "Отчетность"
#. module: account
#: sql_constraint:account.journal:0
msgid "The code of the journal must be unique per company !"
msgstr ""
msgstr "Код журнала должен быть уникальным для компании !"
#. module: account
#: field:account.bank.statement,ending_details_ids:0
@@ -6822,7 +6838,7 @@ msgstr "Домен"
#. module: account
#: model:ir.model,name:account.model_account_use_model
msgid "Use model"
msgstr ""
msgstr "Использовать модель"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7369,6 +7385,8 @@ msgid ""
"When monthly periods are created. The state is 'Draft'. At the end of "
"monthly period it is in 'Done' state."
msgstr ""
"При создании месячных периодов, состояние 'Черновик'. В конце месячного "
"периода состояние 'Сделано'."
#. module: account
#: report:account.analytic.account.inverted.balance:0
@@ -7417,7 +7435,7 @@ msgstr "Банковские и кассовые счета"
#: view:account.invoice.report:0
#: field:account.invoice.report,residual:0
msgid "Total Residual"
msgstr ""
msgstr "Общий остаток"
#. module: account
#: model:process.node,note:account.process_node_invoiceinvoice0
@@ -7436,7 +7454,7 @@ msgstr ""
#. module: account
#: view:account.installer.modules:0
msgid "Add extra Accounting functionalities to the ones already installed."
msgstr ""
msgstr "Добавить дополнительную функциональность учета к уже установленной."
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -7798,6 +7816,8 @@ msgstr "Поставщики"
msgid ""
"You cannot create more than one move per period on centralized journal"
msgstr ""
"Вы не можете создать больше одного действия за период по централизованному "
"журналу."
#. module: account
#: view:account.journal:0
@@ -8488,7 +8508,7 @@ msgstr ""
#: model:process.node,note:account.process_node_manually0
#: model:process.transition,name:account.process_transition_invoicemanually0
msgid "Manual entry"
msgstr ""
msgstr "Проводка вручную"
#. module: account
#: report:account.general.ledger:0
@@ -8697,7 +8717,7 @@ msgstr "Не сверенные"
#: code:addons/account/invoice.py:804
#, python-format
msgid "Bad total !"
msgstr ""
msgstr "Плохой итог !"
#. module: account
#: field:account.journal,sequence_id:0
@@ -9200,7 +9220,7 @@ msgstr "Определить повторяющиеся проводки"
#. module: account
#: field:account.entries.report,date_maturity:0
msgid "Date Maturity"
msgstr ""
msgstr "Дата погашения"
#. module: account
#: help:account.bank.statement,total_entry_encoding:0
@@ -9228,7 +9248,7 @@ msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_balance_report
msgid "Trial Balance Report"
msgstr ""
msgstr "Балансовый отчет"
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -9678,6 +9698,8 @@ msgid ""
"If the active field is set to False, it will allow you to hide the analytic "
"journal without removing it."
msgstr ""
"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть журнал аналитики, "
"не удаляя его."
#. module: account
#: field:account.analytic.line,ref:0
+2 -2
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: 2011-03-18 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:04+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:10+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:58+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+23 -23
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: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -30,7 +30,7 @@ msgstr "Övrig konfiguration"
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#, python-format
msgid "No End of year journal defined for the fiscal year"
msgstr "Inget slutdatum definierat för bokföringsåret"
msgstr "Slutdatum saknas för bokföringsåret"
#. module: account
#: code:addons/account/account.py:506
@@ -44,12 +44,12 @@ msgstr ""
#. module: account
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
msgstr "Gournal transaktion avstämning"
msgstr "Avstämning av journalpost"
#. module: account
#: field:account.installer.modules,account_voucher:0
msgid "Voucher Management"
msgstr "Kuponghantering"
msgstr "Verifikatregistrering"
#. module: account
#: view:account.account:0
@@ -69,7 +69,7 @@ msgstr "Kvarvarande"
#: code:addons/account/invoice.py:785
#, python-format
msgid "Please define sequence on invoice journal"
msgstr "Vänligen definera en sekvens på fakturajournalen"
msgstr "Vänligen definiera en nummerserie för fakturajournalen"
#. module: account
#: constraint:account.period:0
@@ -471,11 +471,11 @@ msgid ""
"amount of each area of the tax declaration for your country. It’s presented "
"in a hierarchical structure, which can be modified to fit your needs."
msgstr ""
"Diagram på Skatter är en trädvy som återspeglar strukturen i Skatter (eller "
"skatt koder) och visar den aktuella skattesituationen. Skattediagrammet "
"representerar den mängd varje område i deklarationen för ditt land. Det "
"presenteras i en hierarkisk struktur, som kan modifieras för att passa dina "
"behov."
"Momstabell är en trädvy som återspeglar strukturen i momssatser (eller "
"momskoder) och visar den aktuella skattesituationen. Momstabellen "
"representerar de avsnitt som skall redovisas på skattedeklarationen för ditt "
"land. Den presenteras i en hierarkisk struktur, som kan modifieras för att "
"passa dina behov."
#. module: account
#: view:account.analytic.line:0
@@ -736,7 +736,7 @@ msgstr "Procent"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_charts
msgid "Charts"
msgstr "Grafer"
msgstr "Kontoplaner"
#. module: account
#: code:addons/account/project/wizard/project_account_analytic_line.py:47
@@ -869,7 +869,7 @@ msgstr ""
#: model:ir.actions.act_window,name:account.action_tax_code_tree
#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
msgid "Chart of Taxes"
msgstr "Chart of Taxes"
msgstr "Momssatser"
#. module: account
#: view:account.fiscalyear:0
@@ -1640,9 +1640,9 @@ msgid ""
"Have a complete tree view of all journal items per account code by clicking "
"on an account."
msgstr ""
"Visa ditt företagskontoplan per bokföringsår och selektera på period. Du "
"får en komplett trädvy över alla verifikationer per konto genom att klicka "
"på ett konto."
"Visar företagets kontoplan per bokföringsår och selekterat på period. Du får "
"en komplett trädvy över alla verifikationer per konto genom att klicka på "
"ett konto."
#. module: account
#: constraint:account.fiscalyear:0
@@ -1706,7 +1706,7 @@ msgstr "Ref. :"
#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
msgstr "Analytic Account Charts"
msgstr "Objektkontoplan"
#. module: account
#: view:account.analytic.line:0
@@ -2005,7 +2005,7 @@ msgstr "Innevarande bokf.år"
#. module: account
#: view:account.tax.chart:0
msgid "Account tax charts"
msgstr ""
msgstr "Momskonton"
#. module: account
#: constraint:account.period:0
@@ -3161,7 +3161,7 @@ msgstr ""
#. module: account
#: view:account.chart:0
msgid "Account charts"
msgstr "Account charts"
msgstr "Kontoplan"
#. module: account
#: report:account.vat.declaration:0
@@ -3271,7 +3271,7 @@ msgstr "VAT :"
#: model:ir.actions.act_window,name:account.action_account_tree
#: model:ir.ui.menu,name:account.menu_action_account_tree2
msgid "Chart of Accounts"
msgstr "Kontotabell"
msgstr "Kontoplan"
#. module: account
#: view:account.tax.chart:0
@@ -3356,7 +3356,7 @@ msgstr "The journal must have default credit and debit account"
#. module: account
#: view:account.chart.template:0
msgid "Chart of Accounts Template"
msgstr "Kontotabell template"
msgstr "Förlaga för kontoplan"
#. module: account
#: code:addons/account/account.py:2095
@@ -3979,7 +3979,7 @@ msgstr " dag i månaden: 0"
#. module: account
#: model:ir.model,name:account.model_account_chart
msgid "Account chart"
msgstr "Konto plan"
msgstr "Kontoplan"
#. module: account
#: report:account.account.balance.landscape:0
@@ -4629,7 +4629,7 @@ msgstr "År"
#. module: account
#: field:account.bank.statement,starting_details_ids:0
msgid "Opening Cashbox"
msgstr ""
msgstr "Öppna kassalåda"
#. module: account
#: view:account.payment.term.line:0
+2 -2
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: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:54+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:11+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+226 -89
View File
File diff suppressed because it is too large Load Diff
+2 -2
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: 2011-03-18 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:12+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:12+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:12+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+5 -5
View File
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
"PO-Revision-Date: 2011-01-19 21:51+0000\n"
"PO-Revision-Date: 2011-05-02 17:22+0000\n"
"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
"Language-Team: Vietnamese <vi@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2011-03-18 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-05-03 04:39+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -5673,7 +5673,7 @@ msgstr ""
#: code:addons/account/invoice.py:997
#, python-format
msgid "Invoice '%s' is validated."
msgstr ""
msgstr "Hóa đơn '%s' đã được kiểm tra."
#. module: account
#: view:account.chart.template:0
@@ -9770,7 +9770,7 @@ msgstr "Accounts Mapping"
#: code:addons/account/invoice.py:346
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr "Invoice '%s' is waiting for validation."
msgstr "Hóa đơn '%s' đang chờ kiểm tra."
#. module: account
#: selection:account.entries.report,month:0
+2 -2
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: 2011-03-18 04:57+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:14+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:56+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:12+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+2 -2
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: 2011-03-18 04:57+0000\n"
"X-Generator: Launchpad (build 12559)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:13+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+6 -11
View File
@@ -90,8 +90,6 @@ class account_installer(osv.osv_memory):
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
res = super(account_installer, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
configured_cmp = []
unconfigured_cmp = []
cmp_select = []
company_ids = self.pool.get('res.company').search(cr, uid, [], context=context)
#display in the widget selection of companies, only the companies that haven't been configured yet (but don't care about the demo chart of accounts)
@@ -99,12 +97,12 @@ class account_installer(osv.osv_memory):
configured_cmp = [r[0] for r in cr.fetchall()]
unconfigured_cmp = list(set(company_ids)-set(configured_cmp))
for field in res['fields']:
if field == 'company_id':
res['fields'][field]['domain'] = unconfigured_cmp
res['fields'][field]['selection'] = [('', '')]
if unconfigured_cmp:
cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
res['fields'][field]['selection'] = cmp_select
if field == 'company_id':
res['fields'][field]['domain'] = unconfigured_cmp
res['fields'][field]['selection'] = [('', '')]
if unconfigured_cmp:
cmp_select = [(line.id, line.name) for line in self.pool.get('res.company').browse(cr, uid, unconfigured_cmp)]
res['fields'][field]['selection'] = cmp_select
return res
def on_change_tax(self, cr, uid, id, tax):
@@ -126,11 +124,8 @@ class account_installer(osv.osv_memory):
obj_acc_temp = self.pool.get('account.account.template')
obj_tax_code_temp = self.pool.get('account.tax.code.template')
obj_tax_temp = self.pool.get('account.tax.template')
obj_product = self.pool.get('product.product')
ir_values = self.pool.get('ir.values')
obj_acc_chart_temp = self.pool.get('account.chart.template')
record = self.browse(cr, uid, ids, context=context)[0]
company_id = record.company_id
for res in self.read(cr, uid, ids, context=context):
if record.charts == 'configurable':
fp = tools.file_open(opj('account', 'configurable_account_chart.xml'))
+16 -9
View File
@@ -312,13 +312,20 @@ class account_invoice(osv.osv):
journal_select = journal_obj._name_search(cr, uid, '', [('type', '=', type)], context=context, limit=None, name_get_uid=1)
res['fields'][field]['selection'] = journal_select
doc = etree.XML(res['arch'])
if view_type == 'search':
if context.get('type', 'in_invoice') in ('out_invoice', 'out_refund'):
for node in doc.xpath("//group[@name='extended filter']"):
doc.remove(node)
res['arch'] = etree.tostring(doc)
if view_type == 'tree':
doc = etree.XML(res['arch'])
nodes = doc.xpath("//field[@name='partner_id']")
partner_string = _('Customer')
if context.get('type', 'out_invoice') in ('in_invoice', 'in_refund'):
partner_string = _('Supplier')
for node in nodes:
for node in doc.xpath("//field[@name='reference']"):
node.set('invisible', '0')
for node in doc.xpath("//field[@name='partner_id']"):
node.set('string', partner_string)
res['arch'] = etree.tostring(doc)
return res
@@ -1258,7 +1265,7 @@ class account_invoice_line(osv.osv):
t = t - (p * l[2].get('quantity'))
taxes = l[2].get('invoice_line_tax_id')
if len(taxes[0]) >= 3 and taxes[0][2]:
taxes = tax_obj.browse(cr, uid, taxes[0][2])
taxes = tax_obj.browse(cr, uid, list(taxes[0][2]))
for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
t = t - tax['amount']
return t
@@ -1609,17 +1616,17 @@ class res_partner(osv.osv):
_columns = {
'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
}
def copy(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
if context is None:
context = {}
context = {}
default.update({'invoice_ids' : []})
return super(res_partner, self).copy(cr, uid, id, default, context)
res_partner()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@ -38,7 +38,6 @@ class account_analytic_balance(osv.osv_memory):
}
def check_report(self, cr, uid, ids, context=None):
datas = {}
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
@@ -38,7 +38,6 @@ class account_analytic_cost_ledger_journal_report(osv.osv_memory):
}
def check_report(self, cr, uid, ids, context=None):
datas = {}
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
@@ -37,7 +37,6 @@ class account_analytic_cost_ledger(osv.osv_memory):
}
def check_report(self, cr, uid, ids, context=None):
datas = {}
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
@@ -37,7 +37,6 @@ class account_analytic_inverted_balance(osv.osv_memory):
}
def check_report(self, cr, uid, ids, context=None):
datas = {}
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
@@ -22,8 +22,8 @@ import time
from osv import osv, fields
class account_analytic_Journal_report(osv.osv_memory):
_name = 'account.analytic.Journal.report'
class account_analytic_journal_report(osv.osv_memory):
_name = 'account.analytic.journal.report'
_description = 'Account Analytic Journal'
_columns = {
@@ -37,7 +37,6 @@ class account_analytic_Journal_report(osv.osv_memory):
}
def check_report(self, cr, uid, ids, context=None):
datas = {}
if context is None:
context = {}
data = self.read(cr, uid, ids)[0]
@@ -52,5 +51,5 @@ class account_analytic_Journal_report(osv.osv_memory):
'datas': datas,
}
account_analytic_Journal_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
account_analytic_journal_report()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@ -4,7 +4,7 @@
<record id="account_analytic_journal_view" model="ir.ui.view">
<field name="name">Account Analytic Journal</field>
<field name="model">account.analytic.Journal.report</field>
<field name="model">account.analytic.journal.report</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Select Period">
@@ -24,7 +24,7 @@
<record id="action_account_analytic_journal" model="ir.actions.act_window">
<field name="name">Analytic Journal</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">account.analytic.Journal.report</field>
<field name="res_model">account.analytic.journal.report</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="view_id" ref="account_analytic_journal_view"/>
@@ -42,4 +42,4 @@
</record>
</data>
</openerp>
</openerp>
@@ -22,36 +22,36 @@ from osv import fields, osv
from tools.translate import _
class project_account_analytic_line(osv.osv_memory):
_name = "project.account.analytic.line"
_description = "Analytic Entries by line"
_columns = {
'from_date': fields.date('From'),
_name = "project.account.analytic.line"
_description = "Analytic Entries by line"
_columns = {
'from_date': fields.date('From'),
'to_date': fields.date('To'),
}
}
def action_open_window(self, cr, uid, ids, context=None):
mod_obj =self.pool.get('ir.model.data')
domain = []
data = self.read(cr, uid, ids, [])[0]
from_date = data['from_date']
to_date = data['to_date']
if from_date and to_date:
domain = [('date','>=',from_date), ('date','<=',to_date)]
elif from_date:
domain = [('date','>=',from_date)]
elif to_date:
domain = [('date','<=',to_date)]
result = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_analytic_line_filter')
id = result and result[1] or False
return {
'name': _('Analytic Entries by line'),
'view_type': 'form',
"view_mode": 'tree,form',
'res_model': 'account.analytic.line',
'type': 'ir.actions.act_window',
'domain': domain,
'search_view_id': id['res_id'],
}
def action_open_window(self, cr, uid, ids, context=None):
mod_obj =self.pool.get('ir.model.data')
domain = []
data = self.read(cr, uid, ids, [])[0]
from_date = data['from_date']
to_date = data['to_date']
if from_date and to_date:
domain = [('date','>=',from_date), ('date','<=',to_date)]
elif from_date:
domain = [('date','>=',from_date)]
elif to_date:
domain = [('date','<=',to_date)]
result = mod_obj.get_object_reference(cr, uid, 'account', 'view_account_analytic_line_filter')
id = result and result[1] or False
return {
'name': _('Analytic Entries by line'),
'view_type': 'form',
"view_mode": 'tree,form',
'res_model': 'account.analytic.line',
'type': 'ir.actions.act_window',
'domain': domain,
'search_view_id': id['res_id'],
}
project_account_analytic_line()
@@ -98,7 +98,6 @@ class account_balance_landscape(report_sxw.rml_parse):
ref_bal='nothing'
total_for_perc=[]
self.done_total=1
self.total_for_perc=self.linesForTotal(form, ids={}, doneAccount={}, level=1)
self.done_total=0
@@ -116,9 +115,7 @@ class account_balance_landscape(report_sxw.rml_parse):
def linesForTotal(self, form, ids={}, doneAccount={}, level=1):
if self.done_total==1:
self.done_total==1
else:
if not self.done_total==1:
return [self.result_total]
accounts=[]
if not ids:
@@ -127,7 +124,6 @@ class account_balance_landscape(report_sxw.rml_parse):
return []
ctx = self.context.copy()
result_total_parent=[]
for id in form['fiscalyear']:
tmp=[]
@@ -142,7 +138,7 @@ class account_balance_landscape(report_sxw.rml_parse):
accounts.append(tmp)
merged_accounts=zip(*accounts)
# used to check for the frst record so all sum_credit and sum_debit r set to 0.00
# used to check for the frst record so all sum_credit and sum_debit r set to 0.00
if level==1:
doneAccount={}
for entry in merged_accounts:
@@ -345,7 +341,6 @@ class account_balance_landscape(report_sxw.rml_parse):
def get_lines(self, year_dict, form):
final_result = []
line_l =[]
res = {}
line_l = self.lines(form)
self.cal_total(year_dict)
@@ -357,21 +352,21 @@ class account_balance_landscape(report_sxw.rml_parse):
res['level'] = l['level']
for k,v in l.items():
if k.startswith('debit'+str(year_dict['last_str'])):
res['debit'] = v
res['debit'] = v
if k.startswith('credit'+str(year_dict['last_str'])):
res['credit'] = v
res['credit'] = v
if k.startswith('balance'+str(year_dict['last_str'])) and not k.startswith('balance_perc'+str(year_dict['last_str'])):
res['balance'] =v
res['balance'] =v
if k.startswith('balance_perc'+str(year_dict['last_str'])) and not k.startswith('balance'+str(year_dict['last_str'])):
res['balance_perc'] = v
res['balance_perc'] = v
if form['compare_pattern'] == 'bal_perc':
if k.startswith('bal_perc'+str(year_dict['last_str'])):
res['pattern'] = v
res['pattern'] = v
elif form['compare_pattern'] == 'bal_cash':
if k.startswith('bal_cash'+str(year_dict['last_str'])):
res['pattern'] = v
res['pattern'] = v
else:
res['pattern'] = ''
res['pattern'] = ''
final_result.append(res)
return final_result
@@ -214,4 +214,4 @@ report_sxw.report_sxw('report.account.balancesheet', 'account.account',
'addons/account/report/account_balance_sheet.rml',parser=report_balancesheet_horizontal,
header='internal')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
@@ -89,7 +89,7 @@ class account_invoice_report(osv.osv):
ai.payment_term as payment_term,
ai.period_id as period_id,
(case when u.uom_type not in ('reference') then
(select name from product_uom where uom_type='reference' and category_id=u.category_id)
(select name from product_uom where uom_type='reference' and active and category_id=u.category_id LIMIT 1)
else
u.name
end) as uom_name,
@@ -242,7 +242,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
if not self.ids:
return 0.0
temp_res = 0.0
self.cr.execute(
"SELECT sum(debit) " \
"FROM account_move_line AS l " \
@@ -261,7 +260,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
if not self.ids:
return 0.0
temp_res = 0.0
self.cr.execute(
"SELECT sum(credit) " \
"FROM account_move_line AS l " \
@@ -281,7 +279,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
if not self.ids:
return 0.0
temp_res = 0.0
self.cr.execute(
"SELECT sum(debit-credit) " \
"FROM account_move_line AS l " \
@@ -295,7 +292,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
return temp_res
def _get_partners(self):
cr, uid = self.cr, self.uid
if self.result_selection == 'customer':
return _('Receivable Accounts')
@@ -118,7 +118,7 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
else:
amount = str(amount)
if (amount == '0'):
return ' '
return ' '
orig = amount
new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
if orig == new:
@@ -402,14 +402,14 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
return currency_total
def _display_initial_balance(self, data):
if self.initial_balance:
return True
return False
if self.initial_balance:
return True
return False
def _display_currency(self, data):
if self.amount_currency:
return True
return False
if self.amount_currency:
return True
return False
report_sxw.report_sxw('report.account.third_party_ledger', 'res.partner',
'addons/account/report/account_partner_ledger.rml',parser=third_party_ledger,
+5 -5
View File
@@ -101,14 +101,14 @@ class report_aged_receivable(osv.osv):
def _calc_bal(self, cr, uid, ids, name, args, context=None):
res = {}
for period in self.read(cr, uid, ids, ['name'], context=context):
date1,date2 = period['name'].split(' to ')
cr.execute("SELECT SUM(credit-debit) FROM account_move_line AS line, account_account as ac \
date1,date2 = period['name'].split(' to ')
cr.execute("SELECT SUM(credit-debit) FROM account_move_line AS line, account_account as ac \
WHERE (line.account_id=ac.id) AND ac.type='receivable' \
AND (COALESCE(line.date,date) BETWEEN %s AND %s) \
AND (reconcile_id IS NULL) AND ac.active",(str(date2),str(date1),))
amount = cr.fetchone()
amount = amount[0] or 0.00
res[period['id']] = amount
amount = cr.fetchone()
amount = amount[0] or 0.00
res[period['id']] = amount
return res
@@ -1,4 +1,3 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
##############################################################################
#
@@ -1,4 +1,3 @@
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
##############################################################################
#
@@ -31,7 +31,7 @@ class account_aged_trial_balance(osv.osv_memory):
_description = 'Account Aged Trial balance Report'
_columns = {
'period_length':fields.integer('Period length (days)', required=True),
'period_length':fields.integer('Period Length (days)', required=True),
'direction_selection': fields.selection([('past','Past'),
('future','Future')],
'Analysis Direction', required=True),
@@ -30,11 +30,11 @@ class account_common_report(osv.osv_memory):
_description = "Account Common Report"
_columns = {
'chart_account_id': fields.many2one('account.account', 'Chart of account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]),
'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal year', help='Keep empty for all open fiscal year'),
'chart_account_id': fields.many2one('account.account', 'Chart of Account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]),
'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', help='Keep empty for all open fiscal year'),
'filter': fields.selection([('filter_no', 'No Filters'), ('filter_date', 'Date'), ('filter_period', 'Periods')], "Filter by", required=True),
'period_from': fields.many2one('account.period', 'Start period'),
'period_to': fields.many2one('account.period', 'End period'),
'period_from': fields.many2one('account.period', 'Start Period'),
'period_to': fields.many2one('account.period', 'End Period'),
'journal_ids': fields.many2many('account.journal', 'account_common_journal_rel', 'account_id', 'journal_id', 'Journals', required=True),
'date_from': fields.date("Start Date"),
'date_to': fields.date("End Date"),
@@ -28,7 +28,7 @@ class account_common_account_report(osv.osv_memory):
_columns = {
'display_account': fields.selection([('bal_all','All'), ('bal_movement','With movements'),
('bal_solde','With balance is not equal to 0'),
],'Display accounts', required=True),
],'Display Accounts', required=True),
}
_defaults = {
@@ -28,10 +28,10 @@ class account_report_general_ledger(osv.osv_memory):
_columns = {
'landscape': fields.boolean("Landscape Mode"),
'initial_balance': fields.boolean("Include initial balances",
'initial_balance': fields.boolean("Include Initial Balances",
help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort By', required=True),
'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort by', required=True),
}
_defaults = {
'landscape': True,
@@ -30,10 +30,10 @@ class account_partner_ledger(osv.osv_memory):
_description = 'Account Partner Ledger'
_columns = {
'initial_balance': fields.boolean('Include initial balances',
'initial_balance': fields.boolean('Include Initial Balances',
help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
'reconcil': fields.boolean('Include Reconciled Entries', help='Consider reconciled entries'),
'page_split': fields.boolean('One Partner Per Page', help='Display Ledger Report with One partner per page'),
'page_split': fields.boolean('One Partner per Page', help='Display Ledger Report with One partner per page'),
'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
}
@@ -29,7 +29,7 @@ class account_print_journal(osv.osv_memory):
_columns = {
'sort_selection': fields.selection([('date', 'Date'),
('ref', 'Reference Number'),],
'Entries Sorted By', required=True),
'Entries Sorted by', required=True),
}
_defaults = {
'sort_selection': 'date',
@@ -38,10 +38,10 @@ class account_subscription_generate(osv.osv_memory):
act_obj = self.pool.get('ir.actions.act_window')
moves_created=[]
for data in self.read(cr, uid, ids, context=context):
cr.execute('select id from account_subscription_line where date<%s and move_id is null', (data['date'],))
line_ids = map(lambda x: x[0], cr.fetchall())
moves = self.pool.get('account.subscription.line').move_create(cr, uid, line_ids, context=context)
moves_created.extend(moves)
cr.execute('select id from account_subscription_line where date<%s and move_id is null', (data['date'],))
line_ids = map(lambda x: x[0], cr.fetchall())
moves = self.pool.get('account.subscription.line').move_create(cr, uid, line_ids, context=context)
moves_created.extend(moves)
result = mod_obj.get_object_reference(cr, uid, 'account', 'action_move_line_form')
id = result and result[1] or False
result = act_obj.read(cr, uid, [id], context=context)[0]
@@ -51,7 +51,6 @@ class account_tax_chart(osv.osv_memory):
"""
mod_obj = self.pool.get('ir.model.data')
act_obj = self.pool.get('ir.actions.act_window')
period_obj = self.pool.get('account.period')
if context is None:
context = {}
data = self.browse(cr, uid, ids, context=context)[0]
+1 -1
View File
@@ -28,7 +28,7 @@ class account_vat_declaration(osv.osv_memory):
_columns = {
'based_on': fields.selection([('invoices', 'Invoices'),
('payments', 'Payments'),],
'Based On', required=True),
'Based on', required=True),
'chart_tax_id': fields.many2one('account.tax.code', 'Chart of Tax', help='Select Charts of Taxes', required=True, domain = [('parent_id','=', False)]),
}
+2 -2
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: 2011-01-19 04:46+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account_accountant
#: model:ir.module.module,description:account_accountant.module_meta_information
+2 -2
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: 2011-02-01 04:42+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account_accountant
#: model:ir.module.module,description:account_accountant.module_meta_information
+8 -3
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: 2011-03-08 04:47+0000\n"
"X-Generator: Launchpad (build 12351)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account_accountant
#: model:ir.module.module,description:account_accountant.module_meta_information
@@ -26,8 +26,13 @@ msgid ""
"items and the chart of accounts.\n"
" "
msgstr ""
"\n"
"Aquest mòdul proporciona a l'usuari admin l'accés a totes les funcionalitats "
"de comptabilitat com\n"
"els assentaments i el pla comptable.\n"
" "
#. module: account_accountant
#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
msgid "Accountant"
msgstr ""
msgstr "Comptable"
+5 -4
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: 2011-01-27 04:37+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account_accountant
#: model:ir.module.module,description:account_accountant.module_meta_information
@@ -27,8 +27,9 @@ msgid ""
" "
msgstr ""
"\n"
"Tento modul dává administrátorovi přístup ke všem účetním možnostem jako je "
"účetní deník, grafy a účty\n"
"Tento modul dává administrátorovi přístup ke všem možnostem účetnictví, jako "
"jsou položky\n"
"deníku a účtový rozvrh.\n"
" "
#. module: account_accountant
+2 -2
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: 2011-01-15 05:56+0000\n"
"X-Generator: Launchpad (build 12177)\n"
"X-Launchpad-Export-Date: 2011-04-29 05:51+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account_accountant
#: model:ir.module.module,description:account_accountant.module_meta_information

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