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

css

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-11 19:42:36 +02:00
parent 04a500f516
commit d3815cbb93
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/margin/tabs/productMargins.php
View File

@ -91,9 +91,7 @@ if ($id > 0 || !empty($ref)) {
llxHeader('', $title, $help_url);
/*
* En mode visu
*/
// View mode
if ($result > 0) {
$head = product_prepare_head($object);
$titre = $langs->trans("CardProduct".$object->type);
@ -108,23 +106,23 @@ if ($id > 0 || !empty($ref)) {
print '<div class="fichecenter">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border tableforfield" width="100%">';
print '<table class="border tableforfield centpercent">';
// Total Margin
print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td colspan="3">';
print '<span id="totalMargin"></span>'; // set by jquery (see below)
print '<tr><td class="titlefield">'.$langs->trans("TotalMargin").'</td><td>';
print '<span id="totalMargin" class="amount"></span>'; // set by jquery (see below)
print '</td></tr>';
// Margin Rate
if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
print '<tr><td>'.$langs->trans("MarginRate").'</td><td colspan="3">';
print '<tr><td>'.$langs->trans("MarginRate").'</td><td>';
print '<span id="marginRate"></span>'; // set by jquery (see below)
print '</td></tr>';
}
// Mark Rate
if (!empty($conf->global->DISPLAY_MARK_RATES)) {
print '<tr><td>'.$langs->trans("MarkRate").'</td><td colspan="3">';
print '<tr><td>'.$langs->trans("MarkRate").'</td><td>';
print '<span id="markRate"></span>'; // set by jquery (see below)
print '</td></tr>';
}
@ -227,12 +225,12 @@ if ($id > 0 || !empty($ref)) {
print "</td>\n";
print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.dol_trunc($objp->name, 44).'</a></td>';
print "<td>".$objp->code_client."</td>\n";
print "<td class=\"center\">";
print '<td class="center">';
print dol_print_date($db->jdate($objp->datef), 'day')."</td>";
print "<td class=\"right\">".price(price2num($objp->selling_price, 'MT'))."</td>\n";
print "<td class=\"right\">".price(price2num($objp->buying_price, 'MT'))."</td>\n";
print "<td class=\"right\">".price(price2num($objp->qty, 'MT'))."</td>\n";
print "<td class=\"right\">".price(price2num($objp->marge, 'MT'))."</td>\n";
print '<td class="right amount">'.price(price2num($objp->selling_price, 'MT'))."</td>\n";
print '<td class="right amount">'.price(price2num($objp->buying_price, 'MT'))."</td>\n";
print '<td class="right">'.price(price2num($objp->qty, 'MT'))."</td>\n";
print '<td class="right amount">'.price(price2num($objp->marge, 'MT'))."</td>\n";
if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
print "<td class=\"right\">".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
}
@ -260,10 +258,10 @@ if ($id > 0 || !empty($ref)) {
}
print '<tr class="liste_total">';
print '<td colspan=4>'.$langs->trans('TotalMargin')."</td>";
print '<td class="right">'.price(price2num($cumul_vente, 'MT'))."</td>\n";
print '<td class="right">'.price(price2num($cumul_achat, 'MT'))."</td>\n";
print '<td class="right amount">'.price(price2num($cumul_vente, 'MT'))."</td>\n";
print '<td class="right amount">'.price(price2num($cumul_achat, 'MT'))."</td>\n";
print '<td class="right">'.price(price2num($cumul_qty, 'MT'))."</td>\n";
print '<td class="right">'.price(price2num($totalMargin, 'MT'))."</td>\n";
print '<td class="right amount">'.price(price2num($totalMargin, 'MT'))."</td>\n";
if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
print '<td class="right">'.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")."</td>\n";
}

16
htdocs/product/fournisseurs.php
View File

@ -382,7 +382,7 @@ if ($id > 0 || $ref) {
echo $formconfirm;
}
if ($action <> 'edit' && $action <> 're-edit') {
if ($action != 'edit' && $action != 're-edit') {
$head = product_prepare_head($object);
$titre = $langs->trans("CardProduct".$object->type);
$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
@ -835,12 +835,13 @@ END;
print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
print '</div>';
print '</form>';
print '</form>'."\n";
}
// Actions buttons
print "\n<div class=\"tabsAction\">\n";
print '<div class="tabsAction">'."\n";
if ($action != 'add_price' && $action != 'update_price') {
$parameters = array();
@ -853,8 +854,7 @@ END;
}
}
print "\n</div>\n";
print '<br>';
print "</div>\n";
if ($user->rights->fournisseur->lire) { // Duplicate ? this check is already in the head of this file
$param = '';
@ -1016,14 +1016,14 @@ END;
// Supplier
if (!empty($arrayfields['s.nom']['checked'])) {
print '<td class="tdoverflowmax200">'.$productfourn->getSocNomUrl(1, 'supplier').'</td>';
print '<td class="tdoverflowmax150">'.$productfourn->getSocNomUrl(1, 'supplier').'</td>';
}
// Supplier ref
if ($usercancreate) { // change required right here
print '<td class="left">'.$productfourn->getNomUrl().'</td>';
print '<td>'.$productfourn->getNomUrl().'</td>';
} else {
print '<td class="left">'.$productfourn->fourn_ref.'</td>';
print '<td>'.$productfourn->fourn_ref.'</td>';
}
// Availability