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

Fix: Warning sur traduction

Browse Source
This commit is contained in:
Laurent Destailleur 2014-10-07 21:15:14 +02:00
parent ec2a8b5551
commit 0a4d040e9d
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project name="dolibarr" default="hudson" basedir="."> <project name="dolibarr" default="hudson" basedir=".">
fdfds
<!-- Exclude/ignore paths --> <!-- Exclude/ignore paths -->
<property name="ignorepaths" value="${basedir}/htdocs/conf,${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" /> <property name="ignorepaths" value="${basedir}/htdocs/conf,${basedir}/htdocs/core/filemanagerdol,${basedir}/htdocs/includes" />
<property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" /> <property name="ignoreregexp" value="**/PEAR/*,**/NET/*,**/HTTP/*,**/zendgdata/*,**/reportico/*" />

29
htdocs/product/price.php
View File

@ -341,21 +341,23 @@ if ($isphoto) {
print '</tr>'; print '</tr>';
// MultiPrix // MultiPrix
if (! empty($conf->global->PRODUIT_MULTIPRICES)) { if (! empty($conf->global->PRODUIT_MULTIPRICES))
if (! empty($socid)) { {
if (! empty($socid))
{
$soc = new Societe($db); $soc = new Societe($db);
$soc->id = $socid; $soc->id = $socid;
$soc->fetch($socid); $soc->fetch($socid);
print '<tr><td>' . $langs->trans("SellingPrice") . '</td>'; print '<tr><td>' . $langs->trans("SellingPrice") . '</td>';
if ($object->multiprices_base_type ["$soc->price_level"] == 'TTC') { if ($object->multiprices_base_type["$soc->price_level"] == 'TTC') {
print '<td>' . price($object->multiprices_ttc ["$soc->price_level"]); print '<td>' . price($object->multiprices_ttc ["$soc->price_level"]);
} else { } else {
print '<td>' . price($object->multiprices ["$soc->price_level"]); print '<td>' . price($object->multiprices ["$soc->price_level"]);
} }
if ($object->multiprices_base_type ["$soc->price_level"]) { if ($object->multiprices_base_type["$soc->price_level"]) {
print ' ' . $langs->trans($object->multiprices_base_type ["$soc->price_level"]); print ' ' . $langs->trans($object->multiprices_base_type ["$soc->price_level"]);
} else { } else {
print ' ' . $langs->trans($object->price_base_type); print ' ' . $langs->trans($object->price_base_type);
@ -364,15 +366,16 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
// Prix mini // Prix mini
print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>'; print '<tr><td>' . $langs->trans("MinPrice") . '</td><td>';
if ($object->multiprices_base_type ["$soc->price_level"] == 'TTC') { if ($object->multiprices_base_type["$soc->price_level"] == 'TTC')
print price($object->multiprices_min_ttc ["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type ["$soc->price_level"]); {
print price($object->multiprices_min_ttc["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type["$soc->price_level"]);
} else { } else {
print price($object->multiprices_min ["$soc->price_level"]) . ' ' . $langs->trans($object->multiprices_base_type ["$soc->price_level"]); print price($object->multiprices_min["$soc->price_level"]) . ' ' . $langs->trans(empty($object->multiprices_base_type["$soc->price_level"])?'HT':$object->multiprices_base_type["$soc->price_level"]);
} }
print '</td></tr>'; print '</td></tr>';
// TVA // TVA
print '<tr><td>' . $langs->trans("VATRate") . '</td><td>' . vatrate($object->multiprices_tva_tx ["$soc->price_level"], true) . '</td></tr>'; print '<tr><td>' . $langs->trans("VATRate") . '</td><td>' . vatrate($object->multiprices_tva_tx["$soc->price_level"], true) . '</td></tr>';
} }
else else
{ {
@ -393,12 +396,12 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
print '</td>'; print '</td>';
if ($object->multiprices_base_type ["$i"] == 'TTC') { if ($object->multiprices_base_type ["$i"] == 'TTC') {
print '<td>' . price($object->multiprices_ttc ["$i"]); print '<td>' . price($object->multiprices_ttc["$i"]);
} else { } else {
print '<td>' . price($object->multiprices ["$i"]); print '<td>' . price($object->multiprices["$i"]);
} }
if ($object->multiprices_base_type ["$i"]) { if ($object->multiprices_base_type["$i"]) {
print ' ' . $langs->trans($object->multiprices_base_type ["$i"]); print ' ' . $langs->trans($object->multiprices_base_type ["$i"]);
} else { } else {
print ' ' . $langs->trans($object->price_base_type); print ' ' . $langs->trans($object->price_base_type);
@ -408,9 +411,9 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) {
// Prix mini // Prix mini
print '<tr><td>' . $langs->trans("MinPrice") . ' ' . $i . '</td><td>'; print '<tr><td>' . $langs->trans("MinPrice") . ' ' . $i . '</td><td>';
if ($object->multiprices_base_type ["$i"] == 'TTC') { if ($object->multiprices_base_type ["$i"] == 'TTC') {
print price($object->multiprices_min_ttc ["$i"]) . ' ' . $langs->trans($object->multiprices_base_type ["$i"]); print price($object->multiprices_min_ttc["$i"]) . ' ' . $langs->trans($object->multiprices_base_type["$i"]);
} else { } else {
print price($object->multiprices_min ["$i"]) . ' ' . $langs->trans($object->multiprices_base_type ["$i"]); print price($object->multiprices_min["$i"]) . ' ' . $langs->trans(empty($object->multiprices_base_type["$i"])?'HT':$object->multiprices_base_type["$i"]);
} }
print '</td></tr>'; print '</td></tr>';