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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2018-08-16 14:48:42 +02:00
commit 4c52384609
2 changed files with 153 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,6 +160,7 @@ class doc_generic_project_odt extends ModelePDFProjects
'task_description'=>$task->description, 'task_description'=>$task->description,
'task_fk_parent'=>$task->fk_parent, 'task_fk_parent'=>$task->fk_parent,
'task_duration'=>$task->duration, 'task_duration'=>$task->duration,
'task_duration_hour'=>convertSecondToTime($task->duration,'all'),
'task_progress'=>$task->progress, 'task_progress'=>$task->progress,
'task_public'=>$task->public, 'task_public'=>$task->public,
'task_date_start'=>dol_print_date($task->date_start,'day'), 'task_date_start'=>dol_print_date($task->date_start,'day'),
@ -317,7 +318,10 @@ class doc_generic_project_odt extends ModelePDFProjects
'tasktime_fk_user'=>$tasktime['fk_user'], 'tasktime_fk_user'=>$tasktime['fk_user'],
'tasktime_user_name'=>$tasktime['name'], 'tasktime_user_name'=>$tasktime['name'],
'tasktime_user_first'=>$tasktime['firstname'], 'tasktime_user_first'=>$tasktime['firstname'],
'tasktime_fullcivname'=>$tasktime['fullcivname'] 'tasktime_fullcivname'=>$tasktime['fullcivname'],
'tasktime_amountht'=>$tasktime['amountht'],
'tasktime_amountttc'=>$tasktime['amountttc'],
'tasktime_thm'=>$tasktime['thm'],
); );
} }
@ -698,7 +702,7 @@ class doc_generic_project_odt extends ModelePDFProjects
//Time ressources //Time ressources
$sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note"; $sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
$sql.= ", u.lastname, u.firstname"; $sql.= ", u.lastname, u.firstname, t.thm";
$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t"; $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
$sql .= " , ".MAIN_DB_PREFIX."user as u"; $sql .= " , ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE t.fk_task =".$task->id; $sql .= " WHERE t.fk_task =".$task->id;
@ -712,6 +716,35 @@ class doc_generic_project_odt extends ModelePDFProjects
$i = 0; $i = 0;
$tasks = array(); $tasks = array();
$listlinestasktime = $listlines->__get('taskstimes'); $listlinestasktime = $listlines->__get('taskstimes');
if (empty($num)) {
$row['rowid']='';
$row['task_date']='';
$row['task_duration']='';
$row['$tasktime']='';
$row['note']='';
$row['fk_user']='';
$row['name']='';
$row['firstname']='';
$row['fullcivname']='';
$row['amountht']='';
$row['amountttc']='';
$row['thm']='';
$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
foreach($tmparray as $key => $val)
{
try
{
$listlinestasktime->setVars($key, $val, true, 'UTF-8');
}
catch(OdfException $e)
{
}
catch(SegmentException $e)
{
}
}
$listlinestasktime->merge();
}
while ($i < $num) while ($i < $num)
{ {
$row = $this->db->fetch_array($resql); $row = $this->db->fetch_array($resql);
@ -723,6 +756,16 @@ class doc_generic_project_odt extends ModelePDFProjects
$row['fullcivname']=''; $row['fullcivname']='';
} }
if (!empty($row['thm'])) {
$row['amountht']=($row['task_duration'] / 3600) * $row['thm'];
$defaultvat = get_default_tva($mysoc, $mysoc);
$row['amountttc']=price2num($row['amountht'] * (1 + ($defaultvat / 100)),'MT');;
} else {
$row['amountht']=0;
$row['amountttc']=0;
$row['thm']=0;
}
$tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs); $tmparray=$this->get_substitutionarray_taskstime($row,$outputlangs);
foreach($tmparray as $key => $val) foreach($tmparray as $key => $val)
@ -884,60 +927,114 @@ class doc_generic_project_odt extends ModelePDFProjects
//List of referent //List of referent
$listofreferent=array( $listofreferent = array(
'propal'=>array( 'propal' => array(
'title'=>"ListProposalsAssociatedProject", 'title' => "ListProposalsAssociatedProject",
'class'=>'Propal', 'class' => 'Propal',
'table'=>'propal', 'table' => 'propal',
'test'=>$conf->propal->enabled && $user->rights->propale->lire), 'test' => $conf->propal->enabled && $user->rights->propale->lire
'order'=>array( ),
'title'=>"ListOrdersAssociatedProject", 'order' => array(
'class'=>'Commande', 'title' => "ListOrdersAssociatedProject",
'table'=>'commande', 'class' => 'Commande',
'test'=>$conf->commande->enabled && $user->rights->commande->lire), 'table' => 'commande',
'invoice'=>array( 'test' => $conf->commande->enabled && $user->rights->commande->lire
'title'=>"ListInvoicesAssociatedProject", ),
'class'=>'Facture', 'invoice' => array(
'table'=>'facture', 'title' => "ListInvoicesAssociatedProject",
'test'=>$conf->facture->enabled && $user->rights->facture->lire), 'class' => 'Facture',
'invoice_predefined'=>array( 'table' => 'facture',
'title'=>"ListPredefinedInvoicesAssociatedProject", 'test' => $conf->facture->enabled && $user->rights->facture->lire
'class'=>'FactureRec', ),
'table'=>'facture_rec', 'invoice_predefined' => array(
'test'=>$conf->facture->enabled && $user->rights->facture->lire), 'title' => "ListPredefinedInvoicesAssociatedProject",
'order_supplier'=>array( 'class' => 'FactureRec',
'title'=>"ListSupplierOrdersAssociatedProject", 'table' => 'facture_rec',
'table'=>'commande_fournisseur', 'test' => $conf->facture->enabled && $user->rights->facture->lire
'class'=>'CommandeFournisseur', ),
'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire), 'proposal_supplier' => array(
'invoice_supplier'=>array( 'title' => "ListSupplierProposalsAssociatedProject",
'title'=>"ListSupplierInvoicesAssociatedProject", 'class' => 'SupplierProposal',
'table'=>'facture_fourn', 'table' => 'supplier_proposal',
'class'=>'FactureFournisseur', 'test' => $conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire
'test'=>$conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire), ),
'contract'=>array( 'order_supplier' => array(
'title'=>"ListContractAssociatedProject", 'title' => "ListSupplierOrdersAssociatedProject",
'class'=>'Contrat', 'table' => 'commande_fournisseur',
'table'=>'contrat', 'class' => 'CommandeFournisseur',
'test'=>$conf->contrat->enabled && $user->rights->contrat->lire), 'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire
'intervention'=>array( ),
'title'=>"ListFichinterAssociatedProject", 'invoice_supplier' => array(
'class'=>'Fichinter', 'title' => "ListSupplierInvoicesAssociatedProject",
'table'=>'fichinter', 'table' => 'facture_fourn',
'disableamount'=>1, 'class' => 'FactureFournisseur',
'test'=>$conf->ficheinter->enabled && $user->rights->ficheinter->lire), 'test' => $conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire
'trip'=>array( ),
'title'=>"ListTripAssociatedProject", 'contract' => array(
'class'=>'Deplacement', 'title' => "ListContractAssociatedProject",
'table'=>'deplacement', 'class' => 'Contrat',
'disableamount'=>1, 'table' => 'contrat',
'test'=>$conf->deplacement->enabled && $user->rights->deplacement->lire), 'test' => $conf->contrat->enabled && $user->rights->contrat->lire
'agenda'=>array( ),
'title'=>"ListActionsAssociatedProject", 'intervention' => array(
'class'=>'ActionComm', 'title' => "ListFichinterAssociatedProject",
'table'=>'actioncomm', 'class' => 'Fichinter',
'disableamount'=>1, 'table' => 'fichinter',
'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->lire) 'disableamount' => 1,
'test' => $conf->ficheinter->enabled && $user->rights->ficheinter->lire
),
'shipping' => array(
'title' => "ListShippingAssociatedProject",
'class' => 'Expedition',
'table' => 'expedition',
'disableamount' => 1,
'test' => $conf->expedition->enabled && $user->rights->expedition->lire
),
'trip' => array(
'title' => "ListTripAssociatedProject",
'class' => 'Deplacement',
'table' => 'deplacement',
'disableamount' => 1,
'test' => $conf->deplacement->enabled && $user->rights->deplacement->lire
),
'expensereport' => array(
'title' => "ListExpenseReportsAssociatedProject",
'class' => 'ExpenseReportLine',
'table' => 'expensereport_det',
'test' => $conf->expensereport->enabled && $user->rights->expensereport->lire
),
'donation' => array(
'title' => "ListDonationsAssociatedProject",
'class' => 'Don',
'table' => 'don',
'test' => $conf->don->enabled && $user->rights->don->lire
),
'loan' => array(
'title' => "ListLoanAssociatedProject",
'class' => 'Loan',
'table' => 'loan',
'test' => $conf->loan->enabled && $user->rights->loan->read
),
'chargesociales' => array(
'title' => "ListSocialContributionAssociatedProject",
'class' => 'ChargeSociales',
'table' => 'chargesociales',
'urlnew' => DOL_URL_ROOT . '/compta/sociales/card.php?action=create&projectid=' . $id,
'test' => $conf->tax->enabled && $user->rights->tax->charges->lire
),
'stock_mouvement' => array(
'title' => "ListMouvementStockProject",
'class' => 'MouvementStock',
'table' => 'stock_mouvement',
'test' => ($conf->stock->enabled && $user->rights->stock->mouvement->lire && ! empty($conf->global->STOCK_MOVEMENT_INTO_PROJECT_OVERVIEW))
),
'agenda' => array(
'title' => "ListActionsAssociatedProject",
'class' => 'ActionComm',
'table' => 'actioncomm',
'disableamount' => 1,
'test' => $conf->agenda->enabled && $user->rights->agenda->allactions->lire
)
); );
//Insert reference //Insert reference

BIN
htdocs/install/doctemplates/projects/template_project.odt
View File

Binary file not shown.