From aefc4b1eb83dd5f074f54ddbb9c370ec9da4bb77 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Mon, 11 Feb 2008 18:53:44 +0000 Subject: [PATCH] merge with rel310C --- .../copropriete/fr_plan_syndiccoprop.sql | 133 ++++ contrib/document_test/facture.odt | Bin 37190 -> 37736 bytes html/admin/setup.php | 16 +- html/admin/sql/patch/upgrade36.BE.sql | 1 + html/admin/sql/patch/upgrade36.sql | 22 +- html/admin/sql/patch/upgrade37.sql | 43 + html/admin/sql/patch/upgrade38.sql | 28 + html/admin/sql/patch/upgrade39.sql | 40 + html/admin/sql/patch/upgrade40.sql | 49 ++ html/annulation.php | 8 +- html/comptanalytic.php | 2 +- html/export_ouv.php | 4 +- html/fiche.php | 2 +- html/fid.php | 21 +- html/index.php | 26 +- html/jrn_csv.php | 11 +- html/js/ajax_fiche.js | 164 ++-- html/js/scripts.js | 9 - html/modify_op.php | 20 +- html/style.css | 4 - html/test.php | 7 +- html/user_jrn.php | 2 +- include/ac_common.php | 4 +- include/action.inc.php | 5 +- include/bank.inc.php | 7 +- include/bud_detail.inc.php | 2 +- include/bud_synthese.inc.php | 18 +- include/ca_pa.inc.php | 6 +- include/class_acc_account_ledger.php | 6 +- include/class_acc_bilan.php | 2 +- include/class_acc_jrn_info.php | 158 ++++ include/class_acc_ledger.php | 22 +- include/class_action.php | 4 +- include/class_admin.php | 2 +- include/class_anc_account.php | 13 +- include/class_anc_balance_double.php | 8 +- include/class_anc_group_operation.php | 4 +- include/class_anc_plan.php | 2 +- include/class_bud_hypo.php | 8 +- include/class_bud_synthese_acc.php | 8 +- include/class_bud_synthese_anc.php | 9 +- include/class_bud_synthese_group.php | 13 +- include/class_bud_synthese_hypo.php | 2 +- include/class_customer.php | 4 +- include/class_document.php | 35 +- include/class_dossier.php | 1 + include/class_fiche.php | 66 +- include/class_gestion_purchase.php | 7 +- include/class_periode.php | 2 +- include/class_user.php | 6 +- include/class_widget.php | 18 +- include/client.inc.php | 13 +- include/constant.php | 3 +- include/contact.inc.php | 7 +- include/depense.inc.php | 3 +- include/facture.inc.php | 18 +- include/fiche.inc.php | 2 +- include/fiche_def.inc.php | 2 +- include/import_inc.php | 5 +- include/impress_inc.php | 6 +- include/impress_jrn.inc.php | 11 +- include/impress_poste.inc.php | 2 +- include/jrn.php | 70 +- include/poste.inc.php | 6 +- include/postgres.php | 2 +- include/pref.inc.php | 39 +- include/stock_inc.php | 7 +- include/supplier.inc.php | 15 +- include/tva.inc.php | 3 +- include/user_action_ach.php | 6 +- include/user_action_fin.php | 4 +- include/user_common.php | 39 +- include/user_form_ach.php | 198 +++-- include/user_form_ven.php | 30 +- include/user_menu.php | 97 ++- scripts/cleanup.sh | 2 +- sql/upgrade.sql | 750 +----------------- 77 files changed, 1189 insertions(+), 1205 deletions(-) create mode 100644 contrib/comptabilite-francaise/copropriete/fr_plan_syndiccoprop.sql create mode 100644 html/admin/sql/patch/upgrade37.sql create mode 100644 html/admin/sql/patch/upgrade38.sql create mode 100644 html/admin/sql/patch/upgrade39.sql create mode 100644 html/admin/sql/patch/upgrade40.sql create mode 100644 include/class_acc_jrn_info.php diff --git a/contrib/comptabilite-francaise/copropriete/fr_plan_syndiccoprop.sql b/contrib/comptabilite-francaise/copropriete/fr_plan_syndiccoprop.sql new file mode 100644 index 000000000..0dd612dba --- /dev/null +++ b/contrib/comptabilite-francaise/copropriete/fr_plan_syndiccoprop.sql @@ -0,0 +1,133 @@ +-- +-- PostgreSQL database dump +-- Version 2008/02/10 09:19 +-- + +-- +-- Name: TABLE tmp_pcmn; Type: COMMENT; Schema: public; Owner: phpcompta +-- + +COMMENT ON TABLE tmp_pcmn IS 'Plan comptable - Syndicat des copropriétaires : strict'; + +-- +-- Data for Name: tmp_pcmn; Type: TABLE DATA; Schema: public; Owner: phpcompta +-- + +COPY tmp_pcmn (pcm_val, pcm_lib, pcm_val_parent) FROM stdin; +1 Classe 1 - Provisions, avances, subventions et emprunts 0 +10 Provisions et avances : 1 +102 Provisions pour travaux décidés 10 +103 Avances 10 +1031 Avances de trésorerie 103 +1032 Avances travaux au titre de l'article 18, 6e alinéa de la loi susvisée 103 +1033 Autres avances 103 +12 Solde en attente sur travaux et opérations exceptionnelles 1 +13 Subventions : 1 +131 Subventions accordées en instance de versement 13 +4 Classe 4 - Copropriétaires et tiers 0 +40 Fournisseurs : 4 +401 Factures parvenues 40 +408 Factures non parvenues 40 +409 Fournisseurs débiteurs 40 +42 Personnel : 4 +421 Rémunérations dues 42 +43 Sécurité sociale et autres organismes sociaux : 4 +431 Sécurité sociale 43 +432 Autres organismes sociaux 43 +44 Etat et collectivités territoriales : 4 +441 Etat et autres organismes - subventions à recevoir 44 +442 Etat - impôts et versements assimilés 44 +443 Collectivités territoriales - aides 44 +45 Collectivité des copropriétaires : 4 +450 Copropriétaire individualisé 45 +4501 Sur décision AG : Copropriétaire - budget prévisionnel 450 +4502 Sur décision AG : Copropriétaire - travaux de l'article 14-2 de la loi susvisée et opérations exceptionnelles 450 +4503 Sur décision AG : Copropriétaire - avances 450 +4504 Sur décision AG : Copropriétaire - emprunts 450 +459 Copropriétaire - créances douteuses 45 +46 Débiteurs et créditeurs divers : 4 +461 Débiteurs divers 46 +462 Créditeurs divers 46 +47 Compte d'attente : 4 +471 Compte en attente d'imputation débiteur 47 +472 Compte en attente d'imputation créditeur 47 +48 Compte de régularisation : 4 +486 Charges payées d'avance 48 +487 Produits encaissés d'avance 48 +49 Dépréciation des comptes de tiers : 4 +491 Copropriétaires 49 +492 Personnes autres que les copropriétaires 49 +5 Classe 5 - Comptes financiers 0 +50 Fonds placés : 5 +501 Compte à terme 50 +502 Autre compte 50 +51 Banques, ou fonds disponibles en banque pour le syndicat : 5 +512 Banques 51 +514 Chèques postaux 51 +53 Caisse. 5 +6 Classe 6 - Comptes de charges 0 +60 Achats de matières et fournitures : 6 +601 Eau 60 +602 Electricié 60 +603 Chauffage, énergie et combustibles 60 +604 Achats produits d'entretien et petits équipements 60 +605 Matériel 60 +606 Fournitures 60 +61 Services extérieurs : 6 +611 Nettoyage des locaux 5 +612 Locations immobiliéres 61 +613 Locations mobiliéres 61 +614 Contrats de maintenance 61 +615 Entretien et petites réparations 61 +616 Primes d'assurances 61 +62 Frais d'administration et honoraires : 6 +621 Rémunérations du syndic sur gestion copropriété 62 +6211 Rémunération du syndic 621 +6212 Débours 621 +6213 Frais postaux 621 +622 Autres honoraires du syndic 62 +6221 Honoraires travaux 622 +6222 Prestations particulières 622 +6223 Autres honoraires 622 +623 Rémunérations de tiers intervenants 62 +624 Frais du conseil syndical 62 +63 Impôts - taxes et versements assimilés : 6 +632 Taxe de balayage 63 +633 Taxe foncière 63 +634 Autres impôts et taxes 63 +64 Frais de personnel : 6 +641 Salaires 64 +642 Charges sociales et organismes sociaux 64 +643 Taxe sur les salaires 64 +644 Autres (médecine du travail, mutuelles, etc.) 64 +66 Charges financières des emprunts, agios ou autres : 6 +661 Remboursement d'annuités d'emprunt 66 +662 Autres charges financières et agios 66 +67 Charges pour travaux et opérations exceptionnelles : 6 +671 Travaux décidés par l'assemblée générale 67 +672 Travaux urgents 67 +673 Etudes techniques, diagnostic, consultation 67 +677 Pertes sur créances irrécouvrables 67 +678 Charges exceptionnelles 67 +68 Dotations aux dépréciations sur créances douteuses. 6 +7 Classe 7 - Comptes de produits 0 +70 Appels de fonds : 7 +701 Provisions sur opérations courantes 70 +702 Provisions sur travaux de l'article 14-2 et opérations exceptionnelles 70 +703 Avances 70 +704 Remboursements d'annuités d'emprunts 70 +71 Autres produits : 7 +711 Subventions 71 +712 Emprunts 71 +713 Indemnités d'assurances 71 +714 Produits divers (dont intérêts légaux dus par les copropriétaires) 71 +716 Produits financiers 71 +718 Produits exceptionnels 71 +78 Reprises de dépréciations sur créances douteuses. 7 +8 Comptes spéciaux 0 +9 Comptes analytique 0 +\. + +-- +-- PostgreSQL database dump complete +-- diff --git a/contrib/document_test/facture.odt b/contrib/document_test/facture.odt index 0132a5e637b630f8b98e18a545c093a14d4c9ea3..460a0f33d94dfbd0bf5a0ea2bd3a0f92742fd139 100644 GIT binary patch delta 15281 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 delta 14744 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 bNuWu1|E!QW2@mWnGKoKl8mcP#?=JrzKkF*B diff --git a/html/admin/setup.php b/html/admin/setup.php index caedcc798..ca5a0ce65 100644 --- a/html/admin/setup.php +++ b/html/admin/setup.php @@ -147,7 +147,7 @@ function ExecuteScript($p_cn,$script) { echo_debug('setup.php',__LINE__,"Execute sql $sql"); if ( ExecSql($p_cn,$sql,false) == false ) { Rollback($p_cn); - if ( DEBUG=='false' ) ob_clean(); + if ( DEBUG=='false' ) ob_end_clean(); print "ERROR : $sql"; exit(); } @@ -156,7 +156,7 @@ echo_debug('setup.php',__LINE__,"Execute sql $sql"); print "
"; } // while (feof) fclose($hf); - if ( DEBUG=='false' ) ob_clean(); + if ( DEBUG=='false' ) ob_end_clean(); } /*! \brief loop to apply all the path to a folder or * a template @@ -166,7 +166,7 @@ echo_debug('setup.php',__LINE__,"Execute sql $sql"); */ function apply_patch($p_cn,$p_name) { - $MaxVersion=36; + $MaxVersion=40; echo '
    '; for ( $i = 4;$i <= $MaxVersion;$i++) { @@ -238,7 +238,7 @@ function apply_patch($p_cn,$p_name) ExecuteScript($p_cn,"sql/patch/upgrade36.".$country.".sql"); ExecSql($p_cn,'update tmp_pcmn set pcm_type=find_pcm_type(pcm_val)'); } - if ( DEBUG == 'false') ob_clean(); + if ( DEBUG == 'false') ob_end_clean(); } } echo '
'; @@ -415,7 +415,7 @@ if ($account == 0 ) { ExecuteScript($cn,"sql/account_repository/constraint.sql"); Commit($cn); - if ( DEBUG=='false') ob_clean(); + if ( DEBUG=='false') ob_end_clean(); echo "Creation of Modele1"; if ( DEBUG=='false') ob_start(); @@ -426,7 +426,7 @@ if ($account == 0 ) { ExecuteScript($cn,'sql/mod1/data.sql'); ExecuteScript($cn,'sql/mod1/constraint.sql'); Commit($cn); - if ( DEBUG=='false') ob_clean(); + if ( DEBUG=='false') ob_end_clean(); echo "Creation of Modele2"; ExecSql($cn,"create database ".domaine."mod2 encoding='latin1'"); @@ -438,7 +438,7 @@ if ($account == 0 ) { ExecuteScript($cn,'sql/mod1/constraint.sql'); Commit($cn); - if ( DEBUG=='false') ob_clean(); + if ( DEBUG=='false') ob_end_clean(); }// end if // Add a french accountancy model @@ -507,6 +507,6 @@ echo '
'; } } - if (DEBUG=='false') ob_clean(); + if (DEBUG=='false') ob_end_clean(); echo "

Voilà tout est installé ;-)

"; ?> diff --git a/html/admin/sql/patch/upgrade36.BE.sql b/html/admin/sql/patch/upgrade36.BE.sql index 8d1cb76d0..79f8c6b77 100644 --- a/html/admin/sql/patch/upgrade36.BE.sql +++ b/html/admin/sql/patch/upgrade36.BE.sql @@ -12,6 +12,7 @@ INSERT INTO parm_poste (p_value, p_type) VALUES (492, 'PAS'); INSERT INTO parm_poste (p_value, p_type) VALUES (493, 'PAS'); INSERT INTO parm_poste (p_value, p_type) VALUES (2409, 'ACTINV'); INSERT INTO parm_poste (p_value, p_type) VALUES (2, 'ACT'); +INSERT INTO parm_poste (p_value, p_type) VALUES (2409, 'ACTINV'); INSERT INTO parm_poste (p_value, p_type) VALUES (3, 'ACT'); INSERT INTO parm_poste (p_value, p_type) VALUES (5, 'ACT'); INSERT INTO parm_poste (p_value, p_type) VALUES (491, 'ACT'); diff --git a/html/admin/sql/patch/upgrade36.sql b/html/admin/sql/patch/upgrade36.sql index 218298598..9c2ef8200 100644 --- a/html/admin/sql/patch/upgrade36.sql +++ b/html/admin/sql/patch/upgrade36.sql @@ -223,13 +223,6 @@ CREATE SEQUENCE bud_card_bc_id_seq ALTER TABLE public.bud_card_bc_id_seq OWNER TO phpcompta; --- --- Name: bud_card_bc_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: phpcompta --- - -ALTER SEQUENCE bud_card_bc_id_seq OWNED BY bud_card.bc_id; - - -- -- Name: bc_id; Type: DEFAULT; Schema: public; Owner: phpcompta -- @@ -322,12 +315,6 @@ CREATE SEQUENCE bud_detail_bd_id_seq ALTER TABLE public.bud_detail_bd_id_seq OWNER TO phpcompta; --- --- Name: bud_detail_bd_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: phpcompta --- - -ALTER SEQUENCE bud_detail_bd_id_seq OWNED BY bud_detail.bd_id; - -- -- Name: bd_id; Type: DEFAULT; Schema: public; Owner: phpcompta @@ -424,13 +411,6 @@ CREATE SEQUENCE bud_detail_periode_bdp_id_seq ALTER TABLE public.bud_detail_periode_bdp_id_seq OWNER TO phpcompta; --- --- Name: bud_detail_periode_bdp_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: phpcompta --- - -ALTER SEQUENCE bud_detail_periode_bdp_id_seq OWNED BY bud_detail_periode.bdp_id; - - -- -- Name: bdp_id; Type: DEFAULT; Schema: public; Owner: phpcompta -- @@ -682,7 +662,7 @@ begin nLength:=length(str_value); while nLength > 0 loop n_value:=to_number(str_value,'99999999999999999999999999999'); - select into str_type p_type from parm_poste where p_value=n_value; + select p_type into str_type from parm_poste where p_value=n_value; if FOUND then return str_type; end if; diff --git a/html/admin/sql/patch/upgrade37.sql b/html/admin/sql/patch/upgrade37.sql new file mode 100644 index 000000000..bb6dd05f8 --- /dev/null +++ b/html/admin/sql/patch/upgrade37.sql @@ -0,0 +1,43 @@ +begin; + +CREATE OR REPLACE FUNCTION jrn_check_periode() + RETURNS "trigger" AS +$BODY$ +declare +bClosed bool; +str_status text; +ljr_tech_per jrn.jr_tech_per%TYPE; +ljr_def_id jrn.jr_def_id%TYPE; +lreturn jrn%ROWTYPE; +begin +if TG_OP='INSERT' then + ljr_tech_per :=NEW.jr_tech_per; + ljr_def_id :=NEW.jr_def_id; + lreturn :=NEW; +end if; + +if TG_OP='DELETE' then + ljr_tech_per :=OLD.jr_tech_per; + ljr_def_id :=OLD.jr_def_id; + lreturn :=OLD; +end if; + +select p_closed into bClosed from parm_periode + where p_id=ljr_tech_per; + +if bClosed = true then + raise exception 'Periode fermee'; +end if; + +select status into str_status from jrn_periode + where p_id =ljr_tech_per and jrn_def_id=ljr_def_id; + +if str_status <> 'OP' then + raise exception 'Periode fermee'; +end if; + +return lreturn; +end;$BODY$ + LANGUAGE 'plpgsql' VOLATILE; +update version set val=38; +commit; diff --git a/html/admin/sql/patch/upgrade38.sql b/html/admin/sql/patch/upgrade38.sql new file mode 100644 index 000000000..eb39eb6bb --- /dev/null +++ b/html/admin/sql/patch/upgrade38.sql @@ -0,0 +1,28 @@ +begin; +CREATE OR REPLACE FUNCTION find_pcm_type(pp_value "numeric") + RETURNS text AS +$BODY$ +declare + str_type text; + str_value text; + n_value numeric; + nLength integer; +begin + str_value:=trim(to_char(pp_value,'99999999999999999999999999999')); + nLength:=length(str_value); + while nLength > 0 loop + n_value:=to_number(str_value,'99999999999999999999999999999'); + select p_type into str_type from parm_poste where p_value=n_value; + if FOUND then + return str_type; + end if; + nLength:=nLength-1; + str_value:=substring(str_value from 1 for nLength); + end loop; +return 'CON'; +end; +$BODY$ + LANGUAGE 'plpgsql' VOLATILE; + +update version set val=39; +commit; diff --git a/html/admin/sql/patch/upgrade39.sql b/html/admin/sql/patch/upgrade39.sql new file mode 100644 index 000000000..d937f3e97 --- /dev/null +++ b/html/admin/sql/patch/upgrade39.sql @@ -0,0 +1,40 @@ +begin; +create table info_def ( + id_type text primary key, + id_description text null +); + +comment on table info_def is 'Contains the types of additionnal info we can add to a operation'; +create or replace function info_def_ins_upd() returns trigger +AS +$$ +declare + row_info_def info_def%ROWTYPE; + str_type text; +begin +row_info_def:=NEW; +str_type:=upper(trim(NEW.id_type)); +str_type:=replace(str_type,' ',''); +str_type:=replace(str_type,',',''); +str_type:=replace(str_type,';',''); +if length(str_type) =0 then + raise exception 'id_type cannot be null'; +end if; +row_info_def.id_type:=str_type; +return row_info_def; +end; +$$ language plpgsql; +create trigger info_def_ins_upd_t before insert or update on info_def for each row execute procedure info_def_ins_upd(); + +create table jrn_info ( + ji_id serial primary key, + jr_id integer not null, + id_type text not null, + ji_value text +); +alter table jrn_info add constraint fk_jrn foreign key (jr_id) references jrn(jr_id) on delete cascade on update cascade; +alter table jrn_info add constraint fk_info_def foreign key (id_type) references info_def(id_type) on delete cascade on update cascade; +insert into info_def values ('BON_COMMANDE','Numero de bon de commande') ,('OTHER','Info diverses'); +insert into attr_def values(30,'Numero de client'); +update version set val=40; +commit; diff --git a/html/admin/sql/patch/upgrade40.sql b/html/admin/sql/patch/upgrade40.sql new file mode 100644 index 000000000..47ec42da4 --- /dev/null +++ b/html/admin/sql/patch/upgrade40.sql @@ -0,0 +1,49 @@ +begin; + +insert into parm_code values ('DEP_PRIV',4890,'Depense a charge du gerant'); +insert into attr_def values (31,'Depense à charge du gérant (partie privée)'); +alter table quant_purchase add qp_dep_priv numeric(20,4) default 0.0; + +CREATE FUNCTION insert_quant_purchase(p_internal text, p_j_id numeric, p_fiche character varying, p_quant numeric, p_price numeric, p_vat numeric, p_vat_code integer, p_nd_amount numeric, p_nd_tva numeric, p_nd_tva_recup numeric,p_dep_priv numeric , p_client character varying) RETURNS void + AS $$ +declare + fid_client integer; + fid_good integer; +begin + select f_id into fid_client from + attr_value join jnt_fic_att_value using (jft_id) where ad_id=23 and av_text=upper(p_client); + select f_id into fid_good from + attr_value join jnt_fic_att_value using (jft_id) where ad_id=23 and av_text=upper(p_fiche); + insert into quant_purchase + (qp_internal, + j_id, + qp_fiche, + qp_quantite, + qp_price, + qp_vat, + qp_vat_code, + qp_nd_amount, + qp_nd_tva, + qp_nd_tva_recup, + qp_supplier, + qp_dep_priv) + values + (p_internal, + p_j_id, + fid_good, + p_quant, + p_price, + p_vat, + p_vat_code, + p_nd_amount, + p_nd_tva, + p_nd_tva_recup, + fid_client, + p_dep_priv); + return; +end; + $$ + LANGUAGE plpgsql; + +update version set val=41; +commit; diff --git a/html/annulation.php b/html/annulation.php index daf0aa46c..7471ac1d3 100644 --- a/html/annulation.php +++ b/html/annulation.php @@ -136,13 +136,15 @@ if ($p_id != -1 ) { // A if ( $p_id != -1 ) { //B // Test whether date of the operation is in a closed periode // get the period_id - $period_id=getPeriodeFromDate($cn,$e_op_date); + $p=ExecSql($cn,"select jr_tech_per from jrn where jr_grpt_id=".$_REQUEST['jrn_op']); + $period_id=pg_fetch_result($p,0,0); // thanks jrn_op (jrn.jr_id) we find out the concerned ledger - $sql="select jr_def_id from jrn where jr_id=".$_REQUEST['jrn_op']; + + $sql="select jr_def_id from jrn where jr_grpt_id=".$_REQUEST['jrn_op']; $r=ExecSql($cn,$sql); $nJrn=pg_fetch_result($r,0,0); $per=new Periode($cn); - $per->set_jrn(nJrn); + $per->set_jrn($nJrn); $per->set_periode($period_id); // Check the period_id diff --git a/html/comptanalytic.php b/html/comptanalytic.php index 8fe1056ae..5ae193319 100644 --- a/html/comptanalytic.php +++ b/html/comptanalytic.php @@ -72,7 +72,7 @@ if ( isset ($_REQUEST['p_action'])) echo '
'; echo ShowItem(array( array('?p_action=ca_pa&'.$str_dossier,'Plan Analytique',"Plan Analytique",0), - array('?p_action=ca_od&'.$str_dossier,'Opérations Diverses',"Permet d'enregistrer des opérations sur la compta analytique",1), + array('?p_action=ca_od&'.$str_dossier,'Opérations Diverses',"Permet d'enregistrer des operations sur la compta analytique",1), array('?p_action=ca_groupe&'.$str_dossier,'Groupe','Regroupe les postes analytiques',3), array('?p_action=ca_imp&'.$str_dossier,'Impression',"impression de rapport",2) ), diff --git a/html/export_ouv.php b/html/export_ouv.php index 4613e2640..66457121c 100644 --- a/html/export_ouv.php +++ b/html/export_ouv.php @@ -56,8 +56,8 @@ $ret=get_array($cn,"select distinct j_poste::text from jrnx inner join tmp_pcmn on (pcm_val=j_poste) where j_tech_per >= ".$sql_from[0]['min']." and - j_tech_per <= ".$sql_to[0]['max']." and j_poste not like '7%' - and j_poste not like '6%' + j_tech_per <= ".$sql_to[0]['max']." and j_poste::text not like '7%' + and j_poste::text not like '6%' order by j_poste::text"); if ( $ret == null ) {echo 'Rien à exporter'; exit();} printf ("OUVERTURE\n"); diff --git a/html/fiche.php b/html/fiche.php index 4afcdfbfc..21bf7e636 100644 --- a/html/fiche.php +++ b/html/fiche.php @@ -222,7 +222,7 @@ if ( isset ( $_GET["action"]) ) { $sql="select distinct f_id,fd_id,av_text from fiche join jnt_fic_att_value using (f_id) join attr_value using (jft_id) where upper(av_text) like upper('%".FormatString($_GET["search_text"])."%') order by av_text,f_id"; - $all=getArray($cn,$sql); + $all=get_array($cn,$sql); // test on the size // if ( sizeof($all) != 0 ) diff --git a/html/fid.php b/html/fid.php index 78655f5a1..86009af80 100644 --- a/html/fid.php +++ b/html/fid.php @@ -24,7 +24,6 @@ * \brief Fid for the ajax request for cards */ -header("Content-type: text/xml charset=\"ISO8859-1\"",true); require_once ("constant.php"); require_once ("postgres.php"); @@ -77,23 +76,17 @@ if ( isset($_SESSION['isValid']) && $_SESSION['isValid'] == 1) $tva_id=$array[0]['tva_id']; // Check null - $name=($name==null)?" ":$name; - $sell=($sell==null)?" ":$sell; - $buy=($buy==null)?" ":$buy; - $tva_id=($tva_id==null)?" ":$tva_id; + $name=($name==null)?" ":str_replace('"','',$name); + $sell=($sell==null)?" ":str_replace('"','',$sell); + $buy=($buy==null)?" ":str_replace('"','',$buy); + $tva_id=($tva_id==null)?" ":str_replace('"','',$tva_id); - $a=''; - $a.=""; - $a.="".$name.""; - $a.="".$sell.""; - $a.="".$buy.""; - $a.="".$tva_id.""; - $a.=""; + $a='{"answer":"ok","name":"'.$name.'","sell":"'.$sell.'","buy":"'.$buy.'","tva_id":"'.$tva_id.'","ctl":"'.$_GET['ctl'].'"}'; } else - $a="not connected"; + $a='{"answer":"nok"}'; echo_debug("fid.php",__LINE__,"Answer is \n $a"); - +header("Content-type: text/html; charset: ISO8859-1",true); print $a; ?> diff --git a/html/index.php b/html/index.php index 8fb7d77c6..5be91c1f5 100644 --- a/html/index.php +++ b/html/index.php @@ -76,22 +76,18 @@ BODY { -Version 3.1.0 -
-

Il est conseillé de ne PAS utiliser Internet Explorer. -

- Vous pouvez utiliser un autre browser: firefox, mozilla, netscape, Konqueror, opera... -

-

- - Si vous avez envie de nous rejoindre, vous êtes les bienvenus - . -

-
- + +version 3.1.0 + +
+
+
+
Logo
+
+
- +
@@ -105,7 +101,9 @@ Version 3.1.0
+ +
diff --git a/html/jrn_csv.php b/html/jrn_csv.php index c3eaa4bb3..aed02bc4d 100644 --- a/html/jrn_csv.php +++ b/html/jrn_csv.php @@ -99,6 +99,15 @@ if ( $_GET['p_simple'] == 0 ) '"internal";'. '"montant";'. "\r\n"); + // set a filter for the FIN + $a_parm_code=get_array($cn,"select p_value from parm_code where p_code in ('BANQUE','COMPTE_COURANT','CAISSE')"); + $sql_fin="("; + $or=""; + foreach ($a_parm_code as $code) { + $sql_fin.="$or j_poste::text like '".$code['p_value']."%'"; + $or=" or "; + } + $sql_fin.=")"; foreach ($Row as $line) { @@ -113,7 +122,7 @@ if ( $_GET['p_simple'] == 0 ) // Get the jrn type if ( $line['jrn_def_type'] == 'FIN' ) { $positive = CountSql($cn,"select * from jrn inner join jrnx on jr_grpt_id=j_grpt ". - " where jr_id=".$line['jr_id']." and (j_poste like '55%' or j_poste like '57%' )". + " where jr_id=".$line['jr_id']." and $sql_fin ". " and j_debit='f'"); diff --git a/html/js/ajax_fiche.js b/html/js/ajax_fiche.js index 9cb4c6740..79169a78f 100644 --- a/html/js/ajax_fiche.js +++ b/html/js/ajax_fiche.js @@ -41,107 +41,79 @@ function clean_Fid(p_ctl) nSell=p_ctl+"_sell"; nBuy=p_ctl+"_buy"; nTva_id=p_ctl+"_tva_id"; - - if ( document.getElementById(nSell) != null ) { - document.getElementById(nSell).value=""; - } - if ( document.getElementById(nBuy) != null ) { - document.getElementById(nBuy).value=""; - } - - if ( document.getElementById(nTva_id) != null ) { - document.getElementById(nTva_id).value=""; - } - + if ( $(nSell) ) { $(nSell).value=""; } + if ( $(nBuy) ) { $(nBuy).value="";} + if ( $(nTva_id) ) { $(nTva_id).value="-1"; } + +} +function errorFid(request,json) { + alert('erreur : ajax fiche'); } - /*!\brief this function fills the data from fid.php, * \param p_ctl the ctrl to fill * \param p_deb if debit of credit * \param p_jrn the ledger */ -function ajaxFid(p_ctl,p_deb,p_jrn){ - var ajaxRequest; // The variable that makes Ajax possible! -; - try{ - // Opera 8.0+, Firefox, Safari - ajaxRequest = new XMLHttpRequest(); - } catch (e){ - // Internet Explorer Browsers - try{ - ajaxRequest = new ActiveXObject("Msxml2.XMLHTTP"); - } catch (e) { - try{ - ajaxRequest = new ActiveXObject("Microsoft.XMLHTTP"); - } catch (e){ - // Something went wrong - alert("Your browser broke!"); - return false; - } - } - } - // Create a function that will receive data sent from the server - ajaxRequest.onreadystatechange = function(){ - if(ajaxRequest.readyState == 4){ - if ( ajaxRequest.status == 200 ) { - - xmldoc = ajaxRequest.responseXML.documentElement; - data = xmldoc.getElementsByTagName('name'); - - label = data[0].firstChild.nodeValue; - sell = xmldoc.getElementsByTagName('sell')[0].firstChild.nodeValue; - buy = xmldoc.getElementsByTagName('buy')[0].firstChild.nodeValue; - tva_id = xmldoc.getElementsByTagName('tva_id')[0].firstChild.nodeValue; - - toSet=p_ctl+"_label"; - - if ( trim(label) == "" ) - { - var ctl_toSet=document.getElementById(toSet); - ctl_toSet.innerHTML="Fiche inconnue"; - ctl_toSet.style.color='red'; - clean_Fid(p_ctl); - } - else { - var ctl_toSet=document.getElementById(toSet); - ctl_toSet.style.color='black'; - ctl_toSet.innerHTML=label; - nSell=p_ctl+"_sell"; - nBuy=p_ctl+"_buy"; - nTva_id=p_ctl+"_tva_id"; - - if ( document.getElementById(nSell) != null ) { - - document.getElementById(nSell).value=sell; - } - if ( document.getElementById(nBuy) != null ) { - - document.getElementById(nBuy).value=buy; - } - - if ( document.getElementById(nTva_id) != null ) { - - document.getElementById(nTva_id).value=tva_id; - } - } - } - } - } - if (document.getElementById(p_ctl).value.length == 0 ) { - var toSet=p_ctl+"_label"; - var ctl_toSet=document.getElementById(toSet); - ctl_toSet.innerHTML=""; - // clean other fields - clean_Fid(p_ctl); - - } else { - var gDossier=document.getElementById('gDossier').value; - queryString="?FID="+document.getElementById(p_ctl).value; - queryString=queryString+"&d="+p_deb+"&j="+p_jrn+'&gDossier='+gDossier; - - ajaxRequest.open("GET", "fid.php"+queryString, true); - ajaxRequest.send(null); - } +function ajaxFid(p_ctl,p_deb,p_jrn) +{ + var gDossier=$('gDossier').value; + var ctl_value=$(p_ctl).value; + if ( trim(ctl_value)==0 ) { + nLabel=p_ctl+"_label"; + $(nLabel).value=""; + $(nLabel).innerHTML=""; + clean_Fid(p_ctl); + return; + } + queryString="?FID="+ctl_value; + queryString=queryString+"&d="+p_deb+"&j="+p_jrn+'&gDossier='+gDossier; + queryString=queryString+'&ctl='+p_ctl; + /* alert(queryString); */ + var action=new Ajax.Request ( + "fid.php", + { + method:'get', + parameters:queryString, + onFailure:errorFid, + onSuccess:successFid + } + + ); + } +/*!\brief callback function for ajax + * \param request : object request + * \param json : json answer */ +function successFid(request,json) { + var answer=request.responseText.evalJSON(true); -//--> \ No newline at end of file + var data=answer.name; + var sell=answer.sell; + var buy=answer.buy; + var tva_id=answer.tva_id; + var ctl=answer.ctl; + +/* alert('data:'+data+' sell:'+sell+' Tva id:'+tva_id); */ + + var toSet=ctl+'_label'; + if (trim(data) == "" ) { + $(toSet).innerHTML="Fiche Inconnue"; + $(toSet).style.color="red"; + clean_Fid(ctl); + } else { + var nSell=ctl+"_sell"; + var nBuy=ctl+"_buy"; + var nTva_id=ctl+"_tva_id"; + $(toSet).innerHTML=data; + $(toSet).style.color="black"; + if ( $(nTva_id) ) { + $(nTva_id).value=tva_id; + } + if ( $(nSell ) ) { + $(nSell).value=sell; + } + $(nBuy).value=buy; + + } +} +//--> diff --git a/html/js/scripts.js b/html/js/scripts.js index 6a5ff8915..db346d085 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -30,7 +30,6 @@ // Set the focus to the specified field, // and select it if requested by SelectIt - function GetID(ID) { if (document.all) { return document.all[ID]; @@ -92,14 +91,6 @@ function HandleSubmit(e) { return true; } } -/* - * Open the search screen - */ -function openRecherche(p_sessid,p_dossier,p_style) { - if ( p_style == 'E' ) { p_style="expert";} - var w=window.open("recherche.php?gDossier="+p_dossier+"&PHPSESSID="+p_sessid+'&'+p_style,'','statusbar=no,scrollbars=yes,toolbar=no'); - w.focus(); -} /*!\brief add a row for the CA * \param p_table_id diff --git a/html/modify_op.php b/html/modify_op.php index feacc62c0..41b9e7b4d 100644 --- a/html/modify_op.php +++ b/html/modify_op.php @@ -66,18 +66,18 @@ if ( ! isset ( $action )) { echo JS_VIEW_JRN_MODIFY; ?> "; + "; echo ' + + '; echo ""; diff --git a/include/action.inc.php b/include/action.inc.php index 5c40b3f70..9e07b2e68 100644 --- a/include/action.inc.php +++ b/include/action.inc.php @@ -1,3 +1,4 @@ + '; $retour=""; $h_url=""; if ( isset ($_REQUEST['url'])) { - $retour=sprintf('',urldecode($_REQUEST['url'])); + $retour=widget::button_href('Retour',urldecode($_REQUEST['url'])); $h_url=sprintf('',urldecode($_REQUEST['url'])); } //---------------------------------------------------------------------- diff --git a/include/bank.inc.php b/include/bank.inc.php index 00a5ef160..5cf306768 100644 --- a/include/bank.inc.php +++ b/include/bank.inc.php @@ -21,6 +21,7 @@ require_once('class_acc_ledger.php'); require_once('user_form_fin.php'); require_once('jrn.php'); +require_once('class_widget.php'); require_once("class_document.php"); require_once("class_fiche.php"); require_once("class_parm_code.php"); @@ -56,7 +57,7 @@ $h_url=""; if ( isset ($_REQUEST['url'])) { - $retour=sprintf('',urldecode($_REQUEST['url'])); + $retour=widget::button_href('Retour',urldecode($_REQUEST['url'])); $h_url=sprintf('',urldecode($_REQUEST['url'])); } @@ -85,8 +86,8 @@ if ( $sub_action == "solde" ) $vir_interne=new parm_code($cn,'VIREMENT_INTERNE'); $accountSql="select distinct pcm_val::text,pcm_lib from tmp_pcmn - where pcm_val like '".$banque->p_value."%' or pcm_val like '".$vir_interne->p_value."%' - or pcm_val like '".$caisse->p_value."%' + where pcm_val::text like '".$banque->p_value."%' or pcm_val::text like '".$vir_interne->p_value."%' + or pcm_val::text like '".$caisse->p_value."%' order by pcm_val::text"; $ResAccount=ExecSql($cn,$accountSql); echo '
'; diff --git a/include/bud_detail.inc.php b/include/bud_detail.inc.php index 36d6d12cc..62ba03464 100644 --- a/include/bud_detail.inc.php +++ b/include/bud_detail.inc.php @@ -28,7 +28,7 @@ require_once ('class_bud_hypo.php'); require_once ('class_anc_account.php'); echo '
'; -/*!\todo Check if there is Hypothesis */ + /* 1st possibility is not defined */ diff --git a/include/bud_synthese.inc.php b/include/bud_synthese.inc.php index 356c0802c..238b4423f 100644 --- a/include/bud_synthese.inc.php +++ b/include/bud_synthese.inc.php @@ -55,12 +55,24 @@ echo ShowItem(array( // echo '
'; -if ( $do=='po') +if ( $do=='po') { + if ($obj->size_analytic() == 0 ) { + echo '

Desole pas d\'hypothese definie avec un plan analytique

'; + exit(); + + } require_once ('bud_spo.inc.php'); +} + +if ( $do=='ga') { + if ($obj->size_analytic() == 0 ) { + echo '

Desole pas d\'hypothese definie avec un plan analytique

'; + exit(); + + } -if ( $do=='ga') require_once ('bud_sga.inc.php'); - +} if ( $do=='vglobal') require_once ('bud_svglobal.inc.php'); diff --git a/include/ca_pa.inc.php b/include/ca_pa.inc.php index 227dd64b2..5a47ccf8e 100644 --- a/include/ca_pa.inc.php +++ b/include/ca_pa.inc.php @@ -135,6 +135,7 @@ if ( isset($_REQUEST['sa'])) $ret.=$po->form(); $ret.=$wSa->IOValue(); $ret.=widget::submit("add","Ajout"); + $ret.=""; $ret.="
"; } // record the poste @@ -231,10 +232,7 @@ if ( isset($_REQUEST['sa'])) } $ret.=""; - $ret.=sprintf(''. - '', - $_GET['pa_id'] - ); + $ret.=widget::button_href('Ajout',"?p_action=ca_pa&sa=po_add&pa_id=".$_GET['pa_id']."&".$str_dossier); $ret.='
'; } diff --git a/include/class_acc_account_ledger.php b/include/class_acc_account_ledger.php index 6df553909..412950151 100644 --- a/include/class_acc_account_ledger.php +++ b/include/class_acc_account_ledger.php @@ -133,7 +133,7 @@ function get_solde($p_cond=" true ") { case when j_debit='f' then j_montant else 0 end as cred from jrnx join tmp_pcmn on j_poste=pcm_val where - j_poste like ('$this->id'::text) and + j_poste::text like ('$this->id'::text) and $p_cond ) as m "); $Max=pg_NumRows($Res); @@ -157,7 +157,7 @@ function get_solde_detail($p_cond="") { case when j_debit='f' then j_montant else 0 end as cred from jrnx join tmp_pcmn on j_poste=pcm_val where - j_poste like ('$this->id'::text) + j_poste::text like ('$this->id'::text) $p_cond ) as m "; @@ -327,7 +327,7 @@ function get_solde_detail($p_cond="") { if ( strlen (trim($item_cred))) { if ( strstr($item_cred,"*") == true ) { $item_cred=strtr($item_cred,"*","%"); - $SqlItem="$or pcm_val like '$item_cred'"; + $SqlItem="$or pcm_val::text like '$item_cred'"; $or=" or "; } else { $SqlItem="$or pcm_val = '$item_cred' "; diff --git a/include/class_acc_bilan.php b/include/class_acc_bilan.php index 2f7f4cf88..d5db1d4ad 100644 --- a/include/class_acc_bilan.php +++ b/include/class_acc_bilan.php @@ -229,7 +229,7 @@ class Acc_Bilan { function load(){ try { if ( $this->id=="") - throw new Exception("le formulaire id n'est pas donnée"); + throw new Exception("le formulaire id n'est pas donnee"); $sql="select b_name,b_file_template,b_file_form,lower(b_type) as b_type from bilan where". " b_id = ".$this->id; diff --git a/include/class_acc_jrn_info.php b/include/class_acc_jrn_info.php new file mode 100644 index 000000000..acf89d7ef --- /dev/null +++ b/include/class_acc_jrn_info.php @@ -0,0 +1,158 @@ +cn=$p_cn; + $this->ji_id=$p_ji_id; + } + function insert() { + if ( ! isset ($this->jr_id) || + ! isset ($this->ji_value) || + ! isset ($this->id_type ) ) + { + echo 'Appel incorrecte '.__FILE__.__LINE__; + var_dump($this); + exit(); + } + try { + $sql=ExecSqlParam( + $this->cn, + 'insert into jrn_info(jr_id,id_type,ji_value) values ($1,$2,$3)'. + ' returning ji_id ', + array ($this->jr_id,$this->id_type,$this->ji_value) + ); + $this->ji_id=pg_fetch_result($sql,0,0); + } catch (Exception $e) { + echo "Echec sauvegarde info additionnelles"; + throw $e; + } + } + function update() { + if ( ! isset ($this->jr_id) || + ! isset ($this->ji_value) || + ! isset ($this->jr_id ) ) + { + echo 'Appel incorrecte '.__FILE__.__LINE__; + var_dump($this); + exit(); + } + try { + $sql=ExecSqlParam( + $this->cn, + 'update jrn_info set jr_id=$1 ,id_type=$2,ji_value=$3 where ji_id=$4)'. + array ($this->jr_id,$this->id_type,$this->ji_value,$this->ji_id) + ); + } catch (Exception $e) { + Rollback($this->cn); + echo "Echec sauvegarde info additionnelles"; + throw $e; + } + } + function load() { + $sql="select jr_id,id_type,ji_value from jrn_info where ji_id=".$this->ji_id; + $r=ExecSql($this->cn,$sql); + if (pg_NumRows ($r) > 0 ) { + $this->from_array(pg_fetch_array($r,0)); + return 0; + }else { + return 1; + } + + } + function from_array($p_array) { + foreach ($p_array as $col=>$value) { + $this->$col=$value; + } + } + function set_id($p_ji_id) { + $this->$ji_id=$p_ji_id; + } + function set_jrn_id($p_id) { + $this->jr_id=$p_id; + } + function set_type($p_id) { + $this->id_type=$p_id; + } + function set_value($p_id) { + $this->ji_value=$p_id; + } + /*!\brief load all the jrn_info thanks the jr_id + * \return an array of object + */ + function load_all() { + if ( ! isset ($this->jr_id) ) { echo "jr_id is not set ".__FILE__.__LINE__;exit();} + + $sql="select ji_id from jrn_info where jr_id=".$this->jr_id; + $r=ExecSql($this->cn,$sql); + if (pg_NumRows($r) == 0 ) + return array(); + $array=pg_fetch_all($r); + $ret=array(); + foreach ($array as $row) { + $o=new Acc_Jrn_Info($this->cn,$row['ji_id']); + $o->load(); + $ret[]=clone $o; + } + return $ret; + } + function count() { + $sql="select ji_id from jrn_info where jr_id=".$this->jr_id; + return CountSql($this->cn,$sql); + } + function search_id_internal($p_internal) { + $sql="select jr_id from jrn where jr_internal='$p_internal'"; + $r=ExecSql($this->cn,$sql); + if (pg_NumRows($r) > 0 ) { + $this->jr_id=pg_fetch_result($r,0,0); + return $this->jr_id; + } else { + $this->jr_id=-1; + return $this->jr_id; + } + } + static function test_me() { + echo "Dossier = ".Dossier::id(); + $cn=DbConnect(Dossier::id()); + $a=new Acc_Jrn_Info($cn); + $a->jr_id=3; + $a->id_type='BON_COMMANDE'; + $a->ji_value='BON'; + var_dump($a); + $a->insert(); + + $a->set_jrn_id(7); + $a->set_type('OTHER'); + $a->set_value('Autre test'); + $a->insert(); + } +} diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index 6ffc75480..479f7b60d 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -123,8 +123,8 @@ class Acc_Ledger { if ( $this->id != 0 ) { if ( $cent=='off' ) { - echo_debug('class_acc_ledger.php',__LINE__,"journaux non centralisé"); - // Journaux non centralisés + echo_debug('class_acc_ledger.php',__LINE__,"journaux non centralise"); + // Journaux non centralises $Res=ExecSql($this->db,"select j_id,j_id as int_j_id,to_char(j_date,'DD.MM.YYYY') as j_date, jr_internal, case j_debit when 't' then j_montant::text else ' ' end as deb_montant, @@ -141,8 +141,8 @@ class Acc_Ledger { " and ".$periode." order by j_date::date asc,jr_internal,j_debit desc ". $cond_limite); }else { - // Journaux centralisés - // echo'class_acc_ledger.php',__LINE__,"journaux centralisé"; + // Journaux centralises + // echo'class_acc_ledger.php',__LINE__,"journaux centralise"; $Sql="select jr_opid as j_id, c_order as int_j_id, to_char (c_date,'DD.MM.YYYY') as j_date , @@ -173,8 +173,8 @@ class Acc_Ledger { } else { // Grand Livre if ( $cent == 'off') { - echo_debug('class_acc_ledger.php',__LINE__,"Grand livre non centralisé"); - // Non centralisé + echo_debug('class_acc_ledger.php',__LINE__,"Grand livre non centralise"); + // Non centralise $Res=ExecSql($this->db,"select j_id,j_id as int_j_id,to_char(j_date,'DD.MM.YYYY') as j_date, jr_internal, case j_debit when 't' then j_montant::text else ' ' end as deb_montant, @@ -190,8 +190,8 @@ class Acc_Ledger { $cond_limite); } else { - echo_debug('class_acc_ledger.php',__LINE__,"Grand livre centralisé"); - // Centralisé + echo_debug('class_acc_ledger.php',__LINE__,"Grand livre centralise"); + // Centralise $Sql="select jr_c_opid as j_id, c_order as int_j_id, c_j_id, @@ -334,7 +334,7 @@ class Acc_Ledger { // Non Centralise si cent=off //-- if ($cent=='off') - {// Non centralisé + {// Non centralise $periode=sql_filter_per($this->db,$p_from,$p_to,'p_id','jr_tech_per'); @@ -361,7 +361,7 @@ class Acc_Ledger { $periode=sql_filter_per($this->db,$p_from,$p_to,'p_id','jr_tech_per'); $cond_limite=($p_limit!=-1)?" limit ".$p_limit." offset ".$p_offset:""; - //Centralisé + //Centralise //--- $id=($this->id == 0 ) ?"jr_c_opid as num":"jr_opid as num"; @@ -1254,7 +1254,7 @@ class Acc_Ledger { $op->p_jrn=$id; $op->od_direct='t'; if ($op->count() != 0 ) - echo widget::submit('use_opd','Utilisez une op.prédéfinie'); + echo widget::submit('use_opd','Utilisez une op.prédéfinie'); echo $op->show_button(); echo ''; exit(); diff --git a/include/class_action.php b/include/class_action.php index 4abc87fd3..8c80674a4 100644 --- a/include/class_action.php +++ b/include/class_action.php @@ -398,8 +398,8 @@ class action $str_type=$v[0]; if ( isset ($_REQUEST['url'])) { - $retour=sprintf('', - urldecode($_REQUEST['url'])); + $retour=widget::button_href('Retour',urldecode($_REQUEST['url'])); + $h_url=sprintf('',urldecode($_REQUEST['url'])); } else diff --git a/include/class_admin.php b/include/class_admin.php index 724a8f80c..c704d8cb1 100644 --- a/include/class_admin.php +++ b/include/class_admin.php @@ -101,7 +101,7 @@ class Admin extends fiche{ return $r; foreach ($step_admin as $admin ) { $r.=""; - $e=sprintf(' ', + $e=sprintf(' ', $script,$admin->id,$str_dossier,$url); $r.=" $e".$admin->strAttribut(ATTR_DEF_QUICKCODE).""; diff --git a/include/class_anc_account.php b/include/class_anc_account.php index c8db6ebff..c8ee246df 100644 --- a/include/class_anc_account.php +++ b/include/class_anc_account.php @@ -226,10 +226,15 @@ class Anc_Account $wPa_id=new widget("hidden","pa_id","pa_id",$this->pa_id); $wAmount=new widget("text","Montant","po_amount",$this->amount); $wDescription=new widget("text","Description","po_description",$this->description); - $wGa_id=new widget("select","Groupe","ga_id"); - $wGa_id->value=make_array($this->db,"select ga_id,ga_id from groupe_analytique",1); - $wGa_id->selected=$this->ga_id; - $wGa_id->table=1; + $aGroup_analytic=make_array($this->db,"select ga_id,ga_id from groupe_analytique where pa_id=".$this->pa_id,1); + if ( count($aGroup_analytic) > 1 ) { + $wGa_id=new widget("select","Groupe","ga_id"); + $wGa_id->value=$aGroup_analytic; + $wGa_id->selected=$this->ga_id; + $wGa_id->table=1; + } else { + $wGa_id=new widget('span'); + } $pa=new Anc_Plan($this->db,$this->pa_id); $pa->get(); $wPaName=new widget("text","Plan A.","",$pa->name); diff --git a/include/class_anc_balance_double.php b/include/class_anc_balance_double.php index df0e042af..f763c1de6 100644 --- a/include/class_anc_balance_double.php +++ b/include/class_anc_balance_double.php @@ -204,7 +204,7 @@ class Anc_Balance_Double extends Anc_Print 'solde'=>'Solde', 'dc'=>'D/C'), 'Totaux', - array('shaded'=>1,'showHeadings'=>1,cols=>array + array('shaded'=>1,'showHeadings'=>1,'cols'=>array ('debit'=>array('justification'=>'right'), 'credit'=>array('justification'=>'right'), 'solde'=>array('justification'=>'right'), ) @@ -274,7 +274,7 @@ class Anc_Balance_Double extends Anc_Print $choose=new widget("button"); $choose->name="Choix Poste"; $choose->label="Recherche"; - $choose->javascript="onClick=search_ca('".$_REQUEST['PHPSESSID']."',".dossier::id().",'from_poste2','pa_id')"; + $choose->javascript="onClick=search_ca('".$_REQUEST['PHPSESSID']."',".dossier::id().",'from_poste2','pa_id2')"; $r.=$choose->IOValue(); $r.=" et le poste ".$poste->IOValue("to_poste2",$this->to_poste2); @@ -370,7 +370,7 @@ class Anc_Balance_Double extends Anc_Print $and=" and "; } if ( $filter_poste != "") - $filter_poste.=" where ".$filter_poste; + $filter_poste=" where ".$filter_poste; $sql=" select a_po_id , @@ -386,7 +386,7 @@ b.po_id as b_po_id, case when a.oa_debit='t' then a.oa_amount else 0 end as a_oa_amount_d, case when a.oa_debit='f' then a.oa_amount else 0 end as a_oa_amount_c from -operation_analytique as a join operation_analytique as b using (oa_group) +operation_analytique as a join operation_analytique as b using (j_id) where a.pa_id=". $this->pa_id." and b.pa_id=".$this->pa_id2." ".$this->set_sql_filter()." diff --git a/include/class_anc_group_operation.php b/include/class_anc_group_operation.php index 7af0720e0..f743b7412 100644 --- a/include/class_anc_group_operation.php +++ b/include/class_anc_group_operation.php @@ -174,12 +174,12 @@ class Anc_Group_Operation $p->oa_amount=$p_array["pamount$i"]; $p->oa_description=$p_array["pdesc"]; - $p->oa_date=$_POST['pdate']; + $p->oa_date=$p_array['pdate']; $p->j_id=0; $p->oa_debit=(isset ($p_array["pdeb$i"]))?'t':'f'; $p->oa_group=0; - $p->po_id=$_POST["pop$i"."plan".$idx]; + $p->po_id=$p_array["pop$i"."plan".$idx]; $p->pa_id=$idx; $this->a_operation[]=clone $p; } diff --git a/include/class_anc_plan.php b/include/class_anc_plan.php index 8e4b3b778..273bcdd12 100644 --- a/include/class_anc_plan.php +++ b/include/class_anc_plan.php @@ -209,7 +209,7 @@ class Anc_Plan var_dump($p); echo "

Update

"; $p->name="Update "; - $p->description="c'est changé"; + $p->description="c'est change"; $p->update(); $p->get(); var_dump($p); diff --git a/include/class_bud_hypo.php b/include/class_bud_hypo.php index b88d5ffb0..5963dd9d5 100644 --- a/include/class_bud_hypo.php +++ b/include/class_bud_hypo.php @@ -77,7 +77,7 @@ class Bud_Hypo { function add() { $bh_saldo=(isNumber($this->bh_saldo) == 1 ) ?$this->bh_saldo:0; $pa_id=($this->pa_id <= 0 )?null:$this->pa_id; - + if ( strlen(trim ($this->bh_name)) == 0 ) return; $sql="insert into bud_hypothese( bh_name,bh_saldo,bh_description,pa_id) ". " values ($1,$2,$3,$4) returning bh_id"; $array=array( @@ -90,6 +90,7 @@ class Bud_Hypo { $this->bh_id=pg_fetch_result($a,0,0); } function update() { + if ( strlen(trim ($this->bh_name)) == "" ) return; $bh_name=pg_escape_string($this->bh_name); $bh_saldo=(isNumber($this->bh_saldo) == 1 ) ?$this->bh_saldo:0; $bh_description=pg_escape_string($this->bh_description); @@ -174,6 +175,11 @@ class Bud_Hypo { $count=getDbValue($this->db,"select count(*) from bud_hypothese"); return $count; } + function size_analytic() { + $count=getDbValue($this->db,"select count(*) from bud_hypothese where pa_id is not null"); + return $count; + } + static function test_me() { $cn=DbConnect (dossier::id()); ExecSql($cn,"delete from bud_hypothese"); diff --git a/include/class_bud_synthese_acc.php b/include/class_bud_synthese_acc.php index a633ede01..d0348bd1e 100644 --- a/include/class_bud_synthese_acc.php +++ b/include/class_bud_synthese_acc.php @@ -59,7 +59,7 @@ class Bud_Synthese_Acc extends Bud_Synthese { /* 2nd Step */ if ( $this->bh_id == 0 ) - throw new Exception ("bh_id n'est pas sélectionné"); + throw new Exception ("bh_id n'est pas selectionne"); $hypo=new Bud_Hypo($this->cn); $hypo->bh_id=$this->bh_id; $hypo->load(); @@ -163,6 +163,8 @@ class Bud_Synthese_Acc extends Bud_Synthese { " join parm_periode using (p_id) ". " where bc_id=$1 and $per and pcm_val=$2 group by p_id,p_start order by p_start"); + if ( empty ($aBudCard)) + return; // foreach card get the detail per pcm_val and periode foreach ($aBudCard as $rBudCard) { $line=array(); @@ -232,10 +234,10 @@ class Bud_Synthese_Acc extends Bud_Synthese { function display_html($p_array) { $r=""; if (empty($p_array)) return; + $persql=sql_filter_per($this->cn,$this->from,$this->to,'p_id','p_id'); $per=get_array($this->cn,"select to_char(p_start,'MM.YYYY') as d". " from parm_periode ". - " where p_id between ".$this->from.' and '. - $this->to." order by p_start" ); + " where $persql"); $heading=" CE "; foreach( $per as $c) { $heading.=''.$c['d'].'';} diff --git a/include/class_bud_synthese_anc.php b/include/class_bud_synthese_anc.php index 6deca935f..7026ba96b 100644 --- a/include/class_bud_synthese_anc.php +++ b/include/class_bud_synthese_anc.php @@ -57,7 +57,7 @@ class Bud_Synthese_Anc extends Bud_Synthese { /* 2nd Step */ if ( $this->bh_id == 0 ) - throw new Exception ("bh_id n'est pas sélectionné"); + throw new Exception ("bh_id n'est pas selectionne"); $hypo=new Bud_Hypo($this->cn); $hypo->bh_id=$this->bh_id; $hypo->load(); @@ -112,7 +112,7 @@ class Bud_Synthese_Anc extends Bud_Synthese { [80] => 14.0000 ) - [acc_name] => Electricité + [acc_name] => Electricite [acc_amount] => 0 ) @@ -225,10 +225,11 @@ class Bud_Synthese_Anc extends Bud_Synthese { function display_html($p_array) { $r=""; if (empty($p_array)) return; + $persql=sql_filter_per($this->cn,$this->from,$this->to,'p_id','p_id'); $per=get_array($this->cn,"select to_char(p_start,'MM.YYYY') as d". " from parm_periode ". - " where p_id between ".$this->from.' and '. - $this->to." order by p_start" ); + " where $persql"); + $heading=" CE "; foreach( $per as $c) { $heading.=''.$c['d'].'';} $heading.="Total Unite"; diff --git a/include/class_bud_synthese_group.php b/include/class_bud_synthese_group.php index 7d57cd4f3..63a61f2cf 100644 --- a/include/class_bud_synthese_group.php +++ b/include/class_bud_synthese_group.php @@ -1,4 +1,3 @@ - bh_id == 0 ) - throw new Exception ("bh_id n'est pas sélectionné"); + throw new Exception ("bh_id n'est pas selectionne"); $hypo=new Bud_Hypo($this->cn); $hypo->bh_id=$this->bh_id; $hypo->load(); @@ -192,6 +191,9 @@ class Bud_Synthese_Group extends Bud_Synthese { $pcm_val=""; $old="XX"; $sub=array(); + if ( empty($res) ) + return; + foreach ($res as $row) { $pcm_val=$row['pcm_val']; @@ -375,11 +377,11 @@ Array function display_html($p_array) { $r=""; + $persql=sql_filter_per($this->cn,$this->from,$this->to,'p_id','p_id'); list ($head,$foot)=$this->head_foot($p_array); $per=get_array($this->cn,"select p_id,to_char(p_start,'MM.YYYY') as d". " from parm_periode ". - " where p_id between ".$this->from.' and '. - $this->to." order by p_start" ); + " where $persql"); $r.=''; $heading=""; foreach( $per as $c) { @@ -401,7 +403,8 @@ Array $r.=''; $r.=''; // content - + if ( empty($p_array)) + return; foreach ($p_array as $key => $value ){ $r.=''; $r.=''; diff --git a/include/class_bud_synthese_hypo.php b/include/class_bud_synthese_hypo.php index 1075676ee..f6b6c038e 100644 --- a/include/class_bud_synthese_hypo.php +++ b/include/class_bud_synthese_hypo.php @@ -87,7 +87,7 @@ Array [GROUPE1] => 81.7 [GROUPE3] => 28 [total_row] => 109.7 - [acc_name] => Electricité + [acc_name] => Electricite [acc_amount] => 0 ) diff --git a/include/class_customer.php b/include/class_customer.php index ac69ffaa2..9f23b0653 100644 --- a/include/class_customer.php +++ b/include/class_customer.php @@ -105,8 +105,8 @@ class Customer extends fiche{ jrnx as A join jrnx as B using (j_grpt) where - A.j_poste like '".$CUSTOMER."%' and - B.j_poste like '".$SOLD."%' + A.j_poste::text like '".$CUSTOMER."%' and + B.j_poste::text like '".$SOLD."%' $cond_sql "; diff --git a/include/class_document.php b/include/class_document.php index 427e93cd0..06da2fcd8 100644 --- a/include/class_document.php +++ b/include/class_document.php @@ -464,6 +464,9 @@ class Document * - [MY_TVA] * - [MY_STREET] * - [MY_NUMBER] + * - BON_COMMANDE + * - OTHER_INFO + * - CUST_NUM * * \param TAG * \return String which must replace the tag @@ -554,8 +557,7 @@ class Document case 'CUST_CP': $tiers=new fiche($this->db); -$qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST[ -'e_client']; + $qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST['e_client']; $tiers->get_by_qcode($qcode,false); $r=$tiers->strAttribut(ATTR_DEF_CP); @@ -563,8 +565,7 @@ $qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST[ case 'CUST_CITY': $tiers=new fiche($this->db); -$qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST[ -'e_client']; + $qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST['e_client']; $tiers->get_by_qcode($qcode,false); $r=$tiers->strAttribut(ATTR_DEF_CITY); @@ -573,8 +574,7 @@ $qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST[ case 'CUST_CO': $tiers=new fiche($this->db); -$qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST[ -'e_client']; + $qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST['e_client']; $tiers->get_by_qcode($qcode,false); $r=$tiers->strAttribut(ATTR_DEF_PAYS); @@ -584,11 +584,17 @@ $qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST[ case 'CUST_VAT': $tiers=new fiche($this->db); -$qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST[ -'e_client']; + $qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST['e_client']; $tiers->get_by_qcode($qcode,false); $r=$tiers->strAttribut(ATTR_DEF_NUMTVA); break; + case 'CUST_NUM': + $tiers=new fiche($this->db); + $qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST['e_client']; + $tiers->get_by_qcode($qcode,false); + $r=$tiers->strAttribut(ATTR_DEF_NUMBER_CUSTOMER); + break; + // Marchandise in $_POST['e_march*'] // \see user_form_achat.php or user_form_ven.php case 'NUMBER': @@ -811,6 +817,19 @@ $qcode=isset($_REQUEST['qcode_dest'])?$_REQUEST['qcode_dest']:$_REQUEST[ $r=$sum; break; + case 'BON_COMMANDE': + if ( isset($_REQUEST['bon_comm'])) + return $_REQUEST['bon_comm']; + else + return ""; + break; + case 'OTHER_INFO': + if ( isset($_REQUEST['other_info'])) + return $_REQUEST['other_info']; + else + return ""; + break; + } return $r; diff --git a/include/class_dossier.php b/include/class_dossier.php index cd32a3894..3ad92d9bf 100644 --- a/include/class_dossier.php +++ b/include/class_dossier.php @@ -37,6 +37,7 @@ require_once('ac_common.php'); class dossier { + /*!\brief return the $_REQUEST['gDossier'] after a check */ static function id() { echo_debug(__FILE__,__LINE__,"id"); diff --git a/include/class_fiche.php b/include/class_fiche.php index d05171cbb..15e1e15f9 100644 --- a/include/class_fiche.php +++ b/include/class_fiche.php @@ -431,9 +431,13 @@ class fiche { * \brief insert a new record * * \param p_fiche_def fiche_def.fd_id + * \param p_array is the array containing the data */ - function insert($p_fiche_def) + function insert($p_fiche_def,$p_array=null) { + if ( $p_array == null) + $p_array=$_POST; + $fiche_id=NextSequence($this->cn,'s_fiche'); $this->id=$fiche_id; // first we create the card @@ -444,8 +448,8 @@ class fiche { " values (%d,%d)", $fiche_id,$p_fiche_def); $Ret=ExecSql($this->cn,$sql); - // parse the $_POST array - foreach ($_POST as $name=>$value ) + // parse the $p_array array + foreach ($p_array as $name=>$value ) { echo_debug ("class_fiche",__LINE__,"Name = $name value $value") ; list ($id) = sscanf ($name,"av_text%d"); @@ -471,8 +475,8 @@ class fiche { $exercice=$user->get_exercice(); if ( $exercice == 0 ) throw Exception ('Annee invalide erreur'); - $str_stock=sprintf('insert into stock_goods(f_id,sg_initial,sg_code,sg_type,sg_exercice) '. - ' values (%d,upper(\'%s\'),\'c\',\'%s\')', + $str_stock=sprintf('insert into stock_goods(f_id,sg_quantity,sg_comment,sg_code,sg_type,sg_exercice) '. + ' values (%d,0,\'%s\',upper(\'%s\'),\'d\',\'%s\')', $fiche_id, 'initial', FormatString($value), @@ -565,12 +569,15 @@ class fiche { /*!\brief update a card * \todo add a check to return an error and rollback operation */ - function update() + function update($p_array=null) { + if ( $p_array == null) + $p_array=$_POST; + try { StartSql($this->cn); - // parse the $_POST array - foreach ($_POST as $name=>$value ) + // parse the $p_array array + foreach ($p_array as $name=>$value ) { echo_debug ("class_fiche",__LINE__,"Name = $name value $value") ; list ($id) = sscanf ($name,"av_text%d"); @@ -619,19 +626,24 @@ class fiche { } if ( $id == ATTR_DEF_STOCK ) { $st=CountSql($this->cn,'select * from stock_goods where '. - " upper(sg_code)=upper('$value')"); + " f_id=".$this->id); if ( $st == 0 ) { $user=new User($this->cn); $exercice=$user->get_exercice(); if ( $exercice == 0 ) throw Exception ('Annee invalide erreur'); - $str_stock=sprintf('insert into stock_goods(f_id,sg_comment,sg_code,sg_type,sg_exercice) '. - ' values (%d,upper(\'%s\'),upper(\'%s\'),\'d\',%s)', - $this->id, - 'initial', - FormatString($value), - $exercice); - + $str_stock=sprintf('insert into stock_goods(f_id,sg_quantity,sg_comment,sg_code,sg_type,sg_exercice) '. + ' values (%d,0,\'%s\',upper(\'%s\'),\'d\',\'%s\')', + $this->id, + 'initial', + FormatString($value), + $exercice); + + ExecSql($this->cn,$str_stock); + }else { + $str_stock=sprintf("update stock_goods set sg_code=upper('%s') where f_id=%d", + FormatString($value), + $this->id); ExecSql($this->cn,$str_stock); } } @@ -876,12 +888,15 @@ class fiche { * * \return none */ - function HtmlTable() + function HtmlTable($p_array=null) { + if ( $p_array == null) + $p_array=$_POST; + $name=$this->getName(); - list($array,$tot_deb,$tot_cred)=$this->get_row( $_POST['from_periode'], - $_POST['to_periode'] + list($array,$tot_deb,$tot_cred)=$this->get_row( $p_array['from_periode'], + $p_array['to_periode'] ); if ( count($this->row ) == 0 ) @@ -928,8 +943,11 @@ class fiche { * * \return none */ - function HtmlTableHeader() + function HtmlTableHeader($p_array=null) { + if ( $p_array == null) + $p_array=$_POST; + $submit=new widget(); $hid=new widget("hidden"); echo '
'; @@ -948,8 +966,8 @@ class fiche { $hid->IOValue('p_action','impress'). $hid->IOValue("f_id",$this->id). dossier::hidden(). - $hid->IOValue("from_periode",$_POST['from_periode']). - $hid->IOValue("to_periode",$_POST['to_periode']); + $hid->IOValue("from_periode",$p_array['from_periode']). + $hid->IOValue("to_periode",$p_array['to_periode']); echo ""; echo '
"; echo "
CE
'.$key.'
'. @@ -958,8 +976,8 @@ class fiche { $hid->IOValue("type","poste"). $hid->IOValue('p_action','impress'). $hid->IOValue("f_id",$this->id). - $hid->IOValue("from_periode",$_POST['from_periode']). - $hid->IOValue("to_periode",$_POST['to_periode']); + $hid->IOValue("from_periode",$p_array['from_periode']). + $hid->IOValue("to_periode",$p_array['to_periode']); echo "
"; diff --git a/include/class_gestion_purchase.php b/include/class_gestion_purchase.php index 9fb475207..eb51ed160 100644 --- a/include/class_gestion_purchase.php +++ b/include/class_gestion_purchase.php @@ -43,7 +43,9 @@ class gestion_purchase extends gestion_table var $qp_nd_tva_recup; /*!< tva ded via taxe */ var $qp_supplier; /*!< supplier code (f_id) */ var $qp_valid; - var $j_id; /*!< jrnx.j_id */ + var $j_id; /*!< jrnx.j_id + */ + var $qp_dep_priv; /*!< private purchase */ /*!\brief return an array of gestion_table, the object are * retrieved thanks the qs_internal */ @@ -63,7 +65,8 @@ class gestion_purchase extends gestion_table qp_nd_tva, qp_nd_tva_recup, qp_supplier, - j_id + j_id, + qp_dep_priv from quant_purchase left join tva_rate on (qp_vat_code=tva_id) where qp_internal='".$this->qp_internal."'"; $ret=ExecSql($this->db,$sql); diff --git a/include/class_periode.php b/include/class_periode.php index 95fbbba0b..1b656cf0c 100644 --- a/include/class_periode.php +++ b/include/class_periode.php @@ -217,7 +217,7 @@ class Periode { echo ' '.$l_line['p_exercice'].''; if ( $l_line['status'] != 'OP' ) { - $closed=($l_line['status']=='CE')?'Centralisée':'Fermée'; + $closed=($l_line['status']=='CE')?'Centralisee':'Fermée'; } else { $closed=''; $closed.=' Cloturer'; diff --git a/include/class_user.php b/include/class_user.php index 703768d1a..fc11f2dc6 100644 --- a/include/class_user.php +++ b/include/class_user.php @@ -324,7 +324,7 @@ function load_global_pref() $line[$type]=$row['parameter_value'];; } // save array into g_ variable - $array_pref=array ('g_theme'=>'THEME','g_pagesize'=>'PAGESIZE'); + $array_pref=array ('g_theme'=>'THEME','g_pagesize'=>'PAGESIZE','g_topmenu'=>'TOPMENU'); foreach ($array_pref as $name=>$parameter ) { if ( ! isset ($line[$parameter]) ) { echo_debug("Missing pref : ".$parameter); @@ -349,7 +349,7 @@ function insert_default_global_pref($p_type="",$p_value="") { echo_debug('class_user.php',__LINE__,"parameter p_type $p_type p_value $p_value"); $default_parameter= array("THEME"=>"Light", - "PAGESIZE"=>"50"); + "PAGESIZE"=>"50",'TOPMENU'=>'SELECT'); $cn=Dbconnect(); $Sql="insert into user_global_pref(user_id,parameter_type,parameter_value) values ('%s','%s','%s')"; @@ -378,7 +378,7 @@ function insert_default_global_pref($p_type="",$p_value="") { */ function update_global_pref($p_type,$p_value="") { $default_parameter= array("THEME"=>"Light", - "PAGESIZE"=>"50"); + "PAGESIZE"=>"50",'TOPMENU'=>'SELECT'); $cn=Dbconnect(); $Sql="update user_global_pref set parameter_value='%s' where parameter_type='%s' and diff --git a/include/class_widget.php b/include/class_widget.php index 554a39813..afb7dbf51 100644 --- a/include/class_widget.php +++ b/include/class_widget.php @@ -129,7 +129,7 @@ class widget { $r='javascript." ".$disabled." $readonly $this->extra >"; + 'SIZE="'.$this->size.'" '.$this->javascript." ".$disabled." $readonly $this->extra >"; if ($this->table==1) { if ( $this->label != "") { @@ -657,9 +657,19 @@ class widget { return ''; } static function button_href($p_name,$p_value) { - return sprintf('', - $p_value, - $p_name); + $agent=$_SERVER['HTTP_USER_AGENT']; + + if ( strpos($agent,'MSIE') == 0 && + strpos ($agent,'Konqueror') ==0) + return sprintf('', + $p_value, + $p_name); + + return sprintf(' '. + ' %s', + $p_value, + $p_name); + } } diff --git a/include/client.inc.php b/include/client.inc.php index ce2324cba..fcd395b5d 100644 --- a/include/client.inc.php +++ b/include/client.inc.php @@ -46,8 +46,7 @@ if ( isset ($_POST['delete']) ) if ( $sub_action=="insert" ) { - $retour=sprintf('', - urldecode($_REQUEST['url'])); + $retour=widget::button_href("Retour", urldecode($_REQUEST['url'])); $customer=new Customer($cn); $customer->Save($_REQUEST['fd_id']); @@ -77,8 +76,8 @@ if ( $sub_action == "" ) if ( $sub_action=="blank") { - $retour=sprintf('', - "commercial.php?p_action=client&$str_dossier"); + $retour=widget::button_href('Retour','commercial.php?p_action=fournisseur&'.dossier::get()); + echo '
'; echo $retour; @@ -116,7 +115,6 @@ if ( $sub_action == "list" )
- +
@@ -148,8 +147,8 @@ if ( $sub_action == 'detail' ) $f_id=$_REQUEST['f_id']; echo '
'; $client=new Customer($cn,$f_id); - $retour=sprintf('', - urldecode($_REQUEST['url'])); + $retour=widget::button_href("Retour", urldecode($_REQUEST['url'])); + echo $retour; echo '
'; echo dossier::hidden(); diff --git a/include/constant.php b/include/constant.php index b413b7acc..08aea30ae 100644 --- a/include/constant.php +++ b/include/constant.php @@ -136,7 +136,8 @@ define ("ATTR_DEF_EMAIL",18); define ("ATTR_DEF_CITY",24); define ("ATTR_DEF_COMPANY",25); define ("ATTR_DEF_FAX",26); - +define ("ATTR_DEF_NUMBER_CUSTOMER",30); +define ("ATTR_DEF_DEP_PRIV",31); define ("FICHE_TYPE_CLIENT",9); define ("FICHE_TYPE_VENTE",1); diff --git a/include/contact.inc.php b/include/contact.inc.php index e16eb3bf6..d0b4a5ae3 100644 --- a/include/contact.inc.php +++ b/include/contact.inc.php @@ -36,7 +36,8 @@ $sub_action=(isset($_REQUEST['sa']))?$_REQUEST['sa']:""; // TODO add function for generating url, hidden tags... if ( isset ($_REQUEST['url'])) { - $retour=sprintf('',urldecode($_REQUEST['url'])); + $retour=widget::button_href('Retour',urldecode($_REQUEST['url'])); + $h_url=sprintf('',urldecode($_REQUEST['url'])); } else @@ -87,8 +88,8 @@ if ( $sub_action == "" ) //Display a blank card if ( $sub_action=="blank") { - $retour_action=sprintf('', - "commercial.php?p_action=contact&$str_dossier"); + $retour_action=widget::button_href('Retour', "commercial.php?p_action=contact&$str_dossier"); + echo '
'; echo $retour_action; diff --git a/include/depense.inc.php b/include/depense.inc.php index 33b2ae8eb..d3981e5e4 100644 --- a/include/depense.inc.php +++ b/include/depense.inc.php @@ -52,7 +52,8 @@ $h_url=""; if ( isset ($_REQUEST['url'])) { - $retour=sprintf('',urldecode($_REQUEST['url'])); + $retour=widget::button_href('Retour',urldecode($_REQUEST['url'])); + $h_url=sprintf('',urldecode($_REQUEST['url'])); } diff --git a/include/facture.inc.php b/include/facture.inc.php index 28c0b0b0f..6b682c986 100644 --- a/include/facture.inc.php +++ b/include/facture.inc.php @@ -24,6 +24,8 @@ require_once('jrn.php'); require_once("class_document.php"); require_once("class_fiche.php"); require_once("check_priv.php"); +require_once('class_acc_jrn_info.php'); + $tag_list='Liste'; $tag_list_sel='Liste'; $tag_unpaid='Non paye'; @@ -52,7 +54,8 @@ $h_url=""; if ( isset ($_REQUEST['url'])) { - $retour=sprintf('',urldecode($_REQUEST['url'])); + $retour=widget::button_href('Retour',urldecode($_REQUEST['url'])); + $h_url=sprintf('',urldecode($_REQUEST['url'])); } @@ -357,6 +360,19 @@ if ( isset($_POST['record_and_print_invoice'])) // Update the comment with invoice number $sql="update jrn set jr_comment='Facture ".$doc->d_number."' where jr_internal='$internal'"; ExecSql($cn,$sql); + /* Save the additional information into jrn_info */ + $obj=new Acc_Jrn_Info($cn); + $jr_id=$obj->search_id_internal($internal); + if (strlen(trim($_POST['bon_comm'] )) != 0 ) { + $obj->set_type('BON_COMMANDE'); + $obj->set_value($_POST['bon_comm']); + $obj->insert(); + } + if (strlen(trim($_POST['other_info'] )) != 0 ) { + $obj->set_type('OTHER'); + $obj->set_value($_POST['other_info']); + $obj->insert(); + } echo $str_file; } } else { diff --git a/include/fiche.inc.php b/include/fiche.inc.php index 549a04268..acc9a26ac 100644 --- a/include/fiche.inc.php +++ b/include/fiche.inc.php @@ -255,7 +255,7 @@ if ( isset ( $_GET["action"]) ) { $sql="select distinct f_id,fd_id,av_text from fiche join jnt_fic_att_value using (f_id) join attr_value using (jft_id) where upper(av_text) like upper('%".FormatString($_GET["search_text"])."%') order by av_text,f_id"; - $all=getArray($cn,$sql); + $all=get_array($cn,$sql); // test on the size // if ( sizeof($all) != 0 ) diff --git a/include/fiche_def.inc.php b/include/fiche_def.inc.php index fed2f7318..8f311bf52 100644 --- a/include/fiche_def.inc.php +++ b/include/fiche_def.inc.php @@ -56,7 +56,7 @@ echo ""; if ( isset ($_POST['mod']) ) { extract ($_POST); - echo '
'; + echo '
'; echo "Voulez-vous modifier ?
Attention, ne changer pas la signification de "; echo " ce poste, par exemple ne pas changer Client par fournisseur,
sinon le programme fonctionnera mal, utiliser uniquement des chiffres pour la classe de base ou rien"; $idx=$_POST['idx']; diff --git a/include/import_inc.php b/include/import_inc.php index b70533e2b..126267d86 100644 --- a/include/import_inc.php +++ b/include/import_inc.php @@ -27,7 +27,7 @@ require_once('class_user.php'); require_once('class_widget.php'); require_once('class_fiche.php'); require_once('class_acc_ledger.php'); - +require_once('class_parm_code.php'); /*! ************************************************** * \brief Parse the file and insert the record @@ -389,7 +389,8 @@ $w=new widget("select"); $w->label='Journal'; echo $w->label." :".$w->IOValue('import_jrn',$jrn)."
"; // choose the bank account - $bq=make_array($p_cn,"select pcm_val,pcm_lib from tmp_pcmn where pcm_val like '550%'"); + $banque=new parm_code($p_cn,'BANQUE'); + $bq=make_array($p_cn,"select pcm_val,pcm_lib from tmp_pcmn where pcm_val::text like '".$banque->p_value."%'"); $w->label='Banque'; echo "Compte en banque :".$w->IOValue('import_bq',$bq)."
"; $format_csv=make_array($p_cn,"select include_file,name from format_csv_banque;"); diff --git a/include/impress_inc.php b/include/impress_inc.php index 00ca6cf31..3bec06932 100644 --- a/include/impress_inc.php +++ b/include/impress_inc.php @@ -584,7 +584,7 @@ function ParseFormula($p_cn,$p_label,$p_formula,$p_start,$p_end,$p_eval=true,$p_ "select p_exercice from parm_periode where p_id=$user_periode"); $sql_per="select to_char(p_start,'MM.YYYY') as start from parm_periode where ". " p_exercice='".$periode."' order by p_start"; - $ret=getArray($p_cn,$sql_per); + $ret=get_array($p_cn,$sql_per); $from=$ret[0]['start']; } @@ -650,7 +650,7 @@ function GetFormulaValue($p_cn,$p_label,$p_formula,$p_cond) $l_credit=0; // somme debit $Res=ExecSql($p_cn,"select sum (j_montant) as montant from - jrnx where $p_cond and j_debit='t' and j_poste like '$p_formula'"); + jrnx where $p_cond and j_debit='t' and j_poste::text like '$p_formula'"); if (pg_NumRows($Res)==0){ $l_debit=0; } else { @@ -659,7 +659,7 @@ function GetFormulaValue($p_cn,$p_label,$p_formula,$p_cond) } // somme credit $Res=ExecSql($p_cn,"select sum (j_montant) as montant from - jrnx where $p_cond and j_debit='f' and j_poste like '$p_formula'"); + jrnx where $p_cond and j_debit='f' and j_poste::text like '$p_formula'"); if (pg_NumRows($Res)==0) { $l_credit=0; } else { diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php index a0ecfba31..b69aceeeb 100644 --- a/include/impress_jrn.inc.php +++ b/include/impress_jrn.inc.php @@ -126,6 +126,15 @@ require_once("class_acc_ledger.php"); /* "Pièce justificative". */ " montant". ""; + // set a filter for the FIN + $a_parm_code=get_array($cn,"select p_value from parm_code where p_code in ('BANQUE','COMPTE_COURANT','CAISSE')"); + $sql_fin="("; + $or=""; + foreach ($a_parm_code as $code) { + $sql_fin.="$or j_poste::text like '".$code['p_value']."%'"; + $or=" or "; + } + $sql_fin.=")"; foreach ($Row as $line) { @@ -140,7 +149,7 @@ require_once("class_acc_ledger.php"); // Get the jrn type if ( $line['jrn_def_type'] == 'FIN' ) { $positive = CountSql($cn,"select * from jrn inner join jrnx on jr_grpt_id=j_grpt ". - " where jr_id=".$line['jr_id']." and (j_poste like '55%' or j_poste like '57%' )". + " where jr_id=".$line['jr_id']." and $sql_fin ". " and j_debit='f'"); echo ""; diff --git a/include/impress_poste.inc.php b/include/impress_poste.inc.php index b91b057c0..ece12386b 100644 --- a/include/impress_poste.inc.php +++ b/include/impress_poste.inc.php @@ -94,7 +94,7 @@ if ( isset( $_POST['bt_html'] ) ) { if ( isset ($_POST['poste_fille']) ) { $parent=$_POST['poste_id']; - $a_poste=get_array($cn,"select pcm_val from tmp_pcmn where pcm_val like '$parent%' order by pcm_val::text"); + $a_poste=get_array($cn,"select pcm_val from tmp_pcmn where pcm_val::text like '$parent%' order by pcm_val::text"); $go=3; } // Check if the post is numeric and exists diff --git a/include/jrn.php b/include/jrn.php index 1e7a66d9c..859eff31c 100644 --- a/include/jrn.php +++ b/include/jrn.php @@ -30,6 +30,8 @@ require_once ('class_anc_plan.php'); require_once ('class_anc_operation.php'); require_once ('class_acc_ledger.php'); require_once ('class_acc_operation.php'); +require_once ('class_acc_jrn_info.php'); + /*! * \brief Display the form to UPDATE account operation in the expert view * @@ -143,11 +145,14 @@ function ShowOperationExpert($p_cn,$p_jr_id,$p_mode=1) if ( $content['jr_pj_name'] != "") $r.='Effacer PJ '; } - $r.="".sprintf('%s', - $content['jr_id'], - $content['jr_grpt_id'], - $str_dossier, - $content['jr_pj_name']).""; + $r.="".sprintf('%s', + $content['jr_id'], + $content['jr_grpt_id'], + $str_dossier, + $_REQUEST['PHPSESSID'], + $content['jr_pj_name'] + + ).""; $r.=""; if ( $p_mode == 1 ) { @@ -287,12 +292,14 @@ function ShowOperationUser($p_cn,$p_jr_id,$p_mode=1) $r.='Nom'; $r.='PU'; $r.='Quantité'; + $r.=' Dep. priv. '; $r.='tva'; - $r.='code tva'; - $r.='Non Ded.'; + $r.='tva'; + $r.='non ded.'; $r.='tva nd'; $r.='tva d impot'; - $r.='prix'; + $r.='total htva'; + $r.='total tvac'; $r.=''; $object=new gestion_purchase($p_cn); @@ -303,6 +310,7 @@ function ShowOperationUser($p_cn,$p_jr_id,$p_mode=1) $tot_nd=0.0; $tot_tva_nd=0.0; $tot_tva_nd_recup=0.0; + $tot_dep_priv=0.0; $i=0; $i_march=0; foreach ($array as $row) { @@ -314,20 +322,24 @@ function ShowOperationUser($p_cn,$p_jr_id,$p_mode=1) $tot_tva_nd+=$row->qp_nd_tva; $tot_tva_nd_recup+=$row->qp_nd_tva_recup; $tot_amount+=$row->qp_price; + $tot_dep_priv+=$row->qp_dep_priv; // $hid_jid=new widget("hidden","","p_jid_".$row->j_id,$row->j_id); $r.=($i%2==0)?"":''; $i++; $pu=0.0; - if ( $row->qp_price != 0.0 && $row->qp_price != 0 ) $pu=round($row->qp_price/$row->qp_quantite,2); + if ( $row->qp_price != 0.0 && $row->qp_price != 0 ) + $pu=round(($row->qp_nd_amount+$row->qp_price)/$row->qp_quantite,2); $r.=' '.$fiche->strAttribut(ATTR_DEF_NAME).''; $r.=''.$pu.''; $r.=''.$row->qp_quantite.''; + $r.=''.$row->qp_dep_priv.''; $r.=''.$row->qp_vat.''; - $r.=''.$row->qp_vat_code.''; - $r.=''.$row->qp_nd_amount.''; $r.=''.$row->tva_label.''; + $r.=''.$row->qp_nd_amount.''; + $r.=''.$row->qp_nd_tva.''; $r.=''.$row->qp_nd_tva_recup.''; - $r.=''.$row->qp_price.''; + $r.=''.sprintf("% 12.2f",$row->qp_price).''; + $r.=''.sprintf("% 12.2f",$row->qp_vat+$row->qp_nd_amount+$row->qp_nd_tva+$row->qp_nd_tva_recup+$row->qp_price).''; //-- add ca // @@ -347,26 +359,36 @@ function ShowOperationUser($p_cn,$p_jr_id,$p_mode=1) 'Total HTVA'. ''.sprintf('% 12.2f',$tot_amount)."". ""; + if ( $tot_tva != 0 ) $r.=''. 'Total TVA'. ''.sprintf('%12.2f',$tot_tva) ."". ""; + if ( $tot_nd !=0 ) $r.=''. 'Total nd '. ''.sprintf('%12.2f',$tot_nd)."". ""; + if ( $tot_tva_nd !=0 ) $r.=''. 'Total tva nd'. ''.sprintf('%12.2f',$tot_tva_nd)."". ""; + if ( $tot_tva_nd_recup !=0 ) $r.=''. 'Total tva nd recup. par impot'. ''.sprintf('%12.2f',$tot_tva_nd_recup)."". ""; + if ( $tot_dep_priv !=0 ) + $r.=''. + 'Total tva nd recup. par impot'. + ''.sprintf('%12.2f',$tot_dep_priv)."". + ""; + $r.=''. 'Total '. - ''.sprintf('%12.2f',$tot_amount+$tot_tva)."". + ''.sprintf('%12.2f',$tot_dep_priv+$tot_amount+$tot_tva+$tot_tva_nd_recup+$tot_nd+$tot_tva_nd)."". ""; $r.= ''; @@ -464,11 +486,31 @@ function ShowOperationUser($p_cn,$p_jr_id,$p_mode=1) //doc if ( $p_mode ==1 && $content['jr_pj_name'] != "") $r.='Effacer Pj '; - $r.="".sprintf('%s', + $r.="".sprintf('%s', $content['jr_id'], $content['jr_grpt_id'], + $_REQUEST['PHPSESSID'], $content['jr_pj_name']).""; $r.=""; + if ( $content['jrn_def_type'] == 'VEN' ) { + /* count the number of additionnal info */ + $acc_jrn_info=new Acc_Jrn_Info($p_cn); + $acc_jrn_info->set_jrn_id($p_jr_id); + + /* if additional info > 0 show them */ + if ( $acc_jrn_info->count() > 0 ) { + $array=$acc_jrn_info->load_all(); + foreach ($array as $row) { + if ( strpos($row->id_type,'BON_COMMANDE') ===0) { + $r.="Num bon de commande : ".$row->ji_value.'
'; + } + if ( strpos($row->id_type,'OTHER') ===0) { + $r.="Autre info : ".$row->ji_value.'
'; + } + + } + } + } $r.="
"; if ( $p_mode == 1 ) { $r.= ""; diff --git a/include/poste.inc.php b/include/poste.inc.php index eed35d007..02e756c7b 100644 --- a/include/poste.inc.php +++ b/include/poste.inc.php @@ -37,7 +37,7 @@ if ( isset( $_POST['confirm_mod'] ) ) $object=new parm_code($cn); $all=$object->LoadAll(); -echo '
'; +echo '
'; echo '
'; for ($i=0;$i'; @@ -58,7 +58,7 @@ echo ""; // modifie if ( isset ($_POST['mod'] )) { - echo '
'; + echo '
'; echo "Voulez-vous vraiment modifier ?"; echo ''; @@ -75,4 +75,4 @@ if ( isset ($_POST['mod'] )) echo ""; echo "
"; -} \ No newline at end of file +} diff --git a/include/postgres.php b/include/postgres.php index 1f7954d87..688cc9a39 100644 --- a/include/postgres.php +++ b/include/postgres.php @@ -98,7 +98,7 @@ function DbConnect($p_db=-1,$p_type='dossier') { $phpcompta_user=phpcompta_user; $password=phpcompta_password; $port=phpcompta_psql_port; - ob_start(); + ob_start(); $a=pg_connect("dbname=$l_dossier host=127.0.0.1 user='$phpcompta_user' password='$password' port=$port"); diff --git a/include/pref.inc.php b/include/pref.inc.php index 0c5919637..2e0156c70 100644 --- a/include/pref.inc.php +++ b/include/pref.inc.php @@ -21,6 +21,8 @@ /*!\brief this file is always included and then executed * it permits to change the user preferences */ +require_once('class_widget.php'); +require_once('class_user.php'); echo '
'; @@ -92,14 +94,30 @@ $disp_style.=""; update_global_pref('TOPMENU',$_POST['topmenu']); +} +$topmenu=new widget('select'); +$topmenu->name='topmenu'; +$topmenu->selected=$_SESSION['g_topmenu']; +$array=array( + array('value'=>'TEXT','label'=>'Texte'), + array('value'=>'SELECT','label'=>'Menu deroulant') + ); +$topmenu->value=$array; +echo '

Style de menu

'; +echo ''; +echo '
'; +echo $topmenu->IOValue(); +echo widget::submit('sub_topmenu','Sauver'); +echo ''; +echo ''; // Si utilise un dossier alors propose de changer // la periode par defaut -if ( ! isset ($_REQUEST['gDossier']) ) - { - echo ''; - } -else +if ( isset ($_REQUEST['gDossier']) ) { include_once("preference.php"); @@ -132,7 +150,10 @@ else
+

Taille des pages

@@ -156,9 +177,13 @@ else
+'; + } + -"; ?> diff --git a/include/stock_inc.php b/include/stock_inc.php index 4421c619c..7c7d0ebeb 100644 --- a/include/stock_inc.php +++ b/include/stock_inc.php @@ -21,7 +21,7 @@ /*! \file * \brief Function for managing the stock */ - +require_once('class_fiche.php'); /*! ************************************************** @@ -123,7 +123,7 @@ $sql="select distinct f_id,av_text join jnt_fic_att_value using (f_id ) join attr_value using (jft_id) where - ad_id=".ATTR_DEF_NAME." + ad_id=".ATTR_DEF_STOCK." and sg_code='$p_sg_code' "; // Execute @@ -134,7 +134,8 @@ $sql="select distinct f_id,av_text for ( $i=0; $i<$M;$i++) { $r=pg_fetch_array($Res,$i); $a['f_id']=$r['f_id']; - $a['av_text']=$r['av_text']; + $fiche=new Fiche($p_cn,$r['f_id']); + $a['av_text']=$fiche->getName(); $result[$i]=$a; } diff --git a/include/supplier.inc.php b/include/supplier.inc.php index 991454f90..5a362af81 100644 --- a/include/supplier.inc.php +++ b/include/supplier.inc.php @@ -46,8 +46,7 @@ if ( isset ($_POST['delete']) ) // Add card if ( $sub_action=="insert" ) { - $retour=sprintf('', - urldecode($_REQUEST['url'])); + $retour=widget::button_href("Retour", urldecode($_REQUEST['url'])); $supplier=new Supplier($cn); $supplier->Save($_REQUEST['fd_id']); @@ -75,8 +74,7 @@ if ( $sub_action == "" ) //Display a blank card if ( $sub_action=="blank") { - $retour=sprintf('', - "commercial.php?p_action=fournisseur&".dossier::get()); + $retour=widget::button_href('Retour','commercial.php?p_action=fournisseur&'.dossier::get()); echo '
'; echo $retour; @@ -85,10 +83,11 @@ if ( $sub_action=="blank") echo ''; echo ''; echo ''; - echo ''; echo dossier::hidden(); echo $c->blank($_GET['fd_id']); echo ''; + echo ''; + echo ''; echo $retour; echo '
'; @@ -114,7 +113,6 @@ if ( $sub_action == "list" )
- +
@@ -148,8 +147,8 @@ if ( $sub_action == 'detail' ) $f_id=$_REQUEST['f_id']; echo '
'; $sup=new Supplier($cn,$f_id); - $retour=sprintf('', - urldecode($_REQUEST['url'])); + $retour=widget::button_href("Retour", urldecode($_REQUEST['url'])); + echo $retour; echo '
'; echo $sup->Display(false); diff --git a/include/tva.inc.php b/include/tva.inc.php index dc44a8e26..e864c8a11 100644 --- a/include/tva.inc.php +++ b/include/tva.inc.php @@ -255,6 +255,7 @@ if ( ! isset ($_POST['add'])
'; } +} + echo '
'; ?> diff --git a/include/user_action_ach.php b/include/user_action_ach.php index e8d60ef92..bbf136722 100644 --- a/include/user_action_ach.php +++ b/include/user_action_ach.php @@ -69,7 +69,7 @@ if ( $action=="use_opd" ) { echo $hid->IOValue("jrn_type","ACH"); if ($op->count() != 0 ) - echo widget::submit('use_opd','Utilisez une op.prédéfinie'); + echo widget::submit('use_opd','Utilisez une op.prédéfinie'); echo $op->show_button(); echo ''; @@ -118,7 +118,7 @@ if ( $action == 'new' ) { echo $hid->IOValue("jrn_type","ACH"); if ($op->count() != 0 ) - echo widget::submit('use_opd','Utilisez une op.prédéfinie'); + echo widget::submit('use_opd','Utilisez une op.prédéfinie'); echo $op->show_button(); echo ''; @@ -202,7 +202,7 @@ if ( $action == 'new' ) { list($internal,$comment)=RecordSell($cn,$_POST,$User,$_GET['p_jrn']); // submit button in the form - $submit='

Opération '.$internal.'

'; + $submit='

Opération '.$internal.'

'; $r=FormAchView($cn,$_GET['p_jrn'],$User->get_periode(),$_POST,"",$nb_number,false); echo '
'; echo $submit; diff --git a/include/user_action_fin.php b/include/user_action_fin.php index 16e14771b..640ceb51f 100644 --- a/include/user_action_fin.php +++ b/include/user_action_fin.php @@ -273,8 +273,8 @@ if ( $action == 'solde' ) { $vir_interne=new parm_code($cn,'VIREMENT_INTERNE'); $accountSql="select distinct pcm_val::text,pcm_lib from tmp_pcmn - where pcm_val like '".$banque->p_value."%' or pcm_val like '".$vir_interne->p_value."%' - or pcm_val like '".$caisse->p_value."%' + where pcm_val::text like '".$banque->p_value."%' or pcm_val::text like '".$vir_interne->p_value."%' + or pcm_val::text like '".$caisse->p_value."%' order by pcm_val::text"; $ResAccount=ExecSql($cn,$accountSql); echo '
'; diff --git a/include/user_common.php b/include/user_common.php index f82db5902..bbae4ad21 100644 --- a/include/user_common.php +++ b/include/user_common.php @@ -129,6 +129,30 @@ echo_debug('user_common.php',__LINE__,"ComputeTotalVat $a_fiche $a_quant $a_pric //variable containing the nd part // used when a card has both special rule for vat $nd1=0; + + $base=$a_price[$idx]*$a_vat['tva_rate']*$a_quant[$idx]; + $nd_amount3=0; + // if a part is not deductible then reduce vat_amount + $nd3=GetFicheAttribut($p_cn,$a_fiche[$idx],ATTR_DEF_DEP_PRIV); + if ( $nd3 != null && strlen(trim($nd3)) != 0 && $nd3 != 0 ) + { + // if tva amount is given we do not compute it + if ( $a_vat_amount != null && + $a_vat_amount[$idx] != 0 ) { + $nd_amount3=round($a_vat_amount[$idx]*$nd3,2); + $a_vat_amount[$idx]-=$nd_amount3; + } + else + $nd_amount3=round($a_price[$idx]*$a_vat['tva_rate']*$a_quant[$idx]*$nd3,2); + + $vat_amount=$vat_amount-$nd_amount3; + + $base=$base*$nd3; + // when using both vat, their sum cannot exceed 1, if = 1 then vat = 0 + $flag=false; + } + + // if a part is not deductible then reduce vat_amount $nd=GetFicheAttribut($p_cn,$a_fiche[$idx],ATTR_DEF_TVA_NON_DEDUCTIBLE); if ( $nd != null && strlen(trim($nd)) != 0 && $nd != 0 ) @@ -136,9 +160,9 @@ echo_debug('user_common.php',__LINE__,"ComputeTotalVat $a_fiche $a_quant $a_pric // if tva amount is given we do not compute it if ( $a_vat_amount != null && $a_vat_amount[$idx] != 0 ) - $nd_amount=round($vat_amount*$nd,2); + $nd_amount=round($a_vat_amount[$idx]*$nd,2); else - $nd_amount=round($a_price[$idx]*$a_vat['tva_rate']*$a_quant[$idx]*$nd,2); + $nd_amount=round($base*$nd,2); // problem with round @@ -159,7 +183,7 @@ echo_debug('user_common.php',__LINE__,"ComputeTotalVat $a_fiche $a_quant $a_pric $a_vat_amount[$idx] != 0 ) $nd_amount2=round($a_vat_amount[$idx]*$nd,2); else - $nd_amount2=round($a_price[$idx]*$a_vat['tva_rate']*$a_quant[$idx]*$nd,2); + $nd_amount2=round($base*$nd,2); $vat_amount=$vat_amount-$nd_amount2; // when using both vat, their sum cannot exceed 1, if = 1 then vat = 0 @@ -438,7 +462,7 @@ $sort_echeance=" $image_ascEch $sql_fin="("; $or=""; foreach ($a_parm_code as $code) { - $sql_fin.="$or j_poste like '".$code['p_value']."%'"; + $sql_fin.="$or j_poste::text like '".$code['p_value']."%'"; $or=" or "; } $sql_fin.=")"; @@ -545,7 +569,7 @@ $sort_echeance=" $image_ascEch $l_poste=FormatString($l_poste); if ( $l_poste != null ) { $sql.=$l_and." jr_grpt_id in (select j_grpt - from jrnx where j_poste like '$l_poste' ) "; + from jrnx where j_poste::text like '$l_poste' ) "; $l_and=" and "; } // Quick Code @@ -729,10 +753,11 @@ $sort_echeance=" $image_ascEch if ( $row['jr_pj_name'] != "") { $image=''; - $r.="".sprintf('%s', + $r.="".sprintf('%s', $p_jrn, $row['jr_grpt_id'], - $str_dossier, + $str_dossier, + $_REQUEST['PHPSESSID'], $image) .""; } diff --git a/include/user_form_ach.php b/include/user_form_ach.php index 0b11a47be..4c5533627 100644 --- a/include/user_form_ach.php +++ b/include/user_form_ach.php @@ -492,7 +492,7 @@ function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number) $per->set_jrn($p_jrn); $per->set_periode($p_periode); - // Periode fermé + // Periode ferme if ( $per->is_open() == 0) { $msg="Cette periode est fermee pour ce journal"; @@ -833,6 +833,8 @@ function RecordSell($p_cn,$p_array,$p_user,$p_jrn) $aNd_amount[$i]=0.0; $aTva_ded_impot[$i]=0.0; $aTva_ded_impot_recup[$i]=0.0; + $aDep_priv[$i]=0.0; + $poste=GetFicheAttribut($p_cn,$a_good[$i],ATTR_DEF_ACCOUNT); @@ -840,26 +842,51 @@ function RecordSell($p_cn,$p_array,$p_user,$p_jrn) if ( $a_price[$i]*$a_quant[$i] == 0 ) continue; $amount=$a_price[$i]*$a_quant[$i]; - //We don't compute vat if it's given - $lvat=($a_vat_amount[$i]==0)?ComputeVat($p_cn,$a_good[$i],$a_quant[$i],$a_price[$i], $a_vat_good[$i],$a_vat_amount[$i] ):$a_vat_amount[$i]; - + //We don't compute vat if it's given + $lvat=($a_vat_amount[$i]==0)?ComputeVat($p_cn,$a_good[$i],$a_quant[$i],$a_price[$i], $a_vat_good[$i],$a_vat_amount[$i] ):$a_vat_amount[$i]; + //---------------------------------------------------------------------- // Put the non deductible part into a special account $non_dedu=GetFicheAttribut($p_cn,$a_good[$i],ATTR_DEF_DEPENSE_NON_DEDUCTIBLE); echo_debug('user_form_ach.php',__LINE__,"value non ded : $non_dedu"); if ( $non_dedu != null && strlen(trim($non_dedu)) != 0) - { - // if vat if given we use it to compute ND - $nd_amount=($a_vat_amount[$i]==0)?round($a_quant[$i]*$a_price[$i]*$non_dedu,2):round($a_vat_amount*$non_dedu,2); - - // save it - echo_debug('user_form_ach.php',__LINE__,"InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,'6740',$e_date,round($nd_amount,2),$seq,$periode);"); - $dna=new parm_code($p_cn,'DNA'); - $j_id=InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,$dna->p_value,$e_date,round($nd_amount,2),$seq,$periode); - $amount=$amount-$nd_amount; - - // save the ND in an array (for the easy view) - $aNd_amount[$i]=$nd_amount; - } + { + // this doens't concern the vat + $nd_amount=round($a_quant[$i]*$a_price[$i]*$non_dedu,2); + // save it + echo_debug('user_form_ach.php',__LINE__,"InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,'6740',$e_date,round($nd_amount,2),$seq,$periode);"); + $dna=new parm_code($p_cn,'DNA'); + $j_id=InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,$dna->p_value,$e_date,round($nd_amount,2),$seq,$periode); + $amount=$amount-$nd_amount; + + // save the ND in an array (for the easy view) + $aNd_amount[$i]=$nd_amount; + } + //---------------------------------------------------------------------- + // Put the non deductible part into a special account + $non_dedu=GetFicheAttribut($p_cn,$a_good[$i],ATTR_DEF_DEP_PRIV); + echo_debug('user_form_ach.php',__LINE__,"value non ded : $non_dedu"); + if ( $non_dedu != null && strlen(trim($non_dedu)) != 0) + { + // Remove also the vat + $nd_amount=round($a_quant[$i]*$a_price[$i]*$non_dedu,2); + $tva_nd=round($lvat*$non_dedu,2); + $nd_amount+=$tva_nd; + + // save it + $dna=new parm_code($p_cn,'DEP_PRIV'); + $j_id=InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,$dna->p_value,$e_date,round($nd_amount,2),$seq,$periode); + + // modify sum + $amount=$amount-$nd_amount+$tva_nd; + $lvat-=$tva_nd; + + $sum_tva_nd+=$tva_nd; + + // save the ND in an array (for the easy view) + $aDep_priv[$i]=$nd_amount; + } + + //---------------------------------------------------------------------- // Put the non deductible part into a special account $non_dedu=GetFicheAttribut($p_cn,$a_good[$i],ATTR_DEF_TVA_NON_DEDUCTIBLE); echo_debug('user_form_ach.php',__LINE__,"TVA value non ded : $non_dedu"); @@ -877,27 +904,27 @@ function RecordSell($p_cn,$p_array,$p_user,$p_jrn) $j_id=InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,$tva_dna->p_value,$e_date,round($ded_vat,2),$seq,$periode); } - + //---------------------------------------------------------------------- // Put the non deductible part into a special account $non_dedu=GetFicheAttribut($p_cn,$a_good[$i],ATTR_DEF_TVA_NON_DEDUCTIBLE_RECUP); echo_debug('user_form_ach.php',__LINE__,"TVA value non ded : $non_dedu"); if ( $non_dedu != null && strlen(trim($non_dedu)) != 0 ) - { - - $ded_vat=($lvat != null )?$lvat*$non_dedu:0; - - $sum_tva_nd+=round($ded_vat,2); - $aTva_ded_impot_recup[$i]=round($ded_vat,2); - - // Save it - $tva_ded_impot=new parm_code($p_cn,'TVA_DED_IMPOT'); - echo_debug('user_form_ach.php',__LINE__, - "InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,".$tva_ded_impot->p_value.",$e_date,round($ded_vat,2),$seq,$periode);"); - - $j_id=InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,$tva_ded_impot->p_value,$e_date,round($ded_vat,2),$seq,$periode); - } + { + $ded_vat=($lvat != null )?$lvat*$non_dedu:0; + + $sum_tva_nd+=round($ded_vat,2); + $aTva_ded_impot_recup[$i]=round($ded_vat,2); + + // Save it + $tva_ded_impot=new parm_code($p_cn,'TVA_DED_IMPOT'); + echo_debug('user_form_ach.php',__LINE__, + "InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,".$tva_ded_impot->p_value.",$e_date,round($ded_vat,2),$seq,$periode);"); + + $j_id=InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,$tva_ded_impot->p_value,$e_date,round($ded_vat,2),$seq,$periode); + } + //---------------------------------------------------------------------- @@ -905,7 +932,7 @@ function RecordSell($p_cn,$p_array,$p_user,$p_jrn) echo_debug('user_form_ach.php',__LINE__,"InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,$poste,$e_date,round($amount,2),$seq,$periode);"); $j_id=InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,$poste,$e_date,round($amount,2),$seq,$periode,$a_good[$i]); - /* \brief if the quantity is < 0 then the stock increase (return of + /*! \brief if the quantity is < 0 then the stock increase (return of * material) */ $nNeg=($a_quant[$i]<0)?-1:1; @@ -924,53 +951,56 @@ function RecordSell($p_cn,$p_array,$p_user,$p_jrn) $op->oa_description=$comm; $op->save_form_plan($_POST,$i); } - //--------------------------------------------------------- - // insert into quant_purchase - //--------------------------------------------------------- - - echo_debug(__FILE__.":".__LINE__,"a_vat = ",$a_vat); - // echo_debug(__FILE__.":".__LINE__."a_vat[$i] =",$a_vat[$i]); - //!\note - // $a_vat_good[$i] contains the tva_id - // $a_vat_amount[$i] contains the amount of vat - $vat_code=$a_vat_good[$i]; - $computed_vat=$lvat-$aNd_amount[$i]-$aTva_ded_impot[$i]-$aTva_ded_impot_recup[$i]; - $qp_vat=($vat_code==-1)?0:$computed_vat; - - echo_debug('form_ach',__LINE__,"Insert into insert_quant_purchase"); - $r=ExecSql($p_cn,"select insert_quant_purchase ". - "('".$internal."'". - ",".$j_id. - ",'".$a_good[$i]."'". - ",".$a_quant[$i].",". - round($amount,2). - ",".$qp_vat. - ",".$vat_code. - ",".$aNd_amount[$i]. - ",".$aTva_ded_impot[$i]. - ",".$aTva_ded_impot_recup[$i]. - ",'".$e_client."')"); - - + //--------------------------------------------------------- + // insert into quant_purchase + //--------------------------------------------------------- + + echo_debug(__FILE__.":".__LINE__,"a_vat = ",$a_vat); + // echo_debug(__FILE__.":".__LINE__."a_vat[$i] =",$a_vat[$i]); + //!\note + // $a_vat_good[$i] contains the tva_id + // $a_vat_amount[$i] contains the amount of vat + $vat_code=$a_vat_good[$i]; + // $computed_vat=$lvat-$aNd_amount[$i]-$aTva_ded_impot[$i]-$aTva_ded_impot_recup[$i]; + $computed_vat=$lvat-$aTva_ded_impot[$i]-$aTva_ded_impot_recup[$i]; + $qp_vat=($vat_code==-1)?0:$computed_vat; + + echo_debug('form_ach',__LINE__,"Insert into insert_quant_purchase"); + $r=ExecSql($p_cn,"select insert_quant_purchase ". + "('".$internal."'". + ",".$j_id. + ",'".$a_good[$i]."'". + ",".$a_quant[$i].",". + round($amount,2). + ",".$qp_vat. + ",".$vat_code. + ",".$aNd_amount[$i]. + ",".$aTva_ded_impot[$i]. + ",".$aTva_ded_impot_recup[$i]. + ",".$aDep_priv[$i]. + ",'".$e_client."')"); + + } // end loop - - // set up internal code for quant_purchase - + + // set up internal code for quant_purchase + // Insert Vat $sum_tva=0.0; if ( $a_vat != null ) // no vat { - echo_debug('user_form_ach',__LINE__,'a_vat = '.var_export($a_vat,true)); - foreach ($a_vat as $tva_id => $e_tva_amount ) - { - echo_debug('user_form_ach',__LINE__," tva_amount = $e_tva_amount tva_id=$tva_id"); - $poste=GetTvaPoste($p_cn,$tva_id,'d'); - if ($e_tva_amount == 0 ) continue; - echo_debug('user_form_ach',__LINE__,"InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,$poste,$e_date,round($e_tva_amount,2),$seq,$periode);"); - $r=InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,$poste,$e_date,round($e_tva_amount,2),$seq,$periode); - $sum_tva+=round($e_tva_amount,2); - } + echo_debug('user_form_ach',__LINE__,'a_vat = '.var_export($a_vat,true)); + foreach ($a_vat as $tva_id => $e_tva_amount ) + { + echo_debug('user_form_ach',__LINE__," tva_amount = $e_tva_amount tva_id=$tva_id"); + if ($e_tva_amount == 0 ) continue; + + $poste=GetTvaPoste($p_cn,$tva_id,'d'); + + $r=InsertJrnx($p_cn,'d',$p_user->id,$p_jrn,$poste,$e_date,round($e_tva_amount,2),$seq,$periode); + $sum_tva+=round($e_tva_amount,2); + } } echo_debug('user_form_ach.php',__LINE__,"echeance = $e_ech"); echo_debug('user_form_ach.php',__LINE__,"sum_tva = $sum_tva"); @@ -984,14 +1014,14 @@ function RecordSell($p_cn,$p_array,$p_user,$p_jrn) $r=InsertJrnx($p_cn,'c',$p_user->id,$p_jrn,$poste,$e_date,round($amount_jrn+$sum_tva+$sum_tva_nd,2),$seq, $periode,$e_client); - + $r=InsertJrn($p_cn,$e_date,$e_ech,$p_jrn,"--",$seq,$periode); // Set Internal code and Comment - $Res=ExecSql($p_cn,"update jrn set jr_internal='".$internal."' where ". + $Res=ExecSql($p_cn,"update jrn set jr_internal='".$internal."' where ". " jr_grpt_id = ".$seq); - + $comment=(FormatString($e_comm) == null )?$internal." Fournisseur : ".GetFicheName($p_cn,$e_client):FormatString($e_comm); // Update and set the invoice's comment @@ -999,14 +1029,14 @@ function RecordSell($p_cn,$p_array,$p_user,$p_jrn) if ( isset ($_FILES)) save_upload_document($p_cn,$seq); - // Save the operation - if ( isset($_POST['opd_save']) && $_POST['opd_save']=='on' ){ - echo_debug(__FILE__.':'.__LINE__.'- ','save opd'); - $opd=new Pre_op_ach($p_cn); - $opd->get_post(); - $opd->save(); + // Save the operation + if ( isset($_POST['opd_save']) && $_POST['opd_save']=='on' ){ + echo_debug(__FILE__.':'.__LINE__.'- ','save opd'); + $opd=new Pre_op_ach($p_cn); + $opd->get_post(); + $opd->save(); echo_debug(__FILE__.':'.__LINE__.'- ',"opd = ",$opd); - } + } } catch (Exception $e) { echo ''. 'Erreur dans l\'enregistrement '. diff --git a/include/user_form_ven.php b/include/user_form_ven.php index d7bc0297c..ed9cc17d4 100644 --- a/include/user_form_ven.php +++ b/include/user_form_ven.php @@ -235,7 +235,7 @@ function FormVenInput($p_cn,$p_jrn,$p_periode,$p_array=null,$pview_only=true,$p_ $Quantity->size=9; //$r.=InputType("","TEXT","e_quant".$i,$quant,$pview_only); $r.=$Quantity->IOValue("e_quant".$i,$quant); - + $r.=""; } @@ -336,8 +336,8 @@ function form_verify_input($p_cn,$p_jrn,$p_periode,$p_array,$p_number) // compare hidden value and computed if ( round($ca_amount-$hidden_amount,2) != 0 ) { - $msg="Montant CA est différent total marchandise"; - $msg.="montant encodé $ca_amount marchandise $hidden_amount"; + $msg="Montant CA est different total marchandise"; + $msg.="montant encode $ca_amount marchandise $hidden_amount"; echo ""; return null; @@ -644,15 +644,19 @@ function FormVenteView ($p_cn,$p_jrn,$p_periode,$p_array,$p_number,$p_doc='form' if ( CountSql($p_cn, "select md_id,md_name from document_modele where md_type=4") > 0 ) { - $r.='Générer une facture '; - // We propose to generate the invoice and some template - $doc_gen=new widget("select"); - $doc_gen->name="gen_doc"; - $doc_gen->value=make_array($p_cn, - "select md_id,md_name from document_modele where md_type=4"); - $r.=$doc_gen->IOValue(); - - $r.="
"; + $r.='
Génération de facture'; + $obj=new widget('TEXT'); + $r.='Numero de bon de commande : '.$obj->IOValue('bon_comm').'
'; + $r.='Autre information : '.$obj->IOValue('other_info').'
'; + + $r.='Générer une facture '; + // We propose to generate the invoice and some template + $doc_gen=new widget("select"); + $doc_gen->name="gen_doc"; + $doc_gen->value=make_array($p_cn, + "select md_id,md_name from document_modele where md_type=4"); + $r.=$doc_gen->IOValue().'
'; + $r.="
"; } } @@ -756,7 +760,7 @@ function RecordInvoice($p_cn,$p_array,$p_user,$p_jrn) // Compute the j_grpt $seq=NextSequence($p_cn,'s_grpt'); -$oJrn=new Acc_Ledger($p_cn,$p_jrn); + $oJrn=new Acc_Ledger($p_cn,$p_jrn); $internal=$oJrn->compute_internal_code($seq); echo_debug(__FILE__,__LINE__,"Dossier is ".dossier::id()); diff --git a/include/user_menu.php b/include/user_menu.php index 9f9ba1859..53c8854ea 100644 --- a/include/user_menu.php +++ b/include/user_menu.php @@ -192,26 +192,7 @@ function ShowMenuCompta($p_high="") $result=ShowItem($p_array,'H',"mtitle","mtitle",$default,' width="100%"'); $str_dossier=dossier::get(); $r=""; - /* - $r.='
'; - $r.="

Comptabilité ".dossier::name()."

"; - $r.='
'; - $r.='
'; - $r.=' - - - - - - - - - - -
'; - */ - // $r.='
'; - $r.=menu_tool(""); + $r.=menu_tool("compta"); $r.='
'; $r.=$result; $r.='
'; @@ -822,15 +803,32 @@ function ShowMenuImport(){ echo ""; } - +/*!\brief show the top menu to access the different modules in top + * \param $p_from from which module this function is called + * \return string +*/ function menu_tool($p_from) { + + if ( ! isset ($_REQUEST['gDossier'])) + return "" ; $r=""; +$r.=''; + + $r.= '
'; $r.= '
'; $r.= "

Commercial ".dossier::name()."

"; $r.= '
'; $r.= '
'; - + if ( $from == 'compta') $view='E'; + else $view='S'; + $agent=$_SERVER['HTTP_USER_AGENT']; $amodule=array( array('value'=>'pref','label'=>'Preference'), @@ -842,20 +840,47 @@ function menu_tool($p_from) { array('value'=>'home','label'=>'Accueil'), array('value'=>'logout','label'=>'Sortir') ); + if ( $_SESSION['g_topmenu'] == 'SELECT' ) { + $gDossier=dossier::id(); + $r.= '
'; + $w=new widget('select'); + $w->name='m'; + $w->value=$amodule; + $r.= ''; + $r.= ''; + $r.= dossier::hidden(); + $r.= ''; + $r.= '
'; - $gDossier=dossier::id(); - $r.= ''; - $w=new widget('select'); - $w->name='m'; - $w->value=$amodule; - $r.= ''; - $r.= ''; - $r.= dossier::hidden(); - $r.= ''; - $r.= '
'; - $r.= ''. - 'Recheche'.$w->IOValue().''.widget::submit('','Acces Direct').'
'; - $r.= ''; - $r.= ''; + $search="openRecherche('".$_REQUEST['PHPSESSID']."','".$gDossier."','".$view."');"; + $r.=''; + $r.='		'.$w->IOValue().''.widget::submit('','Acces Direct').'
'; + $r.= ''; + $r.= '
'; + } + if ( $_SESSION['g_topmenu'] == 'TEXT' ) { + $gDossier=dossier::id(); + $r.= ''; + foreach($amodule as $col ) { + $url="control.php?".dossier::get()."&m=".$col['value']; + if ( $p_from==$col['value']) { + $r.= ''; + + } else { + $r.= ''; + } + + } + $r.=''; + $r.= '
'; + $r.= ''. + 'Recheche'. + ''.$col['label'].''. + ''. + ''.$col['label'].''. + '
'; + $r.= '
'; + } + $r.= '
'; return $r; } diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh index 7dde70fb9..e31397a22 100755 --- a/scripts/cleanup.sh +++ b/scripts/cleanup.sh @@ -1,6 +1,6 @@ #!/bin/bash # clean all phpcompta related DB. -DOMAIN="f31" +DOMAIN="beta_" export PGPASSWORD="dany" export PGUSER="phpcompta" export PGHOST=localhost diff --git a/sql/upgrade.sql b/sql/upgrade.sql index e2e6d36c9..a33282acc 100644 --- a/sql/upgrade.sql +++ b/sql/upgrade.sql @@ -1,720 +1,48 @@ begin; -alter table import_tmp add n_montant numeric(20,4); -update import_tmp set n_montant=to_number(montant,'999999999.99'); -alter table import_tmp drop montant; -alter table import_tmp rename n_montant to montant; --- alter table import_tmp alter montant type numeric(20,4); -alter table import_tmp alter montant set default 0; -alter table import_tmp alter montant set not null; -alter table import_tmp alter code set not null; -alter table import_tmp alter date_exec set not null; -alter table import_tmp alter date_valeur set not null; -COMMENT ON TABLE import_tmp IS 'Table temporaire pour l''importation des banques en format CSV'; -COMMENT ON COLUMN import_tmp.status IS 'Status w waiting, d delete t transfert'; +-- insert into parm_code values ('DEP_PRIV',4890,'Depense à charge du gérant'); +-- insert into attr_def values (31,'Depense à charge du gérant (partie privée)'); +-- alter table quant_purchase add qp_dep_priv numeric(20,4) default 0.0; - -alter table poste_analytique add ga_id varchar (10); - - -CREATE or replace FUNCTION t_document_validate() RETURNS "trigger" +CREATE FUNCTION insert_quant_purchase(p_internal text, p_j_id numeric, p_fiche character varying, p_quant numeric, p_price numeric, p_vat numeric, p_vat_code integer, p_nd_amount numeric, p_nd_tva numeric, p_nd_tva_recup numeric,p_dep_priv numeric , p_client character varying) RETURNS void AS $$ declare - lText text; - modified document%ROWTYPE; + fid_client integer; + fid_good integer; begin - modified:=NEW; - modified.d_filename:=replace(NEW.d_filename,' ','_'); - return modified; + select f_id into fid_client from + attr_value join jnt_fic_att_value using (jft_id) where ad_id=23 and av_text=upper(p_client); + select f_id into fid_good from + attr_value join jnt_fic_att_value using (jft_id) where ad_id=23 and av_text=upper(p_fiche); + insert into quant_purchase + (qp_internal, + j_id, + qp_fiche, + qp_quantite, + qp_price, + qp_vat, + qp_vat_code, + qp_nd_amount, + qp_nd_tva, + qp_nd_tva_recup, + qp_supplier, + qp_dep_priv) + values + (p_internal, + p_j_id, + fid_good, + p_quant, + p_price, + p_vat, + p_vat_code, + p_nd_amount, + p_nd_tva, + p_nd_tva_recup, + fid_client, + p_dep_priv); + return; end; -$$ + $$ LANGUAGE plpgsql; - -CREATE or replace FUNCTION t_document_type_insert() RETURNS "trigger" - AS $$ -declare -nCounter integer; - BEGIN -select count(*) into nCounter from pg_class where relname='seq_doc_type_'||NEW.dt_id; -if nCounter = 0 then - execute 'create sequence seq_doc_type_'||NEW.dt_id; -end if; - RETURN NEW; - END; -$$ - LANGUAGE plpgsql; - -CREATE or replace FUNCTION t_document_modele_validate() RETURNS "trigger" - AS $$ -declare - lText text; - modified document_modele%ROWTYPE; -begin - modified:=NEW; - - modified.md_filename:=replace(NEW.md_filename,' ','_'); - return modified; -end; -$$ - LANGUAGE plpgsql; - - -CREATE TABLE groupe_analytique -( - ga_id varchar(10) NOT NULL, - pa_id int, - ga_description text, - CONSTRAINT pk_ga_id PRIMARY KEY (ga_id) -) ; - - -CREATE OR REPLACE FUNCTION group_analytic_ins_upd() - RETURNS "trigger" AS -$BODY$ -declare -name text; -begin -name:=upper(NEW.ga_id); -name:=trim(name); -name:=replace(name,' ',''); -NEW.ga_id:=name; -return NEW; -end;$BODY$ - LANGUAGE 'plpgsql' VOLATILE; - -CREATE OR REPLACE FUNCTION group_analytique_del() - RETURNS "trigger" AS -$BODY$ -begin -update poste_analytique set ga_id=null -where ga_id=OLD.ga_id; -return OLD; -end;$BODY$ - LANGUAGE 'plpgsql' VOLATILE; - -CREATE OR REPLACE FUNCTION poste_analytique_ins_upd() - RETURNS "trigger" AS -$BODY$declare -name text; -rCount record; - -begin -name:=upper(NEW.po_name); -name:=trim(name); -name:=replace(name,' ',''); -NEW.po_name:=name; - -if NEW.ga_id is NULL then -return NEW; -end if; - -if length(trim(NEW.ga_id)) = 0 then - NEW.ga_id:=NULL; - return NEW; -end if; -perform 'select ga_id from groupe_analytique where ga_id='||NEW.ga_id; -if NOT FOUND then - raise exception' Inexistent Group Analytic %',NEW.ga_id; -end if; -return NEW; -end;$BODY$ - LANGUAGE 'plpgsql' VOLATILE; - -CREATE OR REPLACE FUNCTION plan_analytic_ins_upd() - RETURNS "trigger" AS -$BODY$ -declare - name text; -begin - name:=upper(NEW.pa_name); - name:=trim(name); - name:=replace(name,' ',''); - NEW.pa_name:=name; -return NEW; -end; -$BODY$ - LANGUAGE 'plpgsql' VOLATILE; - -CREATE TRIGGER t_poste_analytique_ins_upd - BEFORE INSERT OR UPDATE - ON poste_analytique - FOR EACH ROW - EXECUTE PROCEDURE poste_analytique_ins_upd(); - -CREATE TRIGGER t_plan_analytique_ins_upd - BEFORE INSERT OR UPDATE - ON plan_analytique - FOR EACH ROW - EXECUTE PROCEDURE plan_analytic_ins_upd(); - -CREATE TRIGGER t_group_analytic_del - before DELETE - ON groupe_analytique - FOR EACH ROW - EXECUTE PROCEDURE group_analytique_del(); - -CREATE TRIGGER t_group_analytic_ins_upd - BEFORE INSERT OR UPDATE - ON groupe_analytique - FOR EACH ROW - EXECUTE PROCEDURE group_analytic_ins_upd(); - - -drop TRIGGER t_upper_pa_name on plan_analytique; -drop TRIGGER t_upper_po_name on poste_analytique; -drop function upper_pa_name(); -drop function upper_po_name(); - -CREATE TABLE bud_hypothese -( - bh_id int4 NOT NULL, - bh_name text NOT NULL, - bh_saldo numeric(20,4) DEFAULT 0, - bh_description text, - pa_id int4, - CONSTRAINT pk_bud_hypo PRIMARY KEY (bh_id), - CONSTRAINT fk_bud_hypo_pa_id FOREIGN KEY (pa_id) - REFERENCES plan_analytique (pa_id) MATCH SIMPLE - ON UPDATE CASCADE ON DELETE CASCADE -) -WITHOUT OIDS; - -create sequence seq_bud_hypothese_bh_id; - -alter table bud_hypothese alter bh_id set default nextval('seq_bud_hypothese_bh_id'); - --- --- Name: bud_card; Type: TABLE; Schema: public; Owner: phpcompta; Tablespace: --- - -CREATE TABLE bud_card ( - bc_id integer NOT NULL, - bc_code character varying(10) NOT NULL, - bc_description text, - bc_price_unit numeric(20,4) DEFAULT 0.0 NOT NULL, - bc_unit character varying(20), - bh_id integer -); --- --- Name: TABLE bud_card; Type: COMMENT; Schema: public; Owner: phpcompta --- - -COMMENT ON TABLE bud_card IS 'card for budget module'; - - --- --- Name: COLUMN bud_card.bh_id; Type: COMMENT; Schema: public; Owner: phpcompta --- - -COMMENT ON COLUMN bud_card.bh_id IS 'fk to bud_hypothese'; - - --- --- Name: bud_card_bc_id_seq; Type: SEQUENCE; Schema: public; Owner: phpcompta --- - -CREATE SEQUENCE bud_card_bc_id_seq - INCREMENT BY 1 - NO MAXVALUE - NO MINVALUE - CACHE 1; - - -ALTER TABLE public.bud_card_bc_id_seq OWNER TO phpcompta; - --- --- Name: bud_card_bc_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: phpcompta --- - -ALTER SEQUENCE bud_card_bc_id_seq OWNED BY bud_card.bc_id; - - --- --- Name: bc_id; Type: DEFAULT; Schema: public; Owner: phpcompta --- - -ALTER TABLE bud_card ALTER COLUMN bc_id SET DEFAULT nextval('bud_card_bc_id_seq'::regclass); - - --- --- Name: pk_bud_card_bc_id; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace: --- - -ALTER TABLE ONLY bud_card - ADD CONSTRAINT pk_bud_card_bc_id PRIMARY KEY (bc_id); - - --- --- Name: uq_bud_card_bc_code; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace: --- - -ALTER TABLE ONLY bud_card - ADD CONSTRAINT uq_bud_card_bc_code_bh_id UNIQUE (bc_code,bh_id); - -ALTER TABLE bud_card ADD CONSTRAINT fk_bud_hypo_bh_id FOREIGN KEY (bh_id) REFERENCES bud_hypothese (bh_id) - ON UPDATE CASCADE ON DELETE CASCADE; -CREATE INDEX fki_bud_hypo_bh_id ON bud_card(bh_id); -ALTER TABLE bud_card ALTER COLUMN bh_id SET NOT NULL; - - - --- --- Name: bud_detail; Type: TABLE; Schema: public; Owner: phpcompta; Tablespace: --- - -CREATE TABLE bud_detail ( - bd_id integer NOT NULL, - po_id integer, - bc_id integer, - bh_id integer, - pcm_val poste_comptable -); - - -ALTER TABLE public.bud_detail OWNER TO phpcompta; - --- --- Name: TABLE bud_detail; Type: COMMENT; Schema: public; Owner: phpcompta --- - -COMMENT ON TABLE bud_detail IS 'Detail for card '; - - --- --- Name: COLUMN bud_detail.bd_id; Type: COMMENT; Schema: public; Owner: phpcompta --- - -COMMENT ON COLUMN bud_detail.bd_id IS 'primary key'; - - --- --- Name: COLUMN bud_detail.po_id; Type: COMMENT; Schema: public; Owner: phpcompta --- - -COMMENT ON COLUMN bud_detail.po_id IS 'FK to poste_analytique'; - - --- --- Name: COLUMN bud_detail.bc_id; Type: COMMENT; Schema: public; Owner: phpcompta --- - -COMMENT ON COLUMN bud_detail.bc_id IS 'fk to bud_card'; - - --- --- Name: COLUMN bud_detail.pcm_val; Type: COMMENT; Schema: public; Owner: phpcompta --- - -COMMENT ON COLUMN bud_detail.pcm_val IS 'fk to tmp_pcmn'; - - --- --- Name: bud_detail_bd_id_seq; Type: SEQUENCE; Schema: public; Owner: phpcompta --- - -CREATE SEQUENCE bud_detail_bd_id_seq - INCREMENT BY 1 - NO MAXVALUE - NO MINVALUE - CACHE 1; - - -ALTER TABLE public.bud_detail_bd_id_seq OWNER TO phpcompta; - --- --- Name: bud_detail_bd_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: phpcompta --- - -ALTER SEQUENCE bud_detail_bd_id_seq OWNED BY bud_detail.bd_id; - - --- --- Name: bd_id; Type: DEFAULT; Schema: public; Owner: phpcompta --- - -ALTER TABLE bud_detail ALTER COLUMN bd_id SET DEFAULT nextval('bud_detail_bd_id_seq'::regclass); - - --- --- Name: pk_bud_detail; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace: --- - -ALTER TABLE ONLY bud_detail - ADD CONSTRAINT pk_bud_detail PRIMARY KEY (bd_id); - - --- --- Name: fki_bud_card; Type: INDEX; Schema: public; Owner: phpcompta; Tablespace: --- - -CREATE INDEX fki_bud_card ON bud_detail USING btree (bc_id); - - --- --- Name: fki_tmp_pcmn; Type: INDEX; Schema: public; Owner: phpcompta; Tablespace: --- - -CREATE INDEX fki_tmp_pcmn ON bud_detail USING btree (pcm_val); - - --- --- Name: fk_bud_card; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta --- - -ALTER TABLE ONLY bud_detail - ADD CONSTRAINT fk_bud_card FOREIGN KEY (bc_id) REFERENCES bud_card(bc_id) ON UPDATE CASCADE ON DELETE CASCADE;; - -ALTER TABLE ONLY bud_detail - add constraint fk_bud_hypothese_not_null FOREIGN KEY (bh_id) REFERENCES bud_hypothese(bh_id) ON UPDATE CASCADE ON DELETE CASCADE;; - - --- --- Name: fk_tmp_pcmn; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta --- - -ALTER TABLE ONLY bud_detail - ADD CONSTRAINT fk_tmp_pcmn FOREIGN KEY (pcm_val) REFERENCES tmp_pcmn(pcm_val) ON UPDATE CASCADE ON DELETE CASCADE; --- --- Name: bud_detail_periode; Type: TABLE; Schema: public; Owner: phpcompta; Tablespace: --- - -CREATE TABLE bud_detail_periode ( - bdp_id integer NOT NULL, - bdp_amount numeric(20,4) DEFAULT 0.0, - p_id integer NOT NULL, - bd_id integer -); - - -ALTER TABLE public.bud_detail_periode OWNER TO phpcompta; - --- --- Name: TABLE bud_detail_periode; Type: COMMENT; Schema: public; Owner: phpcompta --- - -COMMENT ON TABLE bud_detail_periode IS 'Module budget detail by periode'; - - --- --- Name: COLUMN bud_detail_periode.p_id; Type: COMMENT; Schema: public; Owner: phpcompta --- - -COMMENT ON COLUMN bud_detail_periode.p_id IS 'fk to parm_periode'; - - --- --- Name: COLUMN bud_detail_periode.bd_id; Type: COMMENT; Schema: public; Owner: phpcompta --- - -COMMENT ON COLUMN bud_detail_periode.bd_id IS 'fk to bud_detail'; - - --- --- Name: bud_detail_periode_bdp_id_seq; Type: SEQUENCE; Schema: public; Owner: phpcompta --- - -CREATE SEQUENCE bud_detail_periode_bdp_id_seq - START WITH 1 - INCREMENT BY 1 - NO MAXVALUE - NO MINVALUE - CACHE 1; - - -ALTER TABLE public.bud_detail_periode_bdp_id_seq OWNER TO phpcompta; - --- --- Name: bud_detail_periode_bdp_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: phpcompta --- - -ALTER SEQUENCE bud_detail_periode_bdp_id_seq OWNED BY bud_detail_periode.bdp_id; - - --- --- Name: bdp_id; Type: DEFAULT; Schema: public; Owner: phpcompta --- - -ALTER TABLE bud_detail_periode ALTER COLUMN bdp_id SET DEFAULT nextval('bud_detail_periode_bdp_id_seq'::regclass); - - --- --- Name: pk_budget_detail_period; Type: CONSTRAINT; Schema: public; Owner: phpcompta; Tablespace: --- - -ALTER TABLE ONLY bud_detail_periode - ADD CONSTRAINT pk_budget_detail_period PRIMARY KEY (bdp_id); - - --- --- Name: fk_bud_detail_bd_id; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta --- - -ALTER TABLE ONLY bud_detail_periode - ADD CONSTRAINT fk_bud_detail_bd_id FOREIGN KEY (bd_id) REFERENCES bud_detail(bd_id) ON UPDATE CASCADE ON DELETE CASCADE; - - --- --- Name: fk_parm_periode; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta --- - -ALTER TABLE ONLY bud_detail_periode - ADD CONSTRAINT fk_parm_periode FOREIGN KEY (p_id) REFERENCES parm_periode(p_id) ON UPDATE CASCADE ON DELETE CASCADE; - - - -CREATE OR REPLACE FUNCTION bud_detail_ins_upd() - RETURNS "trigger" AS -$BODY$declare -mline bud_detail%ROWTYPE; -begin -mline:=NEW; -if mline.po_id = -1 then - mline.po_id:=NULL; -end if; -return mline; -end;$BODY$ - LANGUAGE 'plpgsql' VOLATILE; - - -CREATE OR REPLACE FUNCTION bud_card_ins_upd() - RETURNS "trigger" AS -$BODY$declare - sCode text; -begin - -sCode:=trim(upper(NEW.bc_code)); -sCode:=replace(sCode,' ','_'); -sCode:=substr(sCode,1,10); -NEW.bc_code:=sCode; -return NEW; -end;$BODY$ - LANGUAGE 'plpgsql' VOLATILE; -ALTER FUNCTION bud_card_ins_upd() OWNER TO phpcompta; - --- --- Name: t_bud_card_ins_up; Type: TRIGGER; Schema: public; Owner: phpcompta --- - -CREATE TRIGGER t_bud_card_ins_up - BEFORE INSERT OR UPDATE ON bud_card - FOR EACH ROW - EXECUTE PROCEDURE bud_card_ins_upd(); - - --- --- Name: bud_hypothese_bh_id; Type: FK CONSTRAINT; Schema: public; Owner: phpcompta --- - -ALTER TABLE ONLY bud_card - ADD CONSTRAINT bud_hypothese_bh_id FOREIGN KEY (bh_id) REFERENCES bud_hypothese(bh_id) ON UPDATE CASCADE ON DELETE CASCADE; - - -CREATE TRIGGER t_bud_detail_ins_upd - BEFORE INSERT OR UPDATE - ON bud_detail - FOR EACH ROW - EXECUTE PROCEDURE bud_detail_ins_upd(); - - - -CREATE TABLE jrn_periode -( - jrn_def_id int4 NOT NULL, - p_id int4 NOT NULL, - status text, - CONSTRAINT jrn_periode_pk PRIMARY KEY (jrn_def_id, p_id), - CONSTRAINT jrn_per_jrn_def_id FOREIGN KEY (jrn_def_id) - REFERENCES jrn_def (jrn_def_id) MATCH SIMPLE - ON UPDATE CASCADE ON DELETE CASCADE, - CONSTRAINT jrn_periode_p_id FOREIGN KEY (p_id) - REFERENCES parm_periode (p_id) MATCH SIMPLE - ON UPDATE CASCADE ON DELETE CASCADE -); - -insert into jrn_periode(p_id,jrn_def_id,status) select p_id,jrn_def_id, - case when p_central='t' then 'CE' - when p_closed='t' then 'CL' - else 'OP' - end -from -parm_periode cross join jrn_def; - -CREATE OR REPLACE FUNCTION jrn_def_add() - RETURNS "trigger" AS -$BODY$begin -execute 'insert into jrn_periode(p_id,jrn_def_id,status) select p_id,'||NEW.jrn_def_id||', - case when p_central=true then ''CE'' - when p_closed=true then ''CL'' - else ''OP'' - end -from -parm_periode '; -return NEW; -end;$BODY$ - LANGUAGE 'plpgsql' VOLATILE; - -CREATE TRIGGER t_jrn_def_add_periode - AFTER INSERT - ON jrn_def - FOR EACH ROW - EXECUTE PROCEDURE jrn_def_add(); - -CREATE OR REPLACE FUNCTION jrn_check_periode() - RETURNS "trigger" AS -$BODY$ -declare -bClosed bool; -str_status text; -begin - -select p_closed into bClosed from parm_periode - where p_id=NEW.jr_tech_per; - -if bClosed = true then - raise exception 'Periode fermee'; -end if; - -select status into str_status from jrn_periode - where p_id =NEW.jr_tech_per and jrn_def_id=NEW.jr_def_id; - -if str_status <> 'OP' then - raise exception 'Periode fermee'; -end if; - -return NEW; -end;$BODY$ - LANGUAGE 'plpgsql' VOLATILE; - - -CREATE TRIGGER t_check_jrn - BEFORE INSERT OR DELETE - ON jrn - FOR EACH ROW - EXECUTE PROCEDURE jrn_check_periode(); - -drop TRIGGER tr_jrn_check_balance on jrn; - -CREATE OR REPLACE FUNCTION jrn_def_delete() - RETURNS "trigger" AS -$BODY$ -declare -nb numeric; -begin -select count(*) into nb from jrn where jr_def_id=OLD.jrn_def_id; - -if nb <> 0 then - raise exception 'EFFACEMENT INTERDIT: JOURNAL UTILISE'; -end if; -return OLD; -end;$BODY$ - LANGUAGE 'plpgsql' VOLATILE; - - -CREATE TRIGGER t_jrn_def_delete - BEFORE DELETE - ON jrn_def - FOR EACH ROW - EXECUTE PROCEDURE jrn_def_delete(); - -CREATE OR REPLACE FUNCTION proc_check_balance() - RETURNS "trigger" AS -$BODY$ -declare - diff numeric; - tt integer; -begin - if TG_OP = 'INSERT' or TG_OP='UPDATE' then - tt=NEW.jr_grpt_id; - diff:=check_balance(tt); - if diff != 0 then - raise exception 'balance error %',diff ; - end if; - return NEW; - end if; -end; -$BODY$ - LANGUAGE 'plpgsql' VOLATILE; - -CREATE TRIGGER t_check_balance - AFTER INSERT OR UPDATE - ON jrn - FOR EACH ROW - EXECUTE PROCEDURE proc_check_balance(); - -INSERT INTO "action" (ac_id, ac_description) VALUES (60, 'Module Budget'); -alter table tmp_pcmn add column pcm_type text; -ALTER TABLE tmp_pcmn ALTER COLUMN pcm_type set default NULL; - - -CREATE TABLE parm_poste ( - p_value poste_comptable NOT NULL, - p_type text NOT NULL -); - - --- --- Name: TABLE parm_poste; Type: COMMENT; Schema: public; Owner: postgres --- - -COMMENT ON TABLE parm_poste IS 'Contains data for finding is the type of the account (asset)'; - - --- --- Name: parm_poste_pkey; Type: CONSTRAINT; Schema: public; Owner: postgres; Tablespace: --- - -ALTER TABLE ONLY parm_poste - ADD CONSTRAINT parm_poste_pkey PRIMARY KEY (p_value); - - - -CREATE OR REPLACE FUNCTION find_pcm_type(pp_value "numeric") - RETURNS text AS -$BODY$ -declare - str_type text; - str_value text; - n_value numeric; - nLength integer; -begin - str_value:=trim(to_char(pp_value,'99999999999999999999999999999')); - nLength:=length(str_value); - while nLength > 0 loop - n_value:=to_number(str_value,'99999999999999999999999999999'); - select into str_type p_type from parm_poste where p_value=n_value; - if FOUND then - return str_type; - end if; - nLength:=nLength-1; - str_value:=substring(str_value from 1 for nLength); - end loop; -return 'CON'; -end; -$BODY$ - LANGUAGE 'plpgsql' VOLATILE; - -CREATE OR REPLACE FUNCTION tmp_pcmn_ins() - RETURNS "trigger" AS -$BODY$ -declare - r_record tmp_pcmn%ROWTYPE; -begin -r_record=NEW; -if length(trim(r_record.pcm_type))=0 or r_record.pcm_type is NULL then - r_record.pcm_type:=find_pcm_type(NEW.pcm_val); - return r_record; -end if; -return NEW; -end; -$BODY$ - LANGUAGE 'plpgsql' VOLATILE; - -CREATE TRIGGER t_tmp_pcmn_ins - BEFORE INSERT - ON tmp_pcmn - FOR EACH ROW - EXECUTE PROCEDURE tmp_pcmn_ins(); - -update tmp_pcmn set pcm_type=find_pcm_type(pcm_val); -commit; +commit;