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

Fix: W3C

Browse Source
This commit is contained in:
Laurent Destailleur 2010-07-22 22:51:00 +00:00
parent 5139288c18
commit 8a8ed0f129
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/expedition/fiche.php
View File

@ -127,7 +127,7 @@ if ($_POST["action"] == 'add')
} }
/* /*
* Genere un bon de livraison * Build a receiving receipt
*/ */
if ($_GET["action"] == 'create_delivery' && $conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer) if ($_GET["action"] == 'create_delivery' && $conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)
{ {

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

@ -2,12 +2,12 @@
CHARSET=UTF-8 CHARSET=UTF-8
Delivery=Livraison Delivery=Livraison
Deliveries=Livraisons Deliveries=Livraisons
DeliveryCard=Fiche livraison DeliveryCard=Fiche réception
DeliveryOrder=Bon de livraison DeliveryOrder=Bon de réception
DeliveryOrders=Bons de livraison DeliveryOrders=Bons de réception
DeliveryDate=Date de livraison DeliveryDate=Date de réception
DeliveryDateShort=Date livr. DeliveryDateShort=Date réc.
CreateDeliveryOrder=Générer bon de livraison CreateDeliveryOrder=Générer bon de réception
QtyDelivered=Qté livrée QtyDelivered=Qté livrée
SetDeliveryDate=Définir la date de livraison SetDeliveryDate=Définir la date de livraison
ValidateDeliveryReceipt=Valider le bon de livraison ValidateDeliveryReceipt=Valider le bon de livraison

2
htdocs/lib/sendings.lib.php
View File

@ -268,7 +268,7 @@ function show_list_sending_receive($origin='commande',$origin_id,$filter='')
} }
else else
{ {
print '<td>&nbsp;</td>'; //print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
} }

8
htdocs/livraison/class/livraison.class.php
View File

@ -54,7 +54,7 @@ class Livraison extends CommonObject
var $expedition_id; var $expedition_id;
var $date_delivery; var $date_delivery; // Date really received
var $date_creation; var $date_creation;
var $date_valid; var $date_valid;
@ -87,6 +87,8 @@ class Livraison extends CommonObject
$error = 0; $error = 0;
$now=dol_now();
/* On positionne en mode brouillon le bon de livraison */ /* On positionne en mode brouillon le bon de livraison */
$this->brouillon = 1; $this->brouillon = 1;
@ -108,9 +110,9 @@ class Livraison extends CommonObject
$sql.= ", ".$conf->entity; $sql.= ", ".$conf->entity;
$sql.= ", ".$this->socid; $sql.= ", ".$this->socid;
$sql.= ", '".$this->ref_customer."'"; $sql.= ", '".$this->ref_customer."'";
$sql.= ", ".$this->db->idate(mktime()); $sql.= ", ".$this->db->idate($now);
$sql.= ", ".$user->id; $sql.= ", ".$user->id;
$sql.= ", ".$this->db->idate($this->date_delivery); $sql.= ", ".($this->date_delivery?"'".$this->db->idate($this->date_delivery)."'":"null");
$sql.= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null"); $sql.= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
$sql.= ")"; $sql.= ")";

6
htdocs/livraison/fiche.php
View File

@ -139,12 +139,13 @@ if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' &&
if ($conf->expedition_bon->enabled) if ($conf->expedition_bon->enabled)
{ {
Header("Location: ".DOL_URL_ROOT.'/expedition/fiche.php?id='.$delivery->origin_id); Header("Location: ".DOL_URL_ROOT.'/expedition/fiche.php?id='.$delivery->origin_id);
exit;
} }
else else
{ {
Header("Location: liste.php"); Header("Location: ".DOL_URL_ROOT."/livraison/liste.php");
exit;
} }
exit;
} }
else else
{ {
@ -477,6 +478,7 @@ else
print '</tr>'; print '</tr>';
// Date delivery real / Received // Date delivery real / Received
// TODO Can edit this date, even if validated.
print '<tr><td>'.$langs->trans("DateReceived").'</td>'; print '<tr><td>'.$langs->trans("DateReceived").'</td>';
print '<td colspan="3">'.dol_print_date($delivery->date_delivery,'daytext')."</td>\n"; print '<td colspan="3">'.dol_print_date($delivery->date_delivery,'daytext')."</td>\n";
print '</tr>'; print '</tr>';