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

Plus de clart dans le module expeditions

Browse Source
This commit is contained in:
Laurent Destailleur 2006-08-27 23:31:44 +00:00
parent e9ab004947
commit e4cb3f26ac
7 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/compta/commande/fiche.php
View File

@ -629,13 +629,16 @@ if ($_GET["id"] > 0)
{ {
if ($somethingshown) print '<br>'; if ($somethingshown) print '<br>';
print_titre($langs->trans("SendingsForSameOrder")); print_titre($langs->trans("SendingsAndReceivingForSameOrder"));
print '<table class="liste" width="100%">'; print '<table class="liste" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td align="left">'.$langs->trans("Sending").'</td>';
print '<td>'.$langs->trans("Product").'</td>'; print '<td>'.$langs->trans("Product").'</td>';
print '<td align="center">'.$langs->trans("QtyShipped").'</td>'; print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
print '<td align="center">'.$langs->trans("Date").'</td>'; print '<td align="center">'.$langs->trans("DateSending").'</td>';
if ($conf->expedition->enabled)
{
print '<td>'.$langs->trans("SendingSheet").'</td>';
}
if ($conf->livraison->enabled) if ($conf->livraison->enabled)
{ {
print '<td>'.$langs->trans("DeliveryOrder").'</td>'; print '<td>'.$langs->trans("DeliveryOrder").'</td>';
@ -648,7 +651,6 @@ if ($_GET["id"] > 0)
$var=!$var; $var=!$var;
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td align="left"><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->ref.'<a></td>';
if ($objp->fk_product > 0) if ($objp->fk_product > 0)
{ {
@ -662,10 +664,14 @@ if ($_GET["id"] > 0)
} }
else else
{ {
print "<td>".stripslashes(nl2br($objp->description))."</td>\n"; print "<td>".nl2br($objp->description)."</td>\n";
} }
print '<td align="center">'.$objp->qty_livre.'</td>'; print '<td align="center">'.$objp->qty_livre.'</td>';
print '<td align="center">'.dolibarr_print_date($objp->date_expedition).'</td>'; print '<td align="center">'.dolibarr_print_date($objp->date_expedition).'</td>';
if ($conf->expedition->enabled)
{
print '<td align="left"><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->ref.'<a></td>';
}
if ($conf->livraison->enabled) if ($conf->livraison->enabled)
{ {
if ($objp->livraison_id) if ($objp->livraison_id)
@ -674,7 +680,7 @@ if ($_GET["id"] > 0)
} }
else else
{ {
print '<td><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'&amp;action=create_delivery">'.$langs->trans("CreateDeliveryOrder").'<a></td>'; print '<td>&nbsp;</td>';
} }
} }
print '</tr>'; print '</tr>';

18
htdocs/expedition/commande.php
View File

@ -513,13 +513,16 @@ if ($_GET["id"] > 0)
{ {
if ($somethingshown) print '<br>'; if ($somethingshown) print '<br>';
print_titre($langs->trans("SendingsForSameOrder")); print_titre($langs->trans("SendingsAndReceivingForSameOrder"));
print '<table class="liste" width="100%">'; print '<table class="liste" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td align="left">'.$langs->trans("Sending").'</td>';
print '<td>'.$langs->trans("Product").'</td>'; print '<td>'.$langs->trans("Product").'</td>';
print '<td align="center">'.$langs->trans("QtyShipped").'</td>'; print '<td align="center">'.$langs->trans("QtyShipped").'</td>';
print '<td align="center">'.$langs->trans("Date").'</td>'; print '<td align="center">'.$langs->trans("DateSending").'</td>';
if ($conf->expedition->enabled)
{
print '<td>'.$langs->trans("SendingSheet").'</td>';
}
if ($conf->livraison->enabled) if ($conf->livraison->enabled)
{ {
print '<td>'.$langs->trans("DeliveryOrder").'</td>'; print '<td>'.$langs->trans("DeliveryOrder").'</td>';
@ -532,7 +535,6 @@ if ($_GET["id"] > 0)
$var=!$var; $var=!$var;
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td align="left"><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->ref.'<a></td>';
if ($objp->fk_product > 0) if ($objp->fk_product > 0)
{ {
@ -546,10 +548,14 @@ if ($_GET["id"] > 0)
} }
else else
{ {
print "<td>".stripslashes(nl2br($objp->description))."</td>\n"; print "<td>".nl2br($objp->description)."</td>\n";
} }
print '<td align="center">'.$objp->qty_livre.'</td>'; print '<td align="center">'.$objp->qty_livre.'</td>';
print '<td align="center">'.dolibarr_print_date($objp->date_expedition).'</td>'; print '<td align="center">'.dolibarr_print_date($objp->date_expedition).'</td>';
if ($conf->expedition->enabled)
{
print '<td align="left"><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->ref.'<a></td>';
}
if ($conf->livraison->enabled) if ($conf->livraison->enabled)
{ {
if ($objp->livraison_id) if ($objp->livraison_id)
@ -558,7 +564,7 @@ if ($_GET["id"] > 0)
} }
else else
{ {
print '<td><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'&amp;action=create_delivery">'.$langs->trans("CreateDeliveryOrder").'<a></td>'; print '<td>&nbsp;</td>';
} }
} }
print '</tr>'; print '</tr>';

6
htdocs/expedition/mods/pdf/pdf_expedition_merou.modules.php
View File

@ -321,10 +321,10 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$pdf->SetXY(60,7); $pdf->SetXY(60,7);
$pdf->SetFont('Arial','B',14); $pdf->SetFont('Arial','B',14);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->MultiCell(0, 8, $langs->trans("SendingSheet"), '' , 'L'); $pdf->MultiCell(0, 8, $langs->trans("SendingSheet"), '' , 'L'); // Bordereau expedition
//Num Expedition //Num Expedition
$Yoff = $Yoff+7; $Yoff = $Yoff+7;
$Xoff = 115; $Xoff = 140;
// $pdf->rect($Xoff, $Yoff, 85, 8); // $pdf->rect($Xoff, $Yoff, 85, 8);
$pdf->SetXY($Xoff,$Yoff); $pdf->SetXY($Xoff,$Yoff);
$pdf->SetFont('Arial','',8); $pdf->SetFont('Arial','',8);
@ -338,6 +338,8 @@ Class pdf_expedition_merou extends ModelePdfExpedition
$pdf->SetFont('Arial','',8); $pdf->SetFont('Arial','',8);
$pdf->SetTextColor(0,0,0); $pdf->SetTextColor(0,0,0);
$pdf->MultiCell(0, 8, $langs->trans("RefOrder").': '.$exp->commande->ref, '' , 'L'); $pdf->MultiCell(0, 8, $langs->trans("RefOrder").': '.$exp->commande->ref, '' , 'L');
$Xoff = 115;
//$this->Code39($Xoff+43, $Yoff+1, $exp->commande->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true); //$this->Code39($Xoff+43, $Yoff+1, $exp->commande->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true);
//Definition Emplacement du bloc Societe //Definition Emplacement du bloc Societe
$blSocX=11; $blSocX=11;

2
htdocs/expedition/mods/pdf/pdf_expedition_rouget.modules.php
View File

@ -98,7 +98,7 @@ Class pdf_expedition_rouget extends ModelePdfExpedition
$pdf->SetDrawColor(128,128,128); $pdf->SetDrawColor(128,128,128);
$pdf->SetFont('Arial','', 14); $pdf->SetFont('Arial','', 14);
$pdf->Text($posx, 16, $outputlangs->trans("SendingReceipt")); $pdf->Text($posx, 16, $outputlangs->trans("SendingSheet")); // Bordereau expedition
$pdf->Text($posx, 22, $outputlangs->trans("Ref") ." : ".$this->expe->ref); $pdf->Text($posx, 22, $outputlangs->trans("Ref") ." : ".$this->expe->ref);
$pdf->Text($posx, 28, $outputlangs->trans("Date")." : ".dolibarr_print_date($this->expe->date,"%d %b %Y")); $pdf->Text($posx, 28, $outputlangs->trans("Date")." : ".dolibarr_print_date($this->expe->date,"%d %b %Y"));
$pdf->Text($posx, 34, $outputlangs->trans("Page")." : ".$pdf->PageNo() ."/{nb}", 0); $pdf->Text($posx, 34, $outputlangs->trans("Page")." : ".$pdf->PageNo() ."/{nb}", 0);

2
htdocs/langs/en_US/sendings.lang
View File

@ -2,6 +2,7 @@
RefSending=Ref. sending RefSending=Ref. sending
Sending=Sending Sending=Sending
Sendings=Sendings Sendings=Sendings
Receivings=Receivings
SendingsArea=Sendings area SendingsArea=Sendings area
ListOfSendings=List of sendings ListOfSendings=List of sendings
SendingMethod=Sending method SendingMethod=Sending method
@ -21,6 +22,7 @@ QtyToShip=Qty to ship
KeepToShip=Keep to ship KeepToShip=Keep to ship
OtherSendingsForSameOrder=Other sendings for this order OtherSendingsForSameOrder=Other sendings for this order
SendingsForSameOrder=Sendings for this order SendingsForSameOrder=Sendings for this order
SendingsAndReceivingForSameOrder=Sendings and receivings for this order
SendingsToValidate=Sending to validate SendingsToValidate=Sending to validate
StatusSendingDraft=Draft StatusSendingDraft=Draft
StatusSendingValidated=Validated (products to ship or already received) StatusSendingValidated=Validated (products to ship or already received)

6
htdocs/langs/fr_FR/sendings.lang
View File

@ -2,6 +2,7 @@
RefSending=Réf. expédition RefSending=Réf. expédition
Sending=Expédition Sending=Expédition
Sendings=Expéditions Sendings=Expéditions
Receivings=Réceptions
SendingsArea=Espace expéditions SendingsArea=Espace expéditions
ListOfSendings=Liste des expéditions ListOfSendings=Liste des expéditions
SendingMethod=Méthode d'expédition SendingMethod=Méthode d'expédition
@ -20,10 +21,11 @@ QtyToShip=Qt
QtyReceived=Qté reçue QtyReceived=Qté reçue
KeepToShip=Reste à expédier KeepToShip=Reste à expédier
OtherSendingsForSameOrder=Autres expéditions pour cette commande OtherSendingsForSameOrder=Autres expéditions pour cette commande
SendingsForSameOrder=Expéditions pour cette commandes SendingsForSameOrder=Expéditions pour cette commande
SendingsAndReceivingForSameOrder=Expéditions et réceptions pour cette commande
SendingsToValidate=Expéditions à valider SendingsToValidate=Expéditions à valider
StatusSendingDraft=Brouillon StatusSendingDraft=Brouillon
StatusSendingValidated=Validée (produits à envoyer ou reçus) StatusSendingValidated=Validée (produits à envoyer ou reçus)
StatusSendingDraftShort=Brouillon StatusSendingDraftShort=Brouillon
StatusSendingValidatedShort=Validée StatusSendingValidatedShort=Validée
SendingSheet=Bon d'expédition SendingSheet=Bordereau d'expédition

4
htdocs/lib/order.lib.php
View File

@ -49,7 +49,9 @@ function commande_prepare_head($commande)
if (($conf->expedition->enabled || $conf->livraison->enabled) && $user->rights->expedition->lire) if (($conf->expedition->enabled || $conf->livraison->enabled) && $user->rights->expedition->lire)
{ {
$head[$h][0] = DOL_URL_ROOT.'/expedition/commande.php?id='.$commande->id; $head[$h][0] = DOL_URL_ROOT.'/expedition/commande.php?id='.$commande->id;
$head[$h][1] = $langs->trans("Sendings"); if ($conf->expedition->enabled) $text=$langs->trans("Sendings");
if ($conf->livraison->enabled) $text.='/'.$langs->trans("Receivings");
$head[$h][1] = $text;
$head[$h][2] = 'shipping'; $head[$h][2] = 'shipping';
$h++; $h++;
} }