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

Fix: deliveray date must not be mandatory

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-17 19:01:26 +00:00
parent f2f185cb22
commit 8480e233a9
3 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
htdocs/comm/propal.php
View File

@ -27,7 +27,7 @@
* \file htdocs/comm/propal.php * \file htdocs/comm/propal.php
* \ingroup propale * \ingroup propale
* \brief Page of commercial proposals card and list * \brief Page of commercial proposals card and list
* \version $Id: propal.php,v 1.610 2011/07/10 20:03:41 eldy Exp $ * \version $Id: propal.php,v 1.611 2011/07/17 19:01:28 eldy Exp $
*/ */
require("../main.inc.php"); require("../main.inc.php");
@ -1114,11 +1114,6 @@ if ($id > 0 || ! empty($ref))
print $formconfirm; print $formconfirm;
/*
* Fiche propal
*
*/
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
$linkback="<a href=\"propal.php?page=$page&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder\">".$langs->trans("BackToList")."</a>"; $linkback="<a href=\"propal.php?page=$page&socid=$socid&viewstatut=$viewstatut&sortfield=$sortfield&$sortorder\">".$langs->trans("BackToList")."</a>";
@ -1233,7 +1228,7 @@ if ($id > 0 || ! empty($ref))
print '<td valign="top" colspan="2" width="50%" rowspan="'.$rowspan.'">'.$langs->trans('NotePublic').' :<br>'. nl2br($object->note_public).'</td>'; print '<td valign="top" colspan="2" width="50%" rowspan="'.$rowspan.'">'.$langs->trans('NotePublic').' :<br>'. nl2br($object->note_public).'</td>';
print '</tr>'; print '</tr>';
// Date fin propal // Date end proposal
print '<tr>'; print '<tr>';
print '<td>'; print '<td>';
print '<table class="nobordernopadding" width="100%"><tr><td>'; print '<table class="nobordernopadding" width="100%"><tr><td>';
@ -1266,6 +1261,25 @@ if ($id > 0 || ! empty($ref))
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// Payment term
print '<tr><td>';
print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('PaymentConditionsShort');
print '</td>';
if ($action != 'editconditions' && $object->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
print '</tr></table>';
print '</td><td colspan="3">';
if ($action == 'editconditions')
{
$html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
}
else
{
$html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
}
print '</td>';
print '</tr>';
// Delivery date // Delivery date
$langs->load('deliveries'); $langs->load('deliveries');
print '<tr><td>'; print '<tr><td>';
@ -1314,7 +1328,7 @@ if ($id > 0 || ! empty($ref))
print '</td></tr>'; print '</td></tr>';
} }
// Availability // Delivery delay
print '<tr><td>'; print '<tr><td>';
print '<table class="nobordernopadding" width="100%"><tr><td>'; print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('AvailabilityPeriod'); print $langs->trans('AvailabilityPeriod');
@ -1325,11 +1339,11 @@ if ($id > 0 || ! empty($ref))
print '</td><td colspan="3">'; print '</td><td colspan="3">';
if ($action == 'editavailability') if ($action == 'editavailability')
{ {
$html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id'); $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'availability_id',1);
} }
else else
{ {
$html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none'); $html->form_availability($_SERVER['PHP_SELF'].'?id='.$object->id,$object->availability_id,'none',1);
} }
print '</td>'; print '</td>';
@ -1356,25 +1370,6 @@ if ($id > 0 || ! empty($ref))
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
// Payment term
print '<tr><td>';
print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('PaymentConditionsShort');
print '</td>';
if ($action != 'editconditions' && $object->brouillon) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'),1).'</a></td>';
print '</tr></table>';
print '</td><td colspan="3">';
if ($action == 'editconditions')
{
$html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'cond_reglement_id');
}
else
{
$html->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id,$object->cond_reglement_id,'none');
}
print '</td>';
print '</tr>';
// Payment mode // Payment mode
print '<tr>'; print '<tr>';
print '<td width="25%">'; print '<td width="25%">';
@ -1975,6 +1970,6 @@ else
} }
$db->close(); $db->close();
llxFooter('$Date: 2011/07/10 20:03:41 $ - $Revision: 1.610 $'); llxFooter('$Date: 2011/07/17 19:01:28 $ - $Revision: 1.611 $');
?> ?>

6
htdocs/core/class/html.form.class.php
View File

@ -31,7 +31,7 @@
* \file htdocs/core/class/html.form.class.php * \file htdocs/core/class/html.form.class.php
* \ingroup core * \ingroup core
* \brief File of class with all html predefined components * \brief File of class with all html predefined components
* \version $Id: html.form.class.php,v 1.189 2011/07/13 14:03:15 eldy Exp $ * \version $Id: html.form.class.php,v 1.190 2011/07/17 19:01:26 eldy Exp $
*/ */
@ -1497,8 +1497,8 @@ class Form
* Retourne la liste des types de delais de livraison possibles * Retourne la liste des types de delais de livraison possibles
* @param selected Id du type de delais pre-selectionne * @param selected Id du type de delais pre-selectionne
* @param htmlname Nom de la zone select * @param htmlname Nom de la zone select
* @param filtertype Pour filtre * @param filtertype To add a filter
* @param addempty Ajoute entree vide * @param addempty Add empty entry
*/ */
function select_availability($selected='',$htmlname='availid',$filtertype='',$addempty=0) function select_availability($selected='',$htmlname='availid',$filtertype='',$addempty=0)
{ {

2
htdocs/langs/fr_FR/deliveries.lang
View File

@ -5,7 +5,7 @@ Deliveries=Livraisons
DeliveryCard=Fiche réception DeliveryCard=Fiche réception
DeliveryOrder=Bon de réception DeliveryOrder=Bon de réception
DeliveryOrders=Bons de réception DeliveryOrders=Bons de réception
DeliveryDate=Date de réception DeliveryDate=Date de livraison
DeliveryDateShort=Date réc. DeliveryDateShort=Date réc.
CreateDeliveryOrder=Générer bon de réception CreateDeliveryOrder=Générer bon de réception
QtyDelivered=Qté livrée QtyDelivered=Qté livrée