Completed
Branch develop (1c99bb)
by
unknown
20:22
created
htdocs/compta/paiement/cheque/class/remisecheque.class.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -715,12 +715,12 @@
 block discarded – undo
715 715
 	}
716 716
 
717 717
 		/**
718
-	 *	Return clicable link of object (with eventually picto)
719
-	 *
720
-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
721
-	 *  @param		array		$arraydata				Array of data
722
-	 *  @return		string								HTML Code for Kanban thumb.
723
-	 */
718
+		 *	Return clicable link of object (with eventually picto)
719
+		 *
720
+		 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
721
+		 *  @param		array		$arraydata				Array of data
722
+		 *  @return		string								HTML Code for Kanban thumb.
723
+		 */
724 724
 	public function getKanbanView($option = '', $arraydata = null)
725 725
 	{
726 726
 		global $langs;
Please login to merge, or discard this patch.
htdocs/compta/sociales/class/chargesociales.class.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -751,12 +751,12 @@
 block discarded – undo
751 751
 	}
752 752
 
753 753
 		/**
754
-	 *	Return clicable link of object (with eventually picto)
755
-	 *
756
-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
757
-	 *  @param		array		$arraydata				Array of data
758
-	 *  @return		string								HTML Code for Kanban thumb.
759
-	 */
754
+		 *	Return clicable link of object (with eventually picto)
755
+		 *
756
+		 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
757
+		 *  @param		array		$arraydata				Array of data
758
+		 *  @return		string								HTML Code for Kanban thumb.
759
+		 */
760 760
 	public function getKanbanView($option = '', $arraydata = null)
761 761
 	{
762 762
 		global $conf, $langs;
Please login to merge, or discard this patch.
htdocs/user/class/usergroup.class.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -715,12 +715,12 @@
 block discarded – undo
715 715
 	}
716 716
 
717 717
 		/**
718
-	 *	Return clicable link of object (with eventually picto)
719
-	 *
720
-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
721
-	 *  @param		array		$arraydata				Array of data
722
-	 *  @return		string								HTML Code for Kanban thumb.
723
-	 */
718
+		 *	Return clicable link of object (with eventually picto)
719
+		 *
720
+		 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
721
+		 *  @param		array		$arraydata				Array of data
722
+		 *  @return		string								HTML Code for Kanban thumb.
723
+		 */
724 724
 	public function getKanbanView($option = '', $arraydata = null)
725 725
 	{
726 726
 		global $langs;
Please login to merge, or discard this patch.
htdocs/expedition/class/api_shipments.class.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -623,15 +623,15 @@
 block discarded – undo
623 623
 	*/
624 624
 
625 625
 	/**
626
-	* Close a shipment (Classify it as "Delivered")
627
-	*
628
-	* @param   int     $id             Expedition ID
629
-	* @param   int     $notrigger      Disabled triggers
630
-	*
631
-	* @url POST    {id}/close
632
-	*
633
-	* @return  object
634
-	*/
626
+	 * Close a shipment (Classify it as "Delivered")
627
+	 *
628
+	 * @param   int     $id             Expedition ID
629
+	 * @param   int     $notrigger      Disabled triggers
630
+	 *
631
+	 * @url POST    {id}/close
632
+	 *
633
+	 * @return  object
634
+	 */
635 635
 	public function close($id, $notrigger = 0)
636 636
 	{
637 637
 		if (!DolibarrApiAccess::$user->rights->expedition->creer) {
Please login to merge, or discard this patch.
htdocs/product/class/product.class.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -306,10 +306,10 @@  discard block
 block discarded – undo
306 306
 	public $finished;
307 307
 
308 308
 		/**
309
-	 * fk_default_bom indicates the default bom
310
-	 *
311
-	 * @var int
312
-	 */
309
+		 * fk_default_bom indicates the default bom
310
+		 *
311
+		 * @var int
312
+		 */
313 313
 	public $fk_default_bom;
314 314
 
315 315
 	/**
@@ -6360,12 +6360,12 @@  discard block
 block discarded – undo
6360 6360
 
6361 6361
 
6362 6362
 		/**
6363
-	 *	Return clicable link of object (with eventually picto)
6364
-	 *
6365
-	 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
6366
-	 *  @param		array		$arraydata				Array of data
6367
-	 *  @return		string								HTML Code for Kanban thumb.
6368
-	 */
6363
+		 *	Return clicable link of object (with eventually picto)
6364
+		 *
6365
+		 *	@param      string	    $option                 Where point the link (0=> main card, 1,2 => shipment, 'nolink'=>No link)
6366
+		 *  @param		array		$arraydata				Array of data
6367
+		 *  @return		string								HTML Code for Kanban thumb.
6368
+		 */
6369 6369
 	public function getKanbanView($option = '', $arraydata = null)
6370 6370
 	{
6371 6371
 		global $langs,$conf;
Please login to merge, or discard this patch.
htdocs/salaries/class/salary.class.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -446,7 +446,7 @@  discard block
 block discarded – undo
446 446
 		}
447 447
 	}
448 448
 
449
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
449
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
450 450
 	/**
451 451
 	 *  Update link between payment salary and line generate into llx_bank
452 452
 	 *
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
455 455
 	 */
456 456
 	public function update_fk_bank($id_bank)
457 457
 	{
458
-        // phpcs:enable
458
+		// phpcs:enable
459 459
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'salary SET fk_bank = '.((int) $id_bank);
460 460
 		$sql .= " WHERE rowid = ".((int) $this->id);
461 461
 		$result = $this->db->query($sql);
@@ -692,7 +692,7 @@  discard block
 block discarded – undo
692 692
 		return $this->LibStatut($this->paye, $mode, $alreadypaid);
693 693
 	}
694 694
 
695
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
695
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
696 696
 	/**
697 697
 	 *  Return label of a given status
698 698
 	 *
Please login to merge, or discard this patch.
websites/website_template-restaurant/containers/page252.tpl.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -51,10 +51,10 @@  discard block
 block discarded – undo
51 51
 
52 52
          
53 53
                         <?php $days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"];
54
-                        foreach ($days as $day){
55
-                            echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";    
56
-                        }
57
-                        ?>
54
+						foreach ($days as $day){
55
+							echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";    
56
+						}
57
+						?>
58 58
 
59 59
                         <p>
60 60
                             Tel:
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
 
70 70
                         <ul class="social-icon">
71 71
                              <?php foreach($mysoc->socialnetworks as $key => $value) {
72
-                                print '<li> <a class="btn btn-perso2 btn-floating m-1" href="'. (preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'"></i></a> </li>';
73
-                             } ?>
72
+								print '<li> <a class="btn btn-perso2 btn-floating m-1" href="'. (preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'"></i></a> </li>';
73
+							 } ?>
74 74
 
75 75
                        
76 76
                         </ul>
Please login to merge, or discard this patch.
websites/website_template-restaurant/containers/page249.tpl.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -35,13 +35,13 @@  discard block
 block discarded – undo
35 35
 <!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content  -->
36 36
 <?php 
37 37
 if (GETPOST('action') == 'sendmail')    {
38
-    include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
39
-    $from = GETPOST('email', 'alpha');
40
-    $to = $mysoc->email;
41
-    $message = GETPOST('message', 'alpha');
42
-    $cmail = new CMailFile('Contact from website', $to, $from, $message);
43
-    if ($cmail->sendfile()) {
44
-        ?>
38
+	include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
39
+	$from = GETPOST('email', 'alpha');
40
+	$to = $mysoc->email;
41
+	$message = GETPOST('message', 'alpha');
42
+	$cmail = new CMailFile('Contact from website', $to, $from, $message);
43
+	if ($cmail->sendfile()) {
44
+		?>
45 45
         <script>
46 46
             alert("Message sent successfully !");
47 47
         </script>
@@ -167,10 +167,10 @@  discard block
 block discarded – undo
167 167
 
168 168
                             <div class=" mb-lg-3">
169 169
                                  <?php $days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"];
170
-                                   foreach ($days as $day){
171
-                            echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";    
172
-                        }
173
-                        ?>
170
+								   foreach ($days as $day){
171
+							echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";    
172
+						}
173
+						?>
174 174
                             </div>
175 175
 
176 176
                             <h5>Weekends</h5>
Please login to merge, or discard this patch.
doctemplates/websites/website_template-restaurant/containers/master.inc.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
3 3
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
4
-    if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
5
-    require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
4
+	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
5
+	require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
6 6
 }
7 7
 ?>
Please login to merge, or discard this patch.