';
+ // TODO use dictionary definition for picto $dictsocialnetworks[$type]['icon']
$htmllink .= img_picto($langs->trans(dol_ucfirst($type)), $type.'.png', '', false, 0, 0, '', 'paddingright', 0);
if ($type == 'skype') {
$htmllink .= $value;
@@ -3306,8 +3303,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
$fakey = 'fa-'.$convertarray[$pictowithouttext];
if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';
$marginleftonlyshort = 1;
- } elseif (!empty($arrayconvpictotofa[$pictowithouttext]))
- {
+ } elseif (!empty($arrayconvpictotofa[$pictowithouttext])) {
$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
} else {
$fakey = 'fa-'.$pictowithouttext;
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 76fb29197b2..e391787479d 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -376,7 +376,7 @@ ALTER TABLE llx_facturedet ADD COLUMN ref_ext varchar(255) AFTER multicurrency_t
ALTER TABLE llx_c_ticket_category ADD COLUMN fk_parent integer DEFAULT 0 NOT NULL;
ALTER TABLE llx_c_ticket_category ADD COLUMN force_severity varchar(32) NULL;
-ALTER TABLE llx_c_ticket_severity CHANGE color color VARCHAR(10) NULL;
+ALTER TABLE llx_c_ticket_severity CHANGE color color VARCHAR(10) NULL;
ALTER TABLE llx_expensereport ADD COLUMN fk_user_creat integer NULL;
@@ -421,7 +421,7 @@ ALTER TABLE llx_projet_task_time MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIM
ALTER TABLE llx_projet_task_time MODIFY COLUMN datec datetime;
-DELETE FROM llx_user_rights WHERE fk_id IN (SELECT id FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous');
+DELETE FROM llx_user_rights WHERE fk_id IN (SELECT id FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous');
DELETE FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous';
UPDATE llx_rights_def set perms = 'readall' WHERE perms = 'read_all' and module = 'holiday';
@@ -545,6 +545,7 @@ CREATE TABLE llx_session(
user_agent varchar(128) NULL
)ENGINE=innodb;
+INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES(1, 'github', 'Github', 'https://github.com/{socialid}', 'fa-github', 1);
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_funnel_of_prospection.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_funnel_of_prospection.php' AND entity = 1);
-- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT 'box_customers_outstanding_bill_reached.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_customers_outstanding_bill_reached.php' AND entity = 1);
diff --git a/htdocs/install/mysql/tables/llx_intracommreport.sql b/htdocs/install/mysql/tables/llx_intracommreport.sql
index 9d89320c1fa..d3d2956e4ab 100644
--- a/htdocs/install/mysql/tables/llx_intracommreport.sql
+++ b/htdocs/install/mysql/tables/llx_intracommreport.sql
@@ -20,7 +20,6 @@
create table llx_intracommreport
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
-
ref varchar(30) NOT NULL, -- report reference number
entity integer DEFAULT 1 NOT NULL, -- multi company id
type_declaration varchar(32),
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 668eca12674..f0a4bd5f070 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -30,54 +30,57 @@ $langs->loadLangs(array("intracommreport"));
$action = GETPOST('action');
$exporttype = GETPOST('exporttype'); // DEB ou DES
-if (empty($exporttype)) $exporttype = 'deb';
+if (empty($exporttype)) {
+ $exporttype = 'deb';
+}
$form = new Form($db);
$formother = new FormOther($db);
$year = GETPOST('year');
$month = GETPOST('month');
-$type_declaration = GETPOST('type');
+$label = (string) GETPOST('label', 'alphanohtml');
+$type_declaration = GETPOSTINT('type');
$backtopage = GETPOST('backtopage', 'alpha');
+$declaration = array(
+ "deb" => $langs->trans("DEB"),
+ "des" => $langs->trans("DES"),
+);
/*
* Actions
*/
-if ($user->rights->intracommreport->delete && $action == 'confirm_delete' && $confirm == 'yes')
-{
+if ($user->rights->intracommreport->delete && $action == 'confirm_delete' && $confirm == 'yes') {
$result = $object->delete($id, $user);
- if ($result > 0)
- {
- if (!empty($backtopage))
- {
+ if ($result > 0) {
+ if (!empty($backtopage)) {
header("Location: ".$backtopage);
exit;
- }
- else {
+ } else {
header("Location: list.php");
exit;
}
- }
- else {
+ } else {
$errmesg = $object->error;
}
}
if ($action == 'add' && $user->rights->intracommreport->write) {
$object->label = trim($label);
- $object->type = trim($type);
- $object->type_declaration = (int) $statut;
- $object->subscription = (int) $subscription;
+ $object->type = trim($exporttype);
+ $object->type_declaration = $type_declaration;
+ $object->subscription = (int) $subscription;
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
- if ($ret < 0) $error++;
+ if ($ret < 0) {
+ $error++;
+ }
if (empty($object->label)) {
$error++;
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
- }
- else {
+ } else {
$sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."adherent_type WHERE libelle='".$db->escape($object->label)."'";
$result = $db->query($sql);
if ($result) {
@@ -90,20 +93,16 @@ if ($action == 'add' && $user->rights->intracommreport->write) {
}
}
- if (!$error)
- {
+ if (!$error) {
$id = $object->create($user);
- if ($id > 0)
- {
+ if ($id > 0) {
header("Location: ".$_SERVER["PHP_SELF"]);
exit;
- }
- else {
+ } else {
setEventMessages($object->error, $object->errors, 'errors');
$action = 'create';
}
- }
- else {
+ } else {
$action = 'create';
}
}
@@ -113,15 +112,14 @@ if ($action == 'add' && $user->rights->intracommreport->write) {
*/
// Creation mode
-if ($action == 'create')
-{
+if ($action == 'create') {
$title = $langs->trans("IntracommReportTitle");
llxHeader("", $title);
print load_fiche_titre($langs->trans("IntracommReportTitle"));
print '