Dolibarr / dolibarr

htdocs/compta/bank/class/api_bankaccounts.class.php

Spacing +15 added lines, -15 removed lines

@@ -20,7 +20,7 @@ 
 
 use Luracast\Restler\RestException;
 
-require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 /**
  * API class for accounts
@@ -75,12 +75,12 @@ 
 
 		$sql = "SELECT t.rowid FROM ".MAIN_DB_PREFIX."bank_account AS t LEFT JOIN ".MAIN_DB_PREFIX."bank_account_extrafields AS ef ON (ef.fk_object = t.rowid)"; // Modification VMR Global Solutions to include extrafields as search parameters in the API GET call, so we will be able to filter on extrafields
 		if ($category > 0) {
-			$sql .= ", " . MAIN_DB_PREFIX . "categorie_account as c";
+			$sql .= ", ".MAIN_DB_PREFIX."categorie_account as c";
 		}
-		$sql .= ' WHERE t.entity IN (' . getEntity('bank_account') . ')';
+		$sql .= ' WHERE t.entity IN ('.getEntity('bank_account').')';
 		// Select accounts of given category
 		if ($category > 0) {
-			$sql .= " AND c.fk_categorie = " . ((int) $category) . " AND c.fk_account = t.rowid";
+			$sql .= " AND c.fk_categorie = ".((int) $category)." AND c.fk_account = t.rowid";
 		}
 		// Add sql filters
 		if ($sqlfilters) {
@@ -115,7 +115,7 @@ 
 				}
 			}
 		} else {
-			throw new RestException(503, 'Error when retrieving list of accounts: ' . $this->db->lasterror());
+			throw new RestException(503, 'Error when retrieving list of accounts: '.$this->db->lasterror());
 		}
 
 		return $list;
@@ -208,7 +208,7 @@ 
 			throw new RestException(403);
 		}
 
-		require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 		$accountfrom = new Account($this->db);
 		$resultAccountFrom = $accountfrom->fetch($bankaccount_from_id);
@@ -284,7 +284,7 @@ 
 		 * Creating links between bank line record and its source
 		 */
 
-		$url = DOL_URL_ROOT . '/compta/bank/line.php?rowid=';
+		$url = DOL_URL_ROOT.'/compta/bank/line.php?rowid=';
 		$label = '(banktransfert)';
 		$type = 'banktransfert';
 
@@ -315,7 +315,7 @@ 
 			);
 		} else {
 			$this->db->rollback();
-			throw new RestException(500, $accountfrom->error . ' ' . $accountto->error);
+			throw new RestException(500, $accountfrom->error.' '.$accountto->error);
 		}
 	}
 
@@ -449,8 +449,8 @@ 
 			throw new RestException(404, 'account not found');
 		}
 
-		$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "bank ";
-		$sql .= " WHERE fk_account = " . ((int) $id);
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."bank ";
+		$sql .= " WHERE fk_account = ".((int) $id);
 
 		// Add sql filters
 		if ($sqlfilters) {
@@ -475,7 +475,7 @@ 
 				}
 			}
 		} else {
-			throw new RestException(503, 'Error when retrieving list of account lines: ' . $this->db->lasterror());
+			throw new RestException(503, 'Error when retrieving list of account lines: '.$this->db->lasterror());
 		}
 
 		return $list;
@@ -535,7 +535,7 @@ 
 			$num_releve
 		);
 		if ($result < 0) {
-			throw new RestException(503, 'Error when adding line to account: ' . $account->error);
+			throw new RestException(503, 'Error when adding line to account: '.$account->error);
 		}
 		return $result;
 	}
@@ -577,7 +577,7 @@ 
 
 		$result = $account->add_url_line($line_id, $url_id, $url, $label, $type);
 		if ($result < 0) {
-			throw new RestException(503, 'Error when adding link to account line: ' . $account->error);
+			throw new RestException(503, 'Error when adding link to account line: '.$account->error);
 		}
 		return $result;
 	}
@@ -648,7 +648,7 @@ 
 
 		$result = $accountLine->updateLabel();
 		if ($result < 0) {
-			throw new RestException(503, 'Error when updating link to account line: ' . $accountLine->error);
+			throw new RestException(503, 'Error when updating link to account line: '.$accountLine->error);
 		}
 		return $accountLine->id;
 	}
@@ -713,7 +713,7 @@ 
 		if (!$result) {
 			throw new RestException(404, 'account not found');
 		}
-		$balance = $account->solde(1);  //1=Exclude future operation date (this is to exclude input made in advance and have real account sold)
+		$balance = $account->solde(1); //1=Exclude future operation date (this is to exclude input made in advance and have real account sold)
 		return $balance;
 	}
 }

htdocs/product/list.php

Spacing +45 added lines, -45 removed lines

@@ -275,12 +275,12 @@ 
 	'p.tobatch' => array('label' => "ManageLotSerial", 'checked' => 0, 'enabled' => (isModEnabled('productbatch')), 'position' => 60),
 	'p.fk_country' => array('label' => "Country", 'checked' => 0, 'position' => 100),
 	'p.fk_state' => array('label' => "State", 'checked' => 0, 'position' => 101),
-	$alias_product_perentity . '.accountancy_code_sell' => array('label' => "ProductAccountancySellCode", 'checked' => 0, 'enabled' => !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 400),
-	$alias_product_perentity . '.accountancy_code_sell_intra' => array('label' => "ProductAccountancySellIntraCode", 'checked' => 0, 'enabled' => $isInEEC && !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 401),
-	$alias_product_perentity . '.accountancy_code_sell_export' => array('label' => "ProductAccountancySellExportCode", 'checked' => 0, 'enabled' => !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 402),
-	$alias_product_perentity . '.accountancy_code_buy' => array('label' => "ProductAccountancyBuyCode", 'checked' => 0, 'enabled' => !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 403),
-	$alias_product_perentity . '.accountancy_code_buy_intra' => array('label' => "ProductAccountancyBuyIntraCode", 'checked' => 0, 'enabled' => $isInEEC && !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 404),
-	$alias_product_perentity . '.accountancy_code_buy_export' => array('label' => "ProductAccountancyBuyExportCode", 'checked' => 0, 'enabled' => !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 405),
+	$alias_product_perentity.'.accountancy_code_sell' => array('label' => "ProductAccountancySellCode", 'checked' => 0, 'enabled' => !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 400),
+	$alias_product_perentity.'.accountancy_code_sell_intra' => array('label' => "ProductAccountancySellIntraCode", 'checked' => 0, 'enabled' => $isInEEC && !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 401),
+	$alias_product_perentity.'.accountancy_code_sell_export' => array('label' => "ProductAccountancySellExportCode", 'checked' => 0, 'enabled' => !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 402),
+	$alias_product_perentity.'.accountancy_code_buy' => array('label' => "ProductAccountancyBuyCode", 'checked' => 0, 'enabled' => !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 403),
+	$alias_product_perentity.'.accountancy_code_buy_intra' => array('label' => "ProductAccountancyBuyIntraCode", 'checked' => 0, 'enabled' => $isInEEC && !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 404),
+	$alias_product_perentity.'.accountancy_code_buy_export' => array('label' => "ProductAccountancyBuyExportCode", 'checked' => 0, 'enabled' => !getDolGlobalString('PRODUCT_DISABLE_ACCOUNTING'), 'position' => 405),
 	'p.datec' => array('label' => "DateCreation", 'checked' => 0, 'position' => 500),
 	'p.tms' => array('label' => "DateModificationShort", 'checked' => 0, 'position' => 500),
 	'p.tosell' => array('label' => $langs->transnoentitiesnoconv("Status").' ('.$langs->transnoentitiesnoconv("Sell").')', 'checked' => 1, 'position' => 1000),
@@ -321,7 +321,7 @@ 
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 // Security check
 if ($search_type == '0') {
@@ -493,10 +493,10 @@ 
 
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 if (isModEnabled('workstation')) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "workstation_workstation as ws ON (p.fk_default_workstation = ws.rowid)";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."workstation_workstation as ws ON (p.fk_default_workstation = ws.rowid)";
 }
 if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
 }
 if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields as ef on (p.rowid = ef.fk_object)";
@@ -595,7 +595,7 @@ 
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck WHERE p.rowid = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
 			}
 		}
 	}
@@ -625,22 +625,22 @@ 
 	$sql .= " AND p.finished = ".((int) $search_finished);
 }
 if ($search_accountancy_code_sell) {
-	$sql .= natural_search($alias_product_perentity . '.accountancy_code_sell', clean_account($search_accountancy_code_sell));
+	$sql .= natural_search($alias_product_perentity.'.accountancy_code_sell', clean_account($search_accountancy_code_sell));
 }
 if ($search_accountancy_code_sell_intra) {
-	$sql .= natural_search($alias_product_perentity . '.accountancy_code_sell_intra', clean_account($search_accountancy_code_sell_intra));
+	$sql .= natural_search($alias_product_perentity.'.accountancy_code_sell_intra', clean_account($search_accountancy_code_sell_intra));
 }
 if ($search_accountancy_code_sell_export) {
-	$sql .= natural_search($alias_product_perentity . '.accountancy_code_sell_export', clean_account($search_accountancy_code_sell_export));
+	$sql .= natural_search($alias_product_perentity.'.accountancy_code_sell_export', clean_account($search_accountancy_code_sell_export));
 }
 if ($search_accountancy_code_buy) {
-	$sql .= natural_search($alias_product_perentity . '.accountancy_code_buy', clean_account($search_accountancy_code_buy));
+	$sql .= natural_search($alias_product_perentity.'.accountancy_code_buy', clean_account($search_accountancy_code_buy));
 }
 if ($search_accountancy_code_buy_intra) {
-	$sql .= natural_search($alias_product_perentity . '.accountancy_code_buy_intra', clean_account($search_accountancy_code_buy_intra));
+	$sql .= natural_search($alias_product_perentity.'.accountancy_code_buy_intra', clean_account($search_accountancy_code_buy_intra));
 }
 if ($search_accountancy_code_buy_export) {
-	$sql .= natural_search($alias_product_perentity . '.accountancy_code_buy_export', clean_account($search_accountancy_code_buy_export));
+	$sql .= natural_search($alias_product_perentity.'.accountancy_code_buy_export', clean_account($search_accountancy_code_buy_export));
 }
 if (getDolGlobalString('PRODUCT_USE_UNITS') && $search_units && $search_units != '-1') {
 	$sql .= natural_search('cu.rowid', $search_units);
@@ -872,7 +872,7 @@ 
 if (isModEnabled('category') && $user->hasRight($rightskey, 'creer')) {
 	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 }
-if (in_array($massaction, array('presend', 'predelete','preaffecttag', 'edit_extrafields', 'preupdateprice'))) {
+if (in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'edit_extrafields', 'preupdateprice'))) {
 	$arrayofmassactions = array();
 }
 if ($user->hasRight($rightskey, 'supprimer')) {
@@ -985,7 +985,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -1227,23 +1227,23 @@ 
 	print '</td>';
 }
 // Accountancy code sell
-if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell']['checked'])) {
+if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_sell']['checked'])) {
 	print '<td class="liste_titre"><input class="flat maxwidth75" type="text" name="search_accountancy_code_sell" value="'.dol_escape_htmltag($search_accountancy_code_sell).'"></td>';
 }
-if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_intra']['checked'])) {
+if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_sell_intra']['checked'])) {
 	print '<td class="liste_titre"><input class="flat maxwidth75" type="text" name="search_accountancy_code_sell_intra" value="'.dol_escape_htmltag($search_accountancy_code_sell_intra).'"></td>';
 }
-if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_export']['checked'])) {
+if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_sell_export']['checked'])) {
 	print '<td class="liste_titre"><input class="flat maxwidth75" type="text" name="search_accountancy_code_sell_export" value="'.dol_escape_htmltag($search_accountancy_code_sell_export).'"></td>';
 }
 // Accountancy code buy
-if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy']['checked'])) {
+if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_buy']['checked'])) {
 	print '<td class="liste_titre"><input class="flat maxwidth75" type="text" name="search_accountancy_code_buy" value="'.dol_escape_htmltag($search_accountancy_code_buy).'"></td>';
 }
-if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_intra']['checked'])) {
+if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_buy_intra']['checked'])) {
 	print '<td class="liste_titre"><input class="flat maxwidth75" type="text" name="search_accountancy_code_buy_intra" value="'.dol_escape_htmltag($search_accountancy_code_buy_intra).'"></td>';
 }
-if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_export']['checked'])) {
+if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_buy_export']['checked'])) {
 	print '<td class="liste_titre"><input class="flat maxwidth75" type="text" name="search_accountancy_code_buy_export" value="'.dol_escape_htmltag($search_accountancy_code_buy_export).'"></td>';
 }
 // Extra fields
@@ -1461,28 +1461,28 @@ 
 	print_liste_field_titre($arrayfields['p.fk_state']['label'], $_SERVER["PHP_SELF"], "p.fk_state", "", $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
-if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell']['checked'])) {
-	print_liste_field_titre($arrayfields[$alias_product_perentity . '.accountancy_code_sell']['label'], $_SERVER["PHP_SELF"], $alias_product_perentity . ".accountancy_code_sell", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_sell']['checked'])) {
+	print_liste_field_titre($arrayfields[$alias_product_perentity.'.accountancy_code_sell']['label'], $_SERVER["PHP_SELF"], $alias_product_perentity.".accountancy_code_sell", "", $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
-if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_intra']['checked'])) {
-	print_liste_field_titre($arrayfields[$alias_product_perentity . '.accountancy_code_sell_intra']['label'], $_SERVER["PHP_SELF"], $alias_product_perentity . ".accountancy_code_sell_intra", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_sell_intra']['checked'])) {
+	print_liste_field_titre($arrayfields[$alias_product_perentity.'.accountancy_code_sell_intra']['label'], $_SERVER["PHP_SELF"], $alias_product_perentity.".accountancy_code_sell_intra", "", $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
-if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_export']['checked'])) {
-	print_liste_field_titre($arrayfields[$alias_product_perentity . '.accountancy_code_sell_export']['label'], $_SERVER["PHP_SELF"], $alias_product_perentity . ".accountancy_code_sell_export", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_sell_export']['checked'])) {
+	print_liste_field_titre($arrayfields[$alias_product_perentity.'.accountancy_code_sell_export']['label'], $_SERVER["PHP_SELF"], $alias_product_perentity.".accountancy_code_sell_export", "", $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
-if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy']['checked'])) {
-	print_liste_field_titre($arrayfields[$alias_product_perentity . '.accountancy_code_buy']['label'], $_SERVER["PHP_SELF"], $alias_product_perentity . ".accountancy_code_buy", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_buy']['checked'])) {
+	print_liste_field_titre($arrayfields[$alias_product_perentity.'.accountancy_code_buy']['label'], $_SERVER["PHP_SELF"], $alias_product_perentity.".accountancy_code_buy", "", $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
-if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_intra']['checked'])) {
-	print_liste_field_titre($arrayfields[$alias_product_perentity . '.accountancy_code_buy_intra']['label'], $_SERVER["PHP_SELF"], $alias_product_perentity . ".accountancy_code_buy_intra", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_buy_intra']['checked'])) {
+	print_liste_field_titre($arrayfields[$alias_product_perentity.'.accountancy_code_buy_intra']['label'], $_SERVER["PHP_SELF"], $alias_product_perentity.".accountancy_code_buy_intra", "", $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
-if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_export']['checked'])) {
-	print_liste_field_titre($arrayfields[$alias_product_perentity . '.accountancy_code_buy_export']['label'], $_SERVER["PHP_SELF"], $alias_product_perentity . ".accountancy_code_buy_export", "", $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_buy_export']['checked'])) {
+	print_liste_field_titre($arrayfields[$alias_product_perentity.'.accountancy_code_buy_export']['label'], $_SERVER["PHP_SELF"], $alias_product_perentity.".accountancy_code_buy_export", "", $param, '', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
 // Extra fields
@@ -1691,7 +1691,7 @@ 
 				}
 			}
 
-			print '<td class="center">' . $product_thumbnail_html . '</td>';
+			print '<td class="center">'.$product_thumbnail_html.'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -1958,10 +1958,10 @@ 
 
 		// Multiprices
 		if (getDolGlobalString('PRODUIT_MULTIPRICES')) {
-			if (! isset($productpricescache)) {
+			if (!isset($productpricescache)) {
 				$productpricescache = array();
 			}
-			if (! isset($productpricescache[$obj->rowid])) {
+			if (!isset($productpricescache[$obj->rowid])) {
 				$productpricescache[$obj->rowid] = array();
 			}
 
@@ -2176,38 +2176,38 @@ 
 			}
 		}
 		// Accountancy code sell
-		if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell']['checked'])) {
+		if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_sell']['checked'])) {
 			print '<td>'.length_accountg($product_static->accountancy_code_sell).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 		}
-		if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_intra']['checked'])) {
+		if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_sell_intra']['checked'])) {
 			print '<td>'.length_accountg($product_static->accountancy_code_sell_intra).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 		}
-		if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_export']['checked'])) {
+		if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_sell_export']['checked'])) {
 			print '<td>'.length_accountg($product_static->accountancy_code_sell_export).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 		}
 		// Accountancy code buy
-		if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy']['checked'])) {
+		if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_buy']['checked'])) {
 			print '<td>'.length_accountg($product_static->accountancy_code_buy).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 		}
-		if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_intra']['checked'])) {
+		if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_buy_intra']['checked'])) {
 			print '<td>'.length_accountg($product_static->accountancy_code_buy_intra).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 		}
-		if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_export']['checked'])) {
+		if (!empty($arrayfields[$alias_product_perentity.'.accountancy_code_buy_export']['checked'])) {
 			print '<td>'.length_accountg($product_static->accountancy_code_buy_export).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;

htdocs/adherents/subscription.php

Spacing +5 added lines, -5 removed lines

@@ -180,8 +180,8 @@ 
 if (empty($reshook) && $action == 'setsocid' && $permissiontoaddmember) {
 	$error = 0;
 	if (GETPOSTINT('socid') != $object->socid) {    // If link differs from currently in database
-		$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "adherent";
-		$sql .= " WHERE fk_soc = " . ((int) GETPOSTINT('socid'));
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."adherent";
+		$sql .= " WHERE fk_soc = ".((int) GETPOSTINT('socid'));
 		$resql = $db->query($sql);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
@@ -466,7 +466,7 @@ 
 //include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 
-if (! ($object->id > 0)) {
+if (!($object->id > 0)) {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");
 }
@@ -977,7 +977,7 @@ 
 	}
 	if (!$datefrom) {
 		// Guess the subscription start date
-		$datefrom = $object->datevalid; 	// By default, the subscription start date is the payment date
+		$datefrom = $object->datevalid; // By default, the subscription start date is the payment date
 		if (getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER')) {
 			$datefrom = dol_time_plus_duree($now, (int) substr(getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER'), 0, -1), substr(getDolGlobalString('MEMBER_SUBSCRIPTION_START_AFTER'), -1));
 		} elseif ($object->datefin > 0 && dol_time_plus_duree($object->datefin, $defaultdelay, $defaultdelayunit) > $now) {
@@ -1015,7 +1015,7 @@ 
 
 	if ($adht->subscription) {
 		// Amount
-		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.(GETPOSTISSET('subscription') ? GETPOST('subscription') : price($adht->amount, 0, '', 0)).'"> '.$langs->trans("Currency".$conf->currency) .'</td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="subscription" size="6" value="'.(GETPOSTISSET('subscription') ? GETPOST('subscription') : price($adht->amount, 0, '', 0)).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
 
 		// Label
 		print '<tr><td>'.$langs->trans("Label").'</td>';