Author: danydb Date: 2013-12-08 12:10:44 +0100 (Sun, 08 Dec 2013) New Revision: 5583
Added: phpcompta/trunk/html/admin/sql/patch/upgrade110.sql Modified: phpcompta/trunk/ phpcompta/trunk/html/js/scripts.js phpcompta/trunk/include/ajax_bookmark.php phpcompta/trunk/include/class_html_input.php phpcompta/trunk/include/constant.php phpcompta/trunk/include/template/action_search_result.php phpcompta/trunk/include/template/letter_all.php phpcompta/trunk/include/template/letter_prop.php Log: Merged revisions 5577-5581 via svnmerge from svn+ssh://[email protected]/svn/phpcompta/tags/rel670 ........ r5577 | danydb | 2013-12-06 17:19:32 +0100 (ven., 06 d?\195?\169c. 2013) | 3 lines bug #931 - Parfois on ne peut pas ajouter le favori Ajout vue v_menu_description_favori Task #931 - Parfois on ne peut pas ajouter le favori ........ r5578 | danydb | 2013-12-06 17:30:55 +0100 (ven., 06 d?\195?\169c. 2013) | 4 lines bug #928 - Fen?\195?\170tre Journaux dans fen?\195?\170tre recherche est clipp?\195?\169 ajout d'un bouton "Fermer" Task #928 - Fen?\195?\170tre Journaux dans fen?\195?\170tre recherche est clipp?\195?\169 ........ r5579 | danydb | 2013-12-07 20:16:46 +0100 (sam., 07 d?\195?\169c. 2013) | 4 lines bug #928 - Fen?\195?\170tre Journaux dans fen?\195?\170tre recherche est clipp?\195?\169 Cosm?\195?\169tique Task #928 - Fen?\195?\170tre Journaux dans fen?\195?\170tre recherche est clipp?\195?\169 ........ r5580 | danydb | 2013-12-07 21:27:36 +0100 (sam., 07 d?\195?\169c. 2013) | 1 line Cosm?\195?\169tique ........ r5581 | danydb | 2013-12-07 23:07:15 +0100 (sam., 07 d?\195?\169c. 2013) | 1 line Fix some cosmetic bug, works with IE11 ........ Property changes on: phpcompta/trunk ___________________________________________________________________ Name: svnmerge-integrated - /phpcompta/tags/rel670:1-5539,5541-5575 + /phpcompta/tags/rel670:1-5539,5541-5582 Copied: phpcompta/trunk/html/admin/sql/patch/upgrade110.sql (from rev 5581, phpcompta/tags/rel670/html/admin/sql/patch/upgrade110.sql) =================================================================== --- phpcompta/trunk/html/admin/sql/patch/upgrade110.sql (rev 0) +++ phpcompta/trunk/html/admin/sql/patch/upgrade110.sql 2013-12-08 11:10:44 UTC (rev 5583) @@ -0,0 +1,26 @@ +begin; +create or replace view v_menu_description_favori as + WITH t_menu AS ( + SELECT mr.me_menu, pm.me_code, pm.me_code_dep, pm.p_type_display, pu.user_name, mr.me_file, mr.me_javascript, mr.me_description, mr.me_description_etendue + FROM profile_menu pm + JOIN profile_user pu ON pu.p_id = pm.p_id + JOIN profile p ON p.p_id = pm.p_id + JOIN menu_ref mr USING (me_code) + ) + SELECT DISTINCT (COALESCE(v3.me_code || '/'::text, ''::text) || COALESCE(v2.me_code, ''::text)) || + CASE + WHEN v2.me_code IS NULL THEN COALESCE(v1.me_code, ''::text) + WHEN v2.me_code IS NOT NULL THEN COALESCE('/'::text || v1.me_code, ''::text) + ELSE NULL::text + END AS code, v1.me_code, v1.me_description, v1.me_description_etendue, v1.me_file, v1.user_name, '> '::text || v1.me_menu AS v1menu, + CASE + WHEN COALESCE(v3.me_menu, ''::text) <> ''::text THEN ' > '::text || v2.me_menu + ELSE v2.me_menu + END AS v2menu, v3.me_menu AS v3menu, v3.p_type_display, COALESCE(v1.me_javascript, COALESCE(v2.me_javascript, v3.me_javascript)) AS javascript + FROM t_menu v1 + LEFT JOIN t_menu v2 ON v1.me_code_dep = v2.me_code + LEFT JOIN t_menu v3 ON v2.me_code_dep = v3.me_code + WHERE v1.p_type_display <> 'P'::text; +update version set val=111; + +commit; Modified: phpcompta/trunk/html/js/scripts.js =================================================================== --- phpcompta/trunk/html/js/scripts.js 2013-12-08 11:10:13 UTC (rev 5582) +++ phpcompta/trunk/html/js/scripts.js 2013-12-08 11:10:44 UTC (rev 5583) @@ -811,7 +811,8 @@ style: ';position:absolute;width:60%;z-index:20;margin-left:20%', drag: 1 }; - var y=calcy(posY); + //var y=calcy(posY); + var y=posY; if (json_obj.div != '')obj.cssclass=""; obj.style="top:"+y+obj.style; add_div(obj); Modified: phpcompta/trunk/include/ajax_bookmark.php =================================================================== --- phpcompta/trunk/include/ajax_bookmark.php 2013-12-08 11:10:13 UTC (rev 5582) +++ phpcompta/trunk/include/ajax_bookmark.php 2013-12-08 11:10:44 UTC (rev 5583) @@ -59,7 +59,7 @@ $bookmark_sql="select distinct b_id,b_action,b_order,me_description, javascript" . " from bookmark " - . "join v_menu_description on (code=b_action)" + . "join v_menu_description_favori on (code=b_action)" . "where " . "login=$1 order by b_order,b_action"; $a_bookmark=$cn->get_array($bookmark_sql,array($g_user->login)); Modified: phpcompta/trunk/include/class_html_input.php =================================================================== --- phpcompta/trunk/include/class_html_input.php 2013-12-08 11:10:13 UTC (rev 5582) +++ phpcompta/trunk/include/class_html_input.php 2013-12-08 11:10:44 UTC (rev 5583) @@ -318,6 +318,7 @@ /* create a hidden div for the ledger */ echo '<div id="div_jrn'.$div.'" >'; echo HtmlInput::title_box("Journaux", $div."jrn_search"); + echo '<div style="padding:5px">'; echo '<form method="GET" id="'.$div.'search_frm" onsubmit="return hide_ledger_choice(\''.$div.'search_frm\')">'; echo HtmlInput::hidden('nb_jrn', count($p_array)); echo _('Filtre ').HtmlInput::filter_table($div.'tb_jrn', '0,1,2', 1); @@ -339,7 +340,7 @@ } $class=($e%2==0)?' class="even" ':' class="odd" '; echo '<tr '.$class.'>'; - echo '<td >'.$r->input().$row['jrn_def_name'].'</td>'; + echo '<td style="white-space: nowrap">'.$r->input().$row['jrn_def_name'].'</td>'; echo '<td >'.$row['jrn_def_description'].'</td>'; echo '<td >'.$row['jrn_def_type'].'</td>'; echo '</tr>'; @@ -348,8 +349,10 @@ echo '</table>'; echo HtmlInput::hidden('div',$div); echo HtmlInput::submit('save','Valider'); + echo HtmlInput::button_close($div."jrn_search"); echo '</form>'; echo '</div>'; + echo '</div>'; $ret=ob_get_contents(); ob_end_clean(); return $ret; Modified: phpcompta/trunk/include/constant.php =================================================================== --- phpcompta/trunk/include/constant.php 2013-12-08 11:10:13 UTC (rev 5582) +++ phpcompta/trunk/include/constant.php 2013-12-08 11:10:44 UTC (rev 5583) @@ -71,7 +71,7 @@ define ("SITE_UPDATE_PLUGIN",'http://www.phpcompta.eu/plugin_last_version.txt'); -define ("DBVERSION",110); +define ("DBVERSION",111); define ("MONO_DATABASE",25); define ("DBVERSIONREPO",14); define ('NOTFOUND','--not found--'); Modified: phpcompta/trunk/include/template/action_search_result.php =================================================================== --- phpcompta/trunk/include/template/action_search_result.php 2013-12-08 11:10:13 UTC (rev 5582) +++ phpcompta/trunk/include/template/action_search_result.php 2013-12-08 11:10:44 UTC (rev 5583) @@ -57,7 +57,7 @@ </th> </tr> <?php for ($i=0;$i<$limit;$i++):?> - <?php $class=($i%2==0)?' class="odd" ':' class="info"'; ?> + <?php $class=($i%2==0)?' class="odd" ':' class="even"'; ?> <tr <?php echo $class?>> <td> <?php Modified: phpcompta/trunk/include/template/letter_all.php =================================================================== --- phpcompta/trunk/include/template/letter_all.php 2013-12-08 11:10:13 UTC (rev 5582) +++ phpcompta/trunk/include/template/letter_all.php 2013-12-08 11:10:44 UTC (rev 5583) @@ -42,7 +42,7 @@ <?php for ($i=0;$i<count($this->content);$i++): $class=""; -if ( ($i % 2) == 0 ) $class="odd"; +$class= ( ($i % 2) == 0 ) ? "odd":"even"; ?> <tr <?php echo "class=\"$class\""; ?> > <td> Modified: phpcompta/trunk/include/template/letter_prop.php =================================================================== --- phpcompta/trunk/include/template/letter_prop.php 2013-12-08 11:10:13 UTC (rev 5582) +++ phpcompta/trunk/include/template/letter_prop.php 2013-12-08 11:10:44 UTC (rev 5583) @@ -47,7 +47,7 @@ for ($i=0;$i<count($this->content);$i++): $class=""; -if ( ($i % 2) == 0 ) $class="odd"; +$class= ( ($i % 2) == 0 ) ? "odd":"even"; if ( $i < $linked_limit ) $class="even"; if ($linked_limit != 0 && $i==$linked_limit) { --- PhpCompta est un logiciel de comptabilité libre en ligne (full web) Projet opensource http://www.phpcompta.eu _______________________________________________ Phpcompta est un logiciel libre de comptabilité en ligne (http://www.phpcompta.eu) Phpcompta-dev mailing list [email protected] https://lists.nongnu.org/mailman/listinfo/phpcompta-dev
