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

bugfix

Browse Source
This commit is contained in:
Regis Houssin 2006-02-16 18:38:07 +00:00
parent e2fe91096c
commit 0880a1b62d
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/commande/commande.class.php
View File

@ -107,7 +107,10 @@ class Commande
} }
$this->soc_id = $propal->soc_id; $this->soc_id = $propal->soc_id;
$this->cond_reglement_id = $propal->cond_reglement_id;
$this->mode_reglement_id = $propal->mode_reglement_id;
/* Définit la société comme un client */ /* Définit la société comme un client */
$soc = new Societe($this->db); $soc = new Societe($this->db);
$soc->id = $this->soc_id; $soc->id = $this->soc_id;

15
htdocs/commande/fiche.php
View File

@ -301,17 +301,6 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
$soc = new Societe($db); $soc = new Societe($db);
$soc->fetch($obj->idp); $soc->fetch($obj->idp);
if ($propalid)
{
$cond_reglement_id = $obj->fk_cond_reglement;
$mode_reglement_id = $obj->fk_mode_reglement;
}
else
{
$cond_reglement_id = $soc->cond_reglement;
$mode_reglement_id = $soc->mode_reglement;
}
$nbrow=4; $nbrow=4;
if ($conf->projet->enabled) $nbrow++; if ($conf->projet->enabled) $nbrow++;
@ -343,12 +332,12 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
// Conditions de réglement // Conditions de réglement
print '<tr><td nowrap>'.$langs->trans('PaymentConditions').'</td><td>'; print '<tr><td nowrap>'.$langs->trans('PaymentConditions').'</td><td>';
$html->select_conditions_paiements($cond_reglement_id,'cond_reglement_id'); $html->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id');
print '</td></tr>'; print '</td></tr>';
// Mode de réglement // Mode de réglement
print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>'; print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
$html->select_types_paiements($mode_reglement_id,'mode_reglement_id'); $html->select_types_paiements($soc->mode_reglement,'mode_reglement_id');
print '</td></tr>'; print '</td></tr>';
if ($conf->projet->enabled) if ($conf->projet->enabled)