diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 1de1d5f992004aed3ecfbb0af86341d0ffb9f18b..81873052031b6261f35830a14daa53e1a42e64ab 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Sun Nov 25 21:04:17 GMT 2007 +#Tue Nov 27 03:47:02 GMT 2007 eclipse.preferences.version=1 encoding/<project>=ISO-8859-1 diff --git a/mysql/migration/2.1.0-2.2.0.sql b/mysql/migration/2.1.0-2.2.0.sql index 2a5dcbbff13b08059421ec9cf9a8e54aef852893..f6133a777d6be5b55ecac2eb1ce389705cf5839c 100644 --- a/mysql/migration/2.1.0-2.2.0.sql +++ b/mysql/migration/2.1.0-2.2.0.sql @@ -76,6 +76,8 @@ update llx_c_chargesociales set actioncompta='TAXCSGND' where id = 3; update llx_c_chargesociales set actioncompta='TAXAPP' where id = 10; update llx_c_chargesociales set actioncompta='TAXPRO' where id = 11; update llx_c_chargesociales set actioncompta='TAXFON' where id = 20; +alter table llx_chargesociales modify fk_type integer NOT NULL; +alter table llx_chargesociales modify libelle varchar(80) NOT NULL; insert into llx_rights_def (id, libelle, module, type, bydefault, subperms, perms) values (114,'Rapprocher transactions','banque','w',0,null,'consolidate'); update llx_rights_def set libelle='Cr�er/modifier/supprimer �criture bancaire' where perms='modifier' AND module='banque'; diff --git a/mysql/tables/llx_chargesociales.sql b/mysql/tables/llx_chargesociales.sql index 968d35f09248d02bf50e31603884a5b4c01fd8b6..5b52121f7bf8a75f302e9967202392415df575b3 100644 --- a/mysql/tables/llx_chargesociales.sql +++ b/mysql/tables/llx_chargesociales.sql @@ -24,8 +24,8 @@ create table llx_chargesociales ( rowid integer AUTO_INCREMENT PRIMARY KEY, date_ech datetime NOT NULL, -- date d'echeance - libelle varchar(80), - fk_type integer, + libelle varchar(80) NOT NULL, + fk_type integer NOT NULL, amount real default 0 NOT NULL, paye smallint default 0 NOT NULL, periode date