Dolibarr / dolibarr

htdocs/api/class/api_documents.class.php

Spacing +15 added lines, -15 removed lines

@@ -200,7 +200,7 @@ 
 				throw new RestException(500, 'Error generating document');
 			}
 		} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') {
-			require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 			$tmpobject = new FactureFournisseur($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
 			if (!$result) {
@@ -237,7 +237,7 @@ 
 				throw new RestException(500, 'Error generating document');
 			}
 		} elseif ($modulepart == 'contrat' || $modulepart == 'contract') {
-			require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
 			$tmpobject = new Contrat($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
@@ -253,7 +253,7 @@ 
 				throw new RestException(500, 'Error generating document missing doctemplate parameter');
 			}
 		} elseif ($modulepart == 'expedition' || $modulepart == 'shipment') {
-			require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
 			$tmpobject = new Expedition($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
@@ -269,7 +269,7 @@ 
 				throw new RestException(500, 'Error generating document missing doctemplate parameter');
 			}
 		} elseif ($modulepart == 'mrp') {
-			require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 
 			$tmpobject = new Mo($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
@@ -573,7 +573,7 @@ 
 			// $recursive = 0;
 		} elseif ($modulepart == 'contrat' || $modulepart == 'contract') {
 			$modulepart = 'contrat';
-			require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
 			$object = new Contrat($this->db);
 			$result = $object->fetch($id, $ref);
@@ -581,10 +581,10 @@ 
 				throw new RestException(404, 'Contract not found');
 			}
 
-			$upload_dir = $conf->contract->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'contract');
+			$upload_dir = $conf->contract->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'contract');
 		} elseif ($modulepart == 'projet' || $modulepart == 'project') {
 			$modulepart = 'project';
-			require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 			$object = new Project($this->db);
 			$result = $object->fetch($id, $ref);
@@ -592,10 +592,10 @@ 
 				throw new RestException(404, 'Project not found');
 			}
 
-			$upload_dir = $conf->project->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'project');
+			$upload_dir = $conf->project->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'project');
 		} elseif ($modulepart == 'mrp') {
 			$modulepart = 'mrp';
-			require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 
 			$object = new Mo($this->db);
 			$result = $object->fetch($id, $ref);
@@ -603,13 +603,13 @@ 
 				throw new RestException(404, 'MO not found');
 			}
 
-			$upload_dir = $conf->mrp->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'mrp');
+			$upload_dir = $conf->mrp->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'mrp');
 		} else {
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 		}
 
 		$objectType = $modulepart;
-		if (! empty($object->id) && ! empty($object->table_element)) {
+		if (!empty($object->id) && !empty($object->table_element)) {
 			$objectType = $object->table_element;
 		}
 
@@ -625,7 +625,7 @@ 
 					throw new RestException(503, 'Error when retrieve ecm list : '.$this->db->lasterror());
 				} elseif (is_array($ecmfile->lines) && count($ecmfile->lines) > 0) {
 					$count = count($filearray);
-					for ($i = 0 ; $i < $count ; $i++) {
+					for ($i = 0; $i < $count; $i++) {
 						foreach ($ecmfile->lines as $line) {
 							if ($filearray[$i]['name'] == $line->filename) {
 								// Next line converts EcmFilesLine properties to array
@@ -778,7 +778,7 @@ 
 				$object = new Propal($this->db);
 			} elseif ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event') {
 				$modulepart = 'agenda';
-				require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 				$object = new ActionComm($this->db);
 			} elseif ($modulepart == 'contact' || $modulepart == 'socpeople') {
 				$modulepart = 'contact';
@@ -787,11 +787,11 @@ 
 				$fetchbyid = true;
 			} elseif ($modulepart == 'contrat' || $modulepart == 'contract') {
 				$modulepart = 'contrat';
-				require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 				$object = new Contrat($this->db);
 			} elseif ($modulepart == 'mrp') {
 				$modulepart = 'mrp';
-				require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 				$object = new Mo($this->db);
 			} else {
 				// TODO Implement additional moduleparts

htdocs/societe/societecontact.php

Spacing +2 added lines, -2 removed lines

@@ -266,7 +266,7 @@ 
 						$memberstatic->ref = $objp->rowid;
 						$memberstatic->lastname = $objp->lastname;
 						$memberstatic->firstname = $objp->firstname;
-						$memberstatic->statut = $objp->statut;	// deprecated
+						$memberstatic->statut = $objp->statut; // deprecated
 						$memberstatic->status = $objp->statut;
 						$memberstatic->datefin = $db->jdate($objp->datefin);
 
@@ -291,7 +291,7 @@ 
 
 						// Type
 						$membertypestatic->id = $objp->type_id;
-						$membertypestatic->libelle = $objp->type_label;	// deprecated
+						$membertypestatic->libelle = $objp->type_label; // deprecated
 						$membertypestatic->label = $objp->type_label;
 
 						print '<td class="nowrap">';

htdocs/reception/index.php

Spacing +1 added lines, -1 removed lines

@@ -244,7 +244,7 @@
 			$orderstatic->id = $obj->rowid;
 			$orderstatic->ref = $obj->ref;
 			$orderstatic->ref_supplier = $obj->ref_supplier;
-			$orderstatic->statut = $obj->status;	// deprecated
+			$orderstatic->statut = $obj->status; // deprecated
 			$orderstatic->status = $obj->status;
 			$orderstatic->facturee = $obj->billed;
 

htdocs/compta/facture/class/facture.class.php

Spacing +57 added lines, -57 removed lines

@@ -499,7 +499,7 @@ 
 			$this->mode_reglement_id = 0;
 		}
 		$this->status = self::STATUS_DRAFT;
-		$this->statut = self::STATUS_DRAFT;	// deprecated
+		$this->statut = self::STATUS_DRAFT; // deprecated
 
 		if (!empty($this->multicurrency_code)) {
 			// Multicurrency (test on $this->multicurrency_tx because we should take the default rate of multicurrency_code only if not using original rate)
@@ -585,7 +585,7 @@ 
 			if (!empty($_facrec->frequency)) {  // Invoice are created on same thirdparty than template when there is a recurrence, but not necessarily when there is no recurrence.
 				$this->socid = $_facrec->socid;
 			}
-			$this->entity            = $_facrec->entity; // Invoice created in same entity than template
+			$this->entity = $_facrec->entity; // Invoice created in same entity than template
 
 			// Fields coming from GUI.
 			// @TODO Value of template should be used as default value on the form on the GUI, and we should here always use the value from GUI
@@ -624,7 +624,7 @@ 
 				$this->mode_reglement_id = 0;
 			}
 			$this->status = self::STATUS_DRAFT;
-			$this->statut = self::STATUS_DRAFT;	// deprecated
+			$this->statut = self::STATUS_DRAFT; // deprecated
 
 			$this->linked_objects = $_facrec->linkedObjectsIds;
 			// We do not add link to template invoice or next invoice will be linked to all generated invoices
@@ -874,7 +874,7 @@ 
 
 						// Complete vat rate with code
 						$vatrate = $newinvoiceline->tva_tx;
-						if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', (string) $vatrate)) {
+						if ($newinvoiceline->vat_src_code && !preg_match('/\(.*\)/', (string) $vatrate)) {
 							$vatrate .= ' ('.$newinvoiceline->vat_src_code.')';
 						}
 
@@ -1082,7 +1082,7 @@ 
 						($_facrec->lines[$i]->date_end_fill == 1 && $previousdaynextdatewhen) ? $previousdaynextdatewhen : '',
 						0,
 						$tva_npr,
-						0,  // fk_remise_except
+						0, // fk_remise_except
 						'HT',
 						0,
 						$_facrec->lines[$i]->product_type,
@@ -1095,8 +1095,8 @@ 
 						$buyprice,
 						$_facrec->lines[$i]->label,
 						empty($_facrec->lines[$i]->array_options) ? null : $_facrec->lines[$i]->array_options,
-						100,	// situation percent is undefined on recurring invoice lines
-						0,  // fk_prev_id
+						100, // situation percent is undefined on recurring invoice lines
+						0, // fk_prev_id
 						$_facrec->lines[$i]->fk_unit,
 						$_facrec->lines[$i]->multicurrency_subprice,
 						$_facrec->lines[$i]->ref_ext,
@@ -1184,7 +1184,7 @@ 
 
 		$facture->fk_facture_source = $this->fk_facture_source;
 		$facture->type 			    = $this->type;
-		$facture->subtype 			= $this->subtype;
+		$facture->subtype = $this->subtype;
 		$facture->socid 		    = $this->socid;
 		$facture->date              = $this->date;
 		$facture->date_pointoftax   = $this->date_pointoftax;
@@ -1201,7 +1201,7 @@ 
 
 		$facture->origin            = $this->origin;
 		$facture->origin_id         = $this->origin_id;
-		$facture->fk_account         = $this->fk_account;
+		$facture->fk_account = $this->fk_account;
 
 		$facture->lines = $this->lines; // Array of lines of invoice
 		$facture->situation_counter = $this->situation_counter;
@@ -1468,8 +1468,8 @@ 
 		$this->fk_account = $object->fk_account;
 		$this->cond_reglement_id    = $object->cond_reglement_id;
 		$this->mode_reglement_id    = $object->mode_reglement_id;
-		$this->fk_incoterms    		= $object->fk_incoterms;
-		$this->location_incoterms	= $object->location_incoterms;
+		$this->fk_incoterms = $object->fk_incoterms;
+		$this->location_incoterms = $object->location_incoterms;
 		$this->availability_id      = $object->availability_id;
 		$this->demand_reason_id     = $object->demand_reason_id;
 		$this->delivery_date        = $object->delivery_date;
@@ -1678,7 +1678,7 @@ 
 	{
 		global $conf, $langs, $hookmanager, $action;
 
-		if (! in_array($origin->element, array('propal', 'commande'))) {
+		if (!in_array($origin->element, array('propal', 'commande'))) {
 			$origin->error = 'ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder';
 			return null;
 		}
@@ -1688,7 +1688,7 @@ 
 			return null;
 		}
 
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 		if ($date > (dol_get_last_hour(dol_now('tzuserrel')) + getDolGlobalInt('INVOICE_MAX_FUTURE_DELAY'))) {
 			$origin->error = 'ErrorDateIsInFuture';
@@ -1732,7 +1732,7 @@ 
 		$deposit->pos_source = $origin->pos_source;
 		$deposit->model_pdf = 'crabe';
 
-		$modelByTypeConfName = 'FACTURE_ADDON_PDF_' . $deposit->type;
+		$modelByTypeConfName = 'FACTURE_ADDON_PDF_'.$deposit->type;
 
 		if (getDolGlobalString($modelByTypeConfName)) {
 			$deposit->model_pdf = getDolGlobalString($modelByTypeConfName);
@@ -1792,10 +1792,10 @@ 
 					$descriptions[$key] = '';
 				}
 				$TTotalByTva[$key] += $line->total_ttc;
-				$descriptions[$key] .= '<li>' . (!empty($line->product_ref) ? $line->product_ref . ' - ' : '');
-				$descriptions[$key] .= (!empty($line->product_label) ? $line->product_label . ' - ' : '');
-				$descriptions[$key] .= $langs->trans('Qty') . ' : ' . $line->qty;
-				$descriptions[$key] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($line->total_ht) . '</li>';
+				$descriptions[$key] .= '<li>'.(!empty($line->product_ref) ? $line->product_ref.' - ' : '');
+				$descriptions[$key] .= (!empty($line->product_label) ? $line->product_label.' - ' : '');
+				$descriptions[$key] .= $langs->trans('Qty').' : '.$line->qty;
+				$descriptions[$key] .= ' - '.$langs->trans('TotalHT').' : '.price($line->total_ht).'</li>';
 			}
 
 			foreach ($TTotalByTva as $tva => &$total) {
@@ -1819,10 +1819,10 @@ 
 				$totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
 				$tva_tx = $lines[$i]->tva_tx;
 				$amountdeposit[$tva_tx] += ((float) $lines[$i]->total_ht * (float) $origin->deposit_percent) / 100;
-				$descriptions[$tva_tx] .= '<li>' . (!empty($lines[$i]->product_ref) ? $lines[$i]->product_ref . ' - ' : '');
-				$descriptions[$tva_tx] .= (!empty($lines[$i]->product_label) ? $lines[$i]->product_label . ' - ' : '');
-				$descriptions[$tva_tx] .= $langs->trans('Qty') . ' : ' . $lines[$i]->qty;
-				$descriptions[$tva_tx] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($lines[$i]->total_ht) . '</li>';
+				$descriptions[$tva_tx] .= '<li>'.(!empty($lines[$i]->product_ref) ? $lines[$i]->product_ref.' - ' : '');
+				$descriptions[$tva_tx] .= (!empty($lines[$i]->product_label) ? $lines[$i]->product_label.' - ' : '');
+				$descriptions[$tva_tx] .= $langs->trans('Qty').' : '.$lines[$i]->qty;
+				$descriptions[$tva_tx] .= ' - '.$langs->trans('TotalHT').' : '.price($lines[$i]->total_ht).'</li>';
 			}
 
 			if ($totalamount == 0) {
@@ -1837,11 +1837,11 @@ 
 				continue;
 			}
 
-			$descline = '(DEPOSIT) ('. $origin->deposit_percent .'%) - '.$origin->ref;
+			$descline = '(DEPOSIT) ('.$origin->deposit_percent.'%) - '.$origin->ref;
 
 			// Hidden conf
 			if (getDolGlobalString('INVOICE_DEPOSIT_VARIABLE_MODE_DETAIL_LINES_IN_DESCRIPTION') && !empty($descriptions[$tva])) {
-				$descline .= '<ul>' . $descriptions[$tva] . '</ul>';
+				$descline .= '<ul>'.$descriptions[$tva].'</ul>';
 			}
 
 			$addlineResult = $deposit->addline(
@@ -2230,7 +2230,7 @@ 
 					: '';
 
 				if ($type !== 'separate') {
-					if (in_array($type, array('point','multipts','linestrg','polygon'))) {
+					if (in_array($type, array('point', 'multipts', 'linestrg', 'polygon'))) {
 						$sql .= ", ST_AsWKT(ef.".$key.") as ".$key;
 					} else {
 						$sql .= ", ef.".$key;
@@ -2273,9 +2273,9 @@ 
 				$this->id = $obj->rowid;
 				$this->entity = $obj->entity;
 
-				$this->ref					= $obj->ref;
-				$this->ref_client			= $obj->ref_client;
-				$this->ref_customer			= $obj->ref_client;
+				$this->ref = $obj->ref;
+				$this->ref_client = $obj->ref_client;
+				$this->ref_customer = $obj->ref_client;
 				$this->ref_ext				= $obj->ref_ext;
 				$this->type					= $obj->type;
 				$this->subtype				= $obj->subtype;
@@ -2301,7 +2301,7 @@ 
 				$this->fk_project = $obj->fk_project;
 				$this->project = null; // Clear if another value was already set by fetch_projet
 
-				$this->statut = $obj->status;	// deprecated
+				$this->statut = $obj->status; // deprecated
 				$this->status = $obj->status;
 
 				$this->date_lim_reglement = $this->db->jdate($obj->dlr);
@@ -2317,7 +2317,7 @@ 
 				$this->fk_fac_rec_source	= $obj->fk_fac_rec_source;
 				$this->note = $obj->note_private; // deprecated
 				$this->note_private = $obj->note_private;
-				$this->note_public			= $obj->note_public;
+				$this->note_public = $obj->note_public;
 				$this->user_creation_id     = $obj->fk_user_author;
 				$this->user_validation_id   = $obj->fk_user_valid;
 				$this->user_modification_id = $obj->fk_user_modif;
@@ -2365,15 +2365,15 @@ 
 
 							// date/datetime
 							if (in_array($type, array('date', 'datetime'))) {
-								$this->array_options['options_' . $key] = $this->db->jdate($rawval);
+								$this->array_options['options_'.$key] = $this->db->jdate($rawval);
 							} elseif ($type == 'password') {
 								if (!empty($rawval) && preg_match('/^dolcrypt:/', $rawval)) {
-									$this->array_options['options_' . $key] = dolDecrypt($rawval);
+									$this->array_options['options_'.$key] = dolDecrypt($rawval);
 								} else {
-									$this->array_options['options_' . $key] = $rawval;
+									$this->array_options['options_'.$key] = $rawval;
 								}
 							} else {
-								$this->array_options['options_' . $key] = $rawval;
+								$this->array_options['options_'.$key] = $rawval;
 							}
 						}
 					}
@@ -2384,7 +2384,7 @@ 
 							if (empty($conf->disable_compute)) {
 								global $objectoffield;
 								$objectoffield = $this;
-								$this->array_options['options_' . $key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0, '2');
+								$this->array_options['options_'.$key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0, '2');
 							}
 						}
 					}
@@ -2480,7 +2480,7 @@ 
 					: '';
 
 				if ($type !== 'separate') {
-					if (in_array($type, array('point','multipts','linestrg','polygon'))) {
+					if (in_array($type, array('point', 'multipts', 'linestrg', 'polygon'))) {
 						$sql .= ", ST_AsWKT(ef.".$key.") as ".$key;
 					} else {
 						$sql .= ", ef.".$key;
@@ -2520,7 +2520,7 @@ 
 				$line->ref              = $objp->product_ref; // Ref product
 				$line->product_ref      = $objp->product_ref; // Ref product
 				$line->libelle          = $objp->product_label; // deprecated
-				$line->product_label 	= $objp->product_label; // Label product
+				$line->product_label = $objp->product_label; // Label product
 				$line->product_barcode  = $objp->product_barcode; // Barcode number product
 				$line->product_desc     = $objp->product_desc; // Description product
 				$line->fk_product_type  = $objp->fk_product_type; // Type of product
@@ -2586,15 +2586,15 @@ 
 
 							// date/datetime
 							if (in_array($type, array('date', 'datetime'))) {
-								$line->array_options['options_' . $key] = $this->db->jdate($rawval);
+								$line->array_options['options_'.$key] = $this->db->jdate($rawval);
 							} elseif ($type == 'password') {
 								if (!empty($rawval) && preg_match('/^dolcrypt:/', $rawval)) {
-									$line->array_options['options_' . $key] = dolDecrypt($rawval);
+									$line->array_options['options_'.$key] = dolDecrypt($rawval);
 								} else {
-									$line->array_options['options_' . $key] = $rawval;
+									$line->array_options['options_'.$key] = $rawval;
 								}
 							} else {
-								$line->array_options['options_' . $key] = $rawval;
+								$line->array_options['options_'.$key] = $rawval;
 							}
 						}
 					}
@@ -2605,7 +2605,7 @@ 
 							if (empty($conf->disable_compute)) {
 								global $objectoffield;
 								$objectoffield = $line;
-								$line->array_options['options_' . $key] = dol_eval($extrafields->attributes[$this->table_element_line]['computed'][$key], 1, 0, '2');
+								$line->array_options['options_'.$key] = dol_eval($extrafields->attributes[$this->table_element_line]['computed'][$key], 1, 0, '2');
 							}
 						}
 					}
@@ -3522,10 +3522,10 @@ 
 		if ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('facture', 'creer'))
 		|| (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('facture', 'invoice_advance', 'validate'))) {
 			$this->error = 'Permission denied';
-			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS=' . getDolGlobalString('MAIN_USE_ADVANCED_PERMS'), LOG_ERR);
+			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS='.getDolGlobalString('MAIN_USE_ADVANCED_PERMS'), LOG_ERR);
 			return -1;
 		}
-		if ((preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) &&	// empty should not happened, but when it occurs, the test save life
+		if ((preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) && // empty should not happened, but when it occurs, the test save life
 			getDolGlobalString('FAC_FORCE_DATE_VALIDATION')						// If option enabled, we force invoice date
 		) {
 			$this->date = dol_now();
@@ -3709,7 +3709,7 @@ 
 				for ($i = 0; $i < $cpt; $i++) {
 					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
-						$mouvP->origin = &$this;	// deprecated
+						$mouvP->origin = &$this; // deprecated
 						$mouvP->setOrigin($this->element, $this->id);
 
 						// We decrease stock for product
@@ -3878,7 +3878,7 @@ 
 			// Set new ref and define current status
 			if (!$error) {
 				$this->ref = $num;
-				$this->statut = self::STATUS_VALIDATED;	// deprecated
+				$this->statut = self::STATUS_VALIDATED; // deprecated
 				$this->status = self::STATUS_VALIDATED;
 				$this->date_validation = $now;
 				$i = 0;
@@ -4056,7 +4056,7 @@ 
 
 			if ($error == 0) {
 				$old_statut = $this->status;
-				$this->statut = self::STATUS_DRAFT;	// deprecated
+				$this->statut = self::STATUS_DRAFT; // deprecated
 				$this->status = self::STATUS_DRAFT;
 
 				// Call trigger
@@ -4644,8 +4644,8 @@ 
 				$rangmax = $this->line_max($fk_parent_line);
 				$this->line->rang = $rangmax + 1;
 			}
-			$apply_abs_price_on_credit_note=false;
-			if ($this->type == self::TYPE_CREDIT_NOTE  && !getDolGlobalInt('FACTURE_ENABLE_NEGATIVE_LINES') && !getDolGlobalInt('INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN')) {
+			$apply_abs_price_on_credit_note = false;
+			if ($this->type == self::TYPE_CREDIT_NOTE && !getDolGlobalInt('FACTURE_ENABLE_NEGATIVE_LINES') && !getDolGlobalInt('INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN')) {
 				$apply_abs_price_on_credit_note = true;
 			}
 
@@ -5078,7 +5078,7 @@ 
 		}
 
 		if (!empty($addon)) {
-			dol_syslog("Call getNextNumRef with ".$addonConstName." = " . getDolGlobalString('FACTURE_ADDON').", thirdparty=".$soc->name.", type=".$soc->typent_code.", mode=".$mode, LOG_DEBUG);
+			dol_syslog("Call getNextNumRef with ".$addonConstName." = ".getDolGlobalString('FACTURE_ADDON').", thirdparty=".$soc->name.", type=".$soc->typent_code.", mode=".$mode, LOG_DEBUG);
 
 			$mybool = false;
 
@@ -5365,7 +5365,7 @@ 
 
 		if (getDolGlobalInt('LIST_OF_QUALIFIED_INVOICES_LIMIT_DEFINED') > 0) {
 			$sql .= " DESC"; //order by
-			$sql .= " LIMIT " . getDolGlobalInt('LIST_OF_QUALIFIED_INVOICES_LIMIT_DEFINED');
+			$sql .= " LIMIT ".getDolGlobalInt('LIST_OF_QUALIFIED_INVOICES_LIMIT_DEFINED');
 		}
 
 		dol_syslog(get_class($this)."::list_qualified_avoir_invoices", LOG_DEBUG);
@@ -5550,7 +5550,7 @@ 
 
 		if (empty($option) || $option != 'nolines') {
 			// 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 FactureLigne($this->db);
@@ -6178,14 +6178,14 @@ 
 		if (!empty($paymentmode) && $paymentmode != 'all') {
 			$sql .= ", ".MAIN_DB_PREFIX."c_paiement as cp";
 		}
-		$sql .= " WHERE f.paye = 0";	// Only unpaid
-		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED;	// Only validated status
+		$sql .= " WHERE f.paye = 0"; // Only unpaid
+		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED; // Only validated status
 		if ($datetouse == 'invoicedate') {
 			$sql .= " AND f.datef = '".$this->db->idate($tmpidate, 'gmt')."'";
 		} else {
 			$sql .= " AND f.date_lim_reglement = '".$this->db->idate($tmpidate, 'gmt')."'";
 		}
-		$sql .= " AND f.entity IN (".getEntity('facture', 0).")";	// One batch process only one company (no sharing)
+		$sql .= " AND f.entity IN (".getEntity('facture', 0).")"; // One batch process only one company (no sharing)
 		if (!empty($paymentmode) && $paymentmode != 'all') {
 			$sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '".$this->db->escape($paymentmode)."'";
 		}
@@ -6404,7 +6404,7 @@ 
 								$actioncomm->create($user);
 							}
 
-							$this->db->commit();	// We always commit
+							$this->db->commit(); // We always commit
 						}
 
 						if ($errormesg) {
@@ -6446,7 +6446,7 @@ 
 		// get date of last validated invoices of same type
 		$sql  = "SELECT datef";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
-		$sql .= " WHERE type = " . (int) $this->type ;
+		$sql .= " WHERE type = ".(int) $this->type;
 		$sql .= " AND date_valid IS NOT NULL";
 		$sql .= " AND entity IN (".getEntity('invoice').")";
 		$sql .= " ORDER BY datef DESC LIMIT 1";

htdocs/compta/index.php

Spacing +2 added lines, -2 removed lines

@@ -360,7 +360,7 @@ 
 				$facstatic->total_ht = $obj->total_ht;
 				$facstatic->total_tva = $obj->total_tva;
 				$facstatic->total_ttc = $obj->total_ttc;
-				$facstatic->statut = $obj->status;	// deprecated
+				$facstatic->statut = $obj->status; // deprecated
 				$facstatic->status = $obj->status;
 				$facstatic->paye = $obj->paye;
 				$facstatic->paid = $obj->paye;
@@ -481,7 +481,7 @@ 
 				$donationstatic->lastname = $obj->lastname;
 				$donationstatic->firstname = $obj->firstname;
 				$donationstatic->date = $db->jdate($obj->date);
-				$donationstatic->statut = $obj->status;	// deprecated
+				$donationstatic->statut = $obj->status; // deprecated
 				$donationstatic->status = $obj->status;
 
 				$label = '';

htdocs/compta/prelevement/index.php

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
 
 			$invoicestatic->id = $obj->rowid;
 			$invoicestatic->ref = $obj->ref;
-			$invoicestatic->statut = $obj->status;	// deprecated
+			$invoicestatic->statut = $obj->status; // deprecated
 			$invoicestatic->status = $obj->status;
 			$invoicestatic->paye = $obj->paye;
 			$invoicestatic->type = $obj->type;

htdocs/product/stats/commande_fournisseur.php

Spacing +1 added lines, -1 removed lines

@@ -279,7 +279,7 @@
 
 						$supplierorderstatic->id = $objp->commandeid;
 						$supplierorderstatic->ref = $objp->ref;
-						$supplierorderstatic->statut = $objp->status;	// deprecated
+						$supplierorderstatic->statut = $objp->status; // deprecated
 						$supplierorderstatic->status = $objp->status;
 						$supplierorderstatic->billed = $objp->billed;
 

htdocs/product/class/html.formproduct.class.php

Spacing +7 added lines, -7 removed lines

@@ -264,7 +264,7 @@ 
 		} else {
 			if (!empty($this->cache_warehouses[$tab['parent_id']])) {
 				if (getDolGlobalInt('MAIN_WAREHOUSE_LIST_DISPLAY_MODE') !== 2 || (getDolGlobalInt('MAIN_WAREHOUSE_LIST_DISPLAY_MODE') === 2 && empty($this->cache_warehouses[$tab['parent_id']]['parent_id']))) {
-					$final_label = $this->cache_warehouses[$tab['parent_id']]['label'] . ' >> ' . $final_label;
+					$final_label = $this->cache_warehouses[$tab['parent_id']]['label'].' >> '.$final_label;
 				}
 
 				return $this->get_parent_path($this->cache_warehouses[$tab['parent_id']], $final_label);
@@ -304,7 +304,7 @@ 
 	{
 		global $conf, $langs, $user, $hookmanager;
 
-		dol_syslog(get_class($this)."::selectWarehouses " . (is_array($selected) ? 'selected is array' : $selected) . ", $htmlname, $filterstatus, $empty, $disabled, $fk_product, $empty_label, $showstock, $forcecombo, $morecss", LOG_DEBUG);
+		dol_syslog(get_class($this)."::selectWarehouses ".(is_array($selected) ? 'selected is array' : $selected).", $htmlname, $filterstatus, $empty, $disabled, $fk_product, $empty_label, $showstock, $forcecombo, $morecss", LOG_DEBUG);
 
 		$out = '';
 		if ((!getDolGlobalString('ENTREPOT_EXTRA_STATUS')) && ($filterstatus === "warehouseinternal")) {
@@ -633,7 +633,7 @@ 
 			$return .= '</select>';
 		}
 
-		$return .= ajax_combobox($name, array(), 0, 0, 'resolve', $placeholderID);	// avoid to have hidden value if scale = -1 (eg DM size)
+		$return .= ajax_combobox($name, array(), 0, 0, 'resolve', $placeholderID); // avoid to have hidden value if scale = -1 (eg DM size)
 
 		return $return;
 	}
@@ -839,7 +839,7 @@ 
 		}
 
 		if (empty($hookmanager)) {
-			include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('productdao'));
@@ -858,7 +858,7 @@ 
 			if (array_key_exists($productId, $this->cache_lot)) {
 				foreach ($this->cache_lot[$productId] as $id => $arraytypes) {
 					if (empty($fk_entrepot) || $fk_entrepot == $arraytypes['entrepot_id']) {
-						$label = $arraytypes['entrepot_label'] . ' - ';
+						$label = $arraytypes['entrepot_label'].' - ';
 						$label .= $arraytypes['batch'];
 						// Notice: Chrome show 1 line with value and 1 for label. Firefox show only 1 line with label
 						$optionLabel = ($conf->browser->name === 'chrome' ? '' : $arraytypes['batch']);
@@ -870,7 +870,7 @@ 
 							$optionLabel .= ' - '.$langs->trans('printEatby', $arraytypes['eatbydate']);
 						}
 						$optionLabel .= ')';
-						$out .= '<option data-warehouse="'.dol_escape_htmltag($label).'" data-eatbydate="'.$arraytypes['eatbydate'].'" data-sellbydate="'.$arraytypes['sellbydate'].'" value="' . $arraytypes['batch'] . '">'.$optionLabel.'</option>';
+						$out .= '<option data-warehouse="'.dol_escape_htmltag($label).'" data-eatbydate="'.$arraytypes['eatbydate'].'" data-sellbydate="'.$arraytypes['sellbydate'].'" value="'.$arraytypes['batch'].'">'.$optionLabel.'</option>';
 					}
 				}
 			}
@@ -914,7 +914,7 @@ 
 			$batch_count = 0;
 			global $hookmanager;
 			if (empty($hookmanager)) {
-				include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 				$hookmanager = new HookManager($this->db);
 			}
 			$hookmanager->initHooks(array('productdao'));

htdocs/product/stock/class/mouvementstock.class.php

Spacing +17 added lines, -17 removed lines

@@ -252,7 +252,7 @@ 
 				'skip_batch'       => &$skip_batch,
 				'id_product_batch' => &$id_product_batch
 			);
-			$reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 			if ($reshook < 0) {
 				if (!empty($hookmanager->resPrint)) {
@@ -599,7 +599,7 @@ 
 			// Update stock quantity
 			if (!$error) {
 				if ($alreadyarecord > 0) {
-					$sql = "UPDATE ".$this->db->prefix()."product_stock SET reel = " . ((float) $oldqtywarehouse + (float) $qty);
+					$sql = "UPDATE ".$this->db->prefix()."product_stock SET reel = ".((float) $oldqtywarehouse + (float) $qty);
 					$sql .= " WHERE fk_entrepot = ".((int) $entrepot_id)." AND fk_product = ".((int) $fk_product);
 				} else {
 					$sql = "INSERT INTO ".$this->db->prefix()."product_stock";
@@ -669,7 +669,7 @@ 
 
 		if ($movestock && !$error) {
 			// Call trigger
-			if ($product->stockable_product != Product::DISABLED_STOCK ) {
+			if ($product->stockable_product != Product::DISABLED_STOCK) {
 				$result = $this->call_trigger('STOCK_MOVEMENT', $user);
 				if ($result < 0) {
 					$error++;
@@ -749,8 +749,8 @@ 
 				$this->price = $obj->price;
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->label = $obj->label;
-				$this->fk_origin = $obj->origin_id;		// For backward compatibility
-				$this->origintype = $obj->origin_type;	// For backward compatibility
+				$this->fk_origin = $obj->origin_id; // For backward compatibility
+				$this->origintype = $obj->origin_type; // For backward compatibility
 				$this->origin_id = $obj->origin_id;
 				$this->origin_type = $obj->origin_type;
 				$this->inventorycode = $obj->inventorycode;
@@ -822,7 +822,7 @@ 
 						$this->errors[] = $langs->trans('ErrorNoteAlsoThatSubProductCantBeFollowedByLot');
 					}
 					$error = $result;
-					dol_syslog(__METHOD__ . ' Error : ' . $this->errorsToString(), LOG_ERR);
+					dol_syslog(__METHOD__.' Error : '.$this->errorsToString(), LOG_ERR);
 					break;
 				}
 				unset($tmpmove);
@@ -980,8 +980,8 @@ 
 			} else {					// product_batch record not found
 				$pdluo->fk_product_stock = $vfk_product_stock;
 				$pdluo->qty = $qty;
-				$pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby'];		// No more used. Now eatby date is store in table of lot, no more into prouct_batch table.
-				$pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby'];		// No more used. Now sellby date is store in table of lot, no more into prouct_batch table.
+				$pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby']; // No more used. Now eatby date is store in table of lot, no more into prouct_batch table.
+				$pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby']; // No more used. Now sellby date is store in table of lot, no more into prouct_batch table.
 				$pdluo->batch = $vbatchnumber;
 
 				$result = $pdluo->create($user, 1);
@@ -1178,11 +1178,11 @@ 
 		$label .= '<div width="100%">';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->id;
 		$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
-		$qtylabel = (($this->qty > 0) ? '<span class="stockmovemententry">+' : '<span class="stockmovementexit">') . $this->qty . '</span>';
+		$qtylabel = (($this->qty > 0) ? '<span class="stockmovemententry">+' : '<span class="stockmovementexit">').$this->qty.'</span>';
 		if ($this->inventorycode) {
 			$label .= '<br><b>'.$langs->trans('InventoryCode').':</b> '.$this->inventorycode;
 		}
-		$label .= '<br><b>'.$langs->trans('Qty').':</b> ' . $qtylabel;
+		$label .= '<br><b>'.$langs->trans('Qty').':</b> '.$qtylabel;
 		if ($this->batch) {
 			$label .= '<br><b>'.$langs->trans('Batch').':</b> '.$this->batch;
 		}
@@ -1310,8 +1310,8 @@ 
 		$sql = "SELECT sum(pb.qty) as cpt";
 		$sql .= " FROM ".$this->db->prefix()."product_batch as pb";
 		$sql .= " INNER JOIN ".$this->db->prefix()."product_stock as ps ON ps.rowid = pb.fk_product_stock";
-		$sql .= " WHERE ps.fk_product = " . ((int) $fk_product);
-		$sql .= " AND pb.batch = '" . $this->db->escape($batch) . "'";
+		$sql .= " WHERE ps.fk_product = ".((int) $fk_product);
+		$sql .= " AND pb.batch = '".$this->db->escape($batch)."'";
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -1335,7 +1335,7 @@ 
 	 */
 	public function reverseMouvement()
 	{
-		$formattedDate = "REVERTMV" .dol_print_date($this->datem, '%Y%m%d%His');
+		$formattedDate = "REVERTMV".dol_print_date($this->datem, '%Y%m%d%His');
 		if ($this->label == 'Annulation movement ID'.$this->id) {
 			return -1;
 		}
@@ -1371,11 +1371,11 @@ 
 	{
 		$date = '';
 
-		$sql = 	"SELECT MAX(datem) as datem";
+		$sql = "SELECT MAX(datem) as datem";
 		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement";
-		$sql .= " WHERE fk_product = " . ((int) $fk_product);
-		$sql .= " AND fk_entrepot  = " .((int) $fk_entrepot);
-		$sql .= " AND batch = '" . $this->db->escape($batch) . "'";
+		$sql .= " WHERE fk_product = ".((int) $fk_product);
+		$sql .= " AND fk_entrepot  = ".((int) $fk_entrepot);
+		$sql .= " AND batch = '".$this->db->escape($batch)."'";
 
 		$result = $this->db->query($sql);
 		if ($result) {