Dolibarr / dolibarr

htdocs/asset/tpl/depreciation_options_edit.tpl.php

Spacing +9 added lines, -9 removed lines

@@ -35,7 +35,7 @@ 
 }
 
 if (!is_object($formadmin)) {
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 	$formadmin = new FormAdmin($db);
 }
 
@@ -69,19 +69,19 @@ 
 				'mode_key' => $info[0],
 				'field_key' => $info[1],
 				'value' => $info[2],
-				'target' => 'block_' . $mode_key,
+				'target' => 'block_'.$mode_key,
 			);
 		}
 
 		$assetdepreciationoptions->setInfosForMode($mode_key, $class_type, true);
-		$prefix_html_name = $mode_key . '_';
+		$prefix_html_name = $mode_key.'_';
 
-		print '<div id="block_' . $mode_key . '">';
+		print '<div id="block_'.$mode_key.'">';
 		print load_fiche_titre($langs->trans($mode_info['label']), '', '');
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border centpercent tableforfield">' . "\n";
+		print '<table class="border centpercent tableforfield">'."\n";
 		$mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
 		foreach ($mode_info['fields'] as $field_key => $field_info) {
 			// Discard if extrafield is a hidden field on form
@@ -102,14 +102,14 @@ 
 				print '<table class="border centpercent tableforfield">';
 			}
 
-			$html_name = $prefix_html_name . $field_key;
+			$html_name = $prefix_html_name.$field_key;
 			if (!empty($field_info['enabled_field'])) {
 				$info = explode(':', $field_info['enabled_field']);
 				$enabled_field_info[] = array(
 					'mode_key' => $info[0],
 					'field_key' => $info[1],
 					'value' => $info[2],
-					'target' => 'field_' . $html_name,
+					'target' => 'field_'.$html_name,
 				);
 			}
 
@@ -121,8 +121,8 @@ 
 				$more_class .= ' tdtop';
 			}
 
-			print '<tr class="field_' . $html_name . '" id="field_' . $html_name . '"><td';
-			print ' class="titlefieldcreate' . $more_class . '">';
+			print '<tr class="field_'.$html_name.'" id="field_'.$html_name.'"><td';
+			print ' class="titlefieldcreate'.$more_class.'">';
 			if (!empty($field_info['help'])) {
 				print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help']));
 			} else {

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -221,7 +221,7 @@
 		}
 	});
 </script>
-SCRIPT;
+script;
 }
 
 ?>

htdocs/asset/tpl/depreciation_view.tpl.php

Spacing +9 added lines, -9 removed lines

@@ -67,7 +67,7 @@ 
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border centpercent tableforfield">' . "\n";
+		print '<table class="border centpercent tableforfield">'."\n";
 		$mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
 		foreach ($mode_info['fields'] as $field_key => $field_info) {
 			if (!empty($field_info['enabled_field'])) {
@@ -94,11 +94,11 @@ 
 				print '<table class="border centpercent tableforfield">';
 			}
 
-			$key = $mode_key . '_' . $field_key;
+			$key = $mode_key.'_'.$field_key;
 			$value = $assetdepreciationoptions->deprecation_options[$mode_key][$field_key];
 
-			print '<tr class="field_' . $key . '"><td';
-			print ' class="' . (empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']) . ' fieldname_' . $key;
+			print '<tr class="field_'.$key.'"><td';
+			print ' class="'.(empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']).' fieldname_'.$key;
 			if ($field_info['type'] == 'text' || $field_info['type'] == 'html') {
 				print ' tdtop';
 			}
@@ -113,12 +113,12 @@ 
 				}
 			}
 			print '</td>';
-			print '<td class="valuefield fieldname_' . $key;
+			print '<td class="valuefield fieldname_'.$key;
 			if ($field_info['type'] == 'text') {
 				print ' wordbreak';
 			}
 			if (!empty($field_info['cssview'])) {
-				print ' ' . $field_info['cssview'];
+				print ' '.$field_info['cssview'];
 			}
 			print '">';
 			if (in_array($field_info['type'], array('text', 'html'))) {
@@ -126,15 +126,15 @@ 
 			}
 			if ($field_key == 'lang') {
 				$langs->load("languages");
-				$labellang = ($value ? $langs->trans('Language_' . $value) : '');
+				$labellang = ($value ? $langs->trans('Language_'.$value) : '');
 				print picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"');
 				print $labellang;
 			} else {
 				if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 2) {
-					$out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+					$out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0);
 					print showValueWithClipboardCPButton($out, 0, $out);
 				} else {
-					print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+					print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0);
 				}
 			}
 			if (in_array($field_info['type'], array('text', 'html'))) {

htdocs/core/lib/asset.lib.php

Spacing +19 added lines, -19 removed lines

@@ -80,32 +80,32 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
 
 	if (empty($object->not_depreciated)) {
-		$head[$h][0] = DOL_URL_ROOT . '/asset/depreciation_options.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/depreciation_options.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("AssetDepreciationOptions");
 		$head[$h][2] = 'depreciation_options';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/accountancy_codes.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/accountancy_codes.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("AssetAccountancyCodes");
 	$head[$h][2] = 'accountancy_codes';
 	$h++;
 
 	if (empty($object->not_depreciated)) {
-		$head[$h][0] = DOL_URL_ROOT . '/asset/depreciation.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/depreciation.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("AssetDepreciation");
 		$head[$h][2] = 'depreciation';
 		$h++;
 	}
 
 	if (isset($object->disposal_date) && $object->disposal_date !== "") {
-		$head[$h][0] = DOL_URL_ROOT . '/asset/disposal.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/disposal.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("AssetDisposal");
 		$head[$h][2] = 'disposal';
 		$h++;
@@ -119,29 +119,29 @@ 
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = DOL_URL_ROOT . '/asset/note.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
 
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
-	$upload_dir = $conf->asset->dir_output . "/asset/" . dol_sanitizeFileName($object->ref);
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->asset->dir_output."/asset/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT . '/asset/document.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	}
 	$head[$h][2] = 'document';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/agenda.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
 	$head[$h][2] = 'agenda';
 	$h++;
@@ -176,17 +176,17 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/card.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/model/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/depreciation_options.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/model/depreciation_options.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("AssetDepreciationOptions");
 	$head[$h][2] = 'depreciation_options';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/accountancy_codes.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/model/accountancy_codes.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("AssetAccountancyCodes");
 	$head[$h][2] = 'accountancy_codes';
 	$h++;
@@ -199,16 +199,16 @@ 
 		if (!empty($object->note_public)) {
 			$nbNote++;
 		}
-		$head[$h][0] = DOL_URL_ROOT . '/asset/model/note.php?id=' . $object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/asset/model/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) {
-			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">' . $nbNote . '</span>' : '');
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
 		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT . '/asset/model/agenda.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/asset/model/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
 	$head[$h][2] = 'agenda';
 	$h++;

htdocs/core/tpl/objectline_view.tpl.php

Braces +9 added lines, -3 removed lines

@@ -397,9 +397,15 @@
 		) {
 			$accountancy_category_asset = $conf->global->ASSET_ACCOUNTANCY_CATEGORY;
 			$filters = array();
-			if (!empty($product_static->accountancy_code_buy)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy) . "'";
-			if (!empty($product_static->accountancy_code_buy_intra)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_intra) . "'";
-			if (!empty($product_static->accountancy_code_buy_export)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_export) . "'";
+			if (!empty($product_static->accountancy_code_buy)) {
+				$filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy) . "'";
+			}
+			if (!empty($product_static->accountancy_code_buy_intra)) {
+				$filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_intra) . "'";
+			}
+			if (!empty($product_static->accountancy_code_buy_export)) {
+				$filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_export) . "'";
+			}
 			$sql = "SELECT COUNT(*) AS found";
 			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account";
 			$sql .= " WHERE pcg_type = '" . $this->db->escape($conf->global->ASSET_ACCOUNTANCY_CATEGORY) . "'";

Spacing +13 added lines, -13 removed lines

@@ -110,7 +110,7 @@ 
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
-		} elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)	{
+		} elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
@@ -119,7 +119,7 @@ 
 			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
 				print ' ('.dol_print_date($discount->datec).')';
 			}
-		} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)	{
+		} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
@@ -193,7 +193,7 @@ 
 			// we need to fetch product associated to line for some test
 			if ($object->element == 'propal' || $object->element == 'order' || $object->element == 'facture' || $object->element == 'propal_supplier' || $object->element == 'supplier_proposal' || $object->element == 'commande') {
 				$res = $line->fetch_product();
-				if ($res  > 0  ) {
+				if ($res > 0) {
 					if ($line->product->isService() && $line->product->isMandatoryPeriod()) {
 						print '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSet").'</span></div>';
 					}
@@ -285,7 +285,7 @@ 
 			}
 		}
 		if ($mysoc->useLocalTax(2)) {
-			if (( isset($seller->country_code) && isset($buyer->thirdparty->country_code) && $seller->country_code == $buyer->thirdparty->country_code) || $line->total_localtax2 || $seller->useLocalTax(2)) {
+			if ((isset($seller->country_code) && isset($buyer->thirdparty->country_code) && $seller->country_code == $buyer->thirdparty->country_code) || $line->total_localtax2 || $seller->useLocalTax(2)) {
 				$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", $seller->country_code).'='.price($line->total_localtax2);
 			} else {
 				$tooltiponprice .= '<br>'.$langs->transcountry("TotalLT2", $seller->country_code).'=<span class="opacitymedium">'.$langs->trans($senderissupplier ? "NotUsedForThisVendor" : "NotUsedForThisCustomer").'</span>';
@@ -431,20 +431,20 @@ 
 		) {
 			$accountancy_category_asset = $conf->global->ASSET_ACCOUNTANCY_CATEGORY;
 			$filters = array();
-			if (!empty($product_static->accountancy_code_buy)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy) . "'";
-			if (!empty($product_static->accountancy_code_buy_intra)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_intra) . "'";
-			if (!empty($product_static->accountancy_code_buy_export)) $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_export) . "'";
+			if (!empty($product_static->accountancy_code_buy)) $filters[] = "account_number = '".$this->db->escape($product_static->accountancy_code_buy)."'";
+			if (!empty($product_static->accountancy_code_buy_intra)) $filters[] = "account_number = '".$this->db->escape($product_static->accountancy_code_buy_intra)."'";
+			if (!empty($product_static->accountancy_code_buy_export)) $filters[] = "account_number = '".$this->db->escape($product_static->accountancy_code_buy_export)."'";
 			$sql = "SELECT COUNT(*) AS found";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account";
-			$sql .= " WHERE pcg_type = '" . $this->db->escape($conf->global->ASSET_ACCOUNTANCY_CATEGORY) . "'";
-			$sql .= " AND (" . implode(' OR ', $filters). ")";
+			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account";
+			$sql .= " WHERE pcg_type = '".$this->db->escape($conf->global->ASSET_ACCOUNTANCY_CATEGORY)."'";
+			$sql .= " AND (".implode(' OR ', $filters).")";
 			$resql_asset = $this->db->query($sql);
 			if (!$resql_asset) {
-				print 'Error SQL: ' . $this->db->lasterror();
+				print 'Error SQL: '.$this->db->lasterror();
 			} elseif ($obj = $this->db->fetch_object($resql_asset)) {
 				if (!empty($obj->found)) {
-					print '<a class="reposition" href="' . DOL_URL_ROOT . '/asset/card.php?action=create&token='.newToken().'&supplier_invoice_id='.$object->id.'">';
-					print img_edit_add() . '</a>';
+					print '<a class="reposition" href="'.DOL_URL_ROOT.'/asset/card.php?action=create&token='.newToken().'&supplier_invoice_id='.$object->id.'">';
+					print img_edit_add().'</a>';
 				}
 			}
 		}

htdocs/reception/list.php

Braces +6 added lines, -3 removed lines

@@ -349,8 +349,9 @@ 
 
 							$rang = $i;
 							//there may already be rows from previous receptions
-							if (!empty($createbills_onebythird))
-								$rang = $TFactThirdNbLines[$rcp->socid];
+							if (!empty($createbills_onebythird)) {
+															$rang = $TFactThirdNbLines[$rcp->socid];
+							}
 
 							$result = $objecttmp->addline(
 								$desc,
@@ -380,8 +381,10 @@ 
 
 							if ($result > 0) {
 								$lineid = $result;
-								if (!empty($createbills_onebythird)) //increment rang to keep order
+								if (!empty($createbills_onebythird)) {
+									//increment rang to keep order
 									$TFactThirdNbLines[$rcp->socid]++;
+								}
 							} else {
 								$lineid = 0;
 								$error++;

Spacing +6 added lines, -6 removed lines

@@ -59,7 +59,7 @@ 
 $search_date_delivery_endday = GETPOST('search_date_delivery_endday', 'int');
 $search_date_delivery_endmonth = GETPOST('search_date_delivery_endmonth', 'int');
 $search_date_delivery_endyear = GETPOST('search_date_delivery_endyear', 'int');
-$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear);	// Use tzserver
+$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear); // Use tzserver
 $search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear);
 $search_date_create_startday = GETPOST('search_date_create_startday', 'int');
 $search_date_create_startmonth = GETPOST('search_date_create_startmonth', 'int');
@@ -67,7 +67,7 @@ 
 $search_date_create_endday = GETPOST('search_date_create_endday', 'int');
 $search_date_create_endmonth = GETPOST('search_date_create_endmonth', 'int');
 $search_date_create_endyear = GETPOST('search_date_create_endyear', 'int');
-$search_date_create_start = dol_mktime(0, 0, 0, $search_date_create_startmonth, $search_date_create_startday, $search_date_create_startyear);	// Use tzserver
+$search_date_create_start = dol_mktime(0, 0, 0, $search_date_create_startmonth, $search_date_create_startday, $search_date_create_startyear); // Use tzserver
 $search_date_create_end = dol_mktime(23, 59, 59, $search_date_create_endmonth, $search_date_create_endday, $search_date_create_endyear);
 $search_billed = GETPOST("search_billed", 'int');
 $sall = GETPOST('sall', 'alphanohtml');
@@ -221,7 +221,7 @@ 
 		$TFactThirdNbLines = array();
 
 		$nb_bills_created = 0;
-		$lastid= 0;
+		$lastid = 0;
 		$lastref = '';
 
 		$db->begin();
@@ -349,7 +349,7 @@ 
 				// if the VAT reverse-charge is activated by default in supplier card to resume the information
 				$objecttmp->vat_reverse_charge = $soc->vat_reverse_charge;
 
-				$objecttmp->fk_project			= $rcp->fk_project;
+				$objecttmp->fk_project = $rcp->fk_project;
 				//$objecttmp->multicurrency_code = $rcp->multicurrency_code;
 				if (empty($createbills_onebythird)) {
 					$objecttmp->ref_supplier = $rcp->ref;
@@ -382,7 +382,7 @@ 
 					}
 				}
 
-				$res = $objecttmp->create($user);		// This should create the supplier invoice + links into $objecttmp->linked_objects + add a link to ->origin_id
+				$res = $objecttmp->create($user); // This should create the supplier invoice + links into $objecttmp->linked_objects + add a link to ->origin_id
 
 				//var_dump($objecttmp->error);exit;
 				if ($res > 0) {
@@ -555,7 +555,7 @@ 
 
 				$id = $objecttmp->id; // For builddoc action
 				$lastref = $objecttmp->ref; // generated ref
-				$object  =$objecttmp;
+				$object  = $objecttmp;
 
 				// Fac builddoc
 				$donotredirect = 1;

htdocs/asset/tpl/depreciation_options_view.tpl.php

Spacing +9 added lines, -9 removed lines

@@ -67,7 +67,7 @@ 
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border centpercent tableforfield">' . "\n";
+		print '<table class="border centpercent tableforfield">'."\n";
 		$mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
 		foreach ($mode_info['fields'] as $field_key => $field_info) {
 			if (!empty($field_info['enabled_field'])) {
@@ -94,11 +94,11 @@ 
 				print '<table class="border centpercent tableforfield">';
 			}
 
-			$key = $mode_key . '_' . $field_key;
+			$key = $mode_key.'_'.$field_key;
 			$value = $assetdepreciationoptions->deprecation_options[$mode_key][$field_key];
 
-			print '<tr class="field_' . $key . '"><td';
-			print ' class="' . (empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']) . ' fieldname_' . $key;
+			print '<tr class="field_'.$key.'"><td';
+			print ' class="'.(empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']).' fieldname_'.$key;
 			if ($field_info['type'] == 'text' || $field_info['type'] == 'html') {
 				print ' tdtop';
 			}
@@ -113,12 +113,12 @@ 
 				}
 			}
 			print '</td>';
-			print '<td class="valuefield fieldname_' . $key;
+			print '<td class="valuefield fieldname_'.$key;
 			if ($field_info['type'] == 'text') {
 				print ' wordbreak';
 			}
 			if (!empty($field_info['cssview'])) {
-				print ' ' . $field_info['cssview'];
+				print ' '.$field_info['cssview'];
 			}
 			print '">';
 			if (in_array($field_info['type'], array('text', 'html'))) {
@@ -126,15 +126,15 @@ 
 			}
 			if ($field_key == 'lang') {
 				$langs->load("languages");
-				$labellang = ($value ? $langs->trans('Language_' . $value) : '');
+				$labellang = ($value ? $langs->trans('Language_'.$value) : '');
 				print picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"');
 				print $labellang;
 			} else {
 				if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 2) {
-					$out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+					$out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0);
 					print showValueWithClipboardCPButton($out, 0, $out);
 				} else {
-					print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+					print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key.'_', 0);
 				}
 			}
 			if (in_array($field_info['type'], array('text', 'html'))) {

htdocs/accountancy/class/accountancyimport.class.php

Spacing +2 added lines, -2 removed lines

@@ -106,7 +106,7 @@ 
 				$amount = $credit;
 			}
 
-			return "'" . $this->db->escape(abs($amount)) . "'";
+			return "'".$this->db->escape(abs($amount))."'";
 		}
 
 		return "''";
@@ -134,7 +134,7 @@ 
 				$sens = 'C';
 			}
 
-			return "'" . $this->db->escape($sens) . "'";
+			return "'".$this->db->escape($sens)."'";
 		}
 
 		return "''";

htdocs/fourn/class/fournisseur.facture-rec.class.php

Braces +3 added lines, -1 removed lines

@@ -479,7 +479,9 @@
 		$sql .= " titre = '" . (!empty($this->titre) ? $this->db->escape($this->titre) : "")."'," ;
 		$sql .= " ref_supplier = '". (!empty($this->ref_supplier) ? $this->db->escape($this->ref_supplier) : "")."',";
 		$sql .= " entity = ". (!empty($this->entity) ? ((int) $this->entity) : 1) . ',';
-		if ($this->fk_soc > 0) $sql .= " fk_soc = ". (int) $this->fk_soc. ',';
+		if ($this->fk_soc > 0) {
+			$sql .= " fk_soc = ". (int) $this->fk_soc. ',';
+		}
 		$sql .= " suspended = ". (!empty($this->suspended) ? ((int) $this->suspended) : 0) . ',';
 		$sql .= " libelle = ". (!empty($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : 'NULL') . ",";
 		$sql .= " vat_src_code = ". (!empty($this->vat_src_code) ? "'".$this->db->escape($this->vat_src_code)."'" : 'NULL') . ',';

Spacing +199 added lines, -199 removed lines

@@ -334,32 +334,32 @@ 
 			$sql .= ", '".$this->db->idate($now)."'";
 			$sql .= ", ".((int) $this->suspended);
 			$sql .= ", '".$this->db->escape($this->libelle)."'";
-			$sql .= ", " .(!empty($facfourn_src->total_ttc) ? (float) $facfourn_src->total_ttc : '0');                              // amount
-			$sql .= ", " .((int) $user->id);
-			$sql .= ", " .(!empty($this->fk_project) ? ((int) $this->fk_project) : 'NULL');
-			$sql .= ", " .(!empty($facfourn_src->fk_account) ? ((int) $facfourn_src->fk_account) : 'NULL');
-			$sql .= ", " .($this->cond_reglement_id > 0 ? (int) $this->cond_reglement_id : 'NULL');
-			$sql .= ", " .($this->mode_reglement_id > 0 ? (int) $this->mode_reglement_id : 'NULL');
-			$sql .= ", ".($facfourn_src->date_echeance > 0 ? "'".$this->db->idate($facfourn_src->date_echeance)."'" : 'NULL');      // date_lim_reglement
-			$sql .= ", " .(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : 'NULL');
-			$sql .= ", " .(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : 'NULL');
-			$sql .= ", " .(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : 'NULL');
-			$sql .= ", " . (int) $facfourn_src->fk_multicurrency;
+			$sql .= ", ".(!empty($facfourn_src->total_ttc) ? (float) $facfourn_src->total_ttc : '0'); // amount
+			$sql .= ", ".((int) $user->id);
+			$sql .= ", ".(!empty($this->fk_project) ? ((int) $this->fk_project) : 'NULL');
+			$sql .= ", ".(!empty($facfourn_src->fk_account) ? ((int) $facfourn_src->fk_account) : 'NULL');
+			$sql .= ", ".($this->cond_reglement_id > 0 ? (int) $this->cond_reglement_id : 'NULL');
+			$sql .= ", ".($this->mode_reglement_id > 0 ? (int) $this->mode_reglement_id : 'NULL');
+			$sql .= ", ".($facfourn_src->date_echeance > 0 ? "'".$this->db->idate($facfourn_src->date_echeance)."'" : 'NULL'); // date_lim_reglement
+			$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : 'NULL');
+			$sql .= ", ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : 'NULL');
+			$sql .= ", ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : 'NULL');
+			$sql .= ", ".(int) $facfourn_src->fk_multicurrency;
 			$sql .= ", '".$this->db->escape($facfourn_src->multicurrency_code)."'";
-			$sql .= ", " . (float) $facfourn_src->multicurrency_tx;
-			$sql .= ", " . (int) $this->usenewprice;
-			$sql .= ", " . (int) $this->frequency;
+			$sql .= ", ".(float) $facfourn_src->multicurrency_tx;
+			$sql .= ", ".(int) $this->usenewprice;
+			$sql .= ", ".(int) $this->frequency;
 			$sql .= ", '".$this->db->escape($this->unit_frequency)."'";
-			$sql .= ", " .(!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'NULL');
-			$sql .= ", " .(!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'NULL');
-			$sql .= ", " . (int) $this->nb_gen_done;
-			$sql .= ", " . (int) $this->nb_gen_max;
-			$sql .= ", " . (int) $this->auto_validate;
-			$sql .= ", " . (int) $this->generate_pdf;
+			$sql .= ", ".(!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'NULL');
+			$sql .= ", ".(!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'NULL');
+			$sql .= ", ".(int) $this->nb_gen_done;
+			$sql .= ", ".(int) $this->nb_gen_max;
+			$sql .= ", ".(int) $this->auto_validate;
+			$sql .= ", ".(int) $this->generate_pdf;
 			$sql .= ')';
 
 			if ($this->db->query($sql)) {
-				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX. 'facture_fourn_rec');
+				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_rec');
 
 				// Fields used into addline later
 				$this->fk_multicurrency = $facfourn_src->fk_multicurrency;
@@ -496,42 +496,42 @@ 
 		$error = 0;
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_rec SET";
-		$sql .= " titre = '" . (!empty($this->titre) ? $this->db->escape($this->titre) : "")."'," ;
-		$sql .= " ref_supplier = '". (!empty($this->ref_supplier) ? $this->db->escape($this->ref_supplier) : "")."',";
-		$sql .= " entity = ". (!empty($this->entity) ? ((int) $this->entity) : 1) . ',';
-		if ($this->fk_soc > 0) $sql .= " fk_soc = ". (int) $this->fk_soc. ',';
-		$sql .= " suspended = ". (!empty($this->suspended) ? ((int) $this->suspended) : 0) . ',';
-		$sql .= " libelle = ". (!empty($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : 'NULL') . ",";
-		$sql .= " vat_src_code = ". (!empty($this->vat_src_code) ? "'".$this->db->escape($this->vat_src_code)."'" : 'NULL') . ',';
-		$sql .= " localtax1 = ". (!empty($this->localtax1) ? ((float) $this->localtax1) : 0.00) . ',';
-		$sql .= " localtax2 = ". (!empty($this->localtax2) ? ((float) $this->localtax2) : 0.00) . ',';
-		$sql .= " total_ht = ". (!empty($this->total_ht) ? ((float) $this->total_ht) : 0.00) . ',';
-		$sql .= " total_tva = ". (!empty($this->total_tva) ? ((float) $this->total_tva) : 0.00) . ',';
-		$sql .= " total_ttc = ". (!empty($this->total_ttc) ? ((float) $this->total_ttc) : 0.00) . ',';
-		$sql .= " fk_user_modif = ". ((int) $user->id) . ',';
-		$sql .= " fk_projet = ". (!empty($this->fk_project) ? ((int) $this->fk_project) : 'NULL') . ',';
-		$sql .= " fk_account = ". (!empty($this->fk_account) ? ((int) $this->fk_account) : 'NULL') . ',';
-		$sql .= " fk_mode_reglement = ". (!empty($this->mode_reglement_id) ? ((int) $this->mode_reglement_id) : 'NULL') . ',';
-		$sql .= " fk_cond_reglement = ". (!empty($this->cond_reglement_id) ? ((int) $this->cond_reglement_id) : 'NULL') . ',';
-		$sql .= " date_lim_reglement = ". (!empty($this->date_lim_reglement) ? "'".$this->db->idate($this->date_lim_reglement)."'" : 'NULL') . ',';
-		$sql .= " note_private = '". (!empty($this->note_private) ? $this->db->escape($this->note_private) : '') . "',";
-		$sql .= " note_public = '". (!empty($this->note_public) ? $this->db->escape($this->note_public) : '') . "',";
-		$sql .= " modelpdf = ". (!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : 'NULL') . ",";
-		$sql .= " fk_multicurrency = ". (!empty($this->fk_multicurrency) ? ((int) $this->fk_multicurrency) : 'NULL') . ',';
-		$sql .= " multicurrency_code = ". (!empty($this->multicurrency_code) ? "'".$this->db->escape($this->multicurrency_code)."'" : 'NULL') . ",";
-		$sql .= " multicurrency_tx = ". (!empty($this->multicurrency_tx) ? ((float) $this->multicurrency_tx) : 1) . ',';
-		$sql .= " multicurrency_total_ht = ". (!empty($this->multicurrency_total_ht) ? ((float) $this->multicurrency_total_ht) : 0.00) . ',';
-		$sql .= " multicurrency_total_tva = ". (!empty($this->multicurrency_total_tva) ? ((float) $this->multicurrency_total_tva) : 0.00) . ',';
-		$sql .= " multicurrency_total_ttc = ". (!empty($this->multicurrency_total_ttc) ? ((float) $this->multicurrency_total_ttc) : 0.00) . ',';
-		$sql .= " usenewprice = ". (!empty($this->usenewprice) ? ((int) $this->usenewprice) : 0) . ',';
-		$sql .= " frequency = ". (!empty($this->frequency) ? ((int) $this->frequency) : 0). ',';
-		$sql .= " unit_frequency = '". (!empty($this->unit_frequency) ? $this->db->escape($this->unit_frequency) : ''). "',";
-		$sql .= " date_when = ". (!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'NULL') . ',';
-		$sql .= " date_last_gen = ". (!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'NULL') . ',';
-		$sql .= " nb_gen_done = ". (!empty($this->nb_gen_done) ? ((int) $this->nb_gen_done) : 0) . ',';
-		$sql .= " nb_gen_max = ". (!empty($this->nb_gen_max) ? ((int) $this->nb_gen_max) : 0) . ',';
-		$sql .= " auto_validate = ". (!empty($this->auto_validate) ? ((int) $this->auto_validate) : 0);
-		$sql .= " WHERE rowid = ". (int) $this->id;
+		$sql .= " titre = '".(!empty($this->titre) ? $this->db->escape($this->titre) : "")."',";
+		$sql .= " ref_supplier = '".(!empty($this->ref_supplier) ? $this->db->escape($this->ref_supplier) : "")."',";
+		$sql .= " entity = ".(!empty($this->entity) ? ((int) $this->entity) : 1).',';
+		if ($this->fk_soc > 0) $sql .= " fk_soc = ".(int) $this->fk_soc.',';
+		$sql .= " suspended = ".(!empty($this->suspended) ? ((int) $this->suspended) : 0).',';
+		$sql .= " libelle = ".(!empty($this->libelle) ? "'".$this->db->escape($this->libelle)."'" : 'NULL').",";
+		$sql .= " vat_src_code = ".(!empty($this->vat_src_code) ? "'".$this->db->escape($this->vat_src_code)."'" : 'NULL').',';
+		$sql .= " localtax1 = ".(!empty($this->localtax1) ? ((float) $this->localtax1) : 0.00).',';
+		$sql .= " localtax2 = ".(!empty($this->localtax2) ? ((float) $this->localtax2) : 0.00).',';
+		$sql .= " total_ht = ".(!empty($this->total_ht) ? ((float) $this->total_ht) : 0.00).',';
+		$sql .= " total_tva = ".(!empty($this->total_tva) ? ((float) $this->total_tva) : 0.00).',';
+		$sql .= " total_ttc = ".(!empty($this->total_ttc) ? ((float) $this->total_ttc) : 0.00).',';
+		$sql .= " fk_user_modif = ".((int) $user->id).',';
+		$sql .= " fk_projet = ".(!empty($this->fk_project) ? ((int) $this->fk_project) : 'NULL').',';
+		$sql .= " fk_account = ".(!empty($this->fk_account) ? ((int) $this->fk_account) : 'NULL').',';
+		$sql .= " fk_mode_reglement = ".(!empty($this->mode_reglement_id) ? ((int) $this->mode_reglement_id) : 'NULL').',';
+		$sql .= " fk_cond_reglement = ".(!empty($this->cond_reglement_id) ? ((int) $this->cond_reglement_id) : 'NULL').',';
+		$sql .= " date_lim_reglement = ".(!empty($this->date_lim_reglement) ? "'".$this->db->idate($this->date_lim_reglement)."'" : 'NULL').',';
+		$sql .= " note_private = '".(!empty($this->note_private) ? $this->db->escape($this->note_private) : '')."',";
+		$sql .= " note_public = '".(!empty($this->note_public) ? $this->db->escape($this->note_public) : '')."',";
+		$sql .= " modelpdf = ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : 'NULL').",";
+		$sql .= " fk_multicurrency = ".(!empty($this->fk_multicurrency) ? ((int) $this->fk_multicurrency) : 'NULL').',';
+		$sql .= " multicurrency_code = ".(!empty($this->multicurrency_code) ? "'".$this->db->escape($this->multicurrency_code)."'" : 'NULL').",";
+		$sql .= " multicurrency_tx = ".(!empty($this->multicurrency_tx) ? ((float) $this->multicurrency_tx) : 1).',';
+		$sql .= " multicurrency_total_ht = ".(!empty($this->multicurrency_total_ht) ? ((float) $this->multicurrency_total_ht) : 0.00).',';
+		$sql .= " multicurrency_total_tva = ".(!empty($this->multicurrency_total_tva) ? ((float) $this->multicurrency_total_tva) : 0.00).',';
+		$sql .= " multicurrency_total_ttc = ".(!empty($this->multicurrency_total_ttc) ? ((float) $this->multicurrency_total_ttc) : 0.00).',';
+		$sql .= " usenewprice = ".(!empty($this->usenewprice) ? ((int) $this->usenewprice) : 0).',';
+		$sql .= " frequency = ".(!empty($this->frequency) ? ((int) $this->frequency) : 0).',';
+		$sql .= " unit_frequency = '".(!empty($this->unit_frequency) ? $this->db->escape($this->unit_frequency) : '')."',";
+		$sql .= " date_when = ".(!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'NULL').',';
+		$sql .= " date_last_gen = ".(!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'NULL').',';
+		$sql .= " nb_gen_done = ".(!empty($this->nb_gen_done) ? ((int) $this->nb_gen_done) : 0).',';
+		$sql .= " nb_gen_max = ".(!empty($this->nb_gen_max) ? ((int) $this->nb_gen_max) : 0).',';
+		$sql .= " auto_validate = ".(!empty($this->auto_validate) ? ((int) $this->auto_validate) : 0);
+		$sql .= " WHERE rowid = ".(int) $this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -590,7 +590,7 @@ 
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
 		$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')';
 		if ($rowid) {
-			$sql .= ' AND f.rowid='. (int) $rowid;
+			$sql .= ' AND f.rowid='.(int) $rowid;
 		} elseif ($ref) {
 			$sql .= " AND f.titre='".$this->db->escape($ref)."'";
 		} else {
@@ -722,7 +722,7 @@ 
 		$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det_rec as l';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-		$sql .= ' WHERE l.fk_facture_fourn = '. (int) $this->id;
+		$sql .= ' WHERE l.fk_facture_fourn = '.(int) $this->id;
 		$sql .= ' ORDER BY l.rang';
 
 		dol_syslog('FactureFournisseurRec::fetch_lines', LOG_DEBUG);
@@ -762,7 +762,7 @@ 
 				$line->product_type             = $objp->product_type;
 				$line->date_start               = $objp->date_start;
 				$line->date_end                 = $objp->date_end;
-				$line->info_bits                = $objp->info_bits	;
+				$line->info_bits                = $objp->info_bits;
 				$line->special_code             = $objp->special_code;
 				$line->rang                     = $objp->rang;
 				$line->fk_unit                  = $objp->fk_unit;
@@ -812,11 +812,11 @@ 
 		$main = MAIN_DB_PREFIX.'facture_fourn_det_rec';
 		$ef = $main."_extrafields";
 
-		$sqlef = "DELETE FROM ".$ef." WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_facture_fourn = ". (int) $rowid .")";
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_det_rec WHERE fk_facture_fourn = ". (int) $rowid;
+		$sqlef = "DELETE FROM ".$ef." WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_facture_fourn = ".(int) $rowid.")";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_det_rec WHERE fk_facture_fourn = ".(int) $rowid;
 
 		if ($this->db->query($sqlef) && $this->db->query($sql)) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_rec WHERE rowid = ". (int) $rowid;
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_rec WHERE rowid = ".(int) $rowid;
 			dol_syslog($sql);
 			if ($this->db->query($sql)) {
 				// Delete linked object
@@ -845,7 +845,7 @@ 
 			}
 			// End call triggers
 		}
-		if (! $error) {
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -957,7 +957,7 @@ 
 				}
 			}
 
-			$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . 'facture_fourn_det_rec (';
+			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det_rec (';
 			$sql .= 'fk_facture_fourn';
 			$sql .= ', fk_product';
 			$sql .= ', ref';
@@ -989,46 +989,46 @@ 
 			$sql .= ', fk_user_author';
 			$sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
 			$sql .= ') VALUES (';
-			$sql .= ' ' . (int) $facid;   // source supplier invoie id
-			$sql .= ', ' . (!empty($fk_product) ? "'" . $this->db->escape($fk_product) . "'" : 'null');
-			$sql .= ', ' . (!empty($ref) ? "'" . $this->db->escape($ref) . "'" : 'null');
-			$sql .= ', ' . (!empty($label) ? "'" . $this->db->escape($label) . "'" : 'null');
-			$sql .= ", '" . $this->db->escape($desc) . "'";
-			$sql .= ', ' . price2num($pu_ht);
-			$sql .= ', ' . price2num($pu_ttc);
-			$sql .= ', ' . price2num($qty);
-			$sql .= ', ' . price2num($remise_percent);
+			$sql .= ' '.(int) $facid; // source supplier invoie id
+			$sql .= ', '.(!empty($fk_product) ? "'".$this->db->escape($fk_product)."'" : 'null');
+			$sql .= ', '.(!empty($ref) ? "'".$this->db->escape($ref)."'" : 'null');
+			$sql .= ', '.(!empty($label) ? "'".$this->db->escape($label)."'" : 'null');
+			$sql .= ", '".$this->db->escape($desc)."'";
+			$sql .= ', '.price2num($pu_ht);
+			$sql .= ', '.price2num($pu_ttc);
+			$sql .= ', '.price2num($qty);
+			$sql .= ', '.price2num($remise_percent);
 			$sql .= ', null';
-			$sql .= ", '" . $this->db->escape($vat_src_code) . "'";
-			$sql .= ', ' . price2num($txtva);
-			$sql .= ', ' . price2num($txlocaltax1);
-			$sql .= ", '" . $this->db->escape(isset($localtaxes_type[0]) ? $localtaxes_type[0] : '') . "'";
-			$sql .= ', ' . price2num($txlocaltax2);
-			$sql .= ", '" . $this->db->escape(isset($localtaxes_type[2]) ? $localtaxes_type[2] : '') . "'";
-			$sql .= ', ' . price2num($total_ht);
-			$sql .= ', ' . price2num($total_tva);
-			$sql .= ', ' . price2num($total_localtax1);
-			$sql .= ', ' . price2num($total_localtax2);
-			$sql .= ', ' . price2num($total_ttc);
-			$sql .= ', ' . (int) $product_type;
-			$sql .= ', ' . ($date_start > 0 ? (int) $date_start : 'NULL');
-			$sql .= ', ' . ($date_end > 0 ? (int) $date_end : 'NULL');
-			$sql .= ', ' . (int) $info_bits;
-			$sql .= ', ' . (int) $special_code;
-			$sql .= ', ' . (int) $rang;
-			$sql .= ', ' . ($fk_unit ? (int) $fk_unit : 'NULL');
-			$sql .= ', ' . (int) $user;
-			$sql .= ', ' . (int) $this->fk_multicurrency;
-			$sql .= ", '" . $this->db->escape($this->multicurrency_code) . "'";
-			$sql .= ', ' . price2num($pu_ht_devise, 'CU');
-			$sql .= ', ' . price2num($multicurrency_total_ht, 'CT');
-			$sql .= ', ' . price2num($multicurrency_total_tva, 'CT');
-			$sql .= ', ' . price2num($multicurrency_total_ttc, 'CT');
+			$sql .= ", '".$this->db->escape($vat_src_code)."'";
+			$sql .= ', '.price2num($txtva);
+			$sql .= ', '.price2num($txlocaltax1);
+			$sql .= ", '".$this->db->escape(isset($localtaxes_type[0]) ? $localtaxes_type[0] : '')."'";
+			$sql .= ', '.price2num($txlocaltax2);
+			$sql .= ", '".$this->db->escape(isset($localtaxes_type[2]) ? $localtaxes_type[2] : '')."'";
+			$sql .= ', '.price2num($total_ht);
+			$sql .= ', '.price2num($total_tva);
+			$sql .= ', '.price2num($total_localtax1);
+			$sql .= ', '.price2num($total_localtax2);
+			$sql .= ', '.price2num($total_ttc);
+			$sql .= ', '.(int) $product_type;
+			$sql .= ', '.($date_start > 0 ? (int) $date_start : 'NULL');
+			$sql .= ', '.($date_end > 0 ? (int) $date_end : 'NULL');
+			$sql .= ', '.(int) $info_bits;
+			$sql .= ', '.(int) $special_code;
+			$sql .= ', '.(int) $rang;
+			$sql .= ', '.($fk_unit ? (int) $fk_unit : 'NULL');
+			$sql .= ', '.(int) $user;
+			$sql .= ', '.(int) $this->fk_multicurrency;
+			$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
+			$sql .= ', '.price2num($pu_ht_devise, 'CU');
+			$sql .= ', '.price2num($multicurrency_total_ht, 'CT');
+			$sql .= ', '.price2num($multicurrency_total_tva, 'CT');
+			$sql .= ', '.price2num($multicurrency_total_ttc, 'CT');
 			$sql .= ')';
 
-			dol_syslog(get_class($this). '::addline', LOG_DEBUG);
+			dol_syslog(get_class($this).'::addline', LOG_DEBUG);
 			if ($this->db->query($sql)) {
-				$lineId = $this->db->last_insert_id(MAIN_DB_PREFIX. 'facture_fourn_det_rec');
+				$lineId = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det_rec');
 				$this->update_price();
 				$this->id = $facid;
 				$this->db->commit();
@@ -1079,7 +1079,7 @@ 
 
 		$facid = $this->id;
 
-		dol_syslog(get_class($this). '::updateline facid=' .$facid." rowid=$rowid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, price_base_type=$price_base_type, pu_ttc=$pu_ttc, type=$type, fk_unit=$fk_unit, pu_ht_devise=$pu_ht_devise", LOG_DEBUG);
+		dol_syslog(get_class($this).'::updateline facid='.$facid." rowid=$rowid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, price_base_type=$price_base_type, pu_ttc=$pu_ttc, type=$type, fk_unit=$fk_unit, pu_ht_devise=$pu_ht_devise", LOG_DEBUG);
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		// Check parameters
@@ -1150,41 +1150,41 @@ 
 				$product_type = $product->type;
 			}
 
-			$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facture_fourn_det_rec SET';
-			$sql .= ' fk_facture_fourn = ' . ((int) $facid);
-			$sql .= ', fk_product = ' . ($fk_product > 0 ? ((int) $fk_product) : 'null');
-			$sql .= ", ref = '" . $this->db->escape($ref) . "'";
-			$sql .= ", label = '" . $this->db->escape($label) . "'";
-			$sql .= ", description = '" . $this->db->escape($desc) . "'";
-			$sql .= ', pu_ht = ' . price2num($pu_ht);
-			$sql .= ', qty = ' . price2num($qty);
-			$sql .= ", remise_percent = '" . price2num($remise_percent) . "'";
-			$sql .= ", vat_src_code = '" . $this->db->escape($vat_src_code) . "'";
-			$sql .= ', tva_tx = ' . price2num($txtva);
-			$sql .= ', localtax1_tx = ' . (float) $txlocaltax1;
-			$sql .= ", localtax1_type = '" . $this->db->escape($localtaxes_type[0]) . "'";
-			$sql .= ', localtax2_tx = ' . (float) $txlocaltax2;
-			$sql .= ", localtax2_type = '" . $this->db->escape($localtaxes_type[2]) . "'";
-			$sql .= ", total_ht = '" . price2num($total_ht) . "'";
-			$sql .= ", total_tva = '" . price2num($total_tva) . "'";
-			$sql .= ", total_localtax1 = '" . price2num($total_localtax1) . "'";
-			$sql .= ", total_localtax2 = '" . price2num($total_localtax2) . "'";
-			$sql .= ", total_ttc = '" . price2num($total_ttc) . "'";
-			$sql .= ', product_type = ' . (int) $product_type;
-			$sql .= ', date_start = ' . (empty($date_start) ? 'NULL' : (int) $date_start);
-			$sql .= ', date_end = ' . (empty($date_end) ? 'NULL' : (int) $date_end);
-			$sql .= ', info_bits = ' . (int) $info_bits;
-			$sql .= ', special_code = ' . (int) $special_code;
-			$sql .= ', rang = ' . (int) $rang;
-			$sql .= ', fk_unit = ' . ($fk_unit ? "'" . $this->db->escape($fk_unit) . "'" : 'null');
-			$sql .= ', fk_user_modif = ' . (int) $user;
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn_det_rec SET';
+			$sql .= ' fk_facture_fourn = '.((int) $facid);
+			$sql .= ', fk_product = '.($fk_product > 0 ? ((int) $fk_product) : 'null');
+			$sql .= ", ref = '".$this->db->escape($ref)."'";
+			$sql .= ", label = '".$this->db->escape($label)."'";
+			$sql .= ", description = '".$this->db->escape($desc)."'";
+			$sql .= ', pu_ht = '.price2num($pu_ht);
+			$sql .= ', qty = '.price2num($qty);
+			$sql .= ", remise_percent = '".price2num($remise_percent)."'";
+			$sql .= ", vat_src_code = '".$this->db->escape($vat_src_code)."'";
+			$sql .= ', tva_tx = '.price2num($txtva);
+			$sql .= ', localtax1_tx = '.(float) $txlocaltax1;
+			$sql .= ", localtax1_type = '".$this->db->escape($localtaxes_type[0])."'";
+			$sql .= ', localtax2_tx = '.(float) $txlocaltax2;
+			$sql .= ", localtax2_type = '".$this->db->escape($localtaxes_type[2])."'";
+			$sql .= ", total_ht = '".price2num($total_ht)."'";
+			$sql .= ", total_tva = '".price2num($total_tva)."'";
+			$sql .= ", total_localtax1 = '".price2num($total_localtax1)."'";
+			$sql .= ", total_localtax2 = '".price2num($total_localtax2)."'";
+			$sql .= ", total_ttc = '".price2num($total_ttc)."'";
+			$sql .= ', product_type = '.(int) $product_type;
+			$sql .= ', date_start = '.(empty($date_start) ? 'NULL' : (int) $date_start);
+			$sql .= ', date_end = '.(empty($date_end) ? 'NULL' : (int) $date_end);
+			$sql .= ', info_bits = '.(int) $info_bits;
+			$sql .= ', special_code = '.(int) $special_code;
+			$sql .= ', rang = '.(int) $rang;
+			$sql .= ', fk_unit = '.($fk_unit ? "'".$this->db->escape($fk_unit)."'" : 'null');
+			$sql .= ', fk_user_modif = '.(int) $user;
 			$sql .= ', multicurrency_subprice = '.price2num($pu_ht_devise);
 			$sql .= ', multicurrency_total_ht = '.price2num($multicurrency_total_ht);
 			$sql .= ', multicurrency_total_tva = '.price2num($multicurrency_total_tva);
 			$sql .= ', multicurrency_total_ttc = '.price2num($multicurrency_total_ttc);
-			$sql .= ' WHERE rowid = ' . (int) $rowid;
+			$sql .= ' WHERE rowid = '.(int) $rowid;
 
-			dol_syslog(get_class($this). '::updateline', LOG_DEBUG);
+			dol_syslog(get_class($this).'::updateline', LOG_DEBUG);
 			if ($this->db->query($sql)) {
 				$this->id = $facid;
 				$this->update_price();
@@ -1273,16 +1273,16 @@ 
 		$tmparray = dol_getdate($now);
 		$today = dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year']); // Today is last second of current day
 
-		dol_syslog('createRecurringInvoices restrictioninvoiceid=' .$restrictioninvoiceid. ' forcevalidation=' .$forcevalidation);
+		dol_syslog('createRecurringInvoices restrictioninvoiceid='.$restrictioninvoiceid.' forcevalidation='.$forcevalidation);
 
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_fourn_rec';
 		$sql .= ' WHERE frequency > 0'; // A recurring supplier invoice is an invoice with a frequency
 		$sql .= " AND (date_when IS NULL OR date_when <= '".$this->db->idate($today)."')";
 		$sql .= ' AND (nb_gen_done < nb_gen_max OR nb_gen_max = 0)';
 		$sql .= ' AND suspended = 0';
-		$sql .= ' AND entity = '. (int) $conf->entity; // MUST STAY = $conf->entity here
+		$sql .= ' AND entity = '.(int) $conf->entity; // MUST STAY = $conf->entity here
 		if ($restrictioninvoiceid > 0) {
-			$sql .= ' AND rowid = '. (int) $restrictioninvoiceid;
+			$sql .= ' AND rowid = '.(int) $restrictioninvoiceid;
 		}
 		$sql .= $this->db->order('entity', 'ASC');
 		//print $sql;exit;
@@ -1320,14 +1320,14 @@ 
 					// Set entity context
 					$conf->entity = $facturerec->entity;
 
-					dol_syslog('createRecurringInvoices Process invoice template id=' .$facturerec->id. ', ref=' .$facturerec->ref. ', entity=' .$facturerec->entity);
+					dol_syslog('createRecurringInvoices Process invoice template id='.$facturerec->id.', ref='.$facturerec->ref.', entity='.$facturerec->entity);
 
 					$new_fac_fourn = new FactureFournisseur($this->db);
 					$new_fac_fourn->fac_rec = $facturerec->id; // We will create $facture from this recurring invoice
 					$new_fac_fourn->fk_fac_rec_source = $facturerec->id; // We will create $facture from this recurring invoice
 
 					$new_fac_fourn->type = self::TYPE_STANDARD;
-					$new_fac_fourn->statut = self::STATUS_DRAFT;	// deprecated
+					$new_fac_fourn->statut = self::STATUS_DRAFT; // deprecated
 					$new_fac_fourn->status = self::STATUS_DRAFT;
 					$new_fac_fourn->date = empty($facturerec->date_when) ? $now : $facturerec->date_when; // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
 					$new_fac_fourn->socid = $facturerec->socid;
@@ -1336,7 +1336,7 @@ 
 					$new_fac_fourn->model_pdf = $facturerec->model_pdf;
 					$new_fac_fourn->fk_project = $facturerec->fk_project;
 					$new_fac_fourn->label = $facturerec->label;
-					$new_fac_fourn->libelle = $facturerec->label;	// deprecated
+					$new_fac_fourn->libelle = $facturerec->label; // deprecated
 
 					$invoiceidgenerated = $new_fac_fourn->create($user);
 					if ($invoiceidgenerated <= 0) {
@@ -1365,22 +1365,22 @@ 
 					}
 				} else {
 					$error++;
-					$this->error = 'Failed to load invoice template with id=' .$line->rowid. ', entity=' .$conf->entity."\n";
-					$this->errors[] = 'Failed to load invoice template with id=' .$line->rowid. ', entity=' .$conf->entity;
-					dol_syslog('createRecurringInvoices Failed to load invoice template with id=' .$line->rowid. ', entity=' .$conf->entity);
+					$this->error = 'Failed to load invoice template with id='.$line->rowid.', entity='.$conf->entity."\n";
+					$this->errors[] = 'Failed to load invoice template with id='.$line->rowid.', entity='.$conf->entity;
+					dol_syslog('createRecurringInvoices Failed to load invoice template with id='.$line->rowid.', entity='.$conf->entity);
 				}
 
 				if (!$error && $invoiceidgenerated >= 0) {
 					$facturerec->nb_gen_done++;
 					$facturerec->date_last_gen = dol_now();
-					$facturerec->date_when= $facturerec->getNextDate();
+					$facturerec->date_when = $facturerec->getNextDate();
 					$facturerec->update($user);
-					$this->db->commit('createRecurringInvoices Process invoice template id=' .$facturerec->id. ', title=' .$facturerec->titre);
-					dol_syslog('createRecurringInvoices Process invoice template ' .$facturerec->titre. ' is finished with a success generation');
+					$this->db->commit('createRecurringInvoices Process invoice template id='.$facturerec->id.', title='.$facturerec->titre);
+					dol_syslog('createRecurringInvoices Process invoice template '.$facturerec->titre.' is finished with a success generation');
 					$nb_create++;
 					$this->output .= $langs->trans('InvoiceGeneratedFromTemplate', $new_fac_fourn->ref, $facturerec->titre)."\n";
 				} else {
-					$this->db->rollback('createRecurringInvoices Process invoice template id=' .$facturerec->id. ', title=' .$facturerec->titre);
+					$this->db->rollback('createRecurringInvoices Process invoice template id='.$facturerec->id.', title='.$facturerec->titre);
 				}
 
 				$parameters = array(
@@ -1473,7 +1473,7 @@ 
 		}
 		$result .= $linkend;
 		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) {
@@ -1652,8 +1652,8 @@ 
 		$prodids = array();
 
 		$sql = 'SELECT rowid';
-		$sql .= ' FROM ' .MAIN_DB_PREFIX. 'product';
-		$sql .= ' WHERE entity IN (' .getEntity('product'). ')';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'product';
+		$sql .= ' WHERE entity IN ('.getEntity('product').')';
 		$sql .= $this->db->plimit(100);
 
 		$resql = $this->db->query($sql);
@@ -1692,7 +1692,7 @@ 
 			$xnbp = 0;
 			while ($xnbp < $nbp) {
 				$line = new FactureLigne($this->db);
-				$line->desc = $langs->trans('Description'). ' ' .$xnbp;
+				$line->desc = $langs->trans('Description').' '.$xnbp;
 				$line->qty = 1;
 				$line->subprice = 100;
 				$line->tva_tx = 19.6;
@@ -1740,7 +1740,7 @@ 
 
 			// Add a line "offered"
 			$line = new FactureLigne($this->db);
-			$line->desc = $langs->trans('Description'). ' (offered line)';
+			$line->desc = $langs->trans('Description').' (offered line)';
 			$line->qty = 1;
 			$line->subprice = 100;
 			$line->tva_tx = 19.6;
@@ -1787,12 +1787,12 @@ 
 	public function setFrequencyAndUnit($frequency, $unit)
 	{
 		if (!$this->table_element) {
-			dol_syslog(get_class($this). '::setFrequencyAndUnit was called on objet with property table_element not defined', LOG_ERR);
+			dol_syslog(get_class($this).'::setFrequencyAndUnit was called on objet with property table_element not defined', LOG_ERR);
 			return -1;
 		}
 
 		if (!empty($frequency) && empty($unit)) {
-			dol_syslog(get_class($this). '::setFrequencyAndUnit was called on objet with params frequency defined but unit not defined', LOG_ERR);
+			dol_syslog(get_class($this).'::setFrequencyAndUnit was called on objet with params frequency defined but unit not defined', LOG_ERR);
 			return -2;
 		}
 
@@ -1831,11 +1831,11 @@ 
 			return -1;
 		}
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql .= " SET date_when = " .($date ? "'".$this->db->idate($date)."'" : "NULL");
+		$sql .= " SET date_when = ".($date ? "'".$this->db->idate($date)."'" : "NULL");
 		if ($increment_nb_gen_done > 0) {
 			$sql .= ", nb_gen_done = nb_gen_done + 1";
 		}
-		$sql .= " WHERE rowid = " . (int) $this->id;
+		$sql .= " WHERE rowid = ".(int) $this->id;
 
 		dol_syslog(get_class($this).'::setNextDate', LOG_DEBUG);
 
@@ -1869,8 +1869,8 @@ 
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql .= " SET nb_gen_max = ". (int) $nb;
-		$sql .= " WHERE rowid = " . (int) $this->id;
+		$sql .= " SET nb_gen_max = ".(int) $nb;
+		$sql .= " WHERE rowid = ".(int) $this->id;
 
 		dol_syslog(get_class($this).'::setMaxPeriod', LOG_DEBUG);
 
@@ -1898,7 +1898,7 @@ 
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET auto_validate = ".((int) $validate);
-		$sql .= " WHERE rowid = " . (int) $this->id;
+		$sql .= " WHERE rowid = ".(int) $this->id;
 
 		dol_syslog(get_class($this).'::setAutoValidate', LOG_DEBUG);
 
@@ -1925,8 +1925,8 @@ 
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-		$sql .= " SET generate_pdf = ". (int) $validate;
-		$sql .= " WHERE rowid = " . (int) $this->id;
+		$sql .= " SET generate_pdf = ".(int) $validate;
+		$sql .= " WHERE rowid = ".(int) $this->id;
 
 		dol_syslog(get_class($this).'::setGeneratePdf', LOG_DEBUG);
 
@@ -1954,7 +1954,7 @@ 
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET modelpdf = '".$this->db->escape($model)."'";
-		$sql .= " WHERE rowid = " . (int) $this->id;
+		$sql .= " WHERE rowid = ".(int) $this->id;
 
 		dol_syslog(get_class($this).'::setModelPdf', LOG_DEBUG);
 
@@ -2028,8 +2028,8 @@ 
 		$error = 0;
 		$this->db->begin();
 
-		if (! $error) {
-			if (! $notrigger) {
+		if (!$error) {
+			if (!$notrigger) {
 				// Call triggers
 				$result = $this->call_trigger('LINESUPPLIERBILLREC_DELETE', $user);
 				if ($result < 0) {
@@ -2039,15 +2039,15 @@ 
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$result = $this->deleteExtraFields();
 			if ($result < 0) {
 				$error++;
 			}
 		}
 
-		if (! $error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element . ' WHERE rowid=' . (int) $this->id;
+		if (!$error) {
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.(int) $this->id;
 
 			$res = $this->db->query($sql);
 			if ($res === false) {
@@ -2087,7 +2087,7 @@ 
 		$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det_rec as l';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-		$sql .= ' WHERE l.rowid = '. (int) $rowid;
+		$sql .= ' WHERE l.rowid = '.(int) $rowid;
 		$sql .= ' ORDER BY l.rang';
 
 		dol_syslog('FactureRec::fetch', LOG_DEBUG);
@@ -2159,44 +2159,44 @@ 
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facture_fourn_det_rec SET';
-		$sql .= ' fk_facture_fourn = ' . (int) $this->fk_facture_fourn;
-		$sql .= ', fk_parent_line = ' . (int) $this->fk_parent;
-		$sql .= ', fk_product = ' . (int) $this->fk_product;
-		$sql .= ', ref = ' . (!empty($this->ref) ? "'" . $this->db->escape($this->ref) . "'" : 'NULL');
-		$sql .= ", label = " . (!empty($this->label) ? "'" . $this->db->escape($this->label) . "'" : 'NULL');
-		$sql .= ", description = '" . $this->db->escape($this->description) . "'";
-		$sql .= ', pu_ht = ' . price2num($this->pu_ht);
-		$sql .= ', pu_ttc = ' . price2num($this->pu_ttc);
-		$sql .= ', qty = ' . price2num($this->qty);
-		$sql .= ", remise_percent = '" . price2num($this->remise_percent) . "'";
-		$sql .= ', fk_remise_except = ' . (int) $this->fk_remise_except;
-		$sql .= ", vat_src_code = '" . $this->db->escape($this->vat_src_code) . "'";
-		$sql .= ', tva_tx = ' . price2num($this->tva_tx);
-		$sql .= ', localtax1_tx = ' . price2num($this->localtax1_tx);
-		$sql .= ", localtax1_type = '" . $this->db->escape($this->localtax1_type) . "'";
-		$sql .= ', localtax2_tx = ' . price2num($this->localtax2_tx);
-		$sql .= ", localtax2_type = '" . $this->db->escape($this->localtax2_type) . "'";
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture_fourn_det_rec SET';
+		$sql .= ' fk_facture_fourn = '.(int) $this->fk_facture_fourn;
+		$sql .= ', fk_parent_line = '.(int) $this->fk_parent;
+		$sql .= ', fk_product = '.(int) $this->fk_product;
+		$sql .= ', ref = '.(!empty($this->ref) ? "'".$this->db->escape($this->ref)."'" : 'NULL');
+		$sql .= ", label = ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : 'NULL');
+		$sql .= ", description = '".$this->db->escape($this->description)."'";
+		$sql .= ', pu_ht = '.price2num($this->pu_ht);
+		$sql .= ', pu_ttc = '.price2num($this->pu_ttc);
+		$sql .= ', qty = '.price2num($this->qty);
+		$sql .= ", remise_percent = '".price2num($this->remise_percent)."'";
+		$sql .= ', fk_remise_except = '.(int) $this->fk_remise_except;
+		$sql .= ", vat_src_code = '".$this->db->escape($this->vat_src_code)."'";
+		$sql .= ', tva_tx = '.price2num($this->tva_tx);
+		$sql .= ', localtax1_tx = '.price2num($this->localtax1_tx);
+		$sql .= ", localtax1_type = '".$this->db->escape($this->localtax1_type)."'";
+		$sql .= ', localtax2_tx = '.price2num($this->localtax2_tx);
+		$sql .= ", localtax2_type = '".$this->db->escape($this->localtax2_type)."'";
 		if (empty($this->skip_update_total)) {
-			$sql .= ', total_ht = ' . price2num($this->total_ht);
-			$sql .= ', total_tva = ' . price2num($this->total_tva);
-			$sql .= ', total_localtax1 = ' . price2num($this->total_localtax1);
-			$sql .= ', total_localtax2 = ' . price2num($this->total_localtax2);
-			$sql .= ', total_ttc = ' . price2num($this->total_ttc);
+			$sql .= ', total_ht = '.price2num($this->total_ht);
+			$sql .= ', total_tva = '.price2num($this->total_tva);
+			$sql .= ', total_localtax1 = '.price2num($this->total_localtax1);
+			$sql .= ', total_localtax2 = '.price2num($this->total_localtax2);
+			$sql .= ', total_ttc = '.price2num($this->total_ttc);
 		}
-		$sql .= ', product_type = ' . (int) $this->product_type;
-		$sql .= ', date_start = ' . (int) $this->date_start;
-		$sql .= ', date_end = ' . (int) $this->date_end;
-		$sql .= ", info_bits = " . ((int) $this->info_bits);
-		$sql .= ', special_code =' . (int) $this->special_code;
-		$sql .= ', rang = ' . (int) $this->rang;
-		$sql .= ', fk_unit = ' .($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : 'null');
-		$sql .= ', fk_user_modif = ' . (int) $user;
-		$sql .= ' WHERE rowid = ' . (int) $this->id;
+		$sql .= ', product_type = '.(int) $this->product_type;
+		$sql .= ', date_start = '.(int) $this->date_start;
+		$sql .= ', date_end = '.(int) $this->date_end;
+		$sql .= ", info_bits = ".((int) $this->info_bits);
+		$sql .= ', special_code ='.(int) $this->special_code;
+		$sql .= ', rang = '.(int) $this->rang;
+		$sql .= ', fk_unit = '.($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : 'null');
+		$sql .= ', fk_user_modif = '.(int) $user;
+		$sql .= ' WHERE rowid = '.(int) $this->id;
 
 		$this->db->begin();
 
-		dol_syslog(get_class($this). '::updateline', LOG_DEBUG);
+		dol_syslog(get_class($this).'::updateline', LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			if (!$error) {

htdocs/core/extrafieldsinimport.inc.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 			case 'sellist':
 				$tmp = '';
 				$tmpparam = jsonOrUnserialize($obj->param); // $tmp may be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-				if (is_array($tmpparam) && array_key_exists('options', $tmpparam) &&  $tmpparam['options'] && is_array($tmpparam['options'])) {
+				if (is_array($tmpparam) && array_key_exists('options', $tmpparam) && $tmpparam['options'] && is_array($tmpparam['options'])) {
 					$tmpkeys = array_keys($tmpparam['options']);
 					$tmp = array_shift($tmpkeys);
 				}