diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 53c9231b19b..f555bd113d9 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3005,60 +3005,60 @@ abstract class CommonObject
print '';
- if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print ' ';
+ if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print ' ';
// Description
- print ''.$langs->trans('Description').' ';
+ print ''.$langs->trans('Description').' ';
if ($this->element == 'askpricesupplier')
{
- print ''.$langs->trans("AskPriceSupplierRefFourn").' '.$langs->trans("AskPriceSupplierRefFourn").' '.$langs->trans('VAT').' ';
+ print ''.$langs->trans('VAT').' ';
// Price HT
- print ''.$langs->trans('PriceUHT').' ';
+ print ''.$langs->trans('PriceUHT').' ';
if ($inputalsopricewithtax) print ''.$langs->trans('PriceUTTC').' ';
// Qty
- print ''.$langs->trans('Qty').' ';
+ print ''.$langs->trans('Qty').' ';
if($conf->global->PRODUCT_USE_UNITS)
{
- print ''.$langs->trans('Unit').' ';
+ print ''.$langs->trans('Unit').' ';
}
// Reduction short
- print ''.$langs->trans('ReductionShort').' ';
+ print ''.$langs->trans('ReductionShort').' ';
if ($this->situation_cycle_ref) {
- print '' . $langs->trans('Progress') . ' ';
+ print '' . $langs->trans('Progress') . ' ';
}
if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
{
if ($conf->global->MARGIN_TYPE == "1")
- print ''.$langs->trans('BuyingPrice').' ';
+ print ''.$langs->trans('BuyingPrice').' ';
else
- print ''.$langs->trans('CostPrice').' ';
+ print ''.$langs->trans('CostPrice').' ';
if (! empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous)
- print ''.$langs->trans('MarginRate').' ';
+ print ''.$langs->trans('MarginRate').' ';
if (! empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous)
- print ''.$langs->trans('MarkRate').' ';
+ print ''.$langs->trans('MarkRate').' ';
}
// Total HT
- print ''.$langs->trans('TotalHTShort').' ';
+ print ''.$langs->trans('TotalHTShort').' ';
- print ' \n";
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 64c49894de1..ccf63983539 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -49,36 +49,36 @@ if (in_array($object->element,array('propal', 'askpricesupplier','facture','invo
- global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
+ global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
trans('AddNewLine'); ?> trans("FreeZone"); ?>
element == 'askpricesupplier') { ?>
- trans('AskPriceSupplierRefFourn'); ?> trans('AskPriceSupplierRefFourn'); ?>
- trans('VAT'); ?> trans('PriceUHT'); ?> trans('VAT'); ?> trans('PriceUHT'); ?> trans('PriceUTTC'); ?> trans('PriceUTTC'); ?> trans('Qty'); ?>
+ trans('Qty'); ?>
global->PRODUCT_USE_UNITS)
{
- print '';
+ print ' ';
print '';
print $langs->trans('Unit');
print ' ';
}
?>
- trans('ReductionShort'); ?>
+ trans('ReductionShort'); ?>
situation_cycle_ref) {
- print '' . $langs->trans('Progress') . ' ';
+ print '' . $langs->trans('Progress') . ' ';
}
if (! empty($usemargins))
{
?>
-
+
global->MARGIN_TYPE == "1")
echo $langs->trans('BuyingPrice');
@@ -87,11 +87,11 @@ if (in_array($object->element,array('propal', 'askpricesupplier','facture','invo
?>
rights->margins->creer && ! empty($conf->global->DISPLAY_MARGIN_RATES)) echo ''.$langs->trans('MarginRate').' '.$langs->trans('MarkRate').' '.$langs->trans('MarginRate').' '.$langs->trans('MarkRate').'
+
>
@@ -102,7 +102,7 @@ else {
$coldisplay=0; }
?>
- global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
+ global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>
element == 'askpricesupplier') { ?>
- tva_assuj == "0") echo '
-
+
-
+
- ';
+ print ' ';
print $form->selectUnits($line->fk_unit, "units");
print ' ';
}
?>
- % %
+
product->enabled) || ! empty($conf->service->enabled)) { ?>
+
>
global->MAIN_VIEW_LINE_NUMBER)) { ?>
-
+
info_bits & 2) == 2) {
?>
@@ -125,17 +125,17 @@ if (empty($usemargins)) $usemargins=0;
?>
ref_fourn; ?>
+ ref_fourn; ?>
- tva_tx,'%',$line->info_bits); ?>
+ tva_tx,'%',$line->info_bits); ?>
- subprice); ?>
+ subprice); ?>
- pu_ttc)?price($line->pu_ttc):price($line->subprice)); ?>
+ pu_ttc)?price($line->pu_ttc):price($line->subprice)); ?>
-
+
info_bits & 2) != 2) && $line->special_code != 3) {
// I comment this because it shows info even when not required
// for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated
@@ -148,7 +148,7 @@ if (empty($usemargins)) $usemargins=0;
global->PRODUCT_USE_UNITS)
{
- print ' ';
+ print ' ';
$label = $line->getLabelOfUnit('short');
if ($label !== '') {
print $langs->trans($label);
@@ -158,42 +158,42 @@ if (empty($usemargins)) $usemargins=0;
?>
remise_percent) && $line->special_code != 3) { ?>
- remise_percent,$langs);
?>
-
+
situation_cycle_ref) {
$coldisplay++;
- print '' . $line->situation_percent . '% ';
+ print '' . $line->situation_percent . '% ';
}
if ($usemargins && ! empty($conf->margin->enabled) && empty($user->societe_id))
{
$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT);
?>
- pa_ht); ?>
+ pa_ht); ?>
global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) { ?>
- pa_ht == 0)?'n/a':price($line->marge_tx, null, null, null, null, $rounding).'%'); ?>
+ pa_ht == 0)?'n/a':price($line->marge_tx, null, null, null, null, $rounding).'%'); ?>
global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>
- marque_tx, null, null, null, null, $rounding).'%'; ?>
+ marque_tx, null, null, null, null, $rounding).'%'; ?>
special_code == 3) { ?>
- trans('Option'); ?>
+ trans('Option'); ?>
- total_ht); ?>
+ total_ht); ?>
statut == 0 && ($object_rights->creer)) { ?>
-
+
info_bits & 2) == 2) { ?>
id.'#line_'.$line->id; ?>">
@@ -202,7 +202,7 @@ if (empty($usemargins)) $usemargins=0;
-
+
situation_counter == 1 || !$this->situation_cycle_ref) {
print 'id . '">';
@@ -213,7 +213,7 @@ if (empty($usemargins)) $usemargins=0;
1 && empty($conf->browser->phone) && ($this->situation_counter == 1 || !$this->situation_cycle_ref)) { ?>
-
+
0) { ?>
id; ?>">
@@ -226,7 +226,7 @@ if (empty($usemargins)) $usemargins=0;
- browser->phone)?' class="tdlineupdown"':''); ?>>
+ browser->phone)?' class="linecolmove tdlineupdown"':' class="linecolmove"'); ?>>