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

Merge pull request #3725 from FHenry/3.8

Browse Source 
FIX : #3724 Bug: Blank page after cloning proposal with changed client
This commit is contained in:
Laurent Destailleur 2015-10-14 21:27:58 +02:00
commit a5b9a210ce
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/skeletons/skeleton_class.class.php
View File

@ -244,7 +244,7 @@ class Skeleton_Class extends CommonObject
} }
if (!empty($sortfield)) { if (!empty($sortfield)) {
$sql .= ' ORDER BY ' . $sortfield . ' ' . $sortorder; $sql .= $this->db->order($sortfield,$sortorder);
} }
if (!empty($limit)) { if (!empty($limit)) {
$sql .= ' ' . $this->db->plimit($limit + 1, $offset); $sql .= ' ' . $this->db->plimit($limit + 1, $offset);

2
htdocs/comm/propal/class/propal.class.php
View File

@ -1063,7 +1063,7 @@ class Propal extends CommonObject
{ {
global $db, $user,$langs,$conf,$hookmanager; global $db, $user,$langs,$conf,$hookmanager;
dol_include_once('/projet/class.project.class.php'); dol_include_once('/projet/class/project.class.php');
$this->context['createfromclone']='createfromclone'; $this->context['createfromclone']='createfromclone';

2
htdocs/core/class/html.form.class.php
View File

@ -3233,7 +3233,7 @@ class Form
if (! empty($more)) { if (! empty($more)) {
$formconfirm.= '<div class="confirmquestions">'.$more.'</div>'; $formconfirm.= '<div class="confirmquestions">'.$more.'</div>';
} }
$formconfirm.= ($question ? '<div class="confirmmessage"'.img_help('','').' '.$question . '</div>': ''); $formconfirm.= ($question ? '<div class="confirmmessage">'.img_help('','').' '.$question . '</div>': '');
$formconfirm.= '</div>'."\n"; $formconfirm.= '</div>'."\n";
$formconfirm.= "\n<!-- begin ajax form_confirm page=".$page." -->\n"; $formconfirm.= "\n<!-- begin ajax form_confirm page=".$page." -->\n";