ATM-Consulting / dolibarr_module_subtotal

lib/subtotal.lib.php

Braces +63 added lines, -29 removed lines

@@ -54,7 +54,9 @@ 
 	dol_include_once('/subtotal/class/subtotal.class.php');
 	$TTitle = TSubtotal::getAllTitleFromDocument($object);
 	$html = '';
-	if ($showLabel) $html.= '<label for="under_title">'.$langs->trans('subtotalLabelForUnderTitle').'</label>';
+	if ($showLabel) {
+		$html.= '<label for="under_title">'.$langs->trans('subtotalLabelForUnderTitle').'</label>';
+	}
 	$html.= '<select onChange="$(\'select[name=under_title]\').val(this.value);" name="under_title" class="under_title minwidth200"><option value="-1"></option>';
 	
 	$nbsp = '&nbsp;';
@@ -95,7 +97,9 @@ 
 	$TFreeText = getTFreeText();
 	$html = '<label for="free_text">'.$langs->trans('subtotalLabelForFreeText').'</label>';
 	$html.= '<select onChange="getTFreeText($(this));" name="free_text" class="minwidth200">';
-	if ($withEmpty) $html.= '<option value=""></option>';
+	if ($withEmpty) {
+		$html.= '<option value=""></option>';
+	}
 
 	$TFreeTextContents = array();
 	foreach ($TFreeText as $id => $tab)
@@ -134,8 +138,13 @@ 
 	$level = GETPOST('subtotal_level', 'int');
 	if (!empty($level))
 	{
-		if ($line->qty > 90) $line->qty = 100 - $level; // Si on edit une ligne sous-total
-		else $line->qty = $level;
+		if ($line->qty > 90) {
+			$line->qty = 100 - $level;
+		}
+		// Si on edit une ligne sous-total
+		else {
+			$line->qty = $level;
+		}
 	}
 	
 	$res = TSubtotal::doUpdateLine($object, $line->id, $description, 0, $line->qty, 0, '', '', 0, 9, 0, 0, 'HT', $pagebreak, 0, 1, null, 0, $label, TSubtotal::$module_number, $line->array_options);
@@ -162,13 +171,18 @@ 
 			{
 				$subtotal_tva_tx = $subtotal_tva_tx_init; // ré-init car la variable peut évoluer
 					
-				if (!empty($showBlockExtrafields)) $line->array_options = $array_options;
-				if ($subtotal_tva_tx == '') $subtotal_tva_tx = $line->tva_tx;
+				if (!empty($showBlockExtrafields)) {
+					$line->array_options = $array_options;
+				}
+				if ($subtotal_tva_tx == '') {
+					$subtotal_tva_tx = $line->tva_tx;
+				}
 				if ($object->element == 'facture' && !empty($conf->global->INVOICE_USE_SITUATION) && $object->type == Facture::TYPE_SITUATION)
 				{
 					$subtotal_progress = $subtotal_progress_init;
-					if ($subtotal_progress == '') $subtotal_progress = $line->situation_percent;
-					else
+					if ($subtotal_progress == '') {
+						$subtotal_progress = $line->situation_percent;
+					} else
 					{
 						$prev_percent = $line->get_prev_progress($object->id);
 						if ($subtotal_progress < $prev_percent)
@@ -181,14 +195,21 @@ 
 				
 				$res = TSubtotal::doUpdateLine($object, $line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $subtotal_tva_tx, $line->product_type, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $subtotal_progress, $line->fk_unit);
 
-				if ($res > 0) $success_updated_line++;
-				else $error_updated_line++;
+				if ($res > 0) {
+					$success_updated_line++;
+				} else {
+					$error_updated_line++;
+				}
 			}
 		}
 
-		if ($nb_progress_not_updated > 0) setEventMessage($langs->trans('subtotal_nb_progress_not_updated', $nb_progress_not_updated), 'warnings');
+		if ($nb_progress_not_updated > 0) {
+			setEventMessage($langs->trans('subtotal_nb_progress_not_updated', $nb_progress_not_updated), 'warnings');
+		}
 		
-		if ($success_updated_line > 0) setEventMessage($langs->trans('subtotal_success_updated_line', $success_updated_line));
+		if ($success_updated_line > 0) {
+			setEventMessage($langs->trans('subtotal_success_updated_line', $success_updated_line));
+		}
 		if ($error_updated_line > 0)
 		{
 			setEventMessage($langs->trans('subtotal_error_updated_line', $error_updated_line), 'errors');
@@ -229,15 +250,16 @@ 
 	global $db,$langs,$tmp_object_nc;
 	
 	$error = 0;
-	if (empty($element)) $error++;
+	if (empty($element)) {
+		$error++;
+	}
 	
 	if (!$error)
 	{
 		if (!empty($tmp_object_nc) && $tmp_object_nc->element == $element && $tmp_object_nc->id == $elementid)
 		{
 			$object = $tmp_object_nc;
-		}
-		else
+		} else
 		{
 			$classname = ucfirst($element);
 			
@@ -257,8 +279,11 @@ 
 			
 			$object = new $classname($db); // Propal | Commande | Facture
 			$res = $object->fetch($elementid);
-			if ($res < 0) $error++;
-			else $tmp_object_nc = $object;
+			if ($res < 0) {
+				$error++;
+			} else {
+				$tmp_object_nc = $object;
+			}
 		}
 	}
 	
@@ -286,21 +311,21 @@ 
 						$res = doUpdate($object, $line_block, $subtotal_nc);
 					}
 				}
-			}
-			else
+			} else
 			{
 				$res = doUpdate($object, $line, $subtotal_nc);
 			}
 			
 			$res = $object->update_price(1);
-			if ($res <= 0) $error++;
+			if ($res <= 0) {
+				$error++;
+			}
 			
 			if (!$error)
 			{
 				setEventMessage($langs->trans('subtotal_update_nc_success'));
 				$db->commit();
-			}
-			else
+			} else
 			{
 				setEventMessage($langs->trans('subtotal_update_nc_error'), 'errors');
 				$db->rollback();
@@ -313,7 +338,9 @@ 
 {
 	global $user;
 	
-	if (TSubtotal::isFreeText($line) || TSubtotal::isSubtotal($line)) return 1;
+	if (TSubtotal::isFreeText($line) || TSubtotal::isSubtotal($line)) {
+		return 1;
+	}
 	// Update extrafield et total
 	if(! empty($subtotal_nc)) {
 		$line->total_ht = $line->total_tva = $line->total_ttc = $line->total_localtax1 = $line->total_localtax2 = 
@@ -321,12 +348,17 @@ 
 
 		$line->array_options['options_subtotal_nc'] = 1;
 
-		if ($line->element == 'propaldet') $res = $line->update();
-		else $res = $line->update($user);
-	}
-	else {
+		if ($line->element == 'propaldet') {
+			$res = $line->update();
+		} else {
+			$res = $line->update($user);
+		}
+	} else {
 	    if(in_array($object->element, array('invoice_supplier', 'order_supplier', 'supplier_proposal'))) {
-	        if(empty($line->label)) $line->label = $line->description; // supplier lines don't have the field label
+	        if(empty($line->label)) {
+	        	$line->label = $line->description;
+	        }
+	        // supplier lines don't have the field label
 	        
 	        require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
 	        $extrafields=new ExtraFields($object->db);
@@ -334,7 +366,9 @@ 
 	        $line->fetch_optionals($line->id,$extralabels);
 	    }
 		$line->array_options['options_subtotal_nc'] = 0;
-		if($object->element == 'order_supplier') $line->update($user);
+		if($object->element == 'order_supplier') {
+			$line->update($user);
+		}
 		$res = TSubtotal::doUpdateLine($object, $line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->product_type, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 	}