';
// Add hidden tag
echo '";
+
+ $sql_array["query"]=$query;
+ $sql_array["inactive_card"]=$inactive;
/* what is the type of the ledger */
$type="GL";
if (isset($jrn) && $jrn > 1)
@@ -456,50 +452,69 @@ case 'fs':
$ledger=new Acc_Ledger($cn,$jrn);
$type=$ledger->get_type();
}
+ // if jrn == -10 , the search is called from the detail operation from an action follow-up
+ if ( isset($jrn) && $jrn == -10){
+ $type=$http->request("amount_from_type","string","VEN");
+ }
$fiche=new Fiche($cn);
/* Build the SQL and show result */
$sql=$fiche->build_sql($sql_array);
if ( strpos($sql," in ()") != 0)
{
- $html=Icon_Action::close('search_card');
- $html.='
'.h2info(_('Recherche de fiche')).'
';
+ $html="";
+ $html.=HtmlInput::title_box(_('Recherche de fiche'), 'search_card');
$html.='
';
$html.=_("Aucune catégorie de fiche ne correspond à".
" votre demande, le journal pourrait n'avoir accès à aucune fiche");
$html.='
';
+ $html.=HtmlInput::button_close("search_card");
break;
}
+ /**
+ * if inactive == 0 , then only active card
+ */
+ if ( $inactive == 0 ) {
+ $sql.=" and f_id in (select f_id from fiche_detail where ad_id=54 and ad_value='1') ";
+ }
+
/* We limit the search to MAX_SEARCH_CARD records */
- $sql=$sql.' order by vw_name limit '.MAX_SEARCH_CARD;
- $a=$cn->get_array($sql);
- for($i=0;$iget_value("select count(*) from ($sql) as c");
+
+ $record_start=$page_card*MAX_SEARCH_CARD;
+ $sql.=' limit '.MAX_SEARCH_CARD.' offset '.$record_start;
+
+ $aFound=$cn->get_array($sql);
+ $nb_found=count($aFound);
+ for($i=0;$i<$nb_found;$i++)
+ {
+ $array[$i]['quick_code']=$aFound[$i]['quick_code'];
+ $array[$i]['name']=h($aFound[$i]['vw_name']);
+ $array[$i]['accounting']=$aFound[$i]['accounting'];
+ $array[$i]['first_name']=h($aFound[$i]['vw_first_name']);
+ $array[$i]['description']=h($aFound[$i]['vw_description']);
$array[$i]['javascript']=sprintf("set_value('%s','%s');",
$inp,$array[$i]['quick_code']);
$array[$i]['javascript'].=sprintf("set_value('%s','%s');",
- $label,j(h(strip_tags($a[$i]['vw_name']))));
+ $label,j(h(strip_tags($aFound[$i]['vw_name']))));
+
/* if it is a ledger of sales we use vw_buy
if it is a ledger of purchase we use vw_sell*/
if ( $type=="ACH" ){
- $amount=(isNumber($a[$i]['vw_buy']) == 1 )?$a[$i]['vw_buy']:0;
+ $amount=(isNumber($aFound[$i]['vw_buy']) == 1 )?$aFound[$i]['vw_buy']:0;
$array[$i]['javascript'].=sprintf("set_value('%s','%s');",
$price,$amount);
}
if ( $type=="VEN" ){
- $amount=(isNumber($a[$i]['vw_buy']) == 1 )?$a[$i]['vw_sell']:0;
+ $amount=(isNumber($aFound[$i]['vw_sell']) == 1 )?$aFound[$i]['vw_sell']:0;
$array[$i]['javascript'].=sprintf("set_value('%s','%s');",
$price,$amount);
}
$array[$i]['javascript'].=sprintf("set_value('%s','%s');",
- $tvaid,$a[$i]['tva_id']);
+ $tvaid,$aFound[$i]['tva_id']);
$array[$i]['javascript'].="removeDiv('search_card');";
}//foreach
@@ -516,9 +531,11 @@ case 'fs':
require_once NOALYSS_INCLUDE.'/ajax/ajax_add_concerned_card.php';
return;
break;
- case 'action_save_concerned':
+// add several card to an action follow⁻up
+ case 'link_concerned_card':
require NOALYSS_INCLUDE.'/ajax/ajax_action_save_concerned.php';
return;
+// remove card from an action follow⁻up
case 'action_remove_concerned':
require NOALYSS_INCLUDE.'/ajax/ajax_action_remove_concerned.php';
return;
@@ -742,6 +759,23 @@ case 'upr':
}
}
break;
+ //---------------------------------------------------------------------------------------------------------------
+ // Display option of a contact in an action-followup
+ //---------------------------------------------------------------------------------------------------------------
+ case 'display_card_option':
+
+ require_once NOALYSS_INCLUDE.'/ajax/ajax_display_card_option.php';
+ return;
+ break;
+
+ //---------------------------------------------------------------------------------------------------------------
+ // Save option of a contact in an action-followup
+ //---------------------------------------------------------------------------------------------------------------
+ case 'save_card_option':
+ require_once NOALYSS_INCLUDE.'/ajax/ajax_save_card_option.php';
+ return;
+
+ break;
} // switch
$xml=escape_xml($html);
diff --git a/include/ajax/ajax_card_attribute.php b/include/ajax/ajax_card_attribute.php
new file mode 100644
index 000000000..418b103df
--- /dev/null
+++ b/include/ajax/ajax_card_attribute.php
@@ -0,0 +1,103 @@
+
+
+/**
+ * @file
+ * @brief answer to card_attr_inc.php
+ */
+global $g_user;
+// security
+$g_user->can_request("CFGATCARD");
+require_once NOALYSS_INCLUDE."/lib/inplace_switch.class.php";
+require_once NOALYSS_INCLUDE.'/class/card_attribut_mtable.class.php';
+
+$http=new HttpInput();
+
+try
+{
+ $action=$http->request("action", "string");
+}
+catch (Exception $ex)
+{
+ record_log("ACA01".$ex->getMessage().$ex->getTraceAsString());
+}
+
+if ($action=="enable_search")
+{
+ $value=$http->request("value");
+ $ad_id=$http->request("ad_id");
+ $name=$http->request("name");
+ if ($value==1)
+ {
+ $cn->exec_sql("update attr_def set ad_search_followup=0 where ad_id=$1", [$ad_id]);
+ $value=0;
+ }
+ else
+ {
+ $cn->exec_sql("update attr_def set ad_search_followup=1 where ad_id=$1", [$ad_id]);
+ $value=1;
+ }
+ $ic=new Inplace_Switch($name, $value);
+ $ic->set_callback("ajax_misc.php");
+ $ic->add_json_param("op", "card");
+ $ic->add_json_param("gDossier", Dossier::id());
+ $ic->add_json_param("op2", "attribute");
+ $ic->add_json_param("action", "enable_search");
+ $ic->add_json_param("ad_id", $ad_id);
+ $ic->add_json_param("ctl", $ad_id);
+ echo $ic->input();
+}
+else
+{
+ $obj=new Fiche_Attr($cn);
+ $mtable=new Card_Attribut_MTable($obj);
+ $mtable->add_json_param("op", "card");
+ $mtable->add_json_param("op2", "attribute");
+ $mtable->set_callback("ajax_misc.php");
+ $mtable->set_object_name($http->request("ctl"));
+ $ad_id=$http->request("p_id");
+ $mtable->get_table()->set_parameter("id", $ad_id);
+ switch ($action)
+ {
+ case "input":
+ $mtable->set_pk($ad_id);
+ if ( $ad_id < 0 ) $mtable->get_table()->set("ad_search_followup",0);
+ $mtable->send_header();
+ echo $mtable->ajax_input()->saveXML();
+
+ break;
+ case "save":
+ $mtable->set_pk($http->request("p_id"));
+ $mtable->send_header();
+ echo $mtable->ajax_save()->saveXML();
+
+
+ break;
+ case "delete":
+ $mtable->set_pk($http->request("p_id"));
+ $mtable->send_header();
+ echo $mtable->ajax_delete()->saveXML();
+ break;
+ default:
+ break;
+ }
+}
+?>
diff --git a/include/ajax/ajax_cfgaction.php b/include/ajax/ajax_cfgaction.php
new file mode 100644
index 000000000..656253194
--- /dev/null
+++ b/include/ajax/ajax_cfgaction.php
@@ -0,0 +1,82 @@
+
+
+if (!defined('ALLOWED'))
+ die('Appel direct ne sont pas permis');
+
+// check right
+if ($g_user->check_action(PARCATDOC)==0)
+{
+
+ record_log("cfgaction01 security ");
+ return;
+}
+
+require_once NOALYSS_INCLUDE."/class/action_document_type_mtable.class.php";
+
+$http=new HttpInput();
+
+
+/**
+ * @file
+ * @brief call for document_type in follow up
+ */
+try
+{
+ $table=$http->request('table');
+ $ctl_id=$http->request('ctl');
+ $action=$http->request('action');
+ $p_id=$http->request('p_id', "number");
+}
+catch (Exception $ex)
+{
+ echo $e->getMessage();
+ return;
+}
+
+$doc_type=new Document_type_SQL($cn,$p_id);
+$action_document_type=new Action_Document_Type_MTable($doc_type);
+
+$action_document_type->set_callback("ajax_misc.php");
+$action_document_type->add_json_param("op", "cfgaction");
+$action_document_type->set_object_name($ctl_id);
+
+
+
+if ($action=="input")
+{
+
+ header('Content-type: text/xml; charset=UTF-8');
+ echo $action_document_type->ajax_input()->saveXML();
+ return;
+}
+elseif ($action=="save")
+{
+ $xml=$action_document_type->ajax_save();
+ header('Content-type: text/xml; charset=UTF-8');
+ echo $xml->saveXML();
+}
+elseif ($action=="delete")
+{
+ $xml=$action_document_type->ajax_delete();
+ header('Content-type: text/xml; charset=UTF-8');
+ echo $xml->saveXML();
+}
diff --git a/include/ajax/ajax_contact_option_list.php b/include/ajax/ajax_contact_option_list.php
new file mode 100644
index 000000000..1622d1ab8
--- /dev/null
+++ b/include/ajax/ajax_contact_option_list.php
@@ -0,0 +1,67 @@
+
+
+if (!defined('ALLOWED'))
+ die('Appel direct ne sont pas permis');
+require_once NOALYSS_INCLUDE."/class/contact_option_ref_mtable.class.php";
+
+/**
+ * @file
+ * @brief add option for contact
+ * @see contact_option_list
+ * @see action_document_type_mtable::input()
+ */
+try
+{
+ $contact_option_id=$http->request("p_id");
+ $ctl_id=$http->request("ctl");
+ $action=$http->request("action");
+}
+catch (Exception $ex)
+{
+ record_log(__FILE__." no p_id");
+ return;
+}
+$cn=Dossier::connect();
+
+// document_option id from document_option where do_code='contact_multiple' and document_type_id=p_id
+$obj=new Contact_option_ref_SQL($cn);
+
+$contact_mtable=new Contact_Option_Ref_MTable($obj);
+
+$contact_mtable->set_callback("ajax_misc.php");
+$contact_mtable->set_object_name("s_contact_option");
+$contact_mtable->set_dialog_box("db_contact_option");
+$contact_mtable->add_json_param("op", "contact_option_list");
+$contact_mtable->set_object_name($ctl);
+$contact_mtable->set_pk($contact_option_id);
+
+if ($action == "input") {
+ $contact_mtable->send_header();
+ echo $contact_mtable->ajax_input()->saveXML();
+} elseif($action == "save") {
+ $contact_mtable->send_header();
+
+ echo $contact_mtable->ajax_save()->saveXML();
+} elseif ($action == "delete") {
+ $contact_mtable->send_header();
+ $contact_mtable->ajax_delete();
+}
\ No newline at end of file
diff --git a/include/ajax/ajax_display_card_option.php b/include/ajax/ajax_display_card_option.php
new file mode 100644
index 000000000..464c2b574
--- /dev/null
+++ b/include/ajax/ajax_display_card_option.php
@@ -0,0 +1,44 @@
+
+
+if (!defined('ALLOWED'))
+ die('Appel direct ne sont pas permis');
+
+/**
+ * @file
+ * @brief display the options of a card
+ */
+require_once NOALYSS_INCLUDE."/class/card_multiple.class.php";
+
+$card_multiple=new Card_Multiple();
+try
+{
+ $ap_id=$http->get("ap_id");
+}
+catch (Exception $exc)
+{
+ echo $exc->getMessage();
+ record_log($exc->getMessage().$exc->getTraceAsString());
+}
+
+echo HtmlInput::title_box(_("Options contact"), "d_linked_card_option","close","","y");
+// display existing option
+$card_multiple->display_option($ap_id);
diff --git a/include/ajax/ajax_get_profile.php b/include/ajax/ajax_get_profile.php
index 586a92d66..9f92f8d2b 100644
--- a/include/ajax/ajax_get_profile.php
+++ b/include/ajax/ajax_get_profile.php
@@ -55,7 +55,7 @@ $a_tab[$call_tab]='tabs_selected';
-
+
@@ -111,7 +111,6 @@ if ($profile->p_id > 0)
echo '
';
echo '
';
//Menu / Module /plugin in this profile
- echo "
"._("Menu")."";
$profile_menu = new Profile_Menu($cn);
$profile_menu->p_id=$p_id;
$profile_menu->display_profile_menu_detail();
@@ -122,7 +121,7 @@ if ($profile->p_id > 0)
echo $add_impression;
echo '
';
echo '
';
- echo "
".('Groupe gestion')."
";
+
$profile_menu->available_profile();
echo '
';
echo '
';
diff --git a/include/ajax/ajax_save_card_option.php b/include/ajax/ajax_save_card_option.php
new file mode 100644
index 000000000..931f07ed3
--- /dev/null
+++ b/include/ajax/ajax_save_card_option.php
@@ -0,0 +1,55 @@
+
+
+if (!defined('ALLOWED'))
+ die('Appel direct ne sont pas permis');
+
+/**
+ * @file
+ * @brief save option of card into action_person_option
+ */
+
+try {
+ $ap_value=$http->post("ap_value","array",[]);
+ $ap_id=$http->post("ap_id","array",[]);
+ $cor_id=$http->post("cor_id","array",[]);
+ $fiche_id=$http->post("f_id");
+ $ag_id=$http->post("ag_id");
+ $action_person_id=$http->post("action_person_id");
+} catch (Exception $ex) {
+ record_log("ASCO01".$ex->getMessage().$ex->getTraceAsString());
+ return;
+}
+
+/// If cannot write we stop it
+if ( ! $g_user->can_write_action($ag_id)) {
+ record_log("ASCO02 Security ");
+}
+
+$nb=count($ap_value);
+// nothing to save
+if ($nb == 0) return;
+
+for ($i=0;$i<$nb; $i++) {
+
+ $cn->exec_sql("UPDATE public.action_person_option SET ap_value=$1 WHERE ap_id=$2",
+ [$ap_value[$i],$ap_id[$i]]);
+}
\ No newline at end of file
diff --git a/include/ajax/ajax_search_add_tag.php b/include/ajax/ajax_search_add_tag.php
index 339b45cec..d1e3b853c 100644
--- a/include/ajax/ajax_search_add_tag.php
+++ b/include/ajax/ajax_search_add_tag.php
@@ -1,4 +1,5 @@
update_search_cell($_GET['pref']);
+if ($http->request("obj")=='t')
+{
-$response= ob_get_clean();
+ $tag=new Tag($cn, $http->get("id", "number"));
+ $tag->update_search_cell($http->get("pref"));
+}
+elseif ($http->request("obj")=="g")
+{
+ // Add all the tag from the group
+ $aTag=$cn->get_array("select t_id,t_tag from jnt_tag_group_tag jtgt join tags on (tag_id=t_id) where tag_group_id=$1 order by 2 ",[$http->get("id", "number")]);
+ $nb_atag=count($aTag);
+ $pref=$http->get("pref");
+ if ( $nb_atag > 0) {
+ for ($i=0;$i<$nb_atag;$i++){
+ $tag=new Tag($cn,$aTag[$i]['t_id']);
+ $tag->update_search_cell($pref);
+ }
+ }
+
+}
+$response=ob_get_clean();
$html=escape_xml($response);
header('Content-type: text/xml; charset=UTF-8');
echo <<
EOF;
exit();
-
-
?>
diff --git a/include/ajax/ajax_search_display_tag.php b/include/ajax/ajax_search_display_tag.php
index 59d962739..b4295cc38 100644
--- a/include/ajax/ajax_search_display_tag.php
+++ b/include/ajax/ajax_search_display_tag.php
@@ -25,11 +25,10 @@ if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
*/
require_once NOALYSS_INCLUDE.'/class/tag.class.php';
-ob_start();
$tag=new Tag($cn);
-$tag->select_search($_GET['pref']);
-$response= ob_get_clean();
+$response= $tag->select_search($_GET['pref']);
+
$html=escape_xml($response);
header('Content-type: text/xml; charset=UTF-8');
echo <<get_limit_current_exercice();
}
$array['hide_operation']=$hide_operation;
+ $array['single_operation']=$http->get("single_operation");
+
list($sql, $where)=$ledger->build_search_sql($array);
// Count nb of line
$max_line=$cn->count_sql($sql);
@@ -128,6 +130,7 @@ if (isset($_GET['viewsearch']))
}
}
echo '
+
+
+
\ No newline at end of file
diff --git a/include/cfgtags.inc.php b/include/cfgtags.inc.php
index e9aef771f..9a6188597 100644
--- a/include/cfgtags.inc.php
+++ b/include/cfgtags.inc.php
@@ -17,7 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
// Copyright Author Dany De Bontridder danydb@aevalys.eu
-if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
+if (!defined('ALLOWED'))
+ die('Appel direct ne sont pas permis');
/**
* @file
@@ -26,34 +27,82 @@ if ( !defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
*/
require_once NOALYSS_INCLUDE.'/class/tag.class.php';
require_once NOALYSS_INCLUDE.'/lib/single_record.class.php';
+require_once NOALYSS_INCLUDE."/lib/html_tab.class.php";
+require_once NOALYSS_INCLUDE."/lib/output_html_tab.class.php";
+require_once NOALYSS_INCLUDE."/class/tag_group_mtable.class.php";
+/* * *****************************************************************************
+ * Tags
+ *
+ * ***************************************************************************** */
+$tabs=new Html_Tab("tg", _("Etiquette"));
+
+ob_start();
$tag=new Tag($cn);
$uos=new Single_Record('tag');
-if ( isset ($_POST['save_tag_sb']))
+if (isset($_POST['save_tag_sb']))
{
- if ( ! isset ($_POST['remove']))
+ if (!isset($_POST['remove']))
{
- try {
+ try
+ {
$uos->check();
$tag->save($_POST);
$uos->save();
- } catch (Exception $e)
+ }
+ catch (Exception $e)
{
alert("déjà sauvé");
}
- } else {
+ }
+ else
+ {
$tag->remove($_POST);
}
}
?>
-
-
-
+
+
-
- show_list();
- $js=sprintf("onclick=\"show_tag('%s','%s','%s','p')\"",Dossier::id(),$_REQUEST['ac'],'-1');
- echo HtmlInput::button("tag_add", "Ajout d'un tag", $js);
- ?>
\ No newline at end of file
+ à plusieurs dossiers ou avoir plusieurs étiquettes."); ?>
+
+show_list();
+$js=sprintf("onclick=\"show_tag('%s','%s','%s','p')\"", Dossier::id(), $_REQUEST['ac'], '-1');
+echo HtmlInput::button("tag_add", "Ajout d'un tag", $js);
+?>
+
+set_content(ob_get_contents());
+ob_end_clean();
+/* * *****************************************************************************
+ * Group of Tags
+ *
+ * ***************************************************************************** */
+$tag_group=new Html_Tab("grp_tg", _("Groupe étiquettes"));
+
+$obj=new Tag_Group_SQL($cn);
+$obj_manage=new Tag_Group_MTable($obj);
+$obj_manage->set_callback("ajax_misc.php");
+$obj_manage->add_json_param("op", "tag_group");
+ob_start();
+$obj_manage->display_table();
+$r=ob_get_contents();
+$tag_group->set_content($r);
+ob_end_clean();
+
+
+$out=new Output_Html_Tab();
+$out->add($tabs);
+$out->add($tag_group);
+$out->output();
+$obj_manage->create_js_script();
+?>
+
\ No newline at end of file
diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php
index c1e17f315..003513bc2 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -2354,7 +2354,12 @@ class Acc_Ledger extends jrn_def_sql
*/
function verify_ledger($array)
{
- extract($array, EXTR_SKIP);
+
+ $p_jrn=$array['p_jrn'];
+ $p_jrn_deb_max_line=$array['p_jrn_deb_max_line'];
+ $p_jrn_name=$array['p_jrn_name'];
+ $p_jrn_type=$array['p_jrn_type'];
+
try
{
if (isNumber($p_jrn)==0)
@@ -2368,8 +2373,10 @@ class Acc_Ledger extends jrn_def_sql
throw new Exception(_("Un journal avec ce nom existe déjà"));
if ($p_jrn_type=='FIN')
{
+ $http=new \HttpInput();
$a=new Fiche($this->db);
- $result=$a->get_by_qcode(trim(strtoupper($_POST['bank'])), false);
+ $bank=$http->post("bank");
+ $result=$a->get_by_qcode(trim(strtoupper($bank)), false);
if ($result==1)
throw new Exception(_("Aucun compte en banque n'est donné"));
}
@@ -2378,11 +2385,17 @@ class Acc_Ledger extends jrn_def_sql
throw new Exception(_('Choix du type de journal est obligatoire'));
}
- if (isset( $negative_warning) && $negative_amount == 1 && trim($negative_warning)=="") {
+ if ( isset( $array['negative_warning']) &&
+ isset( $array['negative_amount']) &&
+ $array['negative_amount'] == 1
+ && trim($array['negative_warning'])=="") {
throw new Exception(_("Avertissement ne peut être vide"));
}
- if ( isset( $negative_amount) && $negative_amount <> 0 && $negative_amount <> 1 ){
+ if ( isset( $array['negative_amount']) &&
+ $array['negative_amount'] <> 0 &&
+ $array['negative_amount'] <> 1 )
+ {
throw new Exception(_("Valeur invalide"));
}
}
diff --git a/include/class/acc_ledger_history_generic.class.php b/include/class/acc_ledger_history_generic.class.php
index 54ee8312b..a50f142d8 100644
--- a/include/class/acc_ledger_history_generic.class.php
+++ b/include/class/acc_ledger_history_generic.class.php
@@ -494,7 +494,7 @@ class Acc_Ledger_History_Generic extends Acc_Ledger_History
$cond_limite=($p_limit!=-1)?" limit ".$p_limit." offset ".$p_offset:"";
- $ledger_list=join($this->ma_ledger, ",");
+ $ledger_list=join( ",",$this->ma_ledger);
// Grand livre == 0
$Res=$this->db->exec_sql("select jr_id,j_id,j_id as int_j_id,to_char(j_date,'DD.MM.YYYY') as j_date,
jr_internal,
diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php
index d7a19155a..b7ed71b3e 100644
--- a/include/class/acc_ledger_search.class.php
+++ b/include/class/acc_ledger_search.class.php
@@ -224,6 +224,9 @@ class Acc_Ledger_Search
if (isset($_REQUEST['hide_operation']))
$r.=HtmlInput::hidden("hide_operation", $http->request('hide_operation'));
+ if (isset($_REQUEST['single_operation']))
+ $r.=HtmlInput::hidden("single_operation", $http->request('single_operation'));
+
ob_start();
$search_filter=$this->build_search_filter();
require_once NOALYSS_TEMPLATE.'/ledger_search.php';
diff --git a/include/class/acc_operation.class.php b/include/class/acc_operation.class.php
index e1930efc1..06946c760 100644
--- a/include/class/acc_operation.class.php
+++ b/include/class/acc_operation.class.php
@@ -747,11 +747,11 @@ class Acc_Operation
$r.=_("Menu invalide");
return $r;
}
- /**
- * @bug : if several menu possible , will use only the first one, because request take first the GET and after
- * the POST
- */
+
// Prepare the form
+ $r=sprintf('