';
-$fiche=new Fiche($cn,$_REQUEST['f_id']);
+$fiche=new Fiche($cn, $http->request('f_id',"number"));
$quick_code=$fiche->get_quick_code();
$letter=new Lettering_Card($cn);
$letter->set_parameter('quick_code',$quick_code);
diff --git a/include/sql/mod1/data.sql b/include/sql/mod1/data.sql
index f15f5c971..8c0ae4780 100644
--- a/include/sql/mod1/data.sql
+++ b/include/sql/mod1/data.sql
@@ -4,6 +4,7 @@ set search_path = public,comptaproc,pg_catalog ;
SET statement_timeout = 0;
SET lock_timeout = 0;
SET idle_in_transaction_session_timeout = 0;
+SET transaction_timeout = 0;
SET client_encoding = 'UTF8';
SET standard_conforming_strings = on;
SELECT pg_catalog.set_config('search_path', '', false);
@@ -14,36 +15,17 @@ SET row_security = off;
SELECT pg_catalog.lo_create('2346174');
-
-
-
SELECT pg_catalog.lo_create('2346176');
-
-
-
SELECT pg_catalog.lo_create('2346177');
-
-
-
SELECT pg_catalog.lo_create('2346178');
-
-
-
SELECT pg_catalog.lo_create('2346179');
-
-
-
SELECT pg_catalog.lo_create('2346181');
-
-
-
SELECT pg_catalog.lo_create('2346476');
-
INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES (800, 'Ajout de fiche', 'fiche', 'FICADD');
INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES (805, 'Création, modification et effacement de fiche', 'fiche', 'FIC');
INSERT INTO public.action (ac_id, ac_description, ac_module, ac_code) VALUES (910, 'création, modification et effacement de catégorie de fiche', 'fiche', 'FICCAT');
diff --git a/include/sql/mod1/make-sql b/include/sql/mod1/make-sql
index 8b725ae28..f7116ea34 100755
--- a/include/sql/mod1/make-sql
+++ b/include/sql/mod1/make-sql
@@ -9,7 +9,7 @@ export TEMPLATE=${DOMAIN}mod1
psql -X $TEMPLATE -c "delete from user_local_pref"
psql -X $TEMPLATE -c "delete from user_local_pref"
-pg_dump -O -U dany -s $TEMPLATE|grep -v "COMMENT ON SCHEMA public IS 'Standard public schema';" |sed "/^--/d" > schema.sql
+pg_dump -Ox -U dany -s $TEMPLATE|grep -v "COMMENT ON SCHEMA public IS 'Standard public schema';" |sed "/^--/d" > schema.sql
sed -i -e "/COMMENT ON EXTENSION/d" schema.sql
sed -i -e "/CREATE EXTENSION/d" schema.sql
sed -ne '0,/ADD CONSTRAINT/p' schema.sql > tmpSchema.sql
diff --git a/include/sql/mod1/schema.sql b/include/sql/mod1/schema.sql
index fdabc9401..7e74cc61e 100644
--- a/include/sql/mod1/schema.sql
+++ b/include/sql/mod1/schema.sql
@@ -3,6 +3,7 @@
SET statement_timeout = 0;
SET lock_timeout = 0;
SET idle_in_transaction_session_timeout = 0;
+SET transaction_timeout = 0;
SET client_encoding = 'UTF8';
SET standard_conforming_strings = on;
SELECT pg_catalog.set_config('search_path', '', false);
@@ -16,6 +17,9 @@ CREATE SCHEMA comptaproc;
+
+
+
CREATE SCHEMA tva_belge;
@@ -6516,8 +6520,8 @@ CREATE VIEW public.v_contact AS
JOIN public.fiche_def fd ON ((f.fd_id = fd.fd_id)))
WHERE (fd.frd_id = 16)
)
- SELECT cd.f_id,
- cd.f_enable,
+ SELECT f_id,
+ f_enable,
( SELECT fiche_detail.ad_value
FROM public.fiche_detail
WHERE ((fiche_detail.ad_id = 32) AND (fiche_detail.f_id = cd.f_id))) AS contact_fname,
@@ -6542,7 +6546,7 @@ CREATE VIEW public.v_contact AS
( SELECT fiche_detail.ad_value
FROM public.fiche_detail
WHERE ((fiche_detail.ad_id = 26) AND (fiche_detail.f_id = cd.f_id))) AS contact_fax,
- cd.fd_id AS card_category
+ fd_id AS card_category
FROM contact_data cd;
@@ -6642,10 +6646,10 @@ COMMENT ON VIEW public.vw_fiche_attr IS 'Some attribute for all cards';
CREATE VIEW public.vw_fiche_name AS
- SELECT fiche_detail.f_id,
- fiche_detail.ad_value AS name
+ SELECT f_id,
+ ad_value AS name
FROM public.fiche_detail
- WHERE (fiche_detail.ad_id = 1);
+ WHERE (ad_id = 1);
@@ -7036,16 +7040,16 @@ CREATE VIEW public.v_quant_detail AS
CREATE VIEW public.v_tva_rate AS
- SELECT tva_rate.tva_id,
- tva_rate.tva_rate,
- tva_rate.tva_code,
- tva_rate.tva_label,
- tva_rate.tva_comment,
- split_part(tva_rate.tva_poste, ','::text, 1) AS tva_purchase,
- split_part(tva_rate.tva_poste, ','::text, 2) AS tva_sale,
- tva_rate.tva_both_side,
- tva_rate.tva_payment_purchase,
- tva_rate.tva_payment_sale
+ SELECT tva_id,
+ tva_rate,
+ tva_code,
+ tva_label,
+ tva_comment,
+ split_part(tva_poste, ','::text, 1) AS tva_purchase,
+ split_part(tva_poste, ','::text, 2) AS tva_sale,
+ tva_both_side,
+ tva_payment_purchase,
+ tva_payment_sale
FROM public.tva_rate;
diff --git a/include/sql/mod2/make-sql b/include/sql/mod2/make-sql
index 5adf3172e..eec26117c 100755
--- a/include/sql/mod2/make-sql
+++ b/include/sql/mod2/make-sql
@@ -9,7 +9,7 @@ export TEMPLATE=${DOMAIN}mod2
psql -X $TEMPLATE -c "delete from user_local_pref"
psql -X $TEMPLATE -c "delete from user_local_pref"
-pg_dump -O -U dany -s $TEMPLATE|grep -v "COMMENT ON SCHEMA public IS 'Standard public schema';" |sed "/^--/d" > schema.sql
+pg_dump -Ox -U dany -s $TEMPLATE|grep -v "COMMENT ON SCHEMA public IS 'Standard public schema';" |sed "/^--/d" > schema.sql
sed -i -e "/COMMENT ON EXTENSION/d" schema.sql
sed -i -e "/CREATE EXTENSION/d" schema.sql
sed -ne '0,/ADD CONSTRAINT/p' schema.sql > tmpSchema.sql
@@ -17,5 +17,5 @@ sed -ne '/ADD CONSTRAINT/,$p' schema.sql |sed -e '1d' > constraint.sql
cp tmpSchema.sql schema.sql
echo "set search_path = public,comptaproc,pg_catalog ;" > data.sql
-pg_dump -O -U dany --data-only --column-inserts -O ${TEMPLATE}|sed "/^--/d" | sed -e "/SET search_path/d" >> data.sql
+pg_dump -Ox -U dany --data-only --column-inserts -O ${TEMPLATE}|sed "/^--/d" | sed -e "/SET search_path/d" >> data.sql
diff --git a/include/template/ledger_search.php b/include/template/ledger_search.php
index 6a8010f03..7aca0e803 100644
--- a/include/template/ledger_search.php
+++ b/include/template/ledger_search.php
@@ -1,10 +1,31 @@
+
-
+
|
@@ -112,19 +133,19 @@ echo $f_accounting->input(); ?>
|
-
+
|
-
+
div."tag_option");
$iselect->value=array(
array("value"=>0,"label"=>_("Toutes les étiquettes")),
array("value"=>1,"label"=>_("Au moins une étiquette"))
);
-
+
$iselect->set_value($http->request($this->div."tag_option","number",0));
- echo $iselect->input();
-
+ echo $iselect->input();
+
?>
div);
@@ -132,7 +153,7 @@ echo $f_accounting->input(); ?>
|
- request($this->div."tag","string",0);
if (is_array($aTag) ) {
$nb_tag=count($aTag);
@@ -142,9 +163,9 @@ echo $f_accounting->input(); ?>
}
}
?>
-
+
|
-
+
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index e69de29bb..0b72f6745 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -0,0 +1 @@
+ALTER TABLE public.todo_list ALTER COLUMN tl_date drop NOT NULL;
\ No newline at end of file
diff --git a/unit-test/include/class/acc_letter.Test.php b/unit-test/include/class/acc_letterTest.php
similarity index 99%
rename from unit-test/include/class/acc_letter.Test.php
rename to unit-test/include/class/acc_letterTest.php
index 410a5a9b1..f6be39006 100644
--- a/unit-test/include/class/acc_letter.Test.php
+++ b/unit-test/include/class/acc_letterTest.php
@@ -33,7 +33,7 @@ use PHPUnit\Framework\TestCase;
*/
require DIRTEST.'/global.php';
-class Acc_Letter extends TestCase
+class Acc_LetterTest extends TestCase
{
/**
* @var Fiche