From 2df9df2db031018ead4d14710ab6b0e77bee760d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Dec 2019 12:24:27 +0100 Subject: [PATCH] Debug v11 --- htdocs/core/class/html.formother.class.php | 24 ++++++++--- htdocs/core/commonfieldsinexport.inc.php | 2 + htdocs/core/lib/functions.lib.php | 42 +++++++++---------- htdocs/core/modules/modFacture.class.php | 6 ++- htdocs/exports/class/export.class.php | 11 +++-- htdocs/exports/export.php | 33 +++++++++++---- htdocs/imports/import.php | 23 ++++------ htdocs/langs/en_US/bills.lang | 2 + htdocs/langs/en_US/cashdesk.lang | 2 + .../core/modules/modMyModule.class.php | 5 ++- htdocs/theme/eldy/global.inc.php | 3 ++ htdocs/theme/md/style.css.php | 3 ++ 12 files changed, 101 insertions(+), 55 deletions(-) diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index e5b3f8fbb6e..ee8ca51ac90 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -71,7 +71,9 @@ class FormOther public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null) { // phpcs:enable - $sql = "SELECT rowid, label"; + global $conf, $langs, $user; + + $sql = "SELECT rowid, label, fk_user"; $sql .= " FROM ".MAIN_DB_PREFIX."export_model"; $sql .= " WHERE type = '".$type."'"; if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model @@ -79,7 +81,7 @@ class FormOther $result = $this->db->query($sql); if ($result) { - print ''; if ($useempty) { print ''; @@ -90,19 +92,28 @@ class FormOther while ($i < $num) { $obj = $this->db->fetch_object($result); + + $label = $obj->label; + if (! empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) { + $tmpuser = new User($this->db); + $tmpuser->fetch($obj->fk_user); + $label .= ' ('.$tmpuser->getFullName($langs).')'; + } + if ($selected == $obj->rowid) { - print ''; $i++; } print ""; + print ajax_combobox($htmlname); } else { dol_print_error($this->db); @@ -130,7 +141,7 @@ class FormOther $result = $this->db->query($sql); if ($result) { - print ''; if ($useempty) { print ''; @@ -154,6 +165,7 @@ class FormOther $i++; } print ""; + print ajax_combobox($htmlname); } else { dol_print_error($this->db); diff --git a/htdocs/core/commonfieldsinexport.inc.php b/htdocs/core/commonfieldsinexport.inc.php index d68954fc568..034fbcd4679 100644 --- a/htdocs/core/commonfieldsinexport.inc.php +++ b/htdocs/core/commonfieldsinexport.inc.php @@ -47,10 +47,12 @@ if (class_exists($keyforclass)) * break; */ } + $helpfield=preg_replace('/\(.*$/', '', $valuefield['help']); if ($valuefield['enabled']) { $this->export_fields_array[$r][$fieldname] = $fieldlabel; $this->export_TypeFields_array[$r][$fieldname] = $typeFilter; $this->export_entities_array[$r][$fieldname] = $keyforelement; + $this->export_help_array[$r][$fieldname] = $helpfield; } } } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 1e6e8d2fc41..4e6a5b6b48a 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3349,7 +3349,7 @@ function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0 */ function img_action($titlealt, $numaction) { - global $conf, $langs; + global $langs; if (empty($titlealt) || $titlealt == 'default') { @@ -3374,7 +3374,7 @@ function img_action($titlealt, $numaction) */ function img_pdf($titlealt = 'default', $size = 3) { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Show'); @@ -3390,7 +3390,7 @@ function img_pdf($titlealt = 'default', $size = 3) */ function img_edit_add($titlealt = 'default', $other = '') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Add'); @@ -3405,7 +3405,7 @@ function img_edit_add($titlealt = 'default', $other = '') */ function img_edit_remove($titlealt = 'default', $other = '') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Remove'); @@ -3422,7 +3422,7 @@ function img_edit_remove($titlealt = 'default', $other = '') */ function img_edit($titlealt = 'default', $float = 0, $other = '') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Modify'); @@ -3439,7 +3439,7 @@ function img_edit($titlealt = 'default', $float = 0, $other = '') */ function img_view($titlealt = 'default', $float = 0, $other = '') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('View'); @@ -3457,7 +3457,7 @@ function img_view($titlealt = 'default', $float = 0, $other = '') */ function img_delete($titlealt = 'default', $other = 'class="pictodelete"') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Delete'); @@ -3474,7 +3474,7 @@ function img_delete($titlealt = 'default', $other = 'class="pictodelete"') */ function img_printer($titlealt = "default", $other = '') { - global $conf, $langs; + global $langs; if ($titlealt == "default") $titlealt = $langs->trans("Print"); return img_picto($titlealt, 'printer.png', $other); } @@ -3488,7 +3488,7 @@ function img_printer($titlealt = "default", $other = '') */ function img_split($titlealt = 'default', $other = 'class="pictosplit"') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Split'); @@ -3504,7 +3504,7 @@ function img_split($titlealt = 'default', $other = 'class="pictosplit"') */ function img_help($usehelpcursor = 1, $usealttitle = 1) { - global $conf, $langs; + global $langs; if ($usealttitle) { @@ -3523,7 +3523,7 @@ function img_help($usehelpcursor = 1, $usealttitle = 1) */ function img_info($titlealt = 'default') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Informations'); @@ -3540,7 +3540,7 @@ function img_info($titlealt = 'default') */ function img_warning($titlealt = 'default', $moreatt = '', $morecss = 'pictowarning') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Warning'); @@ -3556,11 +3556,11 @@ function img_warning($titlealt = 'default', $moreatt = '', $morecss = 'pictowarn */ function img_error($titlealt = 'default') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Error'); - return img_picto($titlealt, 'error.png', 'class="valigntextbottom"'); + return img_picto($titlealt, 'error.png'); } /** @@ -3572,7 +3572,7 @@ function img_error($titlealt = 'default') */ function img_next($titlealt = 'default', $moreatt = '') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Next'); @@ -3589,7 +3589,7 @@ function img_next($titlealt = 'default', $moreatt = '') */ function img_previous($titlealt = 'default', $moreatt = '') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Previous'); @@ -3607,7 +3607,7 @@ function img_previous($titlealt = 'default', $moreatt = '') */ function img_down($titlealt = 'default', $selected = 0, $moreclass = '') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Down'); @@ -3624,7 +3624,7 @@ function img_down($titlealt = 'default', $selected = 0, $moreclass = '') */ function img_up($titlealt = 'default', $selected = 0, $moreclass = '') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Up'); @@ -3641,7 +3641,7 @@ function img_up($titlealt = 'default', $selected = 0, $moreclass = '') */ function img_left($titlealt = 'default', $selected = 0, $moreatt = '') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Left'); @@ -3658,7 +3658,7 @@ function img_left($titlealt = 'default', $selected = 0, $moreatt = '') */ function img_right($titlealt = 'default', $selected = 0, $moreatt = '') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Right'); @@ -3674,7 +3674,7 @@ function img_right($titlealt = 'default', $selected = 0, $moreatt = '') */ function img_allow($allow, $titlealt = 'default') { - global $conf, $langs; + global $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Active'); diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php index 01c80265e46..b0f7dd94ae8 100644 --- a/htdocs/core/modules/modFacture.class.php +++ b/htdocs/core/modules/modFacture.class.php @@ -216,7 +216,7 @@ class modFacture extends DolibarrModules 's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra', 'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_client'=>'RefCustomer', 'f.type'=>"Type", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateDue", 'f.total'=>"TotalHT", - 'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'f.localtax1'=>'LocalTax1', 'f.localtax2'=>'LocalTax2', 'none.rest'=>'Rest', 'f.paye'=>"InvoicePaid", 'f.fk_statut'=>'InvoiceStatus', + 'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'f.localtax1'=>'LocalTax1', 'f.localtax2'=>'LocalTax2', 'none.rest'=>'Rest', 'f.paye'=>"InvoicePaidCompletely", 'f.fk_statut'=>'InvoiceStatus', 'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic", 'f.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin', 'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'pj.title'=>'ProjectLabel', 'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription", 'fd.subprice'=>"LineUnitPrice", 'fd.tva_tx'=>"LineVATRate", 'fd.qty'=>"LineQty", 'fd.total_ht'=>"LineTotalHT", 'fd.total_tva'=>"LineTotalVAT", @@ -300,12 +300,13 @@ class modFacture extends DolibarrModules 's.code_compta_fournisseur'=>'SupplierAccountancyCode', 's.tva_intra'=>'VATIntra', 'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_client'=>'RefCustomer', 'f.type'=>"Type", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateDue", 'f.total'=>"TotalHT", - 'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'f.localtax1'=>'LocalTax1', 'f.localtax2'=>'LocalTax2', 'none.rest'=>'Rest', 'f.paye'=>"InvoicePaid", 'f.fk_statut'=>'InvoiceStatus', + 'f.total_ttc'=>"TotalTTC", 'f.tva'=>"TotalVAT", 'f.localtax1'=>'LocalTax1', 'f.localtax2'=>'LocalTax2', 'none.rest'=>'Rest', 'f.paye'=>"InvoicePaidCompletely", 'f.fk_statut'=>'InvoiceStatus', 'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic", 'f.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin', 'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'pj.title'=>'ProjectLabel', 'p.rowid'=>'PaymentId', 'p.ref'=>'PaymentRef', 'p.amount'=>'AmountPayment', 'pf.amount'=>'AmountPaymentDistributedOnInvoice', 'p.datep'=>'DatePayment', 'p.num_paiement'=>'PaymentNumber', 'pt.code'=>'CodePaymentMode', 'pt.libelle'=>'LabelPaymentMode', 'p.note'=>'PaymentNote', 'p.fk_bank'=>'IdTransaction', 'ba.ref'=>'AccountRef' ); + $this->export_help_array[$r] = array('f.paye'=>'InvoicePaidCompletelyHelp'); if (! empty($conf->multicurrency->enabled)) { $this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency'; @@ -313,6 +314,7 @@ class modFacture extends DolibarrModules $this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT'; $this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT'; $this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC'; + $this->export_examplevalues_array[$r]['f.multicurrency_code'] = 'EUR'; } if (! empty($conf->cashdesk->enabled) || ! empty($conf->takepos->enabled) || ! empty($conf->global->INVOICE_SHOW_POS)) { diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index d6b6a8676ae..0274e493170 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -43,12 +43,13 @@ class Export public $array_export_sql_order=array(); // Tableau des "requetes sql" public $array_export_fields=array(); // Tableau des listes de champ+libelle a exporter - public $array_export_TypeFields=array(); // Tableau des listes de champ+Type de filtre - public $array_export_FilterValue=array(); // Tableau des listes de champ+Valeur a filtrer + public $array_export_TypeFields=array(); // Tableau des listes de champ+Type de filtre + public $array_export_FilterValue=array(); // Tableau des listes de champ+Valeur a filtrer public $array_export_entities=array(); // Tableau des listes de champ+alias a exporter public $array_export_dependencies=array(); // array of list of entities that must take care of the DISTINCT if a field is added into export - public $array_export_special=array(); // Tableau des operations speciales sur champ - public $array_export_examplevalues=array(); // array with examples + public $array_export_special=array(); // array of special operations to do on field + public $array_export_examplevalues=array(); // array with examples for fields + public $array_export_help=array(); // array with tooltip help for fields // To store export modules public $hexa; @@ -186,6 +187,8 @@ class Export $this->array_export_special[$i]=(! empty($module->export_special_array[$r])?$module->export_special_array[$r]:''); // Array of examples $this->array_export_examplevalues[$i]=$module->export_examplevalues_array[$r]; + // Array of help tooltips + $this->array_export_help[$i]=(! empty($module->export_help_array[$r])?$module->export_help_array[$r]:''); // Requete sql du dataset $this->array_export_sql_start[$i]=$module->export_sql_start[$r]; diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 166551fecb8..20ffcf221f3 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -543,8 +543,12 @@ if ($step == 2 && $datatoexport) print ''; print '
'; print ''.$langs->trans("SelectExportFields").' '; - if (empty($conf->global->EXPORTS_SHARE_MODELS))$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id); - else $htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1); + if (empty($conf->global->EXPORTS_SHARE_MODELS)) { + $htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id); + } + else { + $htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1); + } print ' '; print ''; print '
'; @@ -622,6 +626,10 @@ if ($step == 2 && $datatoexport) { $htmltext .= ''.$langs->trans("Type").': '.$objexport->array_export_TypeFields[0][$code].'
'; } + if (!empty($objexport->array_export_help[0][$code])) + { + $htmltext .= ''.$langs->trans("Help").': '.$langs->trans($objexport->array_export_help[0][$code]).'
'; + } if (isset($array_selected[$code]) && $array_selected[$code]) { @@ -808,11 +816,15 @@ if ($step == 3 && $datatoexport) } if (!empty($objexport->array_export_examplevalues[0][$code])) { - $htmltext .= $langs->trans("SourceExample").': '.$objexport->array_export_examplevalues[0][$code].'
'; + $htmltext .= ''.$langs->trans("SourceExample").': '.$objexport->array_export_examplevalues[0][$code].'
'; } if (!empty($objexport->array_export_TypeFields[0][$code])) { - $htmltext .= $langs->trans("Type").': '.$objexport->array_export_TypeFields[0][$code].'
'; + $htmltext .= ''.$langs->trans("Type").': '.$objexport->array_export_TypeFields[0][$code].'
'; + } + if (!empty($objexport->array_export_help[0][$code])) + { + $htmltext .= ''.$langs->trans("Help").': '.$langs->trans($objexport->array_export_help[0][$code]).'
'; } print ''; @@ -999,11 +1011,15 @@ if ($step == 4 && $datatoexport) } if (!empty($objexport->array_export_examplevalues[0][$code])) { - $htmltext .= $langs->trans("SourceExample").': '.$objexport->array_export_examplevalues[0][$code].'
'; + $htmltext .= ''.$langs->trans("SourceExample").': '.$objexport->array_export_examplevalues[0][$code].'
'; } if (!empty($objexport->array_export_TypeFields[0][$code])) { - $htmltext .= $langs->trans("Type").': '.$objexport->array_export_TypeFields[0][$code].'
'; + $htmltext .= ''.$langs->trans("Type").': '.$objexport->array_export_TypeFields[0][$code].'
'; + } + if (!empty($objexport->array_export_help[0][$code])) + { + $htmltext .= ''.$langs->trans("Help").': '.$langs->trans($objexport->array_export_help[0][$code]).'
'; } print ''; @@ -1047,7 +1063,10 @@ if ($step == 4 && $datatoexport) if (count($array_selected)) { print '
'; - print $langs->trans("SaveExportModel"); + + print '
'; + print ''.$langs->trans("SaveExportModel").''; + print '
'; print '
'; print ''; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index b5cdc05206d..606eddeeb20 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -519,14 +519,12 @@ if ($step == 3 && $datatoimport) print ''; print ''; - print '
'; - print ''.$langs->trans("InformationOnSourceFile").''; + print load_fiche_titre($langs->trans("InformationOnSourceFile"), '', ''); print '
'; print '
'; print ''; - //print ''; // Source file format print ''; @@ -798,13 +796,12 @@ if ($step == 4 && $datatoimport) print '
'.$langs->trans("InformationOnSourceFile").'
'.$langs->trans("SourceFileFormat").'
'; print '
'; - print '
'; - print ''.$langs->trans("InformationOnSourceFile").''; + print load_fiche_titre($langs->trans("InformationOnSourceFile"), '', ''); + print '
'; print '
'; print ''; - //print ''; // Source file format print ''; @@ -1273,13 +1270,12 @@ if ($step == 5 && $datatoimport) print '
'.$langs->trans("InformationOnSourceFile").'
'.$langs->trans("SourceFileFormat").'
'; print '
'; - print '
'; - print ''.$langs->trans("InformationOnSourceFile").''; + print load_fiche_titre($langs->trans("InformationOnSourceFile"), '', ''); + print '
'; print '
'; print ''; - //print ''; // Source file format print ''; @@ -1378,9 +1374,9 @@ if ($step == 5 && $datatoimport) print '
'.$langs->trans("InformationOnSourceFile").'
'.$langs->trans("SourceFileFormat").'
'; print '
'; - print '
'; - print ''.$langs->trans("InformationOnTargetTables").''; + print load_fiche_titre($langs->trans("InformationOnTargetTables"), '', ''); + print '
'; print '
'; @@ -1717,13 +1713,12 @@ if ($step == 6 && $datatoimport) print ''; print '
'; - print '
'; - print ''.$langs->trans("InformationOnSourceFile").''; + print load_fiche_titre($langs->trans("InformationOnSourceFile"), '', ''); + print '
'; print '
'; print ''; - //print ''; // Source file format print ''; diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index f7ed7bcade0..902790cc23a 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -334,6 +334,8 @@ InvoiceDateCreation=Invoice creation date InvoiceStatus=Invoice status InvoiceNote=Invoice note InvoicePaid=Invoice paid +InvoicePaidCompletely=Paid completely +InvoicePaidCompletelyHelp=Invoice that are paid completely. This excludes invoices that are paid partially. To get list of all 'Closed' or non 'Closed' invoices, prefer to use a filter on the invoice status. OrderBilled=Order billed DonationPaid=Donation paid PaymentNumber=Payment number diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 0516de208fc..e33d1112deb 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -69,6 +69,8 @@ Terminal=Terminal NumberOfTerminals=Number of Terminals TerminalSelect=Select terminal you want to use: POSTicket=POS Ticket +POSTerminal=POS Terminal +POSModule=POS Module BasicPhoneLayout=Use basic layout for phones SetupOfTerminalNotComplete=Setup of terminal %s is not complete DirectPayment=Direct payment diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php index 7cabc1415ef..79482128362 100644 --- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php +++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php @@ -342,7 +342,10 @@ class modMyModule extends DolibarrModules include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; //$keyforselect='myobjectline'; $keyforaliasextra='extraline'; $keyforelement='myobjectline'; //include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; - //$this->export_dependencies_array[$r]=array('myobjectline'=>array('tl.rowid','tl.ref')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields) + //$this->export_dependencies_array[$r] = array('myobjectline'=>array('tl.rowid','tl.ref')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields) + //$this->export_special_array[$r] = array('t.field'=>'...'); + //$this->export_examplevalues_array[$r] = array('t.field'=>'Example'); + //$this->export_help_array[$r] = array('t.field'=>'FieldDescHelp'); $this->export_sql_start[$r]='SELECT DISTINCT '; $this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'myobject as t'; //$this->export_sql_end[$r] =' LEFT JOIN '.MAIN_DB_PREFIX.'myobject_line as tl ON tl.fk_myobject = t.rowid'; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 9cd5a8efd3a..16902818146 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1408,6 +1408,9 @@ div.nopadding { /* vertical-align: text-bottom; */ color: ; } +.pictoerror { + color: ; +} .pictomodule { width: 14px; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 2df7fd86042..604bc743f93 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1613,6 +1613,9 @@ div.nopadding { /* vertical-align: text-bottom; */ color: ; } +.pictoerror { + color: ; +} .pictomodule { width: 14px; }
'.$langs->trans("InformationOnSourceFile").'
'.$langs->trans("SourceFileFormat").'