>From 856bf0c6396a6b088a3dc93214e55d03727676ca Mon Sep 17 00:00:00 2001 From: graveen
Date: Wed, 14 Sep 2011 14:55:16 +0200 Subject: [PATCH] Add: dolibarr_install.log to .gitignore Fix: typo GETPOT() Fix: check if array Add: allow attachment of any project to any supplier's order - configure this option via project admin --- .gitignore | 1 + htdocs/admin/project.php | 35 +++++++++++++++++++++++++++++++++++ htdocs/fourn/commande/fiche.php | 2 +- htdocs/langs/en_US/admin.lang | 2 ++ htdocs/langs/fr_FR/admin.lang | 2 ++ htdocs/product/fournisseurs.php | 12 ++++++------ htdocs/societe/societe.php | 2 +- 7 files changed, 48 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 14b47b7..1585561 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ nbproject .settings/ .buildpath .gitmodules +dolibarr_install.log diff --git a/htdocs/admin/project.php b/htdocs/admin/project.php index 26c95ec..a3d5c6f 100644 --- a/htdocs/admin/project.php +++ b/htdocs/admin/project.php @@ -396,8 +396,43 @@ if (is_resource($handle)) closedir($handle); } +// Allows you to select any project for supplier orders print ''.$langs->trans("Description").' | '; +print ''; +print ' | '.$langs->trans("Value").' | '."\n"; +print '
'.$langs->trans("ProjectsAllAvailablesForSuppliersOrders").' | '; +print ''; + +print ' | '; +if ($conf->use_javascript_ajax) +{ + print ajax_constantonoff('PROJECT_ALL_SELECTABLES'); +} +else +{ + if($conf->global->PROJECT_ALL_SELECTABLES == 0) + { + print ''.img_picto($langs->trans("Disabled"),'off').''; + } + else if($conf->global->PROJECT_ALL_SELECTABLES == 1) + { + print ''.img_picto($langs->trans("Enabled"),'on').''; + } +} +print ' |