@@ -129,10 +129,10 @@ |
||
129 | 129 | |
130 | 130 | // Boxes |
131 | 131 | $this->boxes = array( |
132 | - 0 => array('file' => 'box_project.php', 'enabledbydefaulton' => 'Home'), // open projects |
|
133 | - 1 => array('file' => 'box_project_opportunities.php', 'enabledbydefaulton' => 'Home'), // open opportunities |
|
132 | + 0 => array('file' => 'box_project.php', 'enabledbydefaulton' => 'Home'), // open projects |
|
133 | + 1 => array('file' => 'box_project_opportunities.php', 'enabledbydefaulton' => 'Home'), // open opportunities |
|
134 | 134 | 2 => array('file' => 'box_task.php', 'enabledbydefaulton' => 'Home'), |
135 | - 3 => array('file' => 'box_validated_projects.php', 'enabledbydefaulton' => 'Home'), // task without timespent |
|
135 | + 3 => array('file' => 'box_validated_projects.php', 'enabledbydefaulton' => 'Home'), // task without timespent |
|
136 | 136 | 4 => array('file' => 'box_funnel_of_prospection.php', 'enabledbydefaulton' => 'Home'), |
137 | 137 | ); |
138 | 138 | // Cronjobs |
@@ -92,7 +92,7 @@ |
||
92 | 92 | // Permissions |
93 | 93 | $this->rights = array(); |
94 | 94 | $this->rights_class = 'paymentbybanktransfer'; |
95 | - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
95 | + $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
96 | 96 | $r++; |
97 | 97 | $this->rights[$r][0] = 561; |
98 | 98 | $this->rights[$r][1] = 'Read bank transfer payment orders'; |
@@ -247,7 +247,7 @@ |
||
247 | 247 | $this->export_fields_array[$r] = array( |
248 | 248 | 's.rowid' => "IdCompany", 's.nom' => 'ThirdParty', 's.address' => 'Address', 's.zip' => 'Zip', 's.town' => 'Town', 'd.nom' => 'State', 'co.label' => 'Country', |
249 | 249 | 'co.code' => 'CountryCode', 's.phone' => 'Phone', 's.siren' => 'ProfId1', 's.siret' => 'ProfId2', 's.ape' => 'ProfId3', 's.idprof4' => 'ProfId4', 's.idprof5' => 'ProfId5', |
250 | - 's.idprof6' => 'ProfId6', 'c.rowid' => "Id", 'c.ref' => "Ref", 'c.ref_customer' => "RefCustomer", 'c.fk_soc' => "IdCompany", 'c.date_creation' => "DateCreation", 'c.date_valid' => "DateValidation", |
|
250 | + 's.idprof6' => 'ProfId6', 'c.rowid' => "Id", 'c.ref' => "Ref", 'c.ref_customer' => "RefCustomer", 'c.fk_soc' => "IdCompany", 'c.date_creation' => "DateCreation", 'c.date_valid' => "DateValidation", |
|
251 | 251 | 'c.date_delivery' => "DateDeliveryPlanned", 'c.tracking_number' => "TrackingNumber", 'c.height' => "Height", 'c.width' => "Width", 'c.size' => "Depth", |
252 | 252 | 'c.size_units' => 'SizeUnits', 'c.weight' => "Weight", 'c.weight_units' => "WeightUnits", 'c.fk_statut' => 'Status', 'c.note_public' => "NotePublic", |
253 | 253 | 'ed.rowid' => 'LineId', 'cd.description' => 'Description', 'ed.qty' => "Qty", 'p.rowid' => 'ProductId', 'p.ref' => 'ProductRef', 'p.label' => 'ProductLabel', |
@@ -444,7 +444,7 @@ discard block |
||
444 | 444 | // $pdf->GetY() here can't be used. It is bottom of the second address box but first one may be higher |
445 | 445 | |
446 | 446 | // $tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks) |
447 | - $tab_top = 90 + $top_shift; // top_shift is an addition for linked objects or addons (0 in most cases) |
|
447 | + $tab_top = 90 + $top_shift; // top_shift is an addition for linked objects or addons (0 in most cases) |
|
448 | 448 | $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10); |
449 | 449 | |
450 | 450 | // You can add more thing under header here, if you increase $extra_under_address_shift too. |
@@ -774,7 +774,7 @@ discard block |
||
774 | 774 | if (!isset($this->tva[$vatrate])) { |
775 | 775 | $this->tva[$vatrate] = 0; |
776 | 776 | } |
777 | - $this->tva[$vatrate] += $tvaligne; // ->tva is abandoned, we use now ->tva_array that is more complete |
|
777 | + $this->tva[$vatrate] += $tvaligne; // ->tva is abandoned, we use now ->tva_array that is more complete |
|
778 | 778 | $vatcode = $object->lines[$i]->vat_src_code; |
779 | 779 | if (empty($this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['amount'])) { |
780 | 780 | $this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['amount'] = 0; |
@@ -1153,7 +1153,7 @@ discard block |
||
1153 | 1153 | $lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement); |
1154 | 1154 | $pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L'); |
1155 | 1155 | |
1156 | - $posy = $pdf->GetY() + 3; // We need spaces for 2 lines payment conditions |
|
1156 | + $posy = $pdf->GetY() + 3; // We need spaces for 2 lines payment conditions |
|
1157 | 1157 | } |
1158 | 1158 | |
1159 | 1159 | // Show category of operations |
@@ -2113,7 +2113,7 @@ discard block |
||
2113 | 2113 | |
2114 | 2114 | $carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs); |
2115 | 2115 | |
2116 | - $mode = 'target'; |
|
2116 | + $mode = 'target'; |
|
2117 | 2117 | $carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object); |
2118 | 2118 | |
2119 | 2119 | // Show recipient |
@@ -453,7 +453,7 @@ discard block |
||
453 | 453 | // $pdf->GetY() here can't be used. It is bottom of the second address box but first one may be higher |
454 | 454 | |
455 | 455 | // $this->tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks) |
456 | - $this->tab_top = 90 + $top_shift + $shipp_shift; // top_shift is an addition for linked objects or addons (0 in most cases) |
|
456 | + $this->tab_top = 90 + $top_shift + $shipp_shift; // top_shift is an addition for linked objects or addons (0 in most cases) |
|
457 | 457 | $this->tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10); |
458 | 458 | |
459 | 459 | // You can add more thing under header here, if you increase $extra_under_address_shift too. |
@@ -690,7 +690,7 @@ discard block |
||
690 | 690 | } |
691 | 691 | |
692 | 692 | $pdf->setTopMargin($this->tab_top_newpage); |
693 | - $page_bottom_margin = $this->heightforfooter + $this->heightforfreetext + $this->heightforinfotot + $this->getHeightForQRInvoice($pdf->getPage(), $object, $langs); |
|
693 | + $page_bottom_margin = $this->heightforfooter + $this->heightforfreetext + $this->heightforinfotot + $this->getHeightForQRInvoice($pdf->getPage(), $object, $langs); |
|
694 | 694 | $pdf->setPageOrientation('', 1, $page_bottom_margin); |
695 | 695 | $pageposbefore = $pdf->getPage(); |
696 | 696 | |
@@ -934,7 +934,7 @@ discard block |
||
934 | 934 | if (!isset($this->tva[$vatrate])) { |
935 | 935 | $this->tva[$vatrate] = 0; |
936 | 936 | } |
937 | - $this->tva[$vatrate] += $tvaligne; // ->tva is abandoned, we use now ->tva_array that is more complete |
|
937 | + $this->tva[$vatrate] += $tvaligne; // ->tva is abandoned, we use now ->tva_array that is more complete |
|
938 | 938 | $vatcode = $object->lines[$i]->vat_src_code; |
939 | 939 | if (empty($this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['amount'])) { |
940 | 940 | $this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['amount'] = 0; |
@@ -1228,7 +1228,7 @@ discard block |
||
1228 | 1228 | $posy = $pdf->GetY() + 4; |
1229 | 1229 | } |
1230 | 1230 | |
1231 | - $posxval = 52; // Position of values of properties shown on left side |
|
1231 | + $posxval = 52; // Position of values of properties shown on left side |
|
1232 | 1232 | $posxend = 110; // End of x for text on left side |
1233 | 1233 | if ($this->page_largeur < 210) { // To work with US executive format |
1234 | 1234 | $posxend -= 10; |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | $maxfilesizearray = getMaxFileSizeArray(); |
176 | 176 | $maxmin = $maxfilesizearray['maxmin']; |
177 | 177 | if ($maxmin > 0) { |
178 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
178 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
179 | 179 | } |
180 | 180 | $texte .= ' <input type="file" name="uploadfile">'; |
181 | 181 | $texte .= '<input type="hidden" value="FACTURE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |
@@ -410,10 +410,10 @@ discard block |
||
410 | 410 | } |
411 | 411 | |
412 | 412 | // Define substitution array |
413 | - $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object); // Set tags __...__ |
|
413 | + $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object); // Set tags __...__ |
|
414 | 414 | $array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs); |
415 | - $array_objet = $this->get_substitutionarray_object($object, $outputlangs); // Set tags object_... |
|
416 | - $array_user = $this->get_substitutionarray_user($user, $outputlangs); // Set tags myuser_... |
|
415 | + $array_objet = $this->get_substitutionarray_object($object, $outputlangs); // Set tags object_... |
|
416 | + $array_user = $this->get_substitutionarray_user($user, $outputlangs); // Set tags myuser_... |
|
417 | 417 | $array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs); |
418 | 418 | $array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs); |
419 | 419 | $array_propal = is_object($propal_object) ? $this->get_substitutionarray_object($propal_object, $outputlangs, 'propal') : array(); |
@@ -149,7 +149,7 @@ |
||
149 | 149 | |
150 | 150 | // Permissions |
151 | 151 | $this->rights = array(); // Permission array used by this module |
152 | - $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
152 | + $r = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
153 | 153 | |
154 | 154 | $this->rights[$r][0] = 63001; |
155 | 155 | $this->rights[$r][1] = 'Read resources'; |
@@ -117,7 +117,7 @@ |
||
117 | 117 | $code = strtoupper(trim($code)); |
118 | 118 | |
119 | 119 | if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED')) { |
120 | - $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
120 | + $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment |
|
121 | 121 | } elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) { |
122 | 122 | $result = -2; |
123 | 123 | } |
@@ -171,7 +171,7 @@ |
||
171 | 171 | $maxfilesizearray = getMaxFileSizeArray(); |
172 | 172 | $maxmin = $maxfilesizearray['maxmin']; |
173 | 173 | if ($maxmin > 0) { |
174 | - $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
174 | + $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file |
|
175 | 175 | } |
176 | 176 | $texte .= ' <input type="file" name="uploadfile">'; |
177 | 177 | $texte .= '<input type="hidden" value="PRODUCT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">'; |