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

Fix: Generated doc in wrong dir

Browse Source
This commit is contained in:
Laurent Destailleur 2011-03-06 23:45:47 +00:00
parent 5311001ae2
commit 0317ae75de
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/html.formfile.class.php
View File

@ -128,7 +128,7 @@ class FormFile
/** /**
* Show the box with list of available documents for object * Show the box with list of available documents for object
* @param modulepart propal, facture, facture_fourn, ... * @param modulepart propal, facture, facture_fourn, ...
* @param filename Sub dir to scan (Example: '9/9', 'FA9999'). Use '' if filedir already complete) * @param filename Sub dir to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). 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)
@ -161,7 +161,7 @@ class FormFile
$forcenomultilang=0; $forcenomultilang=0;
} }
$filename = dol_sanitizeFileName($filename); //$filename = dol_sanitizeFileName($filename); //Must be sanitized before calling show_documents
$headershown=0; $headershown=0;
$showempty=0; $showempty=0;
$i=0; $i=0;

15
htdocs/fourn/facture/fiche.php
View File

@ -1402,13 +1402,13 @@ else
if ($mysoc->localtax1_assuj=="1") //Localtax1 RE if ($mysoc->localtax1_assuj=="1") //Localtax1 RE
{ {
print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->pays_code).'</td>'; print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->pays_code).'</td>';
print '<td align="right">'.price($propal->total_localtax1).'</td>'; print '<td align="right">'.price($fac->total_localtax1).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
} }
if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
{ {
print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->pays_code).'</td>'; print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->pays_code).'</td>';
print '<td align="right">'.price($propal->total_localtax2).'</td>'; print '<td align="right">'.price($fac->total_localtax2).'</td>';
print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>';
} }
} }
@ -1794,16 +1794,15 @@ else
* Documents generes * Documents generes
*/ */
$facfournref=dol_sanitizeFileName($fac->ref); $ref=dol_sanitizeFileName($fac->ref);
$file=$conf->fournisseur->dir_output.'/facture/'. $facfournref . '/' . $facfournref . '.pdf'; $subdir = get_exdir($fac->id,2).$ref;
$relativepath = $facfournref.'/'.$facfournref.'.pdf'; $filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($fac->id,2).$ref;
$filedir = $conf->fournisseur->dir_output . '/facture/' . $facfournref;
$urlsource=$_SERVER['PHP_SELF'].'?facid='.$fac->id; $urlsource=$_SERVER['PHP_SELF'].'?facid='.$fac->id;
$genallowed=$user->rights->fournisseur->facture->creer; $genallowed=$user->rights->fournisseur->facture->creer;
$delallowed=$user->rights->fournisseur->facture->supprimer; $delallowed=$user->rights->fournisseur->facture->supprimer;
print '<br>'; print '<br>';
$somethingshown=$formfile->show_documents('facture_fournisseur',$facfournref,$filedir,$urlsource,$genallowed,$delallowed,$fac->modelpdf); $somethingshown=$formfile->show_documents('facture_fournisseur',$subdir,$filedir,$urlsource,$genallowed,$delallowed,$fac->modelpdf);
$object=$fac; $object=$fac;
@ -1840,7 +1839,7 @@ else
if ($_GET['action'] == 'presend') if ($_GET['action'] == 'presend')
{ {
$ref = dol_sanitizeFileName($fac->ref); $ref = dol_sanitizeFileName($fac->ref);
$file = $conf->fournisseur->facture->dir_output . '/' . $ref . '/' . $ref . '.pdf'; $file = $conf->fournisseur->facture->dir_output.'/'.get_exdir($fac->id,2).$ref.'.pdf';
print '<br>'; print '<br>';
print_titre($langs->trans('SendBillByMail')); print_titre($langs->trans('SendBillByMail'));

3
htdocs/includes/modules/supplier_invoice/pdf/pdf_canelle.modules.php
View File

@ -133,7 +133,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
else else
{ {
$objectref = dol_sanitizeFileName($object->ref); $objectref = dol_sanitizeFileName($object->ref);
$dir = $conf->fournisseur->dir_output . "/facture/" . $objectref; $dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2).$objectref;
$file = $dir . "/" . $objectref . ".pdf"; $file = $dir . "/" . $objectref . ".pdf";
} }
@ -382,6 +382,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
*/ */
function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs) function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{ {
global $conf,$mysoc;
$default_font_size = pdf_getPDFFontSize($outputlangs); $default_font_size = pdf_getPDFFontSize($outputlangs);
$tab2_top = $posy; $tab2_top = $posy;