admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'unstable' into pre-stable

Browse source 
* unstable: (149 commits)
  Update DB Test for PHPUNIT
  Update DB Test for PHPUNIT
  Documentation  Code Doxygen
  Fix 2398 : bug si melange de montants  négatifs et positifs avec de la TVA en autoliquidation
  Esthetic
  VAT ND Analytic : fix bug
  Code improve Todo List to finish , allow a empty date
  Documentation
  Operation Analytic : save_form_plan_vat_nd , check that the total is the same as the VAT ND amount
  improve Operation detail : show Analytic imputation for VAT Not Deductible
  Documentation
  Operation Analytic : save_form_plan_vat_nd , check that the total is the same as the VAT ND amount
  improve Operation detail : show Analytic imputation for VAT Not Deductible
  improve doc
  improve doc
  New : label cannot be empty
  New : label cannot be empty
  FIX P0TVA when no data
  FIX P0TVA when no data
  FIX : javascript id$ function
  ...
This commit is contained in:
sparkyx 2024-12-21 19:51:39 +01:00
commit 88276dd81e
165 changed files with 3267 additions and 2026 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sql/mod1/data.sql
View file

@ -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);
@ -43,7 +44,6 @@ 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');

2
include/sql/mod1/make-sql
View file

@ -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

1
include/sql/mod1/schema.sql
View file

@ -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);

4
include/sql/mod2/make-sql
View file

@ -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

25
include/sql/patch/upgrade202.sql Normal file
View file

@ -0,0 +1,25 @@
begin;
alter table tva_rate add column tva_reverse_account account_type;
alter table tva_rate add constraint fk_tva_reverse_account foreign key (tva_reverse_account) references tmp_pcmn(pcm_val) on delete set null on update cascade ;
comment on column tva_rate.tva_reverse_account is 'Accouting for reversed VAT';
drop VIEW public.v_tva_rate;
CREATE OR REPLACE VIEW public.v_tva_rate
AS SELECT tva_id,
tva_rate,
tva_code,
tva_label,
tva_comment,
tva_reverse_account,
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 tva_rate;
insert into version (val,v_description) values (203,'C0TVA force accounting for autoreverse VAT');
commit;