Merge remote-tracking branch 'upstream/develop' into develop

htdocs/cache.manifest

@@ -33,5 +33,5 @@ NETWORK:
 # If the browser is unable to retrieve the original content, the fallback resource will be used.
 # In the example above, we display a static image in case the dynamic one is unavailable.
 FALLBACK: 
-#/ public/offline.php
+#/ public/notice.php
-#theme/amarok/img/* theme/eldy/img/
+#theme/eldy/img/* theme/md/img/*

htdocs/core/lib/expensereport.lib.php

@@ -56,6 +56,18 @@ function expensereport_prepare_head($object)
 	$head[$h][2] = 'documents';
 	$h++;
 
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
+	{
+	    $nbNote = 0;
+	    if(!empty($object->note_private)) $nbNote++;
+	    if(!empty($object->note_public)) $nbNote++;
+	    $head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
+	    $head[$h][1] = $langs->trans('Notes');
+	    if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+	    $head[$h][2] = 'note';
+	    $h++;
+	}
+	
 	$head[$h][0] = DOL_URL_ROOT . '/expensereport/info.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';

htdocs/core/lib/functions.lib.php

@@ -2585,7 +2585,7 @@ function img_warning($titlealt = 'default', $morealt = '')
 
 	if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
 
-	return img_picto($titlealt, 'warning.png', 'class="pictowarning"'.($morealt ? ($morealt == '1' ? ' style="float: right"' : ' '.$morealt): ''));
+	return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($morealt ? ($morealt == '1' ? ' style="float: right"' : ' '.$morealt): ''));
 }
 
 /**

htdocs/core/menus/standard/eldy.lib.php

@@ -681,15 +681,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
 				    if (! empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $menutoshow=$langs->trans("CustomersCategoriesShort");
 				    if (! empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $menutoshow=$langs->trans("ProspectsCategoriesShort");
 					$newmenu->add("/categories/index.php?leftmenu=cat&type=2", $menutoshow, 0, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-                    $newmenu->add("/categories/card.php?action=create&type=2", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
+				    $newmenu->add("/categories/card.php?action=create&type=2", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
 				}
 				// Categories Contact
-				$newmenu->add("/categories/index.php?leftmenu=cat&type=4", $langs->trans("ContactCategoriesShort"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+				$newmenu->add("/categories/index.php?leftmenu=catcontact&type=4", $langs->trans("ContactCategoriesShort"), 0, $user->rights->categorie->lire, '', $mainmenu, 'cat');
 				$newmenu->add("/categories/card.php?action=create&type=4", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
 				// Categories suppliers
 				if (! empty($conf->fournisseur->enabled))
 				{
-					$newmenu->add("/categories/index.php?leftmenu=cat&type=1", $langs->trans("SuppliersCategoriesShort"), 0, $user->rights->categorie->lire);
+					$newmenu->add("/categories/index.php?leftmenu=catfournish&type=1", $langs->trans("SuppliersCategoriesShort"), 0, $user->rights->categorie->lire);
 					$newmenu->add("/categories/card.php?action=create&type=1", $langs->trans("NewCategory"), 1, $user->rights->categorie->creer);
 				}
 				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);

htdocs/disabled.php

@@ -1,29 +0,0 @@
-<?php
-/* Copyright (C) 2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- *
- * 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/
- */
-
-/**
- *	\file       htdocs/disabled.php
- *  \brief      Page to use to replace index.php to disable all software
- */
-?>
-<html>
-<body>
-This feature has been disabled on this test server.<br>
-Cette fonctionnalité a été désactivée sur ce serveur de test.<br>
-</body>
-</html>

htdocs/expensereport/document.php

@@ -93,6 +93,14 @@ if ($object->id)
 
 	dol_fiche_head($head, 'documents',  $langs->trans("ExpenseReport"), 0, 'trip');
 
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+	
+	$morehtmlref='<div class="refidno">';
+	$morehtmlref.='</div>';
+	
+	
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	
 	
 	// Construit liste des fichiers
 	$filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
@@ -102,25 +110,22 @@ if ($object->id)
 		$totalsize+=$file['size'];
 	}
 
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 	
     print '<table class="border" width="100%">';
 
     $linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
-	// Ref
+    print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
-	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref', '');
-	print '</td></tr>';
-
-	// Societe
-	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
-
-    print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
     print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
     print '</table>';
 
     print '</div>';
 
+    dol_fiche_end();
+    
+    
     $modulepart = 'expensereport';
     $permission = $user->rights->expensereport->creer;
     $permtoedit = $user->rights->expensereport->creer;

htdocs/expensereport/info.php

@@ -43,21 +43,36 @@ $title=$langs->trans("ExpenseReport") . " - " . $langs->trans("Info");
 $helpurl="EN:Module_Expense_Reports";
 llxHeader("",$title,$helpurl);
 
-if ($id)
+if ($id > 0 || ! empty($ref))
 {
 	$object = new ExpenseReport($db);
-	$object->fetch($id);
+	$object->fetch($id,$ref);
-	$object->info($id);
+	$object->info($object->id);
 
 	$head = expensereport_prepare_head($object);
 
 	dol_fiche_head($head, 'info', $langs->trans("ExpenseReport"), 0, 'trip');
 
-    print '<table width="100%"><tr><td>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+	
+	$morehtmlref='<div class="refidno">';
+    $morehtmlref.='</div>';
+
+	
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+	
+	print '<br>';
+	
+	print '<table width="100%"><tr><td>';
     dol_print_object_info($object);
     print '</td></tr></table>';
 
     print '</div>';
+    
+    dol_fiche_end();
 }
 
 llxFooter();

htdocs/expensereport/note.php

@@ -0,0 +1,119 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
+ *
+ * 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/commande/note.php
+ *  \ingroup    commande
+ *  \brief      Fiche de notes sur une commande
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+
+$langs->load("trips");
+$langs->load("companies");
+$langs->load("bills");
+$langs->load("orders");
+
+$id = GETPOST('id','int');
+$ref=GETPOST('ref','alpha');
+$socid=GETPOST('socid','int');
+$action=GETPOST('action','alpha');
+
+// Security check
+$socid=0;
+if ($user->societe_id) $socid=$user->societe_id;
+$result=restrictedArea($user,'expensereport',$id,'');
+
+
+$object = new ExpenseReport($db);
+if (! $object->fetch($id, $ref) > 0)
+{
+	dol_print_error($db);
+}
+
+$permissionnote=$user->rights->expensereport->creer;	// Used by the include of actions_setnotes.inc.php
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not includ_once
+
+
+/*
+ * View
+ */
+$title=$langs->trans("ExpenseReport") . " - " . $langs->trans("Note");
+$helpurl="EN:Module_Expense_Reports";
+llxHeader("",$title,$helpurl);
+
+$form = new Form($db);
+
+if ($id > 0 || ! empty($ref))
+{
+	$object = new ExpenseReport($db);
+	$object->fetch($id, $ref);
+	$object->info($object->id);
+
+	$head = expensereport_prepare_head($object);
+
+	dol_fiche_head($head, 'note', $langs->trans("ExpenseReport"), 0, 'trip');
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
+	
+	$morehtmlref='<div class="refidno">';
+    $morehtmlref.='</div>';
+
+	
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	
+	
+    /*	
+	print '<table class="border" width="100%">';
+
+	// Ref
+	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td colspan="3">';
+	print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref');
+	print "</td></tr>";
+
+	print "</table>";
+
+	print '<br>';
+    */
+	 
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
+	 
+	$cssclass="titlefield";
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+	print '</div>';
+	
+	dol_fiche_end();
+	
+}
+
+
+llxFooter();
+$db->close();

htdocs/install/mysql/migration/4.0.0-5.0.0.sql

@@ -219,6 +219,15 @@ create table llx_user_employment
 )ENGINE=innodb;
 
 
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_date_debut (date_debut);
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_date_fin (date_fin);
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_fk_statut (fk_statut);
+
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_fk_user_author (fk_user_author);
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_fk_user_valid (fk_user_valid);
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_fk_user_approve (fk_user_approve);
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_fk_refuse (fk_user_approve);
+
 
 -- Sequence to removed duplicated values of llx_links. Use serveral times if you still have duplicate.
 drop table tmp_links_double;
@@ -230,5 +239,7 @@ drop table tmp_links_double;
 
 ALTER TABLE llx_links ADD UNIQUE INDEX uk_links (objectid,label);
 
+ALTER TABLE llx_expensereport ADD UNIQUE INDEX idx_expensereport_uk_ref (ref, entity);
+
 UPDATE llx_projet_task SET ref = NULL WHERE ref = '';
 ALTER TABLE llx_projet_task ADD UNIQUE INDEX uk_projet_task_ref (ref, entity);

htdocs/install/mysql/tables/llx_expensereport.key.sql

@@ -0,0 +1,36 @@
+-- ===================================================================
+-- Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2008-2010 Regis Houssin        <regis.houssin@capnetworks.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/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_expensereport ADD UNIQUE INDEX idx_expensereport_uk_ref (ref, entity);
+
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_date_debut (date_debut);
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_date_fin (date_fin);
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_fk_statut (fk_statut);
+
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_fk_user_author (fk_user_author);
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_fk_user_valid (fk_user_valid);
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_fk_user_approve (fk_user_approve);
+ALTER TABLE llx_expensereport ADD INDEX idx_expensereport_fk_refuse (fk_user_approve);
+
+--ALTER TABLE llx_expensereport ADD CONSTRAINT fk_expensereport_fk_user_author		FOREIGN KEY (fk_user_author)	 REFERENCES llx_user (rowid);
+--ALTER TABLE llx_expensereport ADD CONSTRAINT fk_expensereport_fk_user_valid 		FOREIGN KEY (fk_user_valid)		 REFERENCES llx_user (rowid);
+--ALTER TABLE llx_expensereport ADD CONSTRAINT fk_expensereport_fk_user_approve 		FOREIGN KEY (fk_user_approve)	 REFERENCES llx_user (rowid);
+--ALTER TABLE llx_expensereport ADD CONSTRAINT fk_expensereport_fk_refuse				FOREIGN KEY (fk_user_refuse)     REFERENCES llx_user (rowid);
+

htdocs/public/notice.php

@@ -0,0 +1,50 @@
+<?php
+/* Copyright (C) 2016	Laurent Destailleur		<eldy@users.sourceforge.net>
+ *
+ * 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/public/notice.php
+ *	\brief      Dolibarr page to show a notice.
+ *              Default notice is a message to say network connection is off.
+ *              You can also call this page with URL: 
+ *                /public/notice.php?lang=xx_XX&transkey=translation_key  (key must be inside file main.lang, error.lang or other.lang)
+ *                /public/notice.php?transphrase=url_encoded_sentence_to_show
+ */
+
+define('NOCSRFCHECK',1);
+define('NOLOGIN',1);		
+
+require '../main.inc.php';
+
+
+/**
+ * View
+ */
+
+if (! GETPOST('transkey') && ! GETPOST('transphrase'))
+{
+    print 'Sorry, it seems your internet connexion is off.<br>';
+    print 'You need to be connected to network to use this software.<br>';
+}
+else
+{
+    $langs->load("error");
+    $langs->load("other");
+    
+    if (GETPOST('transphrase')) print GETPOST('transphrase'); 
+    if (GETPOST('transkey')) print $langs->trans(GETPOST('transkey'));
+}
+

htdocs/public/offline.php

@@ -1,37 +0,0 @@
-<?php
-/* Copyright (C) 2001-2004	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis@dolibarr.fr>
- * Copyright (C) 2011-2012 	Juanjo Menent			<jmenent@2byte.es>
- *
- * 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/public/offline.php
- *	\brief      Dolibarr offline page
- */
-
-define('NOCSRFCHECK',1);
-define('NOLOGIN',1);		
-
-require '../main.inc.php';
-
-/**
- * View
- */
-
-print 'Sorry, it seems your internet connexion is off.<br>';
-print 'You need to be connected to network to use this software.<br>';
-