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

Test in progress

Browse Source
This commit is contained in:
Alexandre SPANGARO 2019-07-29 15:41:53 +02:00
parent 56f124844c
commit 96380f01c6
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -938,15 +938,22 @@ class AccountancyExport
$date_document = dol_print_date($line->doc_date, '%Y%m%d'); $date_document = dol_print_date($line->doc_date, '%Y%m%d');
$date_creation = dol_print_date($line->date_creation, '%Y%m%d'); $date_creation = dol_print_date($line->date_creation, '%Y%m%d');
// TYPE
$type_enregistrement = 'E'; // For write movement $type_enregistrement = 'E'; // For write movement
print $type_enregistrement . $separator; print $type_enregistrement . $separator;
// JNAL
print substr($line->code_journal, 0, 2) . $separator; print substr($line->code_journal, 0, 2) . $separator;
// NECR
print $line->id . $separator; print $line->id . $separator;
// NPIE
print $line->piece_num . $separator; print $line->piece_num . $separator;
// DATP
print $date_document . $separator; print $date_document . $separator;
// LIBE
print $line->label_operation . $separator; print $line->label_operation . $separator;
// DATH
print $line->date_lim_reglement . $separator; print $line->date_lim_reglement . $separator;
// CNPI
if ($line->doc_type == 'supplier_invoice') { if ($line->doc_type == 'supplier_invoice') {
if ($line->montant < 0) { if ($line->montant < 0) {
$nature_piece = 'AF'; $nature_piece = 'AF';
@ -963,7 +970,8 @@ class AccountancyExport
$nature_piece = ''; $nature_piece = '';
} }
print $nature_piece . $separator; print $nature_piece . $separator;
// RACI
/*
if (! empty($line->subledger_account)) { if (! empty($line->subledger_account)) {
if ($line->doc_type == 'supplier_invoice') { if ($line->doc_type == 'supplier_invoice') {
$racine_subledger_account = '40'; $racine_subledger_account = '40';
@ -973,19 +981,27 @@ class AccountancyExport
$nature_piece = ''; $nature_piece = '';
} }
print $racine_subledger_account . $separator; print $racine_subledger_account . $separator;
} else {
print $separator;
} }
*/
// MONT
print price(abs($line->montant)) . $separator; print price(abs($line->montant)) . $separator;
// CODC
print $line->sens . $separator; print $line->sens . $separator;
// CPTG
print length_accountg($line->numero_compte) . $separator; print length_accountg($line->numero_compte) . $separator;
// DATE
print $date_creation . $separator; print $date_creation . $separator;
// CLET
print $line->lettering_code . $separator; print $line->lettering_code . $separator;
// DATL
print $line->date_lettering . $separator; print $line->date_lettering . $separator;
// CPTA
if (! empty($line->subledger_account)) { if (! empty($line->subledger_account)) {
print length_accounta($line->subledger_account) . $separator; print length_accounta($line->subledger_account) . $separator;
} }
// CNAT
if ($line->doc_type == 'supplier_invoice' && ! empty($line->subledger_account)) { if ($line->doc_type == 'supplier_invoice' && ! empty($line->subledger_account)) {
print 'F'; print 'F';
} elseif ($line->doc_type == 'customer_invoice' && ! empty($line->subledger_account)) { } elseif ($line->doc_type == 'customer_invoice' && ! empty($line->subledger_account)) {