'Balance' will generally be used for cash accounts.
'Detail' will copy each existing journal item of the previous year, even the reconciled ones.
'Unreconciled' will copy only the journal items that were unreconciled on the first day of the new fiscal year."""),
- 'sign': fields.selection([(-1, 'Negative'), (1, 'Positive')], 'Sign on Reports', required=True, help='Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts.'),
+ 'sign': fields.selection([(-1, 'Reverse balance sign'), (1, 'Preserve balance sign')], 'Sign on Reports', required=True, help='For accounts that are typically more debited than credited and that you would like to print as negative amounts in your reports, you should reverse the sign of the balance; e.g.: Expense account. The same applies for accounts that are typically more credited than debited and that you would like to print as positive amounts in your reports; e.g.: Income account.'),
'report_type':fields.selection([
('none','/'),
('income','Profit & Loss (Income Accounts)'),
#compute for each account the balance/debit/credit from the move lines
accounts = {}
res = {}
+ null_result = dict((fn, 0.0) for fn in field_names)
if children_and_consolidated:
aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
sums[current.id][fn] += sums[child.id][fn]
else:
sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context)
- null_result = dict((fn, 0.0) for fn in field_names)
for id in ids:
res[id] = sums.get(id, null_result)
else:
for id in ids:
- res[id] = 0.0
+ res[id] = null_result
return res
def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
res[account.id] = level
return res
+ def _set_credit_debit(self, cr, uid, account_id, name, value, arg, context=None):
+ if context.get('config_invisible', True):
+ return True
+
+ account = self.browse(cr, uid, account_id, context=context)
+ diff = value - getattr(account,name)
+ if not diff:
+ return True
+
+ journal_obj = self.pool.get('account.journal')
+ jids = journal_obj.search(cr, uid, [('type','=','situation'),('centralisation','=',1),('company_id','=',account.company_id.id)], context=context)
+ if not jids:
+ raise osv.except_osv(_('Error!'),_("You need an Opening journal with centralisation checked to set the initial balance!"))
+
+ period_obj = self.pool.get('account.period')
+ pids = period_obj.search(cr, uid, [('special','=',True),('company_id','=',account.company_id.id)], context=context)
+ if not pids:
+ raise osv.except_osv(_('Error!'),_("No opening/closing period defined, please create one to set the initial balance!"))
+
+ move_obj = self.pool.get('account.move.line')
+ move_id = move_obj.search(cr, uid, [
+ ('journal_id','=',jids[0]),
+ ('period_id','=',pids[0]),
+ ('account_id','=', account_id),
+ (name,'>', 0.0),
+ ('name','=', _('Opening Balance'))
+ ], context=context)
+ if move_id:
+ move = move_obj.browse(cr, uid, move_id[0], context=context)
+ move_obj.write(cr, uid, move_id[0], {
+ name: diff+getattr(move,name)
+ }, context=context)
+ else:
+ if diff<0.0:
+ raise osv.except_osv(_('Error!'),_("Unable to adapt the initial balance (negative value)!"))
+ nameinv = (name=='credit' and 'debit') or 'credit'
+ move_id = move_obj.create(cr, uid, {
+ 'name': _('Opening Balance'),
+ 'account_id': account_id,
+ 'journal_id': jids[0],
+ 'period_id': pids[0],
+ name: diff,
+ nameinv: 0.0
+ }, context=context)
+ return True
+
_columns = {
'name': fields.char('Name', size=128, required=True, select=True),
'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'),
'child_id': fields.function(_get_child_ids, type='many2many', relation="account.account", string="Child Accounts"),
'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Balance', multi='balance'),
- 'credit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Credit', multi='balance'),
- 'debit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
- 'reconcile': fields.boolean('Reconcile', help="Check this if the user is allowed to reconcile entries in this account."),
+ 'credit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Credit', multi='balance'),
+ 'debit': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
+# 'foreign_balance': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
+ 'foreign_balance': fields.char('Foreign Balance', size=10),
+ 'adjusted_balance': fields.char('Adjusted Balance', size=10),
+ 'gain_loss_unrealized_balance':fields.char('Unrealized Gain Loss Balance', size=10),
+# 'adjusted_balance': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
+# 'gain_loss_unrealized_balance': fields.function(__compute, fnct_inv=_set_credit_debit, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'),
+ 'reconcile': fields.boolean('Allow Reconciliation', help="Check this box if this account allows reconciliation of journal items."),
'shortcut': fields.char('Shortcut', size=12),
'tax_ids': fields.many2many('account.tax', 'account_account_tax_default_rel',
'account_id', 'tax_id', 'Default Taxes'),
return super(account_journal, self).write(cr, uid, ids, vals, context=context)
def create_sequence(self, cr, uid, vals, context=None):
+ """ Create new no_gap entry sequence for every new Joural
"""
- Create new entry sequence for every new Joural
- """
- seq_pool = self.pool.get('ir.sequence')
- seq_typ_pool = self.pool.get('ir.sequence.type')
-
- name = vals['name']
- code = vals['code'].lower()
-
- types = {
- 'name': name,
- 'code': code
- }
- seq_typ_pool.create(cr, uid, types)
+ # in account.journal code is actually the prefix of the sequence
+ # whereas ir.sequence code is a key to lookup global sequences.
+ prefix = vals['code'].upper()
seq = {
- 'name': name,
- 'code': code,
- 'active': True,
- 'prefix': code + "/%(year)s/",
+ 'name': vals['name'],
+ 'implementation':'no_gap',
+ 'prefix': prefix + "/%(year)s/",
'padding': 4,
'number_increment': 1
}
if 'company_id' in vals:
seq['company_id'] = vals['company_id']
- return seq_pool.create(cr, uid, seq)
+ return self.pool.get('ir.sequence').create(cr, uid, seq)
def create(self, cr, uid, vals, context=None):
if not 'sequence_id' in vals or not vals['sequence_id']:
name = rs.name
if rs.currency:
name = "%s (%s)" % (rs.name, rs.currency.name)
- else:
- name = "%s (%s)" % (rs.name, rs.company_id.currency_id.name)
res += [(rs.id, name)]
return res
return False
return True
- def _check_period_journal(self, cursor, user, ids, context=None):
- for move in self.browse(cursor, user, ids, context=context):
- for line in move.line_id:
- if line.period_id.id != move.period_id.id:
- return False
- if line.journal_id.id != move.journal_id.id:
- return False
- return True
-
_constraints = [
(_check_centralisation,
'You can not create more than one move per period on centralized journal',
['journal_id']),
- (_check_period_journal,
- 'You can not create journal items on different periods/journals in the same journal entry',
- ['line_id']),
]
def post(self, cr, uid, ids, context=None):
else:
if journal.sequence_id:
c = {'fiscalyear_id': move.period_id.fiscalyear_id.id}
- new_name = obj_sequence.get_id(cr, uid, journal.sequence_id.id, context=c)
+ new_name = obj_sequence.next_by_id(cr, uid, journal.sequence_id.id, c)
else:
raise osv.except_osv(_('Error'), _('No sequence defined on the journal !'))
context = {}
c = context.copy()
c['novalidate'] = True
- result = super(osv.osv, self).write(cr, uid, ids, vals, c)
+ result = super(account_move, self).write(cr, uid, ids, vals, c)
self.validate(cr, uid, ids, context=context)
return result
# Update the move lines (set them as valid)
obj_move_line.write(cr, uid, line_draft_ids, {
- 'journal_id': move.journal_id.id,
- 'period_id': move.period_id.id,
'state': 'valid'
}, context, check=False)
# We can't validate it (it's unbalanced)
# Setting the lines as draft
obj_move_line.write(cr, uid, line_ids, {
- 'journal_id': move.journal_id.id,
- 'period_id': move.period_id.id,
'state': 'draft'
}, context, check=False)
# Create analytic lines for the valid moves
_defaults = {
'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/',
}
+
def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None):
total = 0.0
for rec in self.browse(cr, uid, ids, context=context):
for line in rec.line_partial_ids:
- total += (line.debit or 0.0) - (line.credit or 0.0)
+ if line.account_id.currency_id:
+ total += line.amount_currency
+ else:
+ total += (line.debit or 0.0) - (line.credit or 0.0)
if not total:
self.pool.get('account.move.line').write(cr, uid,
map(lambda x: x.id, rec.line_partial_ids),
raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
period_id = period_id[0]
+ move_date = context.get('date', time.strftime('%Y-%m-%d'))
+ move_date = datetime.strptime(move_date,"%Y-%m-%d")
for model in self.browse(cr, uid, ids, context=context):
try:
- entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%Y-%m')}
+ entry['name'] = model.name%{'year': move_date.strftime('%Y'), 'month': move_date.strftime('%m'), 'date': move_date.strftime('%Y-%m')}
except:
raise osv.except_osv(_('Wrong model !'), _('You have a wrong expression "%(...)s" in your model !'))
-
move_id = account_move_obj.create(cr, uid, {
'ref': entry['name'],
'period_id': period_id,
'analytic_account_id': analytic_account_id
}
- date_maturity = time.strftime('%Y-%m-%d')
+ date_maturity = context.get('date',time.strftime('%Y-%m-%d'))
if line.date_maturity == 'partner':
if not line.partner_id:
raise osv.except_osv(_('Error !'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \
'name': fields.char('Fiscal Position Template', size=64, required=True),
'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
'account_ids': fields.one2many('account.fiscal.position.account.template', 'position_id', 'Account Mapping'),
- 'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping')
+ 'tax_ids': fields.one2many('account.fiscal.position.tax.template', 'position_id', 'Tax Mapping'),
+ 'note': fields.text('Notes', translate=True),
}
account_fiscal_position_template()
account_fiscal_position_account_template()
+# ---------------------------------------------------------
+# Account Financial Report
+# ---------------------------------------------------------
+
class account_financial_report(osv.osv):
_name = "account.financial.report"
_description = "Account Report"
return res
_columns = {
- 'name': fields.char('Report Name', size=128, required=True),
+ 'name': fields.char('Report Name', size=128, required=True, translate=True),
'parent_id': fields.many2one('account.financial.report', 'Parent'),
'children_ids': fields.one2many('account.financial.report', 'parent_id', 'Account Report'),
'sequence': fields.integer('Sequence'),
+ 'note': fields.text('Notes'),
+ 'balance': fields.function(_get_balance, 'Balance'),
+ 'level': fields.function(_get_level, string='Level', store=True, type='integer'),
'type': fields.selection([
- ('sum','Sum'),
+ ('sum','View'),
('accounts','Accounts'),
- ('account_report','Account Report'),
+ ('account_type','Account Type'),
+ ('account_report','Report Value'),
],'Type'),
'account_ids': fields.many2many('account.account', 'account_account_financial_report', 'report_line_id', 'account_id', 'Accounts'),
- 'note': fields.text('Notes'),
- 'account_report_id': fields.many2one('account.financial.report', 'Account Report'),
- 'balance': fields.function(_get_balance, 'Balance'),
- 'display_detail': fields.boolean('Display the account list'),
- 'level': fields.function(_get_level, string='Level', store=True, type='integer'),
+ 'display_detail': fields.boolean('Display details', help='Display every account with its balance instead of the sum.'),
+ 'account_report_id': fields.many2one('account.financial.report', 'Report Value'),
+ 'account_type_ids': fields.many2many('account.account.type', 'account_account_financial_report_type', 'report_id', 'account_type_id', 'Account Types'),
}
_defaults = {
account_financial_report()
- # Multi charts of Accounts wizard
+# ---------------------------------------------------------
+# Account generation from template wizards
+# ---------------------------------------------------------
class wizard_multi_charts_accounts(osv.osv_memory):
"""
_columns = {
'company_id':fields.many2one('res.company', 'Company', required=True),
'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
- 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True),
+ 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Cash and Banks', required=True),
'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"),
'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."),
"sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"),
def _get_default_accounts(self, cr, uid, context=None):
return [
- {'acc_name': _('Bank Account'),'account_type':'bank'},
{'acc_name': _('Cash'),'account_type':'cash'}
]
projects / odoo / odoo.git / blobdiff