diff --git a/ChangeLog b/ChangeLog index 46efcc8492d30911001aae71495e045fe5d72880..075eb47d53992ec3bff62bc5e47859c554fa96dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ Fix: list event view lost type event filter. Fix: Add code save on create event. Fix: SQL injection. Fix: [ bug #1589 ] Menu type in "Edit menu" page is not translated +Fix: [ bug #1591 ] Linked object block shows Total HT/TTC even if not having permission to read them ***** ChangeLog for 3.5.4 compared to 3.5.3 ***** Fix: Hide title of event when agenda module disabled. diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index 632dee6396547a33d146d44ee2c4503f4467c18b..cb920afd5fc76c8ee9141b10838930915dff5de1 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -1,6 +1,7 @@ <?php /* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com> - * Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es> + * Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es> + * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,6 +28,8 @@ <?php +global $user; + $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; @@ -52,17 +55,23 @@ foreach($linkedObjectBlock as $object) <a href="<?php echo DOL_URL_ROOT.'/comm/propal.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowPropal"),"propal").' '.$object->ref; ?></a></td> <td><?php echo $object->ref_client; ?></td> <td align="center"><?php echo dol_print_date($object->date,'day'); ?></td> - <td align="right"><?php echo price($object->total_ht); ?></td> + <td align="right"><?php + if ($user->rights->propale->lire) { + $total = $total + $object->total_ht; + echo price($object->total_ht); + } ?></td> <td align="right"><?php echo $object->getLibStatut(3); ?></td> </tr> <?php -$total = $total + $object->total_ht; } ?> <tr class="liste_total"> <td align="left" colspan="3"><?php echo $langs->trans('TotalHT'); ?></td> - <td align="right"><?php echo price($total); ?></td> + <td align="right"><?php + if ($user->rights->propale->lire) { + echo price($total); + } ?></td> <td> </td> </tr> </table> diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index c7d073501a3296e5f709abaee245b886778cf725..d2fe19c5b6f5255e45e68f0794373060cc2abc36 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -1,6 +1,7 @@ <?php /* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es> + * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +23,8 @@ <?php +global $user; + $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; @@ -47,17 +50,23 @@ foreach($linkedObjectBlock as $object) <tr <?php echo $GLOBALS['bc'][$var]; ?> ><td> <a href="<?php echo DOL_URL_ROOT.'/commande/fiche.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowOrder"),"order").' '.$object->ref; ?></a></td> <td align="center"><?php echo dol_print_date($object->date,'day'); ?></td> - <td align="right"><?php echo price($object->total_ht); ?></td> + <td align="right"><?php + if ($user->rights->commande->lire) { + $total = $total + $object->total_ht; + echo price($object->total_ht); + } ?></td> <td align="right"><?php echo $object->getLibStatut(3); ?></td> </tr> <?php -$total = $total + $object->total_ht; } ?> <tr class="liste_total"> <td align="left" colspan="2"><?php echo $langs->trans('TotalHT'); ?></td> - <td align="right"><?php echo price($total); ?></td> + <td align="right"><?php + if ($user->rights->commande->lire) { + echo price($total); + } ?></td> <td> </td> </tr> </table> diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index f0fca0b90ff3ef2594e7cd5fc963a7bfe93ecd72..ae3038a6021887333b84b68b3bf239cc5d4e081e 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -1,6 +1,7 @@ <?php /* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2013 Juanjo Menent <jmenent@2byte.es> + * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +23,8 @@ <?php +global $user; + $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; @@ -47,16 +50,22 @@ foreach($linkedObjectBlock as $object) <tr <?php echo $GLOBALS['bc'][$var]; ?> ><td> <a href="<?php echo DOL_URL_ROOT.'/compta/facture.php?facid='.$object->id ?>"><?php echo img_object($langs->trans("ShowBill"),"bill").' '.$object->ref; ?></a></td> <td align="center"><?php echo dol_print_date($object->date,'day'); ?></td> - <td align="right"><?php echo price($object->total_ht); ?></td> + <td align="right"><?php + if ($user->rights->facture->lire) { + $total = $total + $object->total_ht; + echo price($object->total_ht); + } ?></td> <td align="right"><?php echo $object->getLibStatut(3); ?></td> </tr> <?php -$total = $total + $object->total_ht; } ?> <tr class="liste_total"> <td align="left" colspan="2"><?php echo $langs->trans("TotalHT"); ?></td> - <td align="right"><?php echo price($total); ?></td> + <td align="right"><?php + if ($user->rights->facture->lire) { + echo price($total); + } ?></td> <td> </td> </tr> </table> diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php index fd7236505619e58da39d7027dd1ceffe7fc305bd..364afb921779760e82a4a08bb81253326f023ab2 100644 --- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php +++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php @@ -1,5 +1,6 @@ <?php /* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com> + * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +22,8 @@ <?php +global $user; + $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; @@ -47,17 +50,23 @@ foreach($linkedObjectBlock as $object) <a href="<?php echo DOL_URL_ROOT.'/expedition/fiche.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowShipping"),"sending").' '.$object->ref; ?></a></td> <td align="center"><?php echo dol_print_date($object->date_creation,'day'); ?></td> <td align="center"><?php echo dol_print_date($object->date_delivery,'day'); ?></td> - <td align="right"><?php echo price($object->total_ht); ?></td> + <td align="right"><?php + if ($user->rights->expedition->lire) { + $total = $total + $object->total_ht; + echo price($object->total_ht); + } ?></td> <td align="right"><?php echo $object->getLibStatut(3); ?></td> </tr> <?php -$total = $total + $object->total_ht; } ?> <tr class="liste_total"> <td align="left" colspan="3"><?php echo $langs->trans('TotalHT'); ?></td> - <td align="right"><?php echo price($total); ?></td> + <td align="right"><?php + if ($user->rights->expedition->lire) { + echo price($total); + } ?></td> <td> </td> </tr> </table> diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php index d1e209eb54b50e8b6afc6e86d92018f936b36b39..fc1942e0f615d90da110f0deb66829ed83b94d45 100644 --- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php @@ -1,5 +1,6 @@ <?php /* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com> + * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +22,8 @@ <?php +global $user; + $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; @@ -44,17 +47,23 @@ foreach($linkedObjectBlock as $object) <tr <?php echo $bc[$var]; ?> ><td> <a href="<?php echo DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$object->id ?>"><?php echo img_object($langs->trans("ShowOrder"),"order").' '.$object->ref; ?></a></td> <td align="center"><?php echo dol_print_date($object->date,'day'); ?></td> - <td align="right"><?php echo price($object->total_ht); ?></td> + <td align="right"><?php + if ($user->rights->fournisseur->commande->lire) { + $total = $total + $object->total_ht; + echo price($object->total_ht); + } ?></td> <td align="right"><?php echo $object->getLibStatut(3); ?></td> </tr> <?php -$total = $total + $object->total_ht; } ?> <tr class="liste_total"> <td align="left" colspan="2"><?php echo $langs->trans('TotalHT'); ?></td> - <td align="right"><?php echo price($total); ?></td> + <td align="right"><?php + if ($user->rights->fournisseur->commande->lire) { + echo price($total); + } ?></td> <td> </td> </tr> </table> diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php index ab585cc4b1f25f525fe2c1587b47b8ea8e793b5d..c10fea8bb8aa6adb33f31780636f02878972ce08 100644 --- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php @@ -1,5 +1,6 @@ <?php /* Copyright (C) 2010-2011 Regis Houssin <regis.houssin@capnetworks.com> + * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +22,8 @@ <?php +global $user; + $langs = $GLOBALS['langs']; $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; @@ -45,16 +48,22 @@ foreach($linkedObjectBlock as $object) <tr <?php echo $bc[$var]; ?> ><td> <a href="<?php echo DOL_URL_ROOT.'/fourn/facture/fiche.php?facid='.$object->id ?>"><?php echo img_object($langs->trans("ShowBill"),"bill").' '.$object->ref; ?></a></td> <td align="center"><?php echo dol_print_date($object->date,'day'); ?></td> - <td align="right"><?php echo price($object->total_ht); ?></td> + <td align="right"><?php + if ($user->rights->fournisseur->facture->lire) { + $total = $total + $object->total_ht; + echo price($object->total_ht); + } ?></td> <td align="right"><?php echo $object->getLibStatut(3); ?></td> </tr> <?php -$total = $total + $object->total_ht; } ?> <tr class="liste_total"> <td align="left" colspan="2"><?php echo $langs->trans("TotalHT"); ?></td> - <td align="right"><?php echo price($total); ?></td> + <td align="right"><?php + if ($user->rights->fournisseur->facture->lire) { + echo price($total); + } ?></td> <td> </td> </tr> </table>