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

modif mineure

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2003-08-04 12:46:47 +00:00
parent 28503baf43
commit e4e5dbe694
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/compta/facture.php3
View File

@ -574,10 +574,10 @@ else
print '<input type="hidden" name="action" value="updateligne">';
print '<input type="hidden" name="rowid" value="'.$rowid.'">';
print "<TR $bc[$var]>";
print '<TD><textarea name="desc" cols="60" rows="3">'.stripslashes($objp->description).'</textarea></TD>';
print '<TD align="center"><input type="text" name="qty" value="'.$objp->qty.'"></TD>';
print '<TD align="right"><input type="text" name="price" value="'.price($objp->price).'"></TD>';
print '<td colspan="2"><input type="submit"></td>';
print '<TD colspan="2"><textarea name="desc" cols="60" rows="3">'.stripslashes($objp->description).'</textarea></TD>';
print '<TD align="center"><input size="4" type="text" name="qty" value="'.$objp->qty.'"></TD>';
print '<TD align="right"><input size="8" type="text" name="price" value="'.price($objp->price).'"></TD>';
print '<td align="right" colspan="2"><input type="submit" value="Enregistrer"></td>';
print '</tr>' . "\n";
print "</form>\n";
}
@ -627,7 +627,7 @@ else
* Fin Ajout ligne
*
*/
if ($user->societe_id == 0)
if ($user->societe_id == 0 && $fac->paye == 0)
{
print "<p><TABLE border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\"><tr>";

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

@ -74,7 +74,7 @@ class Contrat
$sql = "SELECT rowid, enservice, fk_soc, fk_product, ".$this->db->pdate("mise_en_service")." as datemise";
$sql .= ", fk_user_mise_en_service, ".$this->db->pdate("date_cloture")." as datecloture";
$sql .= ", ".$this->db->pdate("fin_validite")." as datefin";
$sql .= ", fk_user_cloture";
$sql .= ", fk_user_cloture, fk_facture";
$sql .= " FROM llx_contrat WHERE rowid = $id";
$result = $this->db->query($sql) ;
@ -85,6 +85,7 @@ class Contrat
$this->id = $result["rowid"];
$this->enservice = $result["enservice"];
$this->factureid = $result["fk_facture"];
$this->mise_en_service = $result["datemise"];
$this->date_cloture = $result["datecloture"];
$this->date_fin_validite = $result["datefin"];