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

Fix: on pourra calculer le taux de marge sur un service

Browse Source
This commit is contained in:
Regis Houssin 2007-12-01 08:54:52 +00:00
parent c67d7b832e
commit 7ee0aaa41c
1 changed files with 44 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/comm/propal.php
View File

@ -1162,10 +1162,7 @@ if ($_GET['propalid'] > 0)
print "</td>\n"; print "</td>\n";
} }
if ($conf->global->PRODUIT_USE_MARKUP) if ($conf->global->PRODUIT_USE_MARKUP && $conf->use_ajax)
{
// Champ ???
if ($objp->fk_product_type==0 && $conf->use_ajax)
{ {
$formMarkup = '<form id="formMarkup" action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'" method="post">'."\n"; $formMarkup = '<form id="formMarkup" action="'.$_SERVER["PHP_SELF"].'?propalid='.$propal->id.'" method="post">'."\n";
$formMarkup.= '<table class="border" width="100%">'."\n"; $formMarkup.= '<table class="border" width="100%">'."\n";
@ -1217,11 +1214,6 @@ if ($_GET['propalid'] > 0)
print '</tr></table>'; print '</tr></table>';
print '</td>'; print '</td>';
} }
else
{
print '<td>&nbsp;</td>';
}
}
// VAT Rate // VAT Rate
print '<td align="right">'.vatrate($objp->tva_tx).'%</td>'; print '<td align="right">'.vatrate($objp->tva_tx).'%</td>';