From 543f08fd1a7bfc50f035ca037fc0387b306fbb4e Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Mon, 11 Sep 2017 23:03:14 +0200 Subject: [PATCH] fix minor bug + doc --- doc/developper/Doxyfile | 2 +- html/style-classic.css | 6 ++++++ include/class/fiche.class.php | 16 ++++++++-------- include/lib/manage_table_sql.class.php | 2 ++ sql/upgrade.sql | 7 +++++-- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/doc/developper/Doxyfile b/doc/developper/Doxyfile index b8c301a82..d566823e3 100644 --- a/doc/developper/Doxyfile +++ b/doc/developper/Doxyfile @@ -699,7 +699,7 @@ EXCLUDE_SYMBOLS = # directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = +EXAMPLE_PATH = ../../scenario # If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp diff --git a/html/style-classic.css b/html/style-classic.css index 52708f6df..e1c7c4150 100644 --- a/html/style-classic.css +++ b/html/style-classic.css @@ -1318,6 +1318,12 @@ a.nav:hover,div.content a.nav:hover,div.redcontent a.nav:hover { background-color:#00008B; color:#FFFFFF; } +img:hover { + cursor:inherit ; + background-color:white; + color: transparent; + + } #dossier { display:inline; float:left; diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php index 5f0275b80..9848dc9e4 100644 --- a/include/class/fiche.class.php +++ b/include/class/fiche.class.php @@ -1374,13 +1374,13 @@ class Fiche { $vw_operation = sprintf('%s', $op['jr_id'], dossier::id(), $op['jr_internal']); $let = ''; - $html_let = ""; - if ($op['letter'] != -1) - { - $let = strtoupper(base_convert($op['letter'], 10, 36)); - $html_let = HtmlInput::show_reconcile($from_div, $let); - } - $tmp_diff=bcsub($op['deb_montant'],$op['cred_montant']); + $html_let = ""; + if ($op['letter'] != -1) + { + $let = strtoupper(base_convert($op['letter'], 10, 36)); + $html_let = HtmlInput::show_reconcile($from_div, $let); + } + $tmp_diff=bcsub($op['deb_montant'],$op['cred_montant']); /* * reset prog. balance to zero if we change of exercice @@ -1408,7 +1408,7 @@ class Fiche } } $progress=bcadd($progress,$tmp_diff); - $side=" ".$this->get_amount_side($progress); + $side=" ".$this->get_amount_side($progress); $sum_cred=bcadd($sum_cred,$op['cred_montant']); $sum_deb=bcadd($sum_deb,$op['deb_montant']); if ($idx%2 == 0) $class='class="odd"'; else $class=' class="even"'; diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php index 6b5ca580c..4678b9eba 100644 --- a/include/lib/manage_table_sql.class.php +++ b/include/lib/manage_table_sql.class.php @@ -56,6 +56,8 @@ @endcode * @see ManageTable.js */ +///@example test_manage_table_sql.php +/// For ajax @example ajax_manage_table_sql.php class Manage_Table_SQL { diff --git a/sql/upgrade.sql b/sql/upgrade.sql index b89203631..81bbc0cb2 100644 --- a/sql/upgrade.sql +++ b/sql/upgrade.sql @@ -1,13 +1,16 @@ alter table action_gestion drop ag_ref_ag_id; --- repository insert into theme (the_name,the_filestyle) values ('Classic 692','style-r692.css'); -ALTER TABLE tmp_pcmn ADD CONSTRAINT id_ux UNIQUE(id); +create sequence tmp_pcmn_id_seq; ALTER TABLE tmp_pcmn ADD COLUMN id bigint; +update tmp_pcmn set id=nextval('tmp_pcmn_id_seq'); + ALTER TABLE tmp_pcmn ALTER COLUMN id SET NOT NULL; ALTER TABLE tmp_pcmn ALTER COLUMN id SET DEFAULT nextval('tmp_pcmn_id_seq'::regclass); +ALTER TABLE tmp_pcmn ADD CONSTRAINT id_ux UNIQUE(id); COMMENT ON COLUMN tmp_pcmn.id IS 'allow to identify the row, it is unique and not null (pseudo pk)'; insert into bilan (b_name,b_file_template,b_file_form,b_type) values ('ASBL','document/fr_be/bnb-asbl.rtf','document/fr_be/bnb-asbl.form','RTF'); -alter table jnt_letter drop jl_amount_deb; \ No newline at end of file +alter table jnt_letter drop jl_amount_deb;