@@ -222,8 +222,8 @@ discard block |
||
| 222 | 222 | 'd.code_departement' => 'List:c_departements:code_departement:code_departement:', 'c.code' => 'List:c_country:code:code:', |
| 223 | 223 | 'e.phone' => 'Text', 'e.fax' => 'Text', 'e.statut' => 'Text', 'pe.rowid' => 'List:entrepot:ref:rowid:stock', 'pe.ref' => 'Text' |
| 224 | 224 | ); |
| 225 | - $this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into export_icon |
|
| 226 | - $this->export_aggregate_array[$r] = array(); // TODO Not used yet |
|
| 225 | + $this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into export_icon |
|
| 226 | + $this->export_aggregate_array[$r] = array(); // TODO Not used yet |
|
| 227 | 227 | $keyforselect = 'warehouse'; |
| 228 | 228 | $keyforelement = 'warehouse'; |
| 229 | 229 | $keyforaliasextra = 'extra'; |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | 'p.datec' => 'product', 'p.tms' => 'product', 'p.pmp' => 'product', 'p.cost_price' => 'product', |
| 271 | 271 | 'ps.reel' => 'stock', |
| 272 | 272 | 'p.seuil_stock_alerte' => 'product', 'p.barcode' => 'product', 'bt.libelle' => 'product', |
| 273 | - ); // We define here only fields that use another icon that the one defined into export_icon |
|
| 273 | + ); // We define here only fields that use another icon that the one defined into export_icon |
|
| 274 | 274 | if (isModEnabled('barcode')) { |
| 275 | 275 | $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode' => 'product')); |
| 276 | 276 | } |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | 'p.datec' => 'product', 'p.tms' => 'product', 'p.pmp' => 'product', 'p.cost_price' => 'product', 'lcpn.label'=>'product', |
| 330 | 330 | 'pb.rowid' => 'batch', 'pb.batch' => 'batch', 'pb.qty' => 'batch', 'none.dateLastMovement' => 'movement', |
| 331 | 331 | 'pl.eatby' => 'batch', 'pl.sellby' => 'batch' |
| 332 | - ); // We define here only fields that use another icon that the one defined into export_icon |
|
| 332 | + ); // We define here only fields that use another icon that the one defined into export_icon |
|
| 333 | 333 | $this->export_special_array[$r] = array( |
| 334 | 334 | 'none.dateLastMovement'=>array('rule'=>'compute', 'classfile'=>'/product/stock/class/mouvementstock.class.php', 'class'=>'MouvementStock', 'method'=>'getDateLastMovementProductBatch', 'method_params'=>['e_rowid', 'p_rowid', 'pb_batch']), |
| 335 | 335 | ); |
@@ -383,7 +383,7 @@ discard block |
||
| 383 | 383 | 'e.rowid' => 'warehouse', 'e.ref' => 'warehouse', 'e.description' => 'warehouse', 'e.lieu' => 'warehouse', 'e.address' => 'warehouse', 'e.zip' => 'warehouse', 'e.town' => 'warehouse', |
| 384 | 384 | 'p.rowid' => "product", 'p.ref' => "product", 'p.fk_product_type' => "product", 'p.label' => "product", 'p.description' => "product", 'p.note' => "product", |
| 385 | 385 | 'p.price' => "product", 'p.tva_tx' => 'product', 'p.tosell' => "product", 'p.tobuy' => "product", 'p.duration' => "product", 'p.datec' => 'product', 'p.tms' => 'product' |
| 386 | - ); // We define here only fields that use another icon that the one defined into export_icon |
|
| 386 | + ); // We define here only fields that use another icon that the one defined into export_icon |
|
| 387 | 387 | if (isModEnabled('productbatch')) { |
| 388 | 388 | $this->export_fields_array[$r]['sm.batch'] = 'Batch'; |
| 389 | 389 | $this->export_TypeFields_array[$r]['sm.batch'] = 'Text'; |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | 'e.rowid' => 'warehouse', 'e.ref' => 'warehouse', 'e.description' => 'warehouse', 'e.lieu' => 'warehouse', 'e.address' => 'warehouse', 'e.zip' => 'warehouse', 'e.town' => 'warehouse', |
| 435 | 435 | 'p.rowid' => "product", 'p.ref' => "product", 'p.fk_product_type' => "product", 'p.label' => "product", 'p.description' => "product", 'p.note' => "product", |
| 436 | 436 | 'p.barcode' => "product", 'p.price' => "product", 'p.tva_tx' => 'product', 'p.tosell' => "product", 'p.tobuy' => "product", 'p.duration' => "product", 'p.datec' => 'product', 'p.tms' => 'product' |
| 437 | - ); // We define here only fields that use another icon that the one defined into export_icon |
|
| 437 | + ); // We define here only fields that use another icon that the one defined into export_icon |
|
| 438 | 438 | if (isModEnabled('productbatch')) { |
| 439 | 439 | $this->export_fields_array[$r]['id.batch'] = 'Batch'; |
| 440 | 440 | $this->export_TypeFields_array[$r]['id.batch'] = 'Text'; |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | $form = new Form($db); |
| 115 | 115 | $formaccounting = new FormAccounting($db); |
| 116 | 116 | |
| 117 | -$title= $langs->trans('AccountingCategory'); |
|
| 117 | +$title = $langs->trans('AccountingCategory'); |
|
| 118 | 118 | $help_url = 'EN:Module_Double_Entry_Accounting#Setup|FR:Module_Comptabilité_en_Partie_Double#Configuration'; |
| 119 | 119 | |
| 120 | 120 | llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-accountancy page-admin_categories'); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | $arraykeyvalue = array(); |
| 161 | 161 | foreach ($accountingcategory->lines_cptbk as $key => $val) { |
| 162 | 162 | $doc_ref = !empty($val->doc_ref) ? $val->doc_ref : ''; |
| 163 | - $arraykeyvalue[length_accountg($val->numero_compte)] = length_accountg($val->numero_compte) . ' - ' . $val->label_compte . ($doc_ref ? ' '.$doc_ref : ''); |
|
| 163 | + $arraykeyvalue[length_accountg($val->numero_compte)] = length_accountg($val->numero_compte).' - '.$val->label_compte.($doc_ref ? ' '.$doc_ref : ''); |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | if (is_array($accountingcategory->lines_cptbk) && count($accountingcategory->lines_cptbk) > 0) { |