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

Rename tag note to differentiate public and private note

Browse Source
This commit is contained in:
Laurent Destailleur 2014-01-16 00:07:45 +01:00
parent f83044c5c5
commit c5bcc92651
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/commondocgenerator.class.php
View File

@ -170,7 +170,8 @@ abstract class CommonDocGenerator
'company_idprof4'=>$object->idprof4, 'company_idprof4'=>$object->idprof4,
'company_idprof5'=>$object->idprof5, 'company_idprof5'=>$object->idprof5,
'company_idprof6'=>$object->idprof6, 'company_idprof6'=>$object->idprof6,
'company_note'=>$object->note 'company_note_public'=>$object->note_public,
'company_note_private'=>$object->note_private
); );
// Retrieve extrafields // Retrieve extrafields
@ -260,7 +261,7 @@ abstract class CommonDocGenerator
$array_key.'_total_localtax2'=>price2num($object->total_localtax2), $array_key.'_total_localtax2'=>price2num($object->total_localtax2),
$array_key.'_total_ttc'=>price2num($object->total_ttc), $array_key.'_total_ttc'=>price2num($object->total_ttc),
$array_key.'_total_discount_ht' => price2num($object->getTotalDiscount()), $array_key.'_total_discount_ht' => price2num($object->getTotalDiscount()),
$array_key.'_vatrate'=>vatrate($object->tva), $array_key.'_vatrate'=>vatrate($object->tva),
$array_key.'_note_private'=>$object->note, $array_key.'_note_private'=>$object->note,
$array_key.'_note'=>$object->note_public, $array_key.'_note'=>$object->note_public,
@ -314,7 +315,7 @@ abstract class CommonDocGenerator
'line_date_end'=>$line->date_end 'line_date_end'=>$line->date_end
); );
} }
/** /**
* Define array with couple substitution key => substitution value * Define array with couple substitution key => substitution value
* *