diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 0aaafa461fb49..eff3f85fdf664 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -137,15 +137,15 @@
$var=false;
print "
";
print '';
-print $langs->trans("Ref").': | ';
+print ': | ';
print ' | |
';
print "";
print '';
-print $langs->trans("Name").': | ';
+print ': | ';
print ' |
';
print "";
print '';
-print $langs->trans("Other").': | ';
+print ': | ';
print ' |
';
print "";
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 9865399202557..eada82f7f6ae6 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -78,9 +78,9 @@
print '\n";
print "
\n";
@@ -95,8 +95,8 @@
print '';
print ''.$langs->trans("SearchACustomerOrder").' |
';
print '';
- print $langs->trans("Ref").': | | |
';
- print ''.$langs->trans("Other").': | | ';
+ print ': | |
';
+ print ': | | ';
print '
';
print "
\n";
}
@@ -110,9 +110,9 @@
print '\n";
print "
";
diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php
index a8ce6a45714e2..cd2d2b60f7ec7 100644
--- a/htdocs/compta/hrm.php
+++ b/htdocs/compta/hrm.php
@@ -96,9 +96,9 @@
print '
";
}
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 205aba9a778f5..442016f38fdc8 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -97,9 +97,9 @@
print '
";
}
@@ -114,9 +114,9 @@
print '
";
}
@@ -132,9 +132,9 @@
print '
";
}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index b8083ce32b29c..307164556c77d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -2744,21 +2744,21 @@ function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print ' | ';
// Description
- print ''.$langs->trans('Description').' | ';
+ print ' | ';
// VAT
- print ''.$langs->trans('VAT').' | ';
+ print ' | ';
// Price HT
- print ''.$langs->trans('PriceUHT').' | ';
+ print ' | ';
if ($conf->global->MAIN_FEATURES_LEVEL > 1) print ' | ';
// Qty
- print ''.$langs->trans('Qty').' | ';
+ print ' | ';
// Reduction short
- print ''.$langs->trans('ReductionShort').' | ';
+ print ' | ';
if (! empty($conf->margin->enabled) && empty($user->societe_id))
{
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index bb67e8636671f..efd0b46d6b457 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -77,7 +77,7 @@
|
-
+
|
@@ -96,9 +96,12 @@
}
}
?>
-
+
- trans('SecurityCode'); ?> |
+
|
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 170cc1e0fc74c..719d6c1794c4a 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -50,23 +50,25 @@
global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
trans('AddNewLine'); ?>trans("FreeZone"); ?>
|
- trans('VAT'); ?> |
- trans('PriceUHT'); ?> |
+ |
+ |
- trans('PriceUTTC'); ?> |
+ |
- trans('Qty'); ?> |
- trans('ReductionShort'); ?> |
+ |
+ |
';
if ($conf->global->MARGIN_TYPE == "1")
echo $langs->trans('BuyingPrice');
else
echo $langs->trans('CostPrice');
+ echo '';
?>
|
element) && $object->element == 'contrat')?'1':'0').'">';
}
else {*/
+ echo '';
/*
if (empty($conf->product->enabled) && empty($conf->service->enabled)) echo $langs->trans("Type");
else if (! empty($forceall) || (! empty($conf->product->enabled) && ! empty($conf->service->enabled))) echo $langs->trans("FreeLineOfType");
@@ -124,6 +128,7 @@
echo ' ';
echo ' ';
+ echo '';
echo ' ';
$filtertype='';
@@ -184,7 +190,7 @@
tva_assuj == "0") echo '0';
+ if ($seller->tva_assuj == "0") echo '0';
else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer);
}
?>
@@ -201,9 +207,9 @@
|
- ">
+ | ">
|
- remise_client); ?>" name="remise_percent">% |
+ remise_client); ?>">% |
qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
?>
-
+
@@ -115,7 +115,7 @@
info_bits & 2) != 2) { ?>
- %
+ %
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index bdaaffdafe3cf..f35d493a485d4 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1800,18 +1800,21 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinput
global $conf,$langs;
$ret='';
- $ret.='';
$ret.='\n";
return $ret;
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index b3af35d5b3c0a..1770e046ed3b9 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -83,17 +83,17 @@
print " | ";
print ''.$langs->trans("Search").' | ';
print "";
-print $langs->trans("Ref").': | | ';
+print ': | ';
print ' | ';
if (! empty($conf->barcode->enabled))
{
print "";
- print $langs->trans("BarCode").': | | ';
+ print ': | ';
//print ' | ';
print ' ';
}
print "";
-print $langs->trans("Other").': | | ';
+print ': | ';
//print ' | ';
print ' ';
print "
";
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 3cf38a58b90a6..766e44cf9a74c 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -66,17 +66,17 @@
print ' |
';
print ''.$langs->trans("Search").' |
';
print "";
-print $langs->trans("Name").': | | ';
+print ': | ';
print ' |
';
if (! empty($conf->barcode->enabled))
{
print "";
- print $langs->trans("BarCode").': | | ';
+ print ': | ';
//print ' | ';
print '
';
}
print "";
-print $langs->trans("Other").': | | ';
+print ': | ';
//print ' | ';
print '
';