lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Browse Source 
Conflicts:
	htdocs/core/class/html.formother.class.php
This commit is contained in:
Laurent Destailleur 2020-04-22 18:26:26 +02:00
commit 6b8ff56c20
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/html.formother.class.php
View File

@ -77,7 +77,7 @@ class FormOther
$sql .= " FROM ".MAIN_DB_PREFIX."export_model"; $sql .= " FROM ".MAIN_DB_PREFIX."export_model";
$sql .= " WHERE type = '".$this->db->escape($type)."'"; $sql .= " WHERE type = '".$this->db->escape($type)."'";
if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
$sql .= " ORDER BY rowid"; $sql .= " ORDER BY label";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
{ {
@ -262,7 +262,7 @@ class FormOther
{ {
// phpcs:enable // phpcs:enable
global $langs; global $langs;
$out = ''; $out = '';
$sql = "SELECT r.taux, r.revenuestamp_type"; $sql = "SELECT r.taux, r.revenuestamp_type";
@ -603,8 +603,6 @@ class FormOther
$numlines = count($lines); $numlines = count($lines);
for ($i = 0; $i < $numlines; $i++) { for ($i = 0; $i < $numlines; $i++) {
if ($lines[$i]->fk_parent == $parent) { if ($lines[$i]->fk_parent == $parent) {
$var = !$var;
//var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id); // $lines[$i]->id may be empty if project has no lines //var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id); // $lines[$i]->id may be empty if project has no lines
// Break on a new project // Break on a new project