Passed
Pull Request — master (#134)
by
unknown
03:00
created
admin/subtotal_about.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 // Dolibarr environment
26 26
 $res = @include("../../main.inc.php"); // From htdocs directory
27 27
 if (! $res) {
28
-    $res = @include("../../../main.inc.php"); // From "custom" directory
28
+	$res = @include("../../../main.inc.php"); // From "custom" directory
29 29
 }
30 30
 
31 31
 // Libraries
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
 // Access control
39 39
 if (! $user->admin) {
40
-    accessforbidden();
40
+	accessforbidden();
41 41
 }
42 42
 
43 43
 /*
@@ -48,17 +48,17 @@  discard block
 block discarded – undo
48 48
 
49 49
 // Subheader
50 50
 $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
51
-    . $langs->trans("BackToModuleList") . '</a>';
51
+	. $langs->trans("BackToModuleList") . '</a>';
52 52
 print_fiche_titre($langs->trans($page_name), $linkback);
53 53
 
54 54
 // Configuration header
55 55
 $head = subtotalAdminPrepareHead();
56 56
 dol_fiche_head(
57
-    $head,
58
-    'about',
59
-    $langs->trans("Module104777Name"),
60
-    0,
61
-    'subtotal@subtotal'
57
+	$head,
58
+	'about',
59
+	$langs->trans("Module104777Name"),
60
+	0,
61
+	'subtotal@subtotal'
62 62
 );
63 63
 
64 64
 // About page goes here
Please login to merge, or discard this patch.
script/import-from-milestone.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -56,33 +56,33 @@
 block discarded – undo
56 56
 	}
57 57
 
58 58
 
59
-        $res = $db->query("SELECT DISTINCT(fk_facture) as fk_facture FROM ".MAIN_DB_PREFIX."facturedet WHERE special_code=104777");
60
-        while($obj = $db->fetch_object($res)) {
61
-                $resLine = $db->query("SELECT rowid FROM  ".MAIN_DB_PREFIX."facturedet WHERE fk_facture=".$obj->fk_propal." ORDER BY rang ");
62
-                $k = 1;
63
-                while($objLine = $db->fetch_object($resLine)) {
59
+		$res = $db->query("SELECT DISTINCT(fk_facture) as fk_facture FROM ".MAIN_DB_PREFIX."facturedet WHERE special_code=104777");
60
+		while($obj = $db->fetch_object($res)) {
61
+				$resLine = $db->query("SELECT rowid FROM  ".MAIN_DB_PREFIX."facturedet WHERE fk_facture=".$obj->fk_propal." ORDER BY rang ");
62
+				$k = 1;
63
+				while($objLine = $db->fetch_object($resLine)) {
64 64
 
65
-                        $sql="UPDATE ".MAIN_DB_PREFIX."facturedet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
65
+						$sql="UPDATE ".MAIN_DB_PREFIX."facturedet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
66 66
 
67
-                         print $sql.";<br />";
68
-                        $k++;
69
-                }
67
+						 print $sql.";<br />";
68
+						$k++;
69
+				}
70 70
 
71
-        }
71
+		}
72 72
 
73
-        $res = $db->query("SELECT DISTINCT(fk_commande) as fk_commande FROM ".MAIN_DB_PREFIX."commandedet WHERE special_code=104777");
74
-        while($obj = $db->fetch_object($res)) {
75
-                $resLine = $db->query("SELECT rowid FROM  ".MAIN_DB_PREFIX."commandedet WHERE fk_commande=".$obj->fk_propal." ORDER BY rang ");
76
-                $k = 1;
77
-                while($objLine = $db->fetch_object($resLine)) {
73
+		$res = $db->query("SELECT DISTINCT(fk_commande) as fk_commande FROM ".MAIN_DB_PREFIX."commandedet WHERE special_code=104777");
74
+		while($obj = $db->fetch_object($res)) {
75
+				$resLine = $db->query("SELECT rowid FROM  ".MAIN_DB_PREFIX."commandedet WHERE fk_commande=".$obj->fk_propal." ORDER BY rang ");
76
+				$k = 1;
77
+				while($objLine = $db->fetch_object($resLine)) {
78 78
 
79
-                        $sql="UPDATE ".MAIN_DB_PREFIX."commandedet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
79
+						$sql="UPDATE ".MAIN_DB_PREFIX."commandedet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
80 80
 
81
-                         print $sql.";<br />";
82
-                        $k++;
83
-                }
81
+						 print $sql.";<br />";
82
+						$k++;
83
+				}
84 84
 
85
-        }
85
+		}
86 86
 
87 87
 
88 88
 	 print $sql.";<br />";
Please login to merge, or discard this patch.
htdocs_38/core/lib/pdf.lib.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@
 block discarded – undo
127 127
 	else require_once FPDF_PATH.'fpdf.php';
128 128
 
129 129
 	// We need to instantiate tcpdi or fpdi object (instead of tcpdf) to use merging features. But we can disable it (this will break all merge features).
130
-    if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
130
+	if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
131 131
 	else if (empty($conf->global->MAIN_DISABLE_FPDI)) require_once FPDI_PATH.'fpdi.php';
132 132
 
133 133
 	//$arrayformat=pdf_getFormat();
Please login to merge, or discard this patch.
core/modules/facture/doc/pdf_crabe_subtotal.modules.php 1 patch
Indentation   +65 added lines, -65 removed lines patch added patch discarded remove patch
@@ -38,17 +38,17 @@  discard block
 block discarded – undo
38 38
  */
39 39
 class pdf_crabe_subtotal extends ModelePDFFactures
40 40
 {
41
-    var $db;
42
-    var $name;
43
-    var $description;
44
-    var $type;
41
+	var $db;
42
+	var $name;
43
+	var $description;
44
+	var $type;
45 45
 
46
-    var $phpmin = array(4,3,0); // Minimum version of PHP required by module
47
-    var $version = 'dolibarr';
46
+	var $phpmin = array(4,3,0); // Minimum version of PHP required by module
47
+	var $version = 'dolibarr';
48 48
 
49
-    var $page_largeur;
50
-    var $page_hauteur;
51
-    var $format;
49
+	var $page_largeur;
50
+	var $page_hauteur;
51
+	var $format;
52 52
 	var $marge_gauche;
53 53
 	var	$marge_droite;
54 54
 	var	$marge_haute;
@@ -130,15 +130,15 @@  discard block
 block discarded – undo
130 130
 
131 131
 
132 132
 	/**
133
-     *  Function to build pdf onto disk
134
-     *
135
-     *  @param		Object		$object				Object to generate
136
-     *  @param		Translate	$outputlangs		Lang output object
137
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
138
-     *  @param		int			$hidedetails		Do not show line details
139
-     *  @param		int			$hidedesc			Do not show desc
140
-     *  @param		int			$hideref			Do not show ref
141
-     *  @return     int         	    			1=OK, 0=KO
133
+	 *  Function to build pdf onto disk
134
+	 *
135
+	 *  @param		Object		$object				Object to generate
136
+	 *  @param		Translate	$outputlangs		Lang output object
137
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
138
+	 *  @param		int			$hidedetails		Do not show line details
139
+	 *  @param		int			$hidedesc			Do not show desc
140
+	 *  @param		int			$hideref			Do not show ref
141
+	 *  @return     int         	    			1=OK, 0=KO
142 142
 	 */
143 143
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
144 144
 	{
@@ -230,25 +230,25 @@  discard block
 block discarded – undo
230 230
 
231 231
 				// Create pdf instance
232 232
 				$pdf=pdf_getInstance($this->format);
233
-                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
233
+				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
234 234
 				$heightforinfotot = 50;	// Height reserved to output the info and total part
235
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
236
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
237
-                $pdf->SetAutoPageBreak(1,0);
238
-
239
-                if (class_exists('TCPDF'))
240
-                {
241
-                    $pdf->setPrintHeader(false);
242
-                    $pdf->setPrintFooter(false);
243
-                }
244
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
245
-
246
-                // Set path to the background PDF File
247
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
248
-                {
249
-				    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
250
-				    $tplidx = $pdf->importPage(1);
251
-                }
235
+				$heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
236
+				$heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
237
+				$pdf->SetAutoPageBreak(1,0);
238
+
239
+				if (class_exists('TCPDF'))
240
+				{
241
+					$pdf->setPrintHeader(false);
242
+					$pdf->setPrintFooter(false);
243
+				}
244
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
245
+
246
+				// Set path to the background PDF File
247
+				if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
248
+				{
249
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
250
+					$tplidx = $pdf->importPage(1);
251
+				}
252 252
 
253 253
 				$pdf->Open();
254 254
 				$pagenb=0;
@@ -538,8 +538,8 @@  discard block
 block discarded – undo
538 538
 					// Discount on line
539 539
 					if ($object->lines[$i]->remise_percent)
540 540
 					{
541
-                        $pdf->SetXY($this->posxdiscount-2, $curY);
542
-					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
541
+						$pdf->SetXY($this->posxdiscount-2, $curY);
542
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
543 543
 						$pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
544 544
 					}
545 545
 
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
 						$localtax2_type = $localtaxtmp_array[2];
578 578
 					}
579 579
 
580
-				    // retrieve global local tax
580
+					// retrieve global local tax
581 581
 					if ($localtax1_type && $localtax1ligne != 0)
582 582
 						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
583 583
 					if ($localtax2_type && $localtax2ligne != 0)
@@ -713,20 +713,20 @@  discard block
 block discarded – undo
713 713
 	/**
714 714
 	 *  Show payments table
715 715
 	 *
716
-     *  @param	PDF			$pdf           Object PDF
717
-     *  @param  Object		$object         Object invoice
718
-     *  @param  int			$posy           Position y in PDF
719
-     *  @param  Translate	$outputlangs    Object langs for output
720
-     *  @return int             			<0 if KO, >0 if OK
716
+	 *  @param	PDF			$pdf           Object PDF
717
+	 *  @param  Object		$object         Object invoice
718
+	 *  @param  int			$posy           Position y in PDF
719
+	 *  @param  Translate	$outputlangs    Object langs for output
720
+	 *  @return int             			<0 if KO, >0 if OK
721 721
 	 */
722 722
 	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
723 723
 	{
724 724
 		global $conf;
725 725
 
726
-        $sign=1;
727
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
726
+		$sign=1;
727
+		if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
728 728
 
729
-        $tab3_posx = 120;
729
+		$tab3_posx = 120;
730 730
 		$tab3_top = $posy + 8;
731 731
 		$tab3_width = 80;
732 732
 		$tab3_height = 4;
@@ -953,13 +953,13 @@  discard block
 block discarded – undo
953 953
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
954 954
 						$posy=$pdf->GetY()+1;
955 955
 
956
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
957
-			            {
956
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
957
+						{
958 958
 							$pdf->SetXY($this->marge_gauche, $posy);
959 959
 							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
960 960
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
961 961
 							$posy=$pdf->GetY()+2;
962
-			            }
962
+						}
963 963
 					}
964 964
 					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
965 965
 					{
@@ -968,13 +968,13 @@  discard block
 block discarded – undo
968 968
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
969 969
 						$posy=$pdf->GetY()+1;
970 970
 
971
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
972
-			            {
971
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
972
+						{
973 973
 							$pdf->SetXY($this->marge_gauche, $posy);
974 974
 							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
975 975
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
976 976
 							$posy=$pdf->GetY()+2;
977
-			            }
977
+						}
978 978
 					}
979 979
 				}
980 980
 			}
@@ -1016,10 +1016,10 @@  discard block
 block discarded – undo
1016 1016
 	{
1017 1017
 		global $conf,$mysoc;
1018 1018
 
1019
-        $sign=1;
1020
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
1019
+		$sign=1;
1020
+		if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
1021 1021
 
1022
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
1022
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
1023 1023
 
1024 1024
 		$tab2_top = $posy;
1025 1025
 		$tab2_hl = 4;
@@ -1088,7 +1088,7 @@  discard block
 block discarded – undo
1088 1088
 							}
1089 1089
 						}
1090 1090
 					}
1091
-	      		//}
1091
+		  		//}
1092 1092
 				//Local tax 2 before VAT
1093 1093
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
1094 1094
 				//{
@@ -1180,7 +1180,7 @@  discard block
 block discarded – undo
1180 1180
 							}
1181 1181
 						}
1182 1182
 					}
1183
-	      		//}
1183
+		  		//}
1184 1184
 				//Local tax 2 after VAT
1185 1185
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
1186 1186
 				//{
@@ -1190,7 +1190,7 @@  discard block
 block discarded – undo
1190 1190
 
1191 1191
 						foreach( $localtax_rate as $tvakey => $tvaval )
1192 1192
 						{
1193
-						    // retrieve global local tax
1193
+							// retrieve global local tax
1194 1194
 							if ($tvakey != 0)    // On affiche pas taux 0
1195 1195
 							{
1196 1196
 								//$this->atleastoneratenotnull++;
@@ -1424,15 +1424,15 @@  discard block
 block discarded – undo
1424 1424
 
1425 1425
 		// Show Draft Watermark
1426 1426
 		if($object->statut==0 && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
1427
-        {
1428
-		      pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
1429
-        }
1427
+		{
1428
+			  pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
1429
+		}
1430 1430
 
1431 1431
 		$pdf->SetTextColor(0,0,60);
1432 1432
 		$pdf->SetFont('','B', $default_font_size + 3);
1433 1433
 
1434 1434
 		$posy=$this->marge_haute;
1435
-        $posx=$this->page_largeur-$this->marge_droite-100;
1435
+		$posx=$this->page_largeur-$this->marge_droite-100;
1436 1436
 
1437 1437
 		$pdf->SetXY($this->marge_gauche,$posy);
1438 1438
 
@@ -1442,7 +1442,7 @@  discard block
 block discarded – undo
1442 1442
 		{
1443 1443
 			if (is_readable($logo))
1444 1444
 			{
1445
-			    $height=pdf_getHeightForLogo($logo);
1445
+				$height=pdf_getHeightForLogo($logo);
1446 1446
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
1447 1447
 			}
1448 1448
 			else
@@ -1633,7 +1633,7 @@  discard block
 block discarded – undo
1633 1633
 
1634 1634
 	/**
1635 1635
 	 *   	Show footer of page. Need this->emetteur object
1636
-     *
1636
+	 *
1637 1637
 	 *   	@param	PDF			$pdf     			PDF
1638 1638
 	 * 		@param	Object		$object				Object to show
1639 1639
 	 *      @param	Translate	$outputlangs		Object lang for output
Please login to merge, or discard this patch.
core/modules/propale/doc/pdf_azur_subtotal.modules.php 1 patch
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -128,15 +128,15 @@  discard block
 block discarded – undo
128 128
 	}
129 129
 
130 130
 	/**
131
-     *  Function to build pdf onto disk
132
-     *
133
-     *  @param		Object		$object				Object to generate
134
-     *  @param		Translate	$outputlangs		Lang output object
135
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
136
-     *  @param		int			$hidedetails		Do not show line details
137
-     *  @param		int			$hidedesc			Do not show desc
138
-     *  @param		int			$hideref			Do not show ref
139
-     *  @return     int             				1=OK, 0=KO
131
+	 *  Function to build pdf onto disk
132
+	 *
133
+	 *  @param		Object		$object				Object to generate
134
+	 *  @param		Translate	$outputlangs		Lang output object
135
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
136
+	 *  @param		int			$hidedetails		Do not show line details
137
+	 *  @param		int			$hidedesc			Do not show desc
138
+	 *  @param		int			$hideref			Do not show ref
139
+	 *  @return     int             				1=OK, 0=KO
140 140
 	 */
141 141
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
142 142
 	{
@@ -259,25 +259,25 @@  discard block
 block discarded – undo
259 259
 				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
260 260
 
261 261
 				// Create pdf instance
262
-                $pdf=pdf_getInstance($this->format);
263
-                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
264
-                $heightforinfotot = 50;	// Height reserved to output the info and total part
265
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
266
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
267
-                $pdf->SetAutoPageBreak(1,0);
268
-
269
-                if (class_exists('TCPDF'))
270
-                {
271
-                    $pdf->setPrintHeader(false);
272
-                    $pdf->setPrintFooter(false);
273
-                }
274
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
275
-                // Set path to the background PDF File
276
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
277
-                {
278
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
279
-                    $tplidx = $pdf->importPage(1);
280
-                }
262
+				$pdf=pdf_getInstance($this->format);
263
+				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
264
+				$heightforinfotot = 50;	// Height reserved to output the info and total part
265
+				$heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
266
+				$heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
267
+				$pdf->SetAutoPageBreak(1,0);
268
+
269
+				if (class_exists('TCPDF'))
270
+				{
271
+					$pdf->setPrintHeader(false);
272
+					$pdf->setPrintFooter(false);
273
+				}
274
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
275
+				// Set path to the background PDF File
276
+				if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
277
+				{
278
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
279
+					$tplidx = $pdf->importPage(1);
280
+				}
281 281
 
282 282
 				$pdf->Open();
283 283
 				$pagenb=0;
@@ -612,7 +612,7 @@  discard block
 block discarded – undo
612 612
 						$localtax2_type = $localtaxtmp_array[2];
613 613
 					}
614 614
 
615
-				    // retrieve global local tax
615
+					// retrieve global local tax
616 616
 					if ($localtax1_type && $localtax1ligne != 0)
617 617
 						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
618 618
 					if ($localtax2_type && $localtax2ligne != 0)
@@ -750,11 +750,11 @@  discard block
 block discarded – undo
750 750
 	/**
751 751
 	 *  Show payments table
752 752
 	 *
753
-     *  @param	PDF			$pdf           Object PDF
754
-     *  @param  Object		$object         Object proposal
755
-     *  @param  int			$posy           Position y in PDF
756
-     *  @param  Translate	$outputlangs    Object langs for output
757
-     *  @return int             			<0 if KO, >0 if OK
753
+	 *  @param	PDF			$pdf           Object PDF
754
+	 *  @param  Object		$object         Object proposal
755
+	 *  @param  int			$posy           Position y in PDF
756
+	 *  @param  Translate	$outputlangs    Object langs for output
757
+	 *  @return int             			<0 if KO, >0 if OK
758 758
 	 */
759 759
 	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
760 760
 	{
@@ -790,10 +790,10 @@  discard block
 block discarded – undo
790 790
 
791 791
 		$posxval=52;
792 792
 
793
-        // Show shipping date
794
-        if (! empty($object->date_livraison))
793
+		// Show shipping date
794
+		if (! empty($object->date_livraison))
795 795
 		{
796
-            $outputlangs->load("sendings");
796
+			$outputlangs->load("sendings");
797 797
 			$pdf->SetFont('','B', $default_font_size - 2);
798 798
 			$pdf->SetXY($this->marge_gauche, $posy);
799 799
 			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
@@ -803,9 +803,9 @@  discard block
 block discarded – undo
803 803
 			$dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
804 804
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
805 805
 
806
-            $posy=$pdf->GetY()+1;
806
+			$posy=$pdf->GetY()+1;
807 807
 		}
808
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
808
+		elseif ($object->availability_code || $object->availability)    // Show availability conditions
809 809
 		{
810 810
 			$pdf->SetFont('','B', $default_font_size - 2);
811 811
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -891,13 +891,13 @@  discard block
 block discarded – undo
891 891
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
892 892
 						$posy=$pdf->GetY()+1;
893 893
 
894
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
895
-			            {
894
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
895
+						{
896 896
 							$pdf->SetXY($this->marge_gauche, $posy);
897 897
 							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
898 898
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
899 899
 							$posy=$pdf->GetY()+2;
900
-			            }
900
+						}
901 901
 					}
902 902
 					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
903 903
 					{
@@ -906,13 +906,13 @@  discard block
 block discarded – undo
906 906
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
907 907
 						$posy=$pdf->GetY()+1;
908 908
 
909
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
910
-			            {
909
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
910
+						{
911 911
 							$pdf->SetXY($this->marge_gauche, $posy);
912 912
 							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
913 913
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
914 914
 							$posy=$pdf->GetY()+2;
915
-			            }
915
+						}
916 916
 					}
917 917
 				}
918 918
 			}
@@ -1022,7 +1022,7 @@  discard block
 block discarded – undo
1022 1022
 							}
1023 1023
 						}
1024 1024
 					}
1025
-	      		//}
1025
+		  		//}
1026 1026
 				//Local tax 2 before VAT
1027 1027
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
1028 1028
 				//{
@@ -1114,7 +1114,7 @@  discard block
 block discarded – undo
1114 1114
 							}
1115 1115
 						}
1116 1116
 					}
1117
-	      		//}
1117
+		  		//}
1118 1118
 				//Local tax 2 after VAT
1119 1119
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
1120 1120
 				//{
@@ -1124,7 +1124,7 @@  discard block
 block discarded – undo
1124 1124
 
1125 1125
 						foreach( $localtax_rate as $tvakey => $tvaval )
1126 1126
 						{
1127
-						    // retrieve global local tax
1127
+							// retrieve global local tax
1128 1128
 							if ($tvakey != 0)    // On affiche pas taux 0
1129 1129
 							{
1130 1130
 								//$this->atleastoneratenotnull++;
@@ -1341,7 +1341,7 @@  discard block
 block discarded – undo
1341 1341
 		//  Show Draft Watermark
1342 1342
 		if($object->statut==0 && (! empty($conf->global->PROPALE_DRAFT_WATERMARK)) )
1343 1343
 		{
1344
-            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->PROPALE_DRAFT_WATERMARK);
1344
+			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->PROPALE_DRAFT_WATERMARK);
1345 1345
 		}
1346 1346
 
1347 1347
 		$pdf->SetTextColor(0,0,60);
@@ -1358,8 +1358,8 @@  discard block
 block discarded – undo
1358 1358
 		{
1359 1359
 			if (is_readable($logo))
1360 1360
 			{
1361
-			    $height=pdf_getHeightForLogo($logo);
1362
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
1361
+				$height=pdf_getHeightForLogo($logo);
1362
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
1363 1363
 			}
1364 1364
 			else
1365 1365
 			{
@@ -1517,7 +1517,7 @@  discard block
 block discarded – undo
1517 1517
 
1518 1518
 	/**
1519 1519
 	 *   	Show footer of page. Need this->emetteur object
1520
-     *
1520
+	 *
1521 1521
 	 *   	@param	PDF			$pdf     			PDF
1522 1522
 	 * 		@param	Object		$object				Object to show
1523 1523
 	 *      @param	Translate	$outputlangs		Object lang for output
Please login to merge, or discard this patch.
core/modules/commande/doc/pdf_einstein_subtotal.modules.php 1 patch
Indentation   +116 added lines, -116 removed lines patch added patch discarded remove patch
@@ -38,23 +38,23 @@  discard block
 block discarded – undo
38 38
  */
39 39
 class pdf_einstein_subtotal extends ModelePDFCommandes
40 40
 {
41
-    var $db;
42
-    var $name;
43
-    var $description;
44
-    var $type;
41
+	var $db;
42
+	var $name;
43
+	var $description;
44
+	var $type;
45 45
 
46
-    var $phpmin = array(4,3,0); // Minimum version of PHP required by module
47
-    var $version = 'dolibarr';
46
+	var $phpmin = array(4,3,0); // Minimum version of PHP required by module
47
+	var $version = 'dolibarr';
48 48
 
49
-    var $page_largeur;
50
-    var $page_hauteur;
51
-    var $format;
49
+	var $page_largeur;
50
+	var $page_hauteur;
51
+	var $format;
52 52
 	var $marge_gauche;
53 53
 	var	$marge_droite;
54 54
 	var	$marge_haute;
55 55
 	var	$marge_basse;
56 56
 
57
-    var $emetteur;	// Objet societe qui emet
57
+	var $emetteur;	// Objet societe qui emet
58 58
 
59 59
 
60 60
 	/**
@@ -129,15 +129,15 @@  discard block
 block discarded – undo
129 129
 	}
130 130
 
131 131
 	/**
132
-     *  Function to build pdf onto disk
133
-     *
134
-     *  @param		Object		$object				Object to generate
135
-     *  @param		Translate	$outputlangs		Lang output object
136
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
137
-     *  @param		int			$hidedetails		Do not show line details
138
-     *  @param		int			$hidedesc			Do not show desc
139
-     *  @param		int			$hideref			Do not show ref
140
-     *  @return     int             			1=OK, 0=KO
132
+	 *  Function to build pdf onto disk
133
+	 *
134
+	 *  @param		Object		$object				Object to generate
135
+	 *  @param		Translate	$outputlangs		Lang output object
136
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
137
+	 *  @param		int			$hidedetails		Do not show line details
138
+	 *  @param		int			$hidedesc			Do not show desc
139
+	 *  @param		int			$hideref			Do not show ref
140
+	 *  @return     int             			1=OK, 0=KO
141 141
 	 */
142 142
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
143 143
 	{
@@ -159,13 +159,13 @@  discard block
 block discarded – undo
159 159
 
160 160
 		if ($conf->commande->dir_output)
161 161
 		{
162
-            $object->fetch_thirdparty();
162
+			$object->fetch_thirdparty();
163 163
 			if(!empty($object->client) ){
164 164
 				$object->thirdparty = $object->client;
165 165
 			}
166
-            $deja_regle = "";
166
+			$deja_regle = "";
167 167
 
168
-            // Definition of $dir and $file
168
+			// Definition of $dir and $file
169 169
 			if ($object->specimen)
170 170
 			{
171 171
 				$dir = $conf->commande->dir_output;
@@ -204,22 +204,22 @@  discard block
 block discarded – undo
204 204
 				$pdf=pdf_getInstance($this->format);
205 205
 				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
206 206
 				$heightforinfotot = 50;	// Height reserved to output the info and total part
207
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
208
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
209
-                $pdf->SetAutoPageBreak(1,0);
210
-
211
-                if (class_exists('TCPDF'))
212
-                {
213
-                    $pdf->setPrintHeader(false);
214
-                    $pdf->setPrintFooter(false);
215
-                }
216
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
217
-                // Set path to the background PDF File
218
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
219
-                {
220
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
221
-                    $tplidx = $pdf->importPage(1);
222
-                }
207
+				$heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
208
+				$heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
209
+				$pdf->SetAutoPageBreak(1,0);
210
+
211
+				if (class_exists('TCPDF'))
212
+				{
213
+					$pdf->setPrintHeader(false);
214
+					$pdf->setPrintFooter(false);
215
+				}
216
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
217
+				// Set path to the background PDF File
218
+				if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
219
+				{
220
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
221
+					$tplidx = $pdf->importPage(1);
222
+				}
223 223
 
224 224
 				$pdf->Open();
225 225
 				$pagenb=0;
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
 						$localtax2_type = $localtaxtmp_array[2];
524 524
 					}
525 525
 
526
-				    // retrieve global local tax
526
+					// retrieve global local tax
527 527
 					if ($localtax1_type && $localtax1ligne != 0)
528 528
 						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
529 529
 					if ($localtax2_type && $localtax2ligne != 0)
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
 
656 656
 	/**
657 657
 	 *  Show payments table
658
-     *
658
+	 *
659 659
 	 *  @param	PDF			$pdf     		Object PDF
660 660
 	 *  @param  Object		$object			Object order
661 661
 	 *	@param	int			$posy			Position y in PDF
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 
685 685
 		$pdf->SetFont('','', $default_font_size - 1);
686 686
 
687
-        // If France, show VAT mention if not applicable
687
+		// If France, show VAT mention if not applicable
688 688
 		if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
689 689
 		{
690 690
 			$pdf->SetFont('','B', $default_font_size - 2);
@@ -713,8 +713,8 @@  discard block
 block discarded – undo
713 713
 			$posy=$pdf->GetY()+3;
714 714
 		}
715 715
 
716
-        // Check a payment mode is defined
717
-        /* Not used with orders
716
+		// Check a payment mode is defined
717
+		/* Not used with orders
718 718
 		if (empty($object->mode_reglement_code)
719 719
         	&& ! $conf->global->FACTURE_CHQ_NUMBER
720 720
         	&& ! $conf->global->FACTURE_RIB_NUMBER)
@@ -740,10 +740,10 @@  discard block
 block discarded – undo
740 740
             $posy=$pdf->GetY()+1;
741 741
 		}*/
742 742
 
743
-	    // Show planed date of delivery
744
-        if (! empty($object->date_livraison))
743
+		// Show planed date of delivery
744
+		if (! empty($object->date_livraison))
745 745
 		{
746
-            $outputlangs->load("sendings");
746
+			$outputlangs->load("sendings");
747 747
 			$pdf->SetFont('','B', $default_font_size - 2);
748 748
 			$pdf->SetXY($this->marge_gauche, $posy);
749 749
 			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
@@ -753,9 +753,9 @@  discard block
 block discarded – undo
753 753
 			$dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
754 754
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
755 755
 
756
-            $posy=$pdf->GetY()+1;
756
+			$posy=$pdf->GetY()+1;
757 757
 		}
758
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
758
+		elseif ($object->availability_code || $object->availability)    // Show availability conditions
759 759
 		{
760 760
 			$pdf->SetFont('','B', $default_font_size - 2);
761 761
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -771,70 +771,70 @@  discard block
 block discarded – undo
771 771
 			$posy=$pdf->GetY()+1;
772 772
 		}
773 773
 
774
-      	// Show payment mode
775
-        if ($object->mode_reglement_code
776
-        	 && $object->mode_reglement_code != 'CHQ'
777
-           	 && $object->mode_reglement_code != 'VIR')
778
-           	 {
779
-	            $pdf->SetFont('','B', $default_font_size - 2);
780
-	            $pdf->SetXY($this->marge_gauche, $posy);
781
-	            $titre = $outputlangs->transnoentities("PaymentMode").':';
782
-	            $pdf->MultiCell(80, 5, $titre, 0, 'L');
774
+	  	// Show payment mode
775
+		if ($object->mode_reglement_code
776
+			 && $object->mode_reglement_code != 'CHQ'
777
+		   	 && $object->mode_reglement_code != 'VIR')
778
+		   	 {
779
+				$pdf->SetFont('','B', $default_font_size - 2);
780
+				$pdf->SetXY($this->marge_gauche, $posy);
781
+				$titre = $outputlangs->transnoentities("PaymentMode").':';
782
+				$pdf->MultiCell(80, 5, $titre, 0, 'L');
783 783
 
784 784
 				$pdf->SetFont('','', $default_font_size - 2);
785
-	            $pdf->SetXY($posxval, $posy);
786
-	            $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
787
-	            $pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
785
+				$pdf->SetXY($posxval, $posy);
786
+				$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
787
+				$pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
788 788
 
789
-	            $posy=$pdf->GetY()+2;
790
-           	 }
789
+				$posy=$pdf->GetY()+2;
790
+		   	 }
791 791
 
792 792
 		// Show payment mode CHQ
793
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
794
-        {
795
-        	// Si mode reglement non force ou si force a CHQ
796
-	        if (! empty($conf->global->FACTURE_CHQ_NUMBER))
797
-	        {
798
-	            if ($conf->global->FACTURE_CHQ_NUMBER > 0)
799
-	            {
800
-	                $account = new Account($this->db);
801
-	                $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
802
-
803
-	                $pdf->SetXY($this->marge_gauche, $posy);
804
-	                $pdf->SetFont('','B', $default_font_size - 3);
805
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
806
-		            $posy=$pdf->GetY()+1;
807
-
808
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
809
-		            {
810
-		                $pdf->SetXY($this->marge_gauche, $posy);
811
-		                $pdf->SetFont('','', $default_font_size - 3);
812
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
813
-			            $posy=$pdf->GetY()+2;
814
-		            }
815
-	            }
816
-	            if ($conf->global->FACTURE_CHQ_NUMBER == -1)
817
-	            {
818
-	                $pdf->SetXY($this->marge_gauche, $posy);
819
-	                $pdf->SetFont('','B', $default_font_size - 3);
820
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
821
-		            $posy=$pdf->GetY()+1;
822
-
823
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
824
-		            {
825
-			            $pdf->SetXY($this->marge_gauche, $posy);
826
-		                $pdf->SetFont('','', $default_font_size - 3);
827
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
828
-			            $posy=$pdf->GetY()+2;
829
-		            }
830
-	            }
831
-	        }
793
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
794
+		{
795
+			// Si mode reglement non force ou si force a CHQ
796
+			if (! empty($conf->global->FACTURE_CHQ_NUMBER))
797
+			{
798
+				if ($conf->global->FACTURE_CHQ_NUMBER > 0)
799
+				{
800
+					$account = new Account($this->db);
801
+					$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
802
+
803
+					$pdf->SetXY($this->marge_gauche, $posy);
804
+					$pdf->SetFont('','B', $default_font_size - 3);
805
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
806
+					$posy=$pdf->GetY()+1;
807
+
808
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
809
+					{
810
+						$pdf->SetXY($this->marge_gauche, $posy);
811
+						$pdf->SetFont('','', $default_font_size - 3);
812
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
813
+						$posy=$pdf->GetY()+2;
814
+					}
815
+				}
816
+				if ($conf->global->FACTURE_CHQ_NUMBER == -1)
817
+				{
818
+					$pdf->SetXY($this->marge_gauche, $posy);
819
+					$pdf->SetFont('','B', $default_font_size - 3);
820
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
821
+					$posy=$pdf->GetY()+1;
822
+
823
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
824
+					{
825
+						$pdf->SetXY($this->marge_gauche, $posy);
826
+						$pdf->SetFont('','', $default_font_size - 3);
827
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
828
+						$posy=$pdf->GetY()+2;
829
+					}
830
+				}
831
+			}
832 832
 		}
833 833
 
834
-        // If payment mode not forced or forced to VIR, show payment with BAN
835
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
836
-        {
837
-        	if (! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
834
+		// If payment mode not forced or forced to VIR, show payment with BAN
835
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
836
+		{
837
+			if (! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
838 838
 			{
839 839
 				$bankid=(empty($object->fk_bank)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_bank);
840 840
 				$account = new Account($this->db);
@@ -847,7 +847,7 @@  discard block
 block discarded – undo
847 847
 
848 848
 				$posy+=2;
849 849
 			}
850
-        }
850
+		}
851 851
 
852 852
 		return $posy;
853 853
 	}
@@ -865,7 +865,7 @@  discard block
 block discarded – undo
865 865
 	 */
866 866
 	function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
867 867
 	{
868
-	    global $conf,$mysoc;
868
+		global $conf,$mysoc;
869 869
 
870 870
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
871 871
 
@@ -874,7 +874,7 @@  discard block
 block discarded – undo
874 874
 		$pdf->SetFont('','', $default_font_size - 1);
875 875
 
876 876
 		// Tableau total
877
-        $col1x = 120; $col2x = 170;
877
+		$col1x = 120; $col2x = 170;
878 878
 		if ($this->page_largeur < 210) // To work with US executive format
879 879
 		{
880 880
 			$col2x-=20;
@@ -935,7 +935,7 @@  discard block
 block discarded – undo
935 935
 							}
936 936
 						}
937 937
 					}
938
-	      		//}
938
+		  		//}
939 939
 				//Local tax 2 before VAT
940 940
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
941 941
 				//{
@@ -1026,7 +1026,7 @@  discard block
 block discarded – undo
1026 1026
 							}
1027 1027
 						}
1028 1028
 					}
1029
-	      		//}
1029
+		  		//}
1030 1030
 				//Local tax 2 after VAT
1031 1031
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
1032 1032
 				//{
@@ -1075,8 +1075,8 @@  discard block
 block discarded – undo
1075 1075
 
1076 1076
 		$pdf->SetTextColor(0,0,0);
1077 1077
 
1078
-        $creditnoteamount=0;
1079
-        $depositsamount=0;
1078
+		$creditnoteamount=0;
1079
+		$depositsamount=0;
1080 1080
 		//$creditnoteamount=$object->getSumCreditNotesUsed();
1081 1081
 		//$depositsamount=$object->getSumDepositsUsed();
1082 1082
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
@@ -1230,7 +1230,7 @@  discard block
 block discarded – undo
1230 1230
 		// Show Draft Watermark
1231 1231
 		if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
1232 1232
 		{
1233
-            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
1233
+			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
1234 1234
 		}
1235 1235
 
1236 1236
 		$pdf->SetTextColor(0,0,60);
@@ -1247,8 +1247,8 @@  discard block
 block discarded – undo
1247 1247
 		{
1248 1248
 			if (is_readable($logo))
1249 1249
 			{
1250
-			    $height=pdf_getHeightForLogo($logo);
1251
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
1250
+				$height=pdf_getHeightForLogo($logo);
1251
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
1252 1252
 			}
1253 1253
 			else
1254 1254
 			{
@@ -1386,7 +1386,7 @@  discard block
 block discarded – undo
1386 1386
 
1387 1387
 	/**
1388 1388
 	 *   	Show footer of page. Need this->emetteur object
1389
-     *
1389
+	 *
1390 1390
 	 *   	@param	PDF			$pdf     			PDF
1391 1391
 	 * 		@param	Object		$object				Object to show
1392 1392
 	 *      @param	Translate	$outputlangs		Object lang for output
Please login to merge, or discard this patch.
script/migrate_titles_to_7.0.php 1 patch
Indentation   +63 added lines, -63 removed lines patch added patch discarded remove patch
@@ -6,73 +6,73 @@
 block discarded – undo
6 6
 
7 7
 if((float)DOL_VERSION >= 7)
8 8
 {
9
-    print "Début de conversion des lignes de propale<br>";
10
-    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."propaldet WHERE special_code = 104777 AND qty != 50 AND product_type = 9 AND (label = '' OR label IS NULL)";
11
-    $res = $db->query($sql);
12
-    if($res)
13
-    {
14
-        print $db->num_rows($res)." lignes à convertir<br>";
15
-        $i = 0;
16
-        while ($obj = $db->fetch_object($res))
17
-        {
18
-            $prop = new PropaleLigne($db);
19
-            $prop->fetch($obj->rowid);
20
-            $prop->fetch_optionals();
21
-            if (empty($prop->label)){
22
-                $prop->label = strip_tags($prop->desc);
23
-                $prop->desc = '';
24
-            }
25
-            $ret = $prop->update(1);
26
-            if($ret>0) $i++;
27
-        }
28
-        print $i." lignes converties<br>";
29
-    }
9
+	print "Début de conversion des lignes de propale<br>";
10
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."propaldet WHERE special_code = 104777 AND qty != 50 AND product_type = 9 AND (label = '' OR label IS NULL)";
11
+	$res = $db->query($sql);
12
+	if($res)
13
+	{
14
+		print $db->num_rows($res)." lignes à convertir<br>";
15
+		$i = 0;
16
+		while ($obj = $db->fetch_object($res))
17
+		{
18
+			$prop = new PropaleLigne($db);
19
+			$prop->fetch($obj->rowid);
20
+			$prop->fetch_optionals();
21
+			if (empty($prop->label)){
22
+				$prop->label = strip_tags($prop->desc);
23
+				$prop->desc = '';
24
+			}
25
+			$ret = $prop->update(1);
26
+			if($ret>0) $i++;
27
+		}
28
+		print $i." lignes converties<br>";
29
+	}
30 30
     
31
-    print "Début de conversion des lignes de commande<br>";
32
-    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commandedet WHERE special_code = 104777 AND qty != 50 AND product_type = 9 AND (label = '' OR label IS NULL)";
33
-    $res = $db->query($sql);
34
-    if($res)
35
-    {
36
-        print $db->num_rows($res)." lignes à convertir<br>";
37
-        $i = 0;
38
-        while ($obj = $db->fetch_object($res))
39
-        {
40
-            $cdeline = new OrderLine($db);
41
-            $cdeline->fetch($obj->rowid);
42
-            $cdeline->fetch_optionals($obj->rowid);
43
-            if (empty($cdeline->label)){
44
-                $cdeline->label = strip_tags($cdeline->desc);
45
-                $cdeline->desc = '';
46
-            }
47
-            $ret = $cdeline->update($user, 1);
48
-            if($ret>0) $i++;
49
-        }
31
+	print "Début de conversion des lignes de commande<br>";
32
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commandedet WHERE special_code = 104777 AND qty != 50 AND product_type = 9 AND (label = '' OR label IS NULL)";
33
+	$res = $db->query($sql);
34
+	if($res)
35
+	{
36
+		print $db->num_rows($res)." lignes à convertir<br>";
37
+		$i = 0;
38
+		while ($obj = $db->fetch_object($res))
39
+		{
40
+			$cdeline = new OrderLine($db);
41
+			$cdeline->fetch($obj->rowid);
42
+			$cdeline->fetch_optionals($obj->rowid);
43
+			if (empty($cdeline->label)){
44
+				$cdeline->label = strip_tags($cdeline->desc);
45
+				$cdeline->desc = '';
46
+			}
47
+			$ret = $cdeline->update($user, 1);
48
+			if($ret>0) $i++;
49
+		}
50 50
         
51
-        print $i." lignes converties<br>";
52
-    }
51
+		print $i." lignes converties<br>";
52
+	}
53 53
     
54
-    print "Début de conversion des lignes de facture<br>";
55
-    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet WHERE special_code = 104777 AND qty != 50 AND product_type = 9 AND (label = '' OR label IS NULL)";
54
+	print "Début de conversion des lignes de facture<br>";
55
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet WHERE special_code = 104777 AND qty != 50 AND product_type = 9 AND (label = '' OR label IS NULL)";
56 56
     
57
-    $res = $db->query($sql);
58
-    if($res)
59
-    {
60
-        print $db->num_rows($res)." lignes à convertir<br>";
61
-        $i = 0;
62
-        while ($obj = $db->fetch_object($res))
63
-        {
64
-            $facline = new FactureLigne($db);
65
-            $facline->fetch($obj->rowid);
66
-            $facline->fetch_optionals($obj->rowid);
67
-            if (empty($facline->label)){
68
-                $facline->label = strip_tags($facline->desc);
69
-                $facline->desc = '';
70
-            }
71
-            $ret = $facline->update($user, 1);
72
-            if($ret>0) $i++;
73
-        }
57
+	$res = $db->query($sql);
58
+	if($res)
59
+	{
60
+		print $db->num_rows($res)." lignes à convertir<br>";
61
+		$i = 0;
62
+		while ($obj = $db->fetch_object($res))
63
+		{
64
+			$facline = new FactureLigne($db);
65
+			$facline->fetch($obj->rowid);
66
+			$facline->fetch_optionals($obj->rowid);
67
+			if (empty($facline->label)){
68
+				$facline->label = strip_tags($facline->desc);
69
+				$facline->desc = '';
70
+			}
71
+			$ret = $facline->update($user, 1);
72
+			if($ret>0) $i++;
73
+		}
74 74
         
75
-        print $i." lignes converties<br>";
76
-    }
75
+		print $i." lignes converties<br>";
76
+	}
77 77
     
78 78
 }
79 79
\ No newline at end of file
Please login to merge, or discard this patch.
lib/subtotal.lib.php 1 patch
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -25,25 +25,25 @@  discard block
 block discarded – undo
25 25
 
26 26
 function subtotalAdminPrepareHead()
27 27
 {
28
-    global $langs, $conf;
28
+	global $langs, $conf;
29 29
 
30
-    $langs->load("subtotal@subtotal");
30
+	$langs->load("subtotal@subtotal");
31 31
 
32
-    $h = 0;
33
-    $head = array();
32
+	$h = 0;
33
+	$head = array();
34 34
 
35
-    $head[$h][0] = dol_buildpath("/subtotal/admin/subtotal_setup.php", 1);
36
-    $head[$h][1] = $langs->trans("Parameters");
37
-    $head[$h][2] = 'settings';
38
-    $h++;
39
-    $head[$h][0] = dol_buildpath("/subtotal/admin/subtotal_about.php", 1);
40
-    $head[$h][1] = $langs->trans("About");
41
-    $head[$h][2] = 'about';
42
-    $h++;
35
+	$head[$h][0] = dol_buildpath("/subtotal/admin/subtotal_setup.php", 1);
36
+	$head[$h][1] = $langs->trans("Parameters");
37
+	$head[$h][2] = 'settings';
38
+	$h++;
39
+	$head[$h][0] = dol_buildpath("/subtotal/admin/subtotal_about.php", 1);
40
+	$head[$h][1] = $langs->trans("About");
41
+	$head[$h][2] = 'about';
42
+	$h++;
43 43
 
44
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'subtotal', $showLabel=false);
44
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'subtotal', $showLabel=false);
45 45
 
46
-    return $head;
46
+	return $head;
47 47
 }
48 48
 
49 49
 function getHtmlSelectTitle(&$object, $showLabel=false)
@@ -130,8 +130,8 @@  discard block
 block discarded – undo
130 130
 	$label = GETPOST('line-title');
131 131
 	$description = ($line->qty>90) ? '' : GETPOST('line-description');
132 132
 	$pagebreak = (int) GETPOST('line-pagebreak');
133
-    $showTotalHT = (int) GETPOST('line-showTotalHT');
134
-    $showReduc = (int) GETPOST('line-showReduc');
133
+	$showTotalHT = (int) GETPOST('line-showTotalHT');
134
+	$showReduc = (int) GETPOST('line-showReduc');
135 135
 
136 136
 	$level = GETPOST('subtotal_level', 'int');
137 137
 	if (!empty($level))
@@ -139,8 +139,8 @@  discard block
 block discarded – undo
139 139
 		if ($line->qty > 90) $line->qty = 100 - $level; // Si on edit une ligne sous-total
140 140
 		else $line->qty = $level;
141 141
 	}
142
-    $line->array_options['options_show_total_ht'] = $showTotalHT;
143
-    $line->array_options['options_show_reduc'] = $showReduc;
142
+	$line->array_options['options_show_total_ht'] = $showTotalHT;
143
+	$line->array_options['options_show_reduc'] = $showReduc;
144 144
 	
145 145
 	$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);
146 146
 
@@ -246,17 +246,17 @@  discard block
 block discarded – undo
246 246
 			$classname = ucfirst($element);
247 247
 			
248 248
 			switch ($element) {
249
-			    case 'supplier_proposal':
250
-			        $classname = 'SupplierProposal';
251
-			        break;
249
+				case 'supplier_proposal':
250
+					$classname = 'SupplierProposal';
251
+					break;
252 252
 			        
253
-			    case 'order_supplier':
254
-			        $classname = 'CommandeFournisseur';
255
-			        break;
253
+				case 'order_supplier':
254
+					$classname = 'CommandeFournisseur';
255
+					break;
256 256
 			        
257
-			    case 'invoice_supplier':
258
-			        $classname = 'FactureFournisseur';
259
-			        break;
257
+				case 'invoice_supplier':
258
+					$classname = 'FactureFournisseur';
259
+					break;
260 260
 			}
261 261
 			
262 262
 			$object = new $classname($db); // Propal | Commande | Facture
@@ -329,14 +329,14 @@  discard block
 block discarded – undo
329 329
 		else $res = $line->update($user, $notrigger);
330 330
 	}
331 331
 	else {
332
-	    if(in_array($object->element, array('invoice_supplier', 'order_supplier', 'supplier_proposal'))) {
333
-	        if(empty($line->label)) $line->label = $line->description; // supplier lines don't have the field label
332
+		if(in_array($object->element, array('invoice_supplier', 'order_supplier', 'supplier_proposal'))) {
333
+			if(empty($line->label)) $line->label = $line->description; // supplier lines don't have the field label
334 334
 	        
335
-	        require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
336
-	        $extrafields=new ExtraFields($object->db);
337
-	        $extralabels=$extrafields->fetch_name_optionals_label($object->table_element_line,true);
338
-	        $line->fetch_optionals($line->id,$extralabels);
339
-	    }
335
+			require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
336
+			$extrafields=new ExtraFields($object->db);
337
+			$extralabels=$extrafields->fetch_name_optionals_label($object->table_element_line,true);
338
+			$line->fetch_optionals($line->id,$extralabels);
339
+		}
340 340
 		$line->array_options['options_subtotal_nc'] = 0;
341 341
 		if($object->element == 'order_supplier') $line->update($user);
342 342
 		$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, $notrigger);
Please login to merge, or discard this patch.
core/triggers/interface_90_modSubtotal_subtotaltrigger.class.php 1 patch
Indentation   +521 added lines, -521 removed lines patch added patch discarded remove patch
@@ -36,68 +36,68 @@  discard block
 block discarded – undo
36 36
 class Interfacesubtotaltrigger
37 37
 {
38 38
 
39
-    private $db;
40
-
41
-    /**
42
-     * Constructor
43
-     *
44
-     * 	@param		DoliDB		$db		Database handler
45
-     */
46
-    public function __construct($db)
47
-    {
48
-        $this->db = $db;
49
-
50
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
51
-        $this->family = "demo";
52
-        $this->description = "Triggers of this module are empty functions."
53
-            . "They have no effect."
54
-            . "They are provided for tutorial purpose only.";
55
-        // 'development', 'experimental', 'dolibarr' or version
56
-        $this->version = 'development';
57
-        $this->picto = 'titre@titre';
58
-    }
59
-
60
-    /**
61
-     * Trigger name
62
-     *
63
-     * 	@return		string	Name of trigger file
64
-     */
65
-    public function getName()
66
-    {
67
-        return $this->name;
68
-    }
69
-
70
-    /**
71
-     * Trigger description
72
-     *
73
-     * 	@return		string	Description of trigger file
74
-     */
75
-    public function getDesc()
76
-    {
77
-        return $this->description;
78
-    }
79
-
80
-    /**
81
-     * Trigger version
82
-     *
83
-     * 	@return		string	Version of trigger file
84
-     */
85
-    public function getVersion()
86
-    {
87
-        global $langs;
88
-        $langs->load("admin");
89
-
90
-        if ($this->version == 'development') {
91
-            return $langs->trans("Development");
92
-        } elseif ($this->version == 'experimental')
93
-
94
-                return $langs->trans("Experimental");
95
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
96
-        elseif ($this->version) return $this->version;
97
-        else {
98
-            return $langs->trans("Unknown");
99
-        }
100
-    }
39
+	private $db;
40
+
41
+	/**
42
+	 * Constructor
43
+	 *
44
+	 * 	@param		DoliDB		$db		Database handler
45
+	 */
46
+	public function __construct($db)
47
+	{
48
+		$this->db = $db;
49
+
50
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
51
+		$this->family = "demo";
52
+		$this->description = "Triggers of this module are empty functions."
53
+			. "They have no effect."
54
+			. "They are provided for tutorial purpose only.";
55
+		// 'development', 'experimental', 'dolibarr' or version
56
+		$this->version = 'development';
57
+		$this->picto = 'titre@titre';
58
+	}
59
+
60
+	/**
61
+	 * Trigger name
62
+	 *
63
+	 * 	@return		string	Name of trigger file
64
+	 */
65
+	public function getName()
66
+	{
67
+		return $this->name;
68
+	}
69
+
70
+	/**
71
+	 * Trigger description
72
+	 *
73
+	 * 	@return		string	Description of trigger file
74
+	 */
75
+	public function getDesc()
76
+	{
77
+		return $this->description;
78
+	}
79
+
80
+	/**
81
+	 * Trigger version
82
+	 *
83
+	 * 	@return		string	Version of trigger file
84
+	 */
85
+	public function getVersion()
86
+	{
87
+		global $langs;
88
+		$langs->load("admin");
89
+
90
+		if ($this->version == 'development') {
91
+			return $langs->trans("Development");
92
+		} elseif ($this->version == 'experimental')
93
+
94
+				return $langs->trans("Experimental");
95
+		elseif ($this->version == 'dolibarr') return DOL_VERSION;
96
+		elseif ($this->version) return $this->version;
97
+		else {
98
+			return $langs->trans("Unknown");
99
+		}
100
+	}
101 101
 	
102 102
 	public function addToBegin(&$parent, &$object, $rang)
103 103
 	{
@@ -147,27 +147,27 @@  discard block
 block discarded – undo
147 147
 		}
148 148
 	}
149 149
 	
150
-    /**
151
-     * Function called when a Dolibarrr business event is done.
152
-     * All functions "run_trigger" are triggered if file
153
-     * is inside directory core/triggers
154
-     *
155
-     * 	@param		string		$action		Event action code
156
-     * 	@param		Object		$object		Object
157
-     * 	@param		User		$user		Object user
158
-     * 	@param		Translate	$langs		Object langs
159
-     * 	@param		conf		$conf		Object conf
160
-     * 	@return		int						<0 if KO, 0 if no triggered ran, >0 if OK
161
-     */
162
-    public function run_trigger($action, $object, $user, $langs, $conf)
163
-    {
164
-        // Put here code you want to execute when a Dolibarr business events occurs.
165
-        // Data and type of action are stored into $object and $action
166
-        // Users
167
-        dol_include_once('/subtotal/class/subtotal.class.php');
168
-        $langs->load('subtotal@subtotal');
150
+	/**
151
+	 * Function called when a Dolibarrr business event is done.
152
+	 * All functions "run_trigger" are triggered if file
153
+	 * is inside directory core/triggers
154
+	 *
155
+	 * 	@param		string		$action		Event action code
156
+	 * 	@param		Object		$object		Object
157
+	 * 	@param		User		$user		Object user
158
+	 * 	@param		Translate	$langs		Object langs
159
+	 * 	@param		conf		$conf		Object conf
160
+	 * 	@return		int						<0 if KO, 0 if no triggered ran, >0 if OK
161
+	 */
162
+	public function run_trigger($action, $object, $user, $langs, $conf)
163
+	{
164
+		// Put here code you want to execute when a Dolibarr business events occurs.
165
+		// Data and type of action are stored into $object and $action
166
+		// Users
167
+		dol_include_once('/subtotal/class/subtotal.class.php');
168
+		$langs->load('subtotal@subtotal');
169 169
    
170
-        if (!empty($conf->global->SUBTOTAL_ALLOW_ADD_LINE_UNDER_TITLE) && in_array($action, array('LINEPROPAL_INSERT', 'LINEORDER_INSERT', 'LINEBILL_INSERT')))
170
+		if (!empty($conf->global->SUBTOTAL_ALLOW_ADD_LINE_UNDER_TITLE) && in_array($action, array('LINEPROPAL_INSERT', 'LINEORDER_INSERT', 'LINEBILL_INSERT')))
171 171
 		{
172 172
 			
173 173
 			$rang = GETPOST('under_title', 'int'); // Rang du titre
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 		}
200 200
         
201 201
 		
202
-        if ($action == 'LINEBILL_INSERT' && $object->special_code != TSubtotal::$module_number)
202
+		if ($action == 'LINEBILL_INSERT' && $object->special_code != TSubtotal::$module_number)
203 203
 		{
204 204
 			$subtotal_add_title_bloc_from_orderstoinvoice = GETPOST('subtotal_add_title_bloc_from_orderstoinvoice');
205 205
 			if (!empty($subtotal_add_title_bloc_from_orderstoinvoice))
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 		
256 256
 		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && in_array($action, array('LINEPROPAL_INSERT', 'LINEPROPAL_UPDATE', 'LINEORDER_INSERT', 'LINEORDER_UPDATE', 'LINEBILL_INSERT', 'LINEBILL_UPDATE')))
257 257
 		{
258
-            if(! function_exists('_updateLineNC')) dol_include_once('/subtotal/lib/subtotal.lib.php');
258
+			if(! function_exists('_updateLineNC')) dol_include_once('/subtotal/lib/subtotal.lib.php');
259 259
 
260 260
 			$doli_action = GETPOST('action');
261 261
 			$set = GETPOST('set');
@@ -321,173 +321,173 @@  discard block
 block discarded – undo
321 321
 		}
322 322
 		
323 323
         
324
-        if ($action == 'USER_LOGIN') {
325
-            dol_syslog(
326
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
327
-            );
328
-        } elseif ($action == 'USER_UPDATE_SESSION') {
329
-            // Warning: To increase performances, this action is triggered only if
330
-            // constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
331
-            dol_syslog(
332
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
333
-            );
334
-        } elseif ($action == 'USER_CREATE') {
335
-            dol_syslog(
336
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
337
-            );
338
-        } elseif ($action == 'USER_CREATE_FROM_CONTACT') {
339
-            dol_syslog(
340
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
341
-            );
342
-        } elseif ($action == 'USER_MODIFY') {
343
-            dol_syslog(
344
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
345
-            );
346
-        } elseif ($action == 'USER_NEW_PASSWORD') {
347
-            dol_syslog(
348
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
349
-            );
350
-        } elseif ($action == 'USER_ENABLEDISABLE') {
351
-            dol_syslog(
352
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
353
-            );
354
-        } elseif ($action == 'USER_DELETE') {
355
-            dol_syslog(
356
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
357
-            );
358
-        } elseif ($action == 'USER_LOGOUT') {
359
-            dol_syslog(
360
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
361
-            );
362
-        } elseif ($action == 'USER_SETINGROUP') {
363
-            dol_syslog(
364
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
365
-            );
366
-        } elseif ($action == 'USER_REMOVEFROMGROUP') {
367
-            dol_syslog(
368
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
369
-            );
370
-        }
371
-
372
-        // Groups
373
-        elseif ($action == 'GROUP_CREATE') {
374
-            dol_syslog(
375
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
376
-            );
377
-        } elseif ($action == 'GROUP_MODIFY') {
378
-            dol_syslog(
379
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
380
-            );
381
-        } elseif ($action == 'GROUP_DELETE') {
382
-            dol_syslog(
383
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
384
-            );
385
-        }
386
-
387
-        // Companies
388
-        elseif ($action == 'COMPANY_CREATE') {
389
-            dol_syslog(
390
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
391
-            );
392
-        } elseif ($action == 'COMPANY_MODIFY') {
393
-            dol_syslog(
394
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
395
-            );
396
-        } elseif ($action == 'COMPANY_DELETE') {
397
-            dol_syslog(
398
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
399
-            );
400
-        }
401
-
402
-        // Contacts
403
-        elseif ($action == 'CONTACT_CREATE') {
404
-            dol_syslog(
405
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
406
-            );
407
-        } elseif ($action == 'CONTACT_MODIFY') {
408
-            dol_syslog(
409
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
410
-            );
411
-        } elseif ($action == 'CONTACT_DELETE') {
412
-            dol_syslog(
413
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
414
-            );
415
-        }
416
-
417
-        // Products
418
-        elseif ($action == 'PRODUCT_CREATE') {
419
-            dol_syslog(
420
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
421
-            );
422
-        } elseif ($action == 'PRODUCT_MODIFY') {
423
-            dol_syslog(
424
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
425
-            );
426
-        } elseif ($action == 'PRODUCT_DELETE') {
427
-            dol_syslog(
428
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
429
-            );
430
-        }
431
-
432
-        // Customer orders
433
-        elseif ($action == 'ORDER_CREATE') {
434
-            dol_syslog(
435
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
436
-            );
437
-        } elseif ($action == 'ORDER_VALIDATE') {
438
-            dol_syslog(
439
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
440
-            );
441
-        } elseif ($action == 'ORDER_DELETE') {
442
-            dol_syslog(
443
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
444
-            );
445
-        } elseif ($action == 'ORDER_BUILDDOC') {
446
-            dol_syslog(
447
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
448
-            );
449
-        } elseif ($action == 'ORDER_SENTBYMAIL') {
450
-            dol_syslog(
451
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
452
-            );
453
-        } elseif ($action == 'LINEORDER_INSERT') {
454
-            dol_syslog(
455
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
456
-            );
457
-        } elseif ($action == 'LINEORDER_DELETE') {
458
-            dol_syslog(
459
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
460
-            );
461
-        }
462
-
463
-        // Supplier orders
464
-        elseif ($action == 'ORDER_SUPPLIER_CREATE') {
465
-            dol_syslog(
466
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
467
-            );
468
-        } elseif ($action == 'ORDER_SUPPLIER_VALIDATE') {
469
-            dol_syslog(
470
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
471
-            );
472
-        } elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') {
473
-            dol_syslog(
474
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
475
-            );
476
-        } elseif ($action == 'SUPPLIER_ORDER_BUILDDOC') {
477
-            dol_syslog(
478
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
479
-            );
480
-        }
481
-
482
-        // Proposals
483
-        elseif ($action == 'PROPAL_CREATE') {
484
-            dol_syslog(
485
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
486
-            );
487
-        } elseif (in_array($action, array('PROPAL_CLONE', 'ORDER_CLONE', 'BILL_CLONE'))) {
488
-            dol_syslog(
489
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
490
-            );
324
+		if ($action == 'USER_LOGIN') {
325
+			dol_syslog(
326
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
327
+			);
328
+		} elseif ($action == 'USER_UPDATE_SESSION') {
329
+			// Warning: To increase performances, this action is triggered only if
330
+			// constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
331
+			dol_syslog(
332
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
333
+			);
334
+		} elseif ($action == 'USER_CREATE') {
335
+			dol_syslog(
336
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
337
+			);
338
+		} elseif ($action == 'USER_CREATE_FROM_CONTACT') {
339
+			dol_syslog(
340
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
341
+			);
342
+		} elseif ($action == 'USER_MODIFY') {
343
+			dol_syslog(
344
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
345
+			);
346
+		} elseif ($action == 'USER_NEW_PASSWORD') {
347
+			dol_syslog(
348
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
349
+			);
350
+		} elseif ($action == 'USER_ENABLEDISABLE') {
351
+			dol_syslog(
352
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
353
+			);
354
+		} elseif ($action == 'USER_DELETE') {
355
+			dol_syslog(
356
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
357
+			);
358
+		} elseif ($action == 'USER_LOGOUT') {
359
+			dol_syslog(
360
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
361
+			);
362
+		} elseif ($action == 'USER_SETINGROUP') {
363
+			dol_syslog(
364
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
365
+			);
366
+		} elseif ($action == 'USER_REMOVEFROMGROUP') {
367
+			dol_syslog(
368
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
369
+			);
370
+		}
371
+
372
+		// Groups
373
+		elseif ($action == 'GROUP_CREATE') {
374
+			dol_syslog(
375
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
376
+			);
377
+		} elseif ($action == 'GROUP_MODIFY') {
378
+			dol_syslog(
379
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
380
+			);
381
+		} elseif ($action == 'GROUP_DELETE') {
382
+			dol_syslog(
383
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
384
+			);
385
+		}
386
+
387
+		// Companies
388
+		elseif ($action == 'COMPANY_CREATE') {
389
+			dol_syslog(
390
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
391
+			);
392
+		} elseif ($action == 'COMPANY_MODIFY') {
393
+			dol_syslog(
394
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
395
+			);
396
+		} elseif ($action == 'COMPANY_DELETE') {
397
+			dol_syslog(
398
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
399
+			);
400
+		}
401
+
402
+		// Contacts
403
+		elseif ($action == 'CONTACT_CREATE') {
404
+			dol_syslog(
405
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
406
+			);
407
+		} elseif ($action == 'CONTACT_MODIFY') {
408
+			dol_syslog(
409
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
410
+			);
411
+		} elseif ($action == 'CONTACT_DELETE') {
412
+			dol_syslog(
413
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
414
+			);
415
+		}
416
+
417
+		// Products
418
+		elseif ($action == 'PRODUCT_CREATE') {
419
+			dol_syslog(
420
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
421
+			);
422
+		} elseif ($action == 'PRODUCT_MODIFY') {
423
+			dol_syslog(
424
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
425
+			);
426
+		} elseif ($action == 'PRODUCT_DELETE') {
427
+			dol_syslog(
428
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
429
+			);
430
+		}
431
+
432
+		// Customer orders
433
+		elseif ($action == 'ORDER_CREATE') {
434
+			dol_syslog(
435
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
436
+			);
437
+		} elseif ($action == 'ORDER_VALIDATE') {
438
+			dol_syslog(
439
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
440
+			);
441
+		} elseif ($action == 'ORDER_DELETE') {
442
+			dol_syslog(
443
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
444
+			);
445
+		} elseif ($action == 'ORDER_BUILDDOC') {
446
+			dol_syslog(
447
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
448
+			);
449
+		} elseif ($action == 'ORDER_SENTBYMAIL') {
450
+			dol_syslog(
451
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
452
+			);
453
+		} elseif ($action == 'LINEORDER_INSERT') {
454
+			dol_syslog(
455
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
456
+			);
457
+		} elseif ($action == 'LINEORDER_DELETE') {
458
+			dol_syslog(
459
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
460
+			);
461
+		}
462
+
463
+		// Supplier orders
464
+		elseif ($action == 'ORDER_SUPPLIER_CREATE') {
465
+			dol_syslog(
466
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
467
+			);
468
+		} elseif ($action == 'ORDER_SUPPLIER_VALIDATE') {
469
+			dol_syslog(
470
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
471
+			);
472
+		} elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') {
473
+			dol_syslog(
474
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
475
+			);
476
+		} elseif ($action == 'SUPPLIER_ORDER_BUILDDOC') {
477
+			dol_syslog(
478
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
479
+			);
480
+		}
481
+
482
+		// Proposals
483
+		elseif ($action == 'PROPAL_CREATE') {
484
+			dol_syslog(
485
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
486
+			);
487
+		} elseif (in_array($action, array('PROPAL_CLONE', 'ORDER_CLONE', 'BILL_CLONE'))) {
488
+			dol_syslog(
489
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
490
+			);
491 491
 			
492 492
 			$doli_action = GETPOST('action');
493 493
 
@@ -520,277 +520,277 @@  discard block
 block discarded – undo
520 520
 				if (!empty($line)) $object->update_price(1);
521 521
 			}
522 522
 			
523
-        } elseif ($action == 'PROPAL_MODIFY') {
524
-            dol_syslog(
525
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
526
-            );
527
-        } elseif ($action == 'PROPAL_VALIDATE') {
528
-            dol_syslog(
529
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
530
-            );
531
-        } elseif ($action == 'PROPAL_BUILDDOC') {
532
-            dol_syslog(
533
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
534
-            );
535
-        } elseif ($action == 'PROPAL_SENTBYMAIL') {
536
-            dol_syslog(
537
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
538
-            );
539
-        } elseif ($action == 'PROPAL_CLOSE_SIGNED') {
540
-            dol_syslog(
541
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
542
-            );
543
-        } elseif ($action == 'PROPAL_CLOSE_REFUSED') {
544
-            dol_syslog(
545
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
546
-            );
547
-        } elseif ($action == 'PROPAL_DELETE') {
548
-            dol_syslog(
549
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
550
-            );
551
-        } elseif ($action == 'LINEPROPAL_INSERT') {
552
-            dol_syslog(
553
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
554
-            );
555
-        } elseif ($action == 'LINEPROPAL_MODIFY') {
556
-            dol_syslog(
557
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
558
-            );
559
-        } elseif ($action == 'LINEPROPAL_DELETE') {
560
-            dol_syslog(
561
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
562
-            );
563
-        }
564
-
565
-        // Contracts
566
-        elseif ($action == 'CONTRACT_CREATE') {
567
-            dol_syslog(
568
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
569
-            );
570
-        } elseif ($action == 'CONTRACT_MODIFY') {
571
-            dol_syslog(
572
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
573
-            );
574
-        } elseif ($action == 'CONTRACT_ACTIVATE') {
575
-            dol_syslog(
576
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
577
-            );
578
-        } elseif ($action == 'CONTRACT_CANCEL') {
579
-            dol_syslog(
580
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
581
-            );
582
-        } elseif ($action == 'CONTRACT_CLOSE') {
583
-            dol_syslog(
584
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
585
-            );
586
-        } elseif ($action == 'CONTRACT_DELETE') {
587
-            dol_syslog(
588
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
589
-            );
590
-        }
523
+		} elseif ($action == 'PROPAL_MODIFY') {
524
+			dol_syslog(
525
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
526
+			);
527
+		} elseif ($action == 'PROPAL_VALIDATE') {
528
+			dol_syslog(
529
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
530
+			);
531
+		} elseif ($action == 'PROPAL_BUILDDOC') {
532
+			dol_syslog(
533
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
534
+			);
535
+		} elseif ($action == 'PROPAL_SENTBYMAIL') {
536
+			dol_syslog(
537
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
538
+			);
539
+		} elseif ($action == 'PROPAL_CLOSE_SIGNED') {
540
+			dol_syslog(
541
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
542
+			);
543
+		} elseif ($action == 'PROPAL_CLOSE_REFUSED') {
544
+			dol_syslog(
545
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
546
+			);
547
+		} elseif ($action == 'PROPAL_DELETE') {
548
+			dol_syslog(
549
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
550
+			);
551
+		} elseif ($action == 'LINEPROPAL_INSERT') {
552
+			dol_syslog(
553
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
554
+			);
555
+		} elseif ($action == 'LINEPROPAL_MODIFY') {
556
+			dol_syslog(
557
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
558
+			);
559
+		} elseif ($action == 'LINEPROPAL_DELETE') {
560
+			dol_syslog(
561
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
562
+			);
563
+		}
564
+
565
+		// Contracts
566
+		elseif ($action == 'CONTRACT_CREATE') {
567
+			dol_syslog(
568
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
569
+			);
570
+		} elseif ($action == 'CONTRACT_MODIFY') {
571
+			dol_syslog(
572
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
573
+			);
574
+		} elseif ($action == 'CONTRACT_ACTIVATE') {
575
+			dol_syslog(
576
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
577
+			);
578
+		} elseif ($action == 'CONTRACT_CANCEL') {
579
+			dol_syslog(
580
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
581
+			);
582
+		} elseif ($action == 'CONTRACT_CLOSE') {
583
+			dol_syslog(
584
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
585
+			);
586
+		} elseif ($action == 'CONTRACT_DELETE') {
587
+			dol_syslog(
588
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
589
+			);
590
+		}
591 591
 
592 592
 		elseif ($action == 'BILL_MODIFY') {
593
-            dol_syslog(
594
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
595
-            );
596
-        } elseif ($action == 'BILL_VALIDATE') {
597
-            dol_syslog(
598
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
599
-            );
600
-        } elseif ($action == 'BILL_BUILDDOC') {
601
-            dol_syslog(
602
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
603
-            );
604
-        } elseif ($action == 'BILL_SENTBYMAIL') {
605
-            dol_syslog(
606
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
607
-            );
608
-        } elseif ($action == 'BILL_CANCEL') {
609
-            dol_syslog(
610
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
611
-            );
612
-        } elseif ($action == 'BILL_DELETE') {
613
-            dol_syslog(
614
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
615
-            );
616
-        } elseif ($action == 'LINEBILL_INSERT') {
593
+			dol_syslog(
594
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
595
+			);
596
+		} elseif ($action == 'BILL_VALIDATE') {
597
+			dol_syslog(
598
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
599
+			);
600
+		} elseif ($action == 'BILL_BUILDDOC') {
601
+			dol_syslog(
602
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
603
+			);
604
+		} elseif ($action == 'BILL_SENTBYMAIL') {
605
+			dol_syslog(
606
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
607
+			);
608
+		} elseif ($action == 'BILL_CANCEL') {
609
+			dol_syslog(
610
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
611
+			);
612
+		} elseif ($action == 'BILL_DELETE') {
613
+			dol_syslog(
614
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
615
+			);
616
+		} elseif ($action == 'LINEBILL_INSERT') {
617 617
 				
618
-        	dol_syslog(
619
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
620
-            );
621
-        } elseif ($action == 'LINEBILL_DELETE') {
622
-            dol_syslog(
623
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
624
-            );
625
-        }
626
-
627
-        // Payments
628
-        elseif ($action == 'PAYMENT_CUSTOMER_CREATE') {
629
-            dol_syslog(
630
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
631
-            );
632
-        } elseif ($action == 'PAYMENT_SUPPLIER_CREATE') {
633
-            dol_syslog(
634
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
635
-            );
636
-        } elseif ($action == 'PAYMENT_ADD_TO_BANK') {
637
-            dol_syslog(
638
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
639
-            );
640
-        } elseif ($action == 'PAYMENT_DELETE') {
641
-            dol_syslog(
642
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
643
-            );
644
-        }
645
-
646
-        // Interventions
647
-        elseif ($action == 'FICHEINTER_CREATE') {
648
-            dol_syslog(
649
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
650
-            );
651
-        } elseif ($action == 'FICHEINTER_MODIFY') {
652
-            dol_syslog(
653
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
654
-            );
655
-        } elseif ($action == 'FICHEINTER_VALIDATE') {
656
-            dol_syslog(
657
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
658
-            );
659
-        } elseif ($action == 'FICHEINTER_DELETE') {
660
-            dol_syslog(
661
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
662
-            );
663
-        }
664
-
665
-        // Members
666
-        elseif ($action == 'MEMBER_CREATE') {
667
-            dol_syslog(
668
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
669
-            );
670
-        } elseif ($action == 'MEMBER_VALIDATE') {
671
-            dol_syslog(
672
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
673
-            );
674
-        } elseif ($action == 'MEMBER_SUBSCRIPTION') {
675
-            dol_syslog(
676
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
677
-            );
678
-        } elseif ($action == 'MEMBER_MODIFY') {
679
-            dol_syslog(
680
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
681
-            );
682
-        } elseif ($action == 'MEMBER_NEW_PASSWORD') {
683
-            dol_syslog(
684
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
685
-            );
686
-        } elseif ($action == 'MEMBER_RESILIATE') {
687
-            dol_syslog(
688
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
689
-            );
690
-        } elseif ($action == 'MEMBER_DELETE') {
691
-            dol_syslog(
692
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
693
-            );
694
-        }
695
-
696
-        // Categories
697
-        elseif ($action == 'CATEGORY_CREATE') {
698
-            dol_syslog(
699
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
700
-            );
701
-        } elseif ($action == 'CATEGORY_MODIFY') {
702
-            dol_syslog(
703
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
704
-            );
705
-        } elseif ($action == 'CATEGORY_DELETE') {
706
-            dol_syslog(
707
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
708
-            );
709
-        }
710
-
711
-        // Projects
712
-        elseif ($action == 'PROJECT_CREATE') {
713
-            dol_syslog(
714
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
715
-            );
716
-        } elseif ($action == 'PROJECT_MODIFY') {
717
-            dol_syslog(
718
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
719
-            );
720
-        } elseif ($action == 'PROJECT_DELETE') {
721
-            dol_syslog(
722
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
723
-            );
724
-        }
725
-
726
-        // Project tasks
727
-        elseif ($action == 'TASK_CREATE') {
728
-            dol_syslog(
729
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
730
-            );
731
-        } elseif ($action == 'TASK_MODIFY') {
732
-            dol_syslog(
733
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
734
-            );
735
-        } elseif ($action == 'TASK_DELETE') {
736
-            dol_syslog(
737
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
738
-            );
739
-        }
740
-
741
-        // Task time spent
742
-        elseif ($action == 'TASK_TIMESPENT_CREATE') {
743
-            dol_syslog(
744
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
745
-            );
746
-        } elseif ($action == 'TASK_TIMESPENT_MODIFY') {
747
-            dol_syslog(
748
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
749
-            );
750
-        } elseif ($action == 'TASK_TIMESPENT_DELETE') {
751
-            dol_syslog(
752
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
753
-            );
754
-        }
755
-
756
-        // Shipping
757
-        elseif ($action == 'SHIPPING_CREATE') {
758
-            dol_syslog(
759
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
760
-            );
761
-        } elseif ($action == 'SHIPPING_MODIFY') {
762
-            dol_syslog(
763
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
764
-            );
765
-        } elseif ($action == 'SHIPPING_VALIDATE') {
766
-            dol_syslog(
767
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
768
-            );
769
-        } elseif ($action == 'SHIPPING_SENTBYMAIL') {
770
-            dol_syslog(
771
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
772
-            );
773
-        } elseif ($action == 'SHIPPING_DELETE') {
774
-            dol_syslog(
775
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
776
-            );
777
-        } elseif ($action == 'SHIPPING_BUILDDOC') {
778
-            dol_syslog(
779
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
780
-            );
781
-        }
782
-
783
-        // File
784
-        elseif ($action == 'FILE_UPLOAD') {
785
-            dol_syslog(
786
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
787
-            );
788
-        } elseif ($action == 'FILE_DELETE') {
789
-            dol_syslog(
790
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
791
-            );
792
-        }
793
-
794
-        return 0;
795
-    }
618
+			dol_syslog(
619
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
620
+			);
621
+		} elseif ($action == 'LINEBILL_DELETE') {
622
+			dol_syslog(
623
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
624
+			);
625
+		}
626
+
627
+		// Payments
628
+		elseif ($action == 'PAYMENT_CUSTOMER_CREATE') {
629
+			dol_syslog(
630
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
631
+			);
632
+		} elseif ($action == 'PAYMENT_SUPPLIER_CREATE') {
633
+			dol_syslog(
634
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
635
+			);
636
+		} elseif ($action == 'PAYMENT_ADD_TO_BANK') {
637
+			dol_syslog(
638
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
639
+			);
640
+		} elseif ($action == 'PAYMENT_DELETE') {
641
+			dol_syslog(
642
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
643
+			);
644
+		}
645
+
646
+		// Interventions
647
+		elseif ($action == 'FICHEINTER_CREATE') {
648
+			dol_syslog(
649
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
650
+			);
651
+		} elseif ($action == 'FICHEINTER_MODIFY') {
652
+			dol_syslog(
653
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
654
+			);
655
+		} elseif ($action == 'FICHEINTER_VALIDATE') {
656
+			dol_syslog(
657
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
658
+			);
659
+		} elseif ($action == 'FICHEINTER_DELETE') {
660
+			dol_syslog(
661
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
662
+			);
663
+		}
664
+
665
+		// Members
666
+		elseif ($action == 'MEMBER_CREATE') {
667
+			dol_syslog(
668
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
669
+			);
670
+		} elseif ($action == 'MEMBER_VALIDATE') {
671
+			dol_syslog(
672
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
673
+			);
674
+		} elseif ($action == 'MEMBER_SUBSCRIPTION') {
675
+			dol_syslog(
676
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
677
+			);
678
+		} elseif ($action == 'MEMBER_MODIFY') {
679
+			dol_syslog(
680
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
681
+			);
682
+		} elseif ($action == 'MEMBER_NEW_PASSWORD') {
683
+			dol_syslog(
684
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
685
+			);
686
+		} elseif ($action == 'MEMBER_RESILIATE') {
687
+			dol_syslog(
688
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
689
+			);
690
+		} elseif ($action == 'MEMBER_DELETE') {
691
+			dol_syslog(
692
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
693
+			);
694
+		}
695
+
696
+		// Categories
697
+		elseif ($action == 'CATEGORY_CREATE') {
698
+			dol_syslog(
699
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
700
+			);
701
+		} elseif ($action == 'CATEGORY_MODIFY') {
702
+			dol_syslog(
703
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
704
+			);
705
+		} elseif ($action == 'CATEGORY_DELETE') {
706
+			dol_syslog(
707
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
708
+			);
709
+		}
710
+
711
+		// Projects
712
+		elseif ($action == 'PROJECT_CREATE') {
713
+			dol_syslog(
714
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
715
+			);
716
+		} elseif ($action == 'PROJECT_MODIFY') {
717
+			dol_syslog(
718
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
719
+			);
720
+		} elseif ($action == 'PROJECT_DELETE') {
721
+			dol_syslog(
722
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
723
+			);
724
+		}
725
+
726
+		// Project tasks
727
+		elseif ($action == 'TASK_CREATE') {
728
+			dol_syslog(
729
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
730
+			);
731
+		} elseif ($action == 'TASK_MODIFY') {
732
+			dol_syslog(
733
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
734
+			);
735
+		} elseif ($action == 'TASK_DELETE') {
736
+			dol_syslog(
737
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
738
+			);
739
+		}
740
+
741
+		// Task time spent
742
+		elseif ($action == 'TASK_TIMESPENT_CREATE') {
743
+			dol_syslog(
744
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
745
+			);
746
+		} elseif ($action == 'TASK_TIMESPENT_MODIFY') {
747
+			dol_syslog(
748
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
749
+			);
750
+		} elseif ($action == 'TASK_TIMESPENT_DELETE') {
751
+			dol_syslog(
752
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
753
+			);
754
+		}
755
+
756
+		// Shipping
757
+		elseif ($action == 'SHIPPING_CREATE') {
758
+			dol_syslog(
759
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
760
+			);
761
+		} elseif ($action == 'SHIPPING_MODIFY') {
762
+			dol_syslog(
763
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
764
+			);
765
+		} elseif ($action == 'SHIPPING_VALIDATE') {
766
+			dol_syslog(
767
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
768
+			);
769
+		} elseif ($action == 'SHIPPING_SENTBYMAIL') {
770
+			dol_syslog(
771
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
772
+			);
773
+		} elseif ($action == 'SHIPPING_DELETE') {
774
+			dol_syslog(
775
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
776
+			);
777
+		} elseif ($action == 'SHIPPING_BUILDDOC') {
778
+			dol_syslog(
779
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
780
+			);
781
+		}
782
+
783
+		// File
784
+		elseif ($action == 'FILE_UPLOAD') {
785
+			dol_syslog(
786
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
787
+			);
788
+		} elseif ($action == 'FILE_DELETE') {
789
+			dol_syslog(
790
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
791
+			);
792
+		}
793
+
794
+		return 0;
795
+	}
796 796
 }
797 797
\ No newline at end of file
Please login to merge, or discard this patch.