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

Look and feel v14

Browse Source
This commit is contained in:
Laurent Destailleur 2021-02-10 18:03:45 +01:00
parent 52ee530e70
commit 88550ab417
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/html.form.class.php
View File

@ -5040,7 +5040,7 @@ class Form
} }
} }
print $langs->trans($translationKey, price($amount, 0, $langs, 0, 0, -1, $conf->currency)); print $langs->trans($translationKey, price($amount, 0, $langs, 0, 0, -1, $conf->currency));
if (empty($hidelist)) print ': '; if (empty($hidelist)) print ' ';
print '</div>'; print '</div>';
if (empty($hidelist)) if (empty($hidelist))
{ {

4
htdocs/core/tpl/object_discounts.tpl.php
View File

@ -24,6 +24,8 @@
* $backtopage URL to come back to from discount modification pages * $backtopage URL to come back to from discount modification pages
*/ */
print '<!-- BEGIN object_discounts.tpl.php -->'."\n";
$objclassname = get_class($object); $objclassname = get_class($object);
$isInvoice = in_array($object->element, array('facture', 'invoice', 'facture_fourn', 'invoice_supplier')); $isInvoice = in_array($object->element, array('facture', 'invoice', 'facture_fourn', 'invoice_supplier'));
$isNewObject = empty($object->id) && empty($object->rowid); $isNewObject = empty($object->id) && empty($object->rowid);
@ -109,3 +111,5 @@ if ($absolute_discount <= 0 && $absolute_creditnote <= 0) {
print ' ('.$addabsolutediscount.')'; print ' ('.$addabsolutediscount.')';
} }
} }
print '<!-- END template -->';

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

@ -293,10 +293,10 @@ if ($nolinesbefore) {
} }
} }
if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
echo '<br>';
if (!empty($conf->variants->enabled)) { if (!empty($conf->variants->enabled)) {
echo '<div id="attributes_box"></div>'; echo '<div id="attributes_box"></div>';
} }
echo '<br>';
} }
// Editor wysiwyg // Editor wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';