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

Add custom ODT substitution for lines of products (completesubstitutionarray_lines)

Browse Source 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
This commit is contained in:
Stephen L 2012-08-14 16:03:45 +02:00
parent c1d15a9572
commit c0a314000c
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/lib/functions.lib.php
View File

@ -3380,10 +3380,12 @@ function make_substitutions($chaine,$substitutionarray)
* @param array &$substitutionarray Array substitution old value => new value value
* @param Translate $outputlangs If we want substitution from special constants, we provide a language
* @param Object $object If we want substitution from special constants, we provide data in a source object
* @param Object/array $parameters Add more parameters (useful to pass product lines)
* @param string $callfunc What is the name of the custom function that will be called? (default: completesubstitutionarray)
* @return void
* @see make_substitutions
*/
function complete_substitutions_array(&$substitutionarray,$outputlangs,$object='')
function complete_substitutions_array(&$substitutionarray,$outputlangs,$object='',$parameters=null,$callfunc="completesubstitutionarray")
{
global $conf,$user;
@ -3408,8 +3410,8 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object='
dol_syslog("Library functions_".$substitfile['name']." found into ".$dir);
require_once($dir.$substitfile['name']);
$function_name=$module."_completesubstitutionarray";
$function_name($substitutionarray,$outputlangs,$object);
$function_name=$module."_".$callfunc;
$function_name($substitutionarray,$outputlangs,$object,$parameters);
}
}
}

1
htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
View File

@ -455,6 +455,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
foreach ($object->lines as $line)
{
$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
foreach($tmparray as $key => $val)
{
try

1
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -465,6 +465,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
foreach ($object->lines as $line)
{
$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
foreach($tmparray as $key => $val)
{
try

1
htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
View File

@ -454,6 +454,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
foreach ($object->lines as $line)
{
$tmparray=$this->get_substitutionarray_lines($line,$outputlangs);
complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
foreach($tmparray as $key => $val)
{
try