From 434341316bbee837d24e168e7f261f2cff3ac451 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 20 May 2020 19:51:04 +0200
Subject: [PATCH] suggest some fix to debug situation invoices

---
 htdocs/core/tpl/objectline_title.tpl.php  | 2 +-
 htdocs/install/mysql/migration/repair.sql | 5 +++++
 htdocs/langs/en_US/bills.lang             | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index fd848764721..c2f2dbb3d42 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -83,7 +83,7 @@ print '<td class="linecoldiscount right">'.$langs->trans('ReductionShort').'</td
 // Fields for situation invoice
 if ($this->situation_cycle_ref) {
 	print '<td class="linecolcycleref right">' . $langs->trans('Progress') . '</td>';
-	print '<td class="linecolcycleref2 right">' . $langs->trans('TotalHT100Short') . '</td>';
+	print '<td class="linecolcycleref2 right">' . $form->textwithpicto($langs->trans('TotalHT100Short'), $langs->trans('UnitPriceXQtyLessDiscount')) . '</td>';
 }
 
 if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 64e81e30329..fe0eaff767a 100755
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -475,6 +475,11 @@ UPDATE llx_accounting_bookkeeping set date_creation = tms where date_creation IS
 -- UPDATE llx_facturedet_rec set label = NULL WHERE label IS NOT NULL;
 
 
+-- Test inconsistency of data into situation invoices: If it differs, it may be the total_ht that is wrong and situation_percent that is good.
+-- select f.rowid, f.type, qty, subprice, situation_percent, total_ht, total_ttc, total_tva, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc, (situation_percent  / 100 * subprice * qty * (1 - (fd.remise_percent / 100)))
+-- from llx_facturedet as fd, llx_facture as f where fd.fk_facture = f.rowid AND (total_ht - situation_percent  / 100 * subprice * qty * (1 - (fd.remise_percent / 100))) > 0.01 and f.type = 5;
+
+
 
 -- Note to migrate from old counter aquarium to new one
 -- drop table tmp;
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index ddef01b17c1..3f6dc358d2f 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -554,4 +554,5 @@ AutoFillDateFromShort=Set start date
 AutoFillDateTo=Set end date for service line with next invoice date
 AutoFillDateToShort=Set end date
 MaxNumberOfGenerationReached=Max number of gen. reached
-BILL_DELETEInDolibarr=Invoice deleted
\ No newline at end of file
+BILL_DELETEInDolibarr=Invoice deleted
+UnitPriceXQtyLessDiscount=Unit price x Qty - Discount
\ No newline at end of file