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

Work on generic odt generation

Browse Source
This commit is contained in:
Laurent Destailleur 2010-02-28 18:59:35 +00:00
parent 0f1d95d7fa
commit f49d0eed46
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/document.php
View File

@ -105,7 +105,19 @@ if ($modulepart)
{ {
// On fait une verification des droits et on definit le repertoire concerne // On fait une verification des droits et on definit le repertoire concerne
// Wrapping pour les factures // Wrapping for third parties
if ($modulepart == 'company')
{
$user->getrights('companies');
if ($user->rights->societe->lire || preg_match('/^specimen/i',$original_file))
{
$accessallowed=1;
}
$original_file=$conf->societe->dir_output.'/'.$original_file;
$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='$refname'";
}
// Wrapping for invoices
if ($modulepart == 'facture') if ($modulepart == 'facture')
{ {
$user->getrights('facture'); $user->getrights('facture');

2
htdocs/html.formfile.class.php
View File

@ -123,7 +123,7 @@ class FormFile
/** /**
* \brief Show the box with list of available documents for object * \brief Show the box with list of available documents for object
* \param modulepart propal=propal, facture=facture, ... * \param modulepart propal=propal, facture=facture, ...
* \param filename Sub dir to scan (use '' if filedir already complete) * \param filename Sub dir to scan (Example: '9/9', 'FA9999'). Use '' if filedir already complete)
* \param filedir Dir to scan * \param filedir Dir to scan
* \param urlsource Url of origin page (for return) * \param urlsource Url of origin page (for return)
* \param genallowed Generation is allowed (1/0 or array of formats) * \param genallowed Generation is allowed (1/0 or array of formats)

2
htdocs/soc.php
View File

@ -1403,7 +1403,7 @@ else
$var=true; $var=true;
$somethingshown=$formfile->show_documents('company','',$filedir,$urlsource,$genallowed,$delallowed,'','',0,0,28,0,'',0,'',$soc->default_lang); $somethingshown=$formfile->show_documents('company',$soc->id,$filedir,$urlsource,$genallowed,$delallowed,'','',0,0,28,0,'',0,'',$soc->default_lang);
print '</td>'; print '</td>';
print '<td>'; print '<td>';