alxarafe / alixar

dolibarr/dev/initdemo/updatedemo.php

Indentation +5 added lines, -5 removed lines

@@ -25,8 +25,8 @@ 
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
-	exit;
+    echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
+    exit;
 }
 
 // Global variables
@@ -53,9 +53,9 @@ 
 
 if (empty($confirm))
 {
-	print "Usage: $script_file confirm\n";
-	print "Return code: 0 if success, <>0 if error\n";
-	exit(-1);
+    print "Usage: $script_file confirm\n";
+    print "Return code: 0 if success, <>0 if error\n";
+    exit(-1);
 }
 
 

dolibarr/dev/initdata/generate-order.php

Indentation +37 added lines, -37 removed lines

@@ -113,13 +113,13 @@ 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe where client in (1, 3)";
 $resql=$db->query($sql);
 if ($resql) {
-	$num_thirdparties = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num_thirdparties) {
-		$i++;
-	    $row = $db->fetch_row($resql);
-		$societesid[$i] = $row[0];
-	}
+    $num_thirdparties = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_thirdparties) {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $societesid[$i] = $row[0];
+    }
 }
 else { print "err"; }
 
@@ -127,13 +127,13 @@ 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande";
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num) {
-		$i++;
-	    $row = $db->fetch_row($resql);
-		$commandesid[$i] = $row[0];
-	}
+    $num = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num) {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $commandesid[$i] = $row[0];
+    }
 }
 else { print "err"; }
 
@@ -142,14 +142,14 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-  $num_prods = $db->num_rows($resql);
-  $i = 0;
-  while ($i < $num_prods)
+    $num_prods = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_prods)
     {
-      $i++;
+        $i++;
 
-      $row = $db->fetch_row($resql);
-      $prodids[$i] = $row[0];
+        $row = $db->fetch_row($resql);
+        $prodids[$i] = $row[0];
     }
 }
 
@@ -183,8 +183,8 @@ 
     $db->begin();
 
     $result=$object->create($fuser);
-	if ($result >= 0)
-	{
+    if ($result >= 0)
+    {
         $nbp = mt_rand(2, 5);
         $xnbp = 0;
         while ($xnbp < $nbp)
@@ -200,24 +200,24 @@ 
             $xnbp++;
         }
 
-	    $result=$object->valid($fuser);
-		if ($result > 0)
-		{
+        $result=$object->valid($fuser);
+        if ($result > 0)
+        {
             $db->commit();
             print " OK with ref ".$object->ref."\n";
-		}
-		else
-		{
+        }
+        else
+        {
             print " KO\n";
-		    $db->rollback();
-		    dol_print_error($db,$object->error);
-		}
-	}
-	else
-	{
+            $db->rollback();
+            dol_print_error($db,$object->error);
+        }
+    }
+    else
+    {
         print " KO\n";
-	    $db->rollback();
-	    dol_print_error($db,$object->error);
-	}
+        $db->rollback();
+        dol_print_error($db,$object->error);
+    }
 }
 

dolibarr/dev/initdata/purge-data.php

Indentation +11 added lines, -11 removed lines

@@ -81,11 +81,11 @@ 
         'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposaldet',
         'DELETE FROM '.MAIN_DB_PREFIX.'supplier_proposal',
     ),
-	'supplier_order'=>array(
+    'supplier_order'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet',
         'DELETE FROM '.MAIN_DB_PREFIX.'commande_fournisseur',
     ),
-	'supplier_invoice'=>array(
+    'supplier_invoice'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det',
         'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn',
     ),
@@ -116,9 +116,9 @@ 
         'DELETE FROM '.MAIN_DB_PREFIX.'product_price',
         'DELETE FROM '.MAIN_DB_PREFIX.'product_fournisseur_price',
         'DELETE FROM '.MAIN_DB_PREFIX.'product_batch',
-    	'DELETE FROM '.MAIN_DB_PREFIX.'product_stock',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product_stock',
         'DELETE FROM '.MAIN_DB_PREFIX.'product_lot',
-    	'DELETE FROM '.MAIN_DB_PREFIX.'product',
+        'DELETE FROM '.MAIN_DB_PREFIX.'product',
     ),
     'project'=>array(
         'DELETE FROM '.MAIN_DB_PREFIX.'projet_task_time',
@@ -137,7 +137,7 @@ 
         'DELETE FROM '.MAIN_DB_PREFIX.'categorie_societe',
         'DELETE FROM '.MAIN_DB_PREFIX.'societe_remise_except',
         'DELETE FROM '.MAIN_DB_PREFIX.'societe_rib',
-    	'DELETE FROM '.MAIN_DB_PREFIX.'societe',
+        'DELETE FROM '.MAIN_DB_PREFIX.'societe',
     )
 );
 
@@ -172,18 +172,18 @@ 
 // Replace database handler
 if (! empty($argv[3]))
 {
-	$db->close();
-	unset($db);
-	$db=getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]);
-	$user=new User($db);
+    $db->close();
+    unset($db);
+    $db=getDoliDBInstance($argv[3], $argv[4], $argv[5], $argv[6], $argv[7], $argv[8]);
+    $user=new User($db);
 }
 
 //var_dump($user->db->database_name);
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'An admin user with login "admin" must exists to use this script.'."\n";
-	exit;
+    print 'An admin user with login "admin" must exists to use this script.'."\n";
+    exit;
 }
 //$user->getrights();
 

dolibarr/dev/initdata/generate-invoice.php

Indentation +55 added lines, -55 removed lines

@@ -26,8 +26,8 @@ 
 // Test si mode batch
 $sapi_type = php_sapi_name();
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
-	exit;
+    echo "Erreur: Vous utilisez l'interpreteur PHP pour le mode CGI. Pour executer mailing-send.php en ligne de commande, vous devez utiliser l'interpreteur PHP pour le mode CLI.\n";
+    exit;
 }
 
 // Recupere root dolibarr
@@ -98,8 +98,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -109,14 +109,14 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num_thirdparties = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num_thirdparties)
-	{
-		$i++;
-		$row = $db->fetch_row($resql);
-		$socids[$i] = $row[0];
-	}
+    $num_thirdparties = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_thirdparties)
+    {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $socids[$i] = $row[0];
+    }
 }
 
 $prodids = array();
@@ -124,65 +124,65 @@ 
 $resql = $db->query($sql);
 if ($resql)
 {
-	$num_prods = $db->num_rows($resql);
-	$i = 0;
-	while ($i < $num_prods)
-	{
-		$i++;
-		$row = $db->fetch_row($resql);
-		$prodids[$i] = $row[0];
-	}
+    $num_prods = $db->num_rows($resql);
+    $i = 0;
+    while ($i < $num_prods)
+    {
+        $i++;
+        $row = $db->fetch_row($resql);
+        $prodids[$i] = $row[0];
+    }
 }
 
 $i=0;
 $result=0;
 while ($i < GEN_NUMBER_FACTURE && $result >= 0)
 {
-	$i++;
-	$socid = mt_rand(1, $num_thirdparties);
+    $i++;
+    $socid = mt_rand(1, $num_thirdparties);
 
-	print "Invoice ".$i." for socid ".$socid;
+    print "Invoice ".$i." for socid ".$socid;
 
-	$object = new Facture($db);
-	$object->socid = $socids[$socid];
-	$object->date = $dates[mt_rand(1, count($dates)-1)];
-	$object->cond_reglement_id = 3;
-	$object->mode_reglement_id = 3;
+    $object = new Facture($db);
+    $object->socid = $socids[$socid];
+    $object->date = $dates[mt_rand(1, count($dates)-1)];
+    $object->cond_reglement_id = 3;
+    $object->mode_reglement_id = 3;
 
     $fuser = new User($db);
     $fuser->fetch(mt_rand(1,2));
     $fuser->getRights();
     
-	$result=$object->create($fuser);
-	if ($result >= 0)
-	{
-		$nbp = mt_rand(2, 5);
-		$xnbp = 0;
-		while ($xnbp < $nbp)
-		{
-			$prodid = mt_rand(1, $num_prods);
-			$product=new Product($db);
-			$result=$product->fetch($prodids[$prodid]);
-			$result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
-		    if ($result < 0)
+    $result=$object->create($fuser);
+    if ($result >= 0)
+    {
+        $nbp = mt_rand(2, 5);
+        $xnbp = 0;
+        while ($xnbp < $nbp)
+        {
+            $prodid = mt_rand(1, $num_prods);
+            $product=new Product($db);
+            $result=$product->fetch($prodids[$prodid]);
+            $result=$object->addline($product->description, $product->price, mt_rand(1,5), 0, 0, 0, $prodids[$prodid], 0, '', '', 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type);
+            if ($result < 0)
             {
                 dol_print_error($db,$propal->error);
             }
             $xnbp++;
-		}
+        }
 
-	    $result=$object->validate($fuser);
-		if ($result)
-		{
-			print " OK with ref ".$object->ref."\n";;
-		}
-		else
-		{
-			dol_print_error($db,$object->error);
-		}
-	}
-	else
-	{
-		dol_print_error($db,$object->error);
-	}
+        $result=$object->validate($fuser);
+        if ($result)
+        {
+            print " OK with ref ".$object->ref."\n";;
+        }
+        else
+        {
+            dol_print_error($db,$object->error);
+        }
+    }
+    else
+    {
+        dol_print_error($db,$object->error);
+    }
 }

dolibarr/dev/initdata/generate-thirdparty.php

Indentation +9 added lines, -9 removed lines

@@ -55,8 +55,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -64,21 +64,21 @@ 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
 $resql=$db->query($sql);
 if ($resql) {
-  $num = $db->num_rows($resql); $i = 0;
-  while ($i < $num) {      $row = $db->fetch_row($resql);      $productsid[$i] = $row[0];      $i++; }
+    $num = $db->num_rows($resql); $i = 0;
+    while ($i < $num) {      $row = $db->fetch_row($resql);      $productsid[$i] = $row[0];      $i++; }
 }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+    $num = $db->num_rows($resql); $i = 0;
     while ($i < $num) { $row = $db->fetch_row($resql);      $societesid[$i] = $row[0];      $i++; }
 } else { print "err"; }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+    $num = $db->num_rows($resql); $i = 0;
     while ($i < $num) { $row = $db->fetch_row($resql);      $commandesid[$i] = $row[0];      $i++; }
 } else { print "err"; }
 
@@ -98,9 +98,9 @@ 
     $soc->tva_assuj=1;
     $soc->country_id=1;
     $soc->country_code='FR';
-	// Un client sur 3 a une remise de 5%
+    // Un client sur 3 a une remise de 5%
     $user_remise=mt_rand(1,3); if ($user_remise==3) $soc->remise_percent=5;
-	print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
+    print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n";
     $soc->note_private = 'Company created by the script generate-societe.php';
     $socid = $soc->create();
 
@@ -124,7 +124,7 @@ 
     }
     else
     {
-    	print "Error: ".$soc->error."\n";
+        print "Error: ".$soc->error."\n";
     }
 }
 

dolibarr/dev/initdata/import-thirdparties.php

Indentation +94 added lines, -94 removed lines

@@ -81,8 +81,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -182,116 +182,116 @@ 
             print " - Error in create result code = ".$ret." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
-    	    print " - Creation OK with name ".$object->name." - id = ".$ret;
-    	}
+        else
+        {
+            print " - Creation OK with name ".$object->name." - id = ".$ret;
+        }
     }
 
     if (! $errorrecord)
     {
         dol_syslog("Set price level");
-	    $object->set_price_level($object->price_level, $user);
+        $object->set_price_level($object->price_level, $user);
+    }
+
+    // Assign sales representative
+    if (! $errorrecord && $fields[3])
+    {
+        $salesrep=new User($db);
+
+        $tmp=explode(' ',$fields[3],2);
+        $salesrep->firstname = trim($tmp[0]);
+        $salesrep->lastname = trim($tmp[1]);
+        if ($salesrep->lastname) $salesrep->login = strtolower(substr($salesrep->firstname, 0, 1)) . strtolower(substr($salesrep->lastname, 0));
+        else $salesrep->login=strtolower($salesrep->firstname);
+        $salesrep->login=preg_replace('/ /','',$salesrep->login);
+        $salesrep->fetch(0,$salesrep->login);
+
+        $result = $object->add_commercial($user, $salesrep->id);
+        if ($result < 0)
+        {
+            print " - Error in create link with sale representative result code = ".$result." - ".$object->errorsToString();
+            $errorrecord++;
+        }
+        else
+        {
+            print " - create link sale representative OK";
+        }
     }
 
-	// Assign sales representative
-	if (! $errorrecord && $fields[3])
-	{
-    	$salesrep=new User($db);
-
-    	$tmp=explode(' ',$fields[3],2);
-    	$salesrep->firstname = trim($tmp[0]);
-    	$salesrep->lastname = trim($tmp[1]);
-    	if ($salesrep->lastname) $salesrep->login = strtolower(substr($salesrep->firstname, 0, 1)) . strtolower(substr($salesrep->lastname, 0));
-    	else $salesrep->login=strtolower($salesrep->firstname);
-    	$salesrep->login=preg_replace('/ /','',$salesrep->login);
-    	$salesrep->fetch(0,$salesrep->login);
-
-    	$result = $object->add_commercial($user, $salesrep->id);
-    	if ($result < 0)
-    	{
-    	    print " - Error in create link with sale representative result code = ".$result." - ".$object->errorsToString();
-    	    $errorrecord++;
-    	}
-    	else
-    	{
-    	    print " - create link sale representative OK";
-    	}
-	}
-
-	dol_syslog("Add invoice contacts");
-	// Insert an invoice contact if there is an invoice email != standard email
-	if (! $errorrecord && $fields[27] && $fields[26] != $fields[27])
-	{
-	    $ret1=$ret2=0;
-
-	    $contact = new Contact($db);
-	    $contact->lastname = $object->name;
-	    $contact->address=$object->address;
-	    $contact->zip=$object->zip;
-	    $contact->town=$object->town;
-	    $contact->country_id=$object->country_id;
-	    $contact->email=$fields[27];
-	    $contact->socid=$object->id;
-
-	    $ret1=$contact->create($user);
-	    if ($ret1 > 0)
-	    {
-	        //$ret2=$contact->add_contact($object->id, 'BILLING');
-	    }
-	    if ($ret1 < 0 || $ret2 < 0)
+    dol_syslog("Add invoice contacts");
+    // Insert an invoice contact if there is an invoice email != standard email
+    if (! $errorrecord && $fields[27] && $fields[26] != $fields[27])
+    {
+        $ret1=$ret2=0;
+
+        $contact = new Contact($db);
+        $contact->lastname = $object->name;
+        $contact->address=$object->address;
+        $contact->zip=$object->zip;
+        $contact->town=$object->town;
+        $contact->country_id=$object->country_id;
+        $contact->email=$fields[27];
+        $contact->socid=$object->id;
+
+        $ret1=$contact->create($user);
+        if ($ret1 > 0)
+        {
+            //$ret2=$contact->add_contact($object->id, 'BILLING');
+        }
+        if ($ret1 < 0 || $ret2 < 0)
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
-    	    print " - create contact OK";
-    	}
-	}
-
-	dol_syslog("Add delivery contacts");
-	// Insert a delivery contact
-	if (! $errorrecord && $fields[47])
-	{
-	    $ret1=$ret2=0;
-
-	    $contact2 = new Contact($db);
-	    $contact2->lastname = 'Service livraison - '.$fields[47];
-	    $contact2->address = $fields[48];
-	    $contact2->zip = $fields[50];
-	    $contact2->town = $fields[51];
-	    $contact2->country_id=dol_getIdFromCode($db, trim($fields[52]), 'c_country', 'code', 'rowid');
-	    $contact2->note_public=$fields[54];
-	    $contact2->socid=$object->id;
-
-	    // Extrafields
-	    $contact2->array_options['options_anazoneliv']=price2num($fields[53]);
-
-	    $ret1=$contact2->create($user);
-	    if ($ret1 > 0)
-	    {
-	        //$ret2=$contact2->add_contact($object->id, 'SHIPPING');
-	    }
-	    if ($ret1 < 0 || $ret2 < 0)
+        else
+        {
+            print " - create contact OK";
+        }
+    }
+
+    dol_syslog("Add delivery contacts");
+    // Insert a delivery contact
+    if (! $errorrecord && $fields[47])
+    {
+        $ret1=$ret2=0;
+
+        $contact2 = new Contact($db);
+        $contact2->lastname = 'Service livraison - '.$fields[47];
+        $contact2->address = $fields[48];
+        $contact2->zip = $fields[50];
+        $contact2->town = $fields[51];
+        $contact2->country_id=dol_getIdFromCode($db, trim($fields[52]), 'c_country', 'code', 'rowid');
+        $contact2->note_public=$fields[54];
+        $contact2->socid=$object->id;
+
+        // Extrafields
+        $contact2->array_options['options_anazoneliv']=price2num($fields[53]);
+
+        $ret1=$contact2->create($user);
+        if ($ret1 > 0)
+        {
+            //$ret2=$contact2->add_contact($object->id, 'SHIPPING');
+        }
+        if ($ret1 < 0 || $ret2 < 0)
         {
             print " - Error in create contact result code = ".$ret1." ".$ret2." - ".$object->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
-    	    print " - create contact OK";
-    	}
-	}
+        else
+        {
+            print " - create contact OK";
+        }
+    }
 
 
-	print "\n";
+    print "\n";
 
-	if ($errorrecord)
-	{
-	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
-	    $error++;    // $errorrecord will be reset
-	}
+    if ($errorrecord)
+    {
+        fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
+        $error++;    // $errorrecord will be reset
+    }
 }
 
 

dolibarr/dev/initdata/import-users.php

Indentation +14 added lines, -14 removed lines

@@ -81,8 +81,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -143,18 +143,18 @@ 
         print " - Error in create result code = ".$ret." - ".$object->errorsToString();
         $errorrecord++;
     }
-	else
-	{
-	    print " - Creation OK with login ".$object->login." - id = ".$ret;
-	}
-
-	print "\n";
-
-	if ($errorrecord)
-	{
-	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
-	    $error++;    // $errorrecord will be reset
-	}
+    else
+    {
+        print " - Creation OK with login ".$object->login." - id = ".$ret;
+    }
+
+    print "\n";
+
+    if ($errorrecord)
+    {
+        fwrite($fhandleerr, 'Error on record nb '.$i." - ".$object->errorsToString()."\n");
+        $error++;    // $errorrecord will be reset
+    }
 }
 
 

dolibarr/dev/initdata/import-products.php

Indentation +37 added lines, -37 removed lines

@@ -81,8 +81,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -164,56 +164,56 @@ 
         print " - Error in create result code = ".$ret." - ".$produit->errorsToString();
         $errorrecord++;
     }
-	else
-	{
-	    print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
-	}
+    else
+    {
+        print " - Creation OK with ref ".$produit->ref." - id = ".$ret;
+    }
 
-	dol_syslog("Add prices");
+    dol_syslog("Add prices");
 
     // If we use price level, insert price for each level
-	if (! $errorrecord && 1)
-	{
-	    $ret1=$produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
-	    $ret2=$produit->updatePrice(price2num($fields[14]), 'HT', $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
-	    if ($ret1 < 0 || $ret2 < 0)
+    if (! $errorrecord && 1)
+    {
+        $ret1=$produit->updatePrice($produit->price_ttc, $produit->price_base_type, $user, $produit->tva_tx, $produit->price_min, 1, $produit->tva_npr, 0, 0, array());
+        $ret2=$produit->updatePrice(price2num($fields[14]), 'HT', $user, $produit->tva_tx, $produit->price_min, 2, $produit->tva_npr, 0, 0, array());
+        if ($ret1 < 0 || $ret2 < 0)
         {
             print " - Error in updatePrice result code = ".$ret1." ".$ret2." - ".$produit->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
-    	    print " - updatePrice OK";
-    	}
-	}
+        else
+        {
+            print " - updatePrice OK";
+        }
+    }
 
-	dol_syslog("Add multilangs");
+    dol_syslog("Add multilangs");
 
-	// Add alternative languages
-	if (! $errorrecord && 1)
-	{
-    	$produit->multilangs['fr_FR']=array('label'=>$produit->label, 'description'=>$produit->description, 'note'=>$produit->note_private);
-	    $produit->multilangs['en_US']=array('label'=>$fields[3], 'description'=>$produit->description, 'note'=>$produit->note_private);
+    // Add alternative languages
+    if (! $errorrecord && 1)
+    {
+        $produit->multilangs['fr_FR']=array('label'=>$produit->label, 'description'=>$produit->description, 'note'=>$produit->note_private);
+        $produit->multilangs['en_US']=array('label'=>$fields[3], 'description'=>$produit->description, 'note'=>$produit->note_private);
 
-    	$ret=$produit->setMultiLangs($user);
+        $ret=$produit->setMultiLangs($user);
         if ($ret < 0)
         {
             print " - Error in setMultiLangs result code = ".$ret." - ".$produit->errorsToString();
             $errorrecord++;
         }
-    	else
-    	{
-    	    print " - setMultiLangs OK";
-    	}
-	}
-
-	print "\n";
-
-	if ($errorrecord)
-	{
-	    fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
-	    $error++;    // $errorrecord will be reset
-	}
+        else
+        {
+            print " - setMultiLangs OK";
+        }
+    }
+
+    print "\n";
+
+    if ($errorrecord)
+    {
+        fwrite($fhandleerr, 'Error on record nb '.$i." - ".$produit->errorsToString()."\n");
+        $error++;    // $errorrecord will be reset
+    }
 }
 
 

dolibarr/dev/initdata/generate-product.php

Indentation +7 added lines, -7 removed lines

@@ -52,8 +52,8 @@ 
 $ret=$user->fetch('','admin');
 if (! $ret > 0)
 {
-	print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
-	exit;
+    print 'A user with login "admin" and all permissions must be created to use this script.'."\n";
+    exit;
 }
 $user->getrights();
 
@@ -61,21 +61,21 @@ 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product"; $productsid = array();
 $resql=$db->query($sql);
 if ($resql) {
-  $num = $db->num_rows($resql); $i = 0;
-  while ($i < $num) {      $row = $db->fetch_row($resql);      $productsid[$i] = $row[0];      $i++; }
+    $num = $db->num_rows($resql); $i = 0;
+    while ($i < $num) {      $row = $db->fetch_row($resql);      $productsid[$i] = $row[0];      $i++; }
 }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; $societesid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+    $num = $db->num_rows($resql); $i = 0;
     while ($i < $num) { $row = $db->fetch_row($resql);      $societesid[$i] = $row[0];      $i++; }
 } else { print "err"; }
 
 $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande"; $commandesid = array();
 $resql=$db->query($sql);
 if ($resql) {
-	$num = $db->num_rows($resql); $i = 0;
+    $num = $db->num_rows($resql); $i = 0;
     while ($i < $num) { $row = $db->fetch_row($resql);      $commandesid[$i] = $row[0];      $i++; }
 } else { print "err"; }
 
@@ -94,7 +94,7 @@ 
     $produit->tva_tx = "19.6";
     $ret=$produit->create($user);
     if ($ret < 0) print "Error $ret - ".$produit->error."\n";
-	else print " OK with ref ".$produit->ref."\n";
+    else print " OK with ref ".$produit->ref."\n";
 }