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

Minor fixes.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-07-11 19:29:18 +00:00
parent 3674435bcf
commit 1315833247
3 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
htdocs/admin/stock.php
View File

@ -120,36 +120,21 @@ print '</tr>'."\n";
/* /*
* Formulaire parametres divers * Formulaire parametres divers
*/ */
// sousproduits activation/desactivation
$var=!$var; $var=!$var;
/*print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print '<td width="60%">'.$langs->trans("UserWarehouse").'</td>'; print '<td width="60%">'.$langs->trans("UserWarehouseAutoCreate").'</td>';
print '<td width="160" align="right">'; 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="token" value="'.$_SESSION['newtoken'].'">';
print "<input type=\"hidden\" name=\"action\" value=\"STOCK_USERSTOCK\">"; print "<input type=\"hidden\" name=\"action\" value=\"STOCK_USERSTOCK_AUTOCREATE\">";
print $html->selectyesno("STOCK_USERSTOCK",$conf->global->STOCK_USERSTOCK,1); print $html->selectyesno("STOCK_USERSTOCK_AUTOCREATE",$conf->global->STOCK_USERSTOCK_AUTOCREATE,1);
print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">'; print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</form>\n</td>\n</tr>\n"; print '</form>';
print "</td>\n";
if ($conf->global->STOCK_USERSTOCK == 1) print "</tr>\n";
{
$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";
/*} */
// Title rule for stock decrease // Title rule for stock decrease
@ -223,7 +208,7 @@ if ($conf->fournisseur->enabled)
print "</form>\n</td>\n</tr>\n"; print "</form>\n</td>\n</tr>\n";
} }
if ($conf->commande->enabled) if ($conf->fournisseur->enabled)
{ {
$var=!$var; $var=!$var;
print "<tr ".$bc[$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 $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 '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
print "</form>\n</td>\n</tr>\n"; print "</form>\n</td>\n</tr>\n";
}
if ($conf->fournisseur->enabled)
{
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">"; print "<tr ".$bc[$var].">";
print '<td width="60%">'.$langs->trans("ReStockOnDispatchOrder").'</td>'; print '<td width="60%">'.$langs->trans("ReStockOnDispatchOrder").'</td>';

26
htdocs/cashdesk/style.css
View File

@ -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 * 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 * 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 * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ /* ------------------- Initialisations ------------------- */ */
/* \version $Id$ */
body { body {
background: #eee; background: #eee;
color: #333; color: #333;
@ -42,7 +45,7 @@ p {
background: url("img/bg_conteneur_droite.png") top right repeat-y; background: url("img/bg_conteneur_droite.png") top right repeat-y;
} }
/* ------------------- En-tête ------------------- */ /* ------------------- En-t<EFBFBD>te ------------------- */
.entete { .entete {
height: 15px; height: 15px;
margin: 0; margin: 0;
@ -66,7 +69,7 @@ p {
} }
.menu_bloc { .menu_bloc {
margin-left: 20px; margin-left: 12px;
} }
.menu { .menu {
@ -79,12 +82,12 @@ p {
.menu li { .menu li {
float: left; float: left;
font-weight: bold; font-weight: bold;
width: 230px;
} }
.menu_choix1,.menu_choix2 { .menu_choix1,.menu_choix2 {
font-size: 1.4em; font-size: 1.4em;
text-align: left; text-align: left;
width: 180px;
} }
.menu_choix1 a,.menu_choix2 a { .menu_choix1 a,.menu_choix2 a {
@ -92,7 +95,7 @@ p {
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
width: 100px; width: 100px;
padding-left: 60px; padding-left: 54px;
height: 48px; height: 48px;
background: url('img/new.png') top left no-repeat; background: url('img/new.png') top left no-repeat;
} }
@ -113,7 +116,7 @@ p {
font-size: 0.9em; font-size: 0.9em;
text-align: right; text-align: right;
font-style: italic; font-style: italic;
width: 280px; width: 340px;
display: block; display: block;
color: #333; color: #333;
text-decoration: none; text-decoration: none;
@ -125,10 +128,11 @@ p {
} }
/* ------------------- Récapitulatif des articles ------------------- */ /* ------------------- R<EFBFBD>capitulatif des articles ------------------- */
.liste_articles { .liste_articles {
width: 215px; width: 215px;
float: right; float: right;
margin-top: 8px;
margin-right: 20px; margin-right: 20px;
border: 1px dotted #5ca64d; border: 1px dotted #5ca64d;
padding-bottom: 10px; padding-bottom: 10px;
@ -269,7 +273,7 @@ p.titre {
position: absolute; position: absolute;
} }
/* --------------------- Listes déroulantes ------------------- */ /* --------------------- Listes d<EFBFBD>roulantes ------------------- */
.select_design { .select_design {
width: 370px; width: 370px;
overflow: auto; overflow: auto;
@ -390,7 +394,7 @@ p.titre {
background: url('img/bg_pied.png') no-repeat bottom left; 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 { .msg_err1 {
color: #c00; color: #c00;
} }
@ -443,7 +447,7 @@ p.titre {
padding: 0; padding: 0;
} }
/* Affichage de la liste des résultats */ /* Affichage de la liste des r<EFBFBD>sultats */
.dhtml_bloc { .dhtml_bloc {
margin: 0; margin: 0;
padding: 3px; padding: 3px;

10
htdocs/fourn/commande/dispatch.php
View File

@ -92,6 +92,7 @@ if ($_POST["action"] == 'dispatch' && $user->rights->fournisseur->commande->rece
llxHeader('',$langs->trans("OrderCard"),"CommandeFournisseur"); llxHeader('',$langs->trans("OrderCard"),"CommandeFournisseur");
$html = new Form($db); $html = new Form($db);
$warehouse_static = new Entrepot($db);
$now=dol_now(); $now=dol_now();
@ -305,7 +306,8 @@ if ($id > 0 || ! empty($ref))
} }
// List of already dispatching // 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.= " cfd.fk_product, cfd.qty, cfd.rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p,"; $sql.= " FROM ".MAIN_DB_PREFIX."product as p,";
$sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd"; $sql.= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
@ -344,7 +346,11 @@ if ($id > 0 || ! empty($ref))
print "</td>\n"; print "</td>\n";
print '<td align="right">'.$objp->qty.'</td>'; 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"; print "</tr>\n";
$i++; $i++;