Minor fixes.
This commit is contained in:
Laurent Destailleur
parent
3674435bcf
commit
1315833247
@ -120,36 +120,21 @@ print '</tr>'."\n";
|
||||
/*
|
||||
* Formulaire parametres divers
|
||||
*/
|
||||
// sousproduits activation/desactivation
|
||||
|
||||
$var=!$var;
|
||||
|
||||
/*print "<tr ".$bc[$var].">";
|
||||
print '<td width="60%">'.$langs->trans("UserWarehouse").'</td>';
|
||||
print "<tr ".$bc[$var].">";
|
||||
print '<td width="60%">'.$langs->trans("UserWarehouseAutoCreate").'</td>';
|
||||
|
||||
print '<td width="160" align="right">';
|
||||
print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
|
||||
print "<form method=\"post\" action=\"stock.php\">";
|
||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
print "<input type=\"hidden\" name=\"action\" value=\"STOCK_USERSTOCK\">";
|
||||
print $html->selectyesno("STOCK_USERSTOCK",$conf->global->STOCK_USERSTOCK,1);
|
||||
print "<input type=\"hidden\" name=\"action\" value=\"STOCK_USERSTOCK_AUTOCREATE\">";
|
||||
print $html->selectyesno("STOCK_USERSTOCK_AUTOCREATE",$conf->global->STOCK_USERSTOCK_AUTOCREATE,1);
|
||||
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
|
||||
print "</form>\n</td>\n</tr>\n";
|
||||
|
||||
if ($conf->global->STOCK_USERSTOCK == 1)
|
||||
{
|
||||
$var=!$var;
|
||||
*/
|
||||
print "<tr ".$bc[$var].">";
|
||||
print '<td width="60%">'.$langs->trans("UserWarehouseAutoCreate").'</td>';
|
||||
|
||||
print '<td width="160" align="right">';
|
||||
print "<form method=\"post\" action=\"stock.php\">";
|
||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
print "<input type=\"hidden\" name=\"action\" value=\"STOCK_USERSTOCK_AUTOCREATE\">";
|
||||
print $html->selectyesno("STOCK_USERSTOCK_AUTOCREATE",$conf->global->STOCK_USERSTOCK_AUTOCREATE,1);
|
||||
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
|
||||
print '</form>';
|
||||
print "</td>\n";
|
||||
print "</tr>\n";
|
||||
/*} */
|
||||
print '</form>';
|
||||
print "</td>\n";
|
||||
print "</tr>\n";
|
||||
|
||||
|
||||
// Title rule for stock decrease
|
||||
@ -223,7 +208,7 @@ if ($conf->fournisseur->enabled)
|
||||
print "</form>\n</td>\n</tr>\n";
|
||||
}
|
||||
|
||||
if ($conf->commande->enabled)
|
||||
if ($conf->fournisseur->enabled)
|
||||
{
|
||||
$var=!$var;
|
||||
print "<tr ".$bc[$var].">";
|
||||
@ -235,7 +220,9 @@ if ($conf->commande->enabled)
|
||||
print $html->selectyesno("STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER",$conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER,1);
|
||||
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
|
||||
print "</form>\n</td>\n</tr>\n";
|
||||
|
||||
}
|
||||
if ($conf->fournisseur->enabled)
|
||||
{
|
||||
$var=!$var;
|
||||
print "<tr ".$bc[$var].">";
|
||||
print '<td width="60%">'.$langs->trans("ReStockOnDispatchOrder").'</td>';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2007-2008 Jérémie Ollivier <jeremie.o@laposte.net>
|
||||
/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
@ -13,7 +13,10 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/ /* ------------------- Initialisations ------------------- */
|
||||
*/
|
||||
|
||||
/* \version $Id$ */
|
||||
|
||||
body {
|
||||
background: #eee;
|
||||
color: #333;
|
||||
@ -42,7 +45,7 @@ p {
|
||||
background: url("img/bg_conteneur_droite.png") top right repeat-y;
|
||||
}
|
||||
|
||||
/* ------------------- En-tête ------------------- */
|
||||
/* ------------------- En-t<EFBFBD>te ------------------- */
|
||||
.entete {
|
||||
height: 15px;
|
||||
margin: 0;
|
||||
@ -66,7 +69,7 @@ p {
|
||||
}
|
||||
|
||||
.menu_bloc {
|
||||
margin-left: 20px;
|
||||
margin-left: 12px;
|
||||
}
|
||||
|
||||
.menu {
|
||||
@ -79,12 +82,12 @@ p {
|
||||
.menu li {
|
||||
float: left;
|
||||
font-weight: bold;
|
||||
width: 230px;
|
||||
}
|
||||
|
||||
.menu_choix1,.menu_choix2 {
|
||||
font-size: 1.4em;
|
||||
text-align: left;
|
||||
width: 180px;
|
||||
}
|
||||
|
||||
.menu_choix1 a,.menu_choix2 a {
|
||||
@ -92,7 +95,7 @@ p {
|
||||
color: #fff;
|
||||
text-decoration: none;
|
||||
width: 100px;
|
||||
padding-left: 60px;
|
||||
padding-left: 54px;
|
||||
height: 48px;
|
||||
background: url('img/new.png') top left no-repeat;
|
||||
}
|
||||
@ -113,7 +116,7 @@ p {
|
||||
font-size: 0.9em;
|
||||
text-align: right;
|
||||
font-style: italic;
|
||||
width: 280px;
|
||||
width: 340px;
|
||||
display: block;
|
||||
color: #333;
|
||||
text-decoration: none;
|
||||
@ -125,10 +128,11 @@ p {
|
||||
}
|
||||
|
||||
|
||||
/* ------------------- Récapitulatif des articles ------------------- */
|
||||
/* ------------------- R<EFBFBD>capitulatif des articles ------------------- */
|
||||
.liste_articles {
|
||||
width: 215px;
|
||||
float: right;
|
||||
margin-top: 8px;
|
||||
margin-right: 20px;
|
||||
border: 1px dotted #5ca64d;
|
||||
padding-bottom: 10px;
|
||||
@ -269,7 +273,7 @@ p.titre {
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
/* --------------------- Listes déroulantes ------------------- */
|
||||
/* --------------------- Listes d<EFBFBD>roulantes ------------------- */
|
||||
.select_design {
|
||||
width: 370px;
|
||||
overflow: auto;
|
||||
@ -390,7 +394,7 @@ p.titre {
|
||||
background: url('img/bg_pied.png') no-repeat bottom left;
|
||||
}
|
||||
|
||||
/* ------------------- Paramètres communs (messages d'erreur, informations, etc...) ------------------- */
|
||||
/* ------------------- Param<EFBFBD>tres communs (messages d'erreur, informations, etc...) ------------------- */
|
||||
.msg_err1 {
|
||||
color: #c00;
|
||||
}
|
||||
@ -443,7 +447,7 @@ p.titre {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/* Affichage de la liste des résultats */
|
||||
/* Affichage de la liste des r<EFBFBD>sultats */
|
||||
.dhtml_bloc {
|
||||
margin: 0;
|
||||
padding: 3px;
|
||||
|
||||
@ -92,6 +92,7 @@ if ($_POST["action"] == 'dispatch' && $user->rights->fournisseur->commande->rece
|
||||
llxHeader('',$langs->trans("OrderCard"),"CommandeFournisseur");
|
||||
|
||||
$html = new Form($db);
|
||||
$warehouse_static = new Entrepot($db);
|
||||
|
||||
$now=dol_now();
|
||||
|
||||
@ -305,7 +306,8 @@ if ($id > 0 || ! empty($ref))
|
||||
}
|
||||
|
||||
// List of already dispatching
|
||||
$sql = "SELECT p.ref, p.label, e.label as entrepot,";
|
||||
$sql = "SELECT p.ref, p.label,";
|
||||
$sql.= " e.rowid as warehouse_id, e.label as entrepot,";
|
||||
$sql.= " cfd.fk_product, cfd.qty, cfd.rowid";
|
||||
$sql.= " FROM ".MAIN_DB_PREFIX."product as p,";
|
||||
$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
|
||||
@ -344,7 +346,11 @@ if ($id > 0 || ! empty($ref))
|
||||
print "</td>\n";
|
||||
|
||||
print '<td align="right">'.$objp->qty.'</td>';
|
||||
print '<td align="right">'.$objp->entrepot.'</td>';
|
||||
print '<td align="right">';
|
||||
$warehouse_static->id=$objp->warehouse_id;
|
||||
$warehouse_static->libelle=$objp->entrepot;
|
||||
print $warehouse_static->getNomUrl(1);
|
||||
print '</td>';
|
||||
print "</tr>\n";
|
||||
|
||||
$i++;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user