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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2019-07-04 12:09:26 +02:00
commit 80bbc2577e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/prelevement/create.php
View File

@ -181,6 +181,7 @@ else
print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders"))).'">'.$langs->trans("CreateAll")."</a>\n"; print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NoInvoiceToWithdraw", $langs->transnoentitiesnoconv("StandingOrders"))).'">'.$langs->trans("CreateAll")."</a>\n";
} }
print "</form>\n";
print "</div>\n"; print "</div>\n";
print '<br>'; print '<br>';

8
htdocs/product/price.php
View File

@ -1557,12 +1557,12 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
{ {
print '<td class="right">'; print '<td class="right">';
if (empty($objp->price_by_qty)) { if (empty($objp->price_by_qty)) {
print ($objp->price_base_type != 'TTC' ? price($objp->price) : ''); print price($objp->price);
} }
print "</td>"; print "</td>";
print '<td class="right">'; print '<td class="right">';
if (empty($objp->price_by_qty)) { if (empty($objp->price_by_qty)) {
print ($objp->price_base_type == 'TTC' ? price($objp->price_ttc) : ''); print price($objp->price_ttc);
} }
print "</td>"; print "</td>";
if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled
@ -1572,13 +1572,13 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_
print '<td class="right">'; print '<td class="right">';
if (empty($objp->price_by_qty)) { if (empty($objp->price_by_qty)) {
print ($objp->price_base_type != 'TTC' ? price($objp->price_min) : ''); print price($objp->price_min);
} }
print '</td>'; print '</td>';
print '<td class="right">'; print '<td class="right">';
if (empty($objp->price_by_qty)) { if (empty($objp->price_by_qty)) {
print ($objp->price_base_type == 'TTC' ? price($objp->price_min_ttc) : ''); print price($objp->price_min_ttc);
} }
print '</td>'; print '</td>';