diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 5fd3648b6f4..bfafc7b0ac9 100755 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -20,4 +20,6 @@ NewTask=New task Activity=Activity MyActivity=My activity DurationEffective=Effective duration -ListProposalsAssociatedProject=Lists of the commercial proposals associated the project \ No newline at end of file +ListProposalsAssociatedProject=Lists of the commercial proposals associated with the project +ListOrdersAssociatedProject=Lists of the orders associated with the project +ListInvoicesAssociatedProject=Lists of the invoices associated with the project \ No newline at end of file diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 9f266cb3125..14a494dd0eb 100755 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -20,4 +20,6 @@ NewTask=Nouvelle t Activity=Activité MyActivity=Mon activité DurationEffective=Durée effective -ListProposalsAssociatedProject=Listes des propositions commerciales associées au projet \ No newline at end of file +ListProposalsAssociatedProject=Listes des propositions commerciales associées au projet +ListOrdersAssociatedProject=Listes des commandes associées au projet +ListInvoicesAssociatedProject=Listes des factures associées au projet \ No newline at end of file diff --git a/htdocs/projet/commandes.php b/htdocs/projet/commandes.php index a383566134a..60bedcdba49 100644 --- a/htdocs/projet/commandes.php +++ b/htdocs/projet/commandes.php @@ -116,6 +116,19 @@ print ''.$langs->trans("Ref").''.$projet->ref.''; print ''.$langs->trans("Label").''.$projet->title.''; print ''; +/* + * Barre d'action + * + */ + print '
'; + + if ($conf->commande->enabled && $user->rights->commande->creer) + { + $langs->load("orders"); + print ''.$langs->trans("AddOrder").''; + } + print '
'; + /* * Commandes * @@ -126,7 +139,7 @@ if (sizeof($commandes)>0 && is_array($commandes)) { print '
'; - print_titre('Listes des commandes associées au projet'); + print_titre($langs->trans("ListProposalsAssociatedProject")); print ''; print ''; diff --git a/htdocs/projet/facture.php b/htdocs/projet/facture.php index f2d8c0533ac..69c15906009 100644 --- a/htdocs/projet/facture.php +++ b/htdocs/projet/facture.php @@ -117,6 +117,17 @@ print ''; print ''; print '
'.$langs->trans("Ref").''.$projet->ref.'
'.$langs->trans("Label").''.$projet->title.'
'; +/* + * Barre d'action + * + */ + print '
'; + + if ($conf->facture->enabled && $user->rights->facture->creer) + { + print ''.$langs->trans("AddBill").''; + } + print '
'; /* * Factures @@ -127,7 +138,7 @@ if (sizeof($factures)>0 && is_array($factures)) { print '
'; - print_titre('Listes des factures associées au projet'); + print_titre($langs->trans("ListInvoicesAssociatedProject")); print ''; print ''; diff --git a/htdocs/projet/propal.php b/htdocs/projet/propal.php index a7aa7850a43..2e6690abf72 100644 --- a/htdocs/projet/propal.php +++ b/htdocs/projet/propal.php @@ -131,7 +131,6 @@ print '
'; print ''.$langs->trans("AddProp").''; } print ''; - print '
'; $propales = $projet->get_propal_list();