Debug v16
This commit is contained in:
parent
0104f00a7a
commit
3bb8e9cdda
@ -113,7 +113,7 @@ if ($action != 'edit') {
|
||||
print '<tr class="oddeven">';
|
||||
print '<td> </td><td><input name="label" type="text" class="maxwidth100"></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>';
|
||||
}
|
||||
|
||||
|
||||
@ -550,7 +550,7 @@ foreach ($accounts as $key => $type) {
|
||||
|
||||
// Account type
|
||||
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 '</td>';
|
||||
if (!$i) {
|
||||
|
||||
@ -2247,7 +2247,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
|
||||
$btnUser = '<!-- div for user link -->
|
||||
<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">
|
||||
'.$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>
|
||||
<div class="dropdown-menu">
|
||||
<!-- User image -->
|
||||
|
||||
@ -1076,9 +1076,9 @@ END;
|
||||
|
||||
// Supplier ref
|
||||
if ($usercancreate) { // change required right here
|
||||
print '<td>'.$productfourn->getNomUrl().'</td>';
|
||||
print '<td class="tdoverflowmax150">'.$productfourn->getNomUrl().'</td>';
|
||||
} else {
|
||||
print '<td>'.$productfourn->fourn_ref.'</td>';
|
||||
print '<td class="tdoverflowmax150">'.dol_escape_htmltag($productfourn->fourn_ref).'</td>';
|
||||
}
|
||||
|
||||
// Availability
|
||||
@ -1109,13 +1109,13 @@ END;
|
||||
|
||||
// Price for the quantity
|
||||
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>';
|
||||
|
||||
if (!empty($conf->multicurrency->enabled)) {
|
||||
// Price for the quantity in currency
|
||||
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>';
|
||||
}
|
||||
|
||||
|
||||
@ -1798,14 +1798,14 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
|
||||
// Price HT
|
||||
print '<td class="right">';
|
||||
if (empty($objp->price_by_qty)) {
|
||||
print price($objp->price);
|
||||
print '<span class="amount">'.price($objp->price).'</span>';
|
||||
}
|
||||
print "</td>";
|
||||
// Price TTC
|
||||
print '<td class="right">';
|
||||
if (empty($objp->price_by_qty)) {
|
||||
$price_ttc = $objp->price_ttc;
|
||||
print price($price_ttc);
|
||||
print '<span class="amount">'.price($price_ttc).'<span>';
|
||||
}
|
||||
print "</td>";
|
||||
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) .
|
||||
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") {
|
||||
print '<td class="right">'.price($resultarray[2]).'</td>';
|
||||
}
|
||||
@ -2357,7 +2357,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
|
||||
print '<tr class="oddeven">';
|
||||
|
||||
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 class="center">'.$langs->trans($line->price_base_type)."</td>";
|
||||
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));
|
||||
|
||||
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") {
|
||||
//print '<td class="right">' . price($line->price_ttc) . "</td>";
|
||||
print '<td class="right">'.price($resultarray[2]).'</td>';
|
||||
|
||||
@ -692,12 +692,12 @@ if ($id > 0 || $ref) {
|
||||
} else {
|
||||
// Price
|
||||
print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
|
||||
print $langs->trans("Variable");
|
||||
print '<span class="opacitymedium">'.$langs->trans("Variable").'</span>';
|
||||
print '</td></tr>';
|
||||
|
||||
// Price minimum
|
||||
print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
|
||||
print $langs->trans("Variable");
|
||||
print '<span class="opacitymedium">'.$langs->trans("Variable").'</span>';
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user