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

Merge remote-tracking branch 'origin/3.3' into 3.4

Browse Source 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
This commit is contained in:
Laurent Destailleur 2013-07-24 15:25:00 +02:00
commit bf9b255c92
907 changed files with 71689 additions and 71684 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/rpm/dolibarr_generic.spec
View File

@ -552,7 +552,6 @@ else
echo "No remove ation done (this is an upgrade)" echo "No remove ation done (this is an upgrade)"
fi fi
# version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release
%changelog %changelog
* Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.3 * Sun Feb 17 2013 Laurent Destailleur 3.4.0-0.3

2
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
View File

@ -1204,6 +1204,8 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L'); $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
} }
$pdf->SetTextColor(0,0,0);
} }
/** /**

2
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
View File

@ -1424,6 +1424,8 @@ class pdf_crabe extends ModelePDFFactures
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L'); $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
} }
$pdf->SetTextColor(0,0,0);
} }
/** /**

2
htdocs/core/modules/propale/doc/pdf_azur.modules.php
View File

@ -1268,6 +1268,8 @@ class pdf_azur extends ModelePDFPropales
$pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4));
$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L'); $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
} }
$pdf->SetTextColor(0,0,0);
} }
/** /**