| '; - print ''.$langs->trans("ECMSections").''; + print ' | ';
+ print ' '.$langs->trans("ECMSections");
@@ -283 +156 @@
- $showonrightsize = '';
+ $showonrightsize = '';
@@ -286,48 +159,43 @@
- $htmltooltip = $langs->trans("ECMAreaDesc2a");
- $htmltooltip .= ' '.$langs->trans("ECMAreaDesc2b"); - - if (!empty($conf->use_javascript_ajax) && !getDolGlobalString('MAIN_ECM_DISABLE_JS')) { - // Show the link to "Root" - if ($showroot) { - print ' | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| '; - - // Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php) - print ''; - - if ($action == 'deletefile') { - print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile'); - } - - print ' | |||||||||||
| ';
-
- $_POST['modulepart'] = $module;
- $_POST['openeddir'] = GETPOST('openeddir');
- $_POST['dir'] = empty($_POST['dir']) ? '/' : $_POST['dir'];
-
- // Show filemanager tree (will be filled by direct include of ajaxdirtree.php in mode noajax, this will return all dir - all levels - to show)
- print ' ';
-
- // Variables that may be defined:
- // $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
- // $_POST['dir']
- $mode = 'noajax';
- if (empty($url)) {
- $url = DOL_URL_ROOT.'/ecm/index.php';
- }
- include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
-
- print ' ';
- print ' | |||||||||||
| '; + + // Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php) + print ''; + + if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile'); + + print ' | |||||||||||
| ';
+
+ $_POST['modulepart'] = $module;
+ $_POST['openeddir'] = GETPOST('openeddir');
+ $_POST['dir'] = empty($_POST['dir']) ? '/' : $_POST['dir'];
+
+ // Show filemanager tree (will be filled by direct include of ajaxdirtree.php in mode noajax, this will return all dir - all levels - to show)
+ print ' ';
+
+ // Variables that may be defined:
+ // $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
+ // $_POST['dir']
+ $mode = 'noajax';
+ if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';
+ include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
+
+ print ' ';
+ print ' | '.price($totalarray['val'][$totalarray['pos'][$i]]).' | '; + else + { + if ($i == 1) + { + if ($num < $limit) print ''.$langs->trans("Total").' | '; + else print ''.$langs->trans("Totalforthispage").' | '; @@ -21,38 +25 @@ - switch ($totalarray['type'][$i]) { - case 'duration': - print ''; - print (!empty($totalarray['val'][$totalarray['pos'][$i]]) ? convertSecondToTime($totalarray['val'][$totalarray['pos'][$i]], 'allhourmin') : 0); - print ' | '; - break; - case 'string': // This type is no more used. type is now varchar(x) - print ''; - print (!empty($totalarray['val'][$totalarray['pos'][$i]]) ? $totalarray['val'][$totalarray['pos'][$i]] : ''); - print ' | '; - break; - case 'stock': - print ''; - print price2num(!empty($totalarray['val'][$totalarray['pos'][$i]]) ? $totalarray['val'][$totalarray['pos'][$i]] : 0, 'MS'); - print ' | '; - break; - default: - print ''; - print price(!empty($totalarray['val'][$totalarray['pos'][$i]]) ? $totalarray['val'][$totalarray['pos'][$i]] : 0); - print ' | '; - break; - } - } else { - if ($i == 1) { - if (is_null($limit) || $num < $limit) { - print ''.$langs->trans("Total").' | '; - } else { - print ''; - if (is_object($form)) { - print $form->textwithpicto($langs->trans("Total"), $langs->transnoentitiesnoconv("Totalforthispage")); - } else { - print $langs->trans("Totalforthispage"); - } - print ' | '; - } - } else { - print ''; - } + else print ' | '; --- /tmp/dsg/dolibarr/htdocs/core/tpl/github_19.0.3_login.tpl.php +++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_login.tpl.php @@ -2,2 +2,2 @@ -/* Copyright (C) 2009-2015 Regis Houssin | "> | - element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') // We must have same test in printObjectLines + { + $coldisplay++; + ?> +"> | + tva_assuj == "0") { - echo ''.vatrate(0, true); - } else { - echo $form->load_tva('tva_tx', (GETPOSTISSET("tva_tx") ? GETPOST("tva_tx", 'alpha', 2) : -1), $seller, $buyer, 0, 0, '', false, 1); - } + if ($seller->tva_assuj == "0") echo ''.vatrate(0, true); + else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"]) ?GETPOST("tva_tx", 'alpha', 2) : -1), $seller, $buyer, 0, 0, '', false, 1); @@ -454 +356 @@ - "> + "> @@ -458,2 +360,3 @@ - if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { - $coldisplay++; ?> + if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { + $coldisplay++; + ?> @@ -461 +364 @@ - "> + "> @@ -465,2 +368,3 @@ - if (!empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { - $coldisplay++; ?> + if (!empty($inputalsopricewithtax)) { + $coldisplay++; + ?> @@ -468 +372 @@ - "> + "> @@ -474,3 +378 @@ -- - "> + | "> @@ -479 +381 @@ - if (getDolGlobalInt('PRODUCT_USE_UNITS')) { + if (!empty($conf->global->PRODUCT_USE_UNITS)) { @@ -482 +384 @@ - print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units"); + print $form->selectUnits($line->fk_unit, "units"); @@ -491,2 +393 @@ - - | "> | +">% | @@ -494 +395 @@ - if (isset($this->situation_cycle_ref) && $this->situation_cycle_ref) { + if ($this->situation_cycle_ref) { @@ -496 +397 @@ - print ''; + print ' | % | '; @@ -501,2 +402,3 @@ - if ($user->hasRight('margins', 'creer')) { - $coldisplay++; ?> + if (!empty($user->rights->margins->creer)) { + $coldisplay++; + ?> @@ -505,2 +407,2 @@ - - + product->enabled) || !empty($conf->service->enabled)) { ?> + @@ -509 +411 @@ - "> + "> @@ -512,2 +414,3 @@ - if (getDolGlobalString('DISPLAY_MARGIN_RATES')) { - echo ''; + if (!empty($conf->global->DISPLAY_MARGIN_RATES)) + { + echo ' | '; @@ -516,2 +419,3 @@ - if (getDolGlobalString('DISPLAY_MARK_RATES')) { - echo ' | '; + if (!empty($conf->global->DISPLAY_MARK_RATES)) + { + echo ' | '; @@ -525 +429 @@ - + @@ -530,26 +434,13 @@ -if ((isModEnabled("service") || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0') { // We show date field if required - print ' |
| '; - } - print ' | '; - $date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear')); - $date_end = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear')); - - $prefillDates = false; - - if (getDolGlobalString('MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE') && !empty($object->lines)) { - for ($i = count($object->lines) - 1; $i >= 0; $i--) { - $lastline = $object->lines[$i]; - - if ($lastline->product_type == Product::TYPE_SERVICE && (!empty($lastline->date_start) || !empty($lastline->date_end))) { - $date_start_prefill = $lastline->date_start; - $date_end_prefill = $lastline->date_end; - - $prefillDates = true; - break; - } - } - } - - if (!empty($object->element) && $object->element == 'contrat') { +if (is_object($objectline)) { + print $objectline->showOptionals($extrafields, 'edit', array('colspan'=>$coldisplay), '', '', 1); +} + +if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0') // We show date field if required +{ + print ' | ||||||||||
| '; } + print ' | '; + $date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear')); + $date_end = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear')); + if (!empty($object->element) && $object->element == 'contrat') + { @@ -560 +451,3 @@ - } else { + } + else + { @@ -562 +455 @@ - print $form->selectDate($date_start, 'date_start', !getDolGlobalString('MAIN_USE_HOURMIN_IN_DATE_RANGE') ? 0 : 1, !getDolGlobalString('MAIN_USE_HOURMIN_IN_DATE_RANGE') ? 0 : 1, 1, "addproduct", 1, 0); + print $form->selectDate($date_start, 'date_start', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0); @@ -564,27 +457,3 @@ - print $form->selectDate($date_end, 'date_end', !getDolGlobalString('MAIN_USE_HOURMIN_IN_DATE_RANGE') ? 0 : 1, !getDolGlobalString('MAIN_USE_HOURMIN_IN_DATE_RANGE') ? 0 : 1, 1, "addproduct", 1, 0); - } - - if ($prefillDates) { - echo ' '.$langs->trans('FillWithLastServiceDates').''; - } - - print ''; - print ' | '; - print '+global->MAIN_VIEW_LINE_NUMBER)) { ?> + | @@ -93 +69 @@ - | + |
@@ -97,0 +74 @@
+
@@ -103,23 +80 @@
- if (empty($canchangeproduct)) {
- if ($line->fk_parent_line > 0) {
- echo img_picto('', 'rightarrow');
- } ?>
-
- product_type == 1) {
- echo img_object($langs->trans('ShowService'), 'service');
- } else {
- print img_object($langs->trans('ShowProduct'), 'product');
- }
- echo ' '.$line->ref; ?>
-
- product_label);
- print '';
- } else {
- if ($senderissupplier) {
- $form->select_produits_fournisseurs(!empty($line->fk_product) ? $line->fk_product : 0, 'productid');
- } else {
- print $form->select_produits(!empty($line->fk_product) ? $line->fk_product : 0, 'productid');
- }
- }
+ if ($line->fk_parent_line > 0) echo img_picto('', 'rightarrow');
@@ -126,0 +82,11 @@
+
+ product_type == 1) echo img_object($langs->trans('ShowService'), 'service');
+ else print img_object($langs->trans('ShowProduct'), 'product');
+ echo ' '.$line->ref;
+ ?>
+
+ product_label);
+ ?>
+
@@ -127,0 +94 @@
+
@@ -131,12 +98,5 @@
- if (is_object($hookmanager)) {
- $fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line', 'int') : $line->fk_parent_line);
- $parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
- $reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
- }
-
- $situationinvoicelinewithparent = 0;
- if ($line->fk_prev_id != null && in_array($object->element, array('facture', 'facturedet'))) {
- if ($object->type == $object::TYPE_SITUATION) { // The constant TYPE_SITUATION exists only for object invoice
- // Set constant to disallow editing during a situation cycle
- $situationinvoicelinewithparent = 1;
- }
+ if (is_object($hookmanager))
+ {
+ $fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
+ $parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
+ $reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
@@ -146,6 +106,2 @@
- // but in some situations that is required (update legal informations for example)
- if (getDolGlobalString('INVOICE_SITUATION_CAN_FORCE_UPDATE_DESCRIPTION')) {
- $situationinvoicelinewithparent = 0;
- }
-
- if (!$situationinvoicelinewithparent) {
+ if ($line->fk_prev_id == null)
+ {
@@ -155,3 +111 @@
- if (getDolGlobalString('MAIN_INPUT_DESC_HEIGHT')) {
- $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
- }
+ if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
@@ -160,4 +114,2 @@
- if (getDolGlobalString('FCKEDITOR_ENABLE_DETAILS_FULL')) {
- $toolbarname = 'dolibarr_notes';
- }
- $doleditor = new DolEditor('product_desc', GETPOSTISSET('product_desc') ? GETPOST('product_desc', 'restricthtml') : $line->description, '', (!getDolGlobalString('MAIN_DOLEDITOR_HEIGHT') ? 164 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enable, $nbrows, '98%');
+ if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname = 'dolibarr_notes';
+ $doleditor = new DolEditor('product_desc', $line->description, '', (empty($conf->global->MAIN_DOLEDITOR_HEIGHT) ? 164 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enable, $nbrows, '98%');
@@ -166,13 +118 @@
- print '';
- }
-
- //Line extrafield
- if (!empty($extrafields)) {
- $temps = $line->showOptionals($extrafields, 'edit', array('class'=>'tredited'), '', '', 1, 'line');
- if (!empty($temps)) {
- print ' ';
- print $temps;
- print ' ';
- }
+ print '';
@@ -182,5 +122,2 @@
- if (isModEnabled("service") && $line->product_type == 1 && ($line->element == 'facturedetrec' || $line->element == 'invoice_supplier_det_rec')) {
- if ($line->element == 'invoice_supplier_det_rec') {
- $line->date_start_fill = $line->date_start;
- $line->date_end_fill = $line->date_end;
- }
+ if (!empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec')
+ {
@@ -189 +126 @@
- echo $form->selectyesno('date_start_fill', GETPOSTISSET('date_start_fill') ? GETPOST('date_start_fill', 'int') : $line->date_start_fill, 1);
+ echo $form->selectyesno('date_start_fill', $line->date_start_fill, 1);
@@ -192 +129 @@
- echo $form->selectyesno('date_end_fill', GETPOSTISSET('date_end_fill') ? GETPOST('date_end_fill', 'int') : $line->date_end_fill, 1);
+ echo $form->selectyesno('date_end_fill', $line->date_end_fill, 1);
@@ -199,3 +136,5 @@
- if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier' || $object->element == 'invoice_supplier_rec') { // We must have same test in printObjectLines
- $coldisplay++; ?>
- | + if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') // We must have same test in printObjectLines + { + $coldisplay++; + ?> + | @@ -203,4 +142,2 @@ - print ''; - } - - // VAT Rate + } + @@ -208,4 +145,2 @@ - if (!$situationinvoicelinewithparent) { - print ' | '; - print $form->load_tva('tva_tx', GETPOSTISSET('tva_tx') ? GETPOST('tva_tx', 'alpha') : ($line->tva_tx.($line->vat_src_code ? (' ('.$line->vat_src_code.')') : '')), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1); - print ' | '; + if ($line->fk_prev_id == null) { + print ''.$form->load_tva('tva_tx', $line->tva_tx.($line->vat_src_code ? (' ('.$line->vat_src_code.')') : ''), $seller, $buyer, 0, $line->info_bits, $line->product_type, false, 1).' | '; @@ -217,4 +152,2 @@ - print 'fk_prev_id != null) print ' readonly'; @@ -223 +156,7 @@ - if (isModEnabled("multicurrency") && $object->multicurrency_code != $conf->currency) { + if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { + $coldisplay++; + print ' | '; + } + + if ($inputalsopricewithtax) + { @@ -225,13 +164,2 @@ - print ' | '; - } - - if (!empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { - $coldisplay++; - $upinctax = isset($line->pu_ttc) ? $line->pu_ttc : null; - if (getDolGlobalInt('MAIN_UNIT_PRICE_WITH_TAX_IS_FOR_ALL_TAXES')) { - $upinctax = price2num($line->total_ttc / $line->qty, 'MU'); - } - print ' | fk_prev_id != null) print ' readonly'; @@ -244 +172 @@ - // I comment warning of stock because it shows the info even when it should not. + // I comment this because it shows info even when not required @@ -248,4 +176,2 @@ - print 'fk_prev_id != null) print ' readonly'; @@ -259,13 +185,3 @@ - if (getDolGlobalString('PRODUCT_USE_UNITS')) { - $unit_type = false; - // limit unit select to unit type - if (!empty($line->fk_unit) && !getDolGlobalString('MAIN_EDIT_LINE_ALLOW_ALL_UNIT_TYPE')) { - include_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php'; - $cUnit = new CUnits($line->db); - if ($cUnit->fetch($line->fk_unit) > 0) { - if (!empty($cUnit->unit_type)) { - $unit_type = $cUnit->unit_type; - } - } - } - $coldisplay++; + if ($conf->global->PRODUCT_USE_UNITS) + { + $coldisplay++; @@ -273 +189 @@ - print $form->selectUnits(GETPOSTISSET('units') ? GETPOST('units') : $line->fk_unit, "units", 0, $unit_type); + print $form->selectUnits($line->fk_unit, "units"); @@ -278,4 +194,2 @@ - | - + remise_percent ? $line->remise_percent : '')).'"'; - if ($situationinvoicelinewithparent) { - print ' readonly'; - } - print '>%'; + print 'fk_prev_id != null) print ' readonly'; + print '>%'; @@ -292 +203,0 @@ - @@ -294,2 +205 @@ - // Progession for situation invoices - if ($object->situation_cycle_ref) { + if ($this->situation_cycle_ref) { @@ -297 +207 @@ - print ' | % | '; + print '% | '; @@ -301,5 +211,7 @@ - - if (!empty($usemargins)) { - if ($user->hasRight('margins', 'creer')) { - $coldisplay++; ?> -+ if (!empty($usemargins)) + { + if (!empty($user->rights->margins->creer)) + { + $coldisplay++; + ?> + | @@ -307 +219 @@ - + product->enabled) || !empty($conf->service->enabled)) { ?> @@ -311 +223 @@ - + @@ -313,6 +225,6 @@ - hasRight('margins', 'creer')) { - if (getDolGlobalString('DISPLAY_MARGIN_RATES')) { - $margin_rate = (GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx))); + rights->margins->creer) { + if (!empty($conf->global->DISPLAY_MARGIN_RATES)) + { + $margin_rate = (isset($_POST["np_marginRate"]) ?GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx))); @@ -320,5 +232,4 @@ - if ($line->subprice < 0) { - echo ' | '.$margin_rate.' | '; - } else { - echo ''; - } + if ($line->subprice < 0) + echo ' | '.$margin_rate.'% | '; + else + echo '% | '; @@ -327,2 +238,3 @@ - if (getDolGlobalString('DISPLAY_MARK_RATES')) { - $mark_rate = (GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx)); + elseif (!empty($conf->global->DISPLAY_MARK_RATES)) + { + $mark_rate = (isset($_POST["np_markRate"]) ?GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx)); @@ -330,5 +242,4 @@ - if ($line->subprice < 0) { - echo ''.$mark_rate.' | '; - } else { - echo ''; - } + if ($line->subprice < 0) + echo ' | '.$mark_rate.'% | '; + else + echo '% | '; @@ -343,2 +254,2 @@ - ">trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?> + | trans('ServiceLimitedDuration').' '.$langs->trans('From').' '; ?>
@@ -359 +278 @@
- print '';
- if (GETPOST('mode', 'aZ09') == 'vatforalllines') {
- print ' ';
- print $form->load_tva('vatforalllines', '', $mysoc, $object->thirdparty, 0, 0, '', false, 1);
- print '';
- print ' ';
- }
-}
-print '';
+print ' | '.$langs->trans('VAT').' | '; @@ -88 +65 @@ -print ''.$langs->trans('PriceUHT').' | '; +print ''.$langs->trans('PriceUHT').' | '; @@ -91,3 +68 @@ -if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { - print ''.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).' | '; -} +if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print ''.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).' | '; @@ -95,3 +70 @@ -if (!empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { - print ''.$langs->trans('PriceUTTC').' | '; -} +if ($inputalsopricewithtax) print ''.$langs->trans('PriceUTTC').' | '; @@ -100 +73 @@ -print ''.$langs->trans('Qty').' | '; +print ''.$langs->trans('Qty').' | '; @@ -102,3 +75,3 @@ -// Unit -if (getDolGlobalString('PRODUCT_USE_UNITS')) { - print ''.$langs->trans('Unit').' | '; +if ($conf->global->PRODUCT_USE_UNITS) +{ + print ''.$langs->trans('Unit').' | '; @@ -108,18 +81 @@ -print '';
-print $langs->trans('ReductionShort');
-
-if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT) {
- global $mysoc;
-
- if (empty($disableedit) && GETPOST('mode', 'aZ09') != 'remiseforalllines') {
- print 'id.'">'.img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft cursorpointer"').'';
- }
- //print '';
- if (GETPOST('mode', 'aZ09') == 'remiseforalllines') {
- print ' ';
- print '';
- print '';
- print ' ';
- }
-}
-print ' | ';
+print ''.$langs->trans('ReductionShort').' | '; @@ -128,3 +84,3 @@ -if (isset($this->situation_cycle_ref) && $this->situation_cycle_ref) { - print ''.$langs->trans('Progress').' | '; - print ''.$form->textwithpicto($langs->trans('TotalHT100Short'), $langs->trans('UnitPriceXQtyLessDiscount')).' | '; +if ($this->situation_cycle_ref) { + print ''.$langs->trans('Progress').' | '; + print ''.$form->textwithpicto($langs->trans('TotalHT100Short'), $langs->trans('UnitPriceXQtyLessDiscount')).' | '; @@ -133,5 +89,6 @@ -// Purchase price -if ($usemargins && isModEnabled('margin') && empty($user->socid)) { - if ($user->hasRight('margins', 'creer')) { - if (getDolGlobalString('MARGIN_TYPE') == "1") { - print ''.$langs->trans('BuyingPrice').' | '; +if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid)) +{ + if (!empty($user->rights->margins->creer)) + { + if ($conf->global->MARGIN_TYPE == "1") { + print ''.$langs->trans('BuyingPrice').' | '; @@ -139 +96 @@ - print ''.$langs->trans('CostPrice').' | '; + print ''.$langs->trans('CostPrice').' | '; @@ -143,12 +100,2 @@ - if (getDolGlobalString('DISPLAY_MARGIN_RATES') && $user->hasRight('margins', 'liretous')) { - print ''.$langs->trans('MarginRate');
- if ($user->hasRight("propal", "creer")) {
- print 'id.'">'.img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickmarginforalllines opacitymedium paddingleft cursorpointer"').'';
- if (GETPOST('mode', 'aZ09') == 'marginforalllines') {
- print ' ';
- print '';
- print '';
- print ' ';
- }
- }
- print ' | ';
+ if (!empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) {
+ print ''.$langs->trans('MarginRate').' | '; @@ -156,2 +103,2 @@ - if (getDolGlobalString('DISPLAY_MARK_RATES') && $user->hasRight('margins', 'liretous')) { - print ''.$langs->trans('MarkRate').' | '; + if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) { + print ''.$langs->trans('MarkRate').' | '; @@ -162 +109 @@ -print ''.$langs->trans('TotalHTShort').' | '; +print ''.$langs->trans('TotalHTShort').' | '; @@ -165,3 +112 @@ -if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { - print ''.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).' | '; -} +if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print ''.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).' | '; @@ -169,3 +114 @@ -if ($outputalsopricetotalwithtax) { - print ''.$langs->trans('TotalTTCShort').' | '; -} +if ($outputalsopricetotalwithtax) print ''.$langs->trans('TotalTTCShort').' | '; @@ -173,3 +116 @@ -if (isModEnabled('asset') && $object->element == 'invoice_supplier') { - print ''; -} +print ' | '; // No width to allow autodim @@ -177 +118 @@ -print ' | '; // No width to allow autodim +print ' | '; @@ -179 +120 @@ -print ' | '; +print ' | '; @@ -181,4 +122,3 @@ -print ' | '; - -if ($action == 'selectlines') { - print ' | '; +if ($action == 'selectlines') +{ + print ' | '; @@ -187 +127 @@ - print ''; + print ' | '; --- /tmp/dsg/dolibarr/htdocs/core/tpl/github_19.0.3_objectline_view.tpl.php +++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_objectline_view.tpl.php @@ -9 +8,0 @@ - * Copyright (C) 2022 OpenDSI+global->MAIN_VIEW_LINE_NUMBER)) { ?> + | @@ -94 +76 @@ - print ''; + print ''; @@ -97,7 +79,3 @@ - if ($line->description == '(DEPOSIT)') { - $txt = $langs->trans("Deposit"); - } elseif ($line->description == '(EXCESS RECEIVED)') { - $txt = $langs->trans("ExcessReceived"); - } elseif ($line->description == '(EXCESS PAID)') { - $txt = $langs->trans("ExcessPaid"); - } + if ($line->description == '(DEPOSIT)') $txt = $langs->trans("Deposit"); + elseif ($line->description == '(EXCESS RECEIVED)') $txt = $langs->trans("ExcessReceived"); + elseif ($line->description == '(EXCESS PAID)') $txt = $langs->trans("ExcessPaid"); @@ -107,3 +85,4 @@ - if ($line->description) { - if ($line->description == '(CREDIT_NOTE)' && $line->fk_remise_except > 0) { - include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; + if ($line->description) + { + if ($line->description == '(CREDIT_NOTE)' && $line->fk_remise_except > 0) + { @@ -112,3 +91,4 @@ - print($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0)); - } elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0) { - include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; + print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0)); + } + elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0) + { @@ -117 +97 @@ - print($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0)); + print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0)); @@ -119,5 +99,5 @@ - if (getDolGlobalString('INVOICE_ADD_DEPOSIT_DATE')) { - print ' ('.dol_print_date($discount->datec).')'; - } - } elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0) { - include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; + if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) + print ' ('.dol_print_date($discount->datec).')'; + } + elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0) + { @@ -126,3 +106,4 @@ - print($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0)); - } elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0) { - include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; + print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0)); + } + elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0) + { @@ -131,18 +112,18 @@ - print($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0)); - } else { - print($txt ? ' - ' : '').dol_htmlentitiesbr($line->description); - } - } -} else { - $format = (getDolGlobalString('MAIN_USE_HOURMIN_IN_DATE_RANGE') ? 'dayhour' : 'day'); - - if ($line->fk_product > 0) { - if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) { - print (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow') : '') . $text; - if (!getDolGlobalInt('PRODUIT_DESC_IN_FORM')) { - print $form->textwithpicto('', $description); - } - } else { - print $form->textwithtooltip($text, $description, 3, 0, '', $i, 0, (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow') : '')); - } - } else { + print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0)); + } + else + { + print ($txt ? ' - ' : '').dol_htmlentitiesbr($line->description); + } + } +} +else +{ + $format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE ? 'dayhour' : 'day'; + + if ($line->fk_product > 0) + { + print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : '')); + } + else + { @@ -150,5 +131,2 @@ - if ($type == 1) { - $text = img_object($langs->trans('Service'), 'service'); - } else { - $text = img_object($langs->trans('Product'), 'product'); - } + if ($type == 1) $text = img_object($langs->trans('Service'), 'service'); + else $text = img_object($langs->trans('Product'), 'product'); @@ -158 +136 @@ - print $form->textwithtooltip($text, dol_htmlentitiesbr($line->description), 3, 0, '', $i, 0, (!empty($line->fk_parent_line) ? img_picto('', 'rightarrow') : '')); + print $form->textwithtooltip($text, dol_htmlentitiesbr($line->description), 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : '')); @@ -160,3 +138 @@ - if (!empty($line->fk_parent_line)) { - print img_picto('', 'rightarrow'); - } + if (!empty($line->fk_parent_line)) print img_picto('', 'rightarrow'); @@ -166 +142,2 @@ - } else { + } + else { @@ -173,48 +150,10 @@ - if ($line->element == 'facturedetrec' || $line->element == 'invoice_supplier_det_rec') { - if ($line->element == 'invoice_supplier_det_rec' && $line->product_type != Product::TYPE_PRODUCT) { - $line->date_start_fill = $line->date_start; - $line->date_end_fill = $line->date_end; - } - if ($line->date_start_fill || $line->date_end_fill) { - print ' | subprice); ?> | - -multicurrency_code != $conf->currency) { ?> -multicurrency_subprice); ?> | +subprice); ?> | + +multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { ?> +multicurrency_subprice); ?> | @@ -335,8 +219,2 @@ -if (!empty($inputalsopricewithtax) && !getDolGlobalInt('MAIN_NO_INPUT_PRICE_WITH_TAX')) { ?> -pu_ttc) ? $line->pu_ttc : null; - if (getDolGlobalInt('MAIN_UNIT_PRICE_WITH_TAX_IS_FOR_ALL_TAXES')) { - $upinctax = price2num($line->total_ttc / $line->qty, 'MU'); - } - print(isset($upinctax) ? price($sign * $upinctax) : price($sign * $line->subprice)); - ?> | +if ($inputalsopricewithtax) { ?> +pu_ttc) ?price($line->pu_ttc) : price($line->subprice)); ?> | @@ -345 +223 @@ -+ | @@ -348 +226 @@ - // I comment this because it shows info even when not required + // I comment this because it shows info even when not required @@ -353,3 +231 @@ -} else { - print ' '; -} +} else print ' '; @@ -358 +234,2 @@ -if (getDolGlobalString('PRODUCT_USE_UNITS')) { +if ($conf->global->PRODUCT_USE_UNITS) +{ @@ -378,2 +255,3 @@ -if (isset($this->situation_cycle_ref) && $this->situation_cycle_ref) { - include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; +if ($this->situation_cycle_ref) +{ + include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; @@ -385,5 +263,6 @@ - print ' | '.price($sign * $tmp[0]).' | '; -} - -if ($usemargins && isModEnabled('margin') && empty($user->socid)) { - if ($user->hasRight('margins', 'creer')) { ?> + print ''.price($tmp[0]).' | '; +} + +if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid)) +{ + if (!empty($user->rights->margins->creer)) { ?> @@ -392,2 +271,2 @@ - if (getDolGlobalString('DISPLAY_MARGIN_RATES') && $user->hasRight('margins', 'liretous')) { ?> -pa_ht == 0) ? 'n/a' : price(price2num($line->marge_tx, 'MT')).'%'); ?> | + if (!empty($conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) { ?> +pa_ht == 0) ? 'n/a' : price(price2num($line->marge_tx, 'MT')).'%'); ?> | @@ -395,6 +274,4 @@ - if (getDolGlobalString('DISPLAY_MARK_RATES') && $user->hasRight('margins', 'liretous')) {?> -marque_tx, 'MT')).'%'; ?> | - global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?> +marque_tx, 'MT')).'%'; ?> | + total_ht); - print $tooltiponpriceend; - print ''; - if (isModEnabled("multicurrency") && $this->multicurrency_code != $conf->currency) { - print ''.price($sign * $line->multicurrency_total_ht).' | '; - $coldisplay++; - } -} - -// Price inc tax -if ($outputalsopricetotalwithtax) { - print ''.price($sign * $line->total_ttc).' | '; - $coldisplay++; -} - -if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlines') { - $situationinvoicelinewithparent = 0; - if (isset($line->fk_prev_id) && in_array($object->element, array('facture', 'facturedet'))) { - if ($object->type == $object::TYPE_SITUATION) { // The constant TYPE_SITUATION exists only for object invoice - // Set constant to disallow editing during a situation cycle - $situationinvoicelinewithparent = 1; - } - } - - // Asset info - if (isModEnabled('asset') && $object->element == 'invoice_supplier') { - print '';
- $coldisplay++;
- if (!empty($product_static->accountancy_code_buy) ||
- !empty($product_static->accountancy_code_buy_intra) ||
- !empty($product_static->accountancy_code_buy_export)
- ) {
- $accountancy_category_asset = $conf->global->ASSET_ACCOUNTANCY_CATEGORY;
- $filters = array();
- if (!empty($product_static->accountancy_code_buy)) {
- $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy) . "'";
- }
- if (!empty($product_static->accountancy_code_buy_intra)) {
- $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_intra) . "'";
- }
- if (!empty($product_static->accountancy_code_buy_export)) {
- $filters[] = "account_number = '" . $this->db->escape($product_static->accountancy_code_buy_export) . "'";
- }
- $sql = "SELECT COUNT(*) AS found";
- $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account";
- $sql .= " WHERE pcg_type = '" . $this->db->escape($conf->global->ASSET_ACCOUNTANCY_CATEGORY) . "'";
- $sql .= " AND (" . implode(' OR ', $filters). ")";
- $resql_asset = $this->db->query($sql);
- if (!$resql_asset) {
- print 'Error SQL: ' . $this->db->lasterror();
- } elseif ($obj = $this->db->fetch_object($resql_asset)) {
- if (!empty($obj->found)) {
- print '';
- print img_edit_add() . '';
+ if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+ {
+ $tooltiponprice = $langs->transcountry("TotalHT", $mysoc->country_code).'='.price($line->total_ht);
+ $tooltiponprice .= ' '.$langs->transcountry("TotalVAT", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_tva); + if (!$senderissupplier && is_object($object->thirdparty)) { + if ($mysoc->useLocalTax(1)) { + if (($mysoc->country_code == $object->thirdparty->country_code) || $object->thirdparty->useLocalTax(1)) { + $tooltiponprice .= ' '.$langs->transcountry("TotalLT1", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_localtax1); + } else { + $tooltiponprice .= ' '.$langs->transcountry("TotalLT1", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.$langs->trans("NotUsedForThisCustomer").''; @@ -463,5 +295,29 @@ - } - print ' | ';
- }
-
- // Edit picto
+ if ($mysoc->useLocalTax(2)) {
+ if (($mysoc->country_code == $object->thirdparty->country_code) || $object->thirdparty->useLocalTax(2)) {
+ $tooltiponprice .= ''.price($line->multicurrency_total_ht).' | '; + $coldisplay++; + } +} +if ($outputalsopricetotalwithtax) { + print ''.price($line->total_ttc).' | '; + $coldisplay++; +} + +if ($this->statut == 0 && ($object_rights->creer) && $action != 'selectlines') { @@ -472 +328 @@ - id; ?>"> + id.'#line_'.$line->id; ?>"> @@ -477 +332,0 @@ - // Delete picto @@ -480,2 +335,2 @@ - if (!$situationinvoicelinewithparent && empty($disableremove)) { // For situation invoice, deletion is not possible if there is a parent company. - print 'id.'">'; + if (($line->fk_prev_id == null) && empty($disableremove)) { //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation + print 'id.'">'; @@ -487,2 +342 @@ - // Move up-down picto - if ($num > 1 && $conf->browser->layout != 'phone' && ((property_exists($this, 'situation_counter') && $this->situation_counter == 1) || empty($this->situation_cycle_ref)) && empty($disablemove)) { + if ($num > 1 && $conf->browser->layout != 'phone' && ($this->situation_counter == 1 || !$this->situation_cycle_ref) && empty($disablemove)) { @@ -492 +346 @@ - id; ?>"> + id; ?>"> @@ -497 +351 @@ - id; ?>"> + id; ?>"> @@ -502 +356 @@ - } else { + } else { @@ -507,6 +361,2 @@ - $colspan = 3; - if (isModEnabled('asset') && $object->element == 'invoice_supplier') { - $colspan++; - } - print ''; - $coldisplay = $coldisplay + $colspan; + print ' | '; + $coldisplay = $coldisplay + 3; @@ -520,0 +371,6 @@ +//Line extrafield +if (!empty($extrafields)) +{ + print $line->showOptionals($extrafields, 'view', array('style'=>'class="drag drop oddeven"', 'colspan'=>$coldisplay), '', '', 1); +} + --- /tmp/dsg/dolibarr/htdocs/core/tpl/github_19.0.3_onlinepaymentlinks.tpl.php +++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_onlinepaymentlinks.tpl.php @@ -19 +19,2 @@ -if (empty($conf) || !is_object($conf)) { +if (empty($conf) || !is_object($conf)) +{ @@ -30 +31 @@ -print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount", $servicename).': |
| '.$this->tpl['label'].' | '; -print ''.$this->tpl['description'].' | '; -print ''.$this->tpl['vat_rate'].' | '; -print ''.$this->tpl['price'].' | '; -if (isModEnabled("multicurrency")) { - print ''.$this->tpl['multicurrency_price'].' | '; -} +print '|||||||
| '.$this->tpl['label'].' | '; +print ''.$this->tpl['description'].' | '; +print ''.$this->tpl['vat_rate'].' | '; +print ''.$this->tpl['price'].' | '; +if (!empty($conf->multicurrency->enabled)) + print ''.$this->tpl['multicurrency_price'].' | '; @@ -39,4 +38,3 @@ -print ''.$this->tpl['qty'].' | '; -if (getDolGlobalString('PRODUCT_USE_UNITS')) { - print ''.$langs->trans($this->tpl['unit']).' | '; -} +print ''.$this->tpl['qty'].' | '; +if ($conf->global->PRODUCT_USE_UNITS) + print ''.$langs->trans($this->tpl['unit']).' | '; @@ -44,2 +42 @@ -print ''.$this->tpl['remise_percent'].' | '; -print ''.$this->tpl['total_ht'].' | '; +print ''.$this->tpl['remise_percent'].' | '; @@ -48,3 +45 @@ -if (!empty($selectedLines) && !in_array($this->tpl['id'], $selectedLines)) { - $selected = 0; -} +if (!empty($selectedLines) && !in_array($this->tpl['id'], $selectedLines)) $selected = 0; --- /tmp/dsg/dolibarr/htdocs/core/tpl/github_19.0.3_passwordforgotten.tpl.php +++ /tmp/dsg/dolibarr/htdocs/core/tpl/client_passwordforgotten.tpl.php @@ -19,4 +18,0 @@ -if (!defined('NOBROWSERNOTIF')) { - define('NOBROWSERNOTIF', 1); -} - @@ -24 +20,2 @@ -if (empty($conf) || !is_object($conf)) { +if (empty($conf) || !is_object($conf)) +{ @@ -29,6 +25,0 @@ -// DDOS protection -$size = (int) ($_SERVER['CONTENT_LENGTH'] ?? 0); -if ($size > 10000) { - $langs->loadLangs(array("errors", "install")); - httponly_accessforbidden('