diff --git a/Changelog b/Changelog new file mode 100644 index 000000000..b0323ff57 --- /dev/null +++ b/Changelog @@ -0,0 +1,63 @@ +2003-09-26 sparkyx + + * include/postgres.php, include/top_menu_compta.php, doc/makedoc, html/admin_repo.php, html/central.php, html/compta.php, html/dossier_prefs.php, html/enc_jrn.php, html/facturation.php, html/fiche.php, html/form.php, html/impress.php, html/jrn_add.php, html/jrn_detail.php, html/jrn_update.php, html/line_update.php, html/login.php, html/pcmn_update.php, html/priv_user.php, html/rate_chg.php, html/user_pref.php, html/user_sec.php, include/ac_common.php: + remove html/verif.php + add ./makedoc for creating automatically doc + add doc/mod_function header for the functions + New GetUserProperties to get the user profile + -> replace the checkAdmin function + +2003-09-14 sparkyx + + * html/enc_jrn.php: Fix problem with period + +2003-09-07 sparkyx + + * html/enc_jrn.php: When date change the tech periode must also change + + * html/enc_jrn.php: Fix bug when not g_jrn is defined + +2003-08-31 sparkyx + + * sql/theme.sql: Starting with themes + + * html/admin_repo.php, html/compta.php, html/index.html, html/login.php, html/priv_user.php, include/ac_common.php, include/top_menu_compta.php, install.sh, sql/ac_users.sql: + remove unused file + fix warning in the jrn file + fix bug in jrn table (jr_rapt text) + fix bug in jrn_search problem when checking if a number is valid + Improve the administration repository (user & folder) + +2003-08-17 sparkyx + + * html/jrn_search.php: Fix filter for amount + +2003-08-16 sparkyx + + * include/impress_inc.php: Fix the order by date + + * html/send_poste_pdf.php: Remove the new page + + * include/impress_inc.php: Fix problem in the order of GetDataPoste + +2003-08-15 sparkyx + + * include/jrn.php: Fix problem in the search menu + + * html/send_poste_pdf.php, include/impress_inc.php: + Perform printing : avoid empty account + + * include/jrn.php, sql/journal.sql, cvs-set, html/enc_jrn.php, html/jrn_search.php, log: + remove unused file + fix warning in the jrn file + fix bug in jrn table (jr_rapt text) + fix bug in jrn_search problem when checking if a number is valid + +2003-07-31 sparkyx + + * include/ac_common.php, include/central_inc.php, include/check_priv.php, include/constant.php, include/debug.php, include/facture_inc.php, include/fiche_inc.php, include/form_inc.php, include/impress_inc.php, include/jrn.php, include/poste.php, include/postgres.php, include/preference.php, include/top_menu_compta.php: + First release + + * addon/fonts/ZapfDingbats.afm, addon/fonts/php_Courier-Bold.afm, addon/fonts/php_Courier-BoldOblique.afm, addon/fonts/php_Courier-Oblique.afm, addon/fonts/php_Courier.afm, addon/fonts/php_Helvetica-Bold.afm, addon/fonts/php_Helvetica-BoldOblique.afm, addon/fonts/php_Helvetica-Oblique.afm, addon/fonts/php_Helvetica.afm, addon/fonts/php_Symbol.afm, addon/fonts/php_Times-Bold.afm, addon/fonts/php_Times-BoldItalic.afm, addon/fonts/php_Times-Italic.afm, addon/fonts/php_Times-Roman.afm, addon/fonts/php_ZapfDingbats.afm, addon/fonts/php_a0100131.afm, addon/fonts/php_a010013l.afm, doc/installation.sxw, doc/manual.sxw, doc/php.ini-minimum, html/admin_repo.php, html/calculator.js, html/calendar.js, html/central.php, html/compta.php, html/compute.js, html/dossier_prefs.php, html/enc_jrn.php, html/facturation.php, html/fiche.php, html/form.php, html/impress.php, html/index.html, html/jrn_add.php, html/jrn_detail.php, html/jrn_op_detail.php, html/jrn_search.php, html/jrn_update.php, html/line_update.php, html/login.php, html/logout.php, html/not_implemented.php, html/pcmn_update.php, html/poste_search.php, html/priv_user.php, html/rate_chg.php, html/send.php, html/send_jrn_pdf.php, html/send_poste_pdf.php, html/user_pref.php, html/user_sec.php, html/verif.php, html/win_detail_jrn.js, html/win_search_jrn.js, html/win_search_poste.js, sql/ac_dossier.sql, sql/ac_users.sql, sql/centralized.sql, sql/dos_pref.sql, sql/fiche.sql, sql/form.sql, sql/insert_pcmn.sql, sql/jnt_use_dos.sql, sql/journal.sql, sql/priv_user.sql, sql/struct-repository.sql, sql/struct.sql, sql/tmp_pcmn.sql, sql/user_pref.sql, sql/user_sec.sql, sql/version.sql, AUTHORS, COPYING, Faq, INSTALL, Todo, addon/class.ezpdf.php, addon/class.pdf.php, addon/data.txt, addon/fonts/Courier-Bold.afm, addon/fonts/Courier-BoldOblique.afm, addon/fonts/Courier-Oblique.afm, addon/fonts/Courier.afm, addon/fonts/Helvetica-Bold.afm, addon/fonts/Helvetica-BoldOblique.afm, addon/fonts/Helvetica-Oblique.afm, addon/fonts/Helvetica.afm, addon/fonts/Symbol.afm, addon/fonts/Times-Bold.afm, addon/fonts/Times-BoldItalic.afm, addon/fonts/Times-Italic.afm, addon/fonts/Times-Roman.afm, addon/readme.pdf, addon/readme.php, addon/ros.jpg, backup-db, cvs-set, install.sh, license.txt, log, setenv.sh, style.css: + Import in repository + diff --git a/html/admin_repo.php b/html/admin_repo.php index 5bc6d68f2..ed1326785 100644 --- a/html/admin_repo.php +++ b/html/admin_repo.php @@ -22,7 +22,7 @@ include_once("ac_common.php"); include_once("postgres.php"); include_once("debug.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); echo_debug("entering admin_repo"); //echo_debug("user $g_user"); diff --git a/html/central.php b/html/central.php index 49898b365..987ddf746 100644 --- a/html/central.php +++ b/html/central.php @@ -20,7 +20,9 @@ // Auteur Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start(); + +html_page_start($g_UserProperty['use_theme']); + if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; exit -2; @@ -47,7 +49,9 @@ include_once("central_inc.php"); $l_Db=sprintf("dossier%d",$g_dossier); $cn=DbConnect($l_Db); + echo '
'; +echo '

Centralise


'; if ( isset ($_POST["central"] )) { //demande centralise diff --git a/html/compta.php b/html/compta.php index b6a495f47..c4b8384b0 100644 --- a/html/compta.php +++ b/html/compta.php @@ -17,10 +17,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ // Auteur Dany De Bontridder ddebontridder@yahoo.fr -include ("ac_common.php"); +include_once ("ac_common.php"); /* $Revision$ */ session_start(); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); + if ( isset ( $dos ) ) { $g_dossier=$dos; session_register("g_dossier"); @@ -30,7 +31,7 @@ if ( isset ( $dos ) ) { // phpinfo(); exit -2; } -include ("postgres.php"); +include_once ("postgres.php"); echo_debug ("user is $g_user"); /* CheckUser */ CheckUser(); diff --git a/html/dossier_prefs.php b/html/dossier_prefs.php index 09dff1dfe..0d2601d78 100644 --- a/html/dossier_prefs.php +++ b/html/dossier_prefs.php @@ -20,7 +20,7 @@ // Auteur Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; phpinfo(); diff --git a/html/enc_jrn.php b/html/enc_jrn.php index a014de449..6aa6ef8a4 100644 --- a/html/enc_jrn.php +++ b/html/enc_jrn.php @@ -24,7 +24,7 @@ include_once("jrn.php"); include_once("preference.php"); include_once("poste.php"); include_once("error.php"); -html_page_start(0,"onLoad=\"CheckTotal();\""); +html_page_start($g_UserProperty['use_theme'],"onLoad=\"CheckTotal();\""); if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; exit -2; diff --git a/html/facturation.php b/html/facturation.php index a15c26b22..e5dcfba88 100644 --- a/html/facturation.php +++ b/html/facturation.php @@ -20,7 +20,7 @@ include ("ac_common.php"); include ("check_priv.php"); /* $Revision$ */ -html_page_start(); +html_page_start($g_UserProperty['use_theme']); if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; exit -2; diff --git a/html/fiche.php b/html/fiche.php index 45d713d34..e335c5c34 100644 --- a/html/fiche.php +++ b/html/fiche.php @@ -20,7 +20,9 @@ // Auteur Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start(); + +html_page_start($g_UserProperty['use_theme']); + if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; exit -2; diff --git a/html/form.php b/html/form.php index 6e55e2690..cfb52e5f5 100644 --- a/html/form.php +++ b/html/form.php @@ -21,7 +21,8 @@ /* $Revision$ */ include_once ("ac_common.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); + if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; exit -2; diff --git a/html/image/body-aqua.jpg b/html/image/body-aqua.jpg new file mode 100644 index 000000000..9e7b729f0 Binary files /dev/null and b/html/image/body-aqua.jpg differ diff --git a/html/image/bouton.jpg b/html/image/bouton.jpg new file mode 100644 index 000000000..e95940e22 Binary files /dev/null and b/html/image/bouton.jpg differ diff --git a/html/image/bouton2.jpg b/html/image/bouton2.jpg new file mode 100644 index 000000000..3321eebc0 Binary files /dev/null and b/html/image/bouton2.jpg differ diff --git a/html/image/bouton3.jpg b/html/image/bouton3.jpg new file mode 100644 index 000000000..df1564ce1 Binary files /dev/null and b/html/image/bouton3.jpg differ diff --git a/html/image/bouton4.png b/html/image/bouton4.png new file mode 100644 index 000000000..552b8bfb5 Binary files /dev/null and b/html/image/bouton4.png differ diff --git a/html/image/clouds2.jpg b/html/image/clouds2.jpg new file mode 100644 index 000000000..084b4406f Binary files /dev/null and b/html/image/clouds2.jpg differ diff --git a/html/image/clouds3.jpg b/html/image/clouds3.jpg new file mode 100644 index 000000000..5bc522102 Binary files /dev/null and b/html/image/clouds3.jpg differ diff --git a/html/image/freebtn1-b.jpg b/html/image/freebtn1-b.jpg new file mode 100644 index 000000000..261441ebb Binary files /dev/null and b/html/image/freebtn1-b.jpg differ diff --git a/html/image/freebtn1-l.gif b/html/image/freebtn1-l.gif new file mode 100644 index 000000000..1724031cb Binary files /dev/null and b/html/image/freebtn1-l.gif differ diff --git a/html/image/freebtn1-l.jpg b/html/image/freebtn1-l.jpg new file mode 100644 index 000000000..3b5f48650 Binary files /dev/null and b/html/image/freebtn1-l.jpg differ diff --git a/html/image/freebtn1-ll.gif b/html/image/freebtn1-ll.gif new file mode 100644 index 000000000..beaaaf2dc Binary files /dev/null and b/html/image/freebtn1-ll.gif differ diff --git a/html/image/freebtn1.gif b/html/image/freebtn1.gif new file mode 100644 index 000000000..4fd820d41 Binary files /dev/null and b/html/image/freebtn1.gif differ diff --git a/html/image/freebtn21.gif b/html/image/freebtn21.gif new file mode 100644 index 000000000..d61503e15 Binary files /dev/null and b/html/image/freebtn21.gif differ diff --git a/html/image/freebtn31.gif b/html/image/freebtn31.gif new file mode 100644 index 000000000..0c8ab7587 Binary files /dev/null and b/html/image/freebtn31.gif differ diff --git a/html/image/freebtn91.gif b/html/image/freebtn91.gif new file mode 100644 index 000000000..dd35657b7 Binary files /dev/null and b/html/image/freebtn91.gif differ diff --git a/html/image/glaslake1.jpg b/html/image/glaslake1.jpg new file mode 100644 index 000000000..a10da8b25 Binary files /dev/null and b/html/image/glaslake1.jpg differ diff --git a/html/image/glaslake2.jpg b/html/image/glaslake2.jpg new file mode 100644 index 000000000..981d077a8 Binary files /dev/null and b/html/image/glaslake2.jpg differ diff --git a/html/image/logo-wcompta b/html/image/logo-wcompta new file mode 100644 index 000000000..eda7a2899 Binary files /dev/null and b/html/image/logo-wcompta differ diff --git a/html/image/logo-wcompta.jpg b/html/image/logo-wcompta.jpg new file mode 100644 index 000000000..564936eb6 Binary files /dev/null and b/html/image/logo-wcompta.jpg differ diff --git a/html/image/logo7.jpg b/html/image/logo7.jpg new file mode 100644 index 000000000..2bd7263f0 Binary files /dev/null and b/html/image/logo7.jpg differ diff --git a/html/impress.php b/html/impress.php index 04383ba0c..a2748fa9e 100644 --- a/html/impress.php +++ b/html/impress.php @@ -19,7 +19,7 @@ // Auteur Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; exit -2; @@ -71,13 +71,11 @@ if ( isset ( $_POST["print"]) ) { echo ""; return; } - if ( $result== NO_POST_SELECTED) { - echo ""; + if ($result== NO_POST_SELECTED) { + echo ""; return; } -// foreach($HTTP_POST_VARS as $e=>$element) { -// echo_debug("$e $element"); -// } + if ( $_POST["action"]=="viewhtml") { echo ""; echo $result; diff --git a/html/index.html b/html/index.html index 9b9a90ab9..037b8cda6 100644 --- a/html/index.html +++ b/html/index.html @@ -1,20 +1,20 @@ Gnu Accountancy - +




-

Bienvenue dans wcompta

-

+ Logo +
'; $Res=ExecSql($cn,"select fd_id,fd_label from fichedef order by fd_label"); $Max=pg_NumRows($Res); for ( $i=0; $i < $Max;$i++) { $l_line=pg_fetch_array($Res,$i); - printf(' - + ', $l_line['fd_label'], $l_line['fd_id'], @@ -172,6 +145,7 @@ function ShowMenuComptaLeft($p_dossier,$p_item) echo '
- + - + diff --git a/html/jrn_add.php b/html/jrn_add.php index 2dc5fc94d..5ebd63129 100644 --- a/html/jrn_add.php +++ b/html/jrn_add.php @@ -21,7 +21,7 @@ /* $Revision$ */ include_once ("ac_common.php"); include_once("jrn.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; exit -2; diff --git a/html/jrn_detail.php b/html/jrn_detail.php index 86db2be24..30889caf0 100644 --- a/html/jrn_detail.php +++ b/html/jrn_detail.php @@ -19,7 +19,7 @@ // Auteur Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; exit -2; diff --git a/html/jrn_op_detail.php b/html/jrn_op_detail.php index 342008335..eb165781f 100644 --- a/html/jrn_op_detail.php +++ b/html/jrn_op_detail.php @@ -20,7 +20,7 @@ /* $Revision$ */ include_once ("ac_common.php"); include_once ("poste.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; phpinfo(); diff --git a/html/jrn_search.php b/html/jrn_search.php index 1fe17b85b..d8e5d5cd9 100644 --- a/html/jrn_search.php +++ b/html/jrn_search.php @@ -19,7 +19,7 @@ // Auteur Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; phpinfo(); diff --git a/html/jrn_update.php b/html/jrn_update.php index 9e97f7847..6e7552300 100644 --- a/html/jrn_update.php +++ b/html/jrn_update.php @@ -19,7 +19,7 @@ // Auteur Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; phpinfo(); diff --git a/html/line_update.php b/html/line_update.php index f48af24f8..ce934e7be 100644 --- a/html/line_update.php +++ b/html/line_update.php @@ -19,7 +19,7 @@ // Auteur Dany De Bontridder ddebontridder@yahoo.fr // $Revision$ include ("ac_common.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); if ( !isset ($g_dossier)) { echo "You must choose a Dossier "; phpinfo(); diff --git a/html/login.php b/html/login.php index b730d0588..58e7535d4 100644 --- a/html/login.php +++ b/html/login.php @@ -32,16 +32,16 @@ if ( isset ($_POST["p_user"] ) ) { $g_pass=$_POST["p_pass"]; session_register("g_user"); session_register("g_pass"); - html_page_start(); +html_page_start("classic"); } else { if ( strlen($g_user) != 0 ) { echo_debug("user is not null"); - html_page_start(); + html_page_start("classic"); } else { - html_page_start(1); + html_page_start("classic"); } } @@ -56,7 +56,6 @@ if ( isset ($db_page) ) { echo_debug("USER=$g_user - "); -//echo_debug($HTTP_SESSION_VARS["user"]); echo_debug("PAGE = $db_page"); $cn=pg_connect("dbname=account_repository user='webcompta' "); diff --git a/html/logout.php b/html/logout.php index 052731092..29f553fbd 100644 --- a/html/logout.php +++ b/html/logout.php @@ -20,7 +20,7 @@ include ("ac_common.php"); include ("postgres.php"); -html_page_start(); +html_page_start("classic"); session_unset(); echo ''; diff --git a/html/pcmn_update.php b/html/pcmn_update.php index 1d82c3348..ba17415b0 100644 --- a/html/pcmn_update.php +++ b/html/pcmn_update.php @@ -19,7 +19,7 @@ // Auteur Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); if ( ! isset ( $g_dossier ) ) { echo "You must choose a Dossier "; phpinfo(); diff --git a/html/poste_search.php b/html/poste_search.php index b202c2a04..5552bdd0f 100644 --- a/html/poste_search.php +++ b/html/poste_search.php @@ -20,7 +20,7 @@ /* $Revision$ */ include_once ("ac_common.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); include_once ("postgres.php"); /* Admin. Dossier */ CheckUser(); diff --git a/html/priv_user.php b/html/priv_user.php index f11b9b38c..e10bd35be 100644 --- a/html/priv_user.php +++ b/html/priv_user.php @@ -21,7 +21,7 @@ include_once("ac_common.php"); include_once("postgres.php"); include_once("debug.php"); include_once("top_menu_compta.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); echo_debug("entering priv_users"); diff --git a/html/rate_chg.php b/html/rate_chg.php index a01b0861d..c60304426 100644 --- a/html/rate_chg.php +++ b/html/rate_chg.php @@ -18,7 +18,7 @@ */ // Auteur Dany De Bontridder ddebontridder@yahoo.fr include_once("ac_common.php"); -html_page_start(); +html_page_start($g_UserProperty['use_theme']); echo_debug("code : $code"); include_once("postgres.php"); ?> diff --git a/html/send_jrn_pdf.php b/html/send_jrn_pdf.php index 0a754fa9c..47d7991d0 100644 --- a/html/send_jrn_pdf.php +++ b/html/send_jrn_pdf.php @@ -32,13 +32,15 @@ $l_Db=sprintf("dossier%d",$g_dossier); $cn=DbConnect($l_Db); $l_type="JRN"; +$centr=" Non centralisé"; +$l_centr=0; if ( isset ($_POST["central"]) ) { - $centr=($_POST["central"]=='no')?" Non centralisé":" centralisé "; - $l_type=$_POST["central"] == 'no'?"GL-NOCENTRAL":"GL-CENTRAL"; - + $centr=" centralisé "; + $l_centr=1; } + if ( $_POST["filter"] == YES) { - $name_jrn=GetJrnName($cn,$_POST["p_id"]); + $name_jrn=GetJrnName($cn,$_POST["p_id"]).$centr; } else { $name_jrn="Grand livre ".$centr; } @@ -64,15 +66,21 @@ while (1) { $Exercice=GetExercice($cn,$a_jrn[0]['periode']); - list($rap_deb,$rap_cred)=GetRappel($cn,$first_id,$_POST["p_id"],$Exercice,FIRST,$l_type); + list($rap_deb,$rap_cred)=GetRappel($cn,$first_id,$_POST["p_id"],$Exercice,FIRST, + $_POST['filter'], + $l_centr + ); echo_debug("MONTANT $rap_deb,$rap_cred"); echo_debug(" list($rap_deb,$rap_cred)=GetRappel($cn,$first_id,".$_POST["p_id"].",$Exercice,FIRST)"); - $pdf->ezText($name_jrn,30); + + if ( $l_centr == 1 ) { + // si centralisé montre les montants de rappel $str_debit=sprintf( "report Débit % 10.2f",$rap_deb); $str_credit=sprintf("report Crédit % 10.2f",$rap_cred); $pdf->ezText($str_debit,12,array('justification'=>'right')); $pdf->ezText($str_credit,12,array('justification'=>'right')); + } $pdf->ezTable($a_jrn, array ('internal'=>'Opération', @@ -100,13 +108,14 @@ while (1) { $count=count($a_jrn)-1; $last_id=$a_jrn[$count]['j_id']; $Exercice=GetExercice($cn,$a_jrn[$count]['periode']); - - list($rap_deb,$rap_cred)=GetRappel($cn,$last_id,$_POST["p_id"],$Exercice,LAST,$l_type); - $str_debit=sprintf( "à reporter Débit % 10.2f",$rap_deb); - $str_credit=sprintf("à reporter Crédit % 10.2f",$rap_cred); - $pdf->ezText($str_debit,12,array('justification'=>'right')); - $pdf->ezText($str_credit,12,array('justification'=>'right')); - + if ( $l_centr == 1) { + // Montant de rappel si centralisé + list($rap_deb,$rap_cred)=GetRappel($cn,$last_id,$_POST["p_id"],$Exercice,LAST,$_POST['filter'],$l_centr); + $str_debit=sprintf( "à reporter Débit % 10.2f",$rap_deb); + $str_credit=sprintf("à reporter Crédit % 10.2f",$rap_cred); + $pdf->ezText($str_debit,12,array('justification'=>'right')); + $pdf->ezText($str_credit,12,array('justification'=>'right')); + } //New page $pdf->ezNewPage(); } @@ -123,7 +132,7 @@ $pdf->ezTable($apage, $last_id=$a_jrn[$count]['j_id']; $Exercice=GetExercice($cn,$a_jrn[$count]['periode']); - list($rap_deb,$rap_cred)=GetRappel($cn,$last_id,$_POST["p_id"],$Exercice,LAST,$l_type); + list($rap_deb,$rap_cred)=GetRappel($cn,$last_id,$_POST["p_id"],$Exercice,LAST,$l_POST['filter'],$l_centr); $str_debit=sprintf( "à reporter Débit % 10.2f",$rap_deb); $str_credit=sprintf("à reporter Crédit % 10.2f",$rap_cred); $pdf->ezText($str_debit,12,array('justification'=>'right')); diff --git a/html/send_poste_pdf.php b/html/send_poste_pdf.php index 495a035e1..2a5857ca9 100644 --- a/html/send_poste_pdf.php +++ b/html/send_poste_pdf.php @@ -33,6 +33,15 @@ include("poste.php"); foreach ($HTTP_POST_VARS as $key=>$element) { ${"$key"}=$element; } +if ( isset ( $all_poste) ){ //choisit de voir tous les postes + $r_poste=ExecSql($cn,"select pcm_val from tmp_pcmn where pcm_val = any ". + " (select j_poste from jrnx) order by pcm_val::text"); + $nPoste=pg_numRows($r_poste); + for ( $i=0;$i<$nPoste;$i++) { + $t_poste=pg_fetch_array($r_poste,$i); + $poste[]=$t_poste['pcm_val']; + } +} $ret=""; @@ -54,6 +63,7 @@ for ( $i =0;$i'Opération', 'j_date' => 'Date', 'jrn_name'=>'Journal', + 'description'=>'Description', 'debit'=> 'Type', 'montant'=> 'Montant', ),$Libelle, diff --git a/html/user_pref.php b/html/user_pref.php index 699ae452c..692bc19a8 100644 --- a/html/user_pref.php +++ b/html/user_pref.php @@ -20,9 +20,22 @@ // Auteur Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once ("ac_common.php"); -html_page_start(); - include_once ("postgres.php"); + +// Met a jour le theme utilisateur (style) +if ( isset ( $_POST['style_user']) ) { + $CnRepo=DbConnect(); + $Res=ExecSql($CnRepo, + "update ac_users set use_theme='".$_POST['style_user']. + "' where use_login='$g_user'"); + // echo '

Theme utilisateur changé

'; + $g_UserProperty['use_theme']=$_POST['style_user']; + +} + +html_page_start($g_UserProperty['use_theme']); + + /* Admin. Dossier */ CheckUser(); @@ -48,10 +61,19 @@ if ( isset ($spass) ) { $l_pass=md5($pass_1); $Res=ExecSql($Cn,"update ac_users set use_pass='$l_pass' where use_login='$g_user'"); $pass=$pass_1; - echo '

Mot de passe changé

'; +// echo '

Mot de passe changé

'; } } +// Met a jour le theme utilisateur (style) +if ( isset ( $_POST['style_user']) ) { + $CnRepo=DbConnect(); + $Res=ExecSql($CnRepo, + "update ac_users set use_theme='".$_POST['style_user']. + "' where use_login='$g_user'"); + // echo '

Theme utilisateur changé

'; + $g_UserProperty['use_theme']=$_POST['style_user']; +} ?>

Password

@@ -62,6 +84,42 @@ if ( isset ($spass) ) {
LOGIN LOGIN
PASSWORD PASSWORD
"; +foreach ($style as $st){ + if ( $st == $g_UserProperty['use_theme'] ) { + $disp_style.='
+ echo '
Creation Modele
%sVoir + printf('
%sVoir ModifierModifier
'; echo ''; echo ''; + echo ''; echo "
Devises
Périodes
Sécurité
"; echo '
'; break; @@ -351,12 +325,12 @@ function ShowMenuJrnUser($p_dossier,$p_user) printf ('%s',$l_line['jrn_def_name']); if ( $right > 0 ) { // Lecture - printf ('Voir', + printf ('Voir', $l_line['jrn_def_id']); } // ecriture if ( $right > 1 ) { - printf ('Encoder', + printf ('Encoder', $l_line['jrn_def_id'], $l_line['jrn_deb_max_line'], $l_line['jrn_cred_max_line']); @@ -447,7 +421,7 @@ function ShowMenuComptaForm($p_dossier) { $cn=DbConnect($l_dossier); echo '
'; echo ''; - echo ''; + echo ''; $l_jrn=sprintf("dossier%d",$p_dossier); $Cn=DbConnect($l_jrn); $Ret=ExecSql($Cn,"select fr_id, fr_label @@ -515,10 +489,10 @@ function ShowMenuJrnUserImp($p_cn,$p_user,$p_dossier) printf ('',$l_line['jrn_def_name']); - printf ('', + printf ('', $l_line['jrn_def_id'],YES); - printf ('', + printf ('', $l_line['jrn_def_id'],YES ); @@ -533,13 +507,9 @@ function ShowMenuJrnUserImp($p_cn,$p_user,$p_dossier) "); // Pour voir tout les journal ? if ( $NoPriv == 0 ) { - printf (''); - printf ('',NO); - printf ('',NO); - - printf (''); - printf ('',NO); - printf ('',NO); + printf (''); + printf ('',NO); + printf ('',NO); } echo "
Ajout de formulaire
Ajout
%sHtmlHtmlPdf
Pdf
Grand Livre Non CentraliséHtmlPdf
Grand Livre CentraliséHtmlPdf
Grand Livre HtmlPdf
"; @@ -555,11 +525,11 @@ function ShowMenuJrnUserImp($p_cn,$p_user,$p_dossier) printf ('%s',$l_line['fr_label']); - printf ('Html', $l_line['fr_id']); - printf ('Pdf', $l_line['fr_id'] ); @@ -574,11 +544,11 @@ function ShowMenuJrnUserImp($p_cn,$p_user,$p_dossier) printf ('Poste'); - printf ('Html' ); - printf ('Pdf' ); diff --git a/install.sh b/install.sh index 767ad7b32..eb19cfb48 100755 --- a/install.sh +++ b/install.sh @@ -58,6 +58,7 @@ if [ $REPO -eq 0 ]; then $PSQL < sql/jnt_use_dos.sql $PSQL < sql/version.sql $PSQL < sql/priv_user.sql + $PSQL < sql/theme.sql createdb -E latin1 -O $OWNER templ_account PSQL="psql -U $OWNER templ_account " $PSQL < sql/tmp_pcmn.sql @@ -69,7 +70,6 @@ if [ $REPO -eq 0 ]; then $PSQL < sql/form.sql $PSQL < sql/fiche.sql $PSQL < sql/centralized.sql - $PSQL < sql/theme.sql $PSQL < sql/user_sec.sql # if [ -w $PG_DATA/pg_hba.conf ]; then @@ -83,7 +83,9 @@ fi # Installation des sources export COMPTA_HOME=/home/httpd/compta +[ ! -d $COMPTA_HOME ] && mkdir $COMPTA_HOME [ ! -d $COMPTA_HOME/html ] && mkdir $COMPTA_HOME/html +[ ! -d $COMPTA_HOME/html/image ] && mkdir $COMPTA_HOME/html/image [ ! -d $COMPTA_HOME/include ] && mkdir $COMPTA_HOME/include echo "Installing source" cp -fr include/*.php $COMPTA_HOME/include @@ -96,6 +98,7 @@ for i in html/*.php ;do A=`basename $i` sed "s/echo_debug.*(\"/echo_debug(\"html\/$A:\".__LINE__.'--'.\"/g" $i > $COMPTA_HOME/html/`basename $i` done -cp -f style.css $COMPTA_HOME/html +cp -f style*.css $COMPTA_HOME/html cp -f html/*.js $COMPTA_HOME/html cp -fR addon $COMPTA_HOME/html +cp -fR html/image/* $COMPTA_HOME/html/image diff --git a/sql/centralized.sql b/sql/centralized.sql index 028510801..378195a38 100644 --- a/sql/centralized.sql +++ b/sql/centralized.sql @@ -25,8 +25,9 @@ CREATE TABLE centralized ( c_j_id integer , c_date date not null, c_internal text not null, - c_montant integer not null, + c_montant float not null, c_debit boolean default 't', + c_jrn_def int4 not null references jrn_def(jrn_def_id), c_poste integer references tmp_pcmn(pcm_val), c_description text, c_grp integer not null, diff --git a/sql/theme.sql b/sql/theme.sql index 43adfa2d0..6796d4622 100644 --- a/sql/theme.sql +++ b/sql/theme.sql @@ -24,3 +24,5 @@ create table theme ( ); insert into theme (the_name,the_filestyle,the_filebutton) values ('classic','style.css',null); + insert into theme (the_name,the_filestyle,the_filebutton) + values ('aqua','style-aqua.css',null); diff --git a/style-aqua.css b/style-aqua.css new file mode 100644 index 000000000..bf979b782 --- /dev/null +++ b/style-aqua.css @@ -0,0 +1,220 @@ + diff --git a/style.css b/style.css index 06b68232d..b03128ad5 100644 --- a/style.css +++ b/style.css @@ -7,6 +7,11 @@ h2.info { color:blue; font-size:20px; } +h2.info2 { + color:blue; + font-size:20px; +} + h2.error { color:red; font-size:20px; @@ -26,7 +31,7 @@ div.mtitle { div.tmenu { position: absolute; top:10px; - left:120px; + left:190px; width:750px; } @@ -79,6 +84,26 @@ table.mtitle { border:0; align:center } +td.mshort { + color:gray; + background-color:#0F4CD0; + font-size:11pt; + border-style:groove +} + +td.mltitle { + color:gray; + background-color:#0F4CD0; + font-size:11pt; + border-style:groove +} +td.mlltitle { + color:gray; + background-color:#0F4CD0; + font-size:11pt; + border-style:groove +} + td.mtitle { color:gray; background-color:#0F4CD0;