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

Debug v16

Browse Source
This commit is contained in:
Laurent Destailleur 2022-06-09 11:47:29 +02:00
parent 0104f00a7a
commit 3bb8e9cdda
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/bank/categ.php
View File

@ -113,7 +113,7 @@ if ($action != 'edit') {
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td>&nbsp;</td><td><input name="label" type="text" class="maxwidth100"></td>'; print '<td>&nbsp;</td><td><input name="label" type="text" class="maxwidth100"></td>';
print '<td></td>'; print '<td></td>';
print '<td class="center"><input type="submit" name="add" class="button button-add" value="'.$langs->trans("Add").'"></td>'; print '<td class="center"><input type="submit" name="add" class="button button-add small" value="'.$langs->trans("Add").'"></td>';
print '</tr>'; print '</tr>';
} }

2
htdocs/compta/bank/list.php
View File

@ -550,7 +550,7 @@ foreach ($accounts as $key => $type) {
// Account type // Account type
if (!empty($arrayfields['accountype']['checked'])) { if (!empty($arrayfields['accountype']['checked'])) {
print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objecttmp->type_lib[$objecttmp->type]).'">'; print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($objecttmp->type_lib[$objecttmp->type]).'">';
print $objecttmp->type_lib[$objecttmp->type]; print $objecttmp->type_lib[$objecttmp->type];
print '</td>'; print '</td>';
if (!$i) { if (!$i) {

2
htdocs/main.inc.php
View File

@ -2247,7 +2247,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
$btnUser = '<!-- div for user link --> $btnUser = '<!-- div for user link -->
<div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block"> <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block">
<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown"> <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown">
'.$userImage.'<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone paddingleft">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span> '.$userImage.(empty($user->photo) ? '<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone paddingleft">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>' : '').'
</a> </a>
<div class="dropdown-menu"> <div class="dropdown-menu">
<!-- User image --> <!-- User image -->

8
htdocs/product/fournisseurs.php
View File

@ -1076,9 +1076,9 @@ END;
// Supplier ref // Supplier ref
if ($usercancreate) { // change required right here if ($usercancreate) { // change required right here
print '<td>'.$productfourn->getNomUrl().'</td>'; print '<td class="tdoverflowmax150">'.$productfourn->getNomUrl().'</td>';
} else { } else {
print '<td>'.$productfourn->fourn_ref.'</td>'; print '<td class="tdoverflowmax150">'.dol_escape_htmltag($productfourn->fourn_ref).'</td>';
} }
// Availability // Availability
@ -1109,13 +1109,13 @@ END;
// Price for the quantity // Price for the quantity
print '<td class="right">'; print '<td class="right">';
print $productfourn->fourn_price ?price($productfourn->fourn_price) : ""; print $productfourn->fourn_price ? '<span class="amount">'.price($productfourn->fourn_price).'</span>' : "";
print '</td>'; print '</td>';
if (!empty($conf->multicurrency->enabled)) { if (!empty($conf->multicurrency->enabled)) {
// Price for the quantity in currency // Price for the quantity in currency
print '<td class="right">'; print '<td class="right">';
print $productfourn->fourn_multicurrency_price ? price($productfourn->fourn_multicurrency_price) : ""; print $productfourn->fourn_multicurrency_price ? '<span class="amount">'.price($productfourn->fourn_multicurrency_price).'</span>' : "";
print '</td>'; print '</td>';
} }

14
htdocs/product/price.php
View File

@ -1798,14 +1798,14 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
// Price HT // Price HT
print '<td class="right">'; print '<td class="right">';
if (empty($objp->price_by_qty)) { if (empty($objp->price_by_qty)) {
print price($objp->price); print '<span class="amount">'.price($objp->price).'</span>';
} }
print "</td>"; print "</td>";
// Price TTC // Price TTC
print '<td class="right">'; print '<td class="right">';
if (empty($objp->price_by_qty)) { if (empty($objp->price_by_qty)) {
$price_ttc = $objp->price_ttc; $price_ttc = $objp->price_ttc;
print price($price_ttc); print '<span class="amount">'.price($price_ttc).'<span>';
} }
print "</td>"; print "</td>";
if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") { if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
@ -2175,9 +2175,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
//. vatrate($tva_tx, true, $line->recuperableonly) . //. vatrate($tva_tx, true, $line->recuperableonly) .
print "</td>"; print "</td>";
print '<td class="right">'.price($line->price)."</td>"; print '<td class="right"><span class="amount">'.price($line->price)."</span></td>";
print '<td class="right">'.price($line->price_ttc)."</td>"; print '<td class="right"><span class="amount">'.price($line->price_ttc)."</span></td>";
if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") { if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
print '<td class="right">'.price($resultarray[2]).'</td>'; print '<td class="right">'.price($resultarray[2]).'</td>';
} }
@ -2357,7 +2357,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print "<td>".$staticsoc->getNomUrl(1)."</td>"; print "<td>".$staticsoc->getNomUrl(1)."</td>";
print '<td>' . $line->ref_customer . '</td>'; print '<td>'.dol_escape_htmltag($line->ref_customer).'</td>';
print "<td>".dol_print_date($line->datec, "dayhour", 'tzuserrel')."</td>"; print "<td>".dol_print_date($line->datec, "dayhour", 'tzuserrel')."</td>";
print '<td class="center">'.$langs->trans($line->price_base_type)."</td>"; print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
print '<td class="right">'; print '<td class="right">';
@ -2379,9 +2379,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
echo vatrate($positiverates.($line->default_vat_code ? ' ('.$line->default_vat_code.')' : ''), '%', ($line->tva_npr ? $line->tva_npr : $line->recuperableonly)); echo vatrate($positiverates.($line->default_vat_code ? ' ('.$line->default_vat_code.')' : ''), '%', ($line->tva_npr ? $line->tva_npr : $line->recuperableonly));
print "</td>"; print "</td>";
print '<td class="right">'.price($line->price)."</td>"; print '<td class="right"><span class="amount">'.price($line->price)."</span></td>";
print '<td class="right">'.price($line->price_ttc)."</td>"; print '<td class="right"><span class="amount">'.price($line->price_ttc)."</span></td>";
if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") { if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
//print '<td class="right">' . price($line->price_ttc) . "</td>"; //print '<td class="right">' . price($line->price_ttc) . "</td>";
print '<td class="right">'.price($resultarray[2]).'</td>'; print '<td class="right">'.price($resultarray[2]).'</td>';

4
htdocs/product/stock/product.php
View File

@ -692,12 +692,12 @@ if ($id > 0 || $ref) {
} else { } else {
// Price // Price
print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>'; print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
print $langs->trans("Variable"); print '<span class="opacitymedium">'.$langs->trans("Variable").'</span>';
print '</td></tr>'; print '</td></tr>';
// Price minimum // Price minimum
print '<tr><td>'.$langs->trans("MinPrice").'</td><td>'; print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
print $langs->trans("Variable"); print '<span class="opacitymedium">'.$langs->trans("Variable").'</span>';
print '</td></tr>'; print '</td></tr>';
} }