Completed
Branch develop (ac6154)
by
unknown
17:16
created
htdocs/compta/stats/casoc.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,9 @@
 block discarded – undo
57 57
 
58 58
 // Category
59 59
 $selected_cat = (int) GETPOST('search_categ', 'int');
60
-if ($selected_cat == -1) $selected_cat = '';
60
+if ($selected_cat == -1) {
61
+	$selected_cat = '';
62
+}
61 63
 $subcat = false;
62 64
 if (GETPOST('subcat', 'alpha') === 'yes') {
63 65
 	$subcat = true;
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
 	$month_current = dol_print_date(dol_now(), '%m');
100 100
 	$year_start = $year;
101 101
 }
102
-$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver');	// We use timezone of server so report is same from everywhere
103
-$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
102
+$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
103
+$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
104 104
 // Quarter
105 105
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
106 106
 	$q = GETPOST("q", "int") ?GETPOST("q", "int") : 0;
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 $headerparams = array_merge($commonparams, $headerparams);
180 180
 $tableparams = array_merge($commonparams, $tableparams);
181 181
 
182
-$paramslink="";
182
+$paramslink = "";
183 183
 foreach ($allparams as $key => $value) {
184 184
 	$paramslink .= '&'.$key.'='.$value;
185 185
 }
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
203 203
 	$modecompta = "RECETTES-DEPENSES";
204 204
 }
205 205
 
206
-$exportlink="";
207
-$namelink="";
206
+$exportlink = "";
207
+$namelink = "";
208 208
 
209 209
 // Show report header
210 210
 if ($modecompta == "CREANCES-DETTES") {
Please login to merge, or discard this patch.
htdocs/core/class/commonstickergenerator.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -289,7 +289,7 @@
 block discarded – undo
289 289
 		// phpcs:enable
290 290
 		$this->_Metric = $format['metric'];
291 291
 		$this->_Avery_Name = $format['name'];
292
-		$this->_Avery_Code = empty($format['code'])?'':$format['code'];
292
+		$this->_Avery_Code = empty($format['code']) ? '' : $format['code'];
293 293
 		$this->_Margin_Left = $this->convertMetric($format['marginLeft'], $this->_Metric, $this->_Metric_Doc);
294 294
 		$this->_Margin_Top = $this->convertMetric($format['marginTop'], $this->_Metric, $this->_Metric_Doc);
295 295
 		$this->_X_Space = $this->convertMetric($format['SpaceX'], $this->_Metric, $this->_Metric_Doc);
Please login to merge, or discard this patch.
htdocs/compta/facture/class/facture.class.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -813,7 +813,9 @@
 block discarded – undo
813 813
 
814 814
 						// Complete vat rate with code
815 815
 						$vatrate = $newinvoiceline->tva_tx;
816
-						if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$newinvoiceline->vat_src_code.')';
816
+						if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) {
817
+							$vatrate.=' ('.$newinvoiceline->vat_src_code.')';
818
+						}
817 819
 
818 820
 						$newinvoiceline->fk_parent_line = $fk_parent_line;
819 821
 
Please login to merge, or discard this patch.
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
 			$this->mode_reglement_id = 0;
462 462
 		}
463 463
 		$this->status = self::STATUS_DRAFT;
464
-		$this->statut = self::STATUS_DRAFT;	// deprecated
464
+		$this->statut = self::STATUS_DRAFT; // deprecated
465 465
 
466 466
 		if (!empty($this->multicurrency_code)) {
467 467
 			// Multicurrency (test on $this->multicurrency_tx because we should take the default rate of multicurrency_code only if not using original rate)
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
 				$this->mode_reglement_id = 0;
563 563
 			}
564 564
 			$this->status = self::STATUS_DRAFT;
565
-			$this->statut = self::STATUS_DRAFT;	// deprecated
565
+			$this->statut = self::STATUS_DRAFT; // deprecated
566 566
 
567 567
 			$this->linked_objects = $_facrec->linkedObjectsIds;
568 568
 			// We do not add link to template invoice or next invoice will be linked to all generated invoices
@@ -807,7 +807,7 @@  discard block
 block discarded – undo
807 807
 
808 808
 						// Complete vat rate with code
809 809
 						$vatrate = $newinvoiceline->tva_tx;
810
-						if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$newinvoiceline->vat_src_code.')';
810
+						if ($newinvoiceline->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) $vatrate .= ' ('.$newinvoiceline->vat_src_code.')';
811 811
 
812 812
 						$newinvoiceline->fk_parent_line = $fk_parent_line;
813 813
 
@@ -1037,7 +1037,7 @@  discard block
 block discarded – undo
1037 1037
 						$buyprice,
1038 1038
 						$_facrec->lines[$i]->label,
1039 1039
 						empty($_facrec->lines[$i]->array_options) ?null:$_facrec->lines[$i]->array_options,
1040
-						100,	// situation percent is undefined on recurring invoice lines
1040
+						100, // situation percent is undefined on recurring invoice lines
1041 1041
 						'',
1042 1042
 						$_facrec->lines[$i]->fk_unit,
1043 1043
 						$_facrec->lines[$i]->multicurrency_subprice,
@@ -1133,7 +1133,7 @@  discard block
 block discarded – undo
1133 1133
 
1134 1134
 		$facture->fk_facture_source = $this->fk_facture_source;
1135 1135
 		$facture->type 			    = $this->type;
1136
-		$facture->subtype 			= $this->subtype;
1136
+		$facture->subtype = $this->subtype;
1137 1137
 		$facture->socid 		    = $this->socid;
1138 1138
 		$facture->date              = $this->date;
1139 1139
 		$facture->date_pointoftax   = $this->date_pointoftax;
@@ -1149,7 +1149,7 @@  discard block
 block discarded – undo
1149 1149
 
1150 1150
 		$facture->origin            = $this->origin;
1151 1151
 		$facture->origin_id         = $this->origin_id;
1152
-		$facture->fk_account         = $this->fk_account;
1152
+		$facture->fk_account = $this->fk_account;
1153 1153
 
1154 1154
 		$facture->lines = $this->lines; // Array of lines of invoice
1155 1155
 		$facture->situation_counter = $this->situation_counter;
@@ -1620,7 +1620,7 @@  discard block
 block discarded – undo
1620 1620
 	{
1621 1621
 		global $conf, $langs, $hookmanager, $action;
1622 1622
 
1623
-		if (! in_array($origin->element, array('propal', 'commande'))) {
1623
+		if (!in_array($origin->element, array('propal', 'commande'))) {
1624 1624
 			$origin->error = 'ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder';
1625 1625
 			return null;
1626 1626
 		}
@@ -1630,7 +1630,7 @@  discard block
 block discarded – undo
1630 1630
 			return null;
1631 1631
 		}
1632 1632
 
1633
-		require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
1633
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
1634 1634
 
1635 1635
 		if ($date > (dol_get_last_hour(dol_now('tzuserrel')) + (empty($conf->global->INVOICE_MAX_FUTURE_DELAY) ? 0 : $conf->global->INVOICE_MAX_FUTURE_DELAY))) {
1636 1636
 			$origin->error = 'ErrorDateIsInFuture';
@@ -1674,7 +1674,7 @@  discard block
 block discarded – undo
1674 1674
 		$deposit->pos_source = $origin->pos_source;
1675 1675
 		$deposit->model_pdf = 'crabe';
1676 1676
 
1677
-		$modelByTypeConfName = 'FACTURE_ADDON_PDF_' . $deposit->type;
1677
+		$modelByTypeConfName = 'FACTURE_ADDON_PDF_'.$deposit->type;
1678 1678
 
1679 1679
 		if (!empty($conf->global->$modelByTypeConfName)) {
1680 1680
 			$deposit->model_pdf = $conf->global->$modelByTypeConfName;
@@ -1729,10 +1729,10 @@  discard block
 block discarded – undo
1729 1729
 					continue;
1730 1730
 				}
1731 1731
 				$TTotalByTva[$line->tva_tx] += $line->total_ttc;
1732
-				$descriptions[$line->tva_tx] .= '<li>' . (!empty($line->product_ref) ? $line->product_ref . ' - ' :  '');
1733
-				$descriptions[$line->tva_tx] .= (!empty($line->product_label) ? $line->product_label . ' - ' : '');
1734
-				$descriptions[$line->tva_tx] .= $langs->trans('Qty') . ' : ' . $line->qty;
1735
-				$descriptions[$line->tva_tx] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($line->total_ht) . '</li>';
1732
+				$descriptions[$line->tva_tx] .= '<li>'.(!empty($line->product_ref) ? $line->product_ref.' - ' : '');
1733
+				$descriptions[$line->tva_tx] .= (!empty($line->product_label) ? $line->product_label.' - ' : '');
1734
+				$descriptions[$line->tva_tx] .= $langs->trans('Qty').' : '.$line->qty;
1735
+				$descriptions[$line->tva_tx] .= ' - '.$langs->trans('TotalHT').' : '.price($line->total_ht).'</li>';
1736 1736
 			}
1737 1737
 
1738 1738
 			foreach ($TTotalByTva as $tva => &$total) {
@@ -1756,10 +1756,10 @@  discard block
 block discarded – undo
1756 1756
 				$totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
1757 1757
 				$tva_tx = $lines[$i]->tva_tx;
1758 1758
 				$amountdeposit[$tva_tx] += ($lines[$i]->total_ht * $origin->deposit_percent) / 100;
1759
-				$descriptions[$tva_tx] .= '<li>' . (!empty($lines[$i]->product_ref) ? $lines[$i]->product_ref . ' - ' :  '');
1760
-				$descriptions[$tva_tx] .= (!empty($lines[$i]->product_label) ? $lines[$i]->product_label . ' - ' : '');
1761
-				$descriptions[$tva_tx] .= $langs->trans('Qty') . ' : ' . $lines[$i]->qty;
1762
-				$descriptions[$tva_tx] .= ' - ' . $langs->trans('TotalHT') . ' : ' . price($lines[$i]->total_ht) . '</li>';
1759
+				$descriptions[$tva_tx] .= '<li>'.(!empty($lines[$i]->product_ref) ? $lines[$i]->product_ref.' - ' : '');
1760
+				$descriptions[$tva_tx] .= (!empty($lines[$i]->product_label) ? $lines[$i]->product_label.' - ' : '');
1761
+				$descriptions[$tva_tx] .= $langs->trans('Qty').' : '.$lines[$i]->qty;
1762
+				$descriptions[$tva_tx] .= ' - '.$langs->trans('TotalHT').' : '.price($lines[$i]->total_ht).'</li>';
1763 1763
 			}
1764 1764
 
1765 1765
 			if ($totalamount == 0) {
@@ -1774,11 +1774,11 @@  discard block
 block discarded – undo
1774 1774
 				continue;
1775 1775
 			}
1776 1776
 
1777
-			$descline = '(DEPOSIT) ('. $origin->deposit_percent .'%) - '.$origin->ref;
1777
+			$descline = '(DEPOSIT) ('.$origin->deposit_percent.'%) - '.$origin->ref;
1778 1778
 
1779 1779
 			// Hidden conf
1780 1780
 			if (!empty($conf->global->INVOICE_DEPOSIT_VARIABLE_MODE_DETAIL_LINES_IN_DESCRIPTION) && !empty($descriptions[$tva])) {
1781
-				$descline .= '<ul>' . $descriptions[$tva] . '</ul>';
1781
+				$descline .= '<ul>'.$descriptions[$tva].'</ul>';
1782 1782
 			}
1783 1783
 
1784 1784
 			$addlineResult = $deposit->addline(
@@ -2040,7 +2040,7 @@  discard block
 block discarded – undo
2040 2040
 				$label = $langs->trans("Invoice");
2041 2041
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
2042 2042
 			}
2043
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
2043
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
2044 2044
 			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';
2045 2045
 		}
2046 2046
 
@@ -2151,9 +2151,9 @@  discard block
 block discarded – undo
2151 2151
 				$this->id = $obj->rowid;
2152 2152
 				$this->entity = $obj->entity;
2153 2153
 
2154
-				$this->ref					= $obj->ref;
2155
-				$this->ref_client			= $obj->ref_client;
2156
-				$this->ref_customer			= $obj->ref_client;
2154
+				$this->ref = $obj->ref;
2155
+				$this->ref_client = $obj->ref_client;
2156
+				$this->ref_customer = $obj->ref_client;
2157 2157
 				$this->ref_ext				= $obj->ref_ext;
2158 2158
 				$this->type					= $obj->type;
2159 2159
 				$this->subtype				= $obj->subtype;
@@ -2179,7 +2179,7 @@  discard block
 block discarded – undo
2179 2179
 				$this->fk_project = $obj->fk_project;
2180 2180
 				$this->project = null; // Clear if another value was already set by fetch_projet
2181 2181
 
2182
-				$this->statut = $obj->status;	// deprecated
2182
+				$this->statut = $obj->status; // deprecated
2183 2183
 				$this->status = $obj->status;
2184 2184
 
2185 2185
 				$this->date_lim_reglement = $this->db->jdate($obj->dlr);
@@ -2195,7 +2195,7 @@  discard block
 block discarded – undo
2195 2195
 				$this->fk_fac_rec_source	= $obj->fk_fac_rec_source;
2196 2196
 				$this->note = $obj->note_private; // deprecated
2197 2197
 				$this->note_private = $obj->note_private;
2198
-				$this->note_public			= $obj->note_public;
2198
+				$this->note_public = $obj->note_public;
2199 2199
 				$this->user_creation_id     = $obj->fk_user_author;
2200 2200
 				$this->user_validation_id   = $obj->fk_user_valid;
2201 2201
 				$this->user_modification_id = $obj->fk_user_modif;
@@ -2311,7 +2311,7 @@  discard block
 block discarded – undo
2311 2311
 				$line->ref              = $objp->product_ref; // Ref product
2312 2312
 				$line->product_ref      = $objp->product_ref; // Ref product
2313 2313
 				$line->libelle          = $objp->product_label; // deprecated
2314
-				$line->product_label 	= $objp->product_label; // Label product
2314
+				$line->product_label = $objp->product_label; // Label product
2315 2315
 				$line->product_barcode  = $objp->product_barcode; // Barcode number product
2316 2316
 				$line->product_desc     = $objp->product_desc; // Description product
2317 2317
 				$line->fk_product_type  = $objp->fk_product_type; // Type of product
@@ -2607,7 +2607,7 @@  discard block
 block discarded – undo
2607 2607
 				$facligne->rang = 1;
2608 2608
 				$linecount = count($this->lines);
2609 2609
 				for ($ii = 1; $ii <= $linecount; $ii++) {
2610
-					$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii+1);
2610
+					$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
2611 2611
 				}
2612 2612
 			}
2613 2613
 
@@ -3183,7 +3183,7 @@  discard block
 block discarded – undo
3183 3183
 		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('facture', 'creer'))
3184 3184
 		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight('facture', 'invoice_advance', 'validate'))) {
3185 3185
 			$this->error = 'Permission denied';
3186
-			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS=' . getDolGlobalString('MAIN_USE_ADVANCED_PERMS'), LOG_ERR);
3186
+			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS='.getDolGlobalString('MAIN_USE_ADVANCED_PERMS'), LOG_ERR);
3187 3187
 			return -1;
3188 3188
 		}
3189 3189
 		if (!empty($conf->global-> INVOICE_CHECK_POSTERIOR_DATE)) {
@@ -3527,7 +3527,7 @@  discard block
 block discarded – undo
3527 3527
 			// Set new ref and define current status
3528 3528
 			if (!$error) {
3529 3529
 				$this->ref = $num;
3530
-				$this->statut = self::STATUS_VALIDATED;	// deprecated
3530
+				$this->statut = self::STATUS_VALIDATED; // deprecated
3531 3531
 				$this->status = self::STATUS_VALIDATED;
3532 3532
 				$this->date_validation = $now;
3533 3533
 				$i = 0;
@@ -3672,7 +3672,7 @@  discard block
 block discarded – undo
3672 3672
 
3673 3673
 			if ($error == 0) {
3674 3674
 				$old_statut = $this->status;
3675
-				$this->statut = self::STATUS_DRAFT;	// deprecated
3675
+				$this->statut = self::STATUS_DRAFT; // deprecated
3676 3676
 				$this->status = self::STATUS_DRAFT;
3677 3677
 
3678 3678
 				// Call trigger
@@ -4003,7 +4003,7 @@  discard block
 block discarded – undo
4003 4003
 				return -2;
4004 4004
 			}
4005 4005
 		} else {
4006
-			$this->errors[]='status of invoice must be Draft to allow use of ->addline()';
4006
+			$this->errors[] = 'status of invoice must be Draft to allow use of ->addline()';
4007 4007
 			dol_syslog(get_class($this)."::addline status of invoice must be Draft to allow use of ->addline()", LOG_ERR);
4008 4008
 			return -3;
4009 4009
 		}
@@ -4569,7 +4569,7 @@  discard block
 block discarded – undo
4569 4569
 		}
4570 4570
 
4571 4571
 		if (!empty($addon)) {
4572
-			dol_syslog("Call getNextNumRef with ".$addonConstName." = " . getDolGlobalString('FACTURE_ADDON').", thirdparty=".$soc->name.", type=".$soc->typent_code.", mode=".$mode, LOG_DEBUG);
4572
+			dol_syslog("Call getNextNumRef with ".$addonConstName." = ".getDolGlobalString('FACTURE_ADDON').", thirdparty=".$soc->name.", type=".$soc->typent_code.", mode=".$mode, LOG_DEBUG);
4573 4573
 
4574 4574
 			$mybool = false;
4575 4575
 
@@ -5639,14 +5639,14 @@  discard block
 block discarded – undo
5639 5639
 		if (!empty($paymentmode) && $paymentmode != 'all') {
5640 5640
 			$sql .= ", ".MAIN_DB_PREFIX."c_paiement as cp";
5641 5641
 		}
5642
-		$sql .= " WHERE f.paye = 0";	// Only unpaid
5643
-		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED;	// Only validated status
5642
+		$sql .= " WHERE f.paye = 0"; // Only unpaid
5643
+		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED; // Only validated status
5644 5644
 		if ($datetouse == 'invoicedate') {
5645 5645
 			$sql .= " AND f.datef = '".$this->db->idate($tmpidate, 'gmt')."'";
5646 5646
 		} else {
5647 5647
 			$sql .= " AND f.date_lim_reglement = '".$this->db->idate($tmpidate, 'gmt')."'";
5648 5648
 		}
5649
-		$sql .= " AND f.entity IN (".getEntity('facture', 0).")";	// One batch process only one company (no sharing)
5649
+		$sql .= " AND f.entity IN (".getEntity('facture', 0).")"; // One batch process only one company (no sharing)
5650 5650
 		if (!empty($paymentmode) && $paymentmode != 'all') {
5651 5651
 			$sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '".$this->db->escape($paymentmode)."'";
5652 5652
 		}
@@ -5854,7 +5854,7 @@  discard block
 block discarded – undo
5854 5854
 								$actioncomm->create($user);
5855 5855
 							}
5856 5856
 
5857
-							$this->db->commit();	// We always commit
5857
+							$this->db->commit(); // We always commit
5858 5858
 						}
5859 5859
 
5860 5860
 						if ($errormesg) {
@@ -5890,7 +5890,7 @@  discard block
 block discarded – undo
5890 5890
 		// get date of last validated invoices of same type
5891 5891
 		$sql  = "SELECT datef";
5892 5892
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
5893
-		$sql .= " WHERE type = " . (int) $this->type ;
5893
+		$sql .= " WHERE type = ".(int) $this->type;
5894 5894
 		$sql .= " AND date_valid IS NOT NULL";
5895 5895
 		$sql .= " AND entity IN (".getEntity('invoice').")";
5896 5896
 		$sql .= " ORDER BY datef DESC LIMIT 1";
@@ -6080,7 +6080,7 @@  discard block
 block discarded – undo
6080 6080
 			$objp = $this->db->fetch_object($result);
6081 6081
 
6082 6082
 			if (!$objp) {
6083
-				$this->error = 'InvoiceLine with id '. $rowid .' not found sql='.$sql;
6083
+				$this->error = 'InvoiceLine with id '.$rowid.' not found sql='.$sql;
6084 6084
 				return 0;
6085 6085
 			}
6086 6086
 
Please login to merge, or discard this patch.
htdocs/projet/activity/perday.php 1 patch
Braces   +8 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,8 +96,14 @@
 block discarded – undo
96 96
 }
97 97
 
98 98
 $daytoparsegmt = dol_now('gmt');
99
-if ($yearofday && $monthofday && $dayofday) $daytoparsegmt = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday, 'gmt'); // xxxofday is value of day after submit action 'addtime'
100
-elseif ($year && $month && $day) $daytoparsegmt = dol_mktime(0, 0, 0, $month, $day, $year, 'gmt'); // this are value submited after submit of action 'submitdateselect'
99
+if ($yearofday && $monthofday && $dayofday) {
100
+	$daytoparsegmt = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday, 'gmt');
101
+}
102
+// xxxofday is value of day after submit action 'addtime'
103
+elseif ($year && $month && $day) {
104
+	$daytoparsegmt = dol_mktime(0, 0, 0, $month, $day, $year, 'gmt');
105
+}
106
+// this are value submited after submit of action 'submitdateselect'
101 107
 
102 108
 if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id) {
103 109
 	$usertoprocess = $user;
Please login to merge, or discard this patch.
htdocs/expensereport/payment/list.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -53,20 +53,20 @@  discard block
 block discarded – undo
53 53
 // Security check
54 54
 if ($user->socid) $socid = $user->socid;
55 55
 
56
-$search_ref				= GETPOST('search_ref', 'alpha');
57
-$search_date_startday	= GETPOST('search_date_startday', 'int');
58
-$search_date_startmonth	= GETPOST('search_date_startmonth', 'int');
59
-$search_date_startyear	= GETPOST('search_date_startyear', 'int');
56
+$search_ref = GETPOST('search_ref', 'alpha');
57
+$search_date_startday = GETPOST('search_date_startday', 'int');
58
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
59
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
60 60
 $search_date_endday		= GETPOST('search_date_endday', 'int');
61
-$search_date_endmonth	= GETPOST('search_date_endmonth', 'int');
61
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
62 62
 $search_date_endyear	= GETPOST('search_date_endyear', 'int');
63
-$search_date_start		= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
64
-$search_date_end		= dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
65
-$search_user			= GETPOST('search_user', 'alpha');
63
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
64
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
65
+$search_user = GETPOST('search_user', 'alpha');
66 66
 $search_payment_type	= GETPOST('search_payment_type');
67
-$search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
67
+$search_cheque_num = GETPOST('search_cheque_num', 'alpha');
68 68
 $search_bank_account	= GETPOST('search_bank_account', 'int');
69
-$search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
69
+$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
70 70
 
71 71
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
72 72
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
@@ -198,10 +198,10 @@  discard block
 block discarded – undo
198 198
 	$sql .= natural_search('pndf.rowid', $search_ref);
199 199
 }
200 200
 if ($search_date_start) {
201
-	$sql .= " AND pndf.datep >= '" . $db->idate($search_date_start) . "'";
201
+	$sql .= " AND pndf.datep >= '".$db->idate($search_date_start)."'";
202 202
 }
203 203
 if ($search_date_end) {
204
-	$sql .=" AND pndf.datep <= '" . $db->idate($search_date_end) . "'";
204
+	$sql .= " AND pndf.datep <= '".$db->idate($search_date_end)."'";
205 205
 }
206 206
 
207 207
 if ($search_user) {
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,9 @@
 block discarded – undo
49 49
 $socid = GETPOST('socid', 'int');
50 50
 
51 51
 // Security check
52
-if ($user->socid) $socid = $user->socid;
52
+if ($user->socid) {
53
+	$socid = $user->socid;
54
+}
53 55
 
54 56
 $search_ref				= GETPOST('search_ref', 'alpha');
55 57
 $search_date_startday	= GETPOST('search_date_startday', 'int');
Please login to merge, or discard this patch.
htdocs/recruitment/recruitmentjobposition_list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -303,7 +303,7 @@
 block discarded – undo
303 303
 					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
304 304
 				}
305 305
 				if (preg_match('/_dtend$/', $key)) {
306
-					$sql .= " AND t.".$db->escape($columnName)." <= '" . $db->idate($search[$key])."'";
306
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
307 307
 				}
308 308
 			}
309 309
 		}
Please login to merge, or discard this patch.
htdocs/debugbar/class/DataCollector/DolLogsCollector.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
 	{
74 74
 		global $conf;
75 75
 
76
-		$uselogfile =  getDolGlobalInt('DEBUGBAR_USE_LOG_FILE');
76
+		$uselogfile = getDolGlobalInt('DEBUGBAR_USE_LOG_FILE');
77 77
 
78 78
 		if ($uselogfile) {
79 79
 			$this->getStorageLogs($this->path);
Please login to merge, or discard this patch.
htdocs/admin/emailcollector_list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -507,7 +507,7 @@
 block discarded – undo
507 507
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
508 508
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
509 509
 	}
510
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
510
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
511 511
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
512 512
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
513 513
 		$totalarray['nbfield']++;
Please login to merge, or discard this patch.
htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -235,7 +235,7 @@
 block discarded – undo
235 235
 			if (!function_exists('simplexml_load_string')) {
236 236
 				throw new PrestaShopWebserviceException('Method simplexml_load_string not available. Your PHP does not support xml.');
237 237
 			}
238
-			$xml = simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
238
+			$xml = simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET);
239 239
 			if (libxml_get_errors()) {
240 240
 				$msg = var_export(libxml_get_errors(), true);
241 241
 				libxml_clear_errors();
Please login to merge, or discard this patch.