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

Look and feel v13

Browse Source
This commit is contained in:
Laurent Destailleur 2020-07-07 03:50:14 +02:00
parent 4fd970af28
commit cb5577826d
6 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/bom/tpl/objectline_create.tpl.php
View File

@ -58,7 +58,6 @@ if ($nolinesbefore) {
}
print '<td class="linecoldescription minwidth500imp">';
print '<div id="add"></div><span class="hideonsmartphone">'.$langs->trans('AddNewLine').'</span>';
// echo $langs->trans("FreeZone");
print '</td>';
print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
if ($conf->global->PRODUCT_USE_UNITS)

2
htdocs/core/tpl/objectline_create.tpl.php
View File

@ -85,7 +85,7 @@ if ($nolinesbefore) {
<td class="linecolnum center"></td>
<?php } ?>
<td class="linecoldescription minwidth500imp">
<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span><?php // echo $langs->trans("FreeZone"); ?>
<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span>
</td>
<?php
if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') // We must have same test in printObjectLines

2
htdocs/langs/en_US/main.lang
View File

@ -725,7 +725,7 @@ Page=Page
Notes=Notes
AddNewLine=Add new line
AddFile=Add file
FreeZone=Not a predefined product/service
FreeZone=Free-text product
FreeLineOfType=Free-text item, type:
CloneMainAttributes=Clone object with its main attributes
ReGeneratePDF=Re-generate PDF

4
htdocs/takepos/css/pos.css.php
View File

@ -272,6 +272,10 @@ table.postablelines tr td {
background-color: var(--colorbacklineimpair1);
}
.postablelines td.linecolht {
line-height: 1.3em !important;
}
div.paymentbordline
{
width:calc(50% - 16px);

1
htdocs/takepos/index.php
View File

@ -467,6 +467,7 @@ function New() {
}
if (r == true) {
// Reload section with invoice lines
$("#poslines").load("invoice.php?action=delete&place=" + place, function () {
//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
});

29
htdocs/takepos/invoice.php
View File

@ -425,6 +425,7 @@ if ($action == "delete") {
$sql .= " WHERE ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
$resql3 = $db->query($sql);
$invoice->update_price(1);
if ($resql1 && $resql2 && $resql3)
{
$db->commit();
@ -845,7 +846,10 @@ print '<div class="div-table-responsive-no-min invoice">';
print '<table id="tablelines" class="noborder noshadow postablelines" width="100%">';
print '<tr class="liste_titre nodrag nodrop">';
print '<td class="linecoldescription">';
print '<span style="font-size:120%;" class="right">';
// In phone version only show when it is invoice page
if ($mobilepage == "invoice" || $mobilepage == "") {
print '<input type="hidden" name="invoiceid" id="invoiceid" value="'.$invoice->id.'">'.$sectionwithinvoicelink;
}
if ($conf->global->TAKEPOS_BAR_RESTAURANT)
{
$sql = "SELECT floor, label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place);
@ -858,25 +862,28 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT)
}
// In phone version only show when is invoice page
if ($mobilepage == "invoice" || $mobilepage == "") {
print $langs->trans('Place')." <b>".$label."</b> - ";
print $langs->trans('Floor')." <b>".$floor."</b> - ";
print '<span class="opacitymedium">'.$langs->trans('Place')."</span> <b>".$label."</b><br>";
print '<span class="opacitymedium">'.$langs->trans('Floor')."</span> <b>".$floor."</b>";
}
elseif (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) print $mysoc->name;
elseif ($mobilepage == "cats") print $langs->trans('Category');
elseif ($mobilepage == "products") print $langs->trans('Label');
} else {
print $langs->trans("Products");
}
// In phone version only show when is invoice page
if ($mobilepage == "invoice" || $mobilepage == "") {
print $langs->trans('TotalTTC');
print ' : <b>'.price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</b></span>';
print '<br><input type="hidden" name="invoiceid" id="invoiceid" value="'.$invoice->id.'">'.$sectionwithinvoicelink;
print '</td>';
}
print '</td>';
if ($_SESSION["basiclayout"] != 1)
{
print '<td class="linecolqty right">'.$langs->trans('ReductionShort').'</td>';
print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
print '<td class="linecolht right nowraponall">'.$langs->trans('TotalTTCShort').'</td>';
print '<td class="linecolht right nowraponall">';
print '<span class="opacitymedium small">'.$langs->trans('TotalTTCShort').'</span><br>';
// In phone version only show when it is invoice page
if ($mobilepage == "invoice" || $mobilepage == "") {
print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">'.price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</span>';
print '</td>';
}
print '</td>';
}
elseif ($mobilepage == "invoice") print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
print "</tr>\n";