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

Merge pull request #5219 from fmarcet/3.8

Browse Source 
Fix: Expensereport not compatible with multicompany
This commit is contained in:
Laurent Destailleur 2016-05-18 13:52:45 +02:00
commit 43cb646779
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/expensereport/class/expensereport.class.php
View File

@ -2,6 +2,7 @@
/* Copyright (C) 2011 Dimitri Mouillard <dmouillard@teclib.com> /* Copyright (C) 2011 Dimitri Mouillard <dmouillard@teclib.com>
* Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com> * Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* Copyright (C) 2016 Ferran Marcet <fmarcet@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -149,6 +150,7 @@ class ExpenseReport extends CommonObject
$sql.= ",paid"; $sql.= ",paid";
$sql.= ",note_public"; $sql.= ",note_public";
$sql.= ",note_private"; $sql.= ",note_private";
$sql.= ",entity";
$sql.= ") VALUES("; $sql.= ") VALUES(";
$sql.= "'(PROV)'"; $sql.= "'(PROV)'";
$sql.= ", ".$this->total_ht; $sql.= ", ".$this->total_ht;
@ -165,6 +167,7 @@ class ExpenseReport extends CommonObject
$sql.= ", 0"; $sql.= ", 0";
$sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null"); $sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
$sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null"); $sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
$sql.= ", ".$conf->entity;
$sql.= ")"; $sql.= ")";
dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG); dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);