diff --git a/html/ajax_ledger.php b/html/ajax_ledger.php index e44d94f28..e01c7bf6f 100644 --- a/html/ajax_ledger.php +++ b/html/ajax_ledger.php @@ -291,7 +291,7 @@ case 'file': echo '
'; $x=''; if ($access=='W' && $g_user->check_action (RMRECEIPT) == 1) - $x=sprintf('ⵝ', + $x=sprintf(''.SMALLX.'', $gDossier,$div,$jr_id); $filename= $obj->det->jr_pj_name; @@ -333,7 +333,7 @@ case 'loadfile': // check if the user can remove a document if ($g_user->check_action (RMRECEIPT) == 1) { - $x=sprintf(''."ⵝ".'', + $x=sprintf(''.SMALLX.'', $gDossier,$div,$jr_id); echo $x; } diff --git a/include/ac_common.php b/include/ac_common.php index 201d1fb47..2e3528704 100644 --- a/include/ac_common.php +++ b/include/ac_common.php @@ -1067,6 +1067,12 @@ function ajax_xml_error($p_code,$p_string) EOF; } +/** + * @brief Display a box with the contains + * @param type $p_array Data to display + * @param type $p_title Title of the box + * @param type $p_div id of the box + */ function display_dashboard_operation($p_array,$p_title,$p_div) { ?> @@ -1078,6 +1084,7 @@ function display_dashboard_operation($p_array,$p_title,$p_div) + + diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index d2983761e..d45571dd3 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -3783,7 +3783,17 @@ class Acc_Ledger extends jrn_def_sql throw $e; } } - + /** + * Get operation from the ledger type before, after or with the + * given date . The array is filtered by the ledgers granted to the + * user + * @global type $g_user + * @param $p_date Date (d.m.Y) + * @param $p_ledger_type VEN ACH + * @param type $sql_op < > or = + * @return array from jrn (jr_id, jr_internal, jr_date, jr_comment,jr_pj_number,jr_montant) + * @throws Exception + */ function get_operation_date($p_date,$p_ledger_type,$sql_op) { global $g_user; @@ -3800,7 +3810,7 @@ class Acc_Ledger extends jrn_def_sql } - $sql = "select jr_id, jr_internal, jr_date, jr_comment,jr_comment,jr_montant + $sql = "select jr_id, jr_internal, jr_date, jr_comment,jr_pj_number,jr_montant from jrn join jrn_def on (jrn_def_id=jr_def_id) where diff --git a/include/class_follow_up.php b/include/class_follow_up.php index 95040a4b3..343486413 100644 --- a/include/class_follow_up.php +++ b/include/class_follow_up.php @@ -1528,6 +1528,7 @@ class Follow_Up */ function tag_cell() { + global $g_user; $a_tag=$this->tag_get(); $c=count($a_tag); for ($e=0;$e<$c;$e++) { @@ -1535,13 +1536,17 @@ class Follow_Up $a_tag[$e]['t_id']); echo ''; echo $a_tag[$e]['t_tag']; - echo HtmlInput::anchor( " ⵝ ", "javascript:void(0)", $js_remove, ' class="smallbutton" style="padding:0px;display:inline" '); + if ($g_user->can_write_action($this->ag_id) == true ) + { HtmlInput::anchor( SMALLX, "javascript:void(0)", $js_remove, ' class="smallbutton" style="padding:0px;display:inline" ');} echo ''; echo ' '; echo ' '; } $js=sprintf("onclick=\"action_tag_select('%s','%s')\"",dossier::id(),$this->ag_id); - echo HtmlInput::button('tag_bt', 'Ajout tag',$js, 'smallbutton'); + if ($g_user->can_write_action($this->ag_id) == true ) + { + echo HtmlInput::button('tag_bt', 'Ajout tag',$js, 'smallbutton'); + } } static function action_tag_remove($cn,$p_array) @@ -1692,7 +1697,7 @@ class Follow_Up $a_linked[$i]['f_id'],$this->ag_id); echo ''; echo $qc; - echo HtmlInput::anchor( " ⵝ ", "javascript:void(0)", $js_remove, ' class="smallbutton" style="padding:0px;display:inline" '); + echo HtmlInput::anchor(SMALLX, "javascript:void(0)", $js_remove, ' class="smallbutton" style="padding:0px;display:inline" '); echo ''; echo ' '; echo ' '; diff --git a/include/class_html_input.php b/include/class_html_input.php index c45f38259..48739813a 100755 --- a/include/class_html_input.php +++ b/include/class_html_input.php @@ -904,7 +904,7 @@ class HtmlInput $rmOperation=sprintf("javascript:if ( confirm('"._('Voulez-vous effacer cette relation ')."')==true ) {remove_operation('%s','%s');}", dossier::id(), $p_operation); - $js= ''."ⵝ".''; + $js= ''.SMALLX.''; return $js; } static function button_action_add_concerned_card($p_agid) diff --git a/include/class_tag.php b/include/class_tag.php index 8d2323e47..b36b2518a 100644 --- a/include/class_tag.php +++ b/include/class_tag.php @@ -100,7 +100,7 @@ class Tag echo h($this->data->t_tag); echo HtmlInput::hidden($p_prefix.'tag[]', $this->data->t_id); $js=sprintf("$('sp_".$p_prefix.$this->data->t_id."').remove();"); - echo HtmlInput::anchor( " ⵝ ", "javascript:void(0)", "onclick=\"$js\"", ' class="smallbutton " style="padding:0px;display:inline" '); + echo HtmlInput::anchor( SMALLX, "javascript:void(0)", "onclick=\"$js\"", ' class="smallbutton " style="padding:0px;display:inline" '); echo ''; } /** diff --git a/include/template/dashboard.php b/include/template/dashboard.php index 3bcbeb527..571ab7e3a 100644 --- a/include/template/dashboard.php +++ b/include/template/dashboard.php @@ -266,6 +266,10 @@ for($i=0;$i + diff --git a/include/template/detail-action.php b/include/template/detail-action.php index b5a6d3a9a..8a3013838 100644 --- a/include/template/detail-action.php +++ b/include/template/detail-action.php @@ -49,7 +49,10 @@ @@ -66,7 +69,10 @@
@@ -1095,6 +1102,9 @@ function display_dashboard_operation($p_array,$p_title,$p_div) + + + + + - search().$ag_contact->input(); + can_write_action($this->ag_id) == true ): + echo $ag_contact->search().$ag_contact->input(); + endif; ?>
display_linked(); - echo HtmlInput::button_action_add_concerned_card( $this->ag_id)?> + if ($g_user->can_write_action($this->ag_id) == true ): + echo HtmlInput::button_action_add_concerned_card( $this->ag_id); + endif; + ?> @@ -191,7 +197,7 @@ dossier::id(), $action[$o]['ag_id'],$_REQUEST['ag_id']); $showAction=''; - $js= 'ⵝ'; + $js= ''.SMALLX.''; echo '
  • '.$showAction.$action[$o]['str_date']." ".$action[$o]['ag_ref']." ". h($action[$o]['sub_title']).'('.h($action[$o]['dt_value']).')'." " .$js.'
    • '; @@ -268,7 +274,7 @@ for( $c=0;$cⵝ'; + $js= ''.SMALLX.''; echo hb('n°'.$acomment[$c]['agc_id'].'('.$acomment[$c]['tech_user']." ".$acomment[$c]['str_agc_date'].')').$js. '
     '.
 				" ".h($acomment[$c]['agc_comment']).'
    ' diff --git a/include/template/ledger_detail_bottom.php b/include/template/ledger_detail_bottom.php index 6d0ce650f..66119dbd2 100644 --- a/include/template/ledger_detail_bottom.php +++ b/include/template/ledger_detail_bottom.php @@ -166,7 +166,7 @@ if ($aRap != null ) { $amount=$array_jr[0]['jr_montant']; $str="modifyOperation(".$aRap[$e].",".$gDossier.")"; $rmReconciliation=new IButton('rmr'); - $rmReconciliation->label='ⵝ'; + $rmReconciliation->label=SMALLX; $rmReconciliation->class="tinybutton"; $rmReconciliation->javascript="if (confirm ('vous confirmez?') ) {"; $rmReconciliation->javascript.=sprintf('dropLink(\'%s\',\'%s\',\'%s\',\'%s\');deleteRowRec(\'%s\',this);}',