'."\n";
diff --git a/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.sql b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.sql
index 0470739573a..b380b1280f2 100644
--- a/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.sql
+++ b/htdocs/modulebuilder/template/sql/llx_mymodule_myobject.sql
@@ -22,7 +22,7 @@ CREATE TABLE llx_mymodule_myobject(
qty INTEGER,
status INTEGER,
date_creation DATETIME NOT NULL,
- tms TIMESTAMP NOT NULL,
+ tms TIMESTAMP,
import_key VARCHAR(14)
-- END MODULEBUILDER FIELDS
) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 92171ba7188..025f7099577 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -243,18 +243,7 @@ print '
';
print '
';
$newcardbutton='';
-if (! empty($user->rights->opensurvey->write))
-{
- $newcardbutton='
'.$langs->trans('NewSurvey').'';
- $newcardbutton.= '';
- $newcardbutton.= '';
-}
-else
-{
- $newcardbutton='
'.$langs->trans('NewSurvey').'';
- $newcardbutton.= '';
- $newcardbutton.= '';
-}
+$newcardbutton.= dolGetButtonTitle($langs->trans('NewSurvey'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/opensurvey/wizard/index.php', '', $user->rights->opensurvey->write);
print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton, '', $limit);
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 0d6a0f05174..28b3c06ffa1 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -174,14 +174,8 @@ if ($id > 0 || $ref)
$morehtmlcenter='';
if (! empty($conf->agenda->enabled))
{
- if (! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create))
- {
- $morehtmlcenter.='
'.$langs->trans("AddAction").'';
- }
- else
- {
- $morehtmlcenter.='
'.$langs->trans("AddAction").'';
- }
+ $linktocreatetimeBtnStatus = ! empty($user->rights->agenda->myactions->create) || ! empty($user->rights->agenda->allactions->create);
+ $morehtmlcenter = dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out, '', $linktocreatetimeBtnStatus);
}
if (! empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read) ))
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 3796f5b022e..de0d28cee83 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4155,6 +4155,8 @@ class Product extends CommonObject
// phpcs:enable
global $conf, $langs;
+ $labelstatut = $labelstatutShort = '';
+
$langs->load('products');
if (! empty($conf->productbatch->enabled)) { $langs->load("productbatch");
}
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 07827094394..688fef19654 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -452,10 +452,8 @@ if ($resql)
{
$label='NewProduct';
if($type == Product::TYPE_SERVICE) $label='NewService';
- $newcardbutton='
'.$langs->trans($label).'';
- $newcardbutton.= '';
- $newcardbutton.= '';
- }
+ $newcardbutton.= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&type='.$type);
+ }
print '
';
- print '| '.$form->editfieldkey('Supplier', 'fournisseur', '', $object, 0, 'string', '', 1).' | ';
+ print ' | '.$form->editfieldkey('Vendor', 'fournisseur', '', $object, 0, 'string', '', 1).' | ';
$default = -1;
if (! empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)) $default=1;
print $form->selectyesno("fournisseur", (GETPOST('fournisseur', 'int')!=''?GETPOST('fournisseur', 'int'):(GETPOST("type", 'alpha') == '' ? $default : $object->fournisseur)), 1, 0, (GETPOST("type", 'alpha') == '' ? 1 : 0));
@@ -2709,9 +2709,7 @@ else
$MAXEVENT = 10;
- $morehtmlright = '';
- $morehtmlright.= $langs->trans("SeeAll");
- $morehtmlright.= '';
+ $morehtmlright.= dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
// List of actions on element
include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 42584c5621b..13f179b99cc 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -581,9 +581,7 @@ if ($user->rights->societe->creer && $contextpage != 'poslist')
if($type == 'f') $label='NewSupplier';
}
- $newcardbutton = ''.$langs->trans($label).'';
- $newcardbutton.= '';
- $newcardbutton.= '';
+ $newcardbutton.= dolGetButtonTitle($langs->trans($label), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/societe/card.php?action=create'.$typefilter);
}
print ' | ';
print '';
if ($src->object=='card')
@@ -1040,6 +1082,34 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
}
else print img_warning().' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'';
}
+ elseif ($src->object=='payment_method' && $src->type=='card')
+ {
+ print $src->billing_details->name.'
....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
+ print ' | ';
+
+ if ($src->card->country)
+ {
+ $img=picto_from_langcode($src->card->country);
+ print $img?$img.' ':'';
+ print getCountry($src->card->country, 1);
+ }
+ else print img_warning().' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'';
+ }
+ elseif ($src->object=='payment_method' && $src->type=='sepa_debit')
+ {
+ print 'info sepa';
+ print ' | ';
+ if ($src->sepa_debit->country)
+ {
+ $img=picto_from_langcode($src->sepa_debit->country);
+ print $img?$img.' ':'';
+ print getCountry($src->sepa_debit->country, 1);
+ }
+ else print img_warning().' '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'';
+ }
+ else {
+ print ' | ';
+ }
print ' | ';
// Default
print '';
@@ -1080,7 +1150,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
if ($nbremote == 0 && $nblocal == 0)
{
- print ' |