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

Merge pull request #11247 from aspangaro/develop

Browse Source 
Accountancy - Use Ansi on Agiris model export & indent
This commit is contained in:
Laurent Destailleur 2019-05-29 12:23:25 +02:00 committed by GitHub
commit b6f4cab20d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 147 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -585,19 +585,19 @@ class AccountancyExport
$date = dol_print_date($line->doc_date, '%d%m%Y'); $date = dol_print_date($line->doc_date, '%d%m%Y');
print $line->piece_num . $separator; print $line->piece_num . $separator;
print $line->label_operation . $separator; print self::toAnsi($line->label_operation) . $separator;
print $date . $separator; print $date . $separator;
print $line->label_operation . $separator; print self::toAnsi($line->label_operation) . $separator;
if (empty($line->subledger_account)) { if (empty($line->subledger_account)) {
print length_accountg($line->numero_compte) . $separator; print length_accountg($line->numero_compte) . $separator;
print $line->label_compte . $separator; print self::toAnsi($line->label_compte) . $separator;
} else { } else {
print length_accounta($line->subledger_account) . $separator; print length_accounta($line->subledger_account) . $separator;
print $line->subledger_label . $separator; print self::toAnsi($line->subledger_label) . $separator;
} }
print $line->doc_ref . $separator; print self::toAnsi($line->doc_ref) . $separator;
print price($line->debit) . $separator; print price($line->debit) . $separator;
print price($line->credit) . $separator; print price($line->credit) . $separator;
print price($line->montant) . $separator; print price($line->montant) . $separator;
@ -770,7 +770,6 @@ class AccountancyExport
/** /**
* Export format : SAGE50SWISS * Export format : SAGE50SWISS
* *
*
* https://onlinehelp.sageschweiz.ch/default.aspx?tabid=19984 * https://onlinehelp.sageschweiz.ch/default.aspx?tabid=19984
* http://media.topal.ch/Public/Schnittstellen/TAF/Specification/Sage50-TAF-format.pdf * http://media.topal.ch/Public/Schnittstellen/TAF/Specification/Sage50-TAF-format.pdf
* *
@ -932,7 +931,7 @@ class AccountancyExport
/** /**
* *
* @param unknown $str Original string to encode and optionaly truncate * @param unknown $str Original string to encode and optionaly truncate
* @param integer $size trucate string after $size characters * @param integer $size truncate string after $size characters
* @return string String encoded in Windows-1251 charset * @return string String encoded in Windows-1251 charset
*/ */
public static function toAnsi($str, $size = -1) public static function toAnsi($str, $size = -1)