Update doc_generic_project_odt.modules.php

This commit is contained in:
BENKE Charles 2014-04-19 12:32:01 +02:00
parent bb2c829997
commit 0b78a04756

View File

@ -841,46 +841,56 @@ class doc_generic_project_odt extends ModelePDFProjects
'propal'=>array( 'propal'=>array(
'title'=>"ListProposalsAssociatedProject", 'title'=>"ListProposalsAssociatedProject",
'class'=>'Propal', 'class'=>'Propal',
'test'=>$conf->propal->enabled), 'table'=>'propal',
'test'=>$conf->propal->enabled && $user->rights->propale->lire),
'order'=>array( 'order'=>array(
'title'=>"ListOrdersAssociatedProject", 'title'=>"ListOrdersAssociatedProject",
'class'=>'Commande', 'class'=>'Commande',
'test'=>$conf->commande->enabled), 'table'=>'commande',
'test'=>$conf->commande->enabled && $user->rights->commande->lire),
'invoice'=>array( 'invoice'=>array(
'title'=>"ListInvoicesAssociatedProject", 'title'=>"ListInvoicesAssociatedProject",
'class'=>'Facture', 'class'=>'Facture',
'test'=>$conf->facture->enabled), 'table'=>'facture',
'test'=>$conf->facture->enabled && $user->rights->facture->lire),
'invoice_predefined'=>array( 'invoice_predefined'=>array(
'title'=>"ListPredefinedInvoicesAssociatedProject", 'title'=>"ListPredefinedInvoicesAssociatedProject",
'class'=>'FactureRec', 'class'=>'FactureRec',
'test'=>$conf->facture->enabled), 'table'=>'facture_rec',
'test'=>$conf->facture->enabled && $user->rights->facture->lire),
'order_supplier'=>array( 'order_supplier'=>array(
'title'=>"ListSupplierOrdersAssociatedProject", 'title'=>"ListSupplierOrdersAssociatedProject",
'table'=>'commande_fournisseur',
'class'=>'CommandeFournisseur', 'class'=>'CommandeFournisseur',
'test'=>$conf->fournisseur->enabled), 'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire),
'invoice_supplier'=>array( 'invoice_supplier'=>array(
'title'=>"ListSupplierInvoicesAssociatedProject", 'title'=>"ListSupplierInvoicesAssociatedProject",
'table'=>'facture_fourn',
'class'=>'FactureFournisseur', 'class'=>'FactureFournisseur',
'test'=>$conf->fournisseur->enabled), 'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire),
'contract'=>array( 'contract'=>array(
'title'=>"ListContractAssociatedProject", 'title'=>"ListContractAssociatedProject",
'class'=>'Contrat', 'class'=>'Contrat',
'test'=>$conf->contrat->enabled), 'table'=>'contrat',
'test'=>$conf->contrat->enabled && $user->rights->contrat->lire),
'intervention'=>array( 'intervention'=>array(
'title'=>"ListFichinterAssociatedProject", 'title'=>"ListFichinterAssociatedProject",
'class'=>'Fichinter', 'class'=>'Fichinter',
'table'=>'fichinter',
'disableamount'=>1, 'disableamount'=>1,
'test'=>$conf->ficheinter->enabled), 'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire),
'trip'=>array( 'trip'=>array(
'title'=>"ListTripAssociatedProject", 'title'=>"ListTripAssociatedProject",
'class'=>'Deplacement', 'class'=>'Deplacement',
'table'=>'deplacement',
'disableamount'=>1, 'disableamount'=>1,
'test'=>$conf->deplacement->enabled), 'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire),
'agenda'=>array( 'agenda'=>array(
'title'=>"ListActionsAssociatedProject", 'title'=>"ListActionsAssociatedProject",
'class'=>'ActionComm', 'class'=>'ActionComm',
'table'=>'actioncomm',
'disableamount'=>1, 'disableamount'=>1,
'test'=>$conf->agenda->enabled) 'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->lire)
); );
//Insert reference //Insert reference
@ -891,11 +901,12 @@ class doc_generic_project_odt extends ModelePDFProjects
foreach ($listofreferent as $keyref => $valueref) foreach ($listofreferent as $keyref => $valueref)
{ {
$title=$valueref['title']; $title=$valueref['title'];
$tablename=$valueref['table'];
$classname=$valueref['class']; $classname=$valueref['class'];
$qualified=$valueref['test']; $qualified=$valueref['test'];
if ($qualified) if ($qualified)
{ {
$elementarray = $object->get_element_list($keyref); $elementarray = $object->get_element_list($keyref, $tablename);
if (count($elementarray)>0 && is_array($elementarray)) if (count($elementarray)>0 && is_array($elementarray))
{ {
$var=true; $var=true;