import time
from datetime import datetime
-
from openerp import workflow
from openerp.osv import fields, osv
from openerp.tools.translate import _
import openerp.addons.decimal_precision as dp
from openerp import tools
+from openerp.report import report_sxw
import openerp
class account_move_line(osv.osv):
def _check_no_view(self, cr, uid, ids, context=None):
lines = self.browse(cr, uid, ids, context=context)
for l in lines:
- if l.account_id.type == 'view':
+ if l.account_id.type in ('view', 'consolidation'):
return False
return True
return True
_constraints = [
- (_check_no_view, 'You cannot create journal items on an account of type view.', ['account_id']),
+ (_check_no_view, 'You cannot create journal items on an account of type view or consolidation.', ['account_id']),
(_check_no_closed, 'You cannot create journal items on closed account.', ['account_id']),
(_check_company_id, 'Account and Period must belong to the same company.', ['company_id']),
(_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']),
args.append(('partner_id', '=', partner[0]))
return super(account_move_line, self).search(cr, uid, args, offset, limit, order, context, count)
+ def prepare_move_lines_for_reconciliation_widget(self, cr, uid, lines, target_currency=False, target_date=False, context=None):
+ """ Returns move lines formatted for the manual/bank reconciliation widget
+
+ :param target_currency: curreny you want the move line debit/credit converted into
+ :param target_date: date to use for the monetary conversion
+ """
+ if not lines:
+ return []
+ if context is None:
+ context = {}
+ ctx = context.copy()
+ currency_obj = self.pool.get('res.currency')
+ company_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id
+ rml_parser = report_sxw.rml_parse(cr, uid, 'reconciliation_widget_aml', context=context)
+ reconcile_partial_ids = [] # for a partial reconciliation, take only one line
+ ret = []
+
+ for line in lines:
+ if line.reconcile_partial_id and line.reconcile_partial_id.id in reconcile_partial_ids:
+ continue
+ if line.reconcile_partial_id:
+ reconcile_partial_ids.append(line.reconcile_partial_id.id)
+
+ ret_line = {
+ 'id': line.id,
+ 'name': line.move_id.name,
+ 'ref': line.move_id.ref,
+ 'account_code': line.account_id.code,
+ 'account_name': line.account_id.name,
+ 'account_type': line.account_id.type,
+ 'date_maturity': line.date_maturity,
+ 'date': line.date,
+ 'period_name': line.period_id.name,
+ 'journal_name': line.journal_id.name,
+ 'partner_id': line.partner_id.id,
+ 'partner_name': line.partner_id.name,
+ }
+
+ # Get right debit / credit:
+ line_currency = line.currency_id or company_currency
+ amount_currency_str = ""
+ if line.currency_id and line.amount_currency:
+ amount_currency_str = rml_parser.formatLang(line.amount_currency, currency_obj=line.currency_id)
+ if target_currency and line_currency == target_currency and target_currency != company_currency:
+ debit = line.debit > 0 and line.amount_residual_currency or 0.0
+ credit = line.credit > 0 and line.amount_residual_currency or 0.0
+ amount_currency_str = rml_parser.formatLang(line.amount_residual, currency_obj=company_currency)
+ amount_str = rml_parser.formatLang(debit or credit, currency_obj=target_currency)
+ else:
+ debit = line.debit > 0 and line.amount_residual or 0.0
+ credit = line.credit > 0 and line.amount_residual or 0.0
+ amount_str = rml_parser.formatLang(debit or credit, currency_obj=company_currency)
+ if target_currency and target_currency != company_currency:
+ amount_currency_str = rml_parser.formatLang(debit or credit, currency_obj=line_currency)
+ ctx = context.copy()
+ if target_date:
+ ctx.update({'date': target_date})
+ debit = currency_obj.compute(cr, uid, target_currency.id, company_currency.id, debit, context=ctx)
+ credit = currency_obj.compute(cr, uid, target_currency.id, company_currency.id, credit, context=ctx)
+ amount_str = rml_parser.formatLang(debit or credit, currency_obj=target_currency)
+
+ ret_line['credit'] = credit
+ ret_line['debit'] = debit
+ ret_line['amount_str'] = amount_str
+ ret_line['amount_currency_str'] = amount_currency_str
+ ret.append(ret_line)
+ return ret
+
def list_partners_to_reconcile(self, cr, uid, context=None):
cr.execute(
"""SELECT partner_id FROM (
if self.pool.get('res.currency').is_zero(cr, uid, currency_id, total):
res = self.reconcile(cr, uid, merges+unmerge, context=context, writeoff_acc_id=writeoff_acc_id, writeoff_period_id=writeoff_period_id, writeoff_journal_id=writeoff_journal_id)
return res
+ # marking the lines as reconciled does not change their validity, so there is no need
+ # to revalidate their moves completely.
+ reconcile_context = dict(context, novalidate=True)
r_id = move_rec_obj.create(cr, uid, {
'type': type,
'line_partial_ids': map(lambda x: (4,x,False), merges+unmerge)
- }, context=context)
- move_rec_obj.reconcile_partial_check(cr, uid, [r_id] + merges_rec, context=context)
+ }, context=reconcile_context)
+ move_rec_obj.reconcile_partial_check(cr, uid, [r_id] + merges_rec, context=reconcile_context)
return r_id
def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context=None):
writeoff_line_ids = [writeoff_line_ids[1]]
ids += writeoff_line_ids
+ # marking the lines as reconciled does not change their validity, so there is no need
+ # to revalidate their moves completely.
+ reconcile_context = dict(context, novalidate=True)
r_id = move_rec_obj.create(cr, uid, {
'type': type,
'line_id': map(lambda x: (4, x, False), ids),
'line_partial_ids': map(lambda x: (3, x, False), ids)
- })
+ }, context=reconcile_context)
# the id of the move.reconcile is written in the move.line (self) by the create method above
# because of the way the line_id are defined: (4, x, False)
for id in ids:
all_moves = list(set(all_moves) - set(move_ids))
if unlink_ids:
if opening_reconciliation:
+ raise osv.except_osv(_('Warning!'),
+ _('Opening Entries have already been generated. Please run "Cancel Closing Entries" wizard to cancel those entries and then run this wizard.'))
obj_move_rec.write(cr, uid, unlink_ids, {'opening_reconciliation': False})
obj_move_rec.unlink(cr, uid, unlink_ids)
if len(all_moves) >= 2:
if vals.get('account_tax_id', False):
tax_id = tax_obj.browse(cr, uid, vals['account_tax_id'])
total = vals['debit'] - vals['credit']
- if journal.type in ('purchase_refund', 'sale_refund'):
+ base_code = 'base_code_id'
+ tax_code = 'tax_code_id'
+ account_id = 'account_collected_id'
+ base_sign = 'base_sign'
+ tax_sign = 'tax_sign'
+ if journal.type in ('purchase_refund', 'sale_refund') or (journal.type in ('cash', 'bank') and total < 0):
base_code = 'ref_base_code_id'
tax_code = 'ref_tax_code_id'
account_id = 'account_paid_id'
base_sign = 'ref_base_sign'
tax_sign = 'ref_tax_sign'
- else:
- base_code = 'base_code_id'
- tax_code = 'tax_code_id'
- account_id = 'account_collected_id'
- base_sign = 'base_sign'
- tax_sign = 'tax_sign'
tmp_cnt = 0
- for tax in tax_obj.compute_all(cr, uid, [tax_id], total, 1.00, force_excluded=True).get('taxes'):
+ for tax in tax_obj.compute_all(cr, uid, [tax_id], total, 1.00, force_excluded=False).get('taxes'):
#create the base movement
if tmp_cnt == 0:
if tax[base_code]:
tmp_cnt += 1
- self.write(cr, uid,[result], {
+ if tax_id.price_include:
+ total = tax['price_unit']
+ newvals = {
'tax_code_id': tax[base_code],
- 'tax_amount': tax[base_sign] * abs(total)
- })
+ 'tax_amount': tax[base_sign] * abs(total),
+ }
+ if tax_id.price_include:
+ if tax['price_unit'] < 0:
+ newvals['credit'] = abs(tax['price_unit'])
+ else:
+ newvals['debit'] = tax['price_unit']
+ self.write(cr, uid, [result], newvals, context=context)
else:
data = {
'move_id': vals['move_id'],
'name': tools.ustr(vals['name'] or '') + ' ' + tools.ustr(tax['name'] or ''),
'date': vals['date'],
- 'partner_id': vals.get('partner_id',False),
- 'ref': vals.get('ref',False),
+ 'partner_id': vals.get('partner_id', False),
+ 'ref': vals.get('ref', False),
+ 'statement_id': vals.get('statement_id', False),
'account_tax_id': False,
'tax_code_id': tax[base_code],
'tax_amount': tax[base_sign] * abs(total),
'date': vals['date'],
'partner_id': vals.get('partner_id',False),
'ref': vals.get('ref',False),
+ 'statement_id': vals.get('statement_id', False),
'account_tax_id': False,
'tax_code_id': tax[tax_code],
'tax_amount': tax[tax_sign] * abs(tax['amount']),
self.create(cr, uid, data, context)
del vals['account_tax_id']
- if check and not context.get('novalidate') and ((not context.get('no_store_function')) or journal.entry_posted):
+ if check and not context.get('novalidate') and (context.get('recompute', True) or journal.entry_posted):
tmp = move_obj.validate(cr, uid, [vals['move_id']], context)
if journal.entry_posted and tmp:
move_obj.button_validate(cr,uid, [vals['move_id']], context)