@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | * \ingroup titre |
24 | 24 | * \brief Description and activation file for module titre |
25 | 25 | */ |
26 | -include_once DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php"; |
|
26 | +include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php"; |
|
27 | 27 | |
28 | 28 | /** |
29 | 29 | * Description and activation class for module titre |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | $this->version = '3.1.10'; |
67 | 67 | // Key used in llx_const table to save module status enabled/disabled |
68 | 68 | // (where MYMODULE is value of property name of module in uppercase) |
69 | - $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name); |
|
69 | + $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); |
|
70 | 70 | // Where to store the module in setup page |
71 | 71 | // (0=common,1=interface,2=others,3=very specific) |
72 | 72 | $this->special = 2; |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | // List of modules id that must be enabled if this module is enabled |
126 | 126 | $this->depends = array(); |
127 | 127 | |
128 | - $this->conflictwith=array('modMilestone'); |
|
128 | + $this->conflictwith = array('modMilestone'); |
|
129 | 129 | // List of modules id to disable if this one is disabled |
130 | 130 | $this->requiredby = array(); |
131 | 131 | // Minimum version of PHP required by module |
@@ -190,20 +190,20 @@ discard block |
||
190 | 190 | // 'categories_x' to add a tab in category view |
191 | 191 | // (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member) |
192 | 192 | // Dictionnaries |
193 | - if (! isset($conf->subtotal->enabled)) { |
|
194 | - $conf->subtotal=new stdClass(); |
|
193 | + if (!isset($conf->subtotal->enabled)) { |
|
194 | + $conf->subtotal = new stdClass(); |
|
195 | 195 | $conf->subtotal->enabled = 0; |
196 | 196 | } |
197 | 197 | $this->dictionaries = array( |
198 | 198 | 'langs'=>'subtotal@subtotal', |
199 | - 'tabname'=>array(MAIN_DB_PREFIX.'c_subtotal_free_text'), // List of tables we want to see into dictonnary editor |
|
200 | - 'tablib'=>array($langs->trans('subtotalFreeLineDictionary')), // Label of tables |
|
201 | - 'tabsql'=>array('SELECT f.rowid as rowid, f.label, f.content, f.entity, f.active FROM '.MAIN_DB_PREFIX.'c_subtotal_free_text as f WHERE f.entity='.$conf->entity), // Request to select fields |
|
202 | - 'tabsqlsort'=>array('label ASC'), // Sort order |
|
203 | - 'tabfield'=>array('label,content'), // List of fields (result of select to show dictionary) |
|
204 | - 'tabfieldvalue'=>array('label,content'), // List of fields (list of fields to edit a record) |
|
205 | - 'tabfieldinsert'=>array('label,content,entity'), // List of fields (list of fields for insert) |
|
206 | - 'tabrowid'=>array('rowid'), // Name of columns with primary key (try to always name it 'rowid') |
|
199 | + 'tabname'=>array(MAIN_DB_PREFIX.'c_subtotal_free_text'), // List of tables we want to see into dictonnary editor |
|
200 | + 'tablib'=>array($langs->trans('subtotalFreeLineDictionary')), // Label of tables |
|
201 | + 'tabsql'=>array('SELECT f.rowid as rowid, f.label, f.content, f.entity, f.active FROM '.MAIN_DB_PREFIX.'c_subtotal_free_text as f WHERE f.entity='.$conf->entity), // Request to select fields |
|
202 | + 'tabsqlsort'=>array('label ASC'), // Sort order |
|
203 | + 'tabfield'=>array('label,content'), // List of fields (result of select to show dictionary) |
|
204 | + 'tabfieldvalue'=>array('label,content'), // List of fields (list of fields to edit a record) |
|
205 | + 'tabfieldinsert'=>array('label,content,entity'), // List of fields (list of fields for insert) |
|
206 | + 'tabrowid'=>array('rowid'), // Name of columns with primary key (try to always name it 'rowid') |
|
207 | 207 | 'tabcond'=>array($conf->subtotal->enabled) |
208 | 208 | ); |
209 | 209 | /* Example: |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | |
479 | 479 | $extra = new ExtraFields($db); // propaldet, commandedet, facturedet |
480 | 480 | $TElementType = array('propaldet', 'commandedet', 'facturedet', 'supplier_proposaldet', 'commande_fournisseurdet', 'facture_fourn_det'); |
481 | - foreach($TElementType as $element_type) { |
|
481 | + foreach ($TElementType as $element_type) { |
|
482 | 482 | $extra->addExtraField('show_total_ht', 'Afficher le Total HT sur le sous-total', 'int', 0, 10, $element_type, 0, 0, '', unserialize('a:1:{s:7:"options";a:1:{s:0:"";N;}}'), 0, '', 0, 1); |
483 | 483 | $extra->addExtraField('show_reduc', 'Afficher la réduction sur le sous-total', 'int', 0, 10, $element_type, 0, 0, '', unserialize('a:1:{s:7:"options";a:1:{s:0:"";N;}}'), 0, '', 0, 1); |
484 | 484 | } |
@@ -16,17 +16,17 @@ discard block |
||
16 | 16 | |
17 | 17 | global $type_element, $where; |
18 | 18 | |
19 | - $contexts = explode(':',$parameters['context']); |
|
19 | + $contexts = explode(':', $parameters['context']); |
|
20 | 20 | |
21 | - if(in_array('consumptionthirdparty',$contexts) && in_array($type_element, array('propal', 'order', 'invoice', 'supplier_order', 'supplier_invoice', 'supplier_proposal'))) { |
|
21 | + if (in_array('consumptionthirdparty', $contexts) && in_array($type_element, array('propal', 'order', 'invoice', 'supplier_order', 'supplier_invoice', 'supplier_proposal'))) { |
|
22 | 22 | $mod_num = TSubtotal::$module_number; |
23 | 23 | |
24 | 24 | // Not a title (can't use TSubtotal class methods in sql) |
25 | - $where.= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty > 9)'; |
|
25 | + $where .= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty > 9)'; |
|
26 | 26 | // Not a subtotal (can't use TSubtotal class methods in sql) |
27 | - $where.= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty < 90)'; |
|
27 | + $where .= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty < 90)'; |
|
28 | 28 | // Not a free line text (can't use TSubtotal class methods in sql) |
29 | - $where.= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty != 50)'; |
|
29 | + $where .= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty != 50)'; |
|
30 | 30 | |
31 | 31 | } |
32 | 32 | |
@@ -105,43 +105,43 @@ discard block |
||
105 | 105 | |
106 | 106 | function formObjectOptions($parameters, &$object, &$action, $hookmanager) |
107 | 107 | { |
108 | - global $langs,$db,$user, $conf; |
|
108 | + global $langs, $db, $user, $conf; |
|
109 | 109 | |
110 | 110 | $langs->load('subtotal@subtotal'); |
111 | 111 | |
112 | - $contexts = explode(':',$parameters['context']); |
|
112 | + $contexts = explode(':', $parameters['context']); |
|
113 | 113 | |
114 | - if(in_array('ordercard',$contexts) || in_array('ordersuppliercard',$contexts) || in_array('propalcard',$contexts) || in_array('supplier_proposalcard',$contexts) || in_array('invoicecard',$contexts) || in_array('invoicesuppliercard',$contexts) || in_array('invoicereccard',$contexts)) { |
|
114 | + if (in_array('ordercard', $contexts) || in_array('ordersuppliercard', $contexts) || in_array('propalcard', $contexts) || in_array('supplier_proposalcard', $contexts) || in_array('invoicecard', $contexts) || in_array('invoicesuppliercard', $contexts) || in_array('invoicereccard', $contexts)) { |
|
115 | 115 | |
116 | 116 | $createRight = $user->rights->{$object->element}->creer; |
117 | - if($object->element == 'facturerec' ) |
|
117 | + if ($object->element == 'facturerec') |
|
118 | 118 | { |
119 | 119 | $object->statut = 0; // hack for facture rec |
120 | 120 | $createRight = $user->rights->facture->creer; |
121 | - } elseif($object->element == 'order_supplier' ) |
|
121 | + } elseif ($object->element == 'order_supplier') |
|
122 | 122 | { |
123 | 123 | $createRight = $user->rights->fournisseur->commande->creer; |
124 | - } elseif($object->element == 'invoice_supplier' ) |
|
124 | + } elseif ($object->element == 'invoice_supplier') |
|
125 | 125 | { |
126 | 126 | $createRight = $user->rights->fournisseur->facture->creer; |
127 | 127 | } |
128 | 128 | |
129 | - if ($object->statut == 0 && $createRight) { |
|
129 | + if ($object->statut == 0 && $createRight) { |
|
130 | 130 | |
131 | 131 | |
132 | - if($object->element=='facture')$idvar = 'facid'; |
|
133 | - else $idvar='id'; |
|
132 | + if ($object->element == 'facture')$idvar = 'facid'; |
|
133 | + else $idvar = 'id'; |
|
134 | 134 | |
135 | - if(in_array($action, array('add_title_line', 'add_total_line', 'add_subtitle_line', 'add_subtotal_line', 'add_free_text')) ) |
|
135 | + if (in_array($action, array('add_title_line', 'add_total_line', 'add_subtitle_line', 'add_subtotal_line', 'add_free_text'))) |
|
136 | 136 | { |
137 | 137 | $level = GETPOST('level', 'int'); //New avec SUBTOTAL_USE_NEW_FORMAT |
138 | 138 | |
139 | - if($action=='add_title_line') { |
|
139 | + if ($action == 'add_title_line') { |
|
140 | 140 | $title = GETPOST('title'); |
141 | - if(empty($title)) $title = $langs->trans('title'); |
|
142 | - $qty = $level<1 ? 1 : $level ; |
|
141 | + if (empty($title)) $title = $langs->trans('title'); |
|
142 | + $qty = $level < 1 ? 1 : $level; |
|
143 | 143 | } |
144 | - else if($action=='add_free_text') { |
|
144 | + else if ($action == 'add_free_text') { |
|
145 | 145 | $title = GETPOST('title'); |
146 | 146 | |
147 | 147 | if (empty($title)) { |
@@ -153,21 +153,21 @@ discard block |
||
153 | 153 | } |
154 | 154 | } |
155 | 155 | } |
156 | - if(empty($title)) $title = $langs->trans('subtotalAddLineDescription'); |
|
156 | + if (empty($title)) $title = $langs->trans('subtotalAddLineDescription'); |
|
157 | 157 | $qty = 50; |
158 | 158 | } |
159 | - else if($action=='add_subtitle_line') { |
|
159 | + else if ($action == 'add_subtitle_line') { |
|
160 | 160 | $title = GETPOST('title'); |
161 | - if(empty($title)) $title = $langs->trans('subtitle'); |
|
161 | + if (empty($title)) $title = $langs->trans('subtitle'); |
|
162 | 162 | $qty = 2; |
163 | 163 | } |
164 | - else if($action=='add_subtotal_line') { |
|
164 | + else if ($action == 'add_subtotal_line') { |
|
165 | 165 | $title = $langs->trans('SubSubTotal'); |
166 | 166 | $qty = 98; |
167 | 167 | } |
168 | 168 | else { |
169 | 169 | $title = GETPOST('title') ? GETPOST('title') : $langs->trans('SubTotal'); |
170 | - $qty = $level ? 100-$level : 99; |
|
170 | + $qty = $level ? 100 - $level : 99; |
|
171 | 171 | } |
172 | 172 | dol_include_once('/subtotal/class/subtotal.class.php'); |
173 | 173 | |
@@ -175,15 +175,15 @@ discard block |
||
175 | 175 | |
176 | 176 | TSubtotal::addSubTotalLine($object, $title, $qty); |
177 | 177 | } |
178 | - else if($action==='ask_deleteallline') { |
|
179 | - $form=new Form($db); |
|
178 | + else if ($action === 'ask_deleteallline') { |
|
179 | + $form = new Form($db); |
|
180 | 180 | |
181 | - $lineid = GETPOST('lineid','integer'); |
|
181 | + $lineid = GETPOST('lineid', 'integer'); |
|
182 | 182 | $TIdForGroup = $this->getArrayOfLineForAGroup($object, $lineid); |
183 | 183 | |
184 | 184 | $nbLines = count($TIdForGroup); |
185 | 185 | |
186 | - $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('deleteWithAllLines'), $langs->trans('ConfirmDeleteAllThisLines',$nbLines), 'confirm_delete_all_lines','',0,1); |
|
186 | + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('deleteWithAllLines'), $langs->trans('ConfirmDeleteAllThisLines', $nbLines), 'confirm_delete_all_lines', '', 0, 1); |
|
187 | 187 | print $formconfirm; |
188 | 188 | } |
189 | 189 | |
@@ -193,13 +193,13 @@ discard block |
||
193 | 193 | } |
194 | 194 | |
195 | 195 | |
196 | - if($action!='editline') { |
|
196 | + if ($action != 'editline') { |
|
197 | 197 | // New format is for 3.8 |
198 | 198 | $this->printNewFormat($object, $conf, $langs, $idvar); |
199 | 199 | } |
200 | 200 | } |
201 | 201 | } |
202 | - elseif ((!empty($parameters['currentcontext']) && $parameters['currentcontext'] == 'orderstoinvoice') || in_array('orderstoinvoice',$contexts)) |
|
202 | + elseif ((!empty($parameters['currentcontext']) && $parameters['currentcontext'] == 'orderstoinvoice') || in_array('orderstoinvoice', $contexts)) |
|
203 | 203 | { |
204 | 204 | ?> |
205 | 205 | <script type="text/javascript"> |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | $(document).ready(function() { |
225 | 225 | $('div.fiche div.tabsAction').append('<br />'); |
226 | 226 | |
227 | - $('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_title_line" rel="add_title_line" href="javascript:;" class="butAction"><?php echo $langs->trans('AddTitle' )?></a></div>'); |
|
227 | + $('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_title_line" rel="add_title_line" href="javascript:;" class="butAction"><?php echo $langs->trans('AddTitle')?></a></div>'); |
|
228 | 228 | $('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_total_line" rel="add_total_line" href="javascript:;" class="butAction"><?php echo $langs->trans('AddSubTotal')?></a></div>'); |
229 | 229 | $('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_free_text" rel="add_free_text" href="javascript:;" class="butAction"><?php echo $langs->trans('AddFreeText')?></a></div>'); |
230 | 230 | |
@@ -275,9 +275,9 @@ discard block |
||
275 | 275 | $('body').append(dialog_html); |
276 | 276 | |
277 | 277 | <?php |
278 | - $editorTool = empty($conf->global->FCKEDITOR_EDITORNAME)?'ckeditor':$conf->global->FCKEDITOR_EDITORNAME; |
|
279 | - $editorConf = empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?false:$conf->global->FCKEDITOR_ENABLE_DETAILS; |
|
280 | - if($editorConf && in_array($editorTool,array('textarea','ckeditor'))){ |
|
278 | + $editorTool = empty($conf->global->FCKEDITOR_EDITORNAME) ? 'ckeditor' : $conf->global->FCKEDITOR_EDITORNAME; |
|
279 | + $editorConf = empty($conf->global->FCKEDITOR_ENABLE_DETAILS) ?false:$conf->global->FCKEDITOR_ENABLE_DETAILS; |
|
280 | + if ($editorConf && in_array($editorTool, array('textarea', 'ckeditor'))) { |
|
281 | 281 | ?> |
282 | 282 | if (action == 'addTitle' || action == 'addFreeTxt') |
283 | 283 | { |
@@ -392,62 +392,62 @@ discard block |
||
392 | 392 | global $conf, $langs, $bc; |
393 | 393 | |
394 | 394 | $action = GETPOST('action'); |
395 | - $TContext = explode(':',$parameters['context']); |
|
395 | + $TContext = explode(':', $parameters['context']); |
|
396 | 396 | if ( |
397 | - in_array('invoicecard',$TContext) |
|
398 | - || in_array('invoicesuppliercard',$TContext) |
|
399 | - || in_array('propalcard',$TContext) |
|
400 | - || in_array('ordercard',$TContext) |
|
401 | - || in_array('ordersuppliercard',$TContext) |
|
402 | - || in_array('invoicereccard',$TContext) |
|
397 | + in_array('invoicecard', $TContext) |
|
398 | + || in_array('invoicesuppliercard', $TContext) |
|
399 | + || in_array('propalcard', $TContext) |
|
400 | + || in_array('ordercard', $TContext) |
|
401 | + || in_array('ordersuppliercard', $TContext) |
|
402 | + || in_array('invoicereccard', $TContext) |
|
403 | 403 | ) |
404 | 404 | { |
405 | - $hideInnerLines = isset( $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] ) ? $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] : 0; |
|
406 | - $hidedetails = isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] ) ? $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] : 0; |
|
407 | - $hidepricesDefaultConf = !empty($conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED)?$conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED:0; |
|
408 | - $hideprices= isset( $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] ) ? $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] : $hidepricesDefaultConf; |
|
405 | + $hideInnerLines = isset($_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id]) ? $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] : 0; |
|
406 | + $hidedetails = isset($_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id]) ? $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] : 0; |
|
407 | + $hidepricesDefaultConf = !empty($conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED) ? $conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED : 0; |
|
408 | + $hideprices = isset($_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id]) ? $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] : $hidepricesDefaultConf; |
|
409 | 409 | |
410 | - $var=false; |
|
411 | - $out.= '<tr '.$bc[$var].'> |
|
410 | + $var = false; |
|
411 | + $out .= '<tr '.$bc[$var].'> |
|
412 | 412 | <td colspan="4" align="right"> |
413 | 413 | <label for="hideInnerLines">'.$langs->trans('HideInnerLines').'</label> |
414 | - <input type="checkbox" onclick="if($(this).is(\':checked\')) { $(\'#hidedetails\').prop(\'checked\', \'checked\') }" id="hideInnerLines" name="hideInnerLines" value="1" '.(( $hideInnerLines ) ? 'checked="checked"' : '' ).' /> |
|
414 | + <input type="checkbox" onclick="if($(this).is(\':checked\')) { $(\'#hidedetails\').prop(\'checked\', \'checked\') }" id="hideInnerLines" name="hideInnerLines" value="1" '.(($hideInnerLines) ? 'checked="checked"' : '').' /> |
|
415 | 415 | </td> |
416 | 416 | </tr>'; |
417 | 417 | |
418 | - $var=!$var; |
|
419 | - $out.= '<tr '.$bc[$var].'> |
|
418 | + $var = !$var; |
|
419 | + $out .= '<tr '.$bc[$var].'> |
|
420 | 420 | <td colspan="4" align="right"> |
421 | 421 | <label for="hidedetails">'.$langs->trans('SubTotalhidedetails').'</label> |
422 | - <input type="checkbox" id="hidedetails" name="hidedetails" value="1" '.(( $hidedetails ) ? 'checked="checked"' : '' ).' /> |
|
422 | + <input type="checkbox" id="hidedetails" name="hidedetails" value="1" '.(($hidedetails) ? 'checked="checked"' : '').' /> |
|
423 | 423 | </td> |
424 | 424 | </tr>'; |
425 | 425 | |
426 | - $var=!$var; |
|
427 | - $out.= '<tr '.$bc[$var].'> |
|
426 | + $var = !$var; |
|
427 | + $out .= '<tr '.$bc[$var].'> |
|
428 | 428 | <td colspan="4" align="right"> |
429 | 429 | <label for="hideprices">'.$langs->trans('SubTotalhidePrice').'</label> |
430 | - <input type="checkbox" id="hideprices" name="hideprices" value="1" '.(( $hideprices ) ? 'checked="checked"' : '' ).' /> |
|
430 | + <input type="checkbox" id="hideprices" name="hideprices" value="1" '.(($hideprices) ? 'checked="checked"' : '').' /> |
|
431 | 431 | </td> |
432 | 432 | </tr>'; |
433 | 433 | |
434 | 434 | |
435 | 435 | |
436 | 436 | if ( |
437 | - (in_array('propalcard',$TContext) && !empty($conf->global->SUBTOTAL_PROPAL_ADD_RECAP)) |
|
438 | - || (in_array('ordercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP)) |
|
439 | - || (in_array('ordersuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP)) |
|
440 | - || (in_array('invoicecard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP)) |
|
441 | - || (in_array('invoicesuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP)) |
|
442 | - || (in_array('invoicereccard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP )) |
|
437 | + (in_array('propalcard', $TContext) && !empty($conf->global->SUBTOTAL_PROPAL_ADD_RECAP)) |
|
438 | + || (in_array('ordercard', $TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP)) |
|
439 | + || (in_array('ordersuppliercard', $TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP)) |
|
440 | + || (in_array('invoicecard', $TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP)) |
|
441 | + || (in_array('invoicesuppliercard', $TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP)) |
|
442 | + || (in_array('invoicereccard', $TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP)) |
|
443 | 443 | ) |
444 | 444 | { |
445 | - $var=!$var; |
|
446 | - $out.= ' |
|
445 | + $var = !$var; |
|
446 | + $out .= ' |
|
447 | 447 | <tr '.$bc[$var].'> |
448 | 448 | <td colspan="4" align="right"> |
449 | 449 | <label for="subtotal_add_recap">'.$langs->trans('subtotal_add_recap').'</label> |
450 | - <input type="checkbox" id="subtotal_add_recap" name="subtotal_add_recap" value="1" '.( GETPOST('subtotal_add_recap') ? 'checked="checked"' : '' ).' /> |
|
450 | + <input type="checkbox" id="subtotal_add_recap" name="subtotal_add_recap" value="1" '.(GETPOST('subtotal_add_recap') ? 'checked="checked"' : '').' /> |
|
451 | 451 | </td> |
452 | 452 | </tr>'; |
453 | 453 | } |
@@ -463,7 +463,7 @@ discard block |
||
463 | 463 | function formEditProductOptions($parameters, &$object, &$action, $hookmanager) |
464 | 464 | { |
465 | 465 | |
466 | - if (in_array('invoicecard',explode(':',$parameters['context']))) |
|
466 | + if (in_array('invoicecard', explode(':', $parameters['context']))) |
|
467 | 467 | { |
468 | 468 | |
469 | 469 | } |
@@ -474,13 +474,13 @@ discard block |
||
474 | 474 | function ODTSubstitutionLine(&$parameters, &$object, $action, $hookmanager) { |
475 | 475 | global $conf; |
476 | 476 | |
477 | - if($action === 'builddoc') { |
|
477 | + if ($action === 'builddoc') { |
|
478 | 478 | |
479 | 479 | $line = &$parameters['line']; |
480 | 480 | $object = &$parameters['object']; |
481 | 481 | $substitutionarray = &$parameters['substitutionarray']; |
482 | 482 | |
483 | - if($line->product_type == 9 && $line->special_code == $this->module_number) { |
|
483 | + if ($line->product_type == 9 && $line->special_code == $this->module_number) { |
|
484 | 484 | $substitutionarray['line_modsubtotal'] = 1; |
485 | 485 | |
486 | 486 | $substitutionarray['line_price_ht'] |
@@ -491,7 +491,7 @@ discard block |
||
491 | 491 | = $substitutionarray['line_up'] |
492 | 492 | = ''; |
493 | 493 | |
494 | - if($line->qty>90) { |
|
494 | + if ($line->qty > 90) { |
|
495 | 495 | $substitutionarray['line_modsubtotal_total'] = true; |
496 | 496 | |
497 | 497 | list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1); |
@@ -505,7 +505,7 @@ discard block |
||
505 | 505 | |
506 | 506 | |
507 | 507 | } |
508 | - else{ |
|
508 | + else { |
|
509 | 509 | $substitutionarray['line_not_modsubtotal'] = true; |
510 | 510 | $substitutionarray['line_modsubtotal'] = 0; |
511 | 511 | } |
@@ -517,29 +517,29 @@ discard block |
||
517 | 517 | function createFrom($parameters, &$object, $action, $hookmanager) { |
518 | 518 | |
519 | 519 | if ( |
520 | - in_array('invoicecard',explode(':',$parameters['context'])) |
|
521 | - || in_array('invoicesuppliercard',explode(':',$parameters['context'])) |
|
522 | - || in_array('propalcard',explode(':',$parameters['context'])) |
|
523 | - || in_array('supplier_proposalcard',explode(':',$parameters['context'])) |
|
524 | - || in_array('ordercard',explode(':',$parameters['context'])) |
|
525 | - || in_array('ordersuppliercard',explode(':',$parameters['context'])) |
|
526 | - || in_array('invoicereccard',explode(':',$parameters['context'])) |
|
520 | + in_array('invoicecard', explode(':', $parameters['context'])) |
|
521 | + || in_array('invoicesuppliercard', explode(':', $parameters['context'])) |
|
522 | + || in_array('propalcard', explode(':', $parameters['context'])) |
|
523 | + || in_array('supplier_proposalcard', explode(':', $parameters['context'])) |
|
524 | + || in_array('ordercard', explode(':', $parameters['context'])) |
|
525 | + || in_array('ordersuppliercard', explode(':', $parameters['context'])) |
|
526 | + || in_array('invoicereccard', explode(':', $parameters['context'])) |
|
527 | 527 | ) { |
528 | 528 | |
529 | 529 | global $db; |
530 | 530 | |
531 | 531 | $objFrom = $parameters['objFrom']; |
532 | 532 | |
533 | - foreach($objFrom->lines as $k=> &$lineOld) { |
|
533 | + foreach ($objFrom->lines as $k=> &$lineOld) { |
|
534 | 534 | |
535 | - if($lineOld->product_type == 9 && $lineOld->info_bits > 0 ) { |
|
535 | + if ($lineOld->product_type == 9 && $lineOld->info_bits > 0) { |
|
536 | 536 | |
537 | 537 | $line = & $object->lines[$k]; |
538 | 538 | |
539 | 539 | $idLine = (int) ($line->id ? $line->id : $line->rowid); |
540 | 540 | |
541 | 541 | $db->query("UPDATE ".MAIN_DB_PREFIX.$line->table_element." |
542 | - SET info_bits=".(int)$lineOld->info_bits." |
|
542 | + SET info_bits=".(int) $lineOld->info_bits." |
|
543 | 543 | WHERE rowid = ".$idLine." |
544 | 544 | "); |
545 | 545 | |
@@ -555,15 +555,15 @@ discard block |
||
555 | 555 | |
556 | 556 | function doActions($parameters, &$object, $action, $hookmanager) |
557 | 557 | { |
558 | - global $db, $conf, $langs,$user; |
|
558 | + global $db, $conf, $langs, $user; |
|
559 | 559 | |
560 | 560 | dol_include_once('/subtotal/class/subtotal.class.php'); |
561 | 561 | dol_include_once('/subtotal/lib/subtotal.lib.php'); |
562 | - require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; |
|
562 | + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; |
|
563 | 563 | |
564 | 564 | $showBlockExtrafields = GETPOST('showBlockExtrafields'); |
565 | 565 | |
566 | - if($object->element=='facture') $idvar = 'facid'; |
|
566 | + if ($object->element == 'facture') $idvar = 'facid'; |
|
567 | 567 | else $idvar = 'id'; |
568 | 568 | |
569 | 569 | if ($action == 'updateligne' || $action == 'updateline') |
@@ -576,7 +576,7 @@ discard block |
||
576 | 576 | if ($line->id == $lineid && TSubtotal::isModSubtotalLine($line)) |
577 | 577 | { |
578 | 578 | $found = true; |
579 | - if(TSubtotal::isTitle($line) && !empty($showBlockExtrafields)) { |
|
579 | + if (TSubtotal::isTitle($line) && !empty($showBlockExtrafields)) { |
|
580 | 580 | $extrafieldsline = new ExtraFields($db); |
581 | 581 | $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line); |
582 | 582 | $extrafieldsline->setOptionalsFromPost($extralabelsline, $line); |
@@ -595,43 +595,43 @@ discard block |
||
595 | 595 | exit; // Surtout ne pas laisser Dolibarr faire du traitement sur le updateligne sinon ça plante les données de la ligne |
596 | 596 | } |
597 | 597 | } |
598 | - else if($action === 'builddoc') { |
|
598 | + else if ($action === 'builddoc') { |
|
599 | 599 | |
600 | 600 | if ( |
601 | - in_array('invoicecard',explode(':',$parameters['context'])) |
|
602 | - || in_array('propalcard',explode(':',$parameters['context'])) |
|
603 | - || in_array('ordercard',explode(':',$parameters['context'])) |
|
604 | - || in_array('ordersuppliercard',explode(':',$parameters['context'])) |
|
605 | - || in_array('invoicesuppliercard',explode(':',$parameters['context'])) |
|
606 | - || in_array('supplier_proposalcard',explode(':',$parameters['context'])) |
|
601 | + in_array('invoicecard', explode(':', $parameters['context'])) |
|
602 | + || in_array('propalcard', explode(':', $parameters['context'])) |
|
603 | + || in_array('ordercard', explode(':', $parameters['context'])) |
|
604 | + || in_array('ordersuppliercard', explode(':', $parameters['context'])) |
|
605 | + || in_array('invoicesuppliercard', explode(':', $parameters['context'])) |
|
606 | + || in_array('supplier_proposalcard', explode(':', $parameters['context'])) |
|
607 | 607 | ) |
608 | 608 | { |
609 | - if(in_array('invoicecard',explode(':',$parameters['context']))) { |
|
609 | + if (in_array('invoicecard', explode(':', $parameters['context']))) { |
|
610 | 610 | $sessname = 'subtotal_hideInnerLines_facture'; |
611 | 611 | $sessname2 = 'subtotal_hidedetails_facture'; |
612 | 612 | $sessname3 = 'subtotal_hideprices_facture'; |
613 | 613 | } |
614 | - elseif(in_array('invoicesuppliercard',explode(':',$parameters['context']))) { |
|
614 | + elseif (in_array('invoicesuppliercard', explode(':', $parameters['context']))) { |
|
615 | 615 | $sessname = 'subtotal_hideInnerLines_facture_fournisseur'; |
616 | 616 | $sessname2 = 'subtotal_hidedetails_facture_fournisseur'; |
617 | 617 | $sessname3 = 'subtotal_hideprices_facture_fournisseur'; |
618 | 618 | } |
619 | - elseif(in_array('propalcard',explode(':',$parameters['context']))) { |
|
619 | + elseif (in_array('propalcard', explode(':', $parameters['context']))) { |
|
620 | 620 | $sessname = 'subtotal_hideInnerLines_propal'; |
621 | 621 | $sessname2 = 'subtotal_hidedetails_propal'; |
622 | 622 | $sessname3 = 'subtotal_hideprices_propal'; |
623 | 623 | } |
624 | - elseif(in_array('supplier_proposalcard',explode(':',$parameters['context']))) { |
|
624 | + elseif (in_array('supplier_proposalcard', explode(':', $parameters['context']))) { |
|
625 | 625 | $sessname = 'subtotal_hideInnerLines_supplier_proposal'; |
626 | 626 | $sessname2 = 'subtotal_hidedetails_supplier_proposal'; |
627 | 627 | $sessname3 = 'subtotal_hideprices_supplier_proposal'; |
628 | 628 | } |
629 | - elseif(in_array('ordercard',explode(':',$parameters['context']))) { |
|
629 | + elseif (in_array('ordercard', explode(':', $parameters['context']))) { |
|
630 | 630 | $sessname = 'subtotal_hideInnerLines_commande'; |
631 | 631 | $sessname2 = 'subtotal_hidedetails_commande'; |
632 | 632 | $sessname3 = 'subtotal_hideprices_commande'; |
633 | 633 | } |
634 | - elseif(in_array('ordersuppliercard',explode(':',$parameters['context']))) { |
|
634 | + elseif (in_array('ordersuppliercard', explode(':', $parameters['context']))) { |
|
635 | 635 | $sessname = 'subtotal_hideInnerLines_commande_fournisseur'; |
636 | 636 | $sessname2 = 'subtotal_hidedetails_commande_fournisseur'; |
637 | 637 | $sessname3 = 'subtotal_hideprices_commande_fournisseur'; |
@@ -644,25 +644,25 @@ discard block |
||
644 | 644 | |
645 | 645 | global $hideprices; |
646 | 646 | |
647 | - $hideInnerLines = (int)GETPOST('hideInnerLines'); |
|
648 | - if(!empty($_SESSION[$sessname]) && !is_array($_SESSION[$sessname][$object->id]) ) $_SESSION[$sessname] = array(); // prevent old system |
|
647 | + $hideInnerLines = (int) GETPOST('hideInnerLines'); |
|
648 | + if (!empty($_SESSION[$sessname]) && !is_array($_SESSION[$sessname][$object->id])) $_SESSION[$sessname] = array(); // prevent old system |
|
649 | 649 | $_SESSION[$sessname][$object->id] = $hideInnerLines; |
650 | 650 | |
651 | - $hidedetails= (int)GETPOST('hidedetails'); |
|
652 | - if(!empty($_SESSION[$sessname2]) && !is_array($_SESSION[$sessname2][$object->id]) ) $_SESSION[$sessname2] = array(); // prevent old system |
|
651 | + $hidedetails = (int) GETPOST('hidedetails'); |
|
652 | + if (!empty($_SESSION[$sessname2]) && !is_array($_SESSION[$sessname2][$object->id])) $_SESSION[$sessname2] = array(); // prevent old system |
|
653 | 653 | $_SESSION[$sessname2][$object->id] = $hidedetails; |
654 | 654 | |
655 | - $hideprices= (int)GETPOST('hideprices'); |
|
656 | - if(!empty($_SESSION[$sessname3]) && !is_array($_SESSION[$sessname3][$object->id]) ) $_SESSION[$sessname3] = array(); // prevent old system |
|
655 | + $hideprices = (int) GETPOST('hideprices'); |
|
656 | + if (!empty($_SESSION[$sessname3]) && !is_array($_SESSION[$sessname3][$object->id])) $_SESSION[$sessname3] = array(); // prevent old system |
|
657 | 657 | $_SESSION[$sessname3][$object->id] = $hideprices; |
658 | 658 | |
659 | - foreach($object->lines as &$line) { |
|
659 | + foreach ($object->lines as &$line) { |
|
660 | 660 | if ($line->product_type == 9 && $line->special_code == $this->module_number) { |
661 | 661 | |
662 | - if($line->qty>=90) { |
|
662 | + if ($line->qty >= 90) { |
|
663 | 663 | $line->modsubtotal_total = 1; |
664 | 664 | } |
665 | - else{ |
|
665 | + else { |
|
666 | 666 | $line->modsubtotal_title = 1; |
667 | 667 | } |
668 | 668 | |
@@ -672,34 +672,34 @@ discard block |
||
672 | 672 | } |
673 | 673 | |
674 | 674 | } |
675 | - else if($action === 'confirm_delete_all_lines' && GETPOST('confirm')=='yes') { |
|
675 | + else if ($action === 'confirm_delete_all_lines' && GETPOST('confirm') == 'yes') { |
|
676 | 676 | |
677 | 677 | $Tab = $this->getArrayOfLineForAGroup($object, GETPOST('lineid')); |
678 | 678 | |
679 | - foreach($Tab as $idLine) { |
|
679 | + foreach ($Tab as $idLine) { |
|
680 | 680 | /** |
681 | 681 | * @var $object Facture |
682 | 682 | */ |
683 | - if($object->element=='facture') $object->deleteline($idLine); |
|
683 | + if ($object->element == 'facture') $object->deleteline($idLine); |
|
684 | 684 | /** |
685 | 685 | * @var $object Facture fournisseur |
686 | 686 | */ |
687 | - else if($object->element=='invoice_supplier') |
|
687 | + else if ($object->element == 'invoice_supplier') |
|
688 | 688 | { |
689 | 689 | $object->deleteline($idLine); |
690 | 690 | } |
691 | 691 | /** |
692 | 692 | * @var $object Propal |
693 | 693 | */ |
694 | - else if($object->element=='propal') $object->deleteline($idLine); |
|
694 | + else if ($object->element == 'propal') $object->deleteline($idLine); |
|
695 | 695 | /** |
696 | 696 | * @var $object Propal Fournisseur |
697 | 697 | */ |
698 | - else if($object->element=='supplier_proposal') $object->deleteline($idLine); |
|
698 | + else if ($object->element == 'supplier_proposal') $object->deleteline($idLine); |
|
699 | 699 | /** |
700 | 700 | * @var $object Commande |
701 | 701 | */ |
702 | - else if($object->element=='commande') |
|
702 | + else if ($object->element == 'commande') |
|
703 | 703 | { |
704 | 704 | if ((float) DOL_VERSION >= 5.0) $object->deleteline($user, $idLine); |
705 | 705 | else $object->deleteline($idLine); |
@@ -707,14 +707,14 @@ discard block |
||
707 | 707 | /** |
708 | 708 | * @var $object Commande fournisseur |
709 | 709 | */ |
710 | - else if($object->element=='order_supplier') |
|
710 | + else if ($object->element == 'order_supplier') |
|
711 | 711 | { |
712 | 712 | $object->deleteline($idLine); |
713 | 713 | } |
714 | 714 | /** |
715 | 715 | * @var $object Facturerec |
716 | 716 | */ |
717 | - else if($object->element=='facturerec') $object->deleteline($idLine); |
|
717 | + else if ($object->element == 'facturerec') $object->deleteline($idLine); |
|
718 | 718 | } |
719 | 719 | |
720 | 720 | header('location:?id='.$object->id); |
@@ -737,7 +737,7 @@ discard block |
||
737 | 737 | return 0; |
738 | 738 | } |
739 | 739 | |
740 | - function formAddObjectLine ($parameters, &$object, &$action, $hookmanager) { |
|
740 | + function formAddObjectLine($parameters, &$object, &$action, $hookmanager) { |
|
741 | 741 | return 0; |
742 | 742 | } |
743 | 743 | |
@@ -755,8 +755,8 @@ discard block |
||
755 | 755 | if (!empty($parameters['fk_element'])) |
756 | 756 | { |
757 | 757 | |
758 | - if($obj->fetch($parameters['fk_element'])){ |
|
759 | - $obj->id= $obj->rowid; |
|
758 | + if ($obj->fetch($parameters['fk_element'])) { |
|
759 | + $obj->id = $obj->rowid; |
|
760 | 760 | if (empty($obj->array_options)) |
761 | 761 | $obj->fetch_optionals(); |
762 | 762 | if (!empty($obj->array_options['options_subtotal_nc'])) |
@@ -776,22 +776,22 @@ discard block |
||
776 | 776 | |
777 | 777 | $found = false; |
778 | 778 | |
779 | - $Tab= array(); |
|
779 | + $Tab = array(); |
|
780 | 780 | |
781 | - foreach($object->lines as $l) { |
|
781 | + foreach ($object->lines as $l) { |
|
782 | 782 | |
783 | 783 | $lid = (!empty($l->rowid) ? $l->rowid : $l->id); |
784 | - if($lid == $lineid) { |
|
784 | + if ($lid == $lineid) { |
|
785 | 785 | |
786 | 786 | $found = true; |
787 | 787 | $qty_line = $l->qty; |
788 | 788 | } |
789 | 789 | |
790 | - if($found) { |
|
790 | + if ($found) { |
|
791 | 791 | |
792 | 792 | $Tab[] = (!empty($l->rowid) ? $l->rowid : $l->id); |
793 | 793 | |
794 | - if($l->special_code==$this->module_number && (($l->qty==99 && $qty_line==1) || ($l->qty==98 && $qty_line==2)) ) { |
|
794 | + if ($l->special_code == $this->module_number && (($l->qty == 99 && $qty_line == 1) || ($l->qty == 98 && $qty_line == 2))) { |
|
795 | 795 | break; // end of story |
796 | 796 | } |
797 | 797 | } |
@@ -820,7 +820,7 @@ discard block |
||
820 | 820 | * |
821 | 821 | * @param $use_level isn't used anymore |
822 | 822 | */ |
823 | - function getTotalLineFromObject(&$object, &$line, $use_level=false, $return_all=0) { |
|
823 | + function getTotalLineFromObject(&$object, &$line, $use_level = false, $return_all = 0) { |
|
824 | 824 | global $conf; |
825 | 825 | |
826 | 826 | $rang = $line->rang; |
@@ -831,31 +831,31 @@ discard block |
||
831 | 831 | $total_ttc = 0; |
832 | 832 | $TTotal_tva = array(); |
833 | 833 | |
834 | - $sign=1; |
|
835 | - if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1; |
|
834 | + $sign = 1; |
|
835 | + if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1; |
|
836 | 836 | |
837 | 837 | if (GETPOST('action') == 'builddoc') $builddoc = true; |
838 | 838 | else $builddoc = false; |
839 | 839 | |
840 | 840 | dol_include_once('/subtotal/class/subtotal.class.php'); |
841 | - foreach($object->lines as $l) { |
|
841 | + foreach ($object->lines as $l) { |
|
842 | 842 | //print $l->rang.'>='.$rang.' '.$total.'<br/>'; |
843 | - if($l->rang>=$rang) { |
|
843 | + if ($l->rang >= $rang) { |
|
844 | 844 | //echo 'return!<br>'; |
845 | 845 | if (!$return_all) return $total; |
846 | 846 | else return array($total, $total_tva, $total_ttc, $TTotal_tva); |
847 | 847 | } |
848 | - else if(TSubtotal::isTitle($l, 100 - $qty_line)) |
|
848 | + else if (TSubtotal::isTitle($l, 100 - $qty_line)) |
|
849 | 849 | { |
850 | 850 | $total = 0; |
851 | 851 | $total_tva = 0; |
852 | 852 | $total_ttc = 0; |
853 | 853 | $TTotal_tva = array(); |
854 | 854 | } |
855 | - elseif(!TSubtotal::isTitle($l) && !TSubtotal::isSubtotal($l)) { |
|
855 | + elseif (!TSubtotal::isTitle($l) && !TSubtotal::isSubtotal($l)) { |
|
856 | 856 | |
857 | 857 | // TODO retirer le test avec $builddoc quand Dolibarr affichera le total progression sur la card et pas seulement dans le PDF |
858 | - if ($builddoc && $object->element == 'facture' && $object->type==Facture::TYPE_SITUATION) |
|
858 | + if ($builddoc && $object->element == 'facture' && $object->type == Facture::TYPE_SITUATION) |
|
859 | 859 | { |
860 | 860 | if ($l->situation_percent > 0) |
861 | 861 | { |
@@ -868,7 +868,7 @@ discard block |
||
868 | 868 | } |
869 | 869 | |
870 | 870 | $result = $sign * ($l->total_ht / ($l->situation_percent / 100)) * $progress; |
871 | - $total+= $result; |
|
871 | + $total += $result; |
|
872 | 872 | // TODO check si les 3 lignes du dessous sont corrects |
873 | 873 | $total_tva += $sign * ($l->total_tva / ($l->situation_percent / 100)) * $progress; |
874 | 874 | $TTotal_tva[$l->tva_tx] += $sign * ($l->total_tva / ($l->situation_percent / 100)) * $progress; |
@@ -900,10 +900,10 @@ discard block |
||
900 | 900 | * @param $w float width |
901 | 901 | * @param $h float height |
902 | 902 | */ |
903 | - function pdf_add_total(&$pdf,&$object, &$line, $label, $description,$posx, $posy, $w, $h) { |
|
904 | - global $conf,$subtotal_last_title_posy; |
|
903 | + function pdf_add_total(&$pdf, &$object, &$line, $label, $description, $posx, $posy, $w, $h) { |
|
904 | + global $conf, $subtotal_last_title_posy; |
|
905 | 905 | |
906 | - $hideInnerLines = (int)GETPOST('hideInnerLines'); |
|
906 | + $hideInnerLines = (int) GETPOST('hideInnerLines'); |
|
907 | 907 | if (!empty($conf->global->SUBTOTAL_ONE_LINE_IF_HIDE_INNERLINES) && $hideInnerLines && !empty($subtotal_last_title_posy)) |
908 | 908 | { |
909 | 909 | $posy = $subtotal_last_title_posy; |
@@ -913,34 +913,34 @@ discard block |
||
913 | 913 | $hidePriceOnSubtotalLines = (int) GETPOST('hide_price_on_subtotal_lines'); |
914 | 914 | |
915 | 915 | $set_pagebreak_margin = false; |
916 | - if(method_exists('Closure','bind')) { |
|
916 | + if (method_exists('Closure', 'bind')) { |
|
917 | 917 | $pageBreakOriginalValue = $pdf->AcceptPageBreak(); |
918 | - $sweetsThief = function ($pdf) { |
|
919 | - return $pdf->bMargin ; |
|
918 | + $sweetsThief = function($pdf) { |
|
919 | + return $pdf->bMargin; |
|
920 | 920 | }; |
921 | 921 | $sweetsThief = Closure::bind($sweetsThief, null, $pdf); |
922 | 922 | |
923 | - $bMargin = $sweetsThief($pdf); |
|
923 | + $bMargin = $sweetsThief($pdf); |
|
924 | 924 | |
925 | - $pdf->SetAutoPageBreak( false ); |
|
925 | + $pdf->SetAutoPageBreak(false); |
|
926 | 926 | |
927 | 927 | $set_pagebreak_margin = true; |
928 | 928 | } |
929 | 929 | |
930 | 930 | |
931 | - if($line->qty==99) |
|
932 | - $pdf->SetFillColor(220,220,220); |
|
933 | - elseif ($line->qty==98) |
|
934 | - $pdf->SetFillColor(230,230,230); |
|
931 | + if ($line->qty == 99) |
|
932 | + $pdf->SetFillColor(220, 220, 220); |
|
933 | + elseif ($line->qty == 98) |
|
934 | + $pdf->SetFillColor(230, 230, 230); |
|
935 | 935 | else |
936 | - $pdf->SetFillColor(240,240,240); |
|
936 | + $pdf->SetFillColor(240, 240, 240); |
|
937 | 937 | |
938 | 938 | $style = 'B'; |
939 | 939 | if (!empty($conf->global->SUBTOTAL_SUBTOTAL_STYLE)) $style = $conf->global->SUBTOTAL_SUBTOTAL_STYLE; |
940 | 940 | |
941 | 941 | $pdf->SetFont('', $style, 9); |
942 | 942 | |
943 | - $pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'R',true); |
|
943 | + $pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'R', true); |
|
944 | 944 | // var_dump($bMargin); |
945 | 945 | $pageAfter = $pdf->getPage(); |
946 | 946 | |
@@ -968,7 +968,7 @@ discard block |
||
968 | 968 | |
969 | 969 | |
970 | 970 | |
971 | - if($total_to_print !== '') { |
|
971 | + if ($total_to_print !== '') { |
|
972 | 972 | |
973 | 973 | if (GETPOST('hideInnerLines')) |
974 | 974 | { |
@@ -992,11 +992,11 @@ discard block |
||
992 | 992 | } |
993 | 993 | |
994 | 994 | $pdf->SetXY($pdf->postotalht, $posy); |
995 | - if($set_pagebreak_margin) $pdf->SetAutoPageBreak( $pageBreakOriginalValue , $bMargin); |
|
996 | - $pdf->MultiCell($pdf->page_largeur-$pdf->marge_droite-$pdf->postotalht, 3, $total_to_print, 0, 'R', 0); |
|
995 | + if ($set_pagebreak_margin) $pdf->SetAutoPageBreak($pageBreakOriginalValue, $bMargin); |
|
996 | + $pdf->MultiCell($pdf->page_largeur - $pdf->marge_droite - $pdf->postotalht, 3, $total_to_print, 0, 'R', 0); |
|
997 | 997 | } |
998 | - else{ |
|
999 | - if($set_pagebreak_margin) $pdf->SetAutoPageBreak( $pageBreakOriginalValue , $bMargin); |
|
998 | + else { |
|
999 | + if ($set_pagebreak_margin) $pdf->SetAutoPageBreak($pageBreakOriginalValue, $bMargin); |
|
1000 | 1000 | } |
1001 | 1001 | |
1002 | 1002 | $posy = $posy + $cell_height; |
@@ -1016,22 +1016,22 @@ discard block |
||
1016 | 1016 | * @param $w float width |
1017 | 1017 | * @param $h float height |
1018 | 1018 | */ |
1019 | - function pdf_add_title(&$pdf,&$object, &$line, $label, $description,$posx, $posy, $w, $h) { |
|
1019 | + function pdf_add_title(&$pdf, &$object, &$line, $label, $description, $posx, $posy, $w, $h) { |
|
1020 | 1020 | |
1021 | - global $db,$conf,$subtotal_last_title_posy; |
|
1021 | + global $db, $conf, $subtotal_last_title_posy; |
|
1022 | 1022 | |
1023 | 1023 | $subtotal_last_title_posy = $posy; |
1024 | - $pdf->SetXY ($posx, $posy); |
|
1024 | + $pdf->SetXY($posx, $posy); |
|
1025 | 1025 | |
1026 | - $hideInnerLines = (int)GETPOST('hideInnerLines'); |
|
1026 | + $hideInnerLines = (int) GETPOST('hideInnerLines'); |
|
1027 | 1027 | |
1028 | 1028 | |
1029 | 1029 | |
1030 | - $style = ($line->qty==1) ? 'BU' : 'BUI'; |
|
1030 | + $style = ($line->qty == 1) ? 'BU' : 'BUI'; |
|
1031 | 1031 | if (!empty($conf->global->SUBTOTAL_TITLE_STYLE)) $style = $conf->global->SUBTOTAL_TITLE_STYLE; |
1032 | 1032 | |
1033 | - if($hideInnerLines) { |
|
1034 | - if($line->qty==1)$pdf->SetFont('', $style, 9); |
|
1033 | + if ($hideInnerLines) { |
|
1034 | + if ($line->qty == 1)$pdf->SetFont('', $style, 9); |
|
1035 | 1035 | else |
1036 | 1036 | { |
1037 | 1037 | if (!empty($conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES)) $style = $conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES; |
@@ -1040,43 +1040,43 @@ discard block |
||
1040 | 1040 | } |
1041 | 1041 | else { |
1042 | 1042 | |
1043 | - if($line->qty==1)$pdf->SetFont('', $style, 9); //TODO if super utile |
|
1043 | + if ($line->qty == 1)$pdf->SetFont('', $style, 9); //TODO if super utile |
|
1044 | 1044 | else $pdf->SetFont('', $style, 9); |
1045 | 1045 | |
1046 | 1046 | } |
1047 | 1047 | |
1048 | 1048 | if ($label === strip_tags($label) && $label === dol_html_entity_decode($label, ENT_QUOTES)) $pdf->MultiCell($w, $h, $label, 0, 'L'); // Pas de HTML dans la chaine |
1049 | - else $pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'J',true); // et maintenant avec du HTML |
|
1049 | + else $pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'J', true); // et maintenant avec du HTML |
|
1050 | 1050 | |
1051 | - if($description && !$hidedesc) { |
|
1051 | + if ($description && !$hidedesc) { |
|
1052 | 1052 | $posy = $pdf->GetY(); |
1053 | 1053 | |
1054 | 1054 | $pdf->SetFont('', '', 8); |
1055 | 1055 | |
1056 | - $pdf->writeHTMLCell($w, $h, $posx, $posy, $description, 0, 1, false, true, 'J',true); |
|
1056 | + $pdf->writeHTMLCell($w, $h, $posx, $posy, $description, 0, 1, false, true, 'J', true); |
|
1057 | 1057 | |
1058 | 1058 | } |
1059 | 1059 | |
1060 | 1060 | } |
1061 | 1061 | |
1062 | - function pdf_writelinedesc_ref($parameters=array(), &$object, &$action='') { |
|
1062 | + function pdf_writelinedesc_ref($parameters = array(), &$object, &$action = '') { |
|
1063 | 1063 | // ultimate PDF hook O_o |
1064 | 1064 | |
1065 | - return $this->pdf_writelinedesc($parameters,$object,$action); |
|
1065 | + return $this->pdf_writelinedesc($parameters, $object, $action); |
|
1066 | 1066 | |
1067 | 1067 | } |
1068 | 1068 | |
1069 | 1069 | function isModSubtotalLine(&$parameters, &$object) { |
1070 | 1070 | |
1071 | - if(is_array($parameters)) { |
|
1071 | + if (is_array($parameters)) { |
|
1072 | 1072 | $i = & $parameters['i']; |
1073 | 1073 | } |
1074 | 1074 | else { |
1075 | - $i = (int)$parameters; |
|
1075 | + $i = (int) $parameters; |
|
1076 | 1076 | } |
1077 | 1077 | |
1078 | 1078 | |
1079 | - if($object->lines[$i]->special_code == $this->module_number && $object->lines[$i]->product_type == 9) { |
|
1079 | + if ($object->lines[$i]->special_code == $this->module_number && $object->lines[$i]->product_type == 9) { |
|
1080 | 1080 | return true; |
1081 | 1081 | } |
1082 | 1082 | |
@@ -1084,43 +1084,43 @@ discard block |
||
1084 | 1084 | |
1085 | 1085 | } |
1086 | 1086 | |
1087 | - function pdf_getlineqty($parameters=array(), &$object, &$action='') { |
|
1088 | - global $conf,$hideprices; |
|
1087 | + function pdf_getlineqty($parameters = array(), &$object, &$action = '') { |
|
1088 | + global $conf, $hideprices; |
|
1089 | 1089 | |
1090 | - if($this->isModSubtotalLine($parameters,$object) ){ |
|
1090 | + if ($this->isModSubtotalLine($parameters, $object)) { |
|
1091 | 1091 | |
1092 | 1092 | $this->resprints = ' '; |
1093 | 1093 | |
1094 | - if((float)DOL_VERSION<=3.6) { |
|
1094 | + if ((float) DOL_VERSION <= 3.6) { |
|
1095 | 1095 | return ''; |
1096 | 1096 | } |
1097 | - else if((float)DOL_VERSION>=3.8) { |
|
1097 | + else if ((float) DOL_VERSION >= 3.8) { |
|
1098 | 1098 | return 1; |
1099 | 1099 | } |
1100 | 1100 | |
1101 | 1101 | } |
1102 | - elseif(!empty($hideprices)) { |
|
1102 | + elseif (!empty($hideprices)) { |
|
1103 | 1103 | $this->resprints = $object->lines[$parameters['i']]->qty; |
1104 | 1104 | return 1; |
1105 | 1105 | } |
1106 | 1106 | elseif (!empty($conf->global->SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY)) |
1107 | 1107 | { |
1108 | - $hideInnerLines = (int)GETPOST('hideInnerLines'); |
|
1109 | - $hidedetails = (int)GETPOST('hidedetails'); |
|
1108 | + $hideInnerLines = (int) GETPOST('hideInnerLines'); |
|
1109 | + $hidedetails = (int) GETPOST('hidedetails'); |
|
1110 | 1110 | if (empty($hideInnerLines) && !empty($hidedetails)) |
1111 | 1111 | { |
1112 | 1112 | $this->resprints = $object->lines[$parameters['i']]->qty; |
1113 | 1113 | } |
1114 | 1114 | } |
1115 | 1115 | |
1116 | - if(is_array($parameters)) $i = & $parameters['i']; |
|
1117 | - else $i = (int)$parameters; |
|
1116 | + if (is_array($parameters)) $i = & $parameters['i']; |
|
1117 | + else $i = (int) $parameters; |
|
1118 | 1118 | |
1119 | 1119 | if (empty($object->lines[$i])) return 0; // hideInnerLines => override $object->lines et Dolibarr ne nous permet pas de mettre à jour la variable qui conditionne la boucle sur les lignes (PR faite pour 6.0) |
1120 | 1120 | |
1121 | - if(empty($object->lines[$i]->array_options)) $object->lines[$i]->fetch_optionals(); |
|
1121 | + if (empty($object->lines[$i]->array_options)) $object->lines[$i]->fetch_optionals(); |
|
1122 | 1122 | |
1123 | - if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) ) |
|
1123 | + if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))) |
|
1124 | 1124 | { |
1125 | 1125 | if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC))) |
1126 | 1126 | { |
@@ -1132,20 +1132,20 @@ discard block |
||
1132 | 1132 | return 0; |
1133 | 1133 | } |
1134 | 1134 | |
1135 | - function pdf_getlinetotalexcltax($parameters=array(), &$object, &$action='') { |
|
1135 | + function pdf_getlinetotalexcltax($parameters = array(), &$object, &$action = '') { |
|
1136 | 1136 | global $conf, $hideprices, $hookmanager; |
1137 | 1137 | |
1138 | - if(is_array($parameters)) $i = & $parameters['i']; |
|
1139 | - else $i = (int)$parameters; |
|
1138 | + if (is_array($parameters)) $i = & $parameters['i']; |
|
1139 | + else $i = (int) $parameters; |
|
1140 | 1140 | |
1141 | - if($this->isModSubtotalLine($parameters,$object) ){ |
|
1141 | + if ($this->isModSubtotalLine($parameters, $object)) { |
|
1142 | 1142 | |
1143 | 1143 | $this->resprints = ' '; |
1144 | 1144 | |
1145 | - if((float)DOL_VERSION<=3.6) { |
|
1145 | + if ((float) DOL_VERSION <= 3.6) { |
|
1146 | 1146 | return ''; |
1147 | 1147 | } |
1148 | - else if((float)DOL_VERSION>=3.8) { |
|
1148 | + else if ((float) DOL_VERSION >= 3.8) { |
|
1149 | 1149 | return 1; |
1150 | 1150 | } |
1151 | 1151 | |
@@ -1171,7 +1171,7 @@ discard block |
||
1171 | 1171 | } |
1172 | 1172 | } |
1173 | 1173 | } |
1174 | - if ((int)GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)){ |
|
1174 | + if ((int) GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)) { |
|
1175 | 1175 | $this->resprints = price($object->lines[$i]->total_ht); |
1176 | 1176 | } |
1177 | 1177 | |
@@ -1196,7 +1196,7 @@ discard block |
||
1196 | 1196 | { |
1197 | 1197 | // Check if a title exist for this line && if the title have subtotal |
1198 | 1198 | $lineTitle = TSubtotal::getParentTitleOfLine($object, $i); |
1199 | - if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true)) |
|
1199 | + if (TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true)) |
|
1200 | 1200 | { |
1201 | 1201 | |
1202 | 1202 | $this->resprints = ' '; |
@@ -1216,7 +1216,7 @@ discard block |
||
1216 | 1216 | */ |
1217 | 1217 | private function callHook(&$object, &$hookmanager, $action, $params, $defaultReturn = 1) |
1218 | 1218 | { |
1219 | - $reshook=$hookmanager->executeHooks('subtotalHidePrices',$params, $object, $action); |
|
1219 | + $reshook = $hookmanager->executeHooks('subtotalHidePrices', $params, $object, $action); |
|
1220 | 1220 | if ($reshook < 0) |
1221 | 1221 | { |
1222 | 1222 | $this->error = $hookmanager->error; |
@@ -1232,7 +1232,7 @@ discard block |
||
1232 | 1232 | $this->resprints = $hookmanager->resprints; |
1233 | 1233 | |
1234 | 1234 | // override return (use $this->results['overrideReturn'] or $this->resArray['overrideReturn'] in other module action_xxxx.class.php ) |
1235 | - if(isset($hookmanager->resArray['overrideReturn'])) |
|
1235 | + if (isset($hookmanager->resArray['overrideReturn'])) |
|
1236 | 1236 | { |
1237 | 1237 | return $hookmanager->resArray['overrideReturn']; |
1238 | 1238 | } |
@@ -1241,25 +1241,25 @@ discard block |
||
1241 | 1241 | return $defaultReturn; |
1242 | 1242 | } |
1243 | 1243 | |
1244 | - function pdf_getlinetotalwithtax($parameters=array(), &$object, &$action='') { |
|
1244 | + function pdf_getlinetotalwithtax($parameters = array(), &$object, &$action = '') { |
|
1245 | 1245 | global $conf; |
1246 | 1246 | |
1247 | - if($this->isModSubtotalLine($parameters,$object) ){ |
|
1247 | + if ($this->isModSubtotalLine($parameters, $object)) { |
|
1248 | 1248 | |
1249 | 1249 | $this->resprints = ' '; |
1250 | 1250 | |
1251 | - if((float)DOL_VERSION<=3.6) { |
|
1251 | + if ((float) DOL_VERSION <= 3.6) { |
|
1252 | 1252 | return ''; |
1253 | 1253 | } |
1254 | - else if((float)DOL_VERSION>=3.8) { |
|
1254 | + else if ((float) DOL_VERSION >= 3.8) { |
|
1255 | 1255 | return 1; |
1256 | 1256 | } |
1257 | 1257 | } |
1258 | 1258 | |
1259 | - if(is_array($parameters)) $i = & $parameters['i']; |
|
1260 | - else $i = (int)$parameters; |
|
1259 | + if (is_array($parameters)) $i = & $parameters['i']; |
|
1260 | + else $i = (int) $parameters; |
|
1261 | 1261 | |
1262 | - if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) ) |
|
1262 | + if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))) |
|
1263 | 1263 | { |
1264 | 1264 | if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC))) |
1265 | 1265 | { |
@@ -1271,24 +1271,24 @@ discard block |
||
1271 | 1271 | return 0; |
1272 | 1272 | } |
1273 | 1273 | |
1274 | - function pdf_getlineunit($parameters=array(), &$object, &$action='') { |
|
1274 | + function pdf_getlineunit($parameters = array(), &$object, &$action = '') { |
|
1275 | 1275 | global $conf; |
1276 | 1276 | |
1277 | - if($this->isModSubtotalLine($parameters,$object) ){ |
|
1277 | + if ($this->isModSubtotalLine($parameters, $object)) { |
|
1278 | 1278 | $this->resprints = ' '; |
1279 | 1279 | |
1280 | - if((float)DOL_VERSION<=3.6) { |
|
1280 | + if ((float) DOL_VERSION <= 3.6) { |
|
1281 | 1281 | return ''; |
1282 | 1282 | } |
1283 | - else if((float)DOL_VERSION>=3.8) { |
|
1283 | + else if ((float) DOL_VERSION >= 3.8) { |
|
1284 | 1284 | return 1; |
1285 | 1285 | } |
1286 | 1286 | } |
1287 | 1287 | |
1288 | - if(is_array($parameters)) $i = & $parameters['i']; |
|
1289 | - else $i = (int)$parameters; |
|
1288 | + if (is_array($parameters)) $i = & $parameters['i']; |
|
1289 | + else $i = (int) $parameters; |
|
1290 | 1290 | |
1291 | - if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) ) |
|
1291 | + if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))) |
|
1292 | 1292 | { |
1293 | 1293 | if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC))) |
1294 | 1294 | { |
@@ -1300,32 +1300,32 @@ discard block |
||
1300 | 1300 | return 0; |
1301 | 1301 | } |
1302 | 1302 | |
1303 | - function pdf_getlineupexcltax($parameters=array(), &$object, &$action='') { |
|
1304 | - global $conf,$hideprices,$hookmanager; |
|
1303 | + function pdf_getlineupexcltax($parameters = array(), &$object, &$action = '') { |
|
1304 | + global $conf, $hideprices, $hookmanager; |
|
1305 | 1305 | |
1306 | - if(is_array($parameters)) $i = & $parameters['i']; |
|
1307 | - else $i = (int)$parameters; |
|
1306 | + if (is_array($parameters)) $i = & $parameters['i']; |
|
1307 | + else $i = (int) $parameters; |
|
1308 | 1308 | |
1309 | - if($this->isModSubtotalLine($parameters,$object) ) { |
|
1309 | + if ($this->isModSubtotalLine($parameters, $object)) { |
|
1310 | 1310 | $this->resprints = ' '; |
1311 | 1311 | |
1312 | 1312 | $line = $object->lines[$i]; |
1313 | 1313 | |
1314 | 1314 | // On récupère les montants du bloc pour les afficher dans la ligne de sous-total |
1315 | - if(TSubtotal::isSubtotal($line)) { |
|
1315 | + if (TSubtotal::isSubtotal($line)) { |
|
1316 | 1316 | $parentTitle = TSubtotal::getParentTitleOfLine($object, $i); |
1317 | 1317 | |
1318 | - if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals(); |
|
1319 | - if(! empty($parentTitle->array_options['options_show_total_ht'])) { |
|
1318 | + if (is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals(); |
|
1319 | + if (!empty($parentTitle->array_options['options_show_total_ht'])) { |
|
1320 | 1320 | $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle); |
1321 | 1321 | $this->resprints = price($TTotal['total_subprice']); |
1322 | 1322 | } |
1323 | 1323 | } |
1324 | 1324 | |
1325 | - if((float)DOL_VERSION<=3.6) { |
|
1325 | + if ((float) DOL_VERSION <= 3.6) { |
|
1326 | 1326 | return ''; |
1327 | 1327 | } |
1328 | - else if((float)DOL_VERSION>=3.8) { |
|
1328 | + else if ((float) DOL_VERSION >= 3.8) { |
|
1329 | 1329 | return 1; |
1330 | 1330 | } |
1331 | 1331 | } |
@@ -1353,7 +1353,7 @@ discard block |
||
1353 | 1353 | |
1354 | 1354 | // Check if a title exist for this line && if the title have subtotal |
1355 | 1355 | $lineTitle = TSubtotal::getParentTitleOfLine($object, $i); |
1356 | - if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true)) |
|
1356 | + if (TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true)) |
|
1357 | 1357 | { |
1358 | 1358 | |
1359 | 1359 | $this->resprints = ' '; |
@@ -1367,37 +1367,37 @@ discard block |
||
1367 | 1367 | return 0; |
1368 | 1368 | } |
1369 | 1369 | |
1370 | - function pdf_getlineremisepercent($parameters=array(), &$object, &$action='') { |
|
1371 | - global $conf,$hideprices,$hookmanager; |
|
1370 | + function pdf_getlineremisepercent($parameters = array(), &$object, &$action = '') { |
|
1371 | + global $conf, $hideprices, $hookmanager; |
|
1372 | 1372 | |
1373 | - if(is_array($parameters)) $i = & $parameters['i']; |
|
1373 | + if (is_array($parameters)) $i = & $parameters['i']; |
|
1374 | 1374 | else $i = (int) $parameters; |
1375 | 1375 | |
1376 | - if($this->isModSubtotalLine($parameters,$object) ) { |
|
1376 | + if ($this->isModSubtotalLine($parameters, $object)) { |
|
1377 | 1377 | $this->resprints = ' '; |
1378 | 1378 | |
1379 | 1379 | $line = $object->lines[$i]; |
1380 | 1380 | |
1381 | 1381 | // Affichage de la remise |
1382 | - if(TSubtotal::isSubtotal($line)) { |
|
1382 | + if (TSubtotal::isSubtotal($line)) { |
|
1383 | 1383 | $parentTitle = TSubtotal::getParentTitleOfLine($object, $i); |
1384 | 1384 | |
1385 | - if(empty($parentTitle->array_options)) $parentTitle->fetch_optionals(); |
|
1386 | - if(! empty($parentTitle->array_options['options_show_reduc'])) { |
|
1385 | + if (empty($parentTitle->array_options)) $parentTitle->fetch_optionals(); |
|
1386 | + if (!empty($parentTitle->array_options['options_show_reduc'])) { |
|
1387 | 1387 | $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle); |
1388 | - $this->resprints = price((1-$TTotal['total_ht'] / $TTotal['total_subprice'])*100, 0, '', 1, 2, 2).'%'; |
|
1388 | + $this->resprints = price((1 - $TTotal['total_ht'] / $TTotal['total_subprice']) * 100, 0, '', 1, 2, 2).'%'; |
|
1389 | 1389 | } |
1390 | 1390 | } |
1391 | 1391 | |
1392 | - if((float)DOL_VERSION<=3.6) { |
|
1392 | + if ((float) DOL_VERSION <= 3.6) { |
|
1393 | 1393 | return ''; |
1394 | 1394 | } |
1395 | - else if((float)DOL_VERSION>=3.8) { |
|
1395 | + else if ((float) DOL_VERSION >= 3.8) { |
|
1396 | 1396 | return 1; |
1397 | 1397 | } |
1398 | 1398 | } |
1399 | 1399 | elseif (!empty($hideprices) |
1400 | - || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) ) |
|
1400 | + || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))) |
|
1401 | 1401 | ) |
1402 | 1402 | { |
1403 | 1403 | if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC))) |
@@ -1410,24 +1410,24 @@ discard block |
||
1410 | 1410 | return 0; |
1411 | 1411 | } |
1412 | 1412 | |
1413 | - function pdf_getlineupwithtax($parameters=array(), &$object, &$action='') { |
|
1414 | - global $conf,$hideprices; |
|
1413 | + function pdf_getlineupwithtax($parameters = array(), &$object, &$action = '') { |
|
1414 | + global $conf, $hideprices; |
|
1415 | 1415 | |
1416 | - if($this->isModSubtotalLine($parameters,$object) ){ |
|
1416 | + if ($this->isModSubtotalLine($parameters, $object)) { |
|
1417 | 1417 | $this->resprints = ' '; |
1418 | - if((float)DOL_VERSION<=3.6) { |
|
1418 | + if ((float) DOL_VERSION <= 3.6) { |
|
1419 | 1419 | return ''; |
1420 | 1420 | } |
1421 | - else if((float)DOL_VERSION>=3.8) { |
|
1421 | + else if ((float) DOL_VERSION >= 3.8) { |
|
1422 | 1422 | return 1; |
1423 | 1423 | } |
1424 | 1424 | } |
1425 | 1425 | |
1426 | - if(is_array($parameters)) $i = & $parameters['i']; |
|
1427 | - else $i = (int)$parameters; |
|
1426 | + if (is_array($parameters)) $i = & $parameters['i']; |
|
1427 | + else $i = (int) $parameters; |
|
1428 | 1428 | |
1429 | 1429 | if (!empty($hideprices) |
1430 | - || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) ) |
|
1430 | + || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))) |
|
1431 | 1431 | ) |
1432 | 1432 | { |
1433 | 1433 | if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC))) |
@@ -1440,22 +1440,22 @@ discard block |
||
1440 | 1440 | return 0; |
1441 | 1441 | } |
1442 | 1442 | |
1443 | - function pdf_getlinevatrate($parameters=array(), &$object, &$action='') { |
|
1444 | - global $conf,$hideprices,$hookmanager; |
|
1443 | + function pdf_getlinevatrate($parameters = array(), &$object, &$action = '') { |
|
1444 | + global $conf, $hideprices, $hookmanager; |
|
1445 | 1445 | |
1446 | - if($this->isModSubtotalLine($parameters,$object) ){ |
|
1446 | + if ($this->isModSubtotalLine($parameters, $object)) { |
|
1447 | 1447 | $this->resprints = ' '; |
1448 | 1448 | |
1449 | - if((float)DOL_VERSION<=3.6) { |
|
1449 | + if ((float) DOL_VERSION <= 3.6) { |
|
1450 | 1450 | return ''; |
1451 | 1451 | } |
1452 | - else if((float)DOL_VERSION>=3.8) { |
|
1452 | + else if ((float) DOL_VERSION >= 3.8) { |
|
1453 | 1453 | return 1; |
1454 | 1454 | } |
1455 | 1455 | } |
1456 | 1456 | |
1457 | - if(is_array($parameters)) $i = & $parameters['i']; |
|
1458 | - else $i = (int)$parameters; |
|
1457 | + if (is_array($parameters)) $i = & $parameters['i']; |
|
1458 | + else $i = (int) $parameters; |
|
1459 | 1459 | |
1460 | 1460 | if (empty($object->lines[$i])) return 0; // hideInnerLines => override $object->lines et Dolibarr ne nous permet pas de mettre à jour la variable qui conditionne la boucle sur les lignes (PR faite pour 6.0) |
1461 | 1461 | |
@@ -1482,7 +1482,7 @@ discard block |
||
1482 | 1482 | |
1483 | 1483 | // Check if a title exist for this line && if the title have subtotal |
1484 | 1484 | $lineTitle = TSubtotal::getParentTitleOfLine($object, $i); |
1485 | - if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true)) |
|
1485 | + if (TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true)) |
|
1486 | 1486 | { |
1487 | 1487 | |
1488 | 1488 | $this->resprints = ' '; |
@@ -1496,23 +1496,23 @@ discard block |
||
1496 | 1496 | return 0; |
1497 | 1497 | } |
1498 | 1498 | |
1499 | - function pdf_getlineprogress($parameters=array(), &$object, &$action) { |
|
1499 | + function pdf_getlineprogress($parameters = array(), &$object, &$action) { |
|
1500 | 1500 | global $conf; |
1501 | 1501 | |
1502 | - if($this->isModSubtotalLine($parameters,$object) ){ |
|
1502 | + if ($this->isModSubtotalLine($parameters, $object)) { |
|
1503 | 1503 | $this->resprints = ' '; |
1504 | - if((float)DOL_VERSION<=3.6) { |
|
1504 | + if ((float) DOL_VERSION <= 3.6) { |
|
1505 | 1505 | return ''; |
1506 | 1506 | } |
1507 | - else if((float)DOL_VERSION>=3.8) { |
|
1507 | + else if ((float) DOL_VERSION >= 3.8) { |
|
1508 | 1508 | return 1; |
1509 | 1509 | } |
1510 | 1510 | } |
1511 | 1511 | |
1512 | - if(is_array($parameters)) $i = & $parameters['i']; |
|
1513 | - else $i = (int)$parameters; |
|
1512 | + if (is_array($parameters)) $i = & $parameters['i']; |
|
1513 | + else $i = (int) $parameters; |
|
1514 | 1514 | |
1515 | - if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) ) |
|
1515 | + if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))) |
|
1516 | 1516 | { |
1517 | 1517 | if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC))) |
1518 | 1518 | { |
@@ -1527,12 +1527,12 @@ discard block |
||
1527 | 1527 | function add_numerotation(&$object) { |
1528 | 1528 | global $conf; |
1529 | 1529 | |
1530 | - if(!empty($conf->global->SUBTOTAL_USE_NUMEROTATION)) { |
|
1530 | + if (!empty($conf->global->SUBTOTAL_USE_NUMEROTATION)) { |
|
1531 | 1531 | |
1532 | 1532 | $TLevelTitre = array(); |
1533 | 1533 | $prevlevel = 0; |
1534 | 1534 | |
1535 | - foreach($object->lines as $k=>&$line) |
|
1535 | + foreach ($object->lines as $k=>&$line) |
|
1536 | 1536 | { |
1537 | 1537 | if ($line->id > 0 && $this->isModSubtotalLine($k, $object) && $line->qty <= 10) |
1538 | 1538 | { |
@@ -1546,12 +1546,12 @@ discard block |
||
1546 | 1546 | } |
1547 | 1547 | |
1548 | 1548 | // TODO ne gère pas encore la numération des lignes "Totaux" |
1549 | - private function formatNumerotation(&$TLineTitle, $line_reference='', $level=1, $prefix_num=0) |
|
1549 | + private function formatNumerotation(&$TLineTitle, $line_reference = '', $level = 1, $prefix_num = 0) |
|
1550 | 1550 | { |
1551 | 1551 | $TTitle = array(); |
1552 | 1552 | |
1553 | - $i=1; |
|
1554 | - $j=0; |
|
1553 | + $i = 1; |
|
1554 | + $j = 0; |
|
1555 | 1555 | foreach ($TLineTitle as $k => &$line) |
1556 | 1556 | { |
1557 | 1557 | if (!empty($line_reference) && $line->rang <= $line_reference->rang) continue; |
@@ -1561,7 +1561,7 @@ discard block |
||
1561 | 1561 | { |
1562 | 1562 | $TTitle[$j]['numerotation'] = ($prefix_num == 0) ? $i : $prefix_num.'.'.$i; |
1563 | 1563 | //var_dump('Prefix == '.$prefix_num.' // '.$line->desc.' ==> numerotation == '.$TTitle[$j]['numerotation'].' ### '.$line->qty .'=='. $level); |
1564 | - if (empty($line->label) && (float)DOL_VERSION < 6) |
|
1564 | + if (empty($line->label) && (float) DOL_VERSION < 6) |
|
1565 | 1565 | { |
1566 | 1566 | $line->label = !empty($line->desc) ? $line->desc : $line->description; |
1567 | 1567 | $line->desc = $line->description = ''; |
@@ -1587,26 +1587,26 @@ discard block |
||
1587 | 1587 | |
1588 | 1588 | function setDocTVA(&$pdf, &$object) { |
1589 | 1589 | |
1590 | - $hidedetails = (int)GETPOST('hidedetails'); |
|
1590 | + $hidedetails = (int) GETPOST('hidedetails'); |
|
1591 | 1591 | |
1592 | - if(empty($hidedetails)) return false; |
|
1592 | + if (empty($hidedetails)) return false; |
|
1593 | 1593 | |
1594 | 1594 | // TODO can't add VAT to document without lines... :-/ |
1595 | 1595 | |
1596 | 1596 | return true; |
1597 | 1597 | } |
1598 | 1598 | |
1599 | - function beforePDFCreation($parameters=array(), &$object, &$action) |
|
1599 | + function beforePDFCreation($parameters = array(), &$object, &$action) |
|
1600 | 1600 | { |
1601 | 1601 | /** |
1602 | 1602 | * @var $pdf TCPDF |
1603 | 1603 | */ |
1604 | - global $pdf,$conf, $langs; |
|
1604 | + global $pdf, $conf, $langs; |
|
1605 | 1605 | |
1606 | 1606 | // var_dump($object->lines); |
1607 | 1607 | dol_include_once('/subtotal/class/subtotal.class.php'); |
1608 | 1608 | |
1609 | - foreach($parameters as $key=>$value) { |
|
1609 | + foreach ($parameters as $key=>$value) { |
|
1610 | 1610 | ${$key} = $value; |
1611 | 1611 | } |
1612 | 1612 | |
@@ -1614,35 +1614,35 @@ discard block |
||
1614 | 1614 | |
1615 | 1615 | $this->add_numerotation($object); |
1616 | 1616 | |
1617 | - foreach($object->lines as $k => &$l) { |
|
1618 | - if(TSubtotal::isSubtotal($l)) { |
|
1617 | + foreach ($object->lines as $k => &$l) { |
|
1618 | + if (TSubtotal::isSubtotal($l)) { |
|
1619 | 1619 | $parentTitle = TSubtotal::getParentTitleOfLine($object, $k); |
1620 | - if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals(); |
|
1621 | - if(! empty($parentTitle->id) && ! empty($parentTitle->array_options['options_show_total_ht'])) { |
|
1622 | - $l->remise_percent = 100; // Affichage de la réduction sur la ligne de sous-total |
|
1620 | + if (is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals(); |
|
1621 | + if (!empty($parentTitle->id) && !empty($parentTitle->array_options['options_show_total_ht'])) { |
|
1622 | + $l->remise_percent = 100; // Affichage de la réduction sur la ligne de sous-total |
|
1623 | 1623 | } |
1624 | 1624 | } |
1625 | 1625 | } |
1626 | 1626 | |
1627 | - $hideInnerLines = (int)GETPOST('hideInnerLines'); |
|
1628 | - $hidedetails = (int)GETPOST('hidedetails'); |
|
1627 | + $hideInnerLines = (int) GETPOST('hideInnerLines'); |
|
1628 | + $hidedetails = (int) GETPOST('hidedetails'); |
|
1629 | 1629 | |
1630 | 1630 | if ($hideInnerLines) { // si c une ligne de titre |
1631 | - $fk_parent_line=0; |
|
1632 | - $TLines =array(); |
|
1631 | + $fk_parent_line = 0; |
|
1632 | + $TLines = array(); |
|
1633 | 1633 | |
1634 | - $original_count=count($object->lines); |
|
1634 | + $original_count = count($object->lines); |
|
1635 | 1635 | $TTvas = array(); // tableau de tva |
1636 | 1636 | |
1637 | - foreach($object->lines as $k=>&$line) |
|
1637 | + foreach ($object->lines as $k=>&$line) |
|
1638 | 1638 | { |
1639 | 1639 | |
1640 | - if($line->product_type==9 && $line->rowid>0) |
|
1640 | + if ($line->product_type == 9 && $line->rowid > 0) |
|
1641 | 1641 | { |
1642 | 1642 | $fk_parent_line = $line->rowid; |
1643 | 1643 | |
1644 | 1644 | // Fix tk7201 - si on cache le détail, la TVA est renseigné au niveau du sous-total, l'erreur c'est s'il y a plusieurs sous-totaux pour les même lignes, ça va faire la somme |
1645 | - if(TSubtotal::isSubtotal($line)) |
|
1645 | + if (TSubtotal::isSubtotal($line)) |
|
1646 | 1646 | { |
1647 | 1647 | /*$total = $this->getTotalLineFromObject($object, $line, ''); |
1648 | 1648 | |
@@ -1671,22 +1671,22 @@ discard block |
||
1671 | 1671 | |
1672 | 1672 | if ($hideInnerLines) |
1673 | 1673 | { |
1674 | - if(!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)) |
|
1674 | + if (!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)) |
|
1675 | 1675 | { |
1676 | - if($line->tva_tx != '0.000' && $line->product_type!=9){ |
|
1676 | + if ($line->tva_tx != '0.000' && $line->product_type != 9) { |
|
1677 | 1677 | |
1678 | 1678 | // on remplit le tableau de tva pour substituer les lignes cachées |
1679 | 1679 | $TTvas[$line->tva_tx]['total_tva'] += $line->total_tva; |
1680 | 1680 | $TTvas[$line->tva_tx]['total_ht'] += $line->total_ht; |
1681 | 1681 | $TTvas[$line->tva_tx]['total_ttc'] += $line->total_ttc; |
1682 | 1682 | } |
1683 | - if($line->product_type==9 && $line->rowid>0) |
|
1683 | + if ($line->product_type == 9 && $line->rowid > 0) |
|
1684 | 1684 | { |
1685 | 1685 | //Cas où je doit cacher les produits et afficher uniquement les sous-totaux avec les titres |
1686 | 1686 | // génère des lignes d'affichage des montants HT soumis à tva |
1687 | 1687 | $nbtva = count($TTvas); |
1688 | - if(!empty($nbtva)){ |
|
1689 | - foreach ($TTvas as $tx =>$val){ |
|
1688 | + if (!empty($nbtva)) { |
|
1689 | + foreach ($TTvas as $tx =>$val) { |
|
1690 | 1690 | $l = clone $line; |
1691 | 1691 | $l->product_type = 1; |
1692 | 1692 | $l->special_code = ''; |
@@ -1707,7 +1707,7 @@ discard block |
||
1707 | 1707 | } |
1708 | 1708 | } else { |
1709 | 1709 | |
1710 | - if($line->product_type==9 && $line->rowid>0) |
|
1710 | + if ($line->product_type == 9 && $line->rowid > 0) |
|
1711 | 1711 | { |
1712 | 1712 | // ajoute la ligne de sous-total |
1713 | 1713 | $TLines[] = $line; |
@@ -1735,9 +1735,9 @@ discard block |
||
1735 | 1735 | |
1736 | 1736 | // cas incongru où il y aurait des produits en dessous du dernier sous-total |
1737 | 1737 | $nbtva = count($TTvas); |
1738 | - if(!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)) |
|
1738 | + if (!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)) |
|
1739 | 1739 | { |
1740 | - foreach ($TTvas as $tx =>$val){ |
|
1740 | + foreach ($TTvas as $tx =>$val) { |
|
1741 | 1741 | $l = clone $line; |
1742 | 1742 | $l->product_type = 1; |
1743 | 1743 | $l->special_code = ''; |
@@ -1754,11 +1754,11 @@ discard block |
||
1754 | 1754 | } |
1755 | 1755 | |
1756 | 1756 | global $nblignes; |
1757 | - $nblignes=count($TLines); |
|
1757 | + $nblignes = count($TLines); |
|
1758 | 1758 | |
1759 | 1759 | $object->lines = $TLines; |
1760 | 1760 | |
1761 | - if($i>count($object->lines)) { |
|
1761 | + if ($i > count($object->lines)) { |
|
1762 | 1762 | $this->resprints = ''; |
1763 | 1763 | return 0; |
1764 | 1764 | } |
@@ -1767,59 +1767,59 @@ discard block |
||
1767 | 1767 | return 0; |
1768 | 1768 | } |
1769 | 1769 | |
1770 | - function pdf_writelinedesc($parameters=array(), &$object, &$action) |
|
1770 | + function pdf_writelinedesc($parameters = array(), &$object, &$action) |
|
1771 | 1771 | { |
1772 | 1772 | /** |
1773 | 1773 | * @var $pdf TCPDF |
1774 | 1774 | */ |
1775 | - global $pdf,$conf; |
|
1775 | + global $pdf, $conf; |
|
1776 | 1776 | |
1777 | - foreach($parameters as $key=>$value) { |
|
1777 | + foreach ($parameters as $key=>$value) { |
|
1778 | 1778 | ${$key} = $value; |
1779 | 1779 | } |
1780 | 1780 | |
1781 | - $hideInnerLines = (int)GETPOST('hideInnerLines'); |
|
1782 | - $hidedetails = (int)GETPOST('hidedetails'); |
|
1781 | + $hideInnerLines = (int) GETPOST('hideInnerLines'); |
|
1782 | + $hidedetails = (int) GETPOST('hidedetails'); |
|
1783 | 1783 | |
1784 | - if($this->isModSubtotalLine($parameters,$object) ){ |
|
1784 | + if ($this->isModSubtotalLine($parameters, $object)) { |
|
1785 | 1785 | |
1786 | 1786 | global $hideprices; |
1787 | 1787 | |
1788 | - if(!empty($hideprices)) { |
|
1789 | - foreach($object->lines as &$line) { |
|
1790 | - if($line->fk_product_type!=9) $line->fk_parent_line = -1; |
|
1788 | + if (!empty($hideprices)) { |
|
1789 | + foreach ($object->lines as &$line) { |
|
1790 | + if ($line->fk_product_type != 9) $line->fk_parent_line = -1; |
|
1791 | 1791 | } |
1792 | 1792 | } |
1793 | 1793 | |
1794 | 1794 | $line = &$object->lines[$i]; |
1795 | 1795 | |
1796 | - if($line->info_bits>0) { // PAGE BREAK |
|
1796 | + if ($line->info_bits > 0) { // PAGE BREAK |
|
1797 | 1797 | $pdf->addPage(); |
1798 | 1798 | $posy = $pdf->GetY(); |
1799 | 1799 | } |
1800 | 1800 | |
1801 | 1801 | $label = $line->label; |
1802 | - $description= !empty($line->desc) ? $outputlangs->convToOutputCharset($line->desc) : $outputlangs->convToOutputCharset($line->description); |
|
1802 | + $description = !empty($line->desc) ? $outputlangs->convToOutputCharset($line->desc) : $outputlangs->convToOutputCharset($line->description); |
|
1803 | 1803 | |
1804 | - if(empty($label)) { |
|
1804 | + if (empty($label)) { |
|
1805 | 1805 | $label = $description; |
1806 | - $description=''; |
|
1806 | + $description = ''; |
|
1807 | 1807 | } |
1808 | 1808 | |
1809 | - if($line->qty>90) { |
|
1809 | + if ($line->qty > 90) { |
|
1810 | 1810 | |
1811 | 1811 | if ($conf->global->SUBTOTAL_USE_NEW_FORMAT) $label .= ' '.$this->getTitle($object, $line); |
1812 | 1812 | |
1813 | 1813 | $pageBefore = $pdf->getPage(); |
1814 | - $this->pdf_add_total($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h); |
|
1814 | + $this->pdf_add_total($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h); |
|
1815 | 1815 | $pageAfter = $pdf->getPage(); |
1816 | 1816 | |
1817 | - if($pageAfter>$pageBefore) { |
|
1817 | + if ($pageAfter > $pageBefore) { |
|
1818 | 1818 | //print "ST $pageAfter>$pageBefore<br>"; |
1819 | 1819 | $pdf->rollbackTransaction(true); |
1820 | - $pdf->addPage('','', true); |
|
1820 | + $pdf->addPage('', '', true); |
|
1821 | 1821 | $posy = $pdf->GetY(); |
1822 | - $this->pdf_add_total($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h); |
|
1822 | + $this->pdf_add_total($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h); |
|
1823 | 1823 | $posy = $pdf->GetY(); |
1824 | 1824 | //print 'add ST'.$pdf->getPage().'<br />'; |
1825 | 1825 | } |
@@ -1830,7 +1830,7 @@ discard block |
||
1830 | 1830 | else if ($line->qty < 10) { |
1831 | 1831 | $pageBefore = $pdf->getPage(); |
1832 | 1832 | |
1833 | - $this->pdf_add_title($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h); |
|
1833 | + $this->pdf_add_title($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h); |
|
1834 | 1834 | $pageAfter = $pdf->getPage(); |
1835 | 1835 | |
1836 | 1836 | |
@@ -1905,9 +1905,9 @@ discard block |
||
1905 | 1905 | * @param $hookmanager HookManager |
1906 | 1906 | * @return int |
1907 | 1907 | */ |
1908 | - function printObjectLine ($parameters, &$object, &$action, $hookmanager){ |
|
1908 | + function printObjectLine($parameters, &$object, &$action, $hookmanager) { |
|
1909 | 1909 | |
1910 | - global $conf,$langs,$user,$db,$bc; |
|
1910 | + global $conf, $langs, $user, $db, $bc; |
|
1911 | 1911 | |
1912 | 1912 | $num = &$parameters['num']; |
1913 | 1913 | $line = &$parameters['line']; |
@@ -1915,32 +1915,32 @@ discard block |
||
1915 | 1915 | |
1916 | 1916 | $var = &$parameters['var']; |
1917 | 1917 | |
1918 | - $contexts = explode(':',$parameters['context']); |
|
1918 | + $contexts = explode(':', $parameters['context']); |
|
1919 | 1919 | |
1920 | 1920 | $createRight = $user->rights->{$object->element}->creer; |
1921 | - if($object->element == 'facturerec' ) |
|
1921 | + if ($object->element == 'facturerec') |
|
1922 | 1922 | { |
1923 | 1923 | $object->statut = 0; // hack for facture rec |
1924 | 1924 | $createRight = $user->rights->facture->creer; |
1925 | 1925 | } |
1926 | - elseif($object->element == 'order_supplier' ) |
|
1926 | + elseif ($object->element == 'order_supplier') |
|
1927 | 1927 | { |
1928 | 1928 | $createRight = $user->rights->fournisseur->commande->creer; |
1929 | 1929 | } |
1930 | - elseif($object->element == 'invoice_supplier' ) |
|
1930 | + elseif ($object->element == 'invoice_supplier') |
|
1931 | 1931 | { |
1932 | 1932 | $createRight = $user->rights->fournisseur->facture->creer; |
1933 | 1933 | } |
1934 | 1934 | |
1935 | - if($line->special_code!=$this->module_number || $line->product_type!=9) { |
|
1935 | + if ($line->special_code != $this->module_number || $line->product_type != 9) { |
|
1936 | 1936 | null; |
1937 | 1937 | } |
1938 | - else if (in_array('invoicecard',$contexts) || in_array('invoicesuppliercard',$contexts) || in_array('propalcard',$contexts) || in_array('supplier_proposalcard',$contexts) || in_array('ordercard',$contexts) || in_array('ordersuppliercard',$contexts) || in_array('invoicereccard',$contexts)) |
|
1938 | + else if (in_array('invoicecard', $contexts) || in_array('invoicesuppliercard', $contexts) || in_array('propalcard', $contexts) || in_array('supplier_proposalcard', $contexts) || in_array('ordercard', $contexts) || in_array('ordersuppliercard', $contexts) || in_array('invoicereccard', $contexts)) |
|
1939 | 1939 | { |
1940 | - if($object->element=='facture')$idvar = 'facid'; |
|
1941 | - else $idvar='id'; |
|
1940 | + if ($object->element == 'facture')$idvar = 'facid'; |
|
1941 | + else $idvar = 'id'; |
|
1942 | 1942 | |
1943 | - if((float)DOL_VERSION <= 3.4) |
|
1943 | + if ((float) DOL_VERSION <= 3.4) |
|
1944 | 1944 | { |
1945 | 1945 | ?> |
1946 | 1946 | <script type="text/javascript"> |
@@ -1964,22 +1964,22 @@ discard block |
||
1964 | 1964 | <?php |
1965 | 1965 | } |
1966 | 1966 | |
1967 | - if(empty($line->description)) $line->description = $line->desc; |
|
1967 | + if (empty($line->description)) $line->description = $line->desc; |
|
1968 | 1968 | |
1969 | 1969 | $colspan = 5; |
1970 | - if($object->element == 'facturerec' ) $colspan = 3; |
|
1971 | - if($object->element == 'order_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 3 : $colspan = 6; |
|
1972 | - if($object->element == 'invoice_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 4: $colspan = 7; |
|
1973 | - if($object->element == 'supplier_proposal') (float) DOL_VERSION < 6.0 ? $colspan = 4 : $colspan = 3; |
|
1974 | - if(!empty($conf->multicurrency->enabled) && ((float) DOL_VERSION < 8.0 || $object->multicurrency_code != $conf->currency)) { |
|
1970 | + if ($object->element == 'facturerec') $colspan = 3; |
|
1971 | + if ($object->element == 'order_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 3 : $colspan = 6; |
|
1972 | + if ($object->element == 'invoice_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 4 : $colspan = 7; |
|
1973 | + if ($object->element == 'supplier_proposal') (float) DOL_VERSION < 6.0 ? $colspan = 4 : $colspan = 3; |
|
1974 | + if (!empty($conf->multicurrency->enabled) && ((float) DOL_VERSION < 8.0 || $object->multicurrency_code != $conf->currency)) { |
|
1975 | 1975 | $colspan++; // Colonne PU Devise |
1976 | 1976 | } |
1977 | - if($object->element == 'commande' && $object->statut < 3 && !empty($conf->shippableorder->enabled)) $colspan++; |
|
1978 | - if(!empty($conf->margin->enabled)) $colspan++; |
|
1979 | - if(!empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++; |
|
1980 | - if(!empty($conf->global->DISPLAY_MARK_RATES)) $colspan++; |
|
1981 | - if($object->element == 'facture' && !empty($conf->global->INVOICE_USE_SITUATION) && $object->type == Facture::TYPE_SITUATION) $colspan++; |
|
1982 | - if(!empty($conf->global->PRODUCT_USE_UNITS)) $colspan++; |
|
1977 | + if ($object->element == 'commande' && $object->statut < 3 && !empty($conf->shippableorder->enabled)) $colspan++; |
|
1978 | + if (!empty($conf->margin->enabled)) $colspan++; |
|
1979 | + if (!empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++; |
|
1980 | + if (!empty($conf->global->DISPLAY_MARK_RATES)) $colspan++; |
|
1981 | + if ($object->element == 'facture' && !empty($conf->global->INVOICE_USE_SITUATION) && $object->type == Facture::TYPE_SITUATION) $colspan++; |
|
1982 | + if (!empty($conf->global->PRODUCT_USE_UNITS)) $colspan++; |
|
1983 | 1983 | |
1984 | 1984 | /* Titre */ |
1985 | 1985 | //var_dump($line); |
@@ -1989,39 +1989,39 @@ discard block |
||
1989 | 1989 | |
1990 | 1990 | |
1991 | 1991 | ?> |
1992 | - <tr <?php echo $bc[$var]; $var=!$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php |
|
1992 | + <tr <?php echo $bc[$var]; $var = !$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php |
|
1993 | 1993 | if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT)) |
1994 | 1994 | { |
1995 | - if($line->qty==99) print 'background:#adadcf'; |
|
1996 | - else if($line->qty==98) print 'background:#ddddff;'; |
|
1997 | - else if($line->qty<=97 && $line->qty>=91) print 'background:#eeeeff;'; |
|
1998 | - else if($line->qty==1) print 'background:#adadcf;'; |
|
1999 | - else if($line->qty==2) print 'background:#ddddff;'; |
|
2000 | - else if($line->qty==50) print ''; |
|
1995 | + if ($line->qty == 99) print 'background:#adadcf'; |
|
1996 | + else if ($line->qty == 98) print 'background:#ddddff;'; |
|
1997 | + else if ($line->qty <= 97 && $line->qty >= 91) print 'background:#eeeeff;'; |
|
1998 | + else if ($line->qty == 1) print 'background:#adadcf;'; |
|
1999 | + else if ($line->qty == 2) print 'background:#ddddff;'; |
|
2000 | + else if ($line->qty == 50) print ''; |
|
2001 | 2001 | else print 'background:#eeeeff;'; |
2002 | 2002 | |
2003 | 2003 | //A compléter si on veux plus de nuances de couleurs avec les niveau 4,5,6,7,8 et 9 |
2004 | 2004 | } |
2005 | 2005 | else |
2006 | 2006 | { |
2007 | - if($line->qty==99) print 'background:#ddffdd'; |
|
2008 | - else if($line->qty==98) print 'background:#ddddff;'; |
|
2009 | - else if($line->qty==2) print 'background:#eeeeff; '; |
|
2010 | - else if($line->qty==50) print ''; |
|
2011 | - else print 'background:#eeffee;' ; |
|
2007 | + if ($line->qty == 99) print 'background:#ddffdd'; |
|
2008 | + else if ($line->qty == 98) print 'background:#ddddff;'; |
|
2009 | + else if ($line->qty == 2) print 'background:#eeeeff; '; |
|
2010 | + else if ($line->qty == 50) print ''; |
|
2011 | + else print 'background:#eeffee;'; |
|
2012 | 2012 | } |
2013 | 2013 | |
2014 | 2014 | ?>;"> |
2015 | 2015 | |
2016 | - <?php if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?> |
|
2016 | + <?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?> |
|
2017 | 2017 | <td class="linecolnum"><?php echo $i + 1; ?></td> |
2018 | 2018 | <?php } ?> |
2019 | 2019 | |
2020 | - <td colspan="<?php echo $colspan; ?>" style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?> <?php echo ($line->qty>90)?'text-align:right':'' ?> "><?php |
|
2021 | - if($action=='editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line) ) { |
|
2020 | + <td colspan="<?php echo $colspan; ?>" style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?> <?php echo ($line->qty > 90) ? 'text-align:right' : '' ?> "><?php |
|
2021 | + if ($action == 'editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line)) { |
|
2022 | 2022 | |
2023 | - $params=array('line'=>$line); |
|
2024 | - $reshook=$hookmanager->executeHooks('formEditProductOptions',$params,$object,$action); |
|
2023 | + $params = array('line'=>$line); |
|
2024 | + $reshook = $hookmanager->executeHooks('formEditProductOptions', $params, $object, $action); |
|
2025 | 2025 | |
2026 | 2026 | echo '<div id="line_'.$line->id.'"></div>'; // Imitation Dolibarr |
2027 | 2027 | echo '<input type="hidden" value="'.$line->id.'" name="lineid">'; |
@@ -2029,7 +2029,7 @@ discard block |
||
2029 | 2029 | echo '<input id="product_id" type="hidden" value="'.$line->fk_product.'" name="type">'; |
2030 | 2030 | echo '<input id="special_code" type="hidden" value="'.$line->special_code.'" name="type">'; |
2031 | 2031 | |
2032 | - $isFreeText=false; |
|
2032 | + $isFreeText = false; |
|
2033 | 2033 | if (TSubtotal::isTitle($line)) |
2034 | 2034 | { |
2035 | 2035 | $qty_displayed = $line->qty; |
@@ -2051,13 +2051,13 @@ discard block |
||
2051 | 2051 | $line->description = ''; |
2052 | 2052 | } |
2053 | 2053 | $newlabel = $line->label; |
2054 | - if($line->label=='' && !$isFreeText) { |
|
2055 | - if(TSubtotal::isSubtotal($line)) { |
|
2054 | + if ($line->label == '' && !$isFreeText) { |
|
2055 | + if (TSubtotal::isSubtotal($line)) { |
|
2056 | 2056 | $newlabel = $line->description.' '.$this->getTitle($object, $line); |
2057 | - $line->description=''; |
|
2058 | - } elseif( (float)DOL_VERSION < 6 ) { |
|
2059 | - $newlabel= $line->description; |
|
2060 | - $line->description=''; |
|
2057 | + $line->description = ''; |
|
2058 | + } elseif ((float) DOL_VERSION < 6) { |
|
2059 | + $newlabel = $line->description; |
|
2060 | + $line->description = ''; |
|
2061 | 2061 | } |
2062 | 2062 | } |
2063 | 2063 | |
@@ -2066,10 +2066,10 @@ discard block |
||
2066 | 2066 | |
2067 | 2067 | if (!$isFreeText) echo '<input type="text" name="line-title" id-line="'.$line->id.'" value="'.$newlabel.'" size="80" '.$readonlyForSituation.'/> '; |
2068 | 2068 | |
2069 | - if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT) && (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)) ) |
|
2069 | + if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT) && (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line))) |
|
2070 | 2070 | { |
2071 | 2071 | $select = '<select name="subtotal_level">'; |
2072 | - for ($j=1; $j<10; $j++) |
|
2072 | + for ($j = 1; $j < 10; $j++) |
|
2073 | 2073 | { |
2074 | 2074 | if (!empty($readonlyForSituation)) { |
2075 | 2075 | if ($qty_displayed == $j) $select .= '<option selected="selected" value="'.$j.'">'.$langs->trans('Level').' '.$j.'</option>'; |
@@ -2083,7 +2083,7 @@ discard block |
||
2083 | 2083 | |
2084 | 2084 | echo '<div class="subtotal_underline" style="margin-left:24px; line-height: 25px;">'; |
2085 | 2085 | echo '<div>'; |
2086 | - echo '<input style="vertical-align:sub;" type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '') .' /> '; |
|
2086 | + echo '<input style="vertical-align:sub;" type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '').' /> '; |
|
2087 | 2087 | echo '<label for="subtotal-pagebreak">'.$langs->trans('AddBreakPageBefore').'</label>'; |
2088 | 2088 | echo '</div>'; |
2089 | 2089 | |
@@ -2104,21 +2104,21 @@ discard block |
||
2104 | 2104 | echo '</div>'; |
2105 | 2105 | } |
2106 | 2106 | echo '<div>'; |
2107 | - echo '<input style="vertical-align:sub;" type="checkbox" name="line-showTotalHT" id="subtotal-showTotalHT" value="9" '.(($line->array_options['options_show_total_ht'] > 0) ? 'checked="checked"' : '') .' /> '; |
|
2107 | + echo '<input style="vertical-align:sub;" type="checkbox" name="line-showTotalHT" id="subtotal-showTotalHT" value="9" '.(($line->array_options['options_show_total_ht'] > 0) ? 'checked="checked"' : '').' /> '; |
|
2108 | 2108 | echo '<label for="subtotal-showTotalHT">'.$langs->trans('ShowTotalHTOnSubtotalBlock').'</label>'; |
2109 | 2109 | echo '</div>'; |
2110 | 2110 | |
2111 | 2111 | echo '<div>'; |
2112 | - echo '<input style="vertical-align:sub;" type="checkbox" name="line-showReduc" id="subtotal-showReduc" value="1" '.(($line->array_options['options_show_reduc'] > 0) ? 'checked="checked"' : '') .' /> '; |
|
2112 | + echo '<input style="vertical-align:sub;" type="checkbox" name="line-showReduc" id="subtotal-showReduc" value="1" '.(($line->array_options['options_show_reduc'] > 0) ? 'checked="checked"' : '').' /> '; |
|
2113 | 2113 | echo '<label for="subtotal-showReduc">'.$langs->trans('ShowReducOnSubtotalBlock').'</label>'; |
2114 | 2114 | echo '</div>'; |
2115 | 2115 | } |
2116 | 2116 | else if ($isFreeText) echo TSubtotal::getFreeTextHtml($line, (bool) $readonlyForSituation); |
2117 | 2117 | echo '</div>'; |
2118 | 2118 | |
2119 | - if($line->qty<10) { |
|
2119 | + if ($line->qty < 10) { |
|
2120 | 2120 | // WYSIWYG editor |
2121 | - require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; |
|
2121 | + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; |
|
2122 | 2122 | $nbrows = ROWS_2; |
2123 | 2123 | $cked_enabled = (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0); |
2124 | 2124 | if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) { |
@@ -2138,25 +2138,25 @@ discard block |
||
2138 | 2138 | |
2139 | 2139 | if ($conf->global->SUBTOTAL_USE_NEW_FORMAT) |
2140 | 2140 | { |
2141 | - if(TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)) |
|
2141 | + if (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)) |
|
2142 | 2142 | { |
2143 | - echo str_repeat(' ', $line->qty-1); |
|
2143 | + echo str_repeat(' ', $line->qty - 1); |
|
2144 | 2144 | |
2145 | 2145 | if (TSubtotal::isTitle($line)) print img_picto('', 'subtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;">'.$line->qty.'</span> '; |
2146 | - else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100-$line->qty).'</span> '; |
|
2146 | + else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100 - $line->qty).'</span> '; |
|
2147 | 2147 | } |
2148 | 2148 | } |
2149 | 2149 | else |
2150 | 2150 | { |
2151 | - if($line->qty<=1) print img_picto('', 'subtotal@subtotal'); |
|
2152 | - else if($line->qty==2) print img_picto('', 'subsubtotal@subtotal').' '; |
|
2151 | + if ($line->qty <= 1) print img_picto('', 'subtotal@subtotal'); |
|
2152 | + else if ($line->qty == 2) print img_picto('', 'subsubtotal@subtotal').' '; |
|
2153 | 2153 | } |
2154 | 2154 | |
2155 | 2155 | |
2156 | 2156 | // Get display styles and apply them |
2157 | 2157 | $titleStyleItalic = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'I') === false ? '' : ' font-style: italic;'; |
2158 | - $titleStyleBold = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;'; |
|
2159 | - $titleStyleUnderline = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;'; |
|
2158 | + $titleStyleBold = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;'; |
|
2159 | + $titleStyleUnderline = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;'; |
|
2160 | 2160 | |
2161 | 2161 | if (empty($line->label)) { |
2162 | 2162 | if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) print $line->description.' '.$this->getTitle($object, $line); |
@@ -2164,16 +2164,16 @@ discard block |
||
2164 | 2164 | } |
2165 | 2165 | else { |
2166 | 2166 | |
2167 | - if (! empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) { |
|
2167 | + if (!empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) { |
|
2168 | 2168 | print '<span class="subtotal_label" style="'.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" >'.$line->label.'</span><br><div class="subtotal_desc">'.dol_htmlentitiesbr($line->description).'</div>'; |
2169 | 2169 | } |
2170 | - else{ |
|
2170 | + else { |
|
2171 | 2171 | print '<span class="subtotal_label classfortooltip '.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" title="'.$line->description.'">'.$line->label.'</span>'; |
2172 | 2172 | } |
2173 | 2173 | |
2174 | 2174 | } |
2175 | - if($line->qty>90) print ' : '; |
|
2176 | - if($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal'); |
|
2175 | + if ($line->qty > 90) print ' : '; |
|
2176 | + if ($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal'); |
|
2177 | 2177 | |
2178 | 2178 | |
2179 | 2179 | |
@@ -2182,7 +2182,7 @@ discard block |
||
2182 | 2182 | ?></td> |
2183 | 2183 | |
2184 | 2184 | <?php |
2185 | - if($line->qty>90) { |
|
2185 | + if ($line->qty > 90) { |
|
2186 | 2186 | /* Total */ |
2187 | 2187 | $total_line = $this->getTotalLineFromObject($object, $line, ''); |
2188 | 2188 | echo '<td class="linecolht nowrap" align="right" style="font-weight:bold;" rel="subtotal_total">'.price($total_line).'</td>'; |
@@ -2201,7 +2201,7 @@ discard block |
||
2201 | 2201 | <?php |
2202 | 2202 | if ($action != 'selectlines') { |
2203 | 2203 | |
2204 | - if($action=='editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line) ) { |
|
2204 | + if ($action == 'editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line)) { |
|
2205 | 2205 | ?> |
2206 | 2206 | <input id="savelinebutton" class="button" type="submit" name="save" value="<?php echo $langs->trans('Save') ?>" /> |
2207 | 2207 | <br /> |
@@ -2217,13 +2217,13 @@ discard block |
||
2217 | 2217 | <?php |
2218 | 2218 | |
2219 | 2219 | } |
2220 | - else{ |
|
2221 | - if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK) && $object->element !== 'invoice_supplier') |
|
2220 | + else { |
|
2221 | + if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK) && $object->element !== 'invoice_supplier') |
|
2222 | 2222 | { |
2223 | - if(TSubtotal::isTitle($line) && ( $line->fk_prev_id === null )) echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=duplicate&lineid='.$line->id.'">'. img_picto($langs->trans('Duplicate'), 'duplicate@subtotal').'</a>'; |
|
2223 | + if (TSubtotal::isTitle($line) && ($line->fk_prev_id === null)) echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=duplicate&lineid='.$line->id.'">'.img_picto($langs->trans('Duplicate'), 'duplicate@subtotal').'</a>'; |
|
2224 | 2224 | } |
2225 | 2225 | |
2226 | - if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_EDIT_BLOCK)) |
|
2226 | + if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_EDIT_BLOCK)) |
|
2227 | 2227 | { |
2228 | 2228 | echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=editline&lineid='.$line->id.'">'.img_edit().'</a>'; |
2229 | 2229 | } |
@@ -2238,7 +2238,7 @@ discard block |
||
2238 | 2238 | <?php |
2239 | 2239 | |
2240 | 2240 | if ($action != 'editline' && $action != 'selectlines') { |
2241 | - if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK)) |
|
2241 | + if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK)) |
|
2242 | 2242 | { |
2243 | 2243 | |
2244 | 2244 | if ($line->fk_prev_id === null) |
@@ -2246,12 +2246,12 @@ discard block |
||
2246 | 2246 | echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=ask_deleteline&lineid='.$line->id.'">'.img_delete().'</a>'; |
2247 | 2247 | } |
2248 | 2248 | |
2249 | - if(TSubtotal::isTitle($line) && ($line->fk_prev_id === null) ) |
|
2249 | + if (TSubtotal::isTitle($line) && ($line->fk_prev_id === null)) |
|
2250 | 2250 | { |
2251 | 2251 | if ((float) DOL_VERSION >= 8.0) { |
2252 | 2252 | $img_delete = img_delete($langs->trans('deleteWithAllLines'), ' class="pictodelete pictodeleteallline"'); |
2253 | 2253 | } elseif ((float) DOL_VERSION >= 3.8) { |
2254 | - $img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all.3.8@subtotal',' class="pictodelete" '); |
|
2254 | + $img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all.3.8@subtotal', ' class="pictodelete" '); |
|
2255 | 2255 | } else { |
2256 | 2256 | $img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all@subtotal'); |
2257 | 2257 | } |
@@ -2261,7 +2261,7 @@ discard block |
||
2261 | 2261 | /* Depuis la 8.0, les icônes "standard" utilisent FontAwesome et sont préconfigurées selon la clé de l'image |
2262 | 2262 | * Impossible d'en customiser par exemple la couleur, même en utilisant img_picto() directement |
2263 | 2263 | */ |
2264 | - if((float) DOL_VERSION >= 8.0) { |
|
2264 | + if ((float) DOL_VERSION >= 8.0) { |
|
2265 | 2265 | ?> |
2266 | 2266 | <script> |
2267 | 2267 | $(document).ready(function () { |
@@ -2277,7 +2277,7 @@ discard block |
||
2277 | 2277 | </td> |
2278 | 2278 | |
2279 | 2279 | <?php |
2280 | - if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && TSubtotal::isTitle($line) && $action != 'editline') |
|
2280 | + if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && TSubtotal::isTitle($line) && $action != 'editline') |
|
2281 | 2281 | { |
2282 | 2282 | echo '<td class="subtotal_nc">'; |
2283 | 2283 | echo '<input id="subtotal_nc-'.$line->id.'" class="subtotal_nc_chkbx" data-lineid="'.$line->id.'" type="checkbox" name="subtotal_nc" value="1" '.(!empty($line->array_options['options_subtotal_nc']) ? 'checked="checked"' : '').' />'; |
@@ -2288,11 +2288,11 @@ discard block |
||
2288 | 2288 | <td align="center" class="linecolmove tdlineupdown"> |
2289 | 2289 | </td> |
2290 | 2290 | <?php } else { ?> |
2291 | - <td align="center"<?php echo ((empty($conf->browser->phone) && ($object->statut == 0 && $createRight ))?' class="tdlineupdown"':''); ?>></td> |
|
2291 | + <td align="center"<?php echo ((empty($conf->browser->phone) && ($object->statut == 0 && $createRight)) ? ' class="tdlineupdown"' : ''); ?>></td> |
|
2292 | 2292 | <?php } ?> |
2293 | 2293 | |
2294 | - <?php if($action == 'selectlines'){ // dolibarr 8 ?> |
|
2295 | - <td class="linecolcheck" align="center"><input type="checkbox" class="linecheckbox" name="line_checkbox[<?php echo $i+1; ?>]" value="<?php echo $line->id; ?>" ></td> |
|
2294 | + <?php if ($action == 'selectlines') { // dolibarr 8 ?> |
|
2295 | + <td class="linecolcheck" align="center"><input type="checkbox" class="linecheckbox" name="line_checkbox[<?php echo $i + 1; ?>]" value="<?php echo $line->id; ?>" ></td> |
|
2296 | 2296 | <?php } ?> |
2297 | 2297 | |
2298 | 2298 | </tr> |
@@ -2300,29 +2300,29 @@ discard block |
||
2300 | 2300 | |
2301 | 2301 | |
2302 | 2302 | // Affichage des extrafields à la Dolibarr (car sinon non affiché sur les titres) |
2303 | - if(TSubtotal::isTitle($line) && !empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE)) { |
|
2303 | + if (TSubtotal::isTitle($line) && !empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE)) { |
|
2304 | 2304 | |
2305 | - require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; |
|
2305 | + require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; |
|
2306 | 2306 | |
2307 | 2307 | // Extrafields |
2308 | 2308 | $extrafieldsline = new ExtraFields($db); |
2309 | 2309 | $extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line); |
2310 | 2310 | |
2311 | - $colspan+=3; $mode = 'view'; |
|
2312 | - if($action === 'editline' && $line->rowid == GETPOST('lineid')) $mode = 'edit'; |
|
2311 | + $colspan += 3; $mode = 'view'; |
|
2312 | + if ($action === 'editline' && $line->rowid == GETPOST('lineid')) $mode = 'edit'; |
|
2313 | 2313 | |
2314 | 2314 | $ex_element = $line->element; |
2315 | 2315 | $line->element = 'tr_extrafield_title '.$line->element; // Pour pouvoir manipuler ces tr |
2316 | - print $line->showOptionals($extrafieldsline, $mode, array('style'=>' style="background:#eeffee;" ','colspan'=>$colspan)); |
|
2316 | + print $line->showOptionals($extrafieldsline, $mode, array('style'=>' style="background:#eeffee;" ', 'colspan'=>$colspan)); |
|
2317 | 2317 | $isExtraSelected = false; |
2318 | - foreach($line->array_options as $option) { |
|
2319 | - if(!empty($option) && $option != "-1") { |
|
2318 | + foreach ($line->array_options as $option) { |
|
2319 | + if (!empty($option) && $option != "-1") { |
|
2320 | 2320 | $isExtraSelected = true; |
2321 | 2321 | break; |
2322 | 2322 | } |
2323 | 2323 | } |
2324 | 2324 | |
2325 | - if($mode === 'edit') { |
|
2325 | + if ($mode === 'edit') { |
|
2326 | 2326 | ?> |
2327 | 2327 | <script> |
2328 | 2328 | $(document).ready(function(){ |
@@ -2330,7 +2330,7 @@ discard block |
||
2330 | 2330 | var all_tr_extrafields = $("tr.tr_extrafield_title"); |
2331 | 2331 | <?php |
2332 | 2332 | // Si un extrafield est rempli alors on affiche directement les extrafields |
2333 | - if(!$isExtraSelected) { |
|
2333 | + if (!$isExtraSelected) { |
|
2334 | 2334 | echo 'all_tr_extrafields.hide();'; |
2335 | 2335 | echo 'var trad = "'.$langs->trans('showExtrafields').'";'; |
2336 | 2336 | echo 'var extra = 0;'; |
@@ -2376,20 +2376,20 @@ discard block |
||
2376 | 2376 | |
2377 | 2377 | |
2378 | 2378 | function addMoreActionsButtons($parameters, &$object, &$action, $hookmanager) { |
2379 | - global $conf,$langs; |
|
2379 | + global $conf, $langs; |
|
2380 | 2380 | |
2381 | 2381 | if ($object->statut == 0 && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && $action != 'editline') |
2382 | 2382 | { |
2383 | 2383 | |
2384 | - if($object->element == 'invoice_supplier' || $object->element == 'order_supplier') |
|
2384 | + if ($object->element == 'invoice_supplier' || $object->element == 'order_supplier') |
|
2385 | 2385 | { |
2386 | 2386 | foreach ($object->lines as $line) |
2387 | 2387 | { |
2388 | 2388 | // fetch optionals attributes and labels |
2389 | 2389 | require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'); |
2390 | - $extrafields=new ExtraFields($this->db); |
|
2391 | - $extralabels=$extrafields->fetch_name_optionals_label($object->table_element_line,true); |
|
2392 | - $line->fetch_optionals($line->id,$extralabels); |
|
2390 | + $extrafields = new ExtraFields($this->db); |
|
2391 | + $extralabels = $extrafields->fetch_name_optionals_label($object->table_element_line, true); |
|
2392 | + $line->fetch_optionals($line->id, $extralabels); |
|
2393 | 2393 | } |
2394 | 2394 | } |
2395 | 2395 | |
@@ -2489,23 +2489,23 @@ discard block |
||
2489 | 2489 | $ThtmlData['data-qty'] = 0; //$line->qty; |
2490 | 2490 | $ThtmlData['data-level'] = TSubtotal::getNiveau($line); |
2491 | 2491 | |
2492 | - if(TSubtotal::isTitle($line)){ |
|
2492 | + if (TSubtotal::isTitle($line)) { |
|
2493 | 2493 | $ThtmlData['data-issubtotal'] = 'title'; |
2494 | - }elseif(TSubtotal::isSubtotal($line)){ |
|
2494 | + }elseif (TSubtotal::isSubtotal($line)) { |
|
2495 | 2495 | $ThtmlData['data-issubtotal'] = 'subtotal'; |
2496 | 2496 | } |
2497 | - else{ |
|
2497 | + else { |
|
2498 | 2498 | $ThtmlData['data-issubtotal'] = 'freetext'; |
2499 | 2499 | } |
2500 | 2500 | |
2501 | 2501 | |
2502 | 2502 | // Change or add data from hooks |
2503 | - $parameters = array_replace($parameters , array( 'ThtmlData' => $ThtmlData ) ); |
|
2503 | + $parameters = array_replace($parameters, array('ThtmlData' => $ThtmlData)); |
|
2504 | 2504 | |
2505 | 2505 | // hook |
2506 | - $reshook = $hookmanager->executeHooks('subtotalLineHtmlData',$parameters,$object,$action); // Note that $action and $object may have been modified by hook |
|
2506 | + $reshook = $hookmanager->executeHooks('subtotalLineHtmlData', $parameters, $object, $action); // Note that $action and $object may have been modified by hook |
|
2507 | 2507 | if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
2508 | - if ($reshook>0) |
|
2508 | + if ($reshook > 0) |
|
2509 | 2509 | { |
2510 | 2510 | $ThtmlData = $hookmanager->resArray; |
2511 | 2511 | } |
@@ -2518,14 +2518,14 @@ discard block |
||
2518 | 2518 | function implodeHtmlData($ThtmlData = array()) |
2519 | 2519 | { |
2520 | 2520 | $data = ''; |
2521 | - foreach($ThtmlData as $k => $h ) |
|
2521 | + foreach ($ThtmlData as $k => $h) |
|
2522 | 2522 | { |
2523 | - if(is_array($h)) |
|
2523 | + if (is_array($h)) |
|
2524 | 2524 | { |
2525 | 2525 | $h = json_encode($h); |
2526 | 2526 | } |
2527 | 2527 | |
2528 | - $data .= $k . '="'.dol_htmlentities($h, ENT_QUOTES).'" '; |
|
2528 | + $data .= $k.'="'.dol_htmlentities($h, ENT_QUOTES).'" '; |
|
2529 | 2529 | } |
2530 | 2530 | |
2531 | 2531 | return $data; |
@@ -2533,26 +2533,26 @@ discard block |
||
2533 | 2533 | |
2534 | 2534 | function _ajax_block_order_js($object) |
2535 | 2535 | { |
2536 | - global $conf,$tagidfortablednd,$filepath,$langs; |
|
2536 | + global $conf, $tagidfortablednd, $filepath, $langs; |
|
2537 | 2537 | |
2538 | 2538 | /* |
2539 | 2539 | * this part of js is base on dolibarr htdocs/core/tpl/ajaxrow.tpl.php |
2540 | 2540 | * for compatibility reasons we don't use tableDnD but jquery sortable |
2541 | 2541 | */ |
2542 | 2542 | |
2543 | - $id=$object->id; |
|
2544 | - $nboflines=(isset($object->lines)?count($object->lines):0); |
|
2545 | - $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1; |
|
2543 | + $id = $object->id; |
|
2544 | + $nboflines = (isset($object->lines) ?count($object->lines) : 0); |
|
2545 | + $forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1; |
|
2546 | 2546 | |
2547 | - $id=$object->id; |
|
2548 | - $fk_element=$object->fk_element; |
|
2549 | - $table_element_line=$object->table_element_line; |
|
2550 | - $nboflines=(isset($object->lines)?count($object->lines):(empty($nboflines)?0:$nboflines)); |
|
2551 | - $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd); |
|
2552 | - $filepath=(empty($filepath)?'':$filepath); |
|
2547 | + $id = $object->id; |
|
2548 | + $fk_element = $object->fk_element; |
|
2549 | + $table_element_line = $object->table_element_line; |
|
2550 | + $nboflines = (isset($object->lines) ?count($object->lines) : (empty($nboflines) ? 0 : $nboflines)); |
|
2551 | + $tagidfortablednd = (empty($tagidfortablednd) ? 'tablelines' : $tagidfortablednd); |
|
2552 | + $filepath = (empty($filepath) ? '' : $filepath); |
|
2553 | 2553 | |
2554 | 2554 | |
2555 | - if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1) |
|
2555 | + if (GETPOST('action', 'aZ09') != 'editline' && $nboflines > 1) |
|
2556 | 2556 | { |
2557 | 2557 | |
2558 | 2558 | ?> |
@@ -2570,7 +2570,7 @@ discard block |
||
2570 | 2570 | moveBlockCol.disableSelection(); // prevent selection |
2571 | 2571 | <?php if ($object->statut == 0) { ?> |
2572 | 2572 | // apply some graphical stuff |
2573 | - moveBlockCol.css("background-image",'url(<?php echo dol_buildpath('subtotal/img/grip_all.png',2); ?>)'); |
|
2573 | + moveBlockCol.css("background-image",'url(<?php echo dol_buildpath('subtotal/img/grip_all.png', 2); ?>)'); |
|
2574 | 2574 | moveBlockCol.css("background-repeat","no-repeat"); |
2575 | 2575 | moveBlockCol.css("background-position","center center"); |
2576 | 2576 | moveBlockCol.css("cursor","move"); |