MMICore : Display picto when private note for customer in lists

htdocs/commande/list.php

@@ -791,6 +791,8 @@ if ($sall || $search_product_category > 0 || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
 }
 $sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.email, s.client, s.code_client,';
+// MMI : get soc private note
+$sql .= ' s.note_private soc_note_private,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " country.code as country_code,";
@@ -1880,6 +1882,8 @@ if ($resql) {
 		$companystatic->town = $obj->town;
 		$companystatic->country_code = $obj->country_code;
 		$companystatic->email = $obj->email;
+		// MMI : get soc private note
+		$companystatic->note_private = $obj->soc_note_private;
 		if (!isset($getNomUrl_cache[$obj->socid])) {
 			$getNomUrl_cache[$obj->socid] = $companystatic->getNomUrl(1, 'customer');
 		}

htdocs/compta/facture/list.php

@@ -571,6 +571,8 @@ $sql .= ' f.paye as paye, f.fk_statut, f.close_code,';
 $sql .= ' f.datec as date_creation, f.tms as date_update, f.date_closing as date_closing,';
 $sql .= ' f.retained_warranty, f.retained_warranty_date_limit, f.situation_final, f.situation_cycle_ref, f.situation_counter,';
 $sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,';
+// MMI : get soc private note
+$sql .= ' s.note_private soc_note_private,';
 $sql .= ' typent.code as typent_code,';
 $sql .= ' state.code_departement as state_code, state.nom as state_name,';
 $sql .= ' country.code as country_code,';
@@ -1802,6 +1804,8 @@ if ($resql) {
 			$companystatic->town = $obj->town;
 			$companystatic->country_code = $obj->country_code;
 			$companystatic->email = $obj->email;
+			// MMI : get soc private note
+			$companystatic->note_private = $obj->soc_note_private;
 
 			$projectstatic->id = $obj->project_id;
 			$projectstatic->ref = $obj->project_ref;

htdocs/custom/mmicommon

@@ -1 +1 @@
-Subproject commit 3a2705efdb19ced6a6725328d0b0ad44816128ca
+Subproject commit c834f7f461b6d61fd2ded6b2a6494d426f91b25a

htdocs/expedition/list.php

@@ -263,6 +263,8 @@ if ($sall || $search_product_category > 0 || $search_user > 0) {
 $sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as delivery_date, e.fk_statut, e.billed, e.tracking_number, e.fk_shipping_method,";
 $sql .= " l.date_delivery as date_reception,";
 $sql .= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ";
+// MMI : get soc private note
+$sql .= ' s.note_private soc_note_private,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " e.date_creation as date_creation, e.tms as date_update,";
@@ -826,6 +828,8 @@ while ($i < min($num, $limit)) {
 	$companystatic->id = $obj->socid;
 	$companystatic->ref = $obj->name;
 	$companystatic->name = $obj->name;
+	// MMI : get soc private note
+	$companystatic->note_private = $obj->soc_note_private;
 
 	$object = new Expedition($db);
 	$object->fetch($obj->rowid);

htdocs/societe/class/societe.class.php

@@ -2719,6 +2719,10 @@ class Societe extends CommonObject
 		if (!empty($conf->accounting->enabled) && $this->fournisseur) {
 			$label2 .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
 		}
+		// MMI : Show picto if private note
+		if (!empty($conf->global->MMICORE_SHOW_PICTO_NOTE) && !empty($this->note_private)) {
+			$label2 .= '<br><b>'.$langs->trans('NotePrivate').':</b> '.$this->note_private;
+		}
 		$label .= ($label2 ? '<br>'.$label2 : '').'</div>';
 
 		// Add type of canvas
@@ -2758,6 +2762,10 @@ class Societe extends CommonObject
 		$result .= $linkstart;
 		if ($withpicto) {
 			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+			// MMI : Show picto if private note
+			if (!empty($conf->global->MMICORE_SHOW_PICTO_NOTE) && !empty($this->note_private)) {
+				$result .= '<span class="far fa-sticky-note" style=" color: #999;"></span> ';
+			}
 		}
 		if ($withpicto != 2) {
 			$result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);

htdocs/societe/list.php

@@ -459,6 +459,8 @@ $sql .= " s.email, s.phone, s.fax, s.url, s.siren as idprof1, s.siret as idprof2
 $sql .= " s.tms as date_update, s.datec as date_creation, s.import_key,";
 $sql .= " s.code_compta, s.code_compta_fournisseur, s.parent as fk_parent,s.price_level,";
 $sql .= " s2.nom as name2,";
+// MMI : get soc private note
+$sql .= ' s.note_private soc_note_private,';
 $sql .= " typent.code as typent_code,";
 $sql .= " staff.code as staff_code,";
 $sql .= " country.code as country_code, country.label as country_label,";
@@ -1417,6 +1419,8 @@ while ($i < min($num, $limit)) {
 	$companystatic->fk_prospectlevel = $obj->fk_prospectlevel;
 	$companystatic->fk_parent = $obj->fk_parent;
 	$companystatic->entity = $obj->entity;
+	// MMI : get soc private note
+	$companystatic->note_private = $obj->soc_note_private;
 
 	print '<tr class="oddeven"';
 	if ($contextpage == 'poslist') {