Merge lp:~mukunde/unifield-server/US-10996 into lp:unifield-server

[jftempo]

Unmerged revisions

6398. By Gaël Mukunde on 2023-02-09

US-10996 [IMP] Code fix to use the level of current instance in the query clauses

6397. By Gaël Mukunde on 2023-02-08

US-10996 [IMP] Remove multi-level reconciliation from report at project level

6396. By jftempo on 2023-02-08

US-8557 [FIX] LetMefixIt: on direct invoice

6395. By jftempo on 2023-02-07

[IMP] RB Data: AfriFarmacia & It Company as customers

6394. By jftempo on 2023-02-06

US-9495 [IMP] Re-sync: allow to source a FO line from one instance to another instance (Internal/IM/IS)

lp:~jfb-tempo-consulting/unifield-server/US-9495

6393. By jftempo on 2023-02-06

US-10591 [IMP] Locations: Allow the creation of External CU locations with 'EPREP' in their names

lp:~dorian-kemps/unifield-server/US-10591

6392. By jftempo on 2023-02-06

US-8417 [FIX] Locations: Set virtual_location to True on the Service Location
    this way, RT on move to Service Location will not be "Loss"

lp:~dorian-kemps/unifield-server/US-8417

6391. By jftempo on 2023-02-06

US-8557 [FIX] AJI duplication: add sql lock on account_move_line to prevent duplicates on concurrent actions

lp:~jfb-tempo-consulting/unifield-server/US-8557

6390. By jftempo on 2023-02-06

US-10185 [FIX] Fo f/up report: if Pick cancelled, 0 must be displayed in "Qty to deliver" and "Qty delivered"

lp:~dorian-kemps/unifield-server/US-10185

6389. By jftempo on 2023-01-30

US-11042 [FIX] Sync server: acl on signature.image

=== modified file 'bin/addons/board/queries_finance.py'
--- bin/addons/board/queries_finance.py	2022-03-25 17:22:55 +0000
+++ bin/addons/board/queries_finance.py	2023-02-23 11:18:30 +0000
@@ -108,8 +108,8 @@
         'title': _('Unbalanced reconciliations in functional currency'),
         'headers': [_('Reconcile number'), _('Reconcile date'), _('Difference')],
         'query': """SELECT rec.name, 'rec_date', sum(l.credit-l.debit)
-from account_move_line l, account_move_reconcile rec
-where l.reconcile_id=rec.id
+from account_move_line l, account_move_reconcile rec, msf_instance inst
+where l.reconcile_id=rec.id and l.instance_id=inst.id and not (rec.is_multi_instance='t' and inst.level='project') 
 %s
 group by rec.id, rec.name
 having(abs(sum(l.credit-l.debit)) > 0.0001)
@@ -121,8 +121,8 @@
         'title': _('Unbalanced reconciliations in booking currency'),
         'headers': [_('Reconcile number'), _('Reconcile date'), _('Difference')],
         'query': """SELECT rec.name, 'rec_date', sum(l.credit_currency-l.debit_currency)
-from account_move_line l, account_move_reconcile rec
-where l.reconcile_id=rec.id
+from account_move_line l, account_move_reconcile rec, msf_instance inst
+where l.reconcile_id=rec.id and l.instance_id=inst.id and not (rec.is_multi_instance='t' and inst.level='project')
 %s
 group by rec.id, rec.name
 having(abs(sum(l.credit_currency-l.debit_currency)) > 0.0001 and count(distinct(l.currency_id))=1)