hook fix

htdocs/barcode/codeinit.php

@@ -35,7 +35,8 @@ $month = dol_print_date($now, '%m');
 $day = dol_print_date($now, '%d');
 $forbarcode = GETPOST('forbarcode');
 $fk_barcode_type = GETPOST('fk_barcode_type');
-$eraseallbarcode = GETPOST('eraseallbarcode');
+$eraseallproductbarcode = GETPOST('eraseallproductbarcode');
+$eraseallthirdpartybarcode = GETPOST('eraseallthirdpartybarcode');
 
 $action = GETPOST('action', 'aZ09');
 
@@ -43,6 +44,7 @@ $producttmp = new Product($db);
 $thirdpartytmp = new Societe($db);
 
 $modBarCodeProduct = '';
+$modBarCodeThirdparty = '';
 
 $maxperinit = 1000;
 
@@ -51,6 +53,106 @@ $maxperinit = 1000;
  * Actions
  */
 
+// Define barcode template for third-party
+if (!empty($conf->global->BARCODE_THIRDPARTY_ADDON_NUM)) {
+	$dirbarcodenum = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
+
+	foreach ($dirbarcodenum as $dirroot) {
+		$dir = dol_buildpath($dirroot, 0);
+
+		$handle = @opendir($dir);
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (preg_match('/^mod_barcode_thirdparty_.*php$/', $file)) {
+					$file = substr($file, 0, dol_strlen($file) - 4);
+
+					try {
+						dol_include_once($dirroot.$file.'.php');
+					} catch (Exception $e) {
+						dol_syslog($e->getMessage(), LOG_ERR);
+					}
+
+					$modBarCodeThirdparty = new $file();
+					break;
+				}
+			}
+			closedir($handle);
+		}
+	}
+}
+
+if ($action == 'initbarcodethirdparties') {
+	if (!is_object($modBarCodeThirdparty)) {
+		$error++;
+		setEventMessages($langs->trans("NoBarcodeNumberingTemplateDefined"), null, 'errors');
+	}
+
+	if (!$error) {
+		$thirdpartystatic = new Societe($db);
+
+		$db->begin();
+
+		$nbok = 0;
+		if (!empty($eraseallthirdpartybarcode)) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+			$sql .= " SET barcode = NULL";
+			$resql = $db->query($sql);
+			if ($resql) {
+				setEventMessages($langs->trans("AllBarcodeReset"), null, 'mesgs');
+			} else {
+				$error++;
+				dol_print_error($db);
+			}
+		} else {
+			$sql = "SELECT rowid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+			$sql .= " WHERE barcode IS NULL or barcode = ''";
+			$sql .= $db->order("datec", "ASC");
+			$sql .= $db->plimit($maxperinit);
+
+			dol_syslog("codeinit", LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql) {
+				$num = $db->num_rows($resql);
+
+				$i = 0; $nbok = $nbtry = 0;
+				while ($i < min($num, $maxperinit)) {
+					$obj = $db->fetch_object($resql);
+					if ($obj) {
+						$thirdpartystatic->id = $obj->rowid;
+						$nextvalue = $modBarCodeThirdparty->getNextValue($thirdpartystatic, '');
+
+						$result = $thirdpartystatic->setValueFrom('barcode', $nextvalue, '', '', 'text', '', $user, 'THIRDPARTY_MODIFY');
+
+						$nbtry++;
+						if ($result > 0) {
+							$nbok++;
+						}
+					}
+
+					$i++;
+				}
+			} else {
+				$error++;
+				dol_print_error($db);
+			}
+
+			if (!$error) {
+				setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			}
+		}
+
+		if (!$error) {
+			//$db->rollback();
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
+
+	$action = '';
+}
+
 // Define barcode template for products
 if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
 	$dirbarcodenum = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
@@ -91,7 +193,7 @@ if ($action == 'initbarcodeproducts') {
 		$db->begin();
 
 		$nbok = 0;
-		if (!empty($eraseallbarcode)) {
+		if (!empty($eraseallproductbarcode)) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."product";
 			$sql .= " SET barcode = NULL";
 			$resql = $db->query($sql);
@@ -155,7 +257,6 @@ if ($action == 'initbarcodeproducts') {
 }
 
 
-
 /*
  * View
  */
@@ -189,7 +290,11 @@ print '<br>';
 
 // For thirdparty
 if (isModEnabled('societe')) {
-	$nbno = $nbtotal = 0;
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="mode" value="label">';
+	print '<input type="hidden" name="action" value="initbarcodethirdparties">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	$nbthirdpartyno = $nbthirdpartytotal = 0;
 
 	print load_fiche_titre($langs->trans("BarcodeInitForThirdparties"), '', 'company');
 
@@ -198,7 +303,7 @@ if (isModEnabled('societe')) {
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		$nbno = $obj->nb;
+		$nbthirdpartyno = $obj->nb;
 	} else {
 		dol_print_error($db);
 	}
@@ -207,22 +312,46 @@ if (isModEnabled('societe')) {
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		$nbtotal = $obj->nb;
+		$nbthirdpartytotal = $obj->nb;
 	} else {
 		dol_print_error($db);
 	}
 
-	print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ThirdParties")).'<br>'."\n";
+	print $langs->trans("CurrentlyNWithoutBarCode", $nbthirdpartyno, $nbthirdpartytotal, $langs->transnoentitiesnoconv("ThirdParties")).'<br>'."\n";
 
-	print '<br><input class="button button-add" type="submit" id="submitformbarcodethirdpartygen" '.((GETPOST("selectorforbarcode") && GETPOST("selectorforbarcode")) ? '' : 'disabled ').'value="'.$langs->trans("InitEmptyBarCode", $nbno).'"';
+	$disabledthirdparty = $disabledthirdparty1 = 0;
-	print ' title="'.dol_escape_htmltag($langs->trans("FeatureNotYetAvailable")).'" disabled';
+
-	print '>';
+	if (is_object($modBarCodeThirdparty)) {
+		print $langs->trans("BarCodeNumberManager").": ";
+		$objthirdparty = new Societe($db);
+		print '<b>'.(isset($modBarCodeThirdparty->name) ? $modBarCodeThirdparty->name : $modBarCodeThirdparty->nom).'</b> - '.$langs->trans("NextValue").': <b>'.$modBarCodeThirdparty->getNextValue($objthirdparty).'</b><br>';
+		$disabledthirdparty = 0;
+	} else {
+		$disabledthirdparty = 1;
+		$titleno = $langs->trans("NoBarcodeNumberingTemplateDefined");
+		print '<span class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</span> (<a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>)<br>';
+	}
+	if (empty($nbthirdpartyno)) {
+		$disabledthirdparty1 = 1;
+	}
+
+	$moretagsthirdparty1 = (($disabledthirdparty || $disabledthirdparty1) ? ' disabled title="'.dol_escape_htmltag($titleno).'"' : '');
+	print '<br><input class="button button-add" type="submit" id="submitformbarcodethirdpartygen" value="'.$langs->trans("InitEmptyBarCode", $nbno).'"'.$moretagsthirdparty1.'>';
+	$moretagsthirdparty2 = (($nbthirdpartyno == $nbthirdpartytotal) ? ' disabled' : '');
+	print ' &nbsp; ';
+	print '<input type="submit" class="button butActionDelete" name="eraseallthirdpartybarcode" id="eraseallthirdpartybarcode" value="'.$langs->trans("EraseAllCurrentBarCode").'"'.$moretagsthirdparty2.' onClick="return confirm_erase();">';
 	print '<br><br><br><br>';
+	print '</form>';
 }
 
 
 // For products
 if ($conf->product->enabled || $conf->product->service) {
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="mode" value="label">';
+	print '<input type="hidden" name="action" value="initbarcodeproducts">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+
 	// Example 1 : Adding jquery code
 	print '<script type="text/javascript">
 	function confirm_erase() {
@@ -230,7 +359,7 @@ if ($conf->product->enabled || $conf->product->service) {
 	}
 	</script>';
 
-	$nbno = $nbtotal = 0;
+	$nbproductno = $nbproducttotal = 0;
 
 	print load_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"), '', 'product');
 	print '<br>'."\n";
@@ -247,7 +376,7 @@ if ($conf->product->enabled || $conf->product->service) {
 		$i = 0;
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
-			$nbno += $obj->nb;
+			$nbproductno += $obj->nb;
 
 			$i++;
 		}
@@ -259,35 +388,38 @@ if ($conf->product->enabled || $conf->product->service) {
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		$nbtotal = $obj->nb;
+		$nbproducttotal = $obj->nb;
 	} else {
 		dol_print_error($db);
 	}
 
-	print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ProductsOrServices")).'<br>'."\n";
+	print $langs->trans("CurrentlyNWithoutBarCode", $nbproductno, $nbproducttotal, $langs->transnoentitiesnoconv("ProductsOrServices")).'<br>'."\n";
+
+	$disabledproduct = $disabledproduct1 = 0;
 
 	if (is_object($modBarCodeProduct)) {
 		print $langs->trans("BarCodeNumberManager").": ";
 		$objproduct = new Product($db);
 		print '<b>'.(isset($modBarCodeProduct->name) ? $modBarCodeProduct->name : $modBarCodeProduct->nom).'</b> - '.$langs->trans("NextValue").': <b>'.$modBarCodeProduct->getNextValue($objproduct).'</b><br>';
-		$disabled = 0;
+		$disabledproduct = 0;
 	} else {
-		$disabled = 1;
+		$disabledproduct = 1;
 		$titleno = $langs->trans("NoBarcodeNumberingTemplateDefined");
 		print '<span class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</span> (<a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>)<br>';
 	}
-	if (empty($nbno)) {
+	if (empty($nbproductno)) {
-		$disabled1 = 1;
+		$disabledproduct1 = 1;
 	}
 
 	print '<br>';
 	//print '<input type="checkbox" id="erasealreadyset" name="erasealreadyset"> '.$langs->trans("ResetBarcodeForAllRecords").'<br>';
-	$moretags1 = (($disabled || $disabled1) ? ' disabled title="'.dol_escape_htmltag($titleno).'"' : '');
+	$moretagsproduct1 = (($disabledproduct || $disabledproduct1) ? ' disabled title="'.dol_escape_htmltag($titleno).'"' : '');
-	print '<input type="submit" class="button" name="submitformbarcodeproductgen" id="submitformbarcodeproductgen" value="'.$langs->trans("InitEmptyBarCode", min($maxperinit, $nbno)).'"'.$moretags1.'>';
+	print '<input type="submit" class="button" name="submitformbarcodeproductgen" id="submitformbarcodeproductgen" value="'.$langs->trans("InitEmptyBarCode", min($maxperinit, $nbno)).'"'.$moretagsproduct1.'>';
-	$moretags2 = (($nbno == $nbtotal) ? ' disabled' : '');
+	$moretagsproduct2 = (($nbproductno == $nbproducttotal) ? ' disabled' : '');
 	print ' &nbsp; ';
-	print '<input type="submit" class="button butActionDelete" name="eraseallbarcode" id="eraseallbarcode" value="'.$langs->trans("EraseAllCurrentBarCode").'"'.$moretags2.' onClick="return confirm_erase();">';
+	print '<input type="submit" class="button butActionDelete" name="eraseallproductbarcode" id="eraseallproductbarcode" value="'.$langs->trans("EraseAllCurrentBarCode").'"'.$moretagsproduct2.' onClick="return confirm_erase();">';
 	print '<br><br><br><br>';
+	print '</form>';
 }
 
 
@@ -297,7 +429,6 @@ print $langs->trans("ClickHereToGoTo").' : <a href="'.DOL_URL_ROOT.'/barcode/pri
 
 
 
-print '</form>';
 print '<br>';
 
 // End of page

htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php

@@ -1,5 +1,9 @@
 <?php
-/* Copyright (C) 2022      Faustin Boitel <fboitel@enseirb-matmeca.fr>
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2022      Faustin Boitel <fboitel@enseirb-matmeca.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by