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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2016-04-04 13:24:36 +02:00
commit 122cd200ec
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
/**
* Classe de gestion des factures recurrentes/Modeles
*/
class FactureRec extends Facture
class FactureRec extends CommonInvoice
{
public $element='facturerec';
public $table_element='facture_rec';

22
htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
View File

@ -484,6 +484,22 @@ class doc_generic_project_odt extends ModelePDFProjects
dol_mkdir($conf->projet->dir_temp);
// If PROJECTLEADER contact defined on project, we use it
$usecontact=false;
$arrayidcontact=$object->getIdContact('external','PROJECTLEADER');
if (count($arrayidcontact) > 0)
{
$usecontact=true;
$result=$object->fetch_contact($arrayidcontact[0]);
}
// Recipient name
if (! empty($usecontact))
{
// if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use
$contactobject = $object->contact;
}
$socobject=$object->thirdparty;
// Make substitution
@ -529,8 +545,12 @@ class doc_generic_project_odt extends ModelePDFProjects
$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
$array_objet=$this->get_substitutionarray_object($object,$outputlangs);
$array_other=$this->get_substitutionarray_other($outputlangs);
// retrieve contact information for use in project as contact_xxx tags
$array_project_contact = array();
if ($usecontact)
$array_project_contact=$this->get_substitutionarray_contact($contactobject,$outputlangs,'contact');
$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other);
$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_other,$array_project_contact);
complete_substitutions_array($tmparray, $outputlangs, $object);
// Call the ODTSubstitution hook
$parameters=array('odfHandler'=>&$odfHandler,'file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs,'substitutionarray'=>&$tmparray);

7
htdocs/projet/tasks/contact.php
View File

@ -492,6 +492,13 @@ if ($id > 0 || ! empty($ref))
}
}
if (is_object($hookmanager))
{
$hookmanager->initHooks(array('contacttpl'));
$parameters=array();
$reshook=$hookmanager->executeHooks('formContactTpl',$parameters,$object,$action);
}
llxFooter();