From 7da6a063f977dbb5569b2d80455649d8d640a685 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Thu, 4 Jun 2020 16:46:36 +0200 Subject: [PATCH 1/3] Update llx_subscription.sql --- htdocs/install/mysql/tables/llx_subscription.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/tables/llx_subscription.sql b/htdocs/install/mysql/tables/llx_subscription.sql index a3562f12c57..03d24c68f6e 100644 --- a/htdocs/install/mysql/tables/llx_subscription.sql +++ b/htdocs/install/mysql/tables/llx_subscription.sql @@ -24,7 +24,7 @@ create table llx_subscription fk_adherent integer, fk_type integer, dateadh datetime, - datef date, + datef datetime, subscription double(24,8), fk_bank integer DEFAULT NULL, fk_user_creat integer DEFAULT NULL, From 319710d6aa7df937a10ad34aa606f035a55b4b35 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Thu, 4 Jun 2020 16:50:24 +0200 Subject: [PATCH 2/3] Update 12.0.0-13.0.0.sql --- htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 1 + 1 file changed, 1 insertion(+) 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 58d28dcd6a3..163fec01b3f 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 @@ -43,3 +43,4 @@ UPDATE llx_establishment SET ref = rowid WHERE ref IS NULL; ALTER TABLE llx_establishment MODIFY COLUMN ref varchar(30) NOT NULL; ALTER TABLE llx_establishment MODIFY COLUMN name varchar(128); +ALTER TABLE llx_subscription MODIFY COLUMN datef DATETIME; From 37007d6d1a14d6219b309734f97317d1ad278e52 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Sun, 7 Jun 2020 16:12:28 +0200 Subject: [PATCH 3/3] Update subscription.class.php --- htdocs/adherents/class/subscription.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php index cdc70cf0cd1..5a75fdbae2e 100644 --- a/htdocs/adherents/class/subscription.class.php +++ b/htdocs/adherents/class/subscription.class.php @@ -99,7 +99,7 @@ class Subscription extends CommonObject 'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>20), 'fk_adherent' =>array('type'=>'integer', 'label'=>'Member', 'enabled'=>1, 'visible'=>-1, 'position'=>25), 'dateadh' =>array('type'=>'datetime', 'label'=>'DateSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>30), - 'datef' =>array('type'=>'date', 'label'=>'DateEndSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>35), + 'datef' =>array('type'=>'datetime', 'label'=>'DateEndSubscription', 'enabled'=>1, 'visible'=>-1, 'position'=>35), 'subscription' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'position'=>40, 'isameasure'=>1), 'fk_bank' =>array('type'=>'integer', 'label'=>'BankId', 'enabled'=>1, 'visible'=>-1, 'position'=>45), 'note' =>array('type'=>'text', 'label'=>'Note', 'enabled'=>1, 'visible'=>-1, 'position'=>50),