diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index aaf0d0cd796..2662f6f33f4 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -115,6 +115,11 @@ $companystatic=new Societe($db); $arrayfields=array( 'c.ref'=>array('label'=>$langs->trans("Contract"), 'checked'=>1, 'position'=>80), 'p.description'=>array('label'=>$langs->trans("Service"), 'checked'=>1, 'position'=>80), + 'cd.qty'=>array('label'=>$langs->trans("Qty"), 'checked'=>0, 'position'=>100), + 'cd.total_ht'=>array('label'=>$langs->trans("TotalHT"), 'checked'=>0, 'position'=>100), + 'cd.total_tva'=>array('label'=>$langs->trans("TotalVAT"), 'checked'=>0, 'position'=>100), + 'cd.tva_tx'=>array('label'=>$langs->trans("VAT"), 'checked'=>0, 'position'=>100), + 'cd.subprice'=>array('label'=>$langs->trans("PriceUHT"), 'checked'=>0, 'position'=>100), 's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>100), 'cd.date_ouverture_prevue'=>array('label'=>$langs->trans("DateStartPlannedShort"), 'checked'=>(($mode == "" || $mode == -1) || $mode == "0")), 'cd.date_ouverture'=>array('label'=>$langs->trans("DateStartRealShort"), 'checked'=>(($mode == "" || $mode == -1) || $mode > 0)), @@ -199,7 +204,11 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk $sql.= " cd.date_ouverture_prevue,"; $sql.= " cd.date_ouverture,"; $sql.= " cd.date_fin_validite,"; -$sql.= " cd.date_cloture,"; +$sql.= " cd.qty,"; +$sql.= " cd.total_ht,"; +$sql.= " cd.total_tva,"; +$sql.= " cd.tva_tx,"; +$sql.= " cd.subprice,"; //$sql.= " cd.date_c as date_creation,"; $sql.= " cd.tms as date_update"; // Add fields from extrafields @@ -362,6 +371,11 @@ print '
| '; + print ' | '; +} +if (! empty($arrayfields['cd.total_ht']['checked'])) +{ + print ''; + print ' | '; +} +if (! empty($arrayfields['cd.total_tva']['checked'])) +{ + print ''; + print ' | '; +} +if (! empty($arrayfields['cd.tva_tx']['checked'])) +{ + print ''; + print ' | '; +} +if (! empty($arrayfields['cd.subprice']['checked'])) +{ + print ''; + print ' | '; +} // Third party if (! empty($arrayfields['s.nom']['checked'])) { @@ -414,6 +454,8 @@ if (! empty($arrayfields['s.nom']['checked'])) print ''; print ''; } + + if (! empty($arrayfields['cd.date_ouverture_prevue']['checked'])) { print ''; @@ -557,6 +599,38 @@ while ($i < min($num,$limit)) print ' | '; } + if (! empty($arrayfields['cd.qty']['checked'])) + { + print ''; + print $obj->qty; + print ' | '; + } + if (! empty($arrayfields['cd.total_ht']['checked'])) + { + print ''; + print price($obj->total_ht); + print ' | '; + } + if (! empty($arrayfields['cd.total_tva']['checked'])) + { + print ''; + print price($obj->total_tva); + print ' | '; + } + if (! empty($arrayfields['cd.tva_tx']['checked'])) + { + print ''; + print price2num($obj->tva_tx).'%'; + print ' | '; + } + if (! empty($arrayfields['cd.subprice']['checked'])) + { + print ''; + print price($obj->subprice); + print ' | '; + } + + // Third party if (! empty($arrayfields['s.nom']['checked'])) {