Merge pull request #2678 from defrance69/patch-60

add tab management on salarie payement

htdocs/compta/salaries/card.php

@@ -2,6 +2,7 @@
 /* Copyright (C) 2011-2014 Alexandre Spangaro   <alexandre.spangaro@gmail.com>
  * Copyright (C) 2014      Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2015      Charlie BENKE	<charlie@patas-monkey.com> 
  *
  * 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
@@ -27,6 +28,8 @@ 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';
+
 
 $langs->load("compta");
 $langs->load("banks");
@@ -298,11 +301,8 @@ if ($action == 'create')
 
 if ($id)
 {
-	$h = 0;
+
-	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/card.php?id='.$salpayment->id;
+	$head=salaries_prepare_head($object);
-	$head[$h][1] = $langs->trans('Card');
-	$head[$h][2] = 'card';
-	$h++;
 
 	dol_fiche_head($head, 'card', $langs->trans("SalaryPayment"), 0, 'payment');
 

htdocs/compta/salaries/info.php

@@ -0,0 +1,68 @@
+<?php
+/* Copyright (C) 2005-2009  Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2015		Charlie BENKE		 <charlie@patas-monkey.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/compta/salaries/info.php
+ *	\ingroup    salaries
+ *	\brief      Page with info about salaries contribution
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+$langs->load("compta");
+$langs->load("bills");
+$langs->load("salaries");
+
+$id=GETPOST('id','int');
+$action=GETPOST("action");
+
+// Security check
+$socid = GETPOST('socid','int');
+if ($user->societe_id) $socid=$user->societe_id;
+$result = restrictedArea($user, 'salaries', '', '', '');
+
+
+/*
+ * View
+ */
+
+$help_url='EN:Module_Salaries|FR:Module Fiche de paie|ES:M&oacute;dulo Salarios';
+llxHeader("",$langs->trans("Salaries"),$help_url);
+
+
+$salpayment = new PaymentSalary($db);
+$result = $salpayment->fetch($id);
+$salpayment->info($id);
+
+$head = salaries_prepare_head($salpayment);
+
+dol_fiche_head($head, 'info', $langs->trans("SalaryPayment"), 0, 'payment');
+
+
+print '<table width="100%"><tr><td>';
+dol_print_object_info($salpayment);
+print '</td></tr></table>';
+
+print '</div>';
+
+llxFooter();
+
+$db->close();

htdocs/core/lib/salaries.lib.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright (C) 2015	Charlie BENKE	<charlie@patas-monkey.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ * Returns an array with the tabs for the "salaries" section
+ * It loads tabs from modules looking for the entity salaries
+ *  
+ * @param Paiement $object Current salaries object
+ * @return array Tabs for the salaries section
+ */
+function salaries_prepare_head($object) {
+	
+	global $langs, $conf;
+	
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'salaries';
+	$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);   												to remove a tab
+    complete_head_from_modules($conf,$langs,$object,$head,$h,'salaries');
+
+	$head[$h][0] = DOL_URL_ROOT.'/compta/salaries/info.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
+
+	complete_head_from_modules($conf,$langs,$object,$head,$h,'salaries', 'remove');
+
+	return $head;
+}