diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 35a7abd9498..c23734329f9 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -124,7 +124,7 @@ if ($_GET["action"] == 'create') $html->select_date('','','','','',"addprop"); print ''; - print ''.$langs->trans("ValidityDuration").' '.$langs->trans("days").''; + print ''.$langs->trans("ValidityDuration").' '.$langs->trans("days").''; // Conditions de réglement print ''.$langs->trans('PaymentConditionsShort').''; diff --git a/mysql/data/data.sql b/mysql/data/data.sql index 6dc88e27d51..a069c67db07 100644 --- a/mysql/data/data.sql +++ b/mysql/data/data.sql @@ -187,6 +187,11 @@ insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SET insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SETLOCALE_LC_MONETARY', 'MAIN_FORCE_SETLOCALE_LC_MONETARY', 'chaine', 1, 'Pour forcer LC_MONETARY si pb de locale'); insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SETLOCALE_LC_NUMERIC', 'MAIN_FORCE_SETLOCALE_LC_NUMERIC', 'chaine', 1, 'Mettre la valeur C si problème de centimes'); +-- +-- Duree de validite des propales +-- +insert into llx_const (name, value, type, visible, note) VALUES ('PROPALE_VALIDITY_DURATION', '15', 'chaine', 1, 'Durée de validitée des propales'); + -- -- Descriptif des plans comptables FR PCG99-ABREGE diff --git a/mysql/migration/2.0.0-2.1.0.sql b/mysql/migration/2.0.0-2.1.0.sql index a2fd1fd3fd8..0f817645367 100644 --- a/mysql/migration/2.0.0-2.1.0.sql +++ b/mysql/migration/2.0.0-2.1.0.sql @@ -294,6 +294,6 @@ update llx_societe_remise_except set description='Remise sans description' where alter table llx_societe_remise_except modify description varchar(255) NOT NULL; insert into llx_c_actioncomm (id, code, type, libelle) values ( 8, 'AC_COM', 'system', 'Envoi Commande'); -update llx_actioncomm set fk_action = '8' where fk_action = '3' and label = 'Envoi commande par mail' +update llx_actioncomm set fk_action = '8' where fk_action = '3' and label = 'Envoi commande par mail'; insert into llx_const (name, value, type, visible, note) VALUES ('PROPALE_VALIDITY_DURATION', '15', 'chaine', 1, 'Durée de validitée des propales'); \ No newline at end of file