diff --git a/ChangeLog b/ChangeLog index 66ff1ffd8e0..8d8ff361b59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,10 +11,12 @@ For users: - New: Add graph of bank account input/output into input-output report page. - New: Add script export-bank-receipts. - New: Add option "filter=bank" onto script rebuild_merge_pdf.php to merge - PDF that has one payment on a specific bank account. + PDF that has one payment on a specific bank account.* +- New: [ task #901 ] Add Extrafeild on Fiche Inter For developers: - New: DolGraph can build graph with three lines. + ***** ChangeLog for 3.4 compared to 3.3.2 ***** For users: - New: Can use ODS templates as document templates. diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index fe02656d37a..ade26bbafdd 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -30,6 +30,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; $langs->load("admin"); @@ -204,15 +205,9 @@ print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup'); print "
"; -$h = 0; +$head=fichinter_admin_prepare_head(); -$head[$h][0] = DOL_URL_ROOT."/admin/fichinter.php"; -$head[$h][1] = $langs->trans("Interventions"); -$head[$h][2] = 'Ficheinter'; -$hselected=$h; -$h++; - -dol_fiche_head($head, $hselected, $langs->trans("ModuleSetup")); +dol_fiche_head($head, 'ficheinter', $langs->trans("ModuleSetup")); // Interventions numbering model diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php index d39dd25346d..6a3187fb5fb 100644 --- a/htdocs/core/lib/fichinter.lib.php +++ b/htdocs/core/lib/fichinter.lib.php @@ -88,4 +88,42 @@ function fichinter_prepare_head($object) return $head; } +/** + * Return array head with list of tabs to view object informations. + * + * @return array head array with tabs + */ +function fichinter_admin_prepare_head() +{ + global $langs, $conf, $user; + + $h = 0; + $head = array(); + + $h = 0; + + $head[$h][0] = DOL_URL_ROOT."/admin/fichinter.php"; + $head[$h][1] = $langs->trans("Interventions"); + $head[$h][2] = 'ficheinter'; + $h++; + + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab + complete_head_from_modules($conf,$langs,$object,$head,$h,'fichinter_admin'); + + $head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinter_extrafields.php'; + $head[$h][1] = $langs->trans("ExtraFields"); + $head[$h][2] = 'attributes'; + $h++; + + + + complete_head_from_modules($conf,$langs,$object,$head,$h,'fichinter_admin','remove'); + + return $head; +} + + ?> diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php new file mode 100755 index 00000000000..c094e97666a --- /dev/null +++ b/htdocs/fichinter/admin/fichinter_extrafields.php @@ -0,0 +1,158 @@ + + * Copyright (C) 2003 Jean-Louis Bergamo + * Copyright (C) 2004-2011 Laurent Destailleur + * Copyright (C) 2012 Regis Houssin + * Copyright (C) 2013 Florian Henry + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/fichinter/admin/fichinter_extrafields.php + * \ingroup fichinter + * \brief Page to setup extra fields of ficheinter + */ + + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; + +$langs->load("companies"); +$langs->load("admin"); +$langs->load("members"); + +$extrafields = new ExtraFields($db); +$form = new Form($db); + +// List of supported format +$tmptype2label=getStaticMember(get_class($extrafields),'type2label'); +$type2label=array(''); +foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->trans($val); + +$action=GETPOST('action', 'alpha'); +$attrname=GETPOST('attrname', 'alpha'); +$elementtype='fichinter'; //Must be the $element of the class that manage extrafield + +if (!$user->admin) accessforbidden(); + + +/* + * Actions + */ + +require DOL_DOCUMENT_ROOT.'/core/admin_extrafields.inc.php'; + + + +/* + * View + */ + + +llxHeader(); + + +$linkback=''.$langs->trans("BackToModuleList").''; +print_fiche_titre($langs->trans("InterventionsSetup"),$linkback,'setup'); + + +$head=fichinter_admin_prepare_head(); + +dol_fiche_head($head, 'attributes', $langs->trans("Ficheinter"), 0, 'fichinter'); + + +print $langs->trans("DefineHereComplementaryAttributes",$textobject).'
'."\n"; +print '
'; + +// Load attribute_label +$extrafields->fetch_name_optionals_label($elementtype); + +print ""; + +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print "\n"; + +$var=True; +foreach($extrafields->attribute_type as $key => $value) +{ + $var=!$var; + print ""; + print "\n"; + print "\n"; + print "\n"; + print "\n"; + print '\n"; + print '\n"; + print '\n"; + print '\n"; + print ""; + // $i++; +} + +print "
'.$langs->trans("Position").''.$langs->trans("Label").''.$langs->trans("AttributeCode").''.$langs->trans("Type").''.$langs->trans("Size").''.$langs->trans("Unique").''.$langs->trans("Required").' 
".$extrafields->attribute_pos[$key]."".$extrafields->attribute_label[$key]."".$key."".$type2label[$extrafields->attribute_type[$key]]."'.$extrafields->attribute_size[$key]."'.yn($extrafields->attribute_unique[$key])."'.yn($extrafields->attribute_required[$key])."'.img_edit().''; + print "  ".img_delete()."
"; + +dol_fiche_end(); + + +// Buttons +if ($action != 'create' && $action != 'edit') +{ + print '
'; + print "".$langs->trans("NewAttribute").""; + print "
"; +} + + +/* ************************************************************************** */ +/* */ +/* Creation d'un champ optionnel + /* */ +/* ************************************************************************** */ + +if ($action == 'create') +{ + print "
"; + print_titre($langs->trans('NewAttribute')); + + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php'; +} + +/* ************************************************************************** */ +/* */ +/* Edition d'un champ optionnel */ +/* */ +/* ************************************************************************** */ +if ($action == 'edit' && ! empty($attrname)) +{ + print "
"; + print_titre($langs->trans("FieldEdition", $attrname)); + + require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php'; +} + +llxFooter(); + +$db->close(); +?> diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index a748ef0f549..5fcb865897c 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -82,9 +82,11 @@ class Fichinter extends CommonObject /** * Create an intervention into data base * + * @param User $user Objet user that make creation + * @param int $notrigger Disable all triggers * @return int <0 if KO, >0 if OK */ - function create() + function create($user, $notrigger=0) { global $conf, $user, $langs; @@ -142,7 +144,7 @@ class Fichinter extends CommonObject $sql.= ", '".$this->db->idate($now)."'"; $sql.= ", '".$this->ref."'"; $sql.= ", ".$conf->entity; - $sql.= ", ".$this->author; + $sql.= ", ".$user->id; $sql.= ", ".($this->description?"'".$this->db->escape($this->description)."'":"null"); $sql.= ", '".$this->modelpdf."'"; $sql.= ", ".($this->fk_project ? $this->fk_project : 0); @@ -173,16 +175,16 @@ class Fichinter extends CommonObject if (! $ret) dol_print_error($this->db); } + if (! $notrigger) + { // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); - $tmpuser=new User($this->db); - $tmpuser->fetch($this->author); - $result=$interface->run_triggers('FICHINTER_CREATE',$this,$tmpuser,$langs,$conf); + $result=$interface->run_triggers('FICHINTER_CREATE',$this,$user,$langs,$conf); if ($result < 0) { $error++; $this->errors=$interface->errors; } - // Fin appel triggers + } if (! $error) { @@ -210,9 +212,11 @@ class Fichinter extends CommonObject /** * Update an intervention * + * @param User $user Objet user that make creation + * @param int $notrigger Disable all triggers * @return int <0 if KO, >0 if OK */ - function update() + function update($user, $notrigger=0) { if (! is_numeric($this->duree)) { $this->duree = 0; } if (! dol_strlen($this->fk_project)) { $this->fk_project = 0; } @@ -230,6 +234,9 @@ class Fichinter extends CommonObject dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG); if ($this->db->query($sql)) { + + if (! $notrigger) + { // Appel des triggers include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($this->db); @@ -238,6 +245,7 @@ class Fichinter extends CommonObject $error++; $this->errors=$interface->errors; } // Fin appel triggers + } $this->db->commit(); return 1; @@ -295,6 +303,13 @@ class Fichinter extends CommonObject if ($this->statut == 0) $this->brouillon = 1; + require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'); + $extrafields=new ExtraFields($this->db); + $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true); + if (count($extralabels)>0) { + $this->fetch_optionals($this->id,$extralabels); + } + /* * Lines */ @@ -1021,7 +1036,7 @@ class FichinterLigne $sql.= ' (fk_fichinter, description, date, duree, rang)'; $sql.= " VALUES (".$this->fk_fichinter.","; $sql.= " '".$this->db->escape($this->desc)."',"; - $sql.= " ".$this->db->idate($this->datei).","; + $sql.= " '".$this->db->idate($this->datei)."',"; $sql.= " ".$this->duration.","; $sql.= ' '.$rangToUse; $sql.= ')'; diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 941b5232f54..eeb3c9ee89c 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -41,6 +41,7 @@ if (! empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT ." require_once DOL_DOCUMENT_ROOT ."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.'.php'; } require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $langs->load("companies"); $langs->load("interventions"); @@ -67,6 +68,8 @@ $result = restrictedArea($user, 'ficheinter', $id, 'fichinter'); $hookmanager->initHooks(array('interventioncard')); $object = new Fichinter($db); +$extrafields = new ExtraFields($db); +$extralabels=$extrafields->fetch_name_optionals_label($object->table_element); /* @@ -134,7 +137,6 @@ else if ($action == 'add' && $user->rights->ficheinter->creer) $object->socid = $socid; $object->duree = GETPOST('duree','int'); $object->fk_project = GETPOST('projectid','int'); - $object->author = $user->id; $object->description = GETPOST('description'); $object->ref = $ref; $object->modelpdf = GETPOST('model','alpha'); @@ -155,9 +157,15 @@ else if ($action == 'add' && $user->rights->ficheinter->creer) } // For compatibility - if ($element == 'order') { $element = $subelement = 'commande'; } - if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; } - if ($element == 'contract') { $element = $subelement = 'contrat'; } + if ($element == 'order') { + $element = $subelement = 'commande'; + } + if ($element == 'propal') { + $element = 'comm/propal'; $subelement = 'propal'; + } + if ($element == 'contract') { + $element = $subelement = 'contrat'; + } $object->origin = $origin; $object->origin_id = $originid; @@ -270,7 +278,7 @@ else if ($action == 'add' && $user->rights->ficheinter->creer) } else { - $result = $object->create(); + $result = $object->create($user); if ($result > 0) { $id=$result; // Force raffraichissement sur fiche venant d'etre cree @@ -300,7 +308,10 @@ else if ($action == 'update' && $user->rights->ficheinter->creer) $object->description = GETPOST('description','alpha'); $object->ref = $ref; - $object->update(); + $result=$object->update($user); + if ($result<0) { + setEventMessage($object->error,'errors'); + } } /* @@ -630,13 +641,8 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA { $langs->load('mails'); - if ($object->fetch($id) > 0) - { -// $objectref = dol_sanitizeFileName($object->ref); -// $file = $conf->ficheinter->dir_output . '/' . $objectref . '/' . $objectref . '.pdf'; + if ($object->fetch($id) > 0) { -// if (is_readable($file)) -// { $object->fetch_thirdparty(); if (GETPOST('sendto','alpha')) @@ -722,7 +728,9 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; $interface=new Interfaces($db); $result=$interface->run_triggers('FICHINTER_SENTBYMAIL',$object,$user,$langs,$conf); - if ($result < 0) { $error++; $this->errors=$interface->errors; } + if ($result < 0) { + $error++; $this->errors=$interface->errors; + } // Fin appel triggers if ($error) @@ -760,13 +768,6 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA $mesg='
'.$langs->trans('ErrorMailRecipientIsEmpty').' !
'; dol_syslog('Recipient email is empty'); } - /*} - else - { - $langs->load("errors"); - $mesg='
'.$langs->trans('ErrorCantReadFile',$file).'
'; - dol_syslog('Failed to read file: '.$file); - }*/ } else { @@ -778,6 +779,32 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA $action='presend'; } +else if ($action == 'update_extras') +{ + $object->fetch($id); + // Fill array 'array_options' with data from update form + $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); + $ret = $extrafields->setOptionalsFromPost($extralabels,$object); + + // Actions on extra fields (by external module or standard code) + // FIXME le hook fait double emploi avec le trigger !! + $hookmanager->initHooks(array('interventiondao')); + $parameters=array('id'=>$object->id); + $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks + if (empty($reshook)) + { + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used + { + $result=$object->insertExtraFields(); + if ($result < 0) + { + $error++; + } + } + } + else if ($reshook < 0) $error++; +} + if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer) { if ($action == 'addcontact') @@ -881,9 +908,15 @@ if ($action == 'create') else { // For compatibility - if ($element == 'order' || $element == 'commande') { $element = $subelement = 'commande'; } - if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; } - if ($element == 'contract') { $element = $subelement = 'contrat'; } + if ($element == 'order' || $element == 'commande') { + $element = $subelement = 'commande'; + } + if ($element == 'propal') { + $element = 'comm/propal'; $subelement = 'propal'; + } + if ($element == 'contract') { + $element = $subelement = 'contrat'; + } dol_include_once('/'.$element.'/class/'.$subelement.'.class.php'); @@ -999,6 +1032,10 @@ if ($action == 'create') // Other attributes $parameters=array('colspan' => ' colspan="2"'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + print $object->showOptionals($extrafields,'edit'); + } // Show link to origin object @@ -1165,6 +1202,67 @@ else if ($id > 0 || ! empty($ref)) // Other attributes $parameters=array('colspan' => ' colspan="3"'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + if ($action == 'edit_extras') + { + print '
'; + print ''; + print ''; + print ''; + } + + foreach($extrafields->attribute_label as $key=>$label) + { + if ($action == 'edit_extras') { + $value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]); + } else { + $value=$object->array_options["options_".$key]; + } + if ($extrafields->attribute_type[$key] == 'separate') + { + print $extrafields->showSeparator($key); + } + else + { + print 'attribute_required[$key])) print ' class="fieldrequired"'; + print '>'.$label.''; + // Convert date into timestamp format + if (in_array($extrafields->attribute_type[$key],array('date','datetime'))) + { + $value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$db->jdate($object->array_options['options_'.$key]); + } + if ($action == 'edit_extras' && $user->rights->ficheinter->creer) + { + print $extrafields->showInputField($key,$value); + } + else + { + print $extrafields->showOutputField($key,$value); + } + print ''."\n"; + } + } + + if(count($extrafields->attribute_label) > 0) { + + if ($action == 'edit_extras' && $user->rights->ficheinter->creer) + { + print ''; + print ''; + print ''; + print ''; + + } + else { + if ($object->statut == 0 && $user->rights->ficheinter->creer) + { + print ''.img_picto('','edit').' '.$langs->trans('Modify').''; + } + } + } + } print "
"; diff --git a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql index 03babcae351..0fe73865793 100755 --- a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql +++ b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql @@ -22,4 +22,14 @@ DELETE FROM llx_menu where module='holiday'; ALTER TABLE llx_projet_task ADD COLUMN planned_workload real DEFAULT 0 NOT NULL AFTER duration_effective; +create table llx_fichinter_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, + import_key varchar(14) -- import key +) ENGINE=innodb; + +ALTER TABLE llx_fichinter_extrafields ADD INDEX idx_ficheinter_extrafields (fk_object); + diff --git a/htdocs/install/mysql/tables/llx_fichinter_extrafields.key.sql b/htdocs/install/mysql/tables/llx_fichinter_extrafields.key.sql new file mode 100755 index 00000000000..00fc1801f31 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_fichinter_extrafields.key.sql @@ -0,0 +1,20 @@ +-- =================================================================== +-- Copyright (C) 2013 Florian Henry +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + + +ALTER TABLE llx_fichinter_extrafields ADD INDEX idx_ficheinter_extrafields (fk_object); diff --git a/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql b/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql new file mode 100644 index 00000000000..47e3bbbcc17 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql @@ -0,0 +1,25 @@ +-- =================================================================== +-- Copyright (C) 2013 florian Henry +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + +create table llx_fichinter_extrafields +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, + import_key varchar(14) -- import key +) ENGINE=innodb;