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

New: New way to edit contracts and line of contracts

Browse Source
This commit is contained in:
Laurent Destailleur 2008-02-12 23:45:07 +00:00
parent 0082e08044
commit 3ee13de002
9 changed files with 500 additions and 757 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/contrat/contrat.class.php
View File

@ -352,7 +352,7 @@ class Contrat extends CommonObject
$sql.= " WHERE d.fk_contrat = ".$this->id ." AND d.fk_product = p.rowid"; $sql.= " WHERE d.fk_contrat = ".$this->id ." AND d.fk_product = p.rowid";
$sql.= " ORDER by d.rowid ASC"; $sql.= " ORDER by d.rowid ASC";
dolibarr_syslog("Contrat.class.php::fetch_lignes sql=".$sql); dolibarr_syslog("Contrat::fetch_lignes sql=".$sql);
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
@ -384,7 +384,7 @@ class Contrat extends CommonObject
$ligne->date_fin_prevue = $objp->date_fin_validite; $ligne->date_fin_prevue = $objp->date_fin_validite;
$ligne->date_fin_reel = $objp->date_cloture; $ligne->date_fin_reel = $objp->date_cloture;
$this->lignes[$i] = $ligne; $this->lignes[] = $ligne;
//dolibarr_syslog("1 ".$ligne->desc); //dolibarr_syslog("1 ".$ligne->desc);
//dolibarr_syslog("2 ".$ligne->product_desc); //dolibarr_syslog("2 ".$ligne->product_desc);
$i++; $i++;
@ -414,7 +414,7 @@ class Contrat extends CommonObject
while ($j < $num) while ($j < $num)
{ {
$objp = $this->db->fetch_object($result); $objp = $this->db->fetch_object($result);
$ligne = new ContratLigne(); $ligne = new ContratLigne($this->db);
$ligne->id = $objp->rowid; $ligne->id = $objp->rowid;
$ligne->libelle = stripslashes($objp->description); $ligne->libelle = stripslashes($objp->description);
$ligne->desc = stripslashes($objp->description); $ligne->desc = stripslashes($objp->description);
@ -432,7 +432,7 @@ class Contrat extends CommonObject
$ligne->date_fin_prevue = $objp->date_fin_validite; $ligne->date_fin_prevue = $objp->date_fin_validite;
$ligne->date_fin_reel = $objp->date_cloture; $ligne->date_fin_reel = $objp->date_cloture;
$this->lignes[$i] = $ligne; $this->lignes[] = $ligne;
$i++; $i++;
$j++; $j++;
} }

348
htdocs/contrat/fiche.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr> * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -34,12 +34,13 @@ $langs->load("contracts");
$langs->load("orders"); $langs->load("orders");
$langs->load("companies"); $langs->load("companies");
$langs->load("bills"); $langs->load("bills");
$langs->load("products");
if (! $user->rights->contrat->lire) if (! $user->rights->contrat->lire)
accessforbidden(); accessforbidden();
// S<EFBFBD>curit<EFBFBD> acc<63>s client et commerciaux // Securite acces client et commerciaux
$contratid = isset($_GET["id"])?$_GET["id"]:''; $contratid = isset($_GET["id"])?$_GET["id"]:'';
if ($user->societe_id > 0) if ($user->societe_id > 0)
@ -67,7 +68,46 @@ if ($contratid && !$user->rights->commercial->client->voir)
} }
// Si ajout champ produit pr<70>d<EFBFBD>fini
/*
* Actions
*/
if ($_POST["action"] == 'confirm_active' && $_POST["confirm"] == 'yes' && $user->rights->contrat->activer)
{
$contrat = new Contrat($db);
$contrat->fetch($_GET["id"]);
$result = $contrat->active_line($user, $_GET["ligne"], $_GET["date"], $_GET["dateend"]);
if ($result > 0)
{
Header("Location: fiche.php?id=".$contrat->id);
exit;
}
else {
$mesg=$contrat->error;
}
}
if ($_POST["action"] == 'confirm_closeline' && $_POST["confirm"] == 'yes' && $user->rights->contrat->activer)
{
$contrat = new Contrat($db);
$contrat->fetch($_GET["id"]);
$result = $contrat->close_line($user, $_GET["ligne"], $_GET["dateend"]);
if ($result > 0)
{
Header("Location: fiche.php?id=".$contrat->id);
exit;
}
else {
$mesg=$contrat->error;
}
}
// Si ajout champ produit predefini
if ($_POST["mode"]=='predefined') if ($_POST["mode"]=='predefined')
{ {
$date_start=''; $date_start='';
@ -284,7 +324,7 @@ if ($_POST["action"] == 'addligne' && $user->rights->contrat->creer)
} }
} }
if ($_POST["action"] == 'updateligne' && $user->rights->contrat->creer && $_POST["save"]) if ($_POST["action"] == 'updateligne' && $user->rights->contrat->creer && ! $_POST["cancel"])
{ {
$contrat = new Contrat($db,"",$_GET["id"]); $contrat = new Contrat($db,"",$_GET["id"]);
if ($contrat->fetch($_GET["id"])) if ($contrat->fetch($_GET["id"]))
@ -317,12 +357,6 @@ if ($_POST["action"] == 'updateligne' && $user->rights->contrat->creer && $_POST
} }
} }
if ($_POST["action"] == 'updateligne' && $user->rights->contrat->creer && $_POST["cancel"])
{
Header("Location: fiche.php?id=".$_GET["id"]);
exit;
}
if ($_GET["action"] == 'deleteline' && $user->rights->contrat->creer) if ($_GET["action"] == 'deleteline' && $user->rights->contrat->creer)
{ {
$contrat = new Contrat($db); $contrat = new Contrat($db);
@ -375,6 +409,8 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
llxHeader('',$langs->trans("ContractCard"),"Contrat"); llxHeader('',$langs->trans("ContractCard"),"Contrat");
$form = new Form($db); $form = new Form($db);
$html = new Form($db);
$contratlignestatic=new ContratLigne($db); $contratlignestatic=new ContratLigne($db);
@ -554,8 +590,9 @@ else
$id = $_GET["id"]; $id = $_GET["id"];
if ($id > 0) if ($id > 0)
{ {
$contrat = New Contrat($db); $contrat = new Contrat($db);
$result=$contrat->fetch($id); $result=$contrat->fetch($id);
if ($result > 0) $result=$contrat->fetch_lignes();
if ($result < 0) if ($result < 0)
{ {
dolibarr_print_error($db,$contrat->error); dolibarr_print_error($db,$contrat->error);
@ -680,10 +717,29 @@ else
print '</form>'; print '</form>';
} }
echo '<br>';
$servicepos=(isset($_REQUEST["servicepos"])?$_REQUEST["servicepos"]:1);
$nbofservices=sizeof($contrat->lignes);
$colorb='333333';
/* /*
* Lignes de contrats * Lignes de contrats
*/ */
echo '<br><table class="noborder" width="100%">';
// Menu list of services
print '<table class="noborder" width="100%">'; // Array with (n*2)+1 lines
$cursorline=1;
while ($cursorline <= $nbofservices)
{
print '<tr height="16" '.$bc[false].'>';
print '<td class="tab" width="90" style="border-left: 1px solid #'.$colorb.'; border-top: 1px solid #'.$colorb.'; border-bottom: 1px solid #'.$colorb.';">';
print $langs->trans("ServiceNb",$cursorline).'</td>';
print '<td class="tab" style="border-right: 1px solid #'.$colorb.'; border-top: 1px solid #'.$colorb.'; border-bottom: 1px solid #'.$colorb.';" rowspan="2">';
// Area with common detail of line
print '<table class="noborder" width="100%">';
$sql = "SELECT cd.statut, cd.label as label_det, cd.fk_product, cd.description, cd.price_ht, cd.qty, cd.rowid, cd.tva_tx, cd.remise_percent, cd.subprice,"; $sql = "SELECT cd.statut, cd.label as label_det, cd.fk_product, cd.description, cd.price_ht, cd.qty, cd.rowid, cd.tva_tx, cd.remise_percent, cd.subprice,";
$sql.= " ".$db->pdate("cd.date_ouverture_prevue")." as date_debut, ".$db->pdate("cd.date_ouverture")." as date_debut_reelle,"; $sql.= " ".$db->pdate("cd.date_ouverture_prevue")." as date_debut, ".$db->pdate("cd.date_ouverture")." as date_debut_reelle,";
@ -691,17 +747,13 @@ else
$sql.= " p.ref, p.label"; $sql.= " p.ref, p.label";
$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd"; $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
$sql.= " WHERE cd.fk_contrat = ".$id; $sql.= " WHERE cd.rowid = ".$contrat->lignes[$cursorline-1]->id;
$sql.= " ORDER BY cd .rowid";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows($result); $total = 0;
$i = 0; $total = 0;
if ($num)
{
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Service").'</td>'; print '<td>'.$langs->trans("Service").'</td>';
print '<td width="50" align="center">'.$langs->trans("VAT").'</td>'; print '<td width="50" align="center">'.$langs->trans("VAT").'</td>';
@ -709,19 +761,16 @@ else
print '<td width="30" align="center">'.$langs->trans("Qty").'</td>'; print '<td width="30" align="center">'.$langs->trans("Qty").'</td>';
print '<td width="50" align="right">'.$langs->trans("ReductionShort").'</td>'; print '<td width="50" align="right">'.$langs->trans("ReductionShort").'</td>';
print '<td width="30">&nbsp;</td>'; print '<td width="30">&nbsp;</td>';
print '<td width="30" align="center">'.$langs->trans("Status").'</td>';
print "</tr>\n"; print "</tr>\n";
}
$var=true; $var=true;
while ($i < $num)
{
$objp = $db->fetch_object($result); $objp = $db->fetch_object($result);
$var=!$var; $var=!$var;
if ($_GET["action"] != 'editline' || $_GET["rowid"] != $objp->rowid) if ($_GET["action"] != 'editline' || $_GET["rowid"] != $objp->rowid)
{ {
print '<tr '.$bc[$var].' valign="top">'; print '<tr '.$bc[$var].' valign="top">';
// Libelle // Libelle
if ($objp->fk_product > 0) if ($objp->fk_product > 0)
@ -741,7 +790,7 @@ else
print '<td align="center">'.vatrate($objp->tva_tx).'%</td>'; print '<td align="center">'.vatrate($objp->tva_tx).'%</td>';
// Prix // Prix
print '<td align="right">'.price($objp->subprice)."</td>\n"; print '<td align="right">'.price($objp->subprice)."</td>\n";
// Quantit<69> // Quantite
print '<td align="center">'.$objp->qty.'</td>'; print '<td align="center">'.$objp->qty.'</td>';
// Remise // Remise
if ($objp->remise_percent > 0) if ($objp->remise_percent > 0)
@ -772,21 +821,13 @@ else
} }
print '</td>'; print '</td>';
// Statut
print '<td align="center">';
// Activation desativation du contact
if ($contrat->statut > 0) print '<a href="'.DOL_URL_ROOT.'/contrat/ligne.php?id='.$contrat->id.'&amp;ligne='.$objp->rowid.'">';;
print $contratlignestatic->LibStatut($objp->statut,3);
if ($contrat->statut >= 0) print '</a>';
print '</td>';
print "</tr>\n"; print "</tr>\n";
// Dates de en service pr<70>vues et effectives // Dates de en service prevues et effectives
if ($objp->subprice >= 0) if ($objp->subprice >= 0)
{ {
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td colspan="7">'; print '<td colspan="6">';
// Date pr<70>vues // Date pr<70>vues
print $langs->trans("DateStartPlanned").': '; print $langs->trans("DateStartPlanned").': ';
@ -804,32 +845,10 @@ else
} }
else print $langs->trans("Unknown"); else print $langs->trans("Unknown");
print '<br>';
// Si pas encore activ<69>
if (! $objp->date_debut_reelle) {
print $langs->trans("DateStartReal").': ';
if ($objp->date_debut_reelle) print dolibarr_print_date($objp->date_debut_reelle);
else print $langs->trans("ContractStatusNotRunning");
}
// Si activ<69> et en cours
if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
print $langs->trans("DateStartReal").': ';
print dolibarr_print_date($objp->date_debut_reelle);
}
// Si d<>sactiv<69>
if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
print $langs->trans("DateStartReal").': ';
print dolibarr_print_date($objp->date_debut_reelle);
print ' &nbsp;-&nbsp; ';
print $langs->trans("DateEndReal").': ';
print dolibarr_print_date($objp->date_fin_reelle);
}
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
} }
} }
// Ligne en mode update // Ligne en mode update
else else
{ {
@ -867,25 +886,12 @@ else
$form->select_date($objp->date_debut,"date_start_update",0,0,($objp->date_debut>0?0:1),"update"); $form->select_date($objp->date_debut,"date_start_update",0,0,($objp->date_debut>0?0:1),"update");
print ' &nbsp; '.$langs->trans("DateEndPlanned").' '; print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';
$form->select_date($objp->date_fin,"date_end_update",0,0,($objp->date_fin>0?0:1),"update"); $form->select_date($objp->date_fin,"date_end_update",0,0,($objp->date_fin>0?0:1),"update");
if ($objp->statut >= 4)
{
print '<br>';
print $langs->trans("DateStartReal").' ';
$form->select_date($objp->date_debut_reelle,"date_start_real_update",0,0,($objp->date_debut_reelle>0?0:1),"update");
print ' &nbsp; ';
if ($objp->statut == 5)
{
print $langs->trans("DateEndReal").' ';
$form->select_date($objp->date_fin_reelle,"date_end_real_update",0,0,($objp->date_fin_reelle>0?0:1),"update");
}
}
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
print "</form>\n"; print "</form>\n";
} }
$i++;
}
$db->free($result); $db->free($result);
} }
else else
@ -893,12 +899,201 @@ else
dolibarr_print_error($db); dolibarr_print_error($db);
} }
print "</table>";
/*
* Confirmation de la validation activation
*/
if ($_REQUEST["action"] == 'active' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $contrat->lignes[$cursorline-1]->id == $_GET["ligne"])
{
//print '<br />';
$dateactstart = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$dateactend = dolibarr_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$contrat->id."&amp;ligne=".$_GET["ligne"]."&amp;date=".$dateactstart."&amp;dateend=".$dateactend,$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",strftime("%A %d %B %Y", $dateactstart)),"confirm_active");
//print '<br />';
}
/*
* Confirmation de la validation fermeture
*/
if ($_REQUEST["action"] == 'closeline' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $contrat->lignes[$cursorline-1]->id == $_GET["ligne"])
{
//print '<br />';
$dateactstart = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$dateactend = dolibarr_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
$html->form_confirm($_SERVER["PHP_SELF"]."?id=".$contrat->id."&amp;ligne=".$_GET["ligne"]."&amp;date=".$dateactstart."&amp;dateend=".$dateactend,$langs->trans("CloseService"),$langs->trans("ConfirmCloseService",strftime("%A %d %B %Y", $dateactend)),"confirm_closeline");
//print '<br />';
}
// Area with activation info
if ($contrat->statut > 0)
{
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Activation").'</td>';
print '<td width="30">&nbsp;</td>';
print "</tr>\n";
print '<tr '.$bc[false].'>';
print '<td>'.$langs->trans("Status").': '.$contrat->lignes[$cursorline-1]->getLibStatut(4).'</td>';
print '<td width="30">&nbsp;</td>';
print "</tr>\n";
print '<tr '.$bc[false].'>';
print '<td>';
// Si pas encore active
if (! $objp->date_debut_reelle) {
print $langs->trans("DateStartReal").': ';
if ($objp->date_debut_reelle) print dolibarr_print_date($objp->date_debut_reelle);
else print $langs->trans("ContractStatusNotRunning");
}
// Si active et en cours
if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
print $langs->trans("DateStartReal").': ';
print dolibarr_print_date($objp->date_debut_reelle);
}
// Si desactive
if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
print $langs->trans("DateStartReal").': ';
print dolibarr_print_date($objp->date_debut_reelle);
print ' &nbsp;-&nbsp; ';
print $langs->trans("DateEndReal").': ';
print dolibarr_print_date($objp->date_fin_reelle);
}
print '</td>';
// Statut
print '<td align="center">';
if ($user->societe_id == 0)
{
if ($contrat->statut > 0 && $_REQUEST["action"] != 'activateline' && $_REQUEST["action"] != 'unactivateline')
{
$action='activateline';
if ($objp->statut == 4) $action='unactivateline';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$contrat->id.'&amp;ligne='.$contrat->lignes[$cursorline-1]->id.'&amp;action='.$action.'">';
print img_edit();
print '</a>';
}
}
print '</tr>';
print '</table>';
}
if ($user->rights->contrat->activer && $_REQUEST["action"] == 'activateline' && $contrat->lignes[$cursorline-1]->id == $_GET["ligne"])
{
/**
* Activer la ligne de contrat
*/
print '<form name="active" action="'.$_SERVER["PHP_SELF"].'?id='.$contrat->id.'&amp;ligne='.$_GET["ligne"].'&amp;action=active" method="post">';
print '<table class="noborder" width="100%">';
//print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("Status").'</td></tr>';
// Definie date debut et fin par defaut
if ($_POST["remonth"]) $dateactstart = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
elseif (! $dateactstart) $dateactstart = time();
if ($_POST["endmonth"]) $dateactend = dolibarr_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
elseif (! $dateactend)
{
if ($objp->fk_product > 0)
{
$product=new Product($db);
$product->fetch($objp->fk_product);
$dateactend = dolibarr_time_plus_duree (time(), $product->duration_value, $product->duration_unit);
}
}
print '<tr '.$bc[$var].'><td>'.$langs->trans("DateServiceActivate").'</td><td>';
print $html->select_date($dateactstart,'','','','',"active");
print '</td>';
print '<td>'.$langs->trans("DateEndPlanned").'</td><td>';
print $html->select_date($dateactend,"end",'','','',"active");
print '</td>';
print '<td align="center" rowspan="2" valign="middle">';
print '<input type="submit" class="button" name="activate" value="'.$langs->trans("Activate").'"><br>';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</td>';
print '</tr>';
print '<tr '.$bc[$var].'><td>'.$langs->trans("Comment").'</td><td colspan="3"><input size="80" type="text" name="commentaire" value="'.$_POST["commentaire"].'"></td></tr>';
print '</table>';
print '</form>';
}
if ($user->rights->contrat->activer && $_REQUEST["action"] == 'unactivateline' && $contrat->lignes[$cursorline-1]->id == $_GET["ligne"])
{
/**
* Desactiver la ligne de contrat
*/
print '<form name="closeline" action="'.$_SERVER["PHP_SELF"].'?id='.$contrat->id.'&amp;ligne='.$contrat->lignes[$cursorline-1]->id.'&amp;action=closeline" method="post">';
print '<table class="noborder" width="100%">';
// Definie date debut et fin par defaut
$dateactstart = $objp->date_debut_reelle;
if ($_POST["remonth"]) $dateactstart = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
elseif (! $dateactstart) $dateactstart = time();
$dateactend = $objp->date_fin_reelle;
if ($_POST["endmonth"]) $dateactend = dolibarr_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
elseif (! $dateactend)
{
if ($objp->fk_product > 0)
{
$product=new Product($db);
$product->fetch($objp->fk_product);
$dateactend = dolibarr_time_plus_duree (time(), $product->duration_value, $product->duration_unit);
}
}
$now=mktime();
if ($dateactend > $now) $dateactend=$now;
print '<tr '.$bc[$var].'><td colspan="2">';
if ($objp->statut >= 4)
{
if ($objp->statut == 4)
{
print $langs->trans("DateEndReal").' ';
$form->select_date($dateactend,"end",0,0,($objp->date_fin_reelle>0?0:1),"closeline");
}
}
print '</td>';
print '<td align="right" rowspan="2"><input type="submit" class="button" name="close" value="'.$langs->trans("Close").'"><br>';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</td></tr>';
print '<tr '.$bc[$var].'><td>'.$langs->trans("Comment").'</td><td><input size="70" type="text" class="flat" name="commentaire" value="'.$_POST["commentaire"].'"></td></tr>';
print '</table>';
print '</form>';
}
print '</td>'; // End td if line is 1
print '</tr>';
print '<tr><td style="border-right: 1px solid #'.$colorb.'">&nbsp;</td></tr>';
$cursorline++;
}
print '</table>';
/* /*
* Ajouter une ligne produit/service * Ajouter une ligne produit/service
*/ */
if ($user->rights->contrat->creer && $contrat->statut == 0) if ($user->rights->contrat->creer && $contrat->statut == 0)
{ {
print '<br>';
print '<table class="noborder" width="100%">'; // Array with (n*2)+1 lines
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print '<td>'.$langs->trans("Service").'</td>'; print '<td>'.$langs->trans("Service").'</td>';
print '<td align="center">'.$langs->trans("VAT").'</td>'; print '<td align="center">'.$langs->trans("VAT").'</td>';
@ -975,11 +1170,15 @@ else
print '</tr>'; print '</tr>';
print '</form>'; print '</form>';
print '</table>';
} }
print "</table>";
/*
* Fin Ajout ligne
*/ //print '</td><td align="center" class="tab" style="padding: 4px; border-right: 1px solid #'.$colorb.'; border-top: 1px solid #'.$colorb.'; border-bottom: 1px solid #'.$colorb.';">';
//print '</td></tr></table>';
print '</div>'; print '</div>';
@ -1018,6 +1217,7 @@ else
} }
print "</div>"; print "</div>";
print '<br>';
} }
} }

462
htdocs/contrat/ligne.php
View File

@ -1,462 +0,0 @@
<?php
/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*/
/**
\file htdocs/contrat/ligne.php
\ingroup contrat
\brief Fiche contrat
\version $Revision$
*/
require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
require_once(DOL_DOCUMENT_ROOT."/product.class.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php");
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php");
$langs->load("contracts");
$langs->load("orders");
$langs->load("companies");
$langs->load("bills");
if (!$user->rights->contrat->lire)
accessforbidden();
/*
* S<EFBFBD>curit<EFBFBD> acc<EFBFBD>s client
*/
if ($user->societe_id > 0)
{
$action = '';
$socid = $user->societe_id;
}
/*
* Actions
*/
if ($_POST["action"] == 'confirm_active' && $_POST["confirm"] == 'yes' && $user->rights->contrat->activer)
{
$contrat = new Contrat($db);
$contrat->fetch($_GET["id"]);
$result = $contrat->active_line($user, $_GET["ligne"], $_GET["date"], $_GET["dateend"]);
if ($result > 0)
{
Header("Location: fiche.php?id=".$contrat->id);
exit;
}
else {
$mesg=$contrat->error;
}
}
if ($_POST["action"] == 'confirm_close' && $_POST["confirm"] == 'yes' && $user->rights->contrat->activer)
{
$contrat = new Contrat($db);
$contrat->fetch($_GET["id"]);
$result = $contrat->close_line($user, $_GET["ligne"], $_GET["dateend"]);
if ($result > 0)
{
Header("Location: fiche.php?id=".$contrat->id);
exit;
}
else {
$mesg=$contrat->error;
}
}
llxHeader('',$langs->trans("ContractCard"),"Contrat");
$html = new Form($db);
/* *************************************************************************** */
/* */
/* Mode vue et edition */
/* */
/* *************************************************************************** */
$lineid = $_GET["ligne"];
if ($lineid > 0)
{
$line = new ContratLigne($db);
$result=$line->fetch($lineid);
$contrat = New Contrat($db);
$result=$contrat->fetch($line->fk_contrat);
if ($result > 0)
{
$soc = new Societe($db);
$soc->fetch($contrat->socid);
$author = new User($db);
$author->id = $contrat->user_author_id;
$author->fetch();
$head = contract_prepare_head($contrat);
$h=sizeof($head);
// On ajout onglet service
$head[$h][0] = DOL_URL_ROOT.'/contrat/ligne.php?id='.$contrat->id."&ligne=".$line->id;
$head[$h][1] = $langs->trans($langs->trans("EditServiceLine"));
$hselected = $h;
dolibarr_fiche_head($head, $hselected, $langs->trans("Contract"));
/*
* Confirmation de la validation activation
*/
if ($_GET["action"] == 'active' && $user->rights->contrat->activer)
{
$dateactstart = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$dateactend = dolibarr_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
$html->form_confirm("ligne.php?id=".$contrat->id."&amp;ligne=".$_GET["ligne"]."&amp;date=".$dateactstart."&amp;dateend=".$dateactend,$langs->trans("ActivateService"),$langs->trans("ConfirmActivateService",strftime("%A %d %B %Y", $dateactstart)),"confirm_active");
print '<br />';
}
/*
* Confirmation de la validation fermeture
*/
if ($_GET["action"] == 'close' && $user->rights->contrat->activer)
{
$dateactstart = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$dateactend = dolibarr_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
$html->form_confirm("ligne.php?id=".$contrat->id."&amp;ligne=".$_GET["ligne"]."&amp;date=".$dateactstart."&amp;dateend=".$dateactend,$langs->trans("CloseService"),$langs->trans("ConfirmCloseService",strftime("%A %d %B %Y", $dateactstart)),"confirm_close");
print '<br />';
}
/*
* Contrat
*/
print '<table class="border" width="100%">';
// Reference du contrat
print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td colspan="3">';
print $contrat->ref;
print "</td></tr>";
// Customer
print "<tr><td>".$langs->trans("Customer")."</td>";
print '<td colspan="3">'.$soc->getNomUrl(1).'</td></tr>';
// Ligne info remises tiers
print '<tr><td>'.$langs->trans('Discount').'</td><td>';
if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
else print $langs->trans("CompanyHasNoRelativeDiscount");
$absolute_discount=$soc->getAvailableDiscounts();
print '. ';
if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie));
else print $langs->trans("CompanyHasNoAbsoluteDiscount");
print '.';
print '</td></tr>';
// Statut contrat
print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
print $contrat->getLibStatut(2);
print "</td></tr>";
// Date
print '<tr><td>'.$langs->trans("Date").'</td>';
print '<td colspan="3">'.dolibarr_print_date($contrat->date_contrat,"dayhour")."</td></tr>\n";
// Projet
if ($conf->projet->enabled)
{
$langs->load("projects");
print '<tr><td>';
print '<table width="100%" class="nobordernopadding"><tr><td>';
print $langs->trans("Project");
print '</td>';
if ($_GET["action"] != "classer") print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classer&amp;id='.$id.'&amp;ligne='.$_GET["ligne"].'">'.img_edit($langs->trans("SetProject")).'</a></td>';
print '</tr></table>';
print '</td><td colspan="3">';
if ($_GET["action"] == "classer")
{
$html->form_project($_SERVER["PHP_SELF"]."?id=$id&amp;ligne=".$_GET["ligne"],$contrat->fk_soc,$contrat->fk_projet,"projetid");
}
else
{
$html->form_project($_SERVER["PHP_SELF"]."?id=$id&amp;ligne=".$_GET["ligne"],$contrat->fk_soc,$contrat->fk_projet,"none");
}
print "</td></tr>";
}
print "</table>";
/*
* Lignes de contrats
*/
print '<br><table class="noborder" width="100%">';
$sql = "SELECT cd.statut, cd.label, cd.fk_product, cd.description, cd.price_ht, cd.qty, cd.rowid, cd.tva_tx, cd.remise_percent, cd.subprice,";
$sql.= " ".$db->pdate("cd.date_ouverture_prevue")." as date_debut, ".$db->pdate("cd.date_ouverture")." as date_debut_reelle,";
$sql.= " ".$db->pdate("cd.date_fin_validite")." as date_fin, ".$db->pdate("cd.date_cloture")." as date_fin_reelle,";
$sql.= " p.ref, p.label";
$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
$sql.= " WHERE cd.fk_contrat = ".$contrat->id;
$sql.= " AND cd.rowid = ".$line->id;
$sql.= " ORDER BY cd.rowid";
$result = $db->query($sql);
if ($result)
{
$num = $db->num_rows($result);
$i = 0; $total = 0;
if ($num)
{
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Service").'</td>';
print '<td width="50" align="center">'.$langs->trans("VAT").'</td>';
print '<td width="50" align="right">'.$langs->trans("PriceUHT").'</td>';
print '<td width="30" align="center">'.$langs->trans("Qty").'</td>';
print '<td width="50" align="right">'.$langs->trans("ReductionShort").'</td>';
print '<td width="16">&nbsp;</td>';
print '<td width="30" align="center">'.$langs->trans("Status").'</td>';
print "</tr>\n";
}
$contratlignestatic = new ContratLigne($db);
$var=true;
while ($i < $num)
{
$objp = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var] valign=\"top\">\n";
// Libelle
if ($objp->fk_product > 0)
{
print '<td>';
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
print img_object($langs->trans("ShowService"),"service").' '.$objp->ref.'</a>';
print $objp->label?' - '.$objp->label:'';
if ($objp->description) print '<br />'.stripslashes(nl2br($objp->description));
print '</td>';
}
else
{
print "<td>".stripslashes(nl2br($objp->description))."</td>\n";
}
// TVA
print '<td align="center">'.vatrate($objp->tva_tx).'%</td>';
print '<td align="right">'.price($objp->subprice)."</td>\n";
print '<td align="center">'.$objp->qty.'</td>';
if ($objp->remise_percent > 0)
{
print '<td align="right">'.$objp->remise_percent."%</td>\n";
}
else
{
print '<td>&nbsp;</td>';
}
print '<td>&nbsp;</td>';
// Statut
print '<td align="center">';
print $contratlignestatic->LibStatut($objp->statut,3);
print '</td>';
print "</tr>\n";
if ($objp->date_debut) $dateactstart=$objp->date_debut;
if ($objp->date_fin) $dateactend=$objp->date_fin;
// Dates de en service pr<70>vues et effectives
print '<tr '.$bc[$var].'>';
print '<td colspan="7">';
// Date pr<70>vues
print $langs->trans("DateStartPlanned").': ';
if ($objp->date_debut) {
print dolibarr_print_date($objp->date_debut);
// Warning si date prevu pass<73>e et pas en service
if ($objp->statut == 0 && $objp->date_debut < time() - $conf->contrat->warning_delay) { print " ".img_warning($langs->trans("Late")); }
}
else print $langs->trans("Unknown");
print ' &nbsp;-&nbsp; ';
print $langs->trans("DateEndPlanned").': ';
if ($objp->date_fin) {
print dolibarr_print_date($objp->date_fin);
if ($objp->statut == 4 && $objp->date_fin < time() - $conf->contrat->warning_delay) { print " ".img_warning($langs->trans("Late")); }
}
else print $langs->trans("Unknown");
print '<br>';
// Si pas encore activ<69>
if (! $objp->date_debut_reelle) {
print $langs->trans("DateStartReal").': ';
if ($objp->date_debut_reelle) print dolibarr_print_date($objp->date_debut_reelle);
else print $langs->trans("ContractStatusNotRunning");
}
// Si activ<69> et en cours
if ($objp->date_debut_reelle && ! $objp->date_fin_reelle) {
print $langs->trans("DateStartReal").': ';
print dolibarr_print_date($objp->date_debut_reelle);
}
// Si d<>sactiv<69>
if ($objp->date_debut_reelle && $objp->date_fin_reelle) {
print $langs->trans("DateStartReal").': ';
print dolibarr_print_date($objp->date_debut_reelle);
print ' &nbsp;-&nbsp; ';
print $langs->trans("DateEndReal").': ';
print dolibarr_print_date($objp->date_fin_reelle);
}
print '</td>';
print '</tr>';
$i++;
}
$db->free($result);
}
else
{
dolibarr_print_error($db);
}
print '</table>';
print '</div>';
if ($user->rights->contrat->activer && $contrat->statut == 1 && $objp->statut <> 4)
{
/**
* Activer la ligne de contrat
*/
$form = new Form($db);
print '<form name="active" action="ligne.php?id='.$contrat->id.'&amp;ligne='.$_GET["ligne"].'&amp;action=active" method="post">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="5">'.$langs->trans("ActivateService").'</td></tr>';
// Definie date debut et fin par defaut
if ($_POST["remonth"]) $dateactstart = mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
elseif (! $dateactstart) $dateactstart = time();
if ($_POST["endmonth"]) $dateactend = mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
elseif (! $dateactend)
{
if ($objp->fk_product > 0)
{
$product=new Product($db);
$product->fetch($objp->fk_product);
$dateactend = dolibarr_time_plus_duree (time(), $product->duration_value, $product->duration_unit);
}
}
print '<tr '.$bc[$var].'><td>'.$langs->trans("DateServiceActivate").'</td><td>';
print $form->select_date($dateactstart,'','','','',"active");
print '</td>';
print '<td>'.$langs->trans("DateEndPlanned").'</td><td>';
print $form->select_date($dateactend,"end",'','','',"active");
print '</td>';
print '<td align="center" rowspan="2" valign="middle"><input type="submit" class="button" value="'.$langs->trans("Activate").'"></td>';
print '</tr>';
print '<tr '.$bc[$var].'><td>'.$langs->trans("Comment").'</td><td colspan="3"><input size="80" type="text" name="commentaire" value="'.$_POST["commentaire"].'"></td></tr>';
print '</table>';
print '</form>';
}
if ($user->rights->contrat->activer && $contrat->statut == 1 && $objp->statut == 4)
{
/**
* D<EFBFBD>sactiver la ligne de contrat
*/
$form = new Form($db);
print '<form name="close" action="ligne.php?id='.$contrat->id.'&amp;ligne='.$line->id.'&amp;action=close" method="post">';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("CloseService").'</td></tr>';
// Definie date debut et fin par defaut
if ($_POST["remonth"]) $dateactstart = dolibarr_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
elseif (! $dateactstart) $dateactstart = time();
if ($_POST["endmonth"]) $dateactend = dolibarr_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
elseif (! $dateactend)
{
if ($objp->fk_product > 0)
{
$product=new Product($db);
$product->fetch($objp->fk_product);
$dateactend = dolibarr_time_plus_duree (time(), $product->duration_value, $product->duration_unit);
}
}
$now=mktime();
if ($dateactend > $now) $dateactend=$now;
print '<tr '.$bc[$var].'><td>'.$langs->trans("DateEndReal").'</td><td>';
print $form->select_date($dateactend,"end",'','','',"close");
print '</td>';
print '<td align="right"><input type="submit" class="button" value="'.$langs->trans("Close").'"></td></tr>';
print '<tr '.$bc[$var].'><td>'.$langs->trans("Comment").'</td><td colspan="3"><input size="70" type="text" class="flat" name="commentaire" value="'.$_POST["commentaire"].'"></td></tr>';
print '</table>';
print '</form>';
}
}
else
{
// Contrat non trouv<75>
print "Contrat inexistant ou acc<63>s refus<75>";
}
}
$db->close();
llxFooter('$Date$ - $Revision$');
?>

4
htdocs/langs/en_US/contracts.lang
View File

@ -31,10 +31,10 @@ CloseAContract=Close a contract
ConfirmDeleteAContract=Are you sure you want to delete this contract ? ConfirmDeleteAContract=Are you sure you want to delete this contract ?
ConfirmValidateContract=Are you sure you want to validate this contract ? ConfirmValidateContract=Are you sure you want to validate this contract ?
ConfirmCloseContract=Are you sure you want to close this contract ? ConfirmCloseContract=Are you sure you want to close this contract ?
ConfirmCloseService=Are you sure you want to close this service ? ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b> ?
ValidateAContract=Validate a contract ValidateAContract=Validate a contract
ActivateService=Activate service ActivateService=Activate service
ConfirmActivateService=Are you sure you want to activate this service with date of %s ? ConfirmActivateService=Are you sure you want to activate this service with date of <b>%s</b> ?
DateServiceActivate=Date of service activation DateServiceActivate=Date of service activation
DateServiceUnactivate=Date of service unactivation DateServiceUnactivate=Date of service unactivation
DateServiceStart=Date for beginning of service DateServiceStart=Date for beginning of service

1
htdocs/langs/en_US/products.lang
View File

@ -135,3 +135,4 @@ RecordedProducts=Products recorded
RecordedProductsAndServices=Products/services recorded RecordedProductsAndServices=Products/services recorded
GenerateThumb=Generate thumb GenerateThumb=Generate thumb
ProductCanvasAbility=Use special "canvas" addons ProductCanvasAbility=Use special "canvas" addons
ServiceNb=Service #%s

2
htdocs/langs/fr_BE/contracts.lang
View File

@ -31,7 +31,7 @@ CloseAContract=Cl
ConfirmDeleteAContract=Êtes-vous certain de vouloir supprimer ce contrat ? ConfirmDeleteAContract=Êtes-vous certain de vouloir supprimer ce contrat ?
ConfirmValidateContract=Êtes-vous certain de vouloir valider ce contrat ? ConfirmValidateContract=Êtes-vous certain de vouloir valider ce contrat ?
ConfirmCloseContract=Êtes-vous certain de vouloir clôturer ce contrat ? ConfirmCloseContract=Êtes-vous certain de vouloir clôturer ce contrat ?
ConfirmCloseService=Êtes-vous certain de vouloir clôturer ce service? ConfirmCloseService=Etes-vous sûr de vouloir fermer ce service à la date du <b>%s</b> ?
ValidateAContract=Valider un contrat ValidateAContract=Valider un contrat
ActivateService=Activer service ActivateService=Activer service
ConfirmActivateService=Êtes-vous certain de vouloir activer ce service en date du %s? ConfirmActivateService=Êtes-vous certain de vouloir activer ce service en date du %s?

4
htdocs/langs/fr_FR/contracts.lang
View File

@ -31,10 +31,10 @@ CloseAContract=Cloturer un contract
ConfirmDeleteAContract=Etes-vous sûr de vouloir supprimer ce contrat ? ConfirmDeleteAContract=Etes-vous sûr de vouloir supprimer ce contrat ?
ConfirmValidateContract=Etes-vous sûr de vouloir valider ce contrat ? ConfirmValidateContract=Etes-vous sûr de vouloir valider ce contrat ?
ConfirmCloseContract=Etes-vous sûr de vouloir cloturer ce contrat ? ConfirmCloseContract=Etes-vous sûr de vouloir cloturer ce contrat ?
ConfirmCloseService=Etes-vous sûr de vouloir fermer ce service ? ConfirmCloseService=Etes-vous sûr de vouloir fermer ce service à la date du <b>%s</b> ?
ValidateAContract=Valider un contrat ValidateAContract=Valider un contrat
ActivateService=Activer le service ActivateService=Activer le service
ConfirmActivateService=Etes-vous sûr de vouloir activer ce service en date du %s ConfirmActivateService=Etes-vous sûr de vouloir activer ce service en date du <b>%s</b> ?
DateServiceActivate=Date activation du service DateServiceActivate=Date activation du service
DateServiceUnactivate=Date désactivation du service DateServiceUnactivate=Date désactivation du service
DateServiceStart=Date début du service DateServiceStart=Date début du service

1
htdocs/langs/fr_FR/products.lang
View File

@ -135,3 +135,4 @@ RecordedProducts=Produits en vente
RecordedProductsAndServices=Produits/services en vente RecordedProductsAndServices=Produits/services en vente
GenerateThumb=Générer la vignette GenerateThumb=Générer la vignette
ProductCanvasAbility=Utiliser les extensions speciales "canvas" ProductCanvasAbility=Utiliser les extensions speciales "canvas"
ServiceNb=Service no %s

3
htdocs/theme/eldy/eldy.css.php
View File

@ -692,6 +692,9 @@ a.tabimage {
white-space: nowrap; white-space: nowrap;
} }
td.tab {
background: #dee7ec;
}
/* ============================================================================== */ /* ============================================================================== */
/* Boutons actions */ /* Boutons actions */