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

Fix: W3C in templates

Browse Source
This commit is contained in:
Laurent Destailleur 2010-07-29 15:30:18 +00:00
parent 8c1cf894d0
commit 39e4c69fc6
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
View File

@ -41,7 +41,7 @@ for ($i = 0 ; $i < $num ; $i++)
$var=!$var; $var=!$var;
?> ?>
<tr <?php echo $bc[$var]; ?> ><td> <tr <?php echo $bc[$var]; ?> ><td>
<a href="<?php echo DOL_URL_ROOT.'/compta/propal.php?id='.$linkedObjectBlock->id.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$linkedObjectBlock->ref; ?>"></a></td> <a href="<?php echo DOL_URL_ROOT.'/compta/propal.php?id='.$linkedObjectBlock->id ?>"><?php echo img_object($langs->trans("ShowPropal"),"propal").' '.$linkedObjectBlock->ref; ?></a></td>
<td><?php echo $linkedObjectBlock->ref_client; ?></td> <td><?php echo $linkedObjectBlock->ref_client; ?></td>
<td align="center"><?php echo dol_print_date($linkedObjectBlock->date,'day'); ?></td> <td align="center"><?php echo dol_print_date($linkedObjectBlock->date,'day'); ?></td>
<td align="right"><?php echo price($linkedObjectBlock->total_ht); ?></td> <td align="right"><?php echo price($linkedObjectBlock->total_ht); ?></td>

2
htdocs/commande/tpl/linkedobjectblock.tpl.php
View File

@ -41,7 +41,7 @@ for ($i = 0 ; $i < $num ; $i++)
$var=!$var; $var=!$var;
?> ?>
<tr <?php echo $bc[$var]; ?> ><td> <tr <?php echo $bc[$var]; ?> ><td>
<a href="<?php echo DOL_URL_ROOT.'/commande/fiche.php?id='.$linkedObjectBlock->id.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$linkedObjectBlock->ref; ?>"></a></td> <a href="<?php echo DOL_URL_ROOT.'/commande/fiche.php?id='.$linkedObjectBlock->id ?>"><?php echo img_object($langs->trans("ShowOrder"),"order").' '.$linkedObjectBlock->ref; ?></a></td>
<td align="center"><?php echo dol_print_date($linkedObjectBlock->date,'day'); ?></td> <td align="center"><?php echo dol_print_date($linkedObjectBlock->date,'day'); ?></td>
<td align="right"><?php echo price($linkedObjectBlock->total_ht); ?></td> <td align="right"><?php echo price($linkedObjectBlock->total_ht); ?></td>
<td align="right"><?php echo $linkedObjectBlock->getLibStatut(3); ?></td> <td align="right"><?php echo $linkedObjectBlock->getLibStatut(3); ?></td>

2
htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
View File

@ -42,7 +42,7 @@ for ($i = 0 ; $i < $num ; $i++)
$var=!$var; $var=!$var;
?> ?>
<tr <?php echo $bc[$var]; ?> ><td> <tr <?php echo $bc[$var]; ?> ><td>
<a href="<?php echo DOL_URL_ROOT.'/compta/facture.php?facid='.$linkedObjectBlock->id.'">'.img_object($langs->trans("ShowBill"),"bill").' '.$linkedObjectBlock->ref; ?>"></a></td> <a href="<?php echo DOL_URL_ROOT.'/compta/facture.php?facid='.$linkedObjectBlock->id ?>"><?php echo img_object($langs->trans("ShowBill"),"bill").' '.$linkedObjectBlock->ref; ?></a></td>
<td align="center"><?php echo dol_print_date($linkedObjectBlock->date,'day'); ?></td> <td align="center"><?php echo dol_print_date($linkedObjectBlock->date,'day'); ?></td>
<td align="right"><?php echo price($linkedObjectBlock->total_ht); ?></td> <td align="right"><?php echo price($linkedObjectBlock->total_ht); ?></td>
<td align="right"><?php echo $linkedObjectBlock->getLibStatut(3); ?></td> <td align="right"><?php echo $linkedObjectBlock->getLibStatut(3); ?></td>

2
htdocs/contrat/tpl/linkedobjectblock.tpl.php
View File

@ -41,7 +41,7 @@ for ($i = 0 ; $i < $num ; $i++)
$var=!$var; $var=!$var;
?> ?>
<tr <?php echo $bc[$var]; ?> ><td> <tr <?php echo $bc[$var]; ?> ><td>
<a href="<?php echo DOL_URL_ROOT.'/contrat/fiche.php?id='.$linkedObjectBlock->id.'">'.img_object($langs->trans("ShowContract"),"contract").' '.$linkedObjectBlock->ref; ?>"></a></td> <a href="<?php echo DOL_URL_ROOT.'/contrat/fiche.php?id='.$linkedObjectBlock->id ?>"><?php echo img_object($langs->trans("ShowContract"),"contract").' '.$linkedObjectBlock->ref; ?></a></td>
<td align="center"><?php echo dol_print_date($linkedObjectBlock->date,'day'); ?></td> <td align="center"><?php echo dol_print_date($linkedObjectBlock->date,'day'); ?></td>
<td align="right"><?php echo price($linkedObjectBlock->total_ht); ?></td> <td align="right"><?php echo price($linkedObjectBlock->total_ht); ?></td>
<td align="right"><?php echo $linkedObjectBlock->getLibStatut(3); ?></td> <td align="right"><?php echo $linkedObjectBlock->getLibStatut(3); ?></td>

22
htdocs/core/class/commonobject.class.php
View File

@ -806,7 +806,7 @@ class CommonObject
} }
} }
} }
/** /**
* \brief Get max value for rang * \brief Get max value for rang
*/ */
@ -905,12 +905,12 @@ class CommonObject
$fieldtva='total_tva'; $fieldtva='total_tva';
$fieldlocaltax1='total_localtax1'; $fieldlocaltax1='total_localtax1';
$fieldlocaltax2='total_localtax2'; $fieldlocaltax2='total_localtax2';
if ($this->element == 'facture_fourn') if ($this->element == 'facture_fourn')
{ {
$fieldtva='tva'; $fieldtva='tva';
} }
$sql = 'SELECT qty, total_ht, '.$fieldtva.' as total_tva, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2, total_ttc'; $sql = 'SELECT qty, total_ht, '.$fieldtva.' as total_tva, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2, total_ttc';
$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line; $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
$sql.= ' WHERE '.$this->fk_element.' = '.$this->id; $sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
@ -944,24 +944,24 @@ class CommonObject
// Now update field total_ht, total_ttc and tva // Now update field total_ht, total_ttc and tva
$fieldht='total_ht'; $fieldht='total_ht';
$fieldtva='tva'; $fieldtva='tva';
$fieldlocaltax1='localtax1'; $fieldlocaltax1='localtax1';
$fieldlocaltax2='localtax2'; $fieldlocaltax2='localtax2';
$fieldttc='total_ttc'; $fieldttc='total_ttc';
if ($this->element == 'facture' || $this->element == 'facturerec') if ($this->element == 'facture' || $this->element == 'facturerec')
{ {
$fieldht='total'; $fieldht='total';
} }
if ($this->element == 'facture_fourn') if ($this->element == 'facture_fourn')
{ {
$fieldtva='total_tva'; $fieldtva='total_tva';
} }
if ($this->element == 'propal') if ($this->element == 'propal')
{ {
$fieldttc='total'; $fieldttc='total';