Fabien Pinckaers
commit
463643c9f7
|
|
@ -1095,7 +1095,7 @@ class account_tax(osv.osv):
|
|||
'ref_tax_sign': fields.float('Tax Code Sign', help="Usualy 1 or -1."),
|
||||
'include_base_amount': fields.boolean('Include in base amount', help="Indicate if the amount of tax must be included in the base amount for the computation of the next taxes"),
|
||||
'company_id': fields.many2one('res.company', 'Company', required=True),
|
||||
'description': fields.char('Internal Name', 32),
|
||||
'description': fields.char('Internal Name',size=32),
|
||||
}
|
||||
|
||||
def name_get(self, cr, uid, ids, context={}):
|
||||
|
|
|
|||
|
|
@ -49,9 +49,9 @@ class account_move_line(osv.osv):
|
|||
if state:
|
||||
if state.lower() not in ['all']:
|
||||
where_move_state= " AND "+obj+".move_id in (select id from account_move where account_move.state = '"+state+"')"
|
||||
|
||||
|
||||
if context.get('periods', False):
|
||||
ids = ','.join([str(x) for x in context['periods']])
|
||||
ids = ','.join([str(x) for x in context['periods']])
|
||||
return obj+".active AND "+obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s" % (fiscalyear_clause, ids,where_move_state)
|
||||
else:
|
||||
return obj+".active AND "+obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) %s)" % (fiscalyear_clause,where_move_state)
|
||||
|
|
@ -71,6 +71,7 @@ class account_move_line(osv.osv):
|
|||
return data
|
||||
|
||||
period_obj = self.pool.get('account.period')
|
||||
tax_obj=self.pool.get('account.tax')
|
||||
|
||||
# Compute the current move
|
||||
move_id = False
|
||||
|
|
@ -86,6 +87,7 @@ class account_move_line(osv.osv):
|
|||
(context['journal_id'], context['period_id'], uid, 'draft'))
|
||||
res = cr.fetchone()
|
||||
move_id = (res and res[0]) or False
|
||||
|
||||
if not move_id:
|
||||
return data
|
||||
else:
|
||||
|
|
@ -111,102 +113,39 @@ class account_move_line(osv.osv):
|
|||
|
||||
total = 0
|
||||
ref_id = False
|
||||
taxes = {}
|
||||
move = self.pool.get('account.move').browse(cr, uid, move_id, context)
|
||||
|
||||
for l in move.line_id:
|
||||
partner_id = partner_id or l.partner_id.id
|
||||
ref_id = ref_id or l.ref
|
||||
total += (l.debit - l.credit)
|
||||
for tax in l.account_id.tax_ids:
|
||||
if move.journal_id.type == 'sale':
|
||||
if l.debit:
|
||||
code = tax.ref_tax_code_id.id
|
||||
acc = tax.account_paid_id.id
|
||||
else:
|
||||
code = tax.tax_code_id.id
|
||||
acc = tax.account_collected_id.id
|
||||
else:
|
||||
if l.debit:
|
||||
code = tax.tax_code_id.id
|
||||
acc = tax.account_collected_id.id
|
||||
else:
|
||||
code = tax.ref_tax_code_id.id
|
||||
acc = tax.account_paid_id.id
|
||||
taxes.setdefault((acc, code), False)
|
||||
taxes[(l.account_id.id, l.tax_code_id.id)] = True
|
||||
total += (l.debit or 0.0) - (l.credit or 0.0)
|
||||
if 'name' in fields:
|
||||
data.setdefault('name', l.name)
|
||||
|
||||
data.setdefault('name', l.name)
|
||||
if 'ref' in fields:
|
||||
data['ref'] = ref_id
|
||||
if 'partner_id' in fields:
|
||||
data['partner_id'] = partner_id
|
||||
|
||||
if move.journal_id.type in ('purchase', 'sale'):
|
||||
for t in taxes:
|
||||
if not taxes[t] and t[0]:
|
||||
s = 0
|
||||
tax_amount = 0
|
||||
for l in move.line_id:
|
||||
if move.journal_id.type == 'sale':
|
||||
if l.debit:
|
||||
field_base = 'ref_'
|
||||
key = 'account_paid_id'
|
||||
else:
|
||||
field_base = ''
|
||||
key = 'account_collected_id'
|
||||
else:
|
||||
if l.debit:
|
||||
field_base = ''
|
||||
key = 'account_collected_id'
|
||||
else:
|
||||
field_base = 'ref_'
|
||||
key = 'account_paid_id'
|
||||
for tax in self.pool.get('account.tax').compute(cr, uid,
|
||||
l.account_id.tax_ids, l.debit or l.credit, 1, False):
|
||||
if (tax[key] == t[0]) \
|
||||
and (tax[field_base + 'tax_code_id'] == t[1]):
|
||||
if l.debit:
|
||||
s += tax['amount']
|
||||
else:
|
||||
s -= tax['amount']
|
||||
tax_amount += tax['amount'] * \
|
||||
tax[field_base + 'tax_sign']
|
||||
if ('debit' in fields) or ('credit' in fields):
|
||||
data['debit'] = s>0 and s or 0.0
|
||||
data['credit'] = s<0 and -s or 0.0
|
||||
|
||||
if 'tax_code_id' in fields:
|
||||
data['tax_code_id'] = t[1]
|
||||
if 'account_id' in fields:
|
||||
data['account_id'] = t[0]
|
||||
if 'tax_amount' in fields:
|
||||
data['tax_amount'] = tax_amount
|
||||
#
|
||||
# Compute line for tax T
|
||||
#
|
||||
return data
|
||||
|
||||
#
|
||||
# Compute latest line
|
||||
#
|
||||
if ('debit' in fields) or ('credit' in fields):
|
||||
data['credit'] = total>0 and total
|
||||
data['debit'] = total<0 and -total
|
||||
if 'account_id' in fields:
|
||||
if total >= 0:
|
||||
data['account_id'] = move.journal_id.default_credit_account_id.id or False
|
||||
if move.journal_id.type == 'purchase':
|
||||
if total>0:
|
||||
account = move.journal_id.default_credit_account_id
|
||||
else:
|
||||
data['account_id'] = move.journal_id.default_debit_account_id.id or False
|
||||
if 'account_id' in fields and data['account_id']:
|
||||
account = self.pool.get('account.account').browse(cr, uid, data['account_id'])
|
||||
data['tax_code_id'] = self._default_get_tax(cr, uid, account )
|
||||
return data
|
||||
account = move.journal_id.default_debit_account_id
|
||||
else:
|
||||
if total>0:
|
||||
account = move.journal_id.default_credit_account_id
|
||||
else:
|
||||
account = move.journal_id.default_debit_account_id
|
||||
|
||||
def _default_get_tax(self, cr, uid, account, debit=0, credit=0, context={}):
|
||||
if account.tax_ids:
|
||||
return account.tax_ids[0].base_code_id.id
|
||||
return False
|
||||
data['account_id'] = account.id
|
||||
if account and account.tax_ids:
|
||||
for tax in self.pool.get('account.tax').compute_inv(cr,uid,[account.tax_ids[0]],total,1.00):
|
||||
total -= tax['amount']
|
||||
data['account_tax_id'] = account.tax_ids[0].id
|
||||
s = -total
|
||||
data['debit'] = s>0 and s or 0.0
|
||||
data['credit'] = s<0 and -s or 0.0
|
||||
return data
|
||||
|
||||
def _on_create_write(self, cr, uid, id, context={}):
|
||||
ml = self.browse(cr, uid, id, context)
|
||||
|
|
@ -307,7 +246,6 @@ class account_move_line(osv.osv):
|
|||
'debit': fields.float('Debit', digits=(16,2)),
|
||||
'credit': fields.float('Credit', digits=(16,2)),
|
||||
'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
|
||||
|
||||
'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", states={'valid':[('readonly',True)]}, help="The move of this entry line.", select=2),
|
||||
|
||||
'ref': fields.char('Ref.', size=32),
|
||||
|
|
@ -334,6 +272,10 @@ class account_move_line(osv.osv):
|
|||
'tax_amount': fields.float('Tax/Base Amount', digits=(16,2), select=True),
|
||||
'invoice': fields.function(_invoice, method=True, string='Invoice',
|
||||
type='many2one', relation='account.invoice', fnct_search=_invoice_search),
|
||||
'account_tax_id':fields.many2one('account.tax', 'Tax'),
|
||||
'analytic_account_id' : fields.many2one('account.analytic.account', 'Analytic Account'),
|
||||
#TODO: remove this
|
||||
'amount_taxed':fields.float("Taxed Amount",digits=(16,2)),
|
||||
}
|
||||
|
||||
def _get_date(self, cr, uid, context):
|
||||
|
|
@ -394,34 +336,22 @@ class account_move_line(osv.osv):
|
|||
(_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
|
||||
]
|
||||
|
||||
#TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
|
||||
|
||||
def onchange_partner_id(self, cr, uid, ids, move_id, partner_id, account_id=None, debit=0, credit=0, journal=False):
|
||||
if (not partner_id) or account_id:
|
||||
return {}
|
||||
part = self.pool.get('res.partner').browse(cr, uid, partner_id)
|
||||
id1 = part.property_account_payable.id
|
||||
id2 = part.property_account_receivable.id
|
||||
cr.execute('select sum(debit-credit) from account_move_line where (reconcile_id is null) and partner_id=%d and account_id=%d', (partner_id, id2))
|
||||
balance = cr.fetchone()[0] or 0.0
|
||||
val = {}
|
||||
if (not debit) and (not credit):
|
||||
if abs(balance)>0.01:
|
||||
val['credit'] = ((balance>0) and balance) or 0
|
||||
val['debit'] = ((balance<0) and -balance) or 0
|
||||
val['account_id'] = id2
|
||||
else:
|
||||
cr.execute('select sum(debit-credit) from account_move_line where (reconcile_id is null) and partner_id=%d and account_id=%d', (partner_id, id1))
|
||||
balance = cr.fetchone()[0] or 0.0
|
||||
val['credit'] = ((balance>0) and balance) or 0
|
||||
val['debit'] = ((balance<0) and -balance) or 0
|
||||
val['account_id'] = id1
|
||||
else:
|
||||
val['account_id'] = (debit>0) and id2 or id1
|
||||
if journal:
|
||||
jt = self.pool.get('account.journal').browse(cr, uid, journal).type
|
||||
if jt=='sale':
|
||||
val['account_id'] = id2
|
||||
elif jt=='purchase':
|
||||
val['account_id'] = id1
|
||||
# Compute Maturity Date in val !
|
||||
return {'value':val}
|
||||
|
||||
#
|
||||
|
|
@ -632,7 +562,19 @@ class account_move_line(osv.osv):
|
|||
def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
|
||||
if not context:
|
||||
context={}
|
||||
raise_ex=False
|
||||
account_obj = self.pool.get('account.account')
|
||||
acc=account_obj.browse(cr,uid,ids)[0]
|
||||
|
||||
if ('debit' in vals and 'credit' in vals) and not vals['debit'] and not vals['credit']:
|
||||
raise_ex=True
|
||||
if ('debit' in vals and 'credit' not in vals) and not vals['debit'] and not acc.credit:
|
||||
raise_ex=True
|
||||
if ('credit' in vals and 'debit' not in vals) and not vals['credit'] and not acc.debit:
|
||||
raise_ex=True
|
||||
|
||||
if raise_ex:
|
||||
raise osv.except_osv(_('Wrong Accounting Entry!'), _('Both Credit and Debit cannot be zero!'))
|
||||
|
||||
if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
|
||||
raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
|
||||
|
|
@ -680,7 +622,9 @@ class account_move_line(osv.osv):
|
|||
def create(self, cr, uid, vals, context=None, check=True):
|
||||
if not context:
|
||||
context={}
|
||||
|
||||
account_obj = self.pool.get('account.account')
|
||||
tax_obj=self.pool.get('account.tax')
|
||||
|
||||
if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
|
||||
raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!'))
|
||||
|
|
@ -692,7 +636,9 @@ class account_move_line(osv.osv):
|
|||
m = self.pool.get('account.move').browse(cr, uid, vals['move_id'])
|
||||
context['journal_id'] = m.journal_id.id
|
||||
context['period_id'] = m.period_id.id
|
||||
|
||||
self._update_journal_check(cr, uid, context['journal_id'], context['period_id'], context)
|
||||
|
||||
move_id = vals.get('move_id', False)
|
||||
journal = self.pool.get('account.journal').browse(cr, uid, context['journal_id'])
|
||||
if not move_id:
|
||||
|
|
@ -743,7 +689,48 @@ class account_move_line(osv.osv):
|
|||
vals['amount_currency'] = cur_obj.compute(cr, uid, account.company_id.currency_id.id, account.currency_id.id, vals.get('debit', 0.0)-vals.get('credit', 0.0), context=ctx)
|
||||
if not ok:
|
||||
raise osv.except_osv(_('Bad account !'), _('You can not use this general account in this journal !'))
|
||||
|
||||
result = super(osv.osv, self).create(cr, uid, vals, context)
|
||||
if 'analytic_account_id' in vals and vals['analytic_account_id']:
|
||||
if journal.analytic_journal_id:
|
||||
vals['analytic_lines'] = [(0,0, {
|
||||
'name': vals['name'],
|
||||
'date': vals['date'],
|
||||
'account_id': vals['analytic_account_id'],
|
||||
'unit_amount': vals['quantity'],
|
||||
'amount': vals['debit'] or vals['credit'],
|
||||
'general_account_id': vals['account_id'],
|
||||
'journal_id': journal.analytic_journal_id.id,
|
||||
'ref': vals['ref'],
|
||||
})]
|
||||
|
||||
# CREATE Taxes
|
||||
if 'account_tax_id' in vals and vals['account_tax_id']:
|
||||
tax_id=tax_obj.browse(cr,uid,vals['account_tax_id'])
|
||||
total = vals['credit'] or (-vals['debit'])
|
||||
for tax in tax_obj.compute(cr,uid,[tax_id],total,1.00):
|
||||
print 'Processing Tax', tax
|
||||
self.write(cr, uid,[result], {
|
||||
'tax_code_id': tax['base_code_id'],
|
||||
'tax_amount': tax['base_sign'] * total
|
||||
})
|
||||
data = {
|
||||
'move_id': vals['move_id'],
|
||||
'journal_id': vals['journal_id'],
|
||||
'period_id': vals['period_id'],
|
||||
'name': vals['name']+' '+tax['name'],
|
||||
'date': vals['date'],
|
||||
'partner_id': vals.get('partner_id',False),
|
||||
'ref': vals.get('ref',False),
|
||||
'account_tax_id': False,
|
||||
'tax_code_id': tax['tax_code_id'],
|
||||
'tax_amount': tax['tax_sign'] * tax['amount'],
|
||||
'account_id': tax['account_paid_id'], # or collected ?
|
||||
'credit': tax['amount']>0 and tax['amount'] or 0.0,
|
||||
'debit': tax['amount']<0 and -tax['amount'] or 0.0,
|
||||
}
|
||||
print data
|
||||
self.create(cr, uid, data, context)
|
||||
if check:
|
||||
self.pool.get('account.move').validate(cr, uid, [vals['move_id']], context)
|
||||
return result
|
||||
|
|
@ -757,7 +744,5 @@ class account_bank_statement_reconcile(osv.osv):
|
|||
}
|
||||
account_bank_statement_reconcile()
|
||||
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
|||
|
|
@ -653,6 +653,8 @@
|
|||
<field name="journal_id"/>
|
||||
<field name="debit" sum="Total debit"/>
|
||||
<field name="credit" sum="Total credit"/>
|
||||
<field name="account_tax_id"/>
|
||||
<field name="analytic_account_id"/>
|
||||
<field name="amount_currency"/>
|
||||
<field name="currency_id"/>
|
||||
<field name="state"/>
|
||||
|
|
@ -695,6 +697,9 @@
|
|||
<newline/>
|
||||
<field name="tax_code_id"/>
|
||||
<field name="tax_amount"/>
|
||||
<newline/>
|
||||
<field name="account_tax_id"/>
|
||||
<field name="analytic_account_id"/>
|
||||
|
||||
<separator colspan="4" string="State"/>
|
||||
<field name="journal_id" select="2"/>
|
||||
|
|
@ -743,6 +748,9 @@
|
|||
<field name="date_created"/>
|
||||
<field name="date_created"/>
|
||||
<field name="blocked" select="3"/>
|
||||
<newline/>
|
||||
<field name="account_tax_id"/>
|
||||
<field name="analytic_account_id"/>
|
||||
|
||||
<separator colspan="4" string="State"/>
|
||||
<newline/>
|
||||
|
|
@ -1343,6 +1351,8 @@
|
|||
<field name="tax_amount"/>
|
||||
<field name="debit" sum="Total debit"/>
|
||||
<field name="credit" sum="Total credit"/>
|
||||
<field name="account_tax_id"/>
|
||||
<field name="analytic_account_id"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
</field>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<terp>
|
||||
<data noupdate="1">
|
||||
|
||||
|
||||
<!--
|
||||
Payment term
|
||||
-->
|
||||
-->
|
||||
<record id="account_payment_term" model="account.payment.term">
|
||||
<field name="name">30 Days Net</field>
|
||||
</record>
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
<field name="condition">net days</field>
|
||||
<field eval="account_payment_term" name="payment_id"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!--
|
||||
Account Journal View
|
||||
-->
|
||||
|
|
@ -74,6 +74,18 @@
|
|||
<field name="field">credit</field>
|
||||
<field eval="11" name="sequence"/>
|
||||
</record>
|
||||
<record id="bank_col11" model="account.journal.column">
|
||||
<field name="view_id" ref="account_journal_bank_view"/>
|
||||
<field name="name">Tax</field>
|
||||
<field name="field">account_tax_id</field>
|
||||
<field eval="12" name="sequence"/>
|
||||
</record>
|
||||
<record id="bank_col12" model="account.journal.column">
|
||||
<field name="view_id" ref="account_journal_bank_view"/>
|
||||
<field name="name">Analytic Account</field>
|
||||
<field name="field">analytic_account_id</field>
|
||||
<field eval="13" name="sequence"/>
|
||||
</record>
|
||||
<record id="bank_col3" model="account.journal.column">
|
||||
<field name="view_id" ref="account_journal_bank_view"/>
|
||||
<field name="name">Ref</field>
|
||||
|
|
@ -84,9 +96,9 @@
|
|||
<field name="view_id" ref="account_journal_bank_view"/>
|
||||
<field name="name">State</field>
|
||||
<field name="field">state</field>
|
||||
<field eval="12" name="sequence"/>
|
||||
<field eval="14" name="sequence"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="account_journal_bank_view_multi" model="account.journal.view">
|
||||
<field name="name">Multi-Currency Cash Journal View</field>
|
||||
</record>
|
||||
|
|
@ -142,17 +154,29 @@
|
|||
<field name="field">credit</field>
|
||||
<field eval="11" name="sequence"/>
|
||||
</record>
|
||||
<record id="bank_col11_multi" model="account.journal.column">
|
||||
<field name="view_id" ref="account_journal_bank_view_multi"/>
|
||||
<field name="name">Tax</field>
|
||||
<field name="field">account_tax_id</field>
|
||||
<field eval="12" name="sequence"/>
|
||||
</record>
|
||||
<record id="bank_col12_multi" model="account.journal.column">
|
||||
<field name="view_id" ref="account_journal_bank_view_multi"/>
|
||||
<field name="name">Analytic Account</field>
|
||||
<field name="field">analytic_account_id</field>
|
||||
<field eval="13" name="sequence"/>
|
||||
</record>
|
||||
<record id="bank_col17_multi" model="account.journal.column">
|
||||
<field name="view_id" ref="account_journal_bank_view_multi"/>
|
||||
<field name="name">Currency Amt.</field>
|
||||
<field name="field">amount_currency</field>
|
||||
<field eval="12" name="sequence"/>
|
||||
<field eval="14" name="sequence"/>
|
||||
</record>
|
||||
<record id="bank_col18_multi" model="account.journal.column">
|
||||
<field name="view_id" ref="account_journal_bank_view_multi"/>
|
||||
<field name="name">Currency</field>
|
||||
<field name="field">currency_id</field>
|
||||
<field eval="13" name="sequence"/>
|
||||
<field eval="15" name="sequence"/>
|
||||
</record>
|
||||
<record id="bank_col3_multi" model="account.journal.column">
|
||||
<field name="view_id" ref="account_journal_bank_view_multi"/>
|
||||
|
|
@ -164,10 +188,10 @@
|
|||
<field name="view_id" ref="account_journal_bank_view_multi"/>
|
||||
<field name="name">State</field>
|
||||
<field name="field">state</field>
|
||||
<field eval="14" name="sequence"/>
|
||||
<field eval="16" name="sequence"/>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
|
||||
<record id="account_journal_view" model="account.journal.view">
|
||||
<field name="name">Journal View</field>
|
||||
</record>
|
||||
|
|
@ -229,30 +253,42 @@
|
|||
<field name="field">credit</field>
|
||||
<field eval="9" name="sequence"/>
|
||||
</record>
|
||||
<record id="journal_col10" model="account.journal.column">
|
||||
<field name="view_id" ref="account_journal_view"/>
|
||||
<field name="name">Tax</field>
|
||||
<field name="field">account_tax_id</field>
|
||||
<field eval="10" name="sequence"/>
|
||||
</record>
|
||||
<record id="journal_col11" model="account.journal.column">
|
||||
<field name="view_id" ref="account_journal_view"/>
|
||||
<field name="name">Analytic Account</field>
|
||||
<field name="field">analytic_account_id</field>
|
||||
<field eval="11" name="sequence"/>
|
||||
</record>
|
||||
<record id="journal_col25" model="account.journal.column">
|
||||
<field name="view_id" ref="account_journal_view"/>
|
||||
<field name="name">Tax Acc.</field>
|
||||
<field name="field">tax_code_id</field>
|
||||
<field eval="10" name="sequence"/>
|
||||
<field eval="12" name="sequence"/>
|
||||
</record>
|
||||
<record id="journal_col26" model="account.journal.column">
|
||||
<field name="view_id" ref="account_journal_view"/>
|
||||
<field name="name">Tax</field>
|
||||
<field name="field">tax_amount</field>
|
||||
<field eval="11" name="sequence"/>
|
||||
<field eval="13" name="sequence"/>
|
||||
</record>
|
||||
<record id="journal_col24" model="account.journal.column">
|
||||
<field name="view_id" ref="account_journal_view"/>
|
||||
<field name="name">State</field>
|
||||
<field name="field">state</field>
|
||||
<field eval="12" name="sequence"/>
|
||||
<field eval="14" name="sequence"/>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
|
||||
<!--
|
||||
Account Journal Sequences
|
||||
-->
|
||||
|
||||
|
||||
<record id="sequence_journal_type" model="ir.sequence.type">
|
||||
<field name="name">Account Journal</field>
|
||||
<field name="code">account.journal</field>
|
||||
|
|
@ -262,11 +298,11 @@
|
|||
<field name="code">account.journal</field>
|
||||
<field name="prefix"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!--
|
||||
Account Statement Sequences
|
||||
-->
|
||||
|
||||
|
||||
<record id="sequence_reconcile" model="ir.sequence.type">
|
||||
<field name="name">Account reconcile sequence</field>
|
||||
<field name="code">account.reconcile</field>
|
||||
|
|
@ -278,8 +314,8 @@
|
|||
<field eval="1" name="number_next"/>
|
||||
<field eval="1" name="number_increment"/>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
|
||||
<record id="sequence_statement_type" model="ir.sequence.type">
|
||||
<field name="name">Bank Statement</field>
|
||||
<field name="code">account.bank.statement</field>
|
||||
|
|
@ -291,11 +327,11 @@
|
|||
<field eval="0" name="number_next"/>
|
||||
<field eval="1" name="number_increment"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!--
|
||||
Account Journal
|
||||
-->
|
||||
|
||||
|
||||
<record id="sales_journal" model="account.journal">
|
||||
<field name="name">Sales Journal</field>
|
||||
<field name="code">SAJ</field>
|
||||
|
|
@ -316,7 +352,7 @@
|
|||
<field model="account.account" name="default_credit_account_id" search="[('type','=','payable')]"/>
|
||||
<field name="user_id" ref="base.user_admin"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="bank_journal" model="account.journal">
|
||||
<field name="name">Bank Journal</field>
|
||||
<field name="code">BNK</field>
|
||||
|
|
@ -327,7 +363,7 @@
|
|||
<field model="account.account" name="default_credit_account_id" search="[('type','=','cash')]"/>
|
||||
<field name="user_id" ref="base.user_admin"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record forcecreate="1" id="stock_journal" model="account.journal">
|
||||
<field name="name">Stock Journal</field>
|
||||
<field name="code">STJ</field>
|
||||
|
|
@ -336,6 +372,6 @@
|
|||
<field name="sequence_id" ref="sequence_journal"/>
|
||||
<field name="user_id" ref="base.user_admin"/>
|
||||
</record>
|
||||
|
||||
|
||||
</data>
|
||||
</terp>
|
||||
|
|
@ -237,6 +237,14 @@ class account_analytic_journal(osv.osv):
|
|||
}
|
||||
account_analytic_journal()
|
||||
|
||||
class account_journal(osv.osv):
|
||||
_inherit="account.journal"
|
||||
|
||||
_columns = {
|
||||
'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal'),
|
||||
}
|
||||
account_journal()
|
||||
|
||||
|
||||
# ---------------------------------------------------------
|
||||
# Budgets
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<terp>
|
||||
<data>
|
||||
|
||||
|
||||
<record id="view_account_analytic_account_list" model="ir.ui.view">
|
||||
<field name="name">account.analytic.account.list</field>
|
||||
<field name="model">account.analytic.account</field>
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="view_account_analytic_account_tree" model="ir.ui.view">
|
||||
<field name="name">account.analytic.account.tree</field>
|
||||
<field name="model">account.analytic.account</field>
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="view_account_analytic_account_form" model="ir.ui.view">
|
||||
<field name="name">account.analytic.account.form</field>
|
||||
<field name="model">account.analytic.account</field>
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="action_account_analytic_account_form" model="ir.actions.act_window">
|
||||
<field name="name">Analytic Accounts</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
</record>
|
||||
<menuitem id="next_id_39" name="Analytic Accounts" parent="account.menu_finance_configuration"/>
|
||||
<menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="next_id_39"/>
|
||||
|
||||
|
||||
<record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
|
||||
<field name="name">Analytic Charts of Accounts</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
|
|
@ -86,13 +86,13 @@
|
|||
<field name="view_id" ref="view_account_analytic_account_tree"/>
|
||||
</record>
|
||||
<menuitem
|
||||
action="action_account_analytic_account_tree2"
|
||||
id="account_analytic_def_chart"
|
||||
action="action_account_analytic_account_tree2"
|
||||
id="account_analytic_def_chart"
|
||||
parent="account.next_id_39"/>
|
||||
<menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>
|
||||
|
||||
|
||||
<menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_reporting"/><menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart_balance" parent="next_id_40"/>
|
||||
|
||||
|
||||
<record id="view_account_analytic_line_form" model="ir.ui.view">
|
||||
<field name="name">account.analytic.line.form</field>
|
||||
<field name="model">account.analytic.line</field>
|
||||
|
|
@ -141,8 +141,8 @@
|
|||
<field name="view_id" ref="view_account_analytic_line_tree"/>
|
||||
</record>
|
||||
<menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/><menuitem action="action_account_analytic_line_form" id="account_entries_analytic_entries" parent="next_id_41"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<record id="action_account_tree1" model="ir.actions.act_window">
|
||||
<field name="name">action.account.tree1</field>
|
||||
<field name="res_model">account.analytic.line</field>
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
<field eval="'ir.actions.act_window,%d'%action_account_tree1" name="value"/>
|
||||
<field eval="True" name="object"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="account_analytic_line_extended_form" model="ir.ui.view">
|
||||
<field name="name">account.analytic.line.extended_form</field>
|
||||
<field name="model">account.analytic.line</field>
|
||||
|
|
@ -183,11 +183,11 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="account_analytic_line_extended_form"/>
|
||||
</record>
|
||||
|
||||
|
||||
#
|
||||
# Analytic Journal
|
||||
#
|
||||
|
||||
|
||||
<record id="view_account_analytic_journal_tree" model="ir.ui.view">
|
||||
<field name="name">account.analytic.journal.tree</field>
|
||||
<field name="model">account.analytic.journal</field>
|
||||
|
|
@ -200,7 +200,7 @@
|
|||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="view_account_analytic_journal_form" model="ir.ui.view">
|
||||
<field name="name">account.analytic.journal.form</field>
|
||||
<field name="model">account.analytic.journal</field>
|
||||
|
|
@ -221,11 +221,11 @@
|
|||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
<menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="account.next_id_25"/>
|
||||
|
||||
|
||||
#
|
||||
# Open journal entries
|
||||
#
|
||||
|
||||
|
||||
<record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
|
||||
<field name="name">account.analytic.journal.open.form</field>
|
||||
<field name="res_model">account.analytic.line</field>
|
||||
|
|
@ -240,19 +240,19 @@
|
|||
<field eval="'ir.actions.act_window,%d'%action_account_analytic_journal_open_form" name="value"/>
|
||||
<field eval="True" name="object"/>
|
||||
</record>
|
||||
|
||||
|
||||
#
|
||||
# Reporting
|
||||
#
|
||||
|
||||
|
||||
<record id="action_account_analytic_journal_tree" model="ir.actions.act_window">
|
||||
<field name="name">Print Analytic Journals</field>
|
||||
<field name="res_model">account.analytic.journal</field>
|
||||
<field name="view_type">tree</field>
|
||||
</record>
|
||||
<menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<record id="action_account_analytic_journal_tree2" model="ir.actions.act_window">
|
||||
<field name="name">Analytic Entries by Journal</field>
|
||||
<field name="res_model">account.analytic.journal</field>
|
||||
|
|
@ -260,11 +260,11 @@
|
|||
<field name="view_id" ref="view_account_analytic_journal_tree"/>
|
||||
</record>
|
||||
<menuitem action="action_account_analytic_journal_tree2" id="account_analytic_journal_entries" parent="account.next_id_41"/>
|
||||
|
||||
|
||||
#
|
||||
# Statistics
|
||||
#
|
||||
|
||||
|
||||
<record id="report_hr_timesheet_invoice_journal_form" model="ir.ui.view">
|
||||
<field name="name">report.hr.timesheet.invoice.journal.form</field>
|
||||
<field name="model">report.hr.timesheet.invoice.journal</field>
|
||||
|
|
@ -277,8 +277,8 @@
|
|||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
|
||||
<record id="report_hr_timesheet_invoice_journal_tree" model="ir.ui.view">
|
||||
<field name="name">report.hr.timesheet.invoice.journal.tree</field>
|
||||
<field name="model">report.hr.timesheet.invoice.journal</field>
|
||||
|
|
@ -294,7 +294,7 @@
|
|||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="report_hr_timesheet_invoice_journal_graph" model="ir.ui.view">
|
||||
<field name="name">report.hr.timesheet.invoice.journal.graph</field>
|
||||
<field name="model">report.hr.timesheet.invoice.journal</field>
|
||||
|
|
@ -308,7 +308,7 @@
|
|||
</graph>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record id="report_account_analytic_journal_tree" model="ir.actions.act_window">
|
||||
<field name="name">Account cost and revenue by journal</field>
|
||||
<field name="res_model">report.hr.timesheet.invoice.journal</field>
|
||||
|
|
@ -316,7 +316,7 @@
|
|||
<field name="view_mode">tree,graph</field>
|
||||
</record>
|
||||
<menuitem id="next_id_42" name="All Months" parent="account.next_id_40"/><menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="next_id_42"/>
|
||||
|
||||
|
||||
<record id="report_account_analytic_journal_tree_month" model="ir.actions.act_window">
|
||||
<field name="name">Account cost and revenue by journal (This Month)</field>
|
||||
<field name="res_model">report.hr.timesheet.invoice.journal</field>
|
||||
|
|
@ -325,11 +325,23 @@
|
|||
<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
|
||||
</record>
|
||||
<menuitem id="next_id_43" name="This Month" parent="account.next_id_40"/><menuitem action="report_account_analytic_journal_tree_month" id="report_account_analytic_journal_print_month" parent="next_id_43"/>
|
||||
|
||||
|
||||
<act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal" name="All Analytic Entries" res_model="account.analytic.line" src_model="account.analytic.account" view_mode="tree,form" view_type="form"/>
|
||||
|
||||
|
||||
|
||||
|
||||
<act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal" name="Costs & Revenues" res_model="report.hr.timesheet.invoice.journal" src_model="account.analytic.account" view_mode="graph,tree,form" view_type="form"/>
|
||||
|
||||
|
||||
<record id="view_account_journal_1" model="ir.ui.view">
|
||||
<field name="name">account.journal.form.1</field>
|
||||
<field name="model">account.journal</field>
|
||||
<field name="inherit_id" ref="account.view_account_journal_form"/>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<field name="currency" position="after">
|
||||
<field name="analytic_journal_id"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</terp>
|
||||
|
|
|
|||
Loading…
Reference in New Issue