pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account: bank statement reconciliation: correctly create journal entries when using a tax on a write-off

Browse Source
This commit is contained in:
Arthur Maniet
2015-01-19 11:22:33 +01:00
parent f163cbe0f8
commit 16e6919abc
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_bank_statement.py
+12 -1
View File
@@ -771,7 +771,18 @@ class account_bank_statement_line(osv.osv):
move_id = am_obj.create(cr, uid, move_vals, context=context)
# Create the move line for the statement line
st_line_amount = reduce(add, [x['credit'] - x['debit'] for x in to_create_mv_line_dicts])
if st_line.statement_id.currency.id != company_currency.id:
if st_line.currency_id == company_currency:
st_line_amount = st_line.amount_currency
else:
ctx = context.copy()
ctx['date'] = st_line.date
st_line_amount = currency_obj.compute(cr, uid, st_line.statement_id.currency.id, company_currency.id, st_line.amount, context=ctx)
else:
st_line_amount = st_line.amount
if to_reconcile_mv_line_ids:
already_reconciled_amount = reduce(add, [x['credit'] - x['debit'] for x in mv_line_dicts if x.get('already_paid', False)])
st_line_amount -= already_reconciled_amount
bank_st_move_vals = bs_obj._prepare_bank_move_line(cr, uid, st_line, move_id, st_line_amount, company_currency, context=context)
aml_obj.create(cr, uid, bank_st_move_vals, context=context)
addons/account/account_move_line.py
+1
View File
@@ -1391,6 +1391,7 @@ class account_move_line(osv.osv):
'credit': tax['amount']<0 and -tax['amount'] or 0.0,
'debit': tax['amount']>0 and tax['amount'] or 0.0,
}
import pprint; pp = pprint.PrettyPrinter(indent=4); pp.pprint(tax['amount'])
self.create(cr, uid, data, context)
del vals['account_tax_id']
addons/account/static/src/js/account_widgets.js
+6 -6
View File
@@ -1445,8 +1445,8 @@ openerp.account = function (instance) {
deferred_tax = $.when(self.model_tax
.call("compute_for_bank_reconciliation", [self.tax_id_field.get("value"), amount]))
.then(function(data){
line_created_being_edited[0].amount_with_tax = line_created_being_edited[0].amount;
line_created_being_edited[0].amount = (data.total.toFixed(3) === amount.toFixed(3) ? amount : data.total);
line_created_being_edited[0].amount_before_tax = (data.total.toFixed(3) === amount.toFixed(3) ? data.total : data.total_included);
line_created_being_edited[0].amount = data.total
var current_line_cursor = 1;
$.each(data.taxes, function(index, tax){
if (tax.amount !== 0.0) {
@@ -1481,8 +1481,8 @@ openerp.account = function (instance) {
line_created_being_edited[index].amount = Math.round(val.amount*rounding)/rounding;
line_created_being_edited[index].amount_str = self.formatCurrency(Math.abs(val.amount), val.currency_id);
}
if (val.amount_with_tax)
line_created_being_edited[index].amount_with_tax = Math.round(val.amount_with_tax*rounding)/rounding;
if (val.amount_before_tax)
line_created_being_edited[index].amount_before_tax = Math.round(val.amount_before_tax*rounding)/rounding;
});
self.set("line_created_being_edited", line_created_being_edited);
self.createdLinesChanged(); // TODO For some reason, previous line doesn't trigger change handler
@@ -1654,7 +1654,7 @@ openerp.account = function (instance) {
if (dict['account_id'] === undefined)
dict['account_id'] = line.account_id;
dict['name'] = line.label;
var amount = line.tax_id ? line.amount_with_tax: line.amount;
var amount = line.tax_id ? line.amount_before_tax: line.amount;
if (amount > 0) dict['credit'] = amount;
if (amount < 0) dict['debit'] = -1 * amount;
if (line.tax_id) dict['account_tax_id'] = line.tax_id;
@@ -1681,7 +1681,7 @@ openerp.account = function (instance) {
var mv_line_dicts = [];
_.each(self.get("mv_lines_selected"), function(l) { mv_line_dicts.push(self.prepareSelectedMoveLineForPersisting(l)) });
created_lines = _.filter(self.getCreatedLines(), function(l) { return ! l.is_tax_line; }); // Tax lines are created via account_tax_id
_.each(self.getCreatedLines(), function(l) { mv_line_dicts.push(self.prepareCreatedMoveLineForPersisting(l)) });
_.each(created_lines, function(l) { mv_line_dicts.push(self.prepareCreatedMoveLineForPersisting(l)) });
if (Math.abs(self.get("balance")).toFixed(3) !== "0.000") mv_line_dicts.push(self.prepareOpenBalanceForPersisting());
return mv_line_dicts;
},