[Phpcompta-dev] r547 - in trunk: . rapport_avance rapport_avance/sql

[phpcompta-dev]

Author: danydb
Date: 2013-10-23 21:14:48 +0200 (Wed, 23 Oct 2013)
New Revision: 547

Added:
   trunk/rapport_avance/sql/upgrade4.sql
Modified:
   trunk/
   trunk/rapport_avance/rapav_constant.php
Log:
Merged revisions 546 via svnmerge from 
svn+ssh://address@hidden/svn_extension/tag/rel700

........
  r546 | danydb | 2013-10-23 21:14:03 +0200 (mer., 23 oct. 2013) | 1 line
  
  Upgrade RAPAV version 4
........



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /tag/rel700:1-544
   + /tag/rel700:1-546

Modified: trunk/rapport_avance/rapav_constant.php
===================================================================
--- trunk/rapport_avance/rapav_constant.php     2013-10-23 19:14:03 UTC (rev 
546)
+++ trunk/rapport_avance/rapav_constant.php     2013-10-23 19:14:48 UTC (rev 
547)
@@ -11,5 +11,5 @@
 
 global $cn,$rapav_version;
 $cn=new Database (dossier::id());
-$rapav_version=3;
-?>
\ No newline at end of file
+$rapav_version=4;
+?>

Copied: trunk/rapport_avance/sql/upgrade4.sql (from rev 546, 
tag/rel700/rapport_avance/sql/upgrade4.sql)
===================================================================
--- trunk/rapport_avance/sql/upgrade4.sql                               (rev 0)
+++ trunk/rapport_avance/sql/upgrade4.sql       2013-10-23 19:14:48 UTC (rev 
547)
@@ -0,0 +1,32 @@
+begin;
+
+ALTER TABLE rapport_advanced.formulaire_param_detail   ADD COLUMN jrn_def_id 
bigint;
+COMMENT ON COLUMN rapport_advanced.formulaire_param_detail.jrn_def_id IS 'FK 
to jrn_def, if null then all the ledgers are concerned';
+
+CREATE FUNCTION formulaire_param_detail_jrn_def_id_ins_upd() RETURNS trigger
+    AS $$
+declare
+       jrn_def_id integer;
+begin
+       if NEW.jrn_def_id = -1 then
+               jrn_def_id=NULL;
+               NEW.jrn_def_id := jrn_def_id;
+       end if;
+       return NEW;
+end;$$;
+language plpgsql;
+
+CREATE INDEX fki_jrn_def_id ON rapport_advanced.formulaire_param_detail USING 
btree (jrn_def_id);
+
+CREATE TRIGGER formulaire_param_detail_trg BEFORE INSERT OR UPDATE OF 
jrn_def_id ON rapport_advanced.formulaire_param_detail FOR EACH ROW EXECUTE 
PROCEDURE rapport_advanced.formulaire_param_detail_jrn_def_id_ins_upd();
+
+ALTER TABLE rapport_advanced.formulaire_param_detail  ADD CONSTRAINT 
formulaire_param_detail_jrn_def_id_fkey FOREIGN KEY (jrn_def_id)      
REFERENCES jrn_def (jrn_def_id) MATCH SIMPLE      ON UPDATE CASCADE ON DELETE 
SET NULL DEFERRABLE INITIALLY DEFERRED;
+
+
+
+alter table rapport_advanced.formulaire_param_detail add column date_paid 
integer default 0;
+alter table rapport_advanced.restore_formulaire_param_detail add column 
date_paid integer default 0;
+
+insert into rapport_advanced.version(version_id,version_note) values (4,'Ajout 
date et journaux dans les formules');
+
+commit;



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu