Unifield Server

Merge lp:~julie-w/unifield-server/US-5269 into lp:unifield-server

  1. US-5269
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5139
Proposed branch: lp:~julie-w/unifield-server/US-5269
Merge into: lp:unifield-server
Diff against target: 18 lines (+7/-1)
1 file modified
bin/addons/register_accounting/account_bank_statement.py (+7/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-5269
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+358301@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
2--- bin/addons/register_accounting/account_bank_statement.py 2018-09-24 10:28:33 +0000
3+++ bin/addons/register_accounting/account_bank_statement.py 2018-11-05 08:47:56 +0000
4@@ -1925,7 +1925,13 @@
5 process_invoice_move_line_ids = []
6 total_payment = True
7 diff = st_line.first_move_line_id.amount_currency - total_amount
8- if len(st_line.imported_invoice_line_ids) > 1 and abs(diff) > 0.001:
9+ nb_imported_inv = len(st_line.imported_invoice_line_ids)
10+ if nb_imported_inv == 1 and abs(diff) > 0.001: # 1 single invoice partially imported
11+ inv_ml = st_line.imported_invoice_line_ids[0]
12+ if inv_ml:
13+ ji_description = inv_ml.invoice.number or st_line.first_move_line_id.name or ''
14+ move_line_obj.write(cr, uid, move_lines, {'name': ji_description}, check=False, update_check=False, context=context)
15+ elif nb_imported_inv > 1 and abs(diff) > 0.001:
16 # multi unpartial payment
17 total_payment = False
18 # Delete them

Subscribers

People subscribed via source and target branches