Merge remote-tracking branch 'Dolibarr/11.0' into 11

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->socid))

htdocs/install/mysql/migration/repair.sql

@@ -491,8 +491,13 @@ UPDATE llx_accounting_bookkeeping set date_creation = tms where date_creation IS
 -- UPDATE llx_facturedet_rec set label = NULL WHERE label IS NOT NULL;
 
 
+
 UPDATE llx_facturedet SET situation_percent = 100 WHERE situation_percent IS NULL AND fk_prev_id IS 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 make all deposit as payed when there is already a discount generated from it.
 --drop table tmp_invoice_deposit_mark_as_available;
@@ -501,6 +506,7 @@ UPDATE llx_facturedet SET situation_percent = 100 WHERE situation_percent IS NUL
 
 
 
+
 -- Note to migrate from old counter aquarium to new one
 -- drop table tmp;
 -- create table tmp select rowid, code_client, concat(substr(code_client, 1, 6),'-0',substr(code_client, 8, 5)) as code_client2 from llx_societe where code_client like 'CU____-____';

htdocs/langs/en_US/bills.lang

@@ -574,3 +574,4 @@ 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
+UnitPriceXQtyLessDiscount=Unit price x Qty - Discount

htdocs/projet/class/project.class.php

@@ -937,15 +937,14 @@ class Project extends CommonObject
 
 		$error = 0;
 
-        if ($this->statut != 2)
+		if ($this->statut != self::STATUS_CLOSED)
 		{
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."projet";
-            $sql .= " SET fk_statut = 2, fk_user_close = ".$user->id.", date_close = '".$this->db->idate($now)."'";
+			$sql .= " SET fk_statut = ".self::STATUS_CLOSED.", fk_user_close = ".$user->id.", date_close = '".$this->db->idate($now)."'";
 			$sql .= " WHERE rowid = ".$this->id;
-            $sql .= " AND entity = ".$conf->entity;
+			$sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
-            $sql .= " AND fk_statut = 1";
 
 			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 			{
@@ -1048,12 +1047,15 @@ class Project extends CommonObject
 		if ($option != 'nolink') $label = '<u>'.$langs->trans("ShowProject").'</u>';
 		$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Ref').': </b>'.$this->ref; // The space must be after the : to not being explode when showing the title in img_picto
 		$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Label').': </b>'.$this->title; // The space must be after the : to not being explode when showing the title in img_picto
-        if (!empty($this->thirdparty_name))
+		if (!empty($this->thirdparty_name)) {
 			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('ThirdParty').': </b>'.$this->thirdparty_name; // The space must be after the : to not being explode when showing the title in img_picto
-        if (!empty($this->dateo))
+		}
+		if (!empty($this->dateo)) {
 			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateStart').': </b>'.dol_print_date($this->dateo, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
-        if (!empty($this->datee))
+		}
+		if (!empty($this->datee)) {
 			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateEnd').': </b>'.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
+		}
 		if ($moreinpopup) $label .= '<br>'.$moreinpopup;
 
 		$url = '';