diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 4c9512f18d1..f8d3a1fc567 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -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 '
'; print '
'; print ''; - print ''; + print '
'; print ''; print '\n"; // Statut - print '\n"; + print '\n"; // User print '"; } - // Auteur - print ''; - print ''; - print '"; - - // Ligne de 3 colonnes - print ''; - print ''; - print ''; - print ''; - - print ''; - print ''; - print ''; - print ''; + print ''; + print ''; if (! $user->societe_id) { print ''; print ''; } - print ''; - print ''; - if ($user->rights->fournisseur->commande->creer) { print ''; diff --git a/htdocs/fourn/fournisseur.commande.class.php b/htdocs/fourn/fournisseur.commande.class.php index e386eebd52c..877a00f2a0e 100644 --- a/htdocs/fourn/fournisseur.commande.class.php +++ b/htdocs/fourn/fournisseur.commande.class.php @@ -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"; diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql index af7011da903..edc66304033 100644 --- a/mysql/migration/2.0.0-2.1.0.sql +++ b/mysql/migration/2.0.0-2.1.0.sql @@ -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;
Réceptionner
Date de livraison'; print $form->select_date('','','','','',"commande"); diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php index cbaf50f8ee0..4bae969edbe 100644 --- a/htdocs/fourn/commande/history.php +++ b/htdocs/fourn/commande/history.php @@ -147,7 +147,7 @@ if ($_GET["id"] > 0) print ''.dolibarr_print_date($obj->dl,"%a %d %b %Y %H:%M:%S")."'.$commande->LibStatut($obj->fk_statut,4)."'.$commande->LibStatut($obj->fk_statut,4)."'; diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index 0c31471006d..21adf98b646 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -140,40 +140,23 @@ if ($_GET["id"] > 0) print "
'.$langs->trans("AuthorRequest").''.$author->getNomUrl(1).''; - print " 
'.$langs->trans("AmountHT").''.price($commande->total_ht).''.$langs->trans("Currency".$conf->monnaie).' 
'.$langs->trans("AmountVAT").''.price($commande->total_tva).''.$langs->trans("Currency".$conf->monnaie).' 
'.$langs->trans("AmountTTC").''.price($commande->total_ttc).''.$langs->trans("Currency".$conf->monnaie).' 
'.$langs->trans("NotePublic").''; + if ($user->rights->fournisseur->commande->creer) print ''; + print '
'.$langs->trans("NotePrivate").''; - if ($user->rights->fournisseur->commande->creer) print ''; print '
'.$langs->trans("NotePublic").''; - if ($user->rights->fournisseur->commande->creer) print ''; - print '