[MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130417061434-zry7pxo7fb17063k
This commit is contained in:
sgo@tinyerp.com
commit
d1e17fbde0
|
|
@ -25,8 +25,9 @@ from dateutil.relativedelta import relativedelta
|
|||
from operator import itemgetter
|
||||
import time
|
||||
|
||||
import openerp
|
||||
from openerp import SUPERUSER_ID
|
||||
from openerp import pooler, tools
|
||||
from openerp import tools
|
||||
from openerp.osv import fields, osv
|
||||
from openerp.tools.translate import _
|
||||
from openerp.tools.float_utils import float_round
|
||||
|
|
@ -131,7 +132,6 @@ class account_payment_term_line(osv.osv):
|
|||
(_check_percent, 'Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2%.', ['value_amount']),
|
||||
]
|
||||
|
||||
account_payment_term_line()
|
||||
|
||||
class account_account_type(osv.osv):
|
||||
_name = "account.account.type"
|
||||
|
|
@ -197,7 +197,6 @@ class account_account_type(osv.osv):
|
|||
}
|
||||
_order = "code"
|
||||
|
||||
account_account_type()
|
||||
|
||||
def _code_get(self, cr, uid, context=None):
|
||||
acc_type_obj = self.pool.get('account.account.type')
|
||||
|
|
@ -211,7 +210,6 @@ def _code_get(self, cr, uid, context=None):
|
|||
|
||||
class account_tax(osv.osv):
|
||||
_name = 'account.tax'
|
||||
account_tax()
|
||||
|
||||
class account_account(osv.osv):
|
||||
_order = "parent_left"
|
||||
|
|
@ -696,7 +694,6 @@ class account_account(osv.osv):
|
|||
self._check_moves(cr, uid, ids, "unlink", context=context)
|
||||
return super(account_account, self).unlink(cr, uid, ids, context=context)
|
||||
|
||||
account_account()
|
||||
|
||||
class account_journal(osv.osv):
|
||||
_name = "account.journal"
|
||||
|
|
@ -848,7 +845,6 @@ class account_journal(osv.osv):
|
|||
|
||||
return self.name_get(cr, user, ids, context=context)
|
||||
|
||||
account_journal()
|
||||
|
||||
class account_fiscalyear(osv.osv):
|
||||
_name = "account.fiscalyear"
|
||||
|
|
@ -944,7 +940,6 @@ class account_fiscalyear(osv.osv):
|
|||
ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit)
|
||||
return self.name_get(cr, user, ids, context=context)
|
||||
|
||||
account_fiscalyear()
|
||||
|
||||
class account_period(osv.osv):
|
||||
_name = "account.period"
|
||||
|
|
@ -1026,6 +1021,9 @@ class account_period(osv.osv):
|
|||
|
||||
def action_draft(self, cr, uid, ids, *args):
|
||||
mode = 'draft'
|
||||
for period in self.browse(cr, uid, ids):
|
||||
if period.fiscalyear_id.state == 'done':
|
||||
raise osv.except_osv(_('Warning !'), _('You can not re-open a period which belongs to closed fiscal year'))
|
||||
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
|
||||
|
|
@ -1067,7 +1065,6 @@ class account_period(osv.osv):
|
|||
return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)])
|
||||
return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id), ('special', '=', False)])
|
||||
|
||||
account_period()
|
||||
|
||||
class account_journal_period(osv.osv):
|
||||
_name = "account.journal.period"
|
||||
|
|
@ -1124,7 +1121,6 @@ class account_journal_period(osv.osv):
|
|||
}
|
||||
_order = "period_id"
|
||||
|
||||
account_journal_period()
|
||||
|
||||
class account_fiscalyear(osv.osv):
|
||||
_inherit = "account.fiscalyear"
|
||||
|
|
@ -1141,7 +1137,6 @@ class account_fiscalyear(osv.osv):
|
|||
})
|
||||
return super(account_fiscalyear, self).copy(cr, uid, id, default=default, context=context)
|
||||
|
||||
account_fiscalyear()
|
||||
#----------------------------------------------------------
|
||||
# Entries
|
||||
#----------------------------------------------------------
|
||||
|
|
@ -1380,6 +1375,7 @@ class account_move(osv.osv):
|
|||
'ref':False,
|
||||
'balance':False,
|
||||
'account_tax_id':False,
|
||||
'statement_id': False,
|
||||
})
|
||||
|
||||
if 'journal_id' in vals and vals.get('journal_id', False):
|
||||
|
|
@ -1416,6 +1412,7 @@ class account_move(osv.osv):
|
|||
context = {} if context is None else context.copy()
|
||||
default.update({
|
||||
'state':'draft',
|
||||
'ref': False,
|
||||
'name':'/',
|
||||
})
|
||||
context.update({
|
||||
|
|
@ -1637,7 +1634,6 @@ class account_move(osv.osv):
|
|||
valid_moves = [move.id for move in valid_moves]
|
||||
return len(valid_moves) > 0 and valid_moves or False
|
||||
|
||||
account_move()
|
||||
|
||||
class account_move_reconcile(osv.osv):
|
||||
_name = "account.move.reconcile"
|
||||
|
|
@ -1711,7 +1707,6 @@ class account_move_reconcile(osv.osv):
|
|||
result.append((r.id,r.name))
|
||||
return result
|
||||
|
||||
account_move_reconcile()
|
||||
|
||||
#----------------------------------------------------------
|
||||
# Tax
|
||||
|
|
@ -1859,7 +1854,6 @@ class account_tax_code(osv.osv):
|
|||
]
|
||||
_order = 'code'
|
||||
|
||||
account_tax_code()
|
||||
|
||||
class account_tax(osv.osv):
|
||||
"""
|
||||
|
|
@ -1883,7 +1877,7 @@ class account_tax(osv.osv):
|
|||
|
||||
def get_precision_tax():
|
||||
def change_digit_tax(cr):
|
||||
res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')
|
||||
res = openerp.registry(cr.dbname)['decimal.precision'].precision_get(cr, SUPERUSER_ID, 'Account')
|
||||
return (16, res+2)
|
||||
return change_digit_tax
|
||||
|
||||
|
|
@ -2267,7 +2261,6 @@ class account_tax(osv.osv):
|
|||
total += r['amount']
|
||||
return res
|
||||
|
||||
account_tax()
|
||||
|
||||
# ---------------------------------------------------------
|
||||
# Account Entries Models
|
||||
|
|
@ -2379,7 +2372,6 @@ class account_model(osv.osv):
|
|||
|
||||
return {'value': {'company_id': company_id}}
|
||||
|
||||
account_model()
|
||||
|
||||
class account_model_line(osv.osv):
|
||||
_name = "account.model.line"
|
||||
|
|
@ -2403,7 +2395,6 @@ class account_model_line(osv.osv):
|
|||
('credit_debit1', 'CHECK (credit*debit=0)', 'Wrong credit or debit value in model, they must be positive!'),
|
||||
('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in model, they must be positive!'),
|
||||
]
|
||||
account_model_line()
|
||||
|
||||
# ---------------------------------------------------------
|
||||
# Account Subscription
|
||||
|
|
@ -2477,7 +2468,6 @@ class account_subscription(osv.osv):
|
|||
self.write(cr, uid, ids, {'state':'running'})
|
||||
return True
|
||||
|
||||
account_subscription()
|
||||
|
||||
class account_subscription_line(osv.osv):
|
||||
_name = "account.subscription.line"
|
||||
|
|
@ -2506,7 +2496,6 @@ class account_subscription_line(osv.osv):
|
|||
|
||||
_rec_name = 'date'
|
||||
|
||||
account_subscription_line()
|
||||
|
||||
# ---------------------------------------------------------------
|
||||
# Account Templates: Account, Tax, Tax Code and chart. + Wizard
|
||||
|
|
@ -2514,7 +2503,6 @@ account_subscription_line()
|
|||
|
||||
class account_tax_template(osv.osv):
|
||||
_name = 'account.tax.template'
|
||||
account_tax_template()
|
||||
|
||||
class account_account_template(osv.osv):
|
||||
_order = "code"
|
||||
|
|
@ -2642,7 +2630,6 @@ class account_account_template(osv.osv):
|
|||
obj_acc._parent_store_compute(cr)
|
||||
return acc_template_ref
|
||||
|
||||
account_account_template()
|
||||
|
||||
class account_add_tmpl_wizard(osv.osv_memory):
|
||||
"""Add one more account from the template.
|
||||
|
|
@ -2696,7 +2683,6 @@ class account_add_tmpl_wizard(osv.osv_memory):
|
|||
def action_cancel(self, cr, uid, ids, context=None):
|
||||
return { 'type': 'state', 'state': 'end' }
|
||||
|
||||
account_add_tmpl_wizard()
|
||||
|
||||
class account_tax_code_template(osv.osv):
|
||||
|
||||
|
|
@ -2768,7 +2754,6 @@ class account_tax_code_template(osv.osv):
|
|||
(_check_recursion, 'Error!\nYou cannot create recursive Tax Codes.', ['parent_id'])
|
||||
]
|
||||
_order = 'code,name'
|
||||
account_tax_code_template()
|
||||
|
||||
|
||||
class account_chart_template(osv.osv):
|
||||
|
|
@ -2801,7 +2786,6 @@ class account_chart_template(osv.osv):
|
|||
'complete_tax_set': True,
|
||||
}
|
||||
|
||||
account_chart_template()
|
||||
|
||||
class account_tax_template(osv.osv):
|
||||
|
||||
|
|
@ -2931,7 +2915,6 @@ class account_tax_template(osv.osv):
|
|||
res.update({'tax_template_to_tax': tax_template_to_tax, 'account_dict': todo_dict})
|
||||
return res
|
||||
|
||||
account_tax_template()
|
||||
|
||||
# Fiscal Position Templates
|
||||
|
||||
|
|
@ -2979,7 +2962,6 @@ class account_fiscal_position_template(osv.osv):
|
|||
})
|
||||
return True
|
||||
|
||||
account_fiscal_position_template()
|
||||
|
||||
class account_fiscal_position_tax_template(osv.osv):
|
||||
_name = 'account.fiscal.position.tax.template'
|
||||
|
|
@ -2992,7 +2974,6 @@ class account_fiscal_position_tax_template(osv.osv):
|
|||
'tax_dest_id': fields.many2one('account.tax.template', 'Replacement Tax')
|
||||
}
|
||||
|
||||
account_fiscal_position_tax_template()
|
||||
|
||||
class account_fiscal_position_account_template(osv.osv):
|
||||
_name = 'account.fiscal.position.account.template'
|
||||
|
|
@ -3004,7 +2985,6 @@ class account_fiscal_position_account_template(osv.osv):
|
|||
'account_dest_id': fields.many2one('account.account.template', 'Account Destination', domain=[('type','<>','view')], required=True)
|
||||
}
|
||||
|
||||
account_fiscal_position_account_template()
|
||||
|
||||
# ---------------------------------------------------------
|
||||
# Account generation from template wizards
|
||||
|
|
@ -3397,7 +3377,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
|
|||
try:
|
||||
tmp2 = obj_data.get_object_reference(cr, uid, *ref)
|
||||
if tmp2:
|
||||
self.pool.get(tmp2[0]).write(cr, uid, tmp2[1], {
|
||||
self.pool[tmp2[0]].write(cr, uid, tmp2[1], {
|
||||
'currency_id': obj_wizard.currency_id.id
|
||||
})
|
||||
except ValueError, e:
|
||||
|
|
@ -3544,7 +3524,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
|
|||
current_num += 1
|
||||
return True
|
||||
|
||||
wizard_multi_charts_accounts()
|
||||
|
||||
class account_bank_accounts_wizard(osv.osv_memory):
|
||||
_name='account.bank.accounts.wizard'
|
||||
|
|
@ -3556,6 +3535,5 @@ class account_bank_accounts_wizard(osv.osv_memory):
|
|||
'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
|
||||
}
|
||||
|
||||
account_bank_accounts_wizard()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -143,7 +143,6 @@ class account_analytic_line(osv.osv):
|
|||
return res
|
||||
return False
|
||||
|
||||
account_analytic_line()
|
||||
|
||||
class res_partner(osv.osv):
|
||||
""" Inherits partner and adds contract information in the partner form """
|
||||
|
|
@ -154,6 +153,5 @@ class res_partner(osv.osv):
|
|||
'partner_id', 'Contracts', readonly=True),
|
||||
}
|
||||
|
||||
res_partner()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -500,7 +500,6 @@ class account_bank_statement(osv.osv):
|
|||
'context':ctx,
|
||||
}
|
||||
|
||||
account_bank_statement()
|
||||
|
||||
class account_bank_statement_line(osv.osv):
|
||||
|
||||
|
|
@ -576,6 +575,5 @@ class account_bank_statement_line(osv.osv):
|
|||
'type': 'general',
|
||||
}
|
||||
|
||||
account_bank_statement_line()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ class account_cashbox_line(osv.osv):
|
|||
'bank_statement_id' : fields.many2one('account.bank.statement', ondelete='cascade'),
|
||||
}
|
||||
|
||||
account_cashbox_line()
|
||||
|
||||
class account_cash_statement(osv.osv):
|
||||
|
||||
|
|
@ -316,7 +315,6 @@ class account_cash_statement(osv.osv):
|
|||
|
||||
return self.write(cr, uid, ids, {'closing_date': time.strftime("%Y-%m-%d %H:%M:%S")}, context=context)
|
||||
|
||||
account_cash_statement()
|
||||
|
||||
class account_journal(osv.osv):
|
||||
_inherit = 'account.journal'
|
||||
|
|
@ -336,7 +334,6 @@ class account_journal(osv.osv):
|
|||
'cashbox_line_ids' : _default_cashbox_line_ids,
|
||||
}
|
||||
|
||||
account_journal()
|
||||
|
||||
class account_journal_cashbox_line(osv.osv):
|
||||
_name = 'account.journal.cashbox.line'
|
||||
|
|
@ -348,6 +345,5 @@ class account_journal_cashbox_line(osv.osv):
|
|||
|
||||
_order = 'pieces asc'
|
||||
|
||||
account_journal_cashbox_line()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -24,8 +24,6 @@ from datetime import datetime
|
|||
from dateutil.relativedelta import relativedelta
|
||||
from operator import itemgetter
|
||||
|
||||
from openerp import netsvc
|
||||
from openerp import pooler
|
||||
from openerp.osv import fields, osv
|
||||
import openerp.addons.decimal_precision as dp
|
||||
from openerp.tools.translate import _
|
||||
|
|
@ -140,6 +138,5 @@ class account_financial_report(osv.osv):
|
|||
'style_overwrite': 0,
|
||||
}
|
||||
|
||||
account_financial_report()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ from lxml import etree
|
|||
import openerp.addons.decimal_precision as dp
|
||||
import openerp.exceptions
|
||||
|
||||
from openerp import pooler
|
||||
from openerp.osv import fields, osv, orm
|
||||
from openerp.tools.translate import _
|
||||
|
||||
|
|
@ -97,6 +96,8 @@ class account_invoice(osv.osv):
|
|||
for m in invoice.move_id.line_id:
|
||||
if m.account_id.type in ('receivable','payable'):
|
||||
result[invoice.id] += m.amount_residual_currency
|
||||
#prevent the residual amount on the invoice to be less than 0
|
||||
result[invoice.id] = max(result[invoice.id], 0.0)
|
||||
return result
|
||||
|
||||
# Give Journal Items related to the payment reconciled to this invoice
|
||||
|
|
@ -312,7 +313,7 @@ class account_invoice(osv.osv):
|
|||
context = {}
|
||||
|
||||
if context.get('active_model', '') in ['res.partner'] and context.get('active_ids', False) and context['active_ids']:
|
||||
partner = self.pool.get(context['active_model']).read(cr, uid, context['active_ids'], ['supplier','customer'])[0]
|
||||
partner = self.pool[context['active_model']].read(cr, uid, context['active_ids'], ['supplier','customer'])[0]
|
||||
if not view_type:
|
||||
view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'account.invoice.tree')])
|
||||
view_type = 'tree'
|
||||
|
|
@ -366,18 +367,6 @@ class account_invoice(osv.osv):
|
|||
context['view_id'] = view_id
|
||||
return context
|
||||
|
||||
def create(self, cr, uid, vals, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
try:
|
||||
return super(account_invoice, self).create(cr, uid, vals, context)
|
||||
except Exception, e:
|
||||
if '"journal_id" viol' in e.args[0]:
|
||||
raise orm.except_orm(_('Configuration Error!'),
|
||||
_('There is no Sale/Purchase Journal(s) defined.'))
|
||||
else:
|
||||
raise orm.except_orm(_('Unknown Error!'), str(e))
|
||||
|
||||
def invoice_print(self, cr, uid, ids, context=None):
|
||||
'''
|
||||
This function prints the invoice and mark it as sent, so that we can see more easily the next step of the workflow
|
||||
|
|
@ -420,6 +409,7 @@ class account_invoice(osv.osv):
|
|||
'mark_invoice_as_sent': True,
|
||||
})
|
||||
return {
|
||||
'name': _('Compose Email'),
|
||||
'type': 'ir.actions.act_window',
|
||||
'view_type': 'form',
|
||||
'view_mode': 'form',
|
||||
|
|
@ -1594,7 +1584,6 @@ class account_invoice_line(osv.osv):
|
|||
unique_tax_ids = product_change_result['value']['invoice_line_tax_id']
|
||||
return {'value':{'invoice_line_tax_id': unique_tax_ids}}
|
||||
|
||||
account_invoice_line()
|
||||
|
||||
class account_invoice_tax(osv.osv):
|
||||
_name = "account.invoice.tax"
|
||||
|
|
|
|||
|
|
@ -453,10 +453,11 @@
|
|||
<filter name="invoices" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
|
||||
<filter name="unpaid" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
|
||||
<separator/>
|
||||
<filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="user_id" string="Salesperson"/>
|
||||
<field name="period_id" string="Period"/>
|
||||
<separator/>
|
||||
<filter domain="[('user_id','=',uid)]" help="My Invoices"/>
|
||||
<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'}"/>
|
||||
|
|
|
|||
|
|
@ -741,24 +741,26 @@ class account_move_line(osv.osv):
|
|||
|
||||
def list_partners_to_reconcile(self, cr, uid, context=None):
|
||||
cr.execute(
|
||||
"""
|
||||
SELECT partner_id
|
||||
FROM (
|
||||
SELECT l.partner_id, p.last_reconciliation_date, SUM(l.debit) AS debit, SUM(l.credit) AS credit
|
||||
"""SELECT partner_id FROM (
|
||||
SELECT l.partner_id, p.last_reconciliation_date, SUM(l.debit) AS debit, SUM(l.credit) AS credit, MAX(l.create_date) AS max_date
|
||||
FROM account_move_line l
|
||||
RIGHT JOIN account_account a ON (a.id = l.account_id)
|
||||
RIGHT JOIN res_partner p ON (l.partner_id = p.id)
|
||||
WHERE a.reconcile IS TRUE
|
||||
AND l.reconcile_id IS NULL
|
||||
AND (p.last_reconciliation_date IS NULL OR l.date > p.last_reconciliation_date)
|
||||
AND l.state <> 'draft'
|
||||
GROUP BY l.partner_id, p.last_reconciliation_date
|
||||
) AS s
|
||||
WHERE debit > 0 AND credit > 0
|
||||
WHERE debit > 0 AND credit > 0 AND (last_reconciliation_date IS NULL OR max_date > last_reconciliation_date)
|
||||
ORDER BY last_reconciliation_date""")
|
||||
ids = cr.fetchall()
|
||||
ids = len(ids) and [x[0] for x in ids] or []
|
||||
return self.pool.get('res.partner').name_get(cr, uid, ids, context=context)
|
||||
ids = [x[0] for x in cr.fetchall()]
|
||||
if not ids:
|
||||
return []
|
||||
|
||||
# To apply the ir_rules
|
||||
partner_obj = self.pool.get('res.partner')
|
||||
ids = partner_obj.search(cr, uid, [('id', 'in', ids)], context=context)
|
||||
return partner_obj.name_get(cr, uid, ids, context=context)
|
||||
|
||||
def reconcile_partial(self, cr, uid, ids, type='auto', context=None, writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False):
|
||||
move_rec_obj = self.pool.get('account.move.reconcile')
|
||||
|
|
@ -1306,6 +1308,5 @@ class account_move_line(osv.osv):
|
|||
bool(journal.currency),bool(journal.analytic_journal_id)))
|
||||
return result
|
||||
|
||||
account_move_line()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<report auto="False" id="account_general_journal" model="account.journal.period" name="account.general.journal" rml="account/report/account_general_journal.rml" string="General Journal" header="False"/>
|
||||
<report auto="False" id="account_journal" model="account.journal.period" name="account.journal.period.print" rml="account/report/account_journal.rml" string="Journal" header="False"/>
|
||||
<report auto="False" id="account_journal_sale_purchase" model="account.journal.period" name="account.journal.period.print.sale.purchase" rml="account/report/account_journal_sale_purchase.rml" string="Sale/Purchase Journal" header="False"/>
|
||||
<report auto="False" id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/account_print_overdue.rml" string="Overdue Payments"/>
|
||||
<report id="account_overdue" model="res.partner" name="account.overdue" rml="account/report/account_print_overdue.rml" string="Overdue Payments" parser="account.report.account_print_overdue.Overdue"/>
|
||||
<report
|
||||
auto="False"
|
||||
id="account_invoices"
|
||||
|
|
|
|||
|
|
@ -47,6 +47,5 @@ Thank you in advance for your cooperation.
|
|||
Best Regards,'''
|
||||
}
|
||||
|
||||
res_company()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
</record>
|
||||
|
||||
<record id="account_payment_term_line_15days" model="account.payment.term.line">
|
||||
<field name="name">15 Days</field>
|
||||
<field name="value">balance</field>
|
||||
<field eval="15" name="days"/>
|
||||
<field eval="0" name="days2"/>
|
||||
|
|
@ -48,7 +47,6 @@
|
|||
</record>
|
||||
|
||||
<record id="account_payment_term_line_net" model="account.payment.term.line">
|
||||
<field name="name">30 Net Days</field>
|
||||
<field name="value">balance</field>
|
||||
<field eval="30" name="days"/>
|
||||
<field eval="0" name="days2"/>
|
||||
|
|
|
|||
|
|
@ -135,7 +135,6 @@
|
|||
<field name="note">30 Days End of Month</field>
|
||||
</record>
|
||||
<record id="account_payment_term_line" model="account.payment.term.line">
|
||||
<field name="name">30 Days End of Month</field>
|
||||
<field name="value">balance</field>
|
||||
<field eval="30" name="days"/>
|
||||
<field eval="-1" name="days2"/>
|
||||
|
|
@ -147,16 +146,13 @@
|
|||
<field name="note">30% Advance End 30 Days</field>
|
||||
</record>
|
||||
<record id="account_payment_term_line_advance1" model="account.payment.term.line">
|
||||
<field name="name">30% Advance</field>
|
||||
<field name="value">procent</field>
|
||||
<field eval="3" name="sequence"/>
|
||||
<field eval="0.300000" name="value_amount"/>
|
||||
<field eval="0" name="days"/>
|
||||
<field eval="0" name="days2"/>
|
||||
<field eval="account_payment_term_advance" name="payment_id"/>
|
||||
</record>
|
||||
<record id="account_payment_term_line_advance2" model="account.payment.term.line">
|
||||
<field name="name">Remaining Balance</field>
|
||||
<field name="value">balance</field>
|
||||
<field eval="30" name="days"/>
|
||||
<field eval="-1" name="days2"/>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<field name="name">Invoice - Send by Email</field>
|
||||
<field name="email_from">${object.user_id.email or object.company_id.email or 'noreply@localhost'}</field>
|
||||
<field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})</field>
|
||||
<field name="email_recipients">${object.partner_id.id}</field>
|
||||
<field name="partner_to">${object.partner_id.id}</field>
|
||||
<field name="model_id" ref="account.model_account_invoice"/>
|
||||
<field name="auto_delete" eval="True"/>
|
||||
<field name="report_template" ref="account_invoices"/>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
# Translation of OpenERP Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * account
|
||||
# Els Van Vossel <evv@agaplan.eu>, 2012.
|
||||
# Els Van Vossel <evv@agaplan.eu>, 2012, 2013.
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 5.0.0\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
|
||||
"PO-Revision-Date: 2012-12-19 18:03+0000\n"
|
||||
"PO-Revision-Date: 2013-04-15 23:02+0000\n"
|
||||
"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
|
||||
"Language-Team: Els Van Vossel\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2013-03-16 05:20+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-04-17 05:15+0000\n"
|
||||
"X-Generator: Launchpad (build 16567)\n"
|
||||
"Language: nl\n"
|
||||
|
||||
#. module: account
|
||||
|
|
@ -258,7 +258,7 @@ msgstr "Belgische rapporten"
|
|||
#. module: account
|
||||
#: model:mail.message.subtype,name:account.mt_invoice_validated
|
||||
msgid "Validated"
|
||||
msgstr ""
|
||||
msgstr "Goedgekeurd"
|
||||
|
||||
#. module: account
|
||||
#: model:account.account.type,name:account.account_type_income_view1
|
||||
|
|
@ -473,14 +473,14 @@ msgstr ""
|
|||
#. module: account
|
||||
#: help:account.bank.statement.line,name:0
|
||||
msgid "Originator to Beneficiary Information"
|
||||
msgstr ""
|
||||
msgstr "Informatie Afzender naar Begunstigde"
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
|
||||
#, python-format
|
||||
msgid "Period :"
|
||||
msgstr ""
|
||||
msgstr "Periode:"
|
||||
|
||||
#. module: account
|
||||
#: field:account.account.template,chart_template_id:0
|
||||
|
|
@ -494,6 +494,7 @@ msgstr "Boekhoudplansjabloon"
|
|||
#: selection:account.invoice.refund,filter_refund:0
|
||||
msgid "Modify: create refund, reconcile and create a new draft invoice"
|
||||
msgstr ""
|
||||
"Wijzigen: factuur crediteren, afpunten en een nieuwe conceptfactuur maken"
|
||||
|
||||
#. module: account
|
||||
#: help:account.config.settings,tax_calculation_rounding_method:0
|
||||
|
|
@ -803,7 +804,7 @@ msgstr "Stel de bankrekeningen van uw bedrijf in"
|
|||
#. module: account
|
||||
#: view:account.invoice.refund:0
|
||||
msgid "Create Refund"
|
||||
msgstr ""
|
||||
msgstr "Creditnota maken"
|
||||
|
||||
#. module: account
|
||||
#: constraint:account.move.line:0
|
||||
|
|
@ -833,7 +834,7 @@ msgstr "Bent u zeker dat u de boeking wilt uitvoeren?"
|
|||
#: code:addons/account/account_invoice.py:1330
|
||||
#, python-format
|
||||
msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
|
||||
msgstr ""
|
||||
msgstr "Factuur is gedeeltelijk betaald: %s%s of %s%s (%s%s blijft open)"
|
||||
|
||||
#. module: account
|
||||
#: view:account.invoice:0
|
||||
|
|
@ -1010,6 +1011,8 @@ msgid ""
|
|||
" opening/closing fiscal "
|
||||
"year process."
|
||||
msgstr ""
|
||||
"U kunt geen afpunting ongedaan maken als deze afpunting voortkomt uit een "
|
||||
"heropening."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.actions.act_window,name:account.action_subscription_form_new
|
||||
|
|
@ -1052,7 +1055,7 @@ msgstr "Aankoopjournaal"
|
|||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_paid
|
||||
msgid "Invoice paid"
|
||||
msgstr ""
|
||||
msgstr "Factuur betaald"
|
||||
|
||||
#. module: account
|
||||
#: view:validate.account.move:0
|
||||
|
|
@ -1375,6 +1378,8 @@ msgid ""
|
|||
"The amount expressed in the secondary currency must be positif when journal "
|
||||
"item are debit and negatif when journal item are credit."
|
||||
msgstr ""
|
||||
"Het bedrag in secundaire munt moet positief zijn als de boekingslijn debet "
|
||||
"is en negatief bij een creditbedrag."
|
||||
|
||||
#. module: account
|
||||
#: view:account.invoice.cancel:0
|
||||
|
|
@ -1940,7 +1945,7 @@ msgstr "Verkopen per rekeningtype"
|
|||
#: model:account.payment.term,name:account.account_payment_term_15days
|
||||
#: model:account.payment.term,note:account.account_payment_term_15days
|
||||
msgid "15 Days"
|
||||
msgstr ""
|
||||
msgstr "15 dagen"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.periodical_processing_invoicing
|
||||
|
|
@ -2084,7 +2089,7 @@ msgstr "Voorlopig rekeninguittreksel"
|
|||
#. module: account
|
||||
#: model:mail.message.subtype,description:account.mt_invoice_validated
|
||||
msgid "Invoice validated"
|
||||
msgstr ""
|
||||
msgstr "Factuur goedgekeurd"
|
||||
|
||||
#. module: account
|
||||
#: field:account.config.settings,module_account_check_writing:0
|
||||
|
|
@ -2342,6 +2347,7 @@ msgid ""
|
|||
"You cannot change the type of account to '%s' type as it contains journal "
|
||||
"items!"
|
||||
msgstr ""
|
||||
"U kunt het rekeningtype niet wijzigen in '%s' omdat er al boekingen zijn."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_aged_trial_balance
|
||||
|
|
@ -2358,7 +2364,7 @@ msgstr "Boekjaar afsluiten"
|
|||
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
|
||||
#, python-format
|
||||
msgid "Journal :"
|
||||
msgstr ""
|
||||
msgstr "Journaal:"
|
||||
|
||||
#. module: account
|
||||
#: sql_constraint:account.fiscal.position.tax:0
|
||||
|
|
@ -2718,6 +2724,8 @@ msgid ""
|
|||
"You cannot change the type of account from 'Closed' to any other type as it "
|
||||
"contains journal items!"
|
||||
msgstr ""
|
||||
"U kunt het rekeningtype niet wijzigen van 'Afgesloten' in een ander type als "
|
||||
"er boekingen zijn."
|
||||
|
||||
#. module: account
|
||||
#: field:account.invoice.report,account_line_id:0
|
||||
|
|
@ -2811,7 +2819,7 @@ msgstr "Rekeningeigenschappen"
|
|||
#. module: account
|
||||
#: selection:account.invoice.refund,filter_refund:0
|
||||
msgid "Create a draft refund"
|
||||
msgstr ""
|
||||
msgstr "Maak een voorlopige creditnota"
|
||||
|
||||
#. module: account
|
||||
#: view:account.partner.reconcile.process:0
|
||||
|
|
@ -3360,7 +3368,7 @@ msgstr ""
|
|||
#: view:account.unreconcile:0
|
||||
#: view:account.unreconcile.reconcile:0
|
||||
msgid "Unreconcile Transactions"
|
||||
msgstr ""
|
||||
msgstr "Afpuntingen ongedaan maken"
|
||||
|
||||
#. module: account
|
||||
#: field:wizard.multi.charts.accounts,only_one_chart_template:0
|
||||
|
|
@ -3558,7 +3566,7 @@ msgstr "Aantal cijfers voor de rekeningcode"
|
|||
#. module: account
|
||||
#: field:res.partner,property_supplier_payment_term:0
|
||||
msgid "Supplier Payment Term"
|
||||
msgstr ""
|
||||
msgstr "Betaaltermijn leverancier"
|
||||
|
||||
#. module: account
|
||||
#: view:account.fiscalyear:0
|
||||
|
|
@ -3633,7 +3641,7 @@ msgstr "Elektronisch bestand"
|
|||
#. module: account
|
||||
#: field:account.move.line,reconcile:0
|
||||
msgid "Reconcile Ref"
|
||||
msgstr ""
|
||||
msgstr "Afpuntingsreferentie"
|
||||
|
||||
#. module: account
|
||||
#: field:account.config.settings,has_chart_of_accounts:0
|
||||
|
|
@ -3734,6 +3742,88 @@ msgid ""
|
|||
"</div>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"\n"
|
||||
"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
|
||||
"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
|
||||
"\n"
|
||||
" <p>Hallo ${object.partner_id.name},</p>\n"
|
||||
"\n"
|
||||
" <p>Er is een nieuwe factuur voor u: </p>\n"
|
||||
" \n"
|
||||
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
|
||||
" <strong>REFERENTIE</strong><br />\n"
|
||||
" Factuurnummer: <strong>${object.number}</strong><br />\n"
|
||||
" Totaal: <strong>${object.amount_total} "
|
||||
"${object.currency_id.name}</strong><br />\n"
|
||||
" Datum: ${object.date_invoice}<br />\n"
|
||||
" % if object.origin:\n"
|
||||
" Referentie: ${object.origin}<br />\n"
|
||||
" % endif\n"
|
||||
" % if object.user_id:\n"
|
||||
" Uw contactpersoon: <a "
|
||||
"href=\"mailto:${object.user_id.email or "
|
||||
"''}?subject=Factuur%20${object.number}\">${object.user_id.name}</a>\n"
|
||||
" % endif\n"
|
||||
" </p> \n"
|
||||
" \n"
|
||||
" % if object.paypal_url:\n"
|
||||
" <br/>\n"
|
||||
" <p>U kunt ook onmiddellijk betalen via Paypal:</p>\n"
|
||||
" <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
|
||||
" <img class=\"oe_edi_paypal_button\" "
|
||||
"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
|
||||
" </a>\n"
|
||||
" % endif\n"
|
||||
" \n"
|
||||
" <br/>\n"
|
||||
" <p>Neem gerust contact met ons op als u vragen heeft.</p>\n"
|
||||
" <p>Bedankt dat u hebt gekozen voor ${object.company_id.name or "
|
||||
"'ons'}!</p>\n"
|
||||
" <br/>\n"
|
||||
" <br/>\n"
|
||||
" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
|
||||
"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
|
||||
"background-repeat: repeat no-repeat;\">\n"
|
||||
" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
|
||||
"#DDD;\">\n"
|
||||
" <strong style=\"text-"
|
||||
"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
|
||||
" </div>\n"
|
||||
" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
|
||||
"16px; background-color: #F2F2F2;\">\n"
|
||||
" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
|
||||
" % if object.company_id.street:\n"
|
||||
" ${object.company_id.street}<br/>\n"
|
||||
" % endif\n"
|
||||
" % if object.company_id.street2:\n"
|
||||
" ${object.company_id.street2}<br/>\n"
|
||||
" % endif\n"
|
||||
" % if object.company_id.city or object.company_id.zip:\n"
|
||||
" ${object.company_id.zip} ${object.company_id.city}<br/>\n"
|
||||
" % endif\n"
|
||||
" % if object.company_id.country_id:\n"
|
||||
" ${object.company_id.state_id and ('%s, ' % "
|
||||
"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
|
||||
"or ''}<br/>\n"
|
||||
" % endif\n"
|
||||
" </span>\n"
|
||||
" % if object.company_id.phone:\n"
|
||||
" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
|
||||
"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
|
||||
"0px; padding-left: 0px; \">\n"
|
||||
" Tel.: ${object.company_id.phone}\n"
|
||||
" </div>\n"
|
||||
" % endif\n"
|
||||
" % if object.company_id.website:\n"
|
||||
" <div>\n"
|
||||
" Web: <a "
|
||||
"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
|
||||
" </div>\n"
|
||||
" %endif\n"
|
||||
" <p></p>\n"
|
||||
" </div>\n"
|
||||
"</div>\n"
|
||||
" "
|
||||
|
||||
#. module: account
|
||||
#: view:account.period:0
|
||||
|
|
@ -3922,6 +4012,8 @@ msgid ""
|
|||
"You cannot create journal items with a secondary currency without recording "
|
||||
"both 'currency' and 'amount currency' field."
|
||||
msgstr ""
|
||||
"U kunt geen boekingslijnen in een secundaire munt maken zonder beide velden "
|
||||
"'valuta' en 'bedrag valuta' in te vullen."
|
||||
|
||||
#. module: account
|
||||
#: field:account.financial.report,display_detail:0
|
||||
|
|
@ -4224,7 +4316,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_journal_cashbox_line
|
||||
msgid "account.journal.cashbox.line"
|
||||
msgstr ""
|
||||
msgstr "account.journal.cashbox.line"
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_partner_reconcile_process
|
||||
|
|
@ -4498,7 +4590,7 @@ msgstr "Uw bankrekeningen instellen"
|
|||
#. module: account
|
||||
#: xsl:account.transfer:0
|
||||
msgid "Partner ID"
|
||||
msgstr ""
|
||||
msgstr "Relatie-ID"
|
||||
|
||||
#. module: account
|
||||
#: help:account.bank.statement,message_ids:0
|
||||
|
|
@ -4704,6 +4796,8 @@ msgid ""
|
|||
"This payment term will be used instead of the default one for sale orders "
|
||||
"and customer invoices"
|
||||
msgstr ""
|
||||
"Deze betalingsvoorwaarde vervangt de standaardvoorwaarde van de huidige "
|
||||
"relatie."
|
||||
|
||||
#. module: account
|
||||
#: view:account.config.settings:0
|
||||
|
|
@ -4731,7 +4825,7 @@ msgstr "Geboekte lijnen"
|
|||
#. module: account
|
||||
#: field:account.move.line,blocked:0
|
||||
msgid "No Follow-up"
|
||||
msgstr ""
|
||||
msgstr "Geen aanmaning"
|
||||
|
||||
#. module: account
|
||||
#: view:account.tax.template:0
|
||||
|
|
@ -4858,6 +4952,7 @@ msgstr "Maand"
|
|||
#, python-format
|
||||
msgid "You cannot change the code of account which contains journal items!"
|
||||
msgstr ""
|
||||
"U kunt de code van een rekening niet wijzigen als er al boekingen zijn."
|
||||
|
||||
#. module: account
|
||||
#: field:account.config.settings,purchase_sequence_prefix:0
|
||||
|
|
@ -4895,7 +4990,7 @@ msgstr "Rek.type"
|
|||
#. module: account
|
||||
#: selection:account.journal,type:0
|
||||
msgid "Bank and Checks"
|
||||
msgstr ""
|
||||
msgstr "Bank en cheques"
|
||||
|
||||
#. module: account
|
||||
#: field:account.account.template,note:0
|
||||
|
|
@ -4977,7 +5072,7 @@ msgstr "Schakel dit in als u ook rekeningen met een nulsaldo wilt weergeven."
|
|||
#. module: account
|
||||
#: field:account.move.reconcile,opening_reconciliation:0
|
||||
msgid "Opening Entries Reconciliation"
|
||||
msgstr ""
|
||||
msgstr "Afpunting openingsboekingen"
|
||||
|
||||
#. module: account
|
||||
#. openerp-web
|
||||
|
|
@ -5018,7 +5113,7 @@ msgstr "Boekhoudplan"
|
|||
#. module: account
|
||||
#: field:account.invoice,reference_type:0
|
||||
msgid "Payment Reference"
|
||||
msgstr ""
|
||||
msgstr "Betaalreferentie"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.financial.report,style_overwrite:0
|
||||
|
|
@ -5092,7 +5187,7 @@ msgstr "Af te punten boekingen"
|
|||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_tax_template
|
||||
msgid "Templates for Taxes"
|
||||
msgstr ""
|
||||
msgstr "Btw-sjablonen"
|
||||
|
||||
#. module: account
|
||||
#: sql_constraint:account.period:0
|
||||
|
|
@ -5667,6 +5762,8 @@ msgstr "Doelbewegingen"
|
|||
msgid ""
|
||||
"Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
|
||||
msgstr ""
|
||||
"Boeking kan niet worden verwijderd als deze is gekoppeld aan een factuur "
|
||||
"(Factuur: %s - boeking: %s)"
|
||||
|
||||
#. module: account
|
||||
#: view:account.bank.statement:0
|
||||
|
|
@ -6225,6 +6322,8 @@ msgid ""
|
|||
"This payment term will be used instead of the default one for purchase "
|
||||
"orders and supplier invoices"
|
||||
msgstr ""
|
||||
"Deze betalingsvoorwaarde vervangt de standaardvoorwaarde van de huidige "
|
||||
"relatie voor aankooporders en aankoopfacturen."
|
||||
|
||||
#. module: account
|
||||
#: help:account.automatic.reconcile,power:0
|
||||
|
|
@ -6734,7 +6833,7 @@ msgstr "Analytische lijn"
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_action_model_form
|
||||
msgid "Models"
|
||||
msgstr ""
|
||||
msgstr "Modellen"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/account_invoice.py:1091
|
||||
|
|
@ -7055,6 +7154,12 @@ msgid ""
|
|||
"due date, make sure that the payment term is not set on the invoice. If you "
|
||||
"keep the payment term and the due date empty, it means direct payment."
|
||||
msgstr ""
|
||||
"Als u betalingstermijnen gebruikt, wordt de vervaldatum automatisch berekend "
|
||||
"bij het maken van de boekingen. De betalingsvoorwaarde kan verschillende "
|
||||
"vervaldatums berekenen, vb. 50% nu en 50% binnen een maand. Als u een "
|
||||
"specifieke vervaldatum wilt instellen, gebruikt u beter geen "
|
||||
"betalingstermijn. Als u zowel betalingstermijn als vervaldatum leeglaat, "
|
||||
"gaat het om een contante betaling."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/account.py:414
|
||||
|
|
@ -7296,6 +7401,8 @@ msgid ""
|
|||
"If you unreconcile transactions, you must also verify all the actions that "
|
||||
"are linked to those transactions because they will not be disabled"
|
||||
msgstr ""
|
||||
"Als u afgepunte transacties ongedaan maakt, moet u alle gekoppelde acties "
|
||||
"nakijken, want deze worden niet ongedaan gemaakt."
|
||||
|
||||
#. module: account
|
||||
#: view:account.account.template:0
|
||||
|
|
@ -7330,6 +7437,7 @@ msgid ""
|
|||
"You cannot provide a secondary currency if it is the same than the company "
|
||||
"one."
|
||||
msgstr ""
|
||||
"U kunt geen secundaire munt ingeven die identiek is aan de firmamunt."
|
||||
|
||||
#. module: account
|
||||
#: selection:account.tax.template,applicable_type:0
|
||||
|
|
@ -7467,7 +7575,7 @@ msgstr "Manueel"
|
|||
#. module: account
|
||||
#: selection:account.invoice.refund,filter_refund:0
|
||||
msgid "Cancel: create refund and reconcile"
|
||||
msgstr ""
|
||||
msgstr "Annuleren: maak een creditnota en punt af"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
|
||||
|
|
@ -7564,7 +7672,7 @@ msgstr "Alle boekingen"
|
|||
#. module: account
|
||||
#: constraint:account.move.reconcile:0
|
||||
msgid "You can only reconcile journal items with the same partner."
|
||||
msgstr ""
|
||||
msgstr "U kunt enkel boekingen met dezelfde relatie afpunten."
|
||||
|
||||
#. module: account
|
||||
#: view:account.journal.select:0
|
||||
|
|
@ -7682,7 +7790,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: field:account.invoice,paypal_url:0
|
||||
msgid "Paypal Url"
|
||||
msgstr ""
|
||||
msgstr "Paypal-url"
|
||||
|
||||
#. module: account
|
||||
#: field:account.config.settings,module_account_voucher:0
|
||||
|
|
@ -8390,7 +8498,7 @@ msgstr ""
|
|||
#. module: account
|
||||
#: field:account.move.line,amount_residual_currency:0
|
||||
msgid "Residual Amount in Currency"
|
||||
msgstr ""
|
||||
msgstr "Restbedrag in valuta"
|
||||
|
||||
#. module: account
|
||||
#: field:account.config.settings,sale_refund_sequence_prefix:0
|
||||
|
|
@ -8444,6 +8552,8 @@ msgid ""
|
|||
"Refund base on this type. You can not Modify and Cancel if the invoice is "
|
||||
"already reconciled"
|
||||
msgstr ""
|
||||
"Creditnota voor dit type. U kunt niet wijzigen of annuleren als de factuur "
|
||||
"al is afgepunt."
|
||||
|
||||
#. module: account
|
||||
#: field:account.bank.statement.line,sequence:0
|
||||
|
|
@ -8461,7 +8571,7 @@ msgstr "Volgorde"
|
|||
#. module: account
|
||||
#: field:account.config.settings,paypal_account:0
|
||||
msgid "Paypal account"
|
||||
msgstr ""
|
||||
msgstr "Paypal-rekening"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.print.journal,sort_selection:0
|
||||
|
|
@ -8730,7 +8840,7 @@ msgstr "Omgekeerde analytische balans -"
|
|||
#: help:account.move.reconcile,opening_reconciliation:0
|
||||
msgid ""
|
||||
"Is this reconciliation produced by the opening of a new fiscal year ?."
|
||||
msgstr ""
|
||||
msgstr "Komt deze afpunting van een openingsboeking?"
|
||||
|
||||
#. module: account
|
||||
#: view:account.analytic.line:0
|
||||
|
|
@ -9011,7 +9121,7 @@ msgstr "Eindbalans"
|
|||
#. module: account
|
||||
#: field:account.journal,centralisation:0
|
||||
msgid "Centralized Counterpart"
|
||||
msgstr ""
|
||||
msgstr "Gecentraliseerde tegenboeking"
|
||||
|
||||
#. module: account
|
||||
#: help:account.move.line,blocked:0
|
||||
|
|
@ -9047,6 +9157,12 @@ msgid ""
|
|||
"invoice will be created \n"
|
||||
" so that you can edit it."
|
||||
msgstr ""
|
||||
"Gebruik deze optie als u een factuur wilt annuleren en een nieuwe maken.\n"
|
||||
" De creditnota wordt gemaakt, goedgekeurd "
|
||||
"en afgepunt\n"
|
||||
" met de huidige factuur. Een nieuwe, "
|
||||
"voorlopige factuur wordt gemaakt\n"
|
||||
" die u kunt bewerken."
|
||||
|
||||
#. module: account
|
||||
#: model:process.transition,name:account.process_transition_filestatement0
|
||||
|
|
@ -9079,7 +9195,7 @@ msgstr "Rekeningtypen"
|
|||
#. module: account
|
||||
#: model:email.template,subject:account.email_template_edi_invoice
|
||||
msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
|
||||
msgstr ""
|
||||
msgstr "${object.company_id.name} Factuur (Ref. ${object.number or 'nvt' })"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/account_move_line.py:1213
|
||||
|
|
@ -9149,6 +9265,19 @@ msgid ""
|
|||
" </p>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"<p class=\"oe_view_nocontent_create\">\n"
|
||||
" Klik om een journaal toe te voegen.\n"
|
||||
" </p><p>\n"
|
||||
" Een journaal groepeert boekingen in functie\n"
|
||||
" van de dagelijkse bezigheden.\n"
|
||||
" </p><p>\n"
|
||||
" Een firma geruikt doorgaans een journaal per betaalmethode "
|
||||
"(kas,\n"
|
||||
" bankrekeningen, cheques), een aankoopdagboek, een "
|
||||
"verkoopdagboek\n"
|
||||
" en een diversendagboek.\n"
|
||||
" </p>\n"
|
||||
" "
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_fiscalyear_close_state
|
||||
|
|
@ -9276,6 +9405,9 @@ msgid ""
|
|||
"computed. Because it is space consuming, we do not allow to use it while "
|
||||
"doing a comparison."
|
||||
msgstr ""
|
||||
"Met deze optie krijgt u meer details over de manier waarop de saldi worden "
|
||||
"berekend. Omdat dit ruimte inneemt, is deze optie niet mogelijk bij "
|
||||
"vergelijkingen."
|
||||
|
||||
#. module: account
|
||||
#: model:ir.model,name:account.model_account_fiscalyear_close
|
||||
|
|
@ -9292,6 +9424,8 @@ msgstr "De code van de rekening moet uniek zijn per firma."
|
|||
#: help:product.template,property_account_expense:0
|
||||
msgid "This account will be used to value outgoing stock using cost price."
|
||||
msgstr ""
|
||||
"Deze rekening dient voor de voorraadwaardering van de uitgaande voorraad op "
|
||||
"basis van de kostprijs."
|
||||
|
||||
#. module: account
|
||||
#: view:account.invoice:0
|
||||
|
|
@ -9354,6 +9488,17 @@ msgid ""
|
|||
" </p>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"<p class=\"oe_view_nocontent_create\">\n"
|
||||
" Klik als u een nieuwe recurrente boeking wilt maken.\n"
|
||||
" </p><p>\n"
|
||||
" Een terugkerende boeking wordt regelmatig op een bepaald "
|
||||
"tijdstip herhaald,\n"
|
||||
" vb. bij vervallen van een contract of overeenkomst met een\n"
|
||||
" klant of een leverancier. U kunt dergelijke boekingen "
|
||||
"voorbereiden\n"
|
||||
" zodat deze automatisch worden geboekt.\n"
|
||||
" </p>\n"
|
||||
" "
|
||||
|
||||
#. module: account
|
||||
#: view:account.journal:0
|
||||
|
|
@ -9396,6 +9541,8 @@ msgid ""
|
|||
"This allows you to check writing and printing.\n"
|
||||
" This installs the module account_check_writing."
|
||||
msgstr ""
|
||||
"Hiermee kunt u cheques schrijven en afdrukken.\n"
|
||||
" Hiermee wordt de module account_check_writing geïnstalleerd."
|
||||
|
||||
#. module: account
|
||||
#: model:res.groups,name:account.group_account_invoice
|
||||
|
|
@ -9681,6 +9828,9 @@ msgid ""
|
|||
"chart\n"
|
||||
" of accounts."
|
||||
msgstr ""
|
||||
"Bevestigde facturen kunnen niet meer\n"
|
||||
" worden gewijzigd. Facturen krijgen een uniek nummer\n"
|
||||
" en de boekingen worden gemaakt."
|
||||
|
||||
#. module: account
|
||||
#: model:process.node,note:account.process_node_bankstatement0
|
||||
|
|
@ -9906,11 +10056,15 @@ msgid ""
|
|||
"payments.\n"
|
||||
" This installs the module account_payment."
|
||||
msgstr ""
|
||||
"Hiermee kunt u betaalopdrachten maken\n"
|
||||
" * die als basis dienen voor verdere automatisering,\n"
|
||||
" * om efficiënter betalingen te kunnen uitvoeren.\n"
|
||||
" Hiermee wordt de module account_payment geïnstalleerd."
|
||||
|
||||
#. module: account
|
||||
#: xsl:account.transfer:0
|
||||
msgid "Document"
|
||||
msgstr ""
|
||||
msgstr "Document"
|
||||
|
||||
#. module: account
|
||||
#: view:account.chart.template:0
|
||||
|
|
@ -10132,7 +10286,7 @@ msgstr "Kan geen boekingen maken tussen verschillende firma's."
|
|||
#. module: account
|
||||
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
|
||||
msgid "Periodic Processing"
|
||||
msgstr ""
|
||||
msgstr "Periodieke verwerking"
|
||||
|
||||
#. module: account
|
||||
#: view:account.invoice.report:0
|
||||
|
|
@ -10212,7 +10366,7 @@ msgstr "Vervaldatum"
|
|||
#: model:account.payment.term,name:account.account_payment_term_immediate
|
||||
#: model:account.payment.term,note:account.account_payment_term_immediate
|
||||
msgid "Immediate Payment"
|
||||
msgstr ""
|
||||
msgstr "Contante betaling"
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/account.py:1464
|
||||
|
|
@ -10424,11 +10578,16 @@ msgid ""
|
|||
"analytic account.\n"
|
||||
" This installs the module account_budget."
|
||||
msgstr ""
|
||||
"Hiermee kunnen accountants budgetten beheren.\n"
|
||||
" Als de hoofdbudgetten zijn ingesteld, kunnen de "
|
||||
"projectleiders\n"
|
||||
" het geplande bedrag instellen per analytische rekening.\n"
|
||||
" Hiermee wordt de module account_budget geïnstalleerd."
|
||||
|
||||
#. module: account
|
||||
#: field:account.bank.statement.line,name:0
|
||||
msgid "OBI"
|
||||
msgstr ""
|
||||
msgstr "Omschrijving"
|
||||
|
||||
#. module: account
|
||||
#: help:res.partner,property_account_payable:0
|
||||
|
|
@ -10915,6 +11074,8 @@ msgid ""
|
|||
"If you unreconcile transactions, you must also verify all the actions that "
|
||||
"are linked to those transactions because they will not be disable"
|
||||
msgstr ""
|
||||
"Als u afgepunte transacties ongedaan maakt, moet u alle gekoppelde acties "
|
||||
"nakijken, want deze worden niet ongedaan gemaakt."
|
||||
|
||||
#. module: account
|
||||
#: code:addons/account/account_move_line.py:1059
|
||||
|
|
@ -10949,6 +11110,9 @@ msgid ""
|
|||
"customer. The tool search can also be used to personalise your Invoices "
|
||||
"reports and so, match this analysis to your needs."
|
||||
msgstr ""
|
||||
"Dit rapport biedt een overzicht van het bedrag gefactureerd aan uw klant. De "
|
||||
"zoekfunctie kan worden aangepast om het overzicht van uw facturen te "
|
||||
"personaliseren, zodat u de gewenste analyse krijgt."
|
||||
|
||||
#. module: account
|
||||
#: view:account.partner.reconcile.process:0
|
||||
|
|
@ -11207,6 +11371,16 @@ msgid ""
|
|||
" </p>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"<p class=\"oe_view_nocontent_create\">\n"
|
||||
" Klik als u een nieuw btw-vak wilt toevoegen.\n"
|
||||
" </p><p>\n"
|
||||
" Afhankelijk van uw land, dient een btw-vak om uw btw-"
|
||||
"aangifte in te vullen.\n"
|
||||
" In OpenERP kunt u een btw-structuur instellen en elke btw-"
|
||||
"berekening\n"
|
||||
" kan in een of meer btw-vakken worden opgenomen.\n"
|
||||
" </p>\n"
|
||||
" "
|
||||
|
||||
#. module: account
|
||||
#: selection:account.entries.report,month:0
|
||||
|
|
@ -11233,6 +11407,18 @@ msgid ""
|
|||
" </p>\n"
|
||||
" "
|
||||
msgstr ""
|
||||
"<p class=\"oe_view_nocontent_create\">\n"
|
||||
" Selecteer de periode en het journaal.\n"
|
||||
" </p><p>\n"
|
||||
" Hiermee kan de boekhouder in een sneltempo boekingen "
|
||||
"invoeren in\n"
|
||||
" OpenERP. Als u een aankoopfactuur wilt inboeken,\n"
|
||||
" begint u met de kostenrekening. OpenERP stelt automatisch\n"
|
||||
" de betrokken btw voor die is gekoppeld aan deze rekening, "
|
||||
"net\n"
|
||||
" als de centralisatierekening.\n"
|
||||
" </p>\n"
|
||||
" "
|
||||
|
||||
#. module: account
|
||||
#: help:account.invoice.line,account_id:0
|
||||
|
|
@ -11403,7 +11589,7 @@ msgstr "Rekeningmodel"
|
|||
#: code:addons/account/account_cash_statement.py:292
|
||||
#, python-format
|
||||
msgid "Loss"
|
||||
msgstr ""
|
||||
msgstr "Verlies"
|
||||
|
||||
#. module: account
|
||||
#: selection:account.entries.report,month:0
|
||||
|
|
@ -11475,7 +11661,7 @@ msgstr "Kostenrekening van productsjabloon"
|
|||
#. module: account
|
||||
#: field:res.partner,property_payment_term:0
|
||||
msgid "Customer Payment Term"
|
||||
msgstr ""
|
||||
msgstr "Betaaltermijn klant"
|
||||
|
||||
#. module: account
|
||||
#: help:accounting.report,label_filter:0
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ from operator import itemgetter
|
|||
from os.path import join as opj
|
||||
import time
|
||||
|
||||
from openerp import netsvc, tools
|
||||
from openerp import tools
|
||||
from openerp.tools.translate import _
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
|
|
@ -152,6 +152,5 @@ class account_installer(osv.osv_memory):
|
|||
_logger.debug('Installing chart of accounts %s', chart)
|
||||
return modules | set([chart])
|
||||
|
||||
account_installer()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ class ir_sequence_fiscalyear(osv.osv):
|
|||
'Main Sequence must be different from current !'),
|
||||
]
|
||||
|
||||
ir_sequence_fiscalyear()
|
||||
|
||||
class ir_sequence(osv.osv):
|
||||
_inherit = 'ir.sequence'
|
||||
|
|
@ -56,6 +55,5 @@ class ir_sequence(osv.osv):
|
|||
return super(ir_sequence, self)._next(cr, uid, [line.sequence_id.id], context)
|
||||
return super(ir_sequence, self)._next(cr, uid, seq_ids, context)
|
||||
|
||||
ir_sequence()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ class account_fiscal_position(osv.osv):
|
|||
break
|
||||
return account_id
|
||||
|
||||
account_fiscal_position()
|
||||
|
||||
class account_fiscal_position_tax(osv.osv):
|
||||
_name = 'account.fiscal.position.tax'
|
||||
|
|
@ -84,7 +83,6 @@ class account_fiscal_position_tax(osv.osv):
|
|||
'A tax fiscal position could be defined only once time on same taxes.')
|
||||
]
|
||||
|
||||
account_fiscal_position_tax()
|
||||
|
||||
class account_fiscal_position_account(osv.osv):
|
||||
_name = 'account.fiscal.position.account'
|
||||
|
|
@ -102,7 +100,6 @@ class account_fiscal_position_account(osv.osv):
|
|||
'An account fiscal position could be defined only once time on same accounts.')
|
||||
]
|
||||
|
||||
account_fiscal_position_account()
|
||||
|
||||
class res_partner(osv.osv):
|
||||
_name = 'res.partner'
|
||||
|
|
@ -233,9 +230,8 @@ class res_partner(osv.osv):
|
|||
help="This payment term will be used instead of the default one for purchase orders and supplier invoices"),
|
||||
'ref_companies': fields.one2many('res.company', 'partner_id',
|
||||
'Companies that refers to partner'),
|
||||
'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were fully reconciled last time. It differs from the date of the last reconciliation made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 ways: either the last debit/credit entry was reconciled, either the user pressed the button "Fully Reconciled" in the manual reconciliation process')
|
||||
'last_reconciliation_date': fields.datetime('Latest Full Reconciliation Date', help='Date on which the partner accounting entries were fully reconciled last time. It differs from the last date where a reconciliation has been made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 different ways: either the last unreconciled debit/credit entry of this partner was reconciled, either the user pressed the button "Nothing more to reconcile" during the manual reconciliation process.')
|
||||
}
|
||||
|
||||
res_partner()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ class product_category(osv.osv):
|
|||
view_load=True,
|
||||
help="This account will be used for invoices to value expenses."),
|
||||
}
|
||||
product_category()
|
||||
|
||||
#----------------------------------------------------------
|
||||
# Products
|
||||
|
|
@ -70,6 +69,5 @@ class product_template(osv.osv):
|
|||
help="This account will be used for invoices instead of the default one to value expenses for the current product."),
|
||||
}
|
||||
|
||||
product_template()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ class account_analytic_journal(osv.osv):
|
|||
'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
|
||||
}
|
||||
|
||||
account_analytic_journal()
|
||||
|
||||
class account_journal(osv.osv):
|
||||
_inherit="account.journal"
|
||||
|
|
@ -47,6 +46,5 @@ class account_journal(osv.osv):
|
|||
'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal', help="Journal for analytic entries"),
|
||||
}
|
||||
|
||||
account_journal()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
|
||||
import time
|
||||
|
||||
from openerp import pooler
|
||||
from openerp.report import report_sxw
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
|
||||
import time
|
||||
|
||||
from openerp import pooler
|
||||
from openerp.report import report_sxw
|
||||
|
||||
class account_analytic_cost_ledger(report_sxw.rml_parse):
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
|
||||
import time
|
||||
|
||||
from openerp import pooler
|
||||
from openerp.report import report_sxw
|
||||
|
||||
class account_inverted_analytic_balance(report_sxw.rml_parse):
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
##############################################################################
|
||||
import time
|
||||
|
||||
from openerp import pooler
|
||||
from openerp.report import report_sxw
|
||||
|
||||
class account_analytic_quantity_cost_ledger(report_sxw.rml_parse):
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ class account_analytic_balance(osv.osv_memory):
|
|||
'datas': datas,
|
||||
}
|
||||
|
||||
account_analytic_balance()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
|||
|
|
@ -46,5 +46,4 @@ class account_analytic_chart(osv.osv_memory):
|
|||
result['context'] = str(result_context)
|
||||
return result
|
||||
|
||||
account_analytic_chart()
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -52,5 +52,4 @@ class account_analytic_cost_ledger_journal_report(osv.osv_memory):
|
|||
'datas': datas,
|
||||
}
|
||||
|
||||
account_analytic_cost_ledger_journal_report()
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -52,5 +52,4 @@ class account_analytic_cost_ledger(osv.osv_memory):
|
|||
'datas': datas,
|
||||
}
|
||||
|
||||
account_analytic_cost_ledger()
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -51,5 +51,4 @@ class account_analytic_inverted_balance(osv.osv_memory):
|
|||
'datas': datas,
|
||||
}
|
||||
|
||||
account_analytic_inverted_balance()
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -71,5 +71,4 @@ class account_analytic_journal_report(osv.osv_memory):
|
|||
res.update({'analytic_account_journal_id': journal_ids})
|
||||
return res
|
||||
|
||||
account_analytic_journal_report()
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -53,6 +53,5 @@ class project_account_analytic_line(osv.osv_memory):
|
|||
'search_view_id': id['res_id'],
|
||||
}
|
||||
|
||||
project_account_analytic_line()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -81,6 +81,5 @@ class analytic_entries_report(osv.osv):
|
|||
a.move_id,a.product_id,a.product_uom_id
|
||||
)
|
||||
""")
|
||||
analytic_entries_report()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -152,6 +152,5 @@ class account_entries_report(osv.osv):
|
|||
where l.state != 'draft'
|
||||
)
|
||||
""")
|
||||
account_entries_report()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -210,13 +210,12 @@ class account_invoice_report(osv.osv):
|
|||
cr.id IN (SELECT id
|
||||
FROM res_currency_rate cr2
|
||||
WHERE (cr2.currency_id = sub.currency_id)
|
||||
AND ((sub.date IS NOT NULL AND cr.name <= sub.date)
|
||||
OR (sub.date IS NULL AND cr.name <= NOW()))
|
||||
AND ((sub.date IS NOT NULL AND cr2.name <= sub.date)
|
||||
OR (sub.date IS NULL AND cr2.name <= NOW()))
|
||||
ORDER BY name DESC LIMIT 1)
|
||||
)""" % (
|
||||
self._table,
|
||||
self._select(), self._sub_select(), self._from(), self._group_by()))
|
||||
|
||||
account_invoice_report()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@
|
|||
</para>
|
||||
<para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
|
||||
<para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
|
||||
<para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
|
||||
<para style="terp_default_8">TIN : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
import time
|
||||
|
||||
from openerp.report import report_sxw
|
||||
from openerp import pooler
|
||||
|
||||
class Overdue(report_sxw.rml_parse):
|
||||
def __init__(self, cr, uid, name, context):
|
||||
|
|
@ -38,7 +37,7 @@ class Overdue(report_sxw.rml_parse):
|
|||
def _tel_get(self,partner):
|
||||
if not partner:
|
||||
return False
|
||||
res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
|
||||
res_partner = self.pool['res.partner']
|
||||
addresses = res_partner.address_get(self.cr, self.uid, [partner.id], ['invoice'])
|
||||
adr_id = addresses and addresses['invoice'] or False
|
||||
if adr_id:
|
||||
|
|
@ -49,7 +48,7 @@ class Overdue(report_sxw.rml_parse):
|
|||
return False
|
||||
|
||||
def _lines_get(self, partner):
|
||||
moveline_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')
|
||||
moveline_obj = self.pool['account.move.line']
|
||||
movelines = moveline_obj.search(self.cr, self.uid,
|
||||
[('partner_id', '=', partner.id),
|
||||
('account_id.type', 'in', ['receivable', 'payable']),
|
||||
|
|
@ -58,13 +57,10 @@ class Overdue(report_sxw.rml_parse):
|
|||
return movelines
|
||||
|
||||
def _message(self, obj, company):
|
||||
company_pool = pooler.get_pool(self.cr.dbname).get('res.company')
|
||||
company_pool = self.pool['res.company']
|
||||
message = company_pool.browse(self.cr, self.uid, company.id, {'lang':obj.lang}).overdue_msg
|
||||
return message.split('\n')
|
||||
|
||||
report_sxw.report_sxw('report.account.overdue', 'res.partner',
|
||||
'addons/account/report/account_print_overdue.rml', parser=Overdue)
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ import time
|
|||
from datetime import datetime
|
||||
from dateutil.relativedelta import relativedelta
|
||||
|
||||
from openerp import pooler
|
||||
from openerp import tools
|
||||
from openerp.osv import fields,osv
|
||||
|
||||
|
|
@ -67,7 +66,6 @@ class report_account_receivable(osv.osv):
|
|||
group by
|
||||
to_char(date,'YYYY:IW'), a.type
|
||||
)""")
|
||||
report_account_receivable()
|
||||
|
||||
#a.type in ('receivable','payable')
|
||||
class temp_range(osv.osv):
|
||||
|
|
@ -78,7 +76,6 @@ class temp_range(osv.osv):
|
|||
'name': fields.char('Range',size=64)
|
||||
}
|
||||
|
||||
temp_range()
|
||||
|
||||
class report_aged_receivable(osv.osv):
|
||||
_name = "report.aged.receivable"
|
||||
|
|
@ -123,7 +120,7 @@ class report_aged_receivable(osv.osv):
|
|||
""" This view will be used in dashboard
|
||||
The reason writing this code here is, we need to check date range from today to first date of fiscal year.
|
||||
"""
|
||||
pool_obj_fy = pooler.get_pool(cr.dbname).get('account.fiscalyear')
|
||||
pool_obj_fy = self.pool['account.fiscalyear']
|
||||
today = time.strftime('%Y-%m-%d')
|
||||
fy_id = pool_obj_fy.find(cr, uid, exception=False)
|
||||
LIST_RANGES = []
|
||||
|
|
@ -141,14 +138,13 @@ class report_aged_receivable(osv.osv):
|
|||
cr.execute('delete from temp_range')
|
||||
|
||||
for range in LIST_RANGES:
|
||||
pooler.get_pool(cr.dbname).get('temp.range').create(cr, uid, {'name':range})
|
||||
self.pool['temp.range'].create(cr, uid, {'name':range})
|
||||
|
||||
cr.execute("""
|
||||
create or replace view report_aged_receivable as (
|
||||
select id,name from temp_range
|
||||
)""")
|
||||
|
||||
report_aged_receivable()
|
||||
|
||||
class report_invoice_created(osv.osv):
|
||||
_name = "report.invoice.created"
|
||||
|
|
@ -201,7 +197,6 @@ class report_invoice_created(osv.osv):
|
|||
AND
|
||||
(to_date(to_char(inv.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') > (CURRENT_DATE-15))
|
||||
)""")
|
||||
report_invoice_created()
|
||||
|
||||
class report_account_type_sales(osv.osv):
|
||||
_name = "report.account_type.sales"
|
||||
|
|
@ -242,7 +237,6 @@ class report_account_type_sales(osv.osv):
|
|||
group by
|
||||
to_char(inv.date_invoice, 'YYYY'),to_char(inv.date_invoice,'MM'),inv.currency_id, inv.period_id, inv_line.product_id, account.user_type
|
||||
)""")
|
||||
report_account_type_sales()
|
||||
|
||||
|
||||
class report_account_sales(osv.osv):
|
||||
|
|
@ -284,6 +278,5 @@ class report_account_sales(osv.osv):
|
|||
group by
|
||||
to_char(inv.date_invoice, 'YYYY'),to_char(inv.date_invoice,'MM'),inv.currency_id, inv.period_id, inv_line.product_id, account.id
|
||||
)""")
|
||||
report_account_sales()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -78,6 +78,5 @@ class account_treasury_report(osv.osv):
|
|||
group by p.id, p.fiscalyear_id, p.date_start, am.company_id
|
||||
)
|
||||
""")
|
||||
account_treasury_report()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from openerp import pooler
|
||||
from openerp.tools.translate import _
|
||||
|
||||
# Mixin to use with rml_parse, so self.pool will be defined.
|
||||
class common_report_header(object):
|
||||
|
||||
def _sum_debit(self, period_id=False, journal_id=False):
|
||||
|
|
@ -75,17 +75,17 @@ class common_report_header(object):
|
|||
|
||||
def get_start_period(self, data):
|
||||
if data.get('form', False) and data['form'].get('period_from', False):
|
||||
return pooler.get_pool(self.cr.dbname).get('account.period').browse(self.cr,self.uid,data['form']['period_from']).name
|
||||
return self.pool.get('account.period').browse(self.cr,self.uid,data['form']['period_from']).name
|
||||
return ''
|
||||
|
||||
def get_end_period(self, data):
|
||||
if data.get('form', False) and data['form'].get('period_to', False):
|
||||
return pooler.get_pool(self.cr.dbname).get('account.period').browse(self.cr, self.uid, data['form']['period_to']).name
|
||||
return self.pool.get('account.period').browse(self.cr, self.uid, data['form']['period_to']).name
|
||||
return ''
|
||||
|
||||
def _get_account(self, data):
|
||||
if data.get('form', False) and data['form'].get('chart_account_id', False):
|
||||
return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).name
|
||||
return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).name
|
||||
return ''
|
||||
|
||||
def _get_sortby(self, data):
|
||||
|
|
@ -120,12 +120,12 @@ class common_report_header(object):
|
|||
|
||||
def _get_fiscalyear(self, data):
|
||||
if data.get('form', False) and data['form'].get('fiscalyear_id', False):
|
||||
return pooler.get_pool(self.cr.dbname).get('account.fiscalyear').browse(self.cr, self.uid, data['form']['fiscalyear_id']).name
|
||||
return self.pool.get('account.fiscalyear').browse(self.cr, self.uid, data['form']['fiscalyear_id']).name
|
||||
return ''
|
||||
|
||||
def _get_company(self, data):
|
||||
if data.get('form', False) and data['form'].get('chart_account_id', False):
|
||||
return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.name
|
||||
return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.name
|
||||
return ''
|
||||
|
||||
def _get_journal(self, data):
|
||||
|
|
@ -137,7 +137,7 @@ class common_report_header(object):
|
|||
|
||||
def _get_currency(self, data):
|
||||
if data.get('form', False) and data['form'].get('chart_account_id', False):
|
||||
return pooler.get_pool(self.cr.dbname).get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.currency_id.symbol
|
||||
return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['chart_account_id']).company_id.currency_id.symbol
|
||||
return ''
|
||||
|
||||
#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -43,6 +43,5 @@ class res_currency_account(osv.osv):
|
|||
rate = float(tot2)/float(tot1)
|
||||
return rate
|
||||
|
||||
res_currency_account()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@
|
|||
<button class="oe_account_recon_next oe_button" href="javascript:void(0)">></button>
|
||||
</div>
|
||||
<div>
|
||||
Last Reconciliation: <t t-esc="widget.last_reconciliation_date" />
|
||||
Latest Manual Reconciliation Processed: <t t-esc="widget.last_reconciliation_date" />
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<button class="oe_account_recon_reconcile oe_button oe_highlight" href="javascript:void(0)"
|
||||
disabled="">Reconcile</button>
|
||||
<button class="oe_account_recom_mark_as_reconciled oe_button" href="javascript:void(0)">Nothing to reconcile</button>
|
||||
<button class="oe_account_recom_mark_as_reconciled oe_button" href="javascript:void(0)">Nothing more to reconcile</button>
|
||||
</div>
|
||||
</t>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
import time
|
||||
journal = self._default_journal_id(cr, uid, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
|
||||
'journal_type': 'bank', 'period_id': time.strftime('%m'), 'active_ids': [ref('menu_bank_statement_tree')], 'active_id': ref('menu_bank_statement_tree')})
|
||||
assert journal, _('Journal has not been selected')
|
||||
assert journal, 'Journal has not been selected'
|
||||
-
|
||||
I create a bank statement with Opening and Closing balance 0.
|
||||
-
|
||||
|
|
|
|||
|
|
@ -14,8 +14,9 @@
|
|||
-
|
||||
!python {model: account.invoice}: |
|
||||
import os
|
||||
from openerp import netsvc, tools
|
||||
(data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.account_invoice_customer0')], {}, {})
|
||||
import openerp.report
|
||||
from openerp import tools
|
||||
data, format = openerp.report.render_report(cr, uid, [ref('account.account_invoice_customer0')], 'account.invoice', {}, {})
|
||||
if tools.config['test_report_directory']:
|
||||
file(os.path.join(tools.config['test_report_directory'], 'account-invoice.'+format), 'wb+').write(data)
|
||||
|
||||
|
|
@ -24,8 +25,9 @@
|
|||
-
|
||||
!python {model: res.partner}: |
|
||||
import os
|
||||
from openerp import netsvc, tools
|
||||
(data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_1'),ref('base.res_partner_2'),ref('base.res_partner_12')], {}, {})
|
||||
import openerp.report
|
||||
from openerp import tools
|
||||
data, format = openerp.report.render_report(cr, uid, [ref('base.res_partner_1'),ref('base.res_partner_2'),ref('base.res_partner_12')], 'account.overdue', {}, {})
|
||||
if tools.config['test_report_directory']:
|
||||
file(os.path.join(tools.config['test_report_directory'], 'account-report_overdue.'+format), 'wb+').write(data)
|
||||
-
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
ids = self.search(cr, uid, [('ref', '=', 'My Test Model')])
|
||||
self.button_validate(cr, uid, ids, {})
|
||||
moves = self.browse(cr, uid, ids)[0]
|
||||
assert(moves.state == 'posted'), _('Journal Entries are not in posted state')
|
||||
assert(moves.state == 'posted'), 'Journal Entries are not in posted state'
|
||||
-
|
||||
Then I create Recurring Lines
|
||||
-
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
self.compute(cr, uid, [ref('test_recurring_lines')], {'lang': u'en_US', 'active_model': 'ir.ui.menu',
|
||||
'active_ids': [ref('menu_action_subscription_form')], 'tz': False, 'active_id': ref('menu_action_subscription_form')})
|
||||
subscription_lines = subscription_line_obj.search(cr, uid, [('subscription_id', '=', ref('test_recurring_lines'))])
|
||||
assert subscription_lines, _('Subscription lines has not been created')
|
||||
assert subscription_lines, 'Subscription lines has not been created'
|
||||
-
|
||||
I provide date in 'Generate Entries' wizard
|
||||
-
|
||||
|
|
@ -69,5 +69,5 @@
|
|||
!python {model: account.subscription.generate}: |
|
||||
res = self.action_generate(cr, uid, [ref('account_subscription_generate')], {'lang': u'en_US', 'active_model': 'ir.ui.menu',
|
||||
'active_ids': [ref('menu_generate_subscription')], 'tz': False, 'active_id': ref('menu_generate_subscription')})
|
||||
assert res, _('Move for subscription lines has not been created')
|
||||
assert res, 'Move for subscription lines has not been created'
|
||||
|
||||
|
|
|
|||
|
|
@ -246,6 +246,5 @@ class account_automatic_reconcile(osv.osv_memory):
|
|||
'context': context,
|
||||
}
|
||||
|
||||
account_automatic_reconcile()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -73,6 +73,5 @@ class account_change_currency(osv.osv_memory):
|
|||
obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
account_change_currency()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -105,6 +105,5 @@ class account_chart(osv.osv_memory):
|
|||
'fiscalyear': _get_fiscalyear,
|
||||
}
|
||||
|
||||
account_chart()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -93,6 +93,5 @@ class accounting_report(osv.osv_memory):
|
|||
'datas': data,
|
||||
}
|
||||
|
||||
accounting_report()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -278,6 +278,5 @@ class account_fiscalyear_close(osv.osv_memory):
|
|||
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
account_fiscalyear_close()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -56,6 +56,5 @@ class account_fiscalyear_close_state(osv.osv_memory):
|
|||
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
account_fiscalyear_close_state()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -181,9 +181,9 @@ class account_invoice_refund(osv.osv_memory):
|
|||
invoice = invoice[0]
|
||||
del invoice['id']
|
||||
invoice_lines = inv_line_obj.browse(cr, uid, invoice['invoice_line'], context=context)
|
||||
invoice_lines = inv_obj._refund_cleanup_lines(cr, uid, invoice_lines)
|
||||
invoice_lines = inv_obj._refund_cleanup_lines(cr, uid, invoice_lines, context=context)
|
||||
tax_lines = inv_tax_obj.browse(cr, uid, invoice['tax_line'], context=context)
|
||||
tax_lines = inv_obj._refund_cleanup_lines(cr, uid, tax_lines)
|
||||
tax_lines = inv_obj._refund_cleanup_lines(cr, uid, tax_lines, context=context)
|
||||
invoice.update({
|
||||
'type': inv.type,
|
||||
'date_invoice': date,
|
||||
|
|
@ -220,6 +220,5 @@ class account_invoice_refund(osv.osv_memory):
|
|||
return self.compute_refund(cr, uid, ids, data_refund, context=context)
|
||||
|
||||
|
||||
account_invoice_refund()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
|
||||
from openerp.osv import osv
|
||||
from openerp.tools.translate import _
|
||||
from openerp import pooler
|
||||
|
||||
class account_invoice_confirm(osv.osv_memory):
|
||||
"""
|
||||
|
|
@ -34,8 +33,7 @@ class account_invoice_confirm(osv.osv_memory):
|
|||
def invoice_confirm(self, cr, uid, ids, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
pool_obj = pooler.get_pool(cr.dbname)
|
||||
account_invoice_obj = pool_obj.get('account.invoice')
|
||||
account_invoice_obj = self.pool['account.invoice']
|
||||
data_inv = account_invoice_obj.read(cr, uid, context['active_ids'], ['state'], context=context)
|
||||
for record in data_inv:
|
||||
if record['state'] not in ('draft','proforma','proforma2'):
|
||||
|
|
@ -44,7 +42,6 @@ class account_invoice_confirm(osv.osv_memory):
|
|||
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
account_invoice_confirm()
|
||||
|
||||
class account_invoice_cancel(osv.osv_memory):
|
||||
"""
|
||||
|
|
@ -58,8 +55,7 @@ class account_invoice_cancel(osv.osv_memory):
|
|||
def invoice_cancel(self, cr, uid, ids, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
pool_obj = pooler.get_pool(cr.dbname)
|
||||
account_invoice_obj = pool_obj.get('account.invoice')
|
||||
account_invoice_obj = self.pool['account.invoice']
|
||||
data_inv = account_invoice_obj.read(cr, uid, context['active_ids'], ['state'], context=context)
|
||||
for record in data_inv:
|
||||
if record['state'] in ('cancel','paid'):
|
||||
|
|
@ -67,6 +63,5 @@ class account_invoice_cancel(osv.osv_memory):
|
|||
account_invoice_obj.signal_invoice_cancel(cr , uid, [record['id']])
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
account_invoice_cancel()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -45,6 +45,5 @@ class account_journal_select(osv.osv_memory):
|
|||
result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
|
||||
return result
|
||||
|
||||
account_journal_select()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -59,6 +59,5 @@ the bank account\nin the journal definition for reconciliation.'))
|
|||
'type': 'ir.actions.act_window'
|
||||
}
|
||||
|
||||
account_move_bank_reconcile()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -50,6 +50,5 @@ class account_move_line_reconcile_select(osv.osv_memory):
|
|||
'type': 'ir.actions.act_window'
|
||||
}
|
||||
|
||||
account_move_line_reconcile_select()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -67,6 +67,5 @@ class account_move_line_select(osv.osv_memory):
|
|||
result['domain']=result['domain'][0:-1]+','+domain+result['domain'][-1]
|
||||
return result
|
||||
|
||||
account_move_line_select()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -39,6 +39,5 @@ class account_move_line_unreconcile_select(osv.osv_memory):
|
|||
'type': 'ir.actions.act_window'
|
||||
}
|
||||
|
||||
account_move_line_unreconcile_select()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -43,6 +43,5 @@ class account_open_closed_fiscalyear(osv.osv_memory):
|
|||
cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
account_open_closed_fiscalyear()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -55,6 +55,5 @@ class account_period_close(osv.osv_memory):
|
|||
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
account_period_close()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -91,7 +91,6 @@ class account_move_line_reconcile(osv.osv_memory):
|
|||
period_id, journal_id, context=context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
account_move_line_reconcile()
|
||||
|
||||
class account_move_line_reconcile_writeoff(osv.osv_memory):
|
||||
"""
|
||||
|
|
@ -158,6 +157,5 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
|
|||
period_id, journal_id, context=context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
account_move_line_reconcile_writeoff()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -98,6 +98,5 @@ class account_partner_reconcile_process(osv.osv_memory):
|
|||
'next_partner_id': _get_partner,
|
||||
}
|
||||
|
||||
account_partner_reconcile_process()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -38,6 +38,5 @@ class account_balance_report(osv.osv_memory):
|
|||
data = self.pre_print_report(cr, uid, ids, data, context=context)
|
||||
return {'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance', 'datas': data}
|
||||
|
||||
account_balance_report()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -86,6 +86,5 @@ class account_aged_trial_balance(osv.osv_memory):
|
|||
'datas': data
|
||||
}
|
||||
|
||||
account_aged_trial_balance()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ class account_central_journal(osv.osv_memory):
|
|||
'datas': data,
|
||||
}
|
||||
|
||||
account_central_journal()
|
||||
|
||||
#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
|||
|
|
@ -178,6 +178,5 @@ class account_common_report(osv.osv_memory):
|
|||
data['form']['used_context'] = used_context
|
||||
return self._print_report(cr, uid, ids, data, context=context)
|
||||
|
||||
account_common_report()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@ class account_common_account_report(osv.osv_memory):
|
|||
data['form'].update(self.read(cr, uid, ids, ['display_account'], context=context)[0])
|
||||
return data
|
||||
|
||||
account_common_account_report()
|
||||
|
||||
#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
|||
|
|
@ -50,6 +50,5 @@ class account_common_journal_report(osv.osv_memory):
|
|||
data['form']['active_ids'] = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', data['form']['journal_ids']), ('period_id', 'in', period_list)], context=context)
|
||||
return data
|
||||
|
||||
account_common_journal_report()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@ class account_common_partner_report(osv.osv_memory):
|
|||
data['form'].update(self.read(cr, uid, ids, ['result_selection'], context=context)[0])
|
||||
return data
|
||||
|
||||
account_common_partner_report()
|
||||
|
||||
#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ class account_general_journal(osv.osv_memory):
|
|||
data = self.pre_print_report(cr, uid, ids, data, context=context)
|
||||
return {'type': 'ir.actions.report.xml', 'report_name': 'account.general.journal', 'datas': data}
|
||||
|
||||
account_general_journal()
|
||||
|
||||
#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
|||
|
|
@ -58,6 +58,5 @@ class account_report_general_ledger(osv.osv_memory):
|
|||
return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger_landscape', 'datas': data}
|
||||
return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger', 'datas': data}
|
||||
|
||||
account_report_general_ledger()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -50,6 +50,5 @@ class account_partner_balance(osv.osv_memory):
|
|||
'datas': data,
|
||||
}
|
||||
|
||||
account_partner_balance()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -67,6 +67,5 @@ class account_partner_ledger(osv.osv_memory):
|
|||
'datas': data,
|
||||
}
|
||||
|
||||
account_partner_ledger()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ class account_print_journal(osv.osv_memory):
|
|||
report_name = 'account.journal.period.print'
|
||||
return {'type': 'ir.actions.report.xml', 'report_name': report_name, 'datas': data}
|
||||
|
||||
account_print_journal()
|
||||
|
||||
#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
##############################################################################
|
||||
from openerp.osv import osv
|
||||
|
||||
from openerp import netsvc
|
||||
from openerp.tools.translate import _
|
||||
|
||||
class account_state_open(osv.osv_memory):
|
||||
|
|
@ -38,6 +37,5 @@ class account_state_open(osv.osv_memory):
|
|||
obj_invoice.signal_open_test(cr, uid, context['active_ids'][0])
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
account_state_open()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -48,6 +48,5 @@ class account_subscription_generate(osv.osv_memory):
|
|||
result['domain'] = str([('id','in',moves_created)])
|
||||
return result
|
||||
|
||||
account_subscription_generate()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -73,6 +73,5 @@ class account_tax_chart(osv.osv_memory):
|
|||
'target_move': 'posted'
|
||||
}
|
||||
|
||||
account_tax_chart()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ class account_unreconcile(osv.osv_memory):
|
|||
obj_move_line._remove_move_reconcile(cr, uid, context['active_ids'], context=context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
account_unreconcile()
|
||||
|
||||
class account_unreconcile_reconcile(osv.osv_memory):
|
||||
_name = "account.unreconcile.reconcile"
|
||||
|
|
@ -48,6 +47,5 @@ class account_unreconcile_reconcile(osv.osv_memory):
|
|||
obj_move_reconcile.unlink(cr, uid, rec_ids, context=context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
account_unreconcile_reconcile()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -71,6 +71,5 @@ class account_use_model(osv.osv_memory):
|
|||
'type': 'ir.actions.act_window',
|
||||
}
|
||||
|
||||
account_use_model()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ class validate_account_move(osv.osv_memory):
|
|||
obj_move.button_validate(cr, uid, ids_move, context=context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
validate_account_move()
|
||||
|
||||
class validate_account_move_lines(osv.osv_memory):
|
||||
_name = "validate.account.move.lines"
|
||||
|
|
@ -61,7 +60,6 @@ class validate_account_move_lines(osv.osv_memory):
|
|||
raise osv.except_osv(_('Warning!'), _('Selected Entry Lines does not have any account move enties in draft state.'))
|
||||
obj_move.button_validate(cr, uid, move_ids, context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
validate_account_move_lines()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
|||
|
|
@ -59,6 +59,5 @@ class account_vat_declaration(osv.osv_memory):
|
|||
'datas': datas,
|
||||
}
|
||||
|
||||
account_vat_declaration()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ class CashBox(osv.osv_memory):
|
|||
active_model = context.get('active_model', False) or False
|
||||
active_ids = context.get('active_ids', []) or []
|
||||
|
||||
records = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)
|
||||
records = self.pool[active_model].browse(cr, uid, active_ids, context=context)
|
||||
|
||||
return self._run(cr, uid, ids, records, context=None)
|
||||
|
||||
|
|
@ -63,11 +63,12 @@ class CashBoxIn(CashBox):
|
|||
'name' : box.name,
|
||||
}
|
||||
|
||||
CashBoxIn()
|
||||
|
||||
class CashBoxOut(CashBox):
|
||||
_name = 'cash.box.out'
|
||||
|
||||
_columns = CashBox._columns.copy()
|
||||
|
||||
def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
|
||||
amount = box.amount or 0.0
|
||||
return {
|
||||
|
|
@ -78,4 +79,3 @@ class CashBoxOut(CashBox):
|
|||
'name' : box.name,
|
||||
}
|
||||
|
||||
CashBoxOut()
|
||||
|
|
|
|||
|
|
@ -352,11 +352,10 @@ class account_analytic_account(osv.osv):
|
|||
res[account.id] = 0.0
|
||||
sale_ids = sale_obj.search(cr, uid, [('project_id','=', account.id), ('state', '=', 'manual')], context=context)
|
||||
for sale in sale_obj.browse(cr, uid, sale_ids, context=context):
|
||||
if not sale.invoiced:
|
||||
res[account.id] += sale.amount_untaxed
|
||||
for invoice in sale.invoice_ids:
|
||||
if invoice.state not in ('draft', 'cancel'):
|
||||
res[account.id] -= invoice.amount_untaxed
|
||||
res[account.id] += sale.amount_untaxed
|
||||
for invoice in sale.invoice_ids:
|
||||
if invoice.state != 'cancel':
|
||||
res[account.id] -= invoice.amount_untaxed
|
||||
return res
|
||||
|
||||
def _timesheet_ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
|
||||
|
|
|
|||
|
|
@ -267,7 +267,7 @@
|
|||
</field>
|
||||
</record>
|
||||
<menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
|
||||
<menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="7" parent="base.menu_sales"/>
|
||||
<menuitem action="action_account_analytic_overdue_all" id="menu_action_account_analytic_overdue_all" sequence="8" parent="base.menu_sales"/>
|
||||
|
||||
<!-- Action Sales/Invoicing/Time and Material to Invoice -->
|
||||
<record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
|
||||
|
|
@ -276,7 +276,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('invoice_id','=',False)]</field>
|
||||
<field name="context">{'search_default_to_invoice': 1, 'search_default_sales': 1}</field>
|
||||
<field name="context">{'search_default_to_invoice': 1}</field>
|
||||
<field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
|
||||
<field name="help" type="html">
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ class account_analytic_default(osv.osv):
|
|||
best_index = index
|
||||
return res
|
||||
|
||||
account_analytic_default()
|
||||
|
||||
class account_invoice_line(osv.osv):
|
||||
_inherit = "account.invoice.line"
|
||||
|
|
@ -82,7 +81,6 @@ class account_invoice_line(osv.osv):
|
|||
res_prod['value'].update({'account_analytic_id': False})
|
||||
return res_prod
|
||||
|
||||
account_invoice_line()
|
||||
|
||||
|
||||
class stock_picking(osv.osv):
|
||||
|
|
@ -97,7 +95,6 @@ class stock_picking(osv.osv):
|
|||
|
||||
return super(stock_picking, self)._get_account_analytic_invoice(cursor, user, picking, move_line)
|
||||
|
||||
stock_picking()
|
||||
|
||||
class sale_order_line(osv.osv):
|
||||
_inherit = "sale.order.line"
|
||||
|
|
@ -118,6 +115,5 @@ class sale_order_line(osv.osv):
|
|||
inv_line_obj.write(cr, uid, [line.id], {'account_analytic_id': rec.analytic_id.id}, context=context)
|
||||
return create_ids
|
||||
|
||||
sale_order_line()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 5.0.0\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
|
||||
"PO-Revision-Date: 2012-11-27 13:19+0000\n"
|
||||
"PO-Revision-Date: 2013-04-15 15:56+0000\n"
|
||||
"Last-Translator: Els Van Vossel (Agaplan) <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: 2013-03-16 05:28+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
|
||||
"X-Generator: Launchpad (build 16564)\n"
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
|
||||
|
|
@ -40,6 +40,9 @@ msgid ""
|
|||
"default (e.g. create new customer invoice or Sales order if we select this "
|
||||
"product, it will automatically take this as an analytic account)"
|
||||
msgstr ""
|
||||
"Kies een product voor de analytische rekening in analytische "
|
||||
"standaardrekening (vb. maak een nieuwe verkoopfactuur of verkooporder: als "
|
||||
"we dit product kiezen, wordt de analytische rekening voorgesteld)."
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: model:ir.model,name:account_analytic_default.model_stock_picking
|
||||
|
|
@ -64,6 +67,9 @@ msgid ""
|
|||
"default (e.g. create new customer invoice or Sales order if we select this "
|
||||
"partner, it will automatically take this as an analytic account)"
|
||||
msgstr ""
|
||||
"Kies een relatie voor de analytische rekening in analytische "
|
||||
"standaardrekening (vb. maak een nieuwe verkoopfactuur of verkooporder: als "
|
||||
"we deze relatie kiezen, wordt de analytische rekening voorgesteld)."
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: view:account.analytic.default:0
|
||||
|
|
@ -118,6 +124,9 @@ msgid ""
|
|||
"default (e.g. create new customer invoice or Sales order if we select this "
|
||||
"company, it will automatically take this as an analytic account)"
|
||||
msgstr ""
|
||||
"Kies een firma voor de analytische rekening in analytische standaardrekening "
|
||||
"(vb. maak een nieuwe verkoopfactuur of verkooporder: als we deze firma "
|
||||
"kiezen, wordt de analytische rekening voorgesteld)."
|
||||
|
||||
#. module: account_analytic_default
|
||||
#: view:account.analytic.default:0
|
||||
|
|
|
|||
|
|
@ -40,10 +40,10 @@ class one2many_mod2(fields.one2many):
|
|||
plan = journal.plan_id
|
||||
if plan and len(plan.plan_ids) > pnum:
|
||||
acc_id = plan.plan_ids[pnum].root_analytic_id.id
|
||||
ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids),('analytic_account_id','child_of',[acc_id])], limit=self._limit)
|
||||
ids2 = obj.pool[self._obj].search(cr, user, [(self._fields_id,'in',ids),('analytic_account_id','child_of',[acc_id])], limit=self._limit)
|
||||
if ids2 is None:
|
||||
ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id,'in',ids)], limit=self._limit)
|
||||
for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
|
||||
ids2 = obj.pool[self._obj].search(cr, user, [(self._fields_id,'in',ids)], limit=self._limit)
|
||||
for r in obj.pool[self._obj]._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_write'):
|
||||
res[r[self._fields_id]].append( r['id'] )
|
||||
return res
|
||||
|
||||
|
|
@ -65,7 +65,6 @@ class account_analytic_line(osv.osv):
|
|||
'percentage': fields.float('Percentage')
|
||||
}
|
||||
|
||||
account_analytic_line()
|
||||
|
||||
class account_analytic_plan(osv.osv):
|
||||
_name = "account.analytic.plan"
|
||||
|
|
@ -75,7 +74,6 @@ class account_analytic_plan(osv.osv):
|
|||
'plan_ids': fields.one2many('account.analytic.plan.line', 'plan_id', 'Analytic Plans'),
|
||||
}
|
||||
|
||||
account_analytic_plan()
|
||||
|
||||
class account_analytic_plan_line(osv.osv):
|
||||
_name = "account.analytic.plan.line"
|
||||
|
|
@ -94,7 +92,6 @@ class account_analytic_plan_line(osv.osv):
|
|||
'max_required': 100.0,
|
||||
}
|
||||
|
||||
account_analytic_plan_line()
|
||||
|
||||
class account_analytic_plan_instance(osv.osv):
|
||||
_name = "account.analytic.plan.instance"
|
||||
|
|
@ -257,7 +254,6 @@ class account_analytic_plan_instance(osv.osv):
|
|||
vals['code'] = this.code and (str(this.code)+'*') or "*"
|
||||
return super(account_analytic_plan_instance, self).write(cr, uid, ids, vals, context=context)
|
||||
|
||||
account_analytic_plan_instance()
|
||||
|
||||
class account_analytic_plan_instance_line(osv.osv):
|
||||
_name = "account.analytic.plan.instance.line"
|
||||
|
|
@ -280,7 +276,6 @@ class account_analytic_plan_instance_line(osv.osv):
|
|||
res.append((record['id'], record['analytic_account_id']))
|
||||
return res
|
||||
|
||||
account_analytic_plan_instance_line()
|
||||
|
||||
class account_journal(osv.osv):
|
||||
_inherit = "account.journal"
|
||||
|
|
@ -289,7 +284,6 @@ class account_journal(osv.osv):
|
|||
'plan_id': fields.many2one('account.analytic.plan', 'Analytic Plans'),
|
||||
}
|
||||
|
||||
account_journal()
|
||||
|
||||
class account_invoice_line(osv.osv):
|
||||
_inherit = "account.invoice.line"
|
||||
|
|
@ -315,7 +309,6 @@ class account_invoice_line(osv.osv):
|
|||
res_prod['value'].update({'analytics_id': rec.analytics_id.id})
|
||||
return res_prod
|
||||
|
||||
account_invoice_line()
|
||||
|
||||
class account_move_line(osv.osv):
|
||||
|
||||
|
|
@ -370,7 +363,6 @@ class account_move_line(osv.osv):
|
|||
result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
|
||||
return result
|
||||
|
||||
account_move_line()
|
||||
|
||||
class account_invoice(osv.osv):
|
||||
_name = "account.invoice"
|
||||
|
|
@ -425,14 +417,12 @@ class account_invoice(osv.osv):
|
|||
il['analytic_lines'].append((0, 0, al_vals))
|
||||
return iml
|
||||
|
||||
account_invoice()
|
||||
|
||||
class account_analytic_plan(osv.osv):
|
||||
_inherit = "account.analytic.plan"
|
||||
_columns = {
|
||||
'default_instance_id': fields.many2one('account.analytic.plan.instance', 'Default Entries'),
|
||||
}
|
||||
account_analytic_plan()
|
||||
|
||||
class analytic_default(osv.osv):
|
||||
_inherit = "account.analytic.default"
|
||||
|
|
@ -440,7 +430,6 @@ class analytic_default(osv.osv):
|
|||
'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
|
||||
}
|
||||
|
||||
analytic_default()
|
||||
|
||||
class sale_order_line(osv.osv):
|
||||
_inherit = "sale.order.line"
|
||||
|
|
@ -459,7 +448,6 @@ class sale_order_line(osv.osv):
|
|||
inv_line_obj.write(cr, uid, [line.id], {'analytics_id': rec.analytics_id.id}, context=context)
|
||||
return create_ids
|
||||
|
||||
sale_order_line()
|
||||
|
||||
|
||||
class account_bank_statement(osv.osv):
|
||||
|
|
@ -488,7 +476,6 @@ class account_bank_statement(osv.osv):
|
|||
continue
|
||||
return True
|
||||
|
||||
account_bank_statement()
|
||||
|
||||
|
||||
class account_bank_statement_line(osv.osv):
|
||||
|
|
@ -497,6 +484,5 @@ class account_bank_statement_line(osv.osv):
|
|||
_columns = {
|
||||
'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
|
||||
}
|
||||
account_bank_statement_line()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -64,30 +64,6 @@
|
|||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Replace analytic_id with analytics_id in account.invoice.line -->
|
||||
|
||||
<record model="ir.ui.view" id="view_invoice_line_form_inherit">
|
||||
<field name="name">account.invoice.line.form.inherit</field>
|
||||
<field name="model">account.invoice.line</field>
|
||||
<field name="inherit_id" ref="account.view_invoice_line_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="account_analytic_id" position="replace">
|
||||
<field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','<>',False)]" groups="analytic.group_analytic_accounting"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="invoice_supplier_form_inherit">
|
||||
<field name="name">account.invoice.supplier.form.inherit</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="inherit_id" ref="account.invoice_supplier_form"/>
|
||||
<field name="priority">2</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="account_analytic_id" position="replace">
|
||||
<field name="analytics_id" domain="[('plan_id','<>',False)]" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- views for account.analytic.plan.instance -->
|
||||
<record model="ir.ui.view" id="account_analytic_plan_instance_form">
|
||||
|
|
|
|||
|
|
@ -3,8 +3,9 @@
|
|||
-
|
||||
!python {model: account.analytic.account}: |
|
||||
import os, time
|
||||
from openerp import netsvc, tools
|
||||
import openerp.report
|
||||
from openerp import tools
|
||||
data_dict = {'model': 'account.analytic.account', 'form': {'date1':time.strftime("%Y-01-01"),'date2':time.strftime('%Y-%m-%d'),'journal_ids':[6,0,(ref('account.cose_journal_sale'))],'ref':ref('account.analytic_root'),'empty_line':True,'id':ref('account.analytic_root'),'context':{}}}
|
||||
(data, format) = netsvc.LocalService('report.account.analytic.account.crossovered.analytic').create(cr, uid, [ref('account.analytic_root')], data_dict, {})
|
||||
data, format = openerp.report.render_report(cr, uid, [ref('account.analytic_root')], 'account.analytic.account.crossovered.analytic', data_dict, {})
|
||||
if tools.config['test_report_directory']:
|
||||
file(os.path.join(tools.config['test_report_directory'], 'account_analytic_plans-crossovered_analyitic.'+format), 'wb+').write(data)
|
||||
file(os.path.join(tools.config['test_report_directory'], 'account_analytic_plans-crossovered_analyitic.'+format), 'wb+').write(data)
|
||||
|
|
|
|||
|
|
@ -71,6 +71,5 @@ class account_crossovered_analytic(osv.osv_memory):
|
|||
'datas': datas,
|
||||
}
|
||||
|
||||
account_crossovered_analytic()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -55,6 +55,5 @@ class analytic_plan_create_model(osv.osv_memory):
|
|||
else:
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
analytic_plan_create_model()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ class product_category(osv.osv):
|
|||
help="This account will be used to value outgoing stock using cost price."),
|
||||
|
||||
}
|
||||
product_category()
|
||||
|
||||
class product_template(osv.osv):
|
||||
_inherit = "product.template"
|
||||
|
|
@ -78,7 +77,6 @@ class product_template(osv.osv):
|
|||
help="This account will be used to value outgoing stock using cost price."),
|
||||
|
||||
}
|
||||
product_template()
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -37,6 +37,5 @@ class purchase_order(osv.osv):
|
|||
new_account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, acc_id)
|
||||
line.update({'account_id': new_account_id})
|
||||
return line
|
||||
purchase_order()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@ class stock_picking(osv.osv):
|
|||
self.pool.get('account.invoice.line').write(cr, uid, [ol.id], {'account_id': a})
|
||||
return res
|
||||
|
||||
stock_picking()
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -70,7 +70,6 @@ class account_asset_category(osv.osv):
|
|||
res['value'] = {'account_depreciation_id': account_asset_id}
|
||||
return res
|
||||
|
||||
account_asset_category()
|
||||
|
||||
class account_asset_asset(osv.osv):
|
||||
_name = 'account.asset.asset'
|
||||
|
|
@ -80,7 +79,7 @@ class account_asset_asset(osv.osv):
|
|||
for asset in self.browse(cr, uid, ids, context=context):
|
||||
if asset.account_move_line_ids:
|
||||
raise osv.except_osv(_('Error!'), _('You cannot delete an asset that contains posted depreciation lines.'))
|
||||
return super(account_account, self).unlink(cr, uid, ids, context=context)
|
||||
return super(account_asset_asset, self).unlink(cr, uid, ids, context=context)
|
||||
|
||||
def _get_period(self, cr, uid, context=None):
|
||||
periods = self.pool.get('account.period').find(cr, uid)
|
||||
|
|
@ -361,7 +360,6 @@ class account_asset_asset(osv.osv):
|
|||
'context': context,
|
||||
}
|
||||
|
||||
account_asset_asset()
|
||||
|
||||
class account_asset_depreciation_line(osv.osv):
|
||||
_name = 'account.asset.depreciation.line'
|
||||
|
|
@ -456,7 +454,6 @@ class account_asset_depreciation_line(osv.osv):
|
|||
asset.write({'state': 'close'})
|
||||
return created_move_ids
|
||||
|
||||
account_asset_depreciation_line()
|
||||
|
||||
class account_move_line(osv.osv):
|
||||
_inherit = 'account.move.line'
|
||||
|
|
@ -465,7 +462,6 @@ class account_move_line(osv.osv):
|
|||
'entry_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
|
||||
|
||||
}
|
||||
account_move_line()
|
||||
|
||||
class account_asset_history(osv.osv):
|
||||
_name = 'account.asset.history'
|
||||
|
|
@ -490,6 +486,5 @@ class account_asset_history(osv.osv):
|
|||
'user_id': lambda self, cr, uid, ctx: uid
|
||||
}
|
||||
|
||||
account_asset_history()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ class account_invoice(osv.osv):
|
|||
res['asset_id'] = x.get('asset_id', False)
|
||||
return res
|
||||
|
||||
account_invoice()
|
||||
|
||||
class account_invoice_line(osv.osv):
|
||||
|
||||
|
|
@ -66,6 +65,5 @@ class account_invoice_line(osv.osv):
|
|||
asset_obj.validate(cr, uid, [asset_id], context=context)
|
||||
return True
|
||||
|
||||
account_invoice_line()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:04+0000\n"
|
||||
"PO-Revision-Date: 2012-11-27 13:35+0000\n"
|
||||
"PO-Revision-Date: 2013-04-15 15:59+0000\n"
|
||||
"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
|
||||
"Language-Team: Dutch (Belgium) <nl_BE@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: 2013-03-16 05:50+0000\n"
|
||||
"X-Generator: Launchpad (build 16532)\n"
|
||||
"X-Launchpad-Export-Date: 2013-04-16 04:37+0000\n"
|
||||
"X-Generator: Launchpad (build 16564)\n"
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.asset:0
|
||||
|
|
@ -148,7 +148,7 @@ msgstr "Dit is het bedrag dat u niet kunt afschrijven."
|
|||
#. module: account_asset
|
||||
#: help:account.asset.asset,method_period:0
|
||||
msgid "The amount of time between two depreciations, in months"
|
||||
msgstr ""
|
||||
msgstr "De tijd tussen twee afschrijvingen, in maanden"
|
||||
|
||||
#. module: account_asset
|
||||
#: field:account.asset.depreciation.line,depreciation_date:0
|
||||
|
|
@ -265,7 +265,7 @@ msgstr "Duur wijzigen"
|
|||
#: help:account.asset.category,method_number:0
|
||||
#: help:account.asset.history,method_number:0
|
||||
msgid "The number of depreciations needed to depreciate your asset"
|
||||
msgstr ""
|
||||
msgstr "Het aantal keer dat er moet worden afgeschreven."
|
||||
|
||||
#. module: account_asset
|
||||
#: view:account.asset.category:0
|
||||
|
|
@ -295,7 +295,7 @@ msgstr ""
|
|||
#. module: account_asset
|
||||
#: field:account.asset.depreciation.line,remaining_value:0
|
||||
msgid "Next Period Depreciation"
|
||||
msgstr ""
|
||||
msgstr "Volgende afschrijvingsperiode"
|
||||
|
||||
#. module: account_asset
|
||||
#: help:account.asset.history,method_period:0
|
||||
|
|
@ -346,7 +346,7 @@ msgstr "Investeringscategorie zoeken"
|
|||
#. module: account_asset
|
||||
#: view:asset.modify:0
|
||||
msgid "months"
|
||||
msgstr ""
|
||||
msgstr "maanden"
|
||||
|
||||
#. module: account_asset
|
||||
#: model:ir.model,name:account_asset.model_account_invoice_line
|
||||
|
|
@ -608,7 +608,7 @@ msgstr "Afschrijvingsmethode"
|
|||
#. module: account_asset
|
||||
#: field:account.asset.depreciation.line,amount:0
|
||||
msgid "Current Depreciation"
|
||||
msgstr ""
|
||||
msgstr "Huidige afschrijving"
|
||||
|
||||
#. module: account_asset
|
||||
#: field:account.asset.asset,name:0
|
||||
|
|
@ -653,6 +653,9 @@ msgid ""
|
|||
" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
|
||||
" * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
|
||||
msgstr ""
|
||||
"Kies de methode om het aantal afschrijvingsregels te berekenen.\n"
|
||||
" * Lineair: op basis van: brutowaarde / aantal afschrijvingen\n"
|
||||
" * Degressief: op basis van: restwaarde * degressieve factor"
|
||||
|
||||
#. module: account_asset
|
||||
#: field:account.asset.depreciation.line,move_check:0
|
||||
|
|
|
|||
|
|
@ -82,6 +82,5 @@ class asset_asset_report(osv.osv):
|
|||
a.purchase_value, a.id, a.salvage_value
|
||||
)""")
|
||||
|
||||
asset_asset_report()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -127,6 +127,5 @@ class asset_modify(osv.osv_memory):
|
|||
asset_obj.compute_depreciation_board(cr, uid, [asset_id], context=context)
|
||||
return {'type': 'ir.actions.act_window_close'}
|
||||
|
||||
asset_modify()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -55,6 +55,5 @@ class asset_depreciation_confirmation_wizard(osv.osv_memory):
|
|||
'type': 'ir.actions.act_window',
|
||||
}
|
||||
|
||||
asset_depreciation_confirmation_wizard()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ class account_bank_statement(osv.osv):
|
|||
(tuple([x.id for x in st.line_ids]),))
|
||||
return True
|
||||
|
||||
account_bank_statement()
|
||||
|
||||
class account_bank_statement_line_global(osv.osv):
|
||||
_name = 'account.bank.statement.line.global'
|
||||
|
|
@ -100,7 +99,6 @@ class account_bank_statement_line_global(osv.osv):
|
|||
ids = self.search(cr, user, args, context=context, limit=limit)
|
||||
return self.name_get(cr, user, ids, context=context)
|
||||
|
||||
account_bank_statement_line_global()
|
||||
|
||||
class account_bank_statement_line(osv.osv):
|
||||
_inherit = 'account.bank.statement.line'
|
||||
|
|
@ -130,6 +128,5 @@ class account_bank_statement_line(osv.osv):
|
|||
Please go to the associated bank statement in order to delete and/or modify bank statement line.'))
|
||||
return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
|
||||
|
||||
account_bank_statement_line()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
|
|
@ -0,0 +1,357 @@
|
|||
# Czech translation for openobject-addons
|
||||
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
|
||||
# This file is distributed under the same license as the openobject-addons package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2012-12-21 17:05+0000\n"
|
||||
"PO-Revision-Date: 2013-03-31 16:42+0000\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: Czech <cs@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: 2013-04-01 05:06+0000\n"
|
||||
"X-Generator: Launchpad (build 16546)\n"
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: help:account.bank.statement.line.global,name:0
|
||||
msgid "Originator to Beneficiary Information"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
#: selection:account.bank.statement.line,state:0
|
||||
msgid "Confirmed"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement:0
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Glob. Id"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: selection:account.bank.statement.line.global,type:0
|
||||
msgid "CODA"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line.global,parent_id:0
|
||||
msgid "Parent Code"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Debit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:cancel.statement.line:0
|
||||
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
|
||||
#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
|
||||
msgid "Cancel selected statement lines"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line,val_date:0
|
||||
msgid "Value Date"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Group By..."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
#: selection:account.bank.statement.line,state:0
|
||||
msgid "Draft"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Statement"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:confirm.statement.line:0
|
||||
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
|
||||
#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
|
||||
msgid "Confirm selected statement lines"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: report:bank.statement.balance.report:0
|
||||
#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
|
||||
msgid "Bank Statement Balances Report"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:cancel.statement.line:0
|
||||
msgid "Cancel Lines"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line.global:0
|
||||
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
|
||||
msgid "Batch Payment Info"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line,state:0
|
||||
msgid "Status"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
|
||||
#, python-format
|
||||
msgid ""
|
||||
"Delete operation not allowed. Please go to the associated bank "
|
||||
"statement in order to delete and/or modify bank statement line."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:confirm.statement.line:0
|
||||
msgid "or"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:confirm.statement.line:0
|
||||
msgid "Confirm Lines"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line.global:0
|
||||
msgid "Transactions"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line.global,type:0
|
||||
msgid "Type"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
#: report:bank.statement.balance.report:0
|
||||
msgid "Journal"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Confirmed Statement Lines."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Credit Transactions."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
|
||||
msgid "cancel selected statement lines."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line,counterparty_number:0
|
||||
msgid "Counterparty Number"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: report:bank.statement.balance.report:0
|
||||
msgid "Closing Balance"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: report:bank.statement.balance.report:0
|
||||
msgid "Date"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
#: field:account.bank.statement.line,globalisation_amount:0
|
||||
msgid "Glob. Amount"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Debit Transactions."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Extended Filters..."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:confirm.statement.line:0
|
||||
msgid "Confirmed lines cannot be changed anymore."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:cancel.statement.line:0
|
||||
msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: report:bank.statement.balance.report:0
|
||||
msgid "Name"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line.global,name:0
|
||||
msgid "OBI"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: selection:account.bank.statement.line.global,type:0
|
||||
msgid "ISO 20022"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Notes"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: selection:account.bank.statement.line.global,type:0
|
||||
msgid "Manual"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Bank Transaction"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Credit"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line.global,amount:0
|
||||
msgid "Amount"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Fin.Account"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line,counterparty_currency:0
|
||||
msgid "Counterparty Currency"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line,counterparty_bic:0
|
||||
msgid "Counterparty BIC"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line.global,child_ids:0
|
||||
msgid "Child Codes"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Search Bank Transactions"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:confirm.statement.line:0
|
||||
msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: help:account.bank.statement.line,globalisation_id:0
|
||||
msgid ""
|
||||
"Code to identify transactions belonging to the same globalisation level "
|
||||
"within a batch payment"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Draft Statement Lines."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Glob. Am."
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
|
||||
msgid "Bank Statement Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line.global,code:0
|
||||
msgid "Code"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line,counterparty_name:0
|
||||
msgid "Counterparty Name"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
|
||||
msgid "Bank Accounts"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
|
||||
msgid "Bank Statement"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Statement Line"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: sql_constraint:account.bank.statement.line.global:0
|
||||
msgid "The code must be unique !"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line.global,bank_statement_line_ids:0
|
||||
#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
|
||||
#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
|
||||
msgid "Bank Statement Lines"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
|
||||
#, python-format
|
||||
msgid "Warning!"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line.global:0
|
||||
msgid "Child Batch Payments"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:confirm.statement.line:0
|
||||
msgid "Cancel"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Statement Lines"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: view:account.bank.statement.line:0
|
||||
msgid "Total Amount"
|
||||
msgstr ""
|
||||
|
||||
#. module: account_bank_statement_extensions
|
||||
#: field:account.bank.statement.line,globalisation_id:0
|
||||
msgid "Globalisation ID"
|
||||
msgstr ""
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue