Dolibarr / dolibarr

htdocs/fourn/class/fournisseur.commande.class.php

Spacing +23 added lines, -23 removed lines

@@ -554,7 +554,7 @@ 
 			$this->thirdparty = null; // Clear if another value was already set by fetch_thirdparty
 
 			$this->fourn_id = $obj->fk_soc;
-			$this->statut = $obj->status;	// deprecated
+			$this->statut = $obj->status; // deprecated
 			$this->status = $obj->status;
 			$this->billed = $obj->billed;
 			$this->last_main_doc = $obj->last_main_doc;
@@ -687,9 +687,9 @@ 
 				$line->localtax1_type	   = $objp->localtax1_type;
 				$line->localtax2_type	   = $objp->localtax2_type;
 				$line->subprice            = $objp->subprice;
-				$line->pu_ht 			   = $objp->subprice;	// deprecated
+				$line->pu_ht = $objp->subprice; // deprecated
 				$line->subprice_ttc        = $objp->subprice_ttc;
-				$line->pu_ttc 			   = $objp->subprice_ttc;	// deprecated
+				$line->pu_ttc = $objp->subprice_ttc; // deprecated
 				$line->remise_percent      = $objp->remise_percent;
 
 				$line->vat_src_code        = $objp->vat_src_code;
@@ -722,10 +722,10 @@ 
 					$sqlsearchpackage .= ' WHERE entity IN ('.getEntity('productsupplierprice').")";
 					$sqlsearchpackage .= " AND fk_product = ".((int) $objp->fk_product);
 					$sqlsearchpackage .= " AND ref_fourn = '".$this->db->escape($objp->ref_supplier)."'";
-					$sqlsearchpackage .= " AND quantity <= ".((float) $objp->qty);	// required to be qualified
-					$sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= ".((float) $objp->qty).")";	// required to be qualified
+					$sqlsearchpackage .= " AND quantity <= ".((float) $objp->qty); // required to be qualified
+					$sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= ".((float) $objp->qty).")"; // required to be qualified
 					$sqlsearchpackage .= " AND fk_soc = ".((int) $this->socid);
-					$sqlsearchpackage .= " ORDER BY packaging ASC";		// Take the smaller package first
+					$sqlsearchpackage .= " ORDER BY packaging ASC"; // Take the smaller package first
 					$sqlsearchpackage .= " LIMIT 1";
 
 					$resqlsearchpackage = $this->db->query($sqlsearchpackage);
@@ -756,7 +756,7 @@ 
 				$line->multicurrency_total_tva = $objp->multicurrency_total_tva;
 				$line->multicurrency_total_ttc = $objp->multicurrency_total_ttc;
 
-				$line->info_bits      	   = $objp->info_bits;
+				$line->info_bits = $objp->info_bits;
 				$line->special_code        = $objp->special_code;
 				$line->fk_parent_line      = $objp->fk_parent_line;
 
@@ -887,7 +887,7 @@ 
 			if (!$error) {
 				$result = 1;
 				$this->status = self::STATUS_VALIDATED;
-				$this->statut = self::STATUS_VALIDATED;	// deprecated
+				$this->statut = self::STATUS_VALIDATED; // deprecated
 				$this->ref = $num;
 			}
 
@@ -1130,7 +1130,7 @@ 
 		}
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
@@ -1625,7 +1625,7 @@ 
 		$this->entity = setEntity($this);
 
 		// We set order into draft status
-		$this->statut = self::STATUS_DRAFT;	// deprecated
+		$this->statut = self::STATUS_DRAFT; // deprecated
 		$this->status = self::STATUS_DRAFT;
 
 		$sql = "INSERT INTO ".$this->db->prefix()."commande_fournisseur (";
@@ -1666,7 +1666,7 @@ 
 		$sql .= ", ".((int) $this->source);
 		$sql .= ", '".$this->db->escape(getDolGlobalString('COMMANDE_SUPPLIER_ADDON_PDF'))."'";
 		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'null');
-		$sql .= ", ".(!empty($this->deposit_percent) ? "'" . $this->db->escape($this->deposit_percent) . "'" : "null");
+		$sql .= ", ".(!empty($this->deposit_percent) ? "'".$this->db->escape($this->deposit_percent)."'" : "null");
 		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'null');
 		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
 		$sql .= ", ".(int) $this->fk_incoterms;
@@ -1702,7 +1702,7 @@ 
 						$line->localtax2_tx,
 						$line->fk_product,
 						0,
-						$line->ref_supplier ? $line->ref_supplier : $line->ref_fourn, 			// $line->ref_fourn comes from field ref into table of lines. Value may be a ref that does not exists anymore, so we first try with value of product
+						$line->ref_supplier ? $line->ref_supplier : $line->ref_fourn, // $line->ref_fourn comes from field ref into table of lines. Value may be a ref that does not exists anymore, so we first try with value of product
 						$line->remise_percent,
 						'HT',
 						0,
@@ -1713,10 +1713,10 @@ 
 						$line->date_end,
 						$line->array_options,
 						$line->fk_unit,
-						$line->multicurrency_subprice,  // pu_ht_devise
-						$line->origin,     // origin
-						$line->origin_id,  // origin_id
-						$line->rang,       // rang
+						$line->multicurrency_subprice, // pu_ht_devise
+						$line->origin, // origin
+						$line->origin_id, // origin_id
+						$line->rang, // rang
 						$line->special_code
 					);
 					if ($result < 0) {
@@ -1935,7 +1935,7 @@ 
 			if ($objsoc->fetch($socid) > 0) {
 				$this->socid = $objsoc->id;
 				$this->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-				$this->deposit_percent		= (!empty($objsoc->deposit_percent) ? $objsoc->deposit_percent : 0);
+				$this->deposit_percent = (!empty($objsoc->deposit_percent) ? $objsoc->deposit_percent : 0);
 				$this->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
 				$this->fk_project = 0;
 				$this->fk_delivery_address = 0;
@@ -2091,7 +2091,7 @@ 
 			$this->db->begin();
 
 			$product_type = $type;
-			$label = '';	// deprecated
+			$label = ''; // deprecated
 
 			if ($fk_product > 0) {
 				if (getDolGlobalInt('SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY') == 1) {	// Not the common case
@@ -2153,7 +2153,7 @@ 
 					if ($qty < $prod->packaging) {
 						$qty = (float) $prod->packaging;
 					} else {
-						if (!empty($prod->packaging) && (fmod((float) $qty, (float) $prod->packaging)  > 0.000001)) {
+						if (!empty($prod->packaging) && (fmod((float) $qty, (float) $prod->packaging) > 0.000001)) {
 							$coeff = intval((float) $qty / $prod->packaging) + 1;
 							$qty = (float) $prod->packaging * $coeff;
 							setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
@@ -2246,8 +2246,8 @@ 
 			// Multicurrency
 			$this->line->fk_multicurrency = $this->fk_multicurrency;
 			$this->line->multicurrency_code = $this->multicurrency_code;
-			$this->line->multicurrency_subprice	= (float) $pu_ht_devise;
-			$this->line->multicurrency_total_ht 	= (float) $multicurrency_total_ht;
+			$this->line->multicurrency_subprice = (float) $pu_ht_devise;
+			$this->line->multicurrency_total_ht = (float) $multicurrency_total_ht;
 			$this->line->multicurrency_total_tva 	= (float) $multicurrency_total_tva;
 			$this->line->multicurrency_total_ttc 	= (float) $multicurrency_total_ttc;
 
@@ -3336,7 +3336,7 @@ 
 		$this->status = 0;
 
 		// Lines
-		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5);	// We can force the nb of lines to test from command line (but not more than 1000)
+		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5); // We can force the nb of lines to test from command line (but not more than 1000)
 		$xnbp = 0;
 		while ($xnbp < $nbp) {
 			$line = new CommandeFournisseurLigne($this->db);
@@ -3563,7 +3563,7 @@ 
 		global $langs;
 
 		if (!dol_strlen($modele)) {
-			$modele = '';	// No doc template/generation by default
+			$modele = ''; // No doc template/generation by default
 
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;

test/phpunit/CommandeFournisseurTest.php

Spacing +21 added lines, -21 removed lines

@@ -25,7 +25,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -58,7 +58,7 @@ 
 	 */
 	public function testCommandeFournisseurCreate()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -83,7 +83,7 @@ 
 		// TODO
 
 		// Create 1 supplier price with min qty = 10;
-		$result = $product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity);    // This insert record with no value for price. Values are update later with update_buyprice
+		$result = $product->add_fournisseur($user, $societe->id, $ref_fourn, $quantity); // This insert record with no value for price. Values are update later with update_buyprice
 		print __METHOD__." add_fournisseur result=".$result."\n";
 		$this->assertGreaterThanOrEqual(0, $result, 'Create 1 supplier price with min qty = 10 if not exists');
 		$result = $product->update_buyprice($quantity, 20, $user, 'HT', $societe, '', $ref_fourn, $tva_tx, 0, 0);
@@ -96,10 +96,10 @@ 
 		$localobject = new CommandeFournisseur($db);
 		$param = array('tobuy' => 1);
 		$localobject->initAsSpecimen($param);
-		$localobject->lines = array();    // Overwrite lines of order
+		$localobject->lines = array(); // Overwrite lines of order
 		$line = new CommandeFournisseurLigne($db);
 		$line->desc = $langs->trans("Description")." specimen line with qty too low";
-		$line->qty = 1;                   // So lower than $quantity
+		$line->qty = 1; // So lower than $quantity
 		$line->subprice = 100;
 		$line->fk_product = $product->id;
 		$line->ref_fourn = $ref_fourn;
@@ -108,7 +108,7 @@ 
 
 		$result = $localobject->create($user);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(-1, $result, 'Creation of too low quantity');   // must be -1 because quantity is lower than minimum of supplier price
+		$this->assertEquals(-1, $result, 'Creation of too low quantity'); // must be -1 because quantity is lower than minimum of supplier price
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref IN ('', '(PROV)')";
 		$db->query($sql);
@@ -116,11 +116,11 @@ 
 		// Create purchase order
 		$localobject2 = new CommandeFournisseur($db);
 		$param = array('tobuy' => 1);
-		$localobject2->initAsSpecimen($param);    // This create 5 lines of first product found for socid 1
-		$localobject2->lines = array();       // Overwrite lines of order
+		$localobject2->initAsSpecimen($param); // This create 5 lines of first product found for socid 1
+		$localobject2->lines = array(); // Overwrite lines of order
 		$line = new CommandeFournisseurLigne($db);
 		$line->desc = $langs->trans("Description")." specimen line ok";
-		$line->qty = 10;                      // So enough quantity
+		$line->qty = 10; // So enough quantity
 		$line->subprice = 100;
 		$line->fk_product = $product->id;
 		$line->ref_supplier = $ref_fourn;
@@ -137,10 +137,10 @@ 
 		$localobject3 = new CommandeFournisseur($db);
 		$param = array('tobuy' => 1);
 		$localobject3->initAsSpecimen($param);
-		$localobject3->lines = array();    // Overwrite lines of order
+		$localobject3->lines = array(); // Overwrite lines of order
 		$line = new CommandeFournisseurLigne($db);
 		$line->desc = $langs->trans("Description")." specimen line with qty too low";
-		$line->qty = 1;                   // So lower than $quantity
+		$line->qty = 1; // So lower than $quantity
 		$line->subprice = 100;
 		$line->fk_product = $product->id;
 		$line->ref_supplier = $ref_fourn;
@@ -148,18 +148,18 @@ 
 
 		$result = $localobject3->create($user);
 		print __METHOD__." result=".$result."\n";
-		$this->assertGreaterThan(0, $result, 'Creation of too low quantity should be ok');   // must be id of line because there is no test on minimum quantity
+		$this->assertGreaterThan(0, $result, 'Creation of too low quantity should be ok'); // must be id of line because there is no test on minimum quantity
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where ref=''";
 		$db->query($sql);
 
 		// Create purchase order
 		$localobject4 = new CommandeFournisseur($db);
-		$localobject4->initAsSpecimen();    // This create 5 lines of first product found for socid 1
-		$localobject4->lines = array();       // Overwrite lines of order
+		$localobject4->initAsSpecimen(); // This create 5 lines of first product found for socid 1
+		$localobject4->lines = array(); // Overwrite lines of order
 		$line = new CommandeFournisseurLigne($db);
 		$line->desc = $langs->trans("Description")." specimen line ok";
-		$line->qty = 10;                      // So enough quantity
+		$line->qty = 10; // So enough quantity
 		$line->subprice = 100;
 		$line->fk_product = $product->id;
 		$localobject4->lines[] = $line;
@@ -183,7 +183,7 @@ 
 	 */
 	public function testCommandeFournisseurFetch($id)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -208,7 +208,7 @@ 
 	 */
 	public function testCommandeFournisseurValid($localobject)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -232,7 +232,7 @@ 
 	 */
 	public function testCommandeFournisseurApprove($localobject)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -256,7 +256,7 @@ 
 	 */
 	public function testCommandeFournisseurCancel($localobject)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -280,7 +280,7 @@ 
 	 */
 	public function testCommandeFournisseurOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -311,7 +311,7 @@ 
 	 */
 	public function testCommandeFournisseurDelete($id)
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;