diff --git a/.gitignore b/.gitignore index 1efe4f4bb82..1ece034ae94 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ Thumbs.db htdocs/includes/autoload.php htdocs/includes/bin/ htdocs/includes/composer/ +/.pydevproject diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php index b7ae5c7c2a7..49b35fdf7e1 100644 --- a/htdocs/contrat/list.php +++ b/htdocs/contrat/list.php @@ -375,7 +375,7 @@ $massactionbutton=$form->selectMassAction('', $arrayofmassactions); $newcardbutton=''; if ($user->rights->contrat->creer) { - $newcardbutton=''.$langs->trans('NewContractSubscription'); + $newcardbutton=''.$langs->trans('NewContractSubscription').''; $newcardbutton.= ''; $newcardbutton.= ''; } @@ -388,6 +388,7 @@ print ''; print ''; print ''; print ''; +print ''; print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'title_commercial.png', 0, $newcardbutton, '', $limit); diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 3f67b186b0b..5d07b7f4619 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -519,10 +519,10 @@ class Conf // Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal" if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later. - - // Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list - if (! empty($this->modules_parts['moduleforexternal'])) - foreach($this->modules_parts['moduleforexternal'] as $key=>$value) $this->global->MAIN_MODULES_FOR_EXTERNAL.=",$key"; + if (! empty($this->modules_parts['moduleforexternal'])) // Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list + { + foreach($this->modules_parts['moduleforexternal'] as $key=>$value) $this->global->MAIN_MODULES_FOR_EXTERNAL.=",".$key; + } // Enable select2 if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') $this->global->MAIN_USE_JQUERY_MULTISELECT='select2'; diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php index ebc9257ddc9..c278eea3f09 100644 --- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php +++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php @@ -95,7 +95,8 @@ class modMyModule extends DolibarrModules 'models' => 0, // Set this to 1 if module has its own models directory (core/modules/xxx) 'css' => array('/mymodule/css/mymodule.css.php'), // Set this to relative path of css file if module has its own css file 'js' => array('/mymodule/js/mymodule.js.php'), // Set this to relative path of js file if module must load a js on all pages - 'hooks' => array('data'=>array('hookcontext1','hookcontext2'), 'entity'=>'0') // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all' + 'hooks' => array('data'=>array('hookcontext1','hookcontext2'), 'entity'=>'0'), // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all' + 'moduleforexternal' => 0 // Set this to 1 if feature of module are opened to external users ); // Data directories to create when module is enabled. diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php index 5643533239f..413ffa6be5e 100644 --- a/htdocs/projet/class/projectstats.class.php +++ b/htdocs/projet/class/projectstats.class.php @@ -143,6 +143,7 @@ class ProjectStats extends Stats if (! empty($this->userid)) $sqlwhere[] = ' t.fk_user_resp=' . $this->userid; + // Forced filter on socid is similar to forced filter on project. TODO Use project assignement to allow to not use filter on project if (! empty($this->socid)) $sqlwhere[] = ' t.fk_soc=' . $this->socid; if (! empty($this->year) && empty($this->yearmonth)) diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php index c3add03828c..20a3a67d1d3 100644 --- a/htdocs/projet/class/taskstats.class.php +++ b/htdocs/projet/class/taskstats.class.php @@ -138,8 +138,9 @@ class TaskStats extends Stats if (! empty($this->userid)) $sqlwhere[] = ' t.fk_user_resp=' . $this->userid; + // Forced filter on socid is similar to forced filter on project. TODO Use project assignement to allow to not use filter on project if (! empty($this->socid)) - $sqlwhere[] = ' t.fk_soc=' . $this->socid; + $sqlwhere[] = ' p.fk_soc=' . $this->socid; // Link on thirdparty is on project, not on task if (! empty($this->year) && empty($this->yearmonth)) $sqlwhere[] = " date_format(t.datec,'%Y')='" . $this->db->escape($this->year) . "'"; if (! empty($this->yearmonth)) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 4d7da039467..4570ef493f5 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2827,9 +2827,9 @@ div.pagination li:last-child span { border-bottom-right-radius: 4px;*/ } div.pagination li a:hover, -div.pagination li span:hover, +div.pagination li:not(.paginationafterarrows) span:hover, div.pagination li a:focus, -div.pagination li span:focus { +div.pagination li:not(.paginationafterarrows) span:focus { -webkit-box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); box-shadow: 0px 0px 6px 1px rgba(50, 50, 50, 0.4), 0px 0px 0px rgba(60,60,60,0.1); }