Completed
Branch develop (b49701)
by
unknown
24:08
created
htdocs/compta/facture/card.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2794,9 +2794,11 @@
 block discarded – undo
2794 2794
 		$outlangs = $langs;
2795 2795
 		$margin_rate = GETPOSTISSET('marginforalllines') ? GETPOST('marginforalllines', 'int') : '';
2796 2796
 		$mark_rate = GETPOSTISSET('markforalllines') ? GETPOST('markforalllines', 'int') : '';
2797
-		foreach ($object->lines as &$line) if ($line->subprice > 0) {
2797
+		foreach ($object->lines as &$line) {
2798
+			if ($line->subprice > 0) {
2798 2799
 			if ($line->special_code == SUBTOTALS_SPECIAL_CODE) {
2799 2800
 				continue;
2801
+		}
2800 2802
 			}
2801 2803
 			$subprice_multicurrency = $line->subprice;
2802 2804
 			if (is_numeric($margin_rate) && $margin_rate > 0) {
Please login to merge, or discard this patch.
htdocs/comm/propal/card.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1703,9 +1703,11 @@
 block discarded – undo
1703 1703
 		// Define margin
1704 1704
 		$margin_rate = GETPOSTISSET('marginforalllines') ? GETPOST('marginforalllines', 'int') : '';
1705 1705
 		$mark_rate = GETPOSTISSET('markforalllines') ? GETPOST('markforalllines', 'int') : '';
1706
-		foreach ($object->lines as &$line) if ($line->subprice > 0) {
1706
+		foreach ($object->lines as &$line) {
1707
+			if ($line->subprice > 0) {
1707 1708
 			if ($line->special_code == SUBTOTALS_SPECIAL_CODE) {
1708 1709
 				continue;
1710
+		}
1709 1711
 			}
1710 1712
 			$subprice_multicurrency = $line->subprice;
1711 1713
 			if (is_numeric($margin_rate) && $margin_rate > 0) {
Please login to merge, or discard this patch.
htdocs/commande/card.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1703,9 +1703,11 @@
 block discarded – undo
1703 1703
 		// Define margin
1704 1704
 		$margin_rate = GETPOSTISSET('marginforalllines') ? GETPOST('marginforalllines', 'int') : '';
1705 1705
 		$mark_rate = GETPOSTISSET('markforalllines') ? GETPOST('markforalllines', 'int') : '';
1706
-		foreach ($object->lines as &$line) if ($line->subprice > 0) {
1706
+		foreach ($object->lines as &$line) {
1707
+			if ($line->subprice > 0) {
1707 1708
 			if ($line->special_code == SUBTOTALS_SPECIAL_CODE) {
1708 1709
 				continue;
1710
+		}
1709 1711
 			}
1710 1712
 			$subprice_multicurrency = $line->subprice;
1711 1713
 			if (is_numeric($margin_rate) && $margin_rate > 0) {
Please login to merge, or discard this patch.
htdocs/core/modules/accountancy/doc/pdf_bookkeeping.modules.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1615,7 +1615,9 @@
 block discarded – undo
1615 1615
 		global $conf, $langs;
1616 1616
 
1617 1617
 		$ltrdirection = 'L';
1618
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
1618
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
1619
+			$ltrdirection = 'R';
1620
+		}
1619 1621
 
1620 1622
 		// Load traductions files required by page
1621 1623
 		$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
Please login to merge, or discard this patch.
htdocs/core/modules/accountancy/doc/pdf_ledger.modules.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1615,7 +1615,9 @@
 block discarded – undo
1615 1615
 		global $conf, $langs;
1616 1616
 
1617 1617
 		$ltrdirection = 'L';
1618
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
1618
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
1619
+			$ltrdirection = 'R';
1620
+		}
1619 1621
 
1620 1622
 		// Load traductions files required by page
1621 1623
 		$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
Please login to merge, or discard this patch.
htdocs/core/modules/accountancy/doc/pdf_balance.modules.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1615,7 +1615,9 @@
 block discarded – undo
1615 1615
 		global $conf, $langs;
1616 1616
 
1617 1617
 		$ltrdirection = 'L';
1618
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
1618
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
1619
+			$ltrdirection = 'R';
1620
+		}
1619 1621
 
1620 1622
 		// Load traductions files required by page
1621 1623
 		$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
Please login to merge, or discard this patch.
htdocs/accountancy/class/bookkeeping.class.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3385,11 +3385,15 @@
 block discarded – undo
3385 3385
 				if ($bookkeeping->fetch($id)) {
3386 3386
 					if ( !getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER')) {
3387 3387
 						$accountcustcode = '411';
3388
-					} else $accountcustcode = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER');
3388
+					} else {
3389
+						$accountcustcode = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER');
3390
+					}
3389 3391
 
3390 3392
 					if ( !getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER')) {
3391 3393
 						$accountsuppcode = '401';
3392
-					} else $accountsuppcode = getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER');
3394
+					} else {
3395
+						$accountsuppcode = getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER');
3396
+					}
3393 3397
 
3394 3398
 					if (strpos($bookkeeping->numero_compte, $accountcustcode) === 0 || strpos($bookkeeping->numero_compte, $accountsuppcode) === 0) {
3395 3399
 						$echecT[]=$bookkeeping->numero_compte;
Please login to merge, or discard this patch.
htdocs/api/class/api_documents.class.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -639,7 +639,9 @@
 block discarded – undo
639 639
 								$filearray[$i] = array_merge($filearray[$i], (array) $line);
640 640
 							}
641 641
 						}
642
-						if (isset($line->filename)) $filearray[$i]['content-type'] = dol_mimetype($line->filename);
642
+						if (isset($line->filename)) {
643
+							$filearray[$i]['content-type'] = dol_mimetype($line->filename);
644
+						}
643 645
 						$arraycontenttype = explode(",", $content_type);
644 646
 						if (!empty($content_type) && isset($line->filename) && !in_array(dol_mimetype($line->filename), $arraycontenttype)) {
645 647
 							unset($filearray[$i]);
Please login to merge, or discard this patch.
htdocs/accountancy/journal/bankjournal.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -404,7 +404,9 @@
 block discarded – undo
404 404
 			$resultamount = $db->query($sqlamount);
405 405
 			if ($resultamount) {
406 406
 				$objamount = $db->fetch_object($resultamount);
407
-				if (!empty($objamount->amount)) $amounttouse = $objamount->amount;
407
+				if (!empty($objamount->amount)) {
408
+					$amounttouse = $objamount->amount;
409
+				}
408 410
 			}
409 411
 		}
410 412
 
Please login to merge, or discard this patch.