Dolibarr / dolibarr

htdocs/accountancy/class/accountingjournal.class.php

Braces +50 added lines, -18 removed lines

@@ -378,15 +378,21 @@ 
 				case 1: // Various Journal
 					if (isModEnabled('asset') && !getDolGlobalInt('ACCOUNTING_DISABLE_TRANSFER_ON_ASSETS')) {
 						$tmp = $this->getAssetData($user, $type, $date_start, $date_end, $in_bookkeeping);
-						if (is_array($tmp)) $data = array_merge($data, $tmp);
+						if (is_array($tmp)) {
+							$data = array_merge($data, $tmp);
+						}
 					}
 					if (isModEnabled('invoice') && !getDolGlobalInt('ACCOUNTING_DISABLE_TRANSFER_ON_DISCOUNTS')) {
 						$tmp = $this->getDiscountCustomer($user, $type, $date_start, $date_end, $in_bookkeeping);
-						if (is_array($tmp)) $data = array_merge($data, $tmp);
+						if (is_array($tmp)) {
+							$data = array_merge($data, $tmp);
+						}
 					}
 					if (isModEnabled('supplier_invoice') && !getDolGlobalInt('ACCOUNTING_DISABLE_TRANSFER_ON_DISCOUNTS')) {
 						$tmp = $this->getDiscountSupplier($user, $type, $date_start, $date_end, $in_bookkeeping);
-						if (is_array($tmp)) $data = array_merge($data, $tmp);
+						if (is_array($tmp)) {
+							$data = array_merge($data, $tmp);
+						}
 					}
 					break;
 					//              case 2: // Sells Journal
@@ -745,8 +751,12 @@ 
 		$langs->loadLangs(array('bills'));
 
 		// Clean parameters
-		if (empty($type)) $type = 'view';
-		if (empty($in_bookkeeping)) $in_bookkeeping = 'notyet';
+		if (empty($type)) {
+			$type = 'view';
+		}
+		if (empty($in_bookkeeping)) {
+			$in_bookkeeping = 'notyet';
+		}
 
 		// Build SQL - Customer invoices closed by discount
 		$sql = "SELECT f.rowid, f.ref, f.datef, f.fk_soc, f.total_ttc";
@@ -794,7 +804,9 @@ 
 		$acc_vat_coll_def = getDolGlobalString('ACCOUNTING_VAT_BUY_ACCOUNT');			// Normal to apply vat default account for buy with customer's discount
 
 		while ($obj = $this->db->fetch_object($resql)) {
-			if ($invoice_static->fetch((int) $obj->rowid) <= 0) continue;
+			if ($invoice_static->fetch((int) $obj->rowid) <= 0) {
+				continue;
+			}
 
 			$customer_static->fetch($invoice_static->socid);
 			$account_customer_general = !empty($customer_static->accountancy_code_customer_general) ? $customer_static->accountancy_code_customer_general : getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER');
@@ -808,7 +820,9 @@ 
 			$useddep = (float) price2num($invoice_static->getSumDepositsUsed(), 'MT');
 			$ttc_inv = (float) price2num($invoice_static->total_ttc, 'MT');
 			$escompte_ttc = (float) price2num(max(0, $ttc_inv - $paid - $usedcn - $useddep), 'MT');
-			if ($escompte_ttc <= 0) continue;
+			if ($escompte_ttc <= 0) {
+				continue;
+			}
 
 			$bookkeeping_static = new BookKeeping($this->db);
 			$label_discount = $bookkeeping_static->accountingLabelForOperation($customer_static->getNomUrl(1, 'customer'), $invoice_static->ref, $langs->trans('DiscountGranted'));
@@ -817,9 +831,13 @@ 
 			$ttcByRate = array(); $totalTTC = 0.0;
 			foreach ((array) $invoice_static->lines as $li) {
 				$ttc = (float) $li->total_ttc;
-				if (!$ttc) continue;
+				if (!$ttc) {
+					continue;
+				}
 				$key = number_format((float) $li->tva_tx, 3, '.', '');
-				if (!isset($ttcByRate[$key])) $ttcByRate[$key] = 0.0;
+				if (!isset($ttcByRate[$key])) {
+					$ttcByRate[$key] = 0.0;
+				}
 				$ttcByRate[$key] += $ttc;
 				$totalTTC += $ttc;
 			}
@@ -1035,8 +1053,12 @@ 
 		$langs->loadLangs(array('suppliers'));
 
 		// Clean parameters
-		if (empty($type)) $type = 'view';
-		if (empty($in_bookkeeping)) $in_bookkeeping = 'notyet';
+		if (empty($type)) {
+			$type = 'view';
+		}
+		if (empty($in_bookkeeping)) {
+			$in_bookkeeping = 'notyet';
+		}
 
 		// SQL - Supplier invoices closed by discount
 		$sql = "SELECT ff.rowid, ff.ref, ff.datef, ff.fk_soc, ff.total_ttc";
@@ -1084,7 +1106,9 @@ 
 		$acc_vat_ded_def  = getDolGlobalString('ACCOUNTING_VAT_SOLD_ACCOUNT');			// Normal to apply vat default account for sold with supplier's discount
 
 		while ($obj = $this->db->fetch_object($resql)) {
-			if ($invoicesupplier_static->fetch((int) $obj->rowid) <= 0) continue;
+			if ($invoicesupplier_static->fetch((int) $obj->rowid) <= 0) {
+				continue;
+			}
 
 			$supplier_static->fetch($invoicesupplier_static->socid);
 			$account_supplier_general = !empty($supplier_static->accountancy_code_supplier_general) ? $supplier_static->accountancy_code_supplier_general : getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER');
@@ -1098,7 +1122,9 @@ 
 			$useddep = (float) price2num($invoicesupplier_static->getSumDepositsUsed(), 'MT');
 			$ttc_inv = (float) price2num($invoicesupplier_static->total_ttc, 'MT');
 			$escompte_ttc = (float) price2num(max(0, $ttc_inv - $paid - $usedcn - $useddep), 'MT');
-			if ($escompte_ttc <= 0) continue;
+			if ($escompte_ttc <= 0) {
+				continue;
+			}
 
 			$bookkeeping_static = new BookKeeping($this->db);
 			$label_discount = $bookkeeping_static->accountingLabelForOperation($supplier_static->getNomUrl(1, 'supplier'), $invoicesupplier_static->ref, $langs->trans('DiscountReceived'));
@@ -1107,9 +1133,13 @@ 
 			$ttcByRate = array(); $totalTTC = 0.0;
 			foreach ((array) $invoicesupplier_static->lines as $li) {
 				$ttc = (float) $li->total_ttc;
-				if (!$ttc) continue;
+				if (!$ttc) {
+					continue;
+				}
 				$key = number_format((float) $li->tva_tx, 3, '.', '');
-				if (!isset($ttcByRate[$key])) $ttcByRate[$key] = 0.0;
+				if (!isset($ttcByRate[$key])) {
+					$ttcByRate[$key] = 0.0;
+				}
 				$ttcByRate[$key] += $ttc;
 				$totalTTC += $ttc;
 			}
@@ -1273,9 +1303,11 @@ 
 					}
 				} else {
 					// si TVA = 0, pousser les 2 lignes view/bookkeeping déjà constituées
-					if ($type == 'view') $element['blocks'][] = $lines_view;
-					elseif ($type == 'bookkeeping') $element['blocks'][] = $lines_book;
-					else { // csv
+					if ($type == 'view') {
+						$element['blocks'][] = $lines_view;
+					} elseif ($type == 'bookkeeping') {
+						$element['blocks'][] = $lines_book;
+					} else { // csv
 						$element['blocks'][] = array($docdate, $invoicesupplier_static->ref, length_accountg($account_supplier_general), $label_discount.' - '.$langs->transnoentitiesnoconv('Supplier'), price($ttc_part), '');
 						$element['blocks'][] = array($docdate, $invoicesupplier_static->ref, length_accountg($acc_disc_recv), $label_discount.' ('.$rateStr.'%)', '', price($ht_part));
 					}