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

Le fait de "class facture" une propale en mme temps qu'une commande devient une

Browse Source 
option activable dans la configuration du module propale
This commit is contained in:
Regis Houssin 2006-06-02 08:53:03 +00:00
parent 792fb373eb
commit b8141f21e0
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
htdocs/admin/propale.php
View File

@ -52,6 +52,19 @@ if ($_POST["action"] == 'nbprod')
exit; exit;
} }
if ($_POST["action"] == 'activate_classifiedinvoiced')
{
dolibarr_set_const($db, "PROPALE_CLASSIFIED_INVOICED_WITH_ORDER", $_POST["value"]);
Header("Location: propale.php");
exit;
}
else if ($_POST["action"] == 'disable_classifiedinvoiced')
{
dolibarr_del_const($db, "PROPALE_CLASSIFIED_INVOICED_WITH_ORDER");
Header("Location: propale.php");
exit;
}
if ($_GET["action"] == 'set') if ($_GET["action"] == 'set')
{ {
$type='propal'; $type='propal';
@ -344,6 +357,45 @@ print '</form>';
print '<br>'; print '<br>';
/*
* Classé facturée une propale en même temps que la commande
*
*/
if ($conf->commande->enabled)
{
print_titre($langs->trans("ClassifiedInvoiced"));
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td width="140">'.$langs->trans("Name").'</td>';
print '<td align="center">&nbsp;</td>';
print '<td align="center">'.$langs->trans("Active").'</td>';
print "</tr>\n";
print "<form method=\"post\" action=\"propale.php\">";
print "<input type=\"hidden\" name=\"action\" value=\"classifiedinvoiced\">";
print "<tr ".$bc[false].">";
print '<td width="80%">'.$langs->trans("ClassifiedInvoicedWithOrder").'</td>';
print '<td align="center">';
if($conf->global->PROPALE_CLASSIFIED_INVOICED_WITH_ORDER == 1)
{
print img_tick();
}
print '</td>';
print "<td align=\"center\">";
if($conf->global->PROPALE_CLASSIFIED_INVOICED_WITH_ORDER == 0)
{
print '<a href="propale.php?action=activate_classifiedinvoiced">'.$langs->trans("Activate").'</a>';
}
else if($conf->global->PROPALE_CLASSIFIED_INVOICED_WITH_ORDER == 1)
{
print '<a href="propale.php?action=disable_classifiedinvoiced">'.$langs->trans("Disable").'</a>';
}
print "</td>";
print '</tr>';
print '</table>';
print '</form>';
}
$db->close(); $db->close();
llxFooter('$Date$ - $Revision$'); llxFooter('$Date$ - $Revision$');

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

@ -1554,7 +1554,7 @@ class Commande
$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0 ;'; $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0 ;';
if ($this->db->query($sql) ) if ($this->db->query($sql) )
{ {
if ($this->propale_id) if (($conf->global->PROPALE_CLASSIFIED_INVOICED_WITH_ORDER == 1) && $this->propale_id)
{ {
$propal = new Propal($this->db); $propal = new Propal($this->db);
$propal->fetch($this->propale_id); $propal->fetch($this->propale_id);