From 707bba3d7d6bb15e1afd6a53be4db01bedcf6077 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Sep 2013 10:40:49 +0200 Subject: [PATCH 1/3] Fix: W3C --- htdocs/holiday/index.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index 4e85f261c3c..69c0ac0c914 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -269,6 +269,7 @@ print "\n"; print ''; print ''; print ''; +print ''; // DATE CREATE print ''; @@ -322,10 +323,13 @@ print ' '; print ''; $holiday->selectStatutCP($search_statut); print ''; + // ACTION -print ''; +print ''; print ''; -print "\n"; +print ''; + +print "\n"; // Lines @@ -364,7 +368,7 @@ if (! empty($holiday->holiday)) print ''; $nbopenedday=num_open_day($infos_CP['date_debut'], $infos_CP['date_fin'], 0, 1, $infos_CP['halfday']); print $nbopenedday.' '.$langs->trans('DurationDays'); - print ''.$holidaystatic->LibStatut($infos_CP['statut'],5).''; + print ''.$holidaystatic->LibStatut($infos_CP['statut'],5).''; print ''."\n"; } @@ -374,7 +378,7 @@ if (! empty($holiday->holiday)) if($holiday_payes == '2') { print ''; - print ''.$langs->trans('None').''; + print ''.$langs->trans('None').''; print ''; } From 443eba900a17bea26771e749e79a137517de43e2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Sep 2013 12:51:01 +0200 Subject: [PATCH 2/3] Fix: Bad translation --- README | 2 +- README.md | 4 ++-- build/debian/control | 3 ++- htdocs/langs/en_US/ecm.lang | 8 ++++---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README b/README index c6ac993180c..325704bdebe 100644 --- a/README +++ b/README @@ -92,7 +92,7 @@ Main modules/features: - Payments management - Standing orders management - Shipping management -- ECM (Electronic Content Management) +- EDM (Electronic Document Management) - EMailings - Agenda with ical,vcal export for third tools integration - Management of foundation members diff --git a/README.md b/README.md index c5cf2ecf7e9..6a94371e8dd 100644 --- a/README.md +++ b/README.md @@ -87,10 +87,10 @@ See ChangeLog file found into package. - Standing orders management - Shipping management - Agenda with ical,vcal export for third tools integration -- ECM (Electronic Content Management) +- EDM (Electronic Document Management) - Foundations members management - Employee's holidays management -- Mass emailing +- Mass Emailing - Realize surveys - Point of Sale diff --git a/build/debian/control b/build/debian/control index 430cdb5f347..ac65f0b9070 100755 --- a/build/debian/control +++ b/build/debian/control @@ -6,7 +6,8 @@ Section: web Priority: optional Homepage: http://www.dolibarr.org Build-Depends: debhelper (>= 7), po-debconf, dpatch - +Comments: This package need at least debian 7 or ubuntu 13.04 or any distribution based on this version + Package: dolibarr Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | php5, php5-mysql | php5-mysqli, diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang index 12b5ac31e8d..71a01ba6608 100644 --- a/htdocs/langs/en_US/ecm.lang +++ b/htdocs/langs/en_US/ecm.lang @@ -24,10 +24,10 @@ ECMNewDocument=New document ECMCreationDate=Creation date ECMNbOfFilesInDir=Number of files in directory ECMNbOfSubDir=Number of sub-directories -ECMNbOfFilesInSubDir=Nunber of iles in sub-directories +ECMNbOfFilesInSubDir=Number of files in sub-directories ECMCreationUser=Creator -ECMArea=ECM area -ECMAreaDesc=The ECM (Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr. +ECMArea=EDM area +ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr. ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.
* Manual directories can be used to save documents not linked to a particular element. ECMSectionWasRemoved=Directory %s has been deleted. ECMDocumentsSection=Document of directory @@ -53,4 +53,4 @@ CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some ECMFileManager=File manager ECMSelectASection=Select a directory on left tree... DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory. - \ No newline at end of file + From 914e1671839b9cac7d18c14cdc6e9637626a4e07 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Sep 2013 14:34:45 +0200 Subject: [PATCH 3/3] Fix: Bad sql request --- htdocs/core/class/html.formother.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index f5def186abb..b45e4d0d308 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -362,11 +362,11 @@ class FormOther $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u"; $sql_usr.= " WHERE u.entity IN (0,".$conf->entity.")"; if (empty($user->rights->user->user->lire)) $sql_usr.=" AND u.fk_societe = ".($user->societe_id?$user->societe_id:0); - // Add existing sales representatives of company + // Add existing sales representatives of thirdparty of external user if (empty($user->rights->user->user->lire) && $user->societe_id) { $sql_usr.=" UNION "; - $sql_usr.= "SELECT u2.rowid, u2.name as name, u2.firstname, u2.login"; + $sql_usr.= "SELECT u2.rowid, u2.lastname as name, u2.firstname, u2.login"; $sql_usr.= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql_usr.= " WHERE u2.entity IN (0,".$conf->entity.")"; $sql_usr.= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->societe_id;