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

ajout pour date_livraison

Browse Source
This commit is contained in:
Andre Cianfarani 2006-03-01 10:53:45 +00:00
parent 5c13354108
commit 6369ef6f83
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/comm/addpropal.php
View File

@ -30,6 +30,7 @@
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
include_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php'); include_once(DOL_DOCUMENT_ROOT.'/includes/modules/propale/modules_propale.php');
if (defined("PROPALE_ADDON") && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".PROPALE_ADDON.".php")) if (defined("PROPALE_ADDON") && is_readable(DOL_DOCUMENT_ROOT ."/includes/modules/propale/".PROPALE_ADDON.".php"))
{ {
@ -84,7 +85,6 @@ if ($_GET["action"] == 'create')
$numpr .= "." . ($num + 1); $numpr .= "." . ($num + 1);
} }
} }
print "<form action=\"propal.php?socidp=".$soc->id."\" method=\"post\">"; print "<form action=\"propal.php?socidp=".$soc->id."\" method=\"post\">";
print "<input type=\"hidden\" name=\"action\" value=\"add\">"; print "<input type=\"hidden\" name=\"action\" value=\"add\">";
@ -96,8 +96,8 @@ if ($_GET["action"] == 'create')
print $langs->trans("Comments").'</td></tr>'; print $langs->trans("Comments").'</td></tr>';
print '<tr><td>'.$langs->trans("Company").'</td><td><a href="fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>'; print '<tr><td>'.$langs->trans("Company").'</td><td><a href="fiche.php?socid='.$soc->id.'">'.$soc->nom.'</a></td>';
print '<td rowspan="5" colspan="2" valign="top">'; print '<td rowspan="8" colspan="2" valign="top">';
print '<textarea name="note" wrap="soft" cols="40" rows="6"></textarea>'; print '<textarea name="note" wrap="soft" cols="40" rows="8"></textarea>';
print '</tr>'; print '</tr>';
print "<tr><td>".$langs->trans("Date")."</td><td>"; print "<tr><td>".$langs->trans("Date")."</td><td>";
@ -107,6 +107,20 @@ if ($_GET["action"] == 'create')
print '<tr><td>'.$langs->trans("Author").'</td><td>'.$user->fullname.'</td></tr>'; print '<tr><td>'.$langs->trans("Author").'</td><td>'.$user->fullname.'</td></tr>';
print '<tr><td>'.$langs->trans("ValidityDuration").'</td><td><input name="duree_validite" size="5" value="15"> '.$langs->trans("days").'</td></tr>'; print '<tr><td>'.$langs->trans("ValidityDuration").'</td><td><input name="duree_validite" size="5" value="15"> '.$langs->trans("days").'</td></tr>';
// date de livraison
if ($conf->use_javascript)
{
print '<tr><td>'.$langs->trans("DateDelivery").'</td>';
print '<td>';
$form->select_date('','liv_');
print '</td></tr>';
}
else
{
print "<tr><td>".$langs->trans("DateDelivery")."</td><td>";
$form->select_date();
print "</td></tr>";
}
// 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>';
$form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id'); $form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id');

1
htdocs/comm/propal.php
View File

@ -112,6 +112,7 @@ if ($_POST['action'] == 'add')
{ {
$propal = new Propal($db, $_GET['socidp']); $propal = new Propal($db, $_GET['socidp']);
$propal->datep = mktime(12, 1, 1, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); $propal->datep = mktime(12, 1, 1, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
$propal->date_livraison = mktime(12, 1, 1, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']);
$propal->duree_validite = $_POST['duree_validite']; $propal->duree_validite = $_POST['duree_validite'];
$propal->cond_reglement_id = $_POST['cond_reglement_id']; $propal->cond_reglement_id = $_POST['cond_reglement_id'];

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

@ -63,3 +63,4 @@ RelatedBills=Factures associ
ErrorPropalNotFound=Propal %s inexistante ErrorPropalNotFound=Propal %s inexistante
Estimate=Devis : Estimate=Devis :
OtherPropals=Autres propositions OtherPropals=Autres propositions
DateDelivery=Date de livraison