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

[FIX] account bank reconciliation:

Browse Source 
- Automatic bank reconciliation: failure to acknowledge that x * -1 == -x
- Interface: hide the 'partial reconciliation' sign when matching a transaction with an already registered payment
This commit is contained in:
Arthur Maniet
2015-05-28 11:22:29 +02:00
committed by Arthur Maniet
parent e658017f76
commit 11d8c5fd2e
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/account_bank_statement.py
+2 -2
View File
@@ -613,8 +613,8 @@ class AccountBankStatementLine(models.Model):
amount = aml.currency_id and aml.amount_residual_currency or aml.amount_residual
counterpart_aml_dicts.append({
'name': aml.name if aml.name != '/' else aml.move_id.name,
'debit': amount < 0 and amount or 0,
'credit': amount > 0 and -amount or 0,
'debit': amount < 0 and -amount or 0,
'credit': amount > 0 and amount or 0,
'move_line': aml
})
addons/account/static/src/js/account_reconciliation_widgets.js
+2 -2
View File
@@ -1640,7 +1640,7 @@ var bankStatementReconciliationLine = abstractReconciliationLine.extend({
this.getParent().excludeMoveLines(this, this.partner_id, context.reconciliation_proposition);
// This is computed on mvLinesSelectedChanged, which is not triggered if the widget is instanciated with a reconciliation proposition
this.is_rapprochement = this.get("mv_lines_selected").length > 0 && this.get("mv_lines_selected")[0].is_reconciled;
this.is_rapprochement = this.get("mv_lines_selected").length > 0 && this.get("mv_lines_selected")[0].already_paid;
} else {
this.st_line = undefined;
this.partner_id = undefined;
@@ -1942,7 +1942,7 @@ var bankStatementReconciliationLine = abstractReconciliationLine.extend({
self.getParent().excludeMoveLines(self, self.partner_id, added_lines);
self.getParent().unexcludeMoveLines(self, self.partner_id, removed_lines);
self.is_rapprochement = added_lines.length > 0 && added_lines[0].is_reconciled;
self.is_rapprochement = added_lines.length > 0 && added_lines[0].already_paid;
if (self.is_rapprochement)
self.set("lines_created", []);
addons/account/static/src/xml/account_reconciliation.xml
-8
View File
@@ -272,14 +272,6 @@
<t t-name="icon_undo_partial_reconciliation"><i class="undo_partial_reconcile_button fa fa-exclamation-triangle" data-content="Undo the partial reconciliation."></i></t>
<t t-name="bank_statement_reconciliation_move_line_details" t-extend="reconciliation_move_line_details">
<t t-jquery=".details" t-operation="append">
<tr class="one_line_info" t-if='line.is_reconciled'>
<td colspan="2">This item is already reconciled</td>
</tr>
</t>
</t>
<!-- manual reconciliation -->
<t t-name="show_mode_selector_option">