alxarafe / alixar

dolibarr/htdocs/compta/facture/fiche-rec.php

Braces +170 added lines, -135 removed lines

@@ -61,9 +61,13 @@ 
 $id=(GETPOST('facid','int')?GETPOST('facid','int'):GETPOST('id','int'));
 $lineid=GETPOST('lineid','int');
 $ref=GETPOST('ref','alpha');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $objecttype = 'facture_rec';
-if ($action == "create" || $action == "add") $objecttype = '';
+if ($action == "create" || $action == "add") {
+    $objecttype = '';
+}
 $result = restrictedArea($user, 'facture', $id, $objecttype);
 $projectid = GETPOST('projectid','int');
 
@@ -76,8 +80,12 @@ 
 $page = GETPOST("page",'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
-if (! $sortorder) $sortorder='DESC';
-if (! $sortfield) $sortfield='f.titre';
+if (! $sortorder) {
+    $sortorder='DESC';
+}
+if (! $sortfield) {
+    $sortfield='f.titre';
+}
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
@@ -115,11 +123,15 @@ 
 
 $parameters = array('socid' => $socid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
-	if (GETPOST('cancel','alpha')) $action='';
+	if (GETPOST('cancel','alpha')) {
+	    $action='';
+	}
 
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
@@ -225,8 +237,7 @@ 
 					setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors');
 					$action = "create";
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -239,8 +250,7 @@ 
 
 				header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id);
 	   			exit;
-			}
-			else
+			} else
 			{
 				$db->rollback();
 
@@ -286,8 +296,9 @@ 
 		{
 			$object->titre = GETPOST('ref', 'alpha');
 			$object->ref = $object->titre;
+		} else {
+		    dol_print_error($db, $object->error, $object->errors);
 		}
-		else dol_print_error($db, $object->error, $object->errors);
 	}
 	// Set bank account
 	elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
@@ -303,7 +314,9 @@ 
 	elseif ($action == 'setdate_when' && $user->rights->facture->creer)
 	{
 		$date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
-		if (!empty($date)) $object->setNextDate($date);
+		if (!empty($date)) {
+		    $object->setNextDate($date);
+		}
 	}
 	// Set max period
 	elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer)
@@ -342,8 +355,7 @@ 
 		if (! $error)
 		{
 			$db->commit();
-		}
-		else
+		} else
 		{
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -366,8 +378,7 @@ 
 		if (! $error)
 		{
 			$db->commit();
-		}
-		else
+		} else
 		{
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -395,27 +406,26 @@ 
 			{
 				$db->commit();
 				$object->fetch($object->id);    // Reload lines
-			}
-			else
+			} else
 			{
 				$db->rollback();
 				setEventMessages($db->lasterror(), null, 'errors');
 			}
-		}
-		else
+		} else
 		{
 			$db->rollback();
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
-	}
-	else if ($action == 'update_extras')
+	} else if ($action == 'update_extras')
 	{
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
 		$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 		$ret = $extrafields->setOptionalsFromPost($extralabels, $object, GETPOST('attribute','none'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+		    $error++;
+		}
 
 		if (! $error)
 		{
@@ -442,8 +452,7 @@ 
 		{
 			$idprod=0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		}
-		else
+		} else
 		{
 			$idprod=GETPOST('idprod', 'int');
 			$tva_tx = '';
@@ -473,9 +482,11 @@ 
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 			$error ++;
 		}
-		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) 	// Unit price can be 0 but not ''
+		if (GETPOST('prod_entry_mode') == 'free' && empty($idprod) && (! ($price_ht >= 0) || $price_ht == '')) {
+		    // Unit price can be 0 but not ''
 		{
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
+		}
 			$error ++;
 		}
 		if ($qty == '') {
@@ -525,7 +536,9 @@ 
 			// Update if prices fields are defined
 			$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 			$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
-			if (empty($tva_tx)) $tva_npr=0;
+			if (empty($tva_tx)) {
+			    $tva_npr=0;
+			}
 
 			$pu_ht = $prod->price;
 			$pu_ttc = $prod->price_ttc;
@@ -539,14 +552,19 @@ 
 				$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
 				$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
 				$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
-				if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
+				if (! empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
+				    // using this option is a bug. kept for backward compatibility
 				{
 					if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx=$prod->multiprices_tva_tx[$object->thirdparty->price_level];
-					if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
-					if (empty($tva_tx)) $tva_npr=0;
 				}
-			}
-			elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
+					if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) {
+					    $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+					}
+					if (empty($tva_tx)) {
+					    $tva_npr=0;
+					}
+				}
+			} elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 			{
 				include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
 
@@ -563,9 +581,13 @@ 
 						$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
 						$price_base_type = $prodcustprice->lines[0]->price_base_type;
 						$tva_tx = $prodcustprice->lines[0]->tva_tx;
-						if ($prodcustprice->lines[0]->default_vat_code && ! preg_match('/\(.*\)/', $tva_tx)) $tva_tx.= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+						if ($prodcustprice->lines[0]->default_vat_code && ! preg_match('/\(.*\)/', $tva_tx)) {
+						    $tva_tx.= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+						}
 						$tva_npr = $prodcustprice->lines[0]->recuperableonly;
-						if (empty($tva_tx)) $tva_npr=0;
+						if (empty($tva_tx)) {
+						    $tva_npr=0;
+						}
 					}
 				}
 			}
@@ -586,8 +608,7 @@ 
 				if ($price_base_type != 'HT')
 				{
 					$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
-				}
-				else
+				} else
 				{
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 				}
@@ -600,10 +621,12 @@ 
 			{
 				$outputlangs = $langs;
 				$newlang = '';
-				if (empty($newlang) && GETPOST('lang_id','aZ09'))
-					$newlang = GETPOST('lang_id','aZ09');
-				if (empty($newlang))
-					$newlang = $object->thirdparty->default_lang;
+				if (empty($newlang) && GETPOST('lang_id','aZ09')) {
+									$newlang = GETPOST('lang_id','aZ09');
+				}
+				if (empty($newlang)) {
+									$newlang = $object->thirdparty->default_lang;
+				}
 				if (! empty($newlang))
 				{
 					$outputlangs = new Translate("", $conf);
@@ -611,8 +634,7 @@ 
 				}
 
 				$desc = (! empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
-			}
-			else
+			} else
 			{
 				$desc = $prod->description;
 			}
@@ -623,26 +645,30 @@ 
 			if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (! empty($prod->customcode) || ! empty($prod->country_code)))
 			{
 				$tmptxt = '(';
-				if (! empty($prod->customcode))
-					$tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
-				if (! empty($prod->customcode) && ! empty($prod->country_code))
-					$tmptxt .= ' - ';
-				if (! empty($prod->country_code))
-					$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
+				if (! empty($prod->customcode)) {
+									$tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
+				}
+				if (! empty($prod->customcode) && ! empty($prod->country_code)) {
+									$tmptxt .= ' - ';
+				}
+				if (! empty($prod->country_code)) {
+									$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
+				}
 				$tmptxt .= ')';
 				$desc = dol_concatdesc($desc, $tmptxt);
 			}
 
 			$type = $prod->type;
 			$fk_unit = $prod->fk_unit;
-		}
-		else
+		} else
 		{
 			$pu_ht = price2num($price_ht, 'MU');
 			$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 			$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 			$tva_tx = str_replace('*', '', $tva_tx);
-			if (empty($tva_tx)) $tva_npr=0;
+			if (empty($tva_tx)) {
+			    $tva_npr=0;
+			}
 			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
 			$desc = $product_desc;
 			$type = GETPOST('type');
@@ -661,15 +687,15 @@ 
 		$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
 
 		$info_bits = 0;
-		if ($tva_npr)
-			$info_bits |= 0x01;
+		if ($tva_npr) {
+					$info_bits |= 0x01;
+		}
 
 		if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS) )&& (! empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min))))
 		{
 			$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
 			setEventMessages($mesg, null, 'errors');
-		}
-		else
+		} else
 		{
 			// Insert line
 			$result = $object->addline($desc, $pu_ht, $qty, $tva_tx,$localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit, 0, $date_start_fill, $date_end_fill);
@@ -733,8 +759,7 @@ 
 
 				unset($_POST['situations']);
 				unset($_POST['progress']);
-			}
-			else
+			} else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -742,11 +767,11 @@ 
 			$action = '';
 		}
 		}
-	}
-
-	elseif ($action == 'updateline' && $user->rights->facture->creer && ! GETPOST('cancel','alpha'))
+	} elseif ($action == 'updateline' && $user->rights->facture->creer && ! GETPOST('cancel','alpha'))
 	{
-		if (! $object->fetch($id) > 0)	dol_print_error($db);
+		if (! $object->fetch($id) > 0) {
+		    dol_print_error($db);
+		}
 		$object->fetch_thirdparty();
 
 		// Clean parameters
@@ -762,7 +787,9 @@ 
 
 		// Define info_bits
 		$info_bits = 0;
-		if (preg_match('/\*/', $vat_rate)) $info_bits |= 0x01;
+		if (preg_match('/\*/', $vat_rate)) {
+		    $info_bits |= 0x01;
+		}
 
 		// Define vat_rate
 		$vat_rate = str_replace('*', '', $vat_rate);
@@ -801,7 +828,9 @@ 
 
 		// Define special_code for special lines
 		$special_code=GETPOST('special_code');
-		if (! GETPOST('qty')) $special_code=3;
+		if (! GETPOST('qty')) {
+		    $special_code=3;
+		}
 
 		/*$line = new FactureLigne($db);
         $line->fetch(GETPOST('lineid'));
@@ -825,8 +854,9 @@ 
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level))
-				$price_min = $product->multiprices_min[$object->thirdparty->price_level];
+			if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level)) {
+							$price_min = $product->multiprices_min[$object->thirdparty->price_level];
+			}
 
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
@@ -939,8 +969,7 @@ 
 
 				unset($_POST['situations']);
 				unset($_POST['progress']);
-			}
-			else
+			} else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -988,8 +1017,12 @@ 
 		dol_fiche_head(null, '', '', 0);
 
 		$rowspan=4;
-		if (! empty($conf->projet->enabled)) $rowspan++;
-		if ($object->fk_account > 0) $rowspan++;
+		if (! empty($conf->projet->enabled)) {
+		    $rowspan++;
+		}
+		if ($object->fk_account > 0) {
+		    $rowspan++;
+		}
 
 		print '<table class="border" width="100%">';
 
@@ -1134,8 +1167,7 @@ 
 			$select = array('0'=>$langs->trans('DoNotGenerateDoc'),'1'=>$langs->trans('AutoGenerateDoc'));
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
 			print "</td></tr>";
-		}
-		else
+		} else
 		{
 			print '<input type="hidden" name="generate_pdf" value="1">';
 		}
@@ -1146,10 +1178,11 @@ 
 
 
 		$title = $langs->trans("ProductsAndServices");
-		if (empty($conf->service->enabled))
-			$title = $langs->trans("Products");
-		else if (empty($conf->product->enabled))
-			$title = $langs->trans("Services");
+		if (empty($conf->service->enabled)) {
+					$title = $langs->trans("Products");
+		} else if (empty($conf->product->enabled)) {
+					$title = $langs->trans("Services");
+		}
 
 		print load_fiche_titre($title, '', '');
 
@@ -1188,13 +1221,11 @@ 
 		print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
 		print '</div>';
 		print "</form>\n";
-	}
-	else
+	} else
 	{
 		dol_print_error('',"Error, no invoice ".$object->id);
 	}
-}
-else
+} else
 {
 	/*
 	 * View mode
@@ -1227,8 +1258,11 @@ 
         $linkback = '<a href="' . BASE_URI . '?controller=compta/facture&method=invoicetemplate_list&restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 		$morehtmlref='';
-		if ($action != 'editref') $morehtmlref.=$form->editfieldkey($object->ref, 'ref', $object->ref, $object, $user->rights->facture->creer, '', '', 0, 2);
-		else $morehtmlref.= $form->editfieldval('', 'ref', $object->ref, $object, $user->rights->facture->creer, 'string');
+		if ($action != 'editref') {
+		    $morehtmlref.=$form->editfieldkey($object->ref, 'ref', $object->ref, $object, $user->rights->facture->creer, '', '', 0, 2);
+		} else {
+		    $morehtmlref.= $form->editfieldval('', 'ref', $object->ref, $object, $user->rights->facture->creer, 'string');
+		}
 
 		$morehtmlref.='<div class="refidno">';
 		// Ref customer
@@ -1243,8 +1277,9 @@ 
 			$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 			if ($user->rights->facture->creer)
 			{
-				if ($action != 'classify')
-					$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				if ($action != 'classify') {
+									$morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				}
 					if ($action == 'classify') {
 						//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 						$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -1288,14 +1323,18 @@ 
 		print '</tr>';
 
 		// Amount Local Taxes
-		if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) 	// Localtax1
+		if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) {
+		    // Localtax1
 		{
 			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
+		}
 			print '<td class="nowrap">' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
 		}
-		if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) 	// Localtax2
+		if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) {
+		    // Localtax2
 		{
 			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
+		}
 			print '<td class=nowrap">' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '</td></tr>';
 		}
 
@@ -1308,8 +1347,9 @@ 
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('PaymentConditionsShort');
 		print '</td>';
-		if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer)
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+		if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) {
+					print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($object->type != Facture::TYPE_CREDIT_NOTE)
@@ -1317,8 +1357,7 @@ 
 			if ($action == 'editconditions')
 			{
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id');
-			}
-			else
+			} else
 			{
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'none');
 			}
@@ -1332,15 +1371,15 @@ 
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('PaymentMode');
 		print '</td>';
-		if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer)
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
+		if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer) {
+					print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editmode&amp;facid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editmode')
 		{
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT');
-		}
-		else
+		} else
 		{
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT');
 		}
@@ -1348,7 +1387,9 @@ 
 
 		// Help of substitution key
 		$dateexample=dol_now();
-		if (! empty($object->frequency) && ! empty($object->date_when)) $dateexample=$object->date_when;
+		if (! empty($object->frequency) && ! empty($object->date_when)) {
+		    $dateexample=$object->date_when;
+		}
 
 		$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
 
@@ -1395,15 +1436,15 @@ 
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('RIB');
 		print '<td>';
-		if (($action != 'editbankaccount') && $user->rights->facture->creer && ! empty($object->brouillon))
-			print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+		if (($action != 'editbankaccount') && $user->rights->facture->creer && ! empty($object->brouillon)) {
+					print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'),1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editbankaccount')
 		{
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
-		}
-		else
+		} else
 		{
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 		}
@@ -1417,8 +1458,9 @@ 
         print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
         print $langs->trans('Model');
         print '<td>';
-        if (($action != 'editmodelpdf') && $user->rights->facture->creer && ! empty($object->brouillon))
-            print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'),1).'</a></td>';
+        if (($action != 'editmodelpdf') && $user->rights->facture->creer && ! empty($object->brouillon)) {
+                    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'),1).'</a></td>';
+        }
         print '</tr></table>';
         print '</td><td>';
         if ($action == 'editmodelpdf')
@@ -1431,8 +1473,7 @@ 
             }
             $select = 'select;'.implode(',', $list);
             print $form->editfieldval($langs->trans("Model"), 'modelpdf', $object->modelpdf, $object, $user->rights->facture->creer, $select);
-        }
-        else
+        } else
         {
             print $object->modelpdf;
         }
@@ -1466,8 +1507,9 @@ 
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('Frequency');
 		print '</td>';
-		if ($action != 'editfrequency' && ! empty($object->brouillon) && $user->rights->facture->creer)
-			print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&amp;facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
+		if ($action != 'editfrequency' && ! empty($object->brouillon) && $user->rights->facture->creer) {
+					print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&amp;facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editfrequency')
@@ -1481,14 +1523,12 @@ 
 			print '</td>';
 			print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
-		}
-		else
+		} else
 		{
 				if ($object->frequency > 0)
 				{
 					print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
-				}
-				else
+				} else
 				{
 					print $langs->trans("NotARecurringInvoiceTemplate");
 			}
@@ -1500,8 +1540,7 @@ 
 		if ($action == 'date_when' || $object->frequency > 0)
 		{
 			print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day');
-		}
-		else
+		} else
 		{
 			print $langs->trans("NextDateToExecution");
 		}
@@ -1513,9 +1552,10 @@ 
 		//var_dump(dol_print_date($object->date_when+60, 'dayhour').' - '.dol_print_date($now, 'dayhour'));
 		if (! $object->isMaxNbGenReached())
 		{
-			if (! $object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
-		}
-		else
+			if (! $object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) {
+			    print img_warning($langs->trans("Late"));
+			}
+		} else
 		{
 			print img_info($langs->trans("MaxNumberOfGenerationReached"));
 		}
@@ -1527,8 +1567,7 @@ 
 		if ($action == 'nb_gen_max' || $object->frequency > 0)
 		{
 			print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
-		}
-		else
+		} else
 		{
 			print $langs->trans("MaxPeriodNumber");
 		}
@@ -1536,8 +1575,7 @@ 
 		if ($action == 'nb_gen_max' || $object->frequency > 0)
 		{
 			  print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max?$object->nb_gen_max:'', $object, $user->rights->facture->creer);
-		}
-		else
+		} else
 		{
 			print '';
 		}
@@ -1546,10 +1584,11 @@ 
 
 		// Status of generated invoices
 		print '<tr><td>';
-		if ($action == 'auto_validate' || $object->frequency > 0)
-			print $form->editfieldkey($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer);
-		else
-			print $langs->trans("StatusOfGeneratedInvoices");
+		if ($action == 'auto_validate' || $object->frequency > 0) {
+					print $form->editfieldkey($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer);
+		} else {
+					print $langs->trans("StatusOfGeneratedInvoices");
+		}
 		print '</td><td>';
 		$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
 		if ($action == 'auto_validate' || $object->frequency > 0)
@@ -1562,10 +1601,11 @@ 
 		{
 			print '<tr>';
 			print '<td>';
-			if ($action == 'generate_pdf' || $object->frequency > 0)
-				print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer);
-			else
-				print $langs->trans("StatusOfGeneratedDocuments");
+			if ($action == 'generate_pdf' || $object->frequency > 0) {
+							print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer);
+			} else {
+							print $langs->trans("StatusOfGeneratedDocuments");
+			}
 			print '</td>';
 			print '<td>';
 			$select = 'select;0:'.$langs->trans('DoNotGenerateDoc').',1:'.$langs->trans('AutogenerateDoc');
@@ -1575,8 +1615,7 @@ 
 			}
 			print '</td>';
 			print '</tr>';
-		}
-		else
+		} else
 		{
 			print '<input type="hidden" name="generate_pdf" value="1">';
 		}
@@ -1678,20 +1717,17 @@ 
 				if (! empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max))
 				{
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MaxGenerationReached")).'">'.$langs->trans("CreateBill").'</a></div>';
-				}
-				else
+				} else
 				{
 					if (empty($object->frequency) || $object->date_when <= $today)
 					{
                         print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=compta/facture&method=card&action=create&socid=' . $object->thirdparty->id . '&fac_rec=' . $object->id . '">' . $langs->trans("CreateBill") . '</a></div>';
-					}
-					else
+					} else
 					{
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DateIsNotEnough")).'">'.$langs->trans("CreateBill").'</a></div>';
 					}
 				}
-			}
-			else
+			} else
 			{
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateBill").'</a></div>';
 			}
@@ -1702,8 +1738,7 @@ 
 			if (empty($object->suspended))
 			{
                 print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . BASE_URI . '?controller=compta/facture&method=fiche-rec&action=disable&id=' . $object->id . '">' . $langs->trans("Disable") . '</a></div>';
-			}
-			else
+			} else
 			{
                 print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=compta/facture&method=fiche-rec&action=enable&id=' . $object->id . '">' . $langs->trans("Enable") . '</a></div>';
 			}

dolibarr/htdocs/loan/schedule.php

Braces +17 added lines, -10 removed lines

@@ -151,13 +151,15 @@ 
 if(count($echeance->lines)>0)
 {
 	print '<input type="hidden" name="action" value="updateecheancier">';
-}else{
+} else{
 	print '<input type="hidden" name="action" value="createecheancier">';
 }
 print '<table class="border" width="100%">';
 print '<tr class="liste_titre">';
 $colspan = 6;
-if (count($echeance->lines)>0) $colspan++;
+if (count($echeance->lines)>0) {
+    $colspan++;
+}
 print '<th align="center" colspan="'.$colspan.'">';
 print $langs->trans("FinancialCommitment");
 print '</th>';
@@ -173,7 +175,9 @@ 
 print ' ('.price2num($object->capital).')';
 print '<input type="hidden" name="hi_capital0" id ="hi_capital0" value="'.$object->capital.'">';
 print '</th>';
-if (count($echeance->lines)>0) print '<th>'.$langs->trans('DoPayment').'</th>';
+if (count($echeance->lines)>0) {
+    print '<th>'.$langs->trans('DoPayment').'</th>';
+}
 print '</tr>'."\n";
 
 if ($object->nbterm > 0 && count($echeance->lines)==0)
@@ -201,8 +205,7 @@ 
 		$i++;
 		$capital = $cap_rest;
 	}
-}
-elseif(count($echeance->lines)>0)
+} elseif(count($echeance->lines)>0)
 {
 	$i=1;
 	$capital = $object->capital;
@@ -223,14 +226,15 @@ 
 		print '<td align="center" id="interets'.$i.'">'.price($int,0,'',1).' €</td><input type="hidden" name="hi_interets' .$i .'" id ="hi_interets' .$i .'" value="' . $int . '">';
 		if($line->datep > dol_now() && empty($line->fk_bank)){
 			print '<td align="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"> €</td>';
-		}else{
+		} else{
 			print '<td align="center">' . price($mens) . ' €</td><input type="hidden" name="mens' .$i .'" id ="mens' .$i .'" value="' . $mens . '">';
 		}
 		
 		print '<td align="center" id="capital'.$i.'">'.price($cap_rest).' €</td><input type="hidden" name="hi_capital' .$i .'" id ="hi_capital' .$i .'" value="' . $cap_rest . '">';
 		print '<td align="center">';
-		if (!empty($line->fk_bank)) print $langs->trans('Paid');
-		elseif (!$printed)
+		if (!empty($line->fk_bank)) {
+		    print $langs->trans('Paid');
+		} elseif (!$printed)
 		{
             print '<a class="butAction" href="' . BASE_URI . '?controller=loan/payment&method=payment.php&id=' . $object->id . '&amp;action=create&line_id=' . $line->id . '">' . $langs->trans('DoPayment') . '</a>';
 		    $printed = true;
@@ -245,8 +249,11 @@ 
 print '</table>';
 print '</br>';
 print '</br>';
-if (count($echeance->lines)==0) $label = $langs->trans("Create");
-else $label = $langs->trans("Save");
+if (count($echeance->lines)==0) {
+    $label = $langs->trans("Create");
+} else {
+    $label = $langs->trans("Save");
+}
 print '<div align="center"><input class="button" type="submit" value="'.$label.'"></div>';
 print '</form>';