Dolibarr / dolibarr

htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php

Spacing +5 added lines, -5 removed lines

@@ -264,7 +264,7 @@ 
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref . '_' . $newfiletmp;
+				$newfiletmp = $objectref.'_'.$newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -273,11 +273,11 @@ 
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
-					$filename = $newfiletmp . '.' . $newfileformat;
+					$filename = $newfiletmp.'.'.$newfileformat;
 				}
-				$file = $dir . '/' . $filename;
+				$file = $dir.'/'.$filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -286,7 +286,7 @@ 
 				dol_mkdir($conf->fournisseur->commande->dir_temp);
 				if (!is_writable($conf->fournisseur->commande->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->fournisseur->commande->dir_temp);
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
 					return -1;
 				}
 

htdocs/variants/class/ProductCombination2ValuePair.class.php

Spacing +8 added lines, -8 removed lines

@@ -69,8 +69,8 @@ 
 	 */
 	public function __toString()
 	{
-		require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttributeValue.class.php';
-		require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttribute.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
 		$prodattr = new ProductAttribute($this->db);
 		$prodattrval = new ProductAttributeValue($this->db);
@@ -78,7 +78,7 @@ 
 		$prodattr->fetch($this->fk_prod_attr);
 		$prodattrval->fetch($this->fk_prod_attr_val);
 
-		return $prodattr->label . ': ' . $prodattrval->value;
+		return $prodattr->label.': '.$prodattrval->value;
 	}
 
 	/**
@@ -89,14 +89,14 @@ 
 	 */
 	public function create($user)
 	{
-		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_attribute_combination2val
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_combination2val
 		(fk_prod_combination, fk_prod_attr, fk_prod_attr_val)
-		VALUES(" . (int) $this->fk_prod_combination . ", " . (int) $this->fk_prod_attr . ", " . (int) $this->fk_prod_attr_val . ")";
+		VALUES(" . (int) $this->fk_prod_combination.", ".(int) $this->fk_prod_attr.", ".(int) $this->fk_prod_attr_val.")";
 
 		$query = $this->db->query($sql);
 
 		if ($query) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . 'product_attribute_combination2val');
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_combination2val');
 
 			return 1;
 		}
@@ -117,7 +117,7 @@ 
         c2v.fk_prod_attr_val,
         c2v.fk_prod_attr,
         c2v.fk_prod_combination
-        FROM " . MAIN_DB_PREFIX . "product_attribute c LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr
+        FROM " . MAIN_DB_PREFIX."product_attribute c LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr
         WHERE c2v.fk_prod_combination = " . (int) $fk_combination;
 
 		$sql .= $this->db->order('c.position', 'asc');
@@ -151,7 +151,7 @@ 
 	 */
 	public function deleteByFkCombination($fk_combination)
 	{
-		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val WHERE fk_prod_combination = " . (int) $fk_combination;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination2val WHERE fk_prod_combination = ".(int) $fk_combination;
 
 		if ($this->db->query($sql)) {
 			return 1;

htdocs/hrm/position_note.php

Spacing +3 added lines, -3 removed lines

@@ -28,9 +28,9 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'companies'));

htdocs/compta/tva/index.php

Spacing +22 added lines, -22 removed lines

@@ -245,12 +245,12 @@ 
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<td width="30%">' . $langs->trans("Year") . '</td>';
-	print '<td class="right">' . $langs->trans("VATToPay") . '</td>';
-	print '<td class="right">' . $langs->trans("VATToCollect") . '</td>';
-	print '<td class="right">' . $langs->trans("Balance") . '</td>';
-	print '<td>&nbsp;</td>' . "\n";
-	print '</tr>' . "\n";
+	print '<td width="30%">'.$langs->trans("Year").'</td>';
+	print '<td class="right">'.$langs->trans("VATToPay").'</td>';
+	print '<td class="right">'.$langs->trans("VATToCollect").'</td>';
+	print '<td class="right">'.$langs->trans("Balance").'</td>';
+	print '<td>&nbsp;</td>'."\n";
+	print '</tr>'."\n";
 
 	$tmp = dol_getdate($date_start);
 	$y = $tmp['year'];
@@ -394,7 +394,7 @@ 
 
 
 		print '<tr class="oddeven">';
-		print '<td class="nowrap"><a href="' . DOL_URL_ROOT . '/compta/tva/quadri_detail.php?leftmenu=tax_vat&month=' . $m . '&year=' . $y . '">' . dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y") . '</a></td>';
+		print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
 
 		$x_coll_sum = 0;
 		foreach (array_keys($x_coll) as $rate) {
@@ -434,7 +434,7 @@ 
 				$x_coll_sum += $temp_vat;
 			}
 		}
-		print '<td class="nowrap right"><span class="amount">' . price(price2num($x_coll_sum, 'MT')) . '</span></td>';
+		print '<td class="nowrap right"><span class="amount">'.price(price2num($x_coll_sum, 'MT')).'</span></td>';
 
 		$x_paye_sum = 0;
 		foreach (array_keys($x_paye) as $rate) {
@@ -474,7 +474,7 @@ 
 				$x_paye_sum += $temp_vat;
 			}
 		}
-		print '<td class="nowrap right"><span class="amount">' . price(price2num($x_paye_sum, 'MT')) . '</span></td>';
+		print '<td class="nowrap right"><span class="amount">'.price(price2num($x_paye_sum, 'MT')).'</span></td>';
 
 		$subtotalcoll = $subtotalcoll + $x_coll_sum;
 		$subtotalpaid = $subtotalpaid + $x_paye_sum;
@@ -483,7 +483,7 @@ 
 		$total = $total + $diff;
 		$subtotal = price2num($subtotal + $diff, 'MT');
 
-		print '<td class="nowrap right"><span class="amount">' . price(price2num($diff, 'MT')) . '</span></td>' . "\n";
+		print '<td class="nowrap right"><span class="amount">'.price(price2num($diff, 'MT')).'</span></td>'."\n";
 		print "<td>&nbsp;</td>\n";
 		print "</tr>\n";
 
@@ -492,10 +492,10 @@ 
 		$m++;
 		if ($i > 2) {
 			print '<tr class="liste_total">';
-			print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q=' . round($m / 3) . '&year=' . $y . '">' . $langs->trans("SubTotal") . '</a>:</td>';
-			print '<td class="nowrap right">' . price(price2num($subtotalcoll, 'MT')) . '</td>';
-			print '<td class="nowrap right">' . price(price2num($subtotalpaid, 'MT')) . '</td>';
-			print '<td class="nowrap right">' . price(price2num($subtotal, 'MT')) . '</td>';
+			print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
+			print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num($subtotalpaid, 'MT')).'</td>';
+			print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
 			print '<td>&nbsp;</td></tr>';
 			$i = 0;
 			$subtotalcoll = 0;
@@ -503,7 +503,7 @@ 
 			$subtotal = 0;
 		}
 	}
-	print '<tr class="liste_total"><td class="right" colspan="3">' . $langs->trans("TotalToPay") . ':</td><td class="nowrap right">' . price(price2num($total, 'MT')) . '</td>';
+	print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
 	print "<td>&nbsp;</td>\n";
 	print '</tr>';
 
@@ -521,18 +521,18 @@ 
 	$sql = '';
 
 	$sql .= "SELECT SUM(amount) as mm, date_format(tva.datev,'%Y-%m') as dm, 'claimed' as mode";
-	$sql .= " FROM " . MAIN_DB_PREFIX . "tva as tva";
-	$sql .= " WHERE tva.entity = " . $conf->entity;
-	$sql .= " AND (tva.datev >= '" . $db->idate($date_start) . "' AND tva.datev <= '" . $db->idate($date_end) . "')";
+	$sql .= " FROM ".MAIN_DB_PREFIX."tva as tva";
+	$sql .= " WHERE tva.entity = ".$conf->entity;
+	$sql .= " AND (tva.datev >= '".$db->idate($date_start)."' AND tva.datev <= '".$db->idate($date_end)."')";
 	$sql .= " GROUP BY dm";
 
 	$sql .= " UNION ";
 
 	$sql .= "SELECT SUM(ptva.amount) as mm, date_format(tva.datev,'%Y-%m') as dm, 'paid' as mode";
-	$sql .= " FROM " . MAIN_DB_PREFIX . "tva as tva";
-	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_vat as ptva ON (tva.rowid = ptva.fk_tva)";
-	$sql .= " WHERE tva.entity = " . $conf->entity;
-	$sql .= " AND (tva.datev >= '" . $db->idate($date_start) . "' AND tva.datev <= '" . $db->idate($date_end) . "')";
+	$sql .= " FROM ".MAIN_DB_PREFIX."tva as tva";
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_vat as ptva ON (tva.rowid = ptva.fk_tva)";
+	$sql .= " WHERE tva.entity = ".$conf->entity;
+	$sql .= " AND (tva.datev >= '".$db->idate($date_start)."' AND tva.datev <= '".$db->idate($date_end)."')";
 	$sql .= " GROUP BY dm";
 
 	$sql .= " ORDER BY dm ASC, mode ASC";

htdocs/core/modules/mailings/contacts1.modules.php

Spacing +6 added lines, -6 removed lines

@@ -120,7 +120,7 @@ 
 	 */
 	public function formFilter()
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Load translation files required by the page
 		$langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
@@ -131,7 +131,7 @@ 
 		$sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND (sp.poste IS NOT NULL AND sp.poste <> '')";
 		$sql .= " GROUP BY sp.poste";
@@ -166,7 +166,7 @@ 
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie_contact as cs";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND cs.fk_categorie = c.rowid";
 		$sql .= " AND cs.fk_socpeople = sp.rowid";
@@ -239,7 +239,7 @@ 
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie_societe as cs";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND cs.fk_categorie = c.rowid";
 		$sql .= " AND cs.fk_soc = sp.fk_soc";
@@ -276,7 +276,7 @@ 
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND cs.fk_categorie = c.rowid";
 		$sql .= " AND cs.fk_soc = sp.fk_soc";
@@ -434,7 +434,7 @@ 
 
 		// Filter on job position
 		$key = $filter_jobposition;
-		if (!empty($key) && $key != 'all'  && $key != '-1') {
+		if (!empty($key) && $key != 'all' && $key != '-1') {
 			$sql .= " AND sp.poste = '".$this->db->escape($key)."'";
 		}
 

htdocs/recruitment/recruitmentcandidature_card.php

Spacing +1 added lines, -1 removed lines

@@ -426,7 +426,7 @@
 	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
-	$morehtmlref.= $object->getFullName('', 1);
+	$morehtmlref .= $object->getFullName('', 1);
 	/*
 	 // Ref customer
 	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);

htdocs/recruitment/recruitmentcandidature_agenda.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
-	$morehtmlref.= $object->getFullName('', 1);
+	$morehtmlref .= $object->getFullName('', 1);
 	/*
 	// Ref customer
 	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);

htdocs/recruitment/recruitmentcandidature_note.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
-	$morehtmlref.= $object->getFullName('', 1);
+	$morehtmlref .= $object->getFullName('', 1);
 	/*
 	 // Ref customer
 	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);

htdocs/recruitment/recruitmentcandidature_document.php

Spacing +1 added lines, -1 removed lines

@@ -426,7 +426,7 @@
 	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
-	$morehtmlref.= $object->getFullName('', 1);
+	$morehtmlref .= $object->getFullName('', 1);
 	/*
 	 // Ref customer
 	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);