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

Qual: Fix architecture problem with canvas

Browse Source
This commit is contained in:
Laurent Destailleur 2011-04-06 16:21:46 +00:00
parent d72f417868
commit c311bf5f2c
2 changed files with 54 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/contact/fiche.php
View File

@ -320,14 +320,24 @@ if (! empty($objcanvas->template_dir))
}
else
{
$result=$objcanvas->fetch($id); // Reload object
$objcanvas->assign_values('view'); // Assign values
$objcanvas->display_canvas('view'); // Show template
// Fetch object
$result=$objcanvas->fetch($id);
if ($result > 0)
{
// Assign values
$objcanvas->assign_values('view');
// TODO Move this also into template
print show_actions_todo($conf,$langs,$db,$objsoc,$objcanvas->control->object);
// Display canvas
$objcanvas->display_canvas('view');
print show_actions_done($conf,$langs,$db,$objsoc,$objcanvas->control->object);
print show_actions_todo($conf,$langs,$db,$objsoc,$objcanvas->control->object);
print show_actions_done($conf,$langs,$db,$objsoc,$objcanvas->control->object);
}
else
{
dol_htmloutput_errors($objcanvas->error,$objcanvas->errors);
}
}
}

64
htdocs/societe/soc.php
View File

@ -397,42 +397,54 @@ if (! empty($objcanvas->template_dir))
}
else
{
$result=$objcanvas->fetch($socid); // Relaod object
$objcanvas->assign_values('view'); // Assign values
$objcanvas->display_canvas('view'); // Show template
// Fetch object
$result=$objcanvas->fetch($socid);
if ($result > 0)
{
// Assign values
$objcanvas->assign_values('view');
// TODO Move this also into template
print '<table width="100%"><tr><td valign="top" width="50%">';
print '<a name="builddoc"></a>'; // ancre
// Display canvas
$objcanvas->display_canvas('view');
/*
* Documents generes
*/
$filedir=$conf->societe->dir_output.'/'.$socid;
$urlsource=$_SERVER["PHP_SELF"]."?socid=".$socid;
$genallowed=$user->rights->societe->creer;
$delallowed=$user->rights->societe->supprimer;
$var=true;
print '<table width="100%"><tr><td valign="top" width="50%">';
print '<a name="builddoc"></a>'; // ancre
$somethingshown=$formfile->show_documents('company',$socid,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$objcanvas->control->object->default_lang);
/*
* Documents generes
*/
$filedir=$conf->societe->dir_output.'/'.$socid;
$urlsource=$_SERVER["PHP_SELF"]."?socid=".$socid;
$genallowed=$user->rights->societe->creer;
$delallowed=$user->rights->societe->supprimer;
print '</td>';
print '<td></td>';
print '</tr>';
print '</table>';
$var=true;
print '<br>';
$somethingshown=$formfile->show_documents('company',$socid,$filedir,$urlsource,$genallowed,$delallowed,'',0,0,0,28,0,'',0,'',$objcanvas->control->object->default_lang);
// Subsidiaries list
$result=show_subsidiaries($conf,$langs,$db,$objcanvas->control->object);
print '</td>';
print '<td></td>';
print '</tr>';
print '</table>';
// Contacts list
$result=show_contacts($conf,$langs,$db,$objcanvas->control->object);
print '<br>';
// Projects list
$result=show_projects($conf,$langs,$db,$objcanvas->control->object);
// Subsidiaries list
$result=show_subsidiaries($conf,$langs,$db,$objcanvas->control->object);
// Contacts list
$result=show_contacts($conf,$langs,$db,$objcanvas->control->object);
// Projects list
$result=show_projects($conf,$langs,$db,$objcanvas->control->object);
}
else
{
dol_htmloutput_errors($objcanvas->error,$objcanvas->errors);
}
}
}
else
{