Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 15:01:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: change the value of field 'code' in llx_expedition_methode

Browse Source
This commit is contained in:
Regis Houssin
2008-10-29 10:51:52 +00:00
parent 0c41a7b8a8
commit 2c20966008
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/expedition/fiche.php
View File

@@ -119,7 +119,7 @@ if ($_POST["action"] == 'add')
} }
/* /*
* G<EFBFBD>n<EFBFBD>re un bon de livraison * Genere un bon de livraison
*/ */
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)
{ {
@@ -338,7 +338,7 @@ if ($_GET["action"] == 'create')
//$lignes = $object->fetch_lines(1); //$lignes = $object->fetch_lines(1);
$numAsked = sizeof($object->lignes); $numAsked = sizeof($object->lignes);
/* Lecture des expeditions d<EFBFBD>j<EFBFBD> effectu<EFBFBD>es */ /* Lecture des expeditions deja effectuees */
$object->loadExpeditions(); $object->loadExpeditions();
if ($numAsked) if ($numAsked)
@@ -402,7 +402,7 @@ if ($_GET["action"] == 'create')
if ($_GET["entrepot_id"]) if ($_GET["entrepot_id"])
{ {
$stock = $product->stock_entrepot[$_GET["entrepot_id"]]; $stock = $product->stock_entrepot[$_GET["entrepot_id"]];
$stock+=0; // Convertit en num<EFBFBD>rique $stock+=0; // Convertit en numerique
$defaultqty=min($quantityToBeDelivered, $stock); $defaultqty=min($quantityToBeDelivered, $stock);
if ($defaultqty < 0) $defaultqty=0; if ($defaultqty < 0) $defaultqty=0;
} }
@@ -737,7 +737,7 @@ else
print "<td>".nl2br($lignes[$i]->description)."</td>\n"; print "<td>".nl2br($lignes[$i]->description)."</td>\n";
} }
// Qte command<EFBFBD> // Qte commande
print '<td align="center">'.$lignes[$i]->qty_asked.'</td>'; print '<td align="center">'.$lignes[$i]->qty_asked.'</td>';
// Qte a expedier ou expedier // Qte a expedier ou expedier
@@ -834,7 +834,7 @@ else
} }
else else
{ {
print "Expedition inexistante ou acc<EFBFBD>s refus<EFBFBD>"; print "Expedition inexistante ou acces refuse";
} }
} }

3
mysql/migration/2.4.0-2.5.0.sql
View File

@@ -59,3 +59,6 @@ alter table llx_expedition add size_units integer;
alter table llx_expedition add size integer; alter table llx_expedition add size integer;
alter table llx_expedition add weight_units integer; alter table llx_expedition add weight_units integer;
alter table llx_expedition add weight integer; alter table llx_expedition add weight integer;
update llx_expedition_methode set code='ENL', libelle='Enlevement' where code='enlevement';
update llx_expedition_methode set code='TRANS', libelle='Transporteur' where code='transporteur';