diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index a59d6fca3bb..6b290ab8f07 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -843,115 +843,111 @@ if ($mode == 'marketplace')
if ($mode == 'deploy')
{
- dol_fiche_head($head, $mode, '', -1);
+ dol_fiche_head($head, $mode, '', -1);
+ $dolibarrdataroot=preg_replace('/([\\/]+)$/i','',DOL_DATA_ROOT);
+ $allowonlineinstall=true;
+ $allowfromweb=1;
+ if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) $allowonlineinstall=false;
- $allowonlineinstall=true;
- $allowfromweb=1;
- if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) $allowonlineinstall=false;
+ $fullurl=''.$urldolibarrmodules.'';
+ $message='';
+ if (! empty($allowonlineinstall))
+ {
+ if (! in_array('/custom',explode(',',$dolibarr_main_url_root_alt)))
+ {
+ $message=info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
+ $allowfromweb=-1;
+ }
+ else
+ {
+ if ($dirins_ok)
+ {
+ if (! is_writable(dol_osencode($dirins)))
+ {
+ $langs->load("errors");
+ $message=info_admin($langs->trans("ErrorFailedToWriteInDir",$dirins));
+ $allowfromweb=0;
+ }
+ }
+ else
+ {
+ $message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
+ $allowfromweb=0;
+ }
+ }
+ }
+ else
+ {
+ $message=info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile",$dolibarrdataroot.'/installmodules.lock'));
+ $allowfromweb=0;
+ }
- $fullurl=''.$urldolibarrmodules.'';
- $message='';
- if (! empty($allowonlineinstall))
- {
- if (! in_array('/custom',explode(',',$dolibarr_main_url_root_alt)))
- {
- $message=info_admin($langs->trans("ConfFileMustContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT));
- $allowfromweb=-1;
- }
- else
- {
- if ($dirins_ok)
- {
- if (! is_writable(dol_osencode($dirins)))
- {
- $langs->load("errors");
- $message=info_admin($langs->trans("ErrorFailedToWriteInDir",$dirins));
- $allowfromweb=0;
- }
- }
- else
- {
+ if ($allowfromweb < 1)
+ {
+ print $langs->trans("SomethingMakeInstallFromWebNotPossible");
+ print $message;
+ //print $langs->trans("SomethingMakeInstallFromWebNotPossible2");
+ print '
';
+ }
- $message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample"));
- $allowfromweb=0;
- }
- }
- }
- else
- {
- $message=info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile",$dolibarrdataroot.'/installmodules.lock'));
- $allowfromweb=0;
- }
+ print '
';
- if ($allowfromweb < 1)
- {
- print $langs->trans("SomethingMakeInstallFromWebNotPossible");
- print $message;
- //print $langs->trans("SomethingMakeInstallFromWebNotPossible2");
- print '
';
- }
+ if ($allowfromweb >= 0)
+ {
+ if ($allowfromweb == 1)
+ {
+ //print $langs->trans("ThisIsProcessToFollow").'
';
+ }
+ else
+ {
+ print $langs->trans("ThisIsAlternativeProcessToFollow").'
';
+ print ''.$langs->trans("StepNb",1).': ';
+ print $langs->trans("FindPackageFromWebSite",$fullurl).'
';
+ print ''.$langs->trans("StepNb",2).': ';
+ print $langs->trans("DownloadPackageFromWebSite",$fullurl).'
';
+ print ''.$langs->trans("StepNb",3).': ';
+ }
- print '
';
+ if ($allowfromweb == 1)
+ {
+ print $langs->trans("UnpackPackageInModulesRoot",$dirins).'
';
- if ($allowfromweb >= 0)
- {
- if ($allowfromweb == 1)
- {
- //print $langs->trans("ThisIsProcessToFollow").'
';
- }
- else
- {
- print $langs->trans("ThisIsAlternativeProcessToFollow").'
';
- print ''.$langs->trans("StepNb",1).': ';
- print $langs->trans("FindPackageFromWebSite",$fullurl).'
';
- print ''.$langs->trans("StepNb",2).': ';
- print $langs->trans("DownloadPackageFromWebSite",$fullurl).'
';
- print ''.$langs->trans("StepNb",3).': ';
- }
+ print '
';
- if ($allowfromweb == 1)
- {
- print $langs->trans("UnpackPackageInModulesRoot",$dirins).'
';
+ print '';
- print '
';
+ print '
';
+ print '
';
- print '';
+ print '';
+ }
+ else
+ {
+ print $langs->trans("UnpackPackageInModulesRoot",$dirins).'
';
+ print ''.$langs->trans("StepNb",4).': ';
+ print $langs->trans("SetupIsReadyForUse").'
';
+ }
+ }
- print '
';
- print '
';
+ if (! empty($result['return']))
+ {
+ print '
';
- print '';
- }
- else
- {
- print $langs->trans("UnpackPackageInModulesRoot",$dirins).'
';
- print ''.$langs->trans("StepNb",4).': ';
- print $langs->trans("SetupIsReadyForUse").'
';
- }
- }
+ foreach($result['return'] as $value)
+ {
+ echo $value.'
';
+ }
+ }
-
- if (! empty($result['return']))
- {
- print '
';
-
- foreach($result['return'] as $value)
- {
- echo $value.'
';
- }
- }
-
- dol_fiche_end();
+ dol_fiche_end();
}
-
-
llxFooter();
$db->close();
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index b8544ee3eda..d5cbd14c11d 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -794,6 +794,7 @@ TitleSetToDraft=Go back to draft
ConfirmSetToDraft=Are you sure you want to go back to Draft status ?
ImportId=Import id
Websites=Web sites
+Events=Events
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index 85f13a881ab..c83ca406347 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -180,26 +180,27 @@ $sql = "SELECT";
$sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
if ($client) $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
$sql.= " sum(d.total_ht) as selling_price,";
-// Note: qty and buy_price_ht is always positive (if not your database may be corrupted, you can update this)
+// Note: qty and buy_price_ht is always positive (if not, your database may be corrupted, you can update this)
$sql.= " sum(".$db->ifsql('d.total_ht < 0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,";
$sql.= " sum(".$db->ifsql('d.total_ht < 0','-1 * (abs(d.total_ht) - (d.buy_price_ht * d.qty))','d.total_ht - (d.buy_price_ht * d.qty)').") as marge";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."facture as f";
$sql.= ", ".MAIN_DB_PREFIX."facturedet as d";
+if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE f.fk_soc = s.rowid";
+if ($socid > 0) $sql.= ' AND s.rowid = '.$socid;
+if (!$user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
$sql.= " AND f.fk_statut > 0";
$sql.= ' AND s.entity IN ('.getEntity('societe').')';
$sql.= " AND d.fk_facture = f.rowid";
$sql.= " AND (d.product_type = 0 OR d.product_type = 1)";
-if ($client)
- $sql.= " AND f.fk_soc = ".$socid;
if (!empty($startdate))
- $sql.= " AND f.datef >= '".$db->idate($startdate)."'";
+$sql.= " AND f.datef >= '".$db->idate($startdate)."'";
if (!empty($enddate))
- $sql.= " AND f.datef <= '".$db->idate($enddate)."'";
+$sql.= " AND f.datef <= '".$db->idate($enddate)."'";
$sql .= " AND d.buy_price_ht IS NOT NULL";
if (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)
- $sql .= " AND d.buy_price_ht <> 0";
+$sql .= " AND d.buy_price_ht <> 0";
if ($client) $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client, f.rowid, f.facnumber, f.total, f.datef, f.paye, f.fk_statut";
else $sql.= " GROUP BY s.rowid, s.nom, s.code_client, s.client";
$sql.=$db->order($sortfield,$sortorder);
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 204b393cc6d..c00e93e239f 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -1,7 +1,7 @@
* Copyright (C) 2004-2015 Laurent Destailleur
- * Copyright (C) 2005-2012 Regis Houssin
+ * Copyright (C) 2005-2017 Regis Houssin
*
* 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
@@ -70,7 +70,9 @@ $hookmanager->initHooks(array('projecttaskcard','globalcard'));
$progress=GETPOST('progress', 'int');
$label=GETPOST('label', 'alpha');
$description=GETPOST('description');
-$planned_workload=GETPOST('planned_workloadhour')*3600+GETPOST('planned_workloadmin')*60;
+$planned_workloadhour=(GETPOST('planned_workloadhour','int')?GETPOST('planned_workloadhour','int'):0);
+$planned_workloadmin=(GETPOST('planned_workloadmin','int')?GETPOST('planned_workloadmin','int'):0);
+$planned_workload=$planned_workloadhour*3600+$planned_workloadmin*60;
$userAccess=0;