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

Fix: Bouton rceptionner commande non actif

Browse Source
This commit is contained in:
Laurent Destailleur 2006-08-26 00:52:26 +00:00
parent d0c9050e3d
commit 5d23ac75e3
5 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/fourn/commande/fiche.php
View File

@ -33,6 +33,8 @@ require_once(DOL_DOCUMENT_ROOT."/project.class.php");
require_once(DOL_DOCUMENT_ROOT."/propal.class.php");
require_once(DOL_DOCUMENT_ROOT ."/fourn/commande/modules/modules_commandefournisseur.php");
$user->getrights("fournisseur");
if (!$user->rights->fournisseur->commande->lire) accessforbidden();
@ -695,7 +697,7 @@ if ($_GET["id"] > 0)
print '<br>';
print '<form action="fiche.php?id='.$commande->id.'" method="post">';
print '<input type="hidden" name="action" value="livraison">';
print '<table class="noborder">';
print '<table class="border" width="100%">';
print '<tr class="liste_titre"><td colspan="2">Réceptionner</td></tr>';
print '<tr><td>Date de livraison</td><td>';
print $form->select_date('','','','','',"commande");

2
htdocs/fourn/commande/history.php
View File

@ -147,7 +147,7 @@ if ($_GET["id"] > 0)
print '<td width="20%">'.dolibarr_print_date($obj->dl,"%a %d %b %Y %H:%M:%S")."</td>\n";
// Statut
print '<td width="100px">'.$commande->LibStatut($obj->fk_statut,4)."</td>\n";
print '<td width="100px" nowrap="1">'.$commande->LibStatut($obj->fk_statut,4)."</td>\n";
// User
print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">';

31
htdocs/fourn/commande/note.php
View File

@ -140,40 +140,23 @@ if ($_GET["id"] > 0)
print "</td></tr>";
}
// Auteur
print '<tr><td>'.$langs->trans("AuthorRequest").'</td>';
print '<td colspan="2">'.$author->getNomUrl(1).'</td>';
print '<td width="50%">';
print "&nbsp;</td></tr>";
// Ligne de 3 colonnes
print '<tr><td>'.$langs->trans("AmountHT").'</td>';
print '<td align="right"><b>'.price($commande->total_ht).'</b></td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td>';
print '<td valign="top">&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("AmountVAT").'</td><td align="right">'.price($commande->total_tva).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td>&nbsp;</td></tr>';
print '<tr><td>'.$langs->trans("AmountTTC").'</td><td align="right">'.price($commande->total_ttc).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td><td>&nbsp;</td></tr>';
print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
print '<td colspan="3">';
if ($user->rights->fournisseur->commande->creer) print '<textarea cols="90" rows="'.ROWS_4.'" name="note_public">';
print nl2br($commande->note_public);
if ($user->rights->fournisseur->commande->creer) print '</textarea>';
print '</td></tr>';
if (! $user->societe_id)
{
print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
print '<td colspan="3">';
if ($user->rights->fournisseur->commande->creer) print '<textarea cols="60" rows="'.ROWS_4.'" name="note">';
if ($user->rights->fournisseur->commande->creer) print '<textarea cols="90" rows="'.ROWS_6.'" name="note">';
print nl2br($commande->note);
if ($user->rights->fournisseur->commande->creer) print '</textarea>';
print '</td></tr>';
}
print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
print '<td colspan="3">';
if ($user->rights->fournisseur->commande->creer) print '<textarea cols="60" rows="'.ROWS_4.'" name="note_public">';
print nl2br($commande->note_public);
if ($user->rights->fournisseur->commande->creer) print '</textarea>';
print '</td></tr>';
if ($user->rights->fournisseur->commande->creer)
{
print '<tr><td colspan="4" align="center"><input type="submit" class="button" value="'.$langs->trans("Save").'"></td></tr>';

2
htdocs/fourn/fournisseur.commande.class.php
View File

@ -54,7 +54,7 @@ class CommandeFournisseur extends Commande
$this->statuts[2] = "Approuvée";
$this->statuts[3] = "Commandée";
$this->statuts[4] = "Reçu partiellement";
$this->statuts[5] = "Clotûrée";
$this->statuts[5] = "Reçu complètement";
$this->statuts[6] = "Annulée";
$this->statuts[9] = "Refusée";

1
mysql/migration/2.0.0-2.1.0.sql
View File

@ -315,6 +315,7 @@ insert into llx_rights_def (id, libelle, module, type, bydefault, subperms, perm
-- V4.1 insert into llx_user_rights(fk_user,fk_id) select distinct fk_user, '262' from llx_user_rights where fk_id = 261;
update llx_rights_def set subperms='creer' where subperms='supprimer' AND module='user' AND perms='self' AND id=255;
update llx_rights_def set module='tax' where module='compta' AND id in ('91','92','93');
update llx_rights_def set subperms='receptionner' where id=186;
alter table llx_commandedet add column rang integer DEFAULT 0;