';
// Param
$label = $langs->trans($key);
- print ' | ';
+ print ' | ';
// Value
print '';
diff --git a/htdocs/salaries/admin/salaries_extrafields.php b/htdocs/salaries/admin/salaries_extrafields.php
new file mode 100644
index 00000000000..7920acf5c6c
--- /dev/null
+++ b/htdocs/salaries/admin/salaries_extrafields.php
@@ -0,0 +1,117 @@
+
+ * Copyright (C) 2004-2012 Laurent Destailleur
+ * Copyright (C) 2019 Alexandre Spangaro
+ *
+ * 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/admin/salaries_extrafields.php
+ * \ingroup member
+ * \brief Page to setup extra fields of salaries
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("admin","salaries"));
+
+$extrafields = new ExtraFields($db);
+$form = new Form($db);
+
+// List of supported format
+$tmptype2label=ExtraFields::$type2label;
+$type2label=array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+
+$action=GETPOST('action', 'alpha');
+$attrname=GETPOST('attrname', 'alpha');
+$elementtype='payment_salary'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+$textobject = $langs->transnoentitiesnoconv("Salaries");
+
+$help_url='';
+llxHeader('', $langs->trans("SalariesSetup"), $help_url);
+
+
+$linkback=''.$langs->trans("BackToModuleList").'';
+print load_fiche_titre($langs->trans("SalariesSetup"), $linkback, 'title_setup');
+
+
+$head = salaries_admin_prepare_head();
+
+dol_fiche_head($head, 'attributes', $langs->trans("Salaries"), -1, 'user');
+
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
+
+dol_fiche_end();
+
+
+// Buttons
+if ($action != 'create' && $action != 'edit')
+{
+ print '";
+}
+
+
+/* ************************************************************************** */
+/* */
+/* Creation of an optional field */
+/* */
+/* ************************************************************************** */
+
+if ($action == 'create')
+{
+ print '
';
+ print load_fiche_titre($langs->trans('NewAttribute'));
+
+ require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+}
+
+/* ************************************************************************** */
+/* */
+/* Edition of an optional field */
+/* */
+/* ************************************************************************** */
+if ($action == 'edit' && ! empty($attrname))
+{
+ print '
';
+ print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+
+ require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/compta/salaries/card.php b/htdocs/salaries/card.php
similarity index 89%
rename from htdocs/compta/salaries/card.php
rename to htdocs/salaries/card.php
index c19b18bc0f0..5028dae747e 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2011-2019 Alexandre Spangaro
* Copyright (C) 2014 Laurent Destailleur
* Copyright (C) 2015 Jean-François Ferry
* Copyright (C) 2015 Charlie BENKE
@@ -20,20 +20,21 @@
*/
/**
- * \file htdocs/compta/salaries/card.php
+ * \file htdocs/salaries/card.php
* \ingroup salaries
* \brief Page of salaries payments
*/
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php';
-require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/salaries/class/paymentsalary.class.php';
+require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/salaries.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
if (! empty($conf->projet->enabled))
{
- require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
- require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+ require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
}
// Load translation files required by the page
@@ -51,12 +52,14 @@ if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'salaries', '', '', '');
$object = new PaymentSalary($db);
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
$hookmanager->initHooks(array('salarycard','globalcard'));
-
-
/**
* Actions
*/
@@ -100,11 +103,15 @@ if ($action == 'add' && empty($cancel))
$object->fk_user_author=$user->id;
$object->fk_project= GETPOST('fk_project', 'int');
- // Set user current salary as ref salaray for the payment
+ // Set user current salary as ref salary for the payment
$fuser=new User($db);
$fuser->fetch(GETPOST("fk_user", "int"));
$object->salary=$fuser->salary;
+ // Fill array 'array_options' with data from add form
+ $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+ if ($ret < 0) $error++;
+
if (empty($datep) || empty($datev) || empty($datesp) || empty($dateep))
{
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
@@ -174,7 +181,7 @@ if ($action == 'delete')
if ($result >= 0)
{
$db->commit();
- header("Location: ".DOL_URL_ROOT.'/compta/salaries/list.php');
+ header("Location: ".DOL_URL_ROOT.'/salaries/list.php');
exit;
}
else
@@ -333,10 +340,14 @@ if ($action == 'create')
print ' | |
'."\n";
}
- // Other attributes
- $parameters=array();
- $reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
+ // Other attributes
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+ if (empty($reshook))
+ {
+ print $object->showOptionals($extrafields, 'edit', $parameters);
+ }
print '