lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur 2021-11-07 18:54:59 +01:00
parent 47451432a7
commit 5085db36a7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/accountancy/class/accountancyexport.class.php
View File

@ -87,11 +87,11 @@ class AccountancyExport
* *
* @param DoliDb $db Database handler * @param DoliDb $db Database handler
*/ */
public function __construct(DoliDB &$db) public function __construct(DoliDB $db)
{ {
global $conf; global $conf;
$this->db = &$db; $this->db = $db;
$this->separator = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV; $this->separator = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
$this->end_line = empty($conf->global->ACCOUNTING_EXPORT_ENDLINE) ? "\n" : ($conf->global->ACCOUNTING_EXPORT_ENDLINE == 1 ? "\n" : "\r\n"); $this->end_line = empty($conf->global->ACCOUNTING_EXPORT_ENDLINE) ? "\n" : ($conf->global->ACCOUNTING_EXPORT_ENDLINE == 1 ? "\n" : "\r\n");
} }
@ -928,17 +928,18 @@ class AccountancyExport
$date_validation = dol_print_date($line->date_validation, '%Y%m%d'); $date_validation = dol_print_date($line->date_validation, '%Y%m%d');
$date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d'); $date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d');
$refInvoice = '';
if ($line->doc_type == 'customer_invoice') { if ($line->doc_type == 'customer_invoice') {
// Customer invoice // Customer invoice
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
$invoice = new Facture($db); $invoice = new Facture($this->db);
$invoice->fetch($line->fk_doc); $invoice->fetch($line->fk_doc);
$refInvoice = $invoice->ref; $refInvoice = $invoice->ref;
} elseif ($line->doc_type == 'supplier_invoice') { } elseif ($line->doc_type == 'supplier_invoice') {
// Supplier invoice // Supplier invoice
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
$invoice = new FactureFournisseur($db); $invoice = new FactureFournisseur($this->db);
$invoice->fetch($line->fk_doc); $invoice->fetch($line->fk_doc);
$refInvoice = $invoice->ref_supplier; $refInvoice = $invoice->ref_supplier;
@ -1054,17 +1055,18 @@ class AccountancyExport
$date_validation = dol_print_date($line->date_validation, '%Y%m%d'); $date_validation = dol_print_date($line->date_validation, '%Y%m%d');
$date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d'); $date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d');
$refInvoice = '';
if ($line->doc_type == 'customer_invoice') { if ($line->doc_type == 'customer_invoice') {
// Customer invoice // Customer invoice
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
$invoice = new Facture($db); $invoice = new Facture($this->db);
$invoice->fetch($line->fk_doc); $invoice->fetch($line->fk_doc);
$refInvoice = $invoice->ref; $refInvoice = $invoice->ref;
} elseif ($line->doc_type == 'supplier_invoice') { } elseif ($line->doc_type == 'supplier_invoice') {
// Supplier invoice // Supplier invoice
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
$invoice = new FactureFournisseur($db); $invoice = new FactureFournisseur($this->db);
$invoice->fetch($line->fk_doc); $invoice->fetch($line->fk_doc);
$refInvoice = $invoice->ref_supplier; $refInvoice = $invoice->ref_supplier;