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

Fix: Les lignes sans produits tait perdues pour la creation de facture depuis un contrat.

Browse Source
This commit is contained in:
Laurent Destailleur 2005-10-26 19:00:46 +00:00
parent f823a9cdb0
commit 175515e700
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,11 +318,10 @@ class Contrat
*/ */
function fetch_lignes() function fetch_lignes()
{ {
dolibarr_syslog("Contrat.class.php::fetch_lignes");
$this->lignes = array(); $this->lignes = array();
/* // Selectionne les lignes contrats liées à un produit
* Lignes contrats liées à un produit
*/
$sql = "SELECT p.rowid, p.label, p.description as product_desc, p.ref,"; $sql = "SELECT p.rowid, p.label, p.description as product_desc, p.ref,";
$sql.= " d.description, d.price_ht, d.tva_tx, d.qty, d.remise_percent, d.subprice,"; $sql.= " d.description, d.price_ht, d.tva_tx, d.qty, d.remise_percent, d.subprice,";
$sql.= " d.date_ouverture_prevue, d.date_ouverture,"; $sql.= " d.date_ouverture_prevue, d.date_ouverture,";
@ -372,15 +371,14 @@ class Contrat
return -3; return -3;
} }
/* // Selectionne les lignes contrat liées à aucun produit
* Lignes contrat liées à aucun produit
*/
$sql = "SELECT d.qty, d.description, d.price_ht, d.subprice, d.tva_tx, d.rowid, d.remise_percent,"; $sql = "SELECT d.qty, d.description, d.price_ht, d.subprice, d.tva_tx, d.rowid, d.remise_percent,";
$sql.= " d.date_ouverture_prevue, d.date_ouverture,"; $sql.= " d.date_ouverture_prevue, d.date_ouverture,";
$sql.= " d.date_fin_validite, d.date_cloture"; $sql.= " d.date_fin_validite, d.date_cloture";
$sql.= " FROM ".MAIN_DB_PREFIX."contratdet as d"; $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as d";
$sql.= " WHERE d.fk_contrat = ".$this->id ." AND d.fk_product = 0"; $sql.= " WHERE d.fk_contrat = ".$this->id;
$sql.= " AND (d.fk_product IS NULL OR d.fk_product = 0)"; // fk_product = 0 gardé pour compatibilité
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {

8
htdocs/contrat/fiche.php
View File

@ -348,7 +348,7 @@ if ($_GET["action"] == 'create')
} }
print '<tr><td>'.$langs->trans("Comment").'</td><td valign="top">'; print '<tr><td>'.$langs->trans("Comment").'</td><td valign="top">';
print '<textarea name="note" wrap="soft" cols="60" rows="3"></textarea></td></tr>'; print '<textarea name="note" wrap="soft" cols="70" rows="3"></textarea></td></tr>';
print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></td></tr>'; print '<tr><td colspan="2" align="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></td></tr>';
print "</form>\n"; print "</form>\n";
@ -737,7 +737,7 @@ else
{ {
print $objp->label?$objp->label.'<br>':''; print $objp->label?$objp->label.'<br>':'';
} }
print '<textarea name="eldesc" cols="60" rows="1">'.$objp->description.'</textarea></td>'; print '<textarea name="eldesc" cols="70" rows="1">'.$objp->description.'</textarea></td>';
print '<td align="right">'; print '<td align="right">';
print $html->select_tva("eltva_tx",$objp->tva_tx); print $html->select_tva("eltva_tx",$objp->tva_tx);
print '</td>'; print '</td>';
@ -808,7 +808,7 @@ else
print '<td colspan="3">'; print '<td colspan="3">';
$html->select_produits('','p_idprod','',$conf->produit->limit_size); $html->select_produits('','p_idprod','',$conf->produit->limit_size);
print '<br>'; print '<br>';
print '<textarea name="desc" cols="50" rows="'.ROWS_2.'"></textarea>'; print '<textarea name="desc" cols="70" rows="'.ROWS_2.'"></textarea>';
print '</td>'; print '</td>';
print '<td align="center"><input type="text" class="flat" size="2" name="pqty" value="1"></td>'; print '<td align="center"><input type="text" class="flat" size="2" name="pqty" value="1"></td>';
@ -836,7 +836,7 @@ else
print '<input type="hidden" name="id" value="'.$id.'">'; print '<input type="hidden" name="id" value="'.$id.'">';
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><textarea name="desc" cols="50" rows="'.ROWS_2.'"></textarea></td>'; print '<td><textarea name="desc" cols="70" rows="'.ROWS_2.'"></textarea></td>';
print '<td>'; print '<td>';
$html->select_tva("tva_tx",$conf->defaulttx); $html->select_tva("tva_tx",$conf->defaulttx);