item); $i++)
{
if ($this->item[$i]['type']=="url")
@@ -162,5 +173,12 @@ class Select_Box
$this->item[$this->cnt]['type']='input';
$this->cnt++;
}
+ function set_filter($p_filter)
+ {
+ $this->filter=$p_filter;
+ }
+ function get_filter() {
+ return $this->filter;
+ }
}
diff --git a/include/lib/user_menu.php b/include/lib/user_menu.php
index b3dc5fa2c..6444cb3c7 100644
--- a/include/lib/user_menu.php
+++ b/include/lib/user_menu.php
@@ -27,52 +27,6 @@ require_once NOALYSS_INCLUDE.'/lib/idate.class.php';
require_once NOALYSS_INCLUDE.'/lib/icard.class.php';
require_once NOALYSS_INCLUDE.'/lib/ispan.class.php';
-
-
-
-/*!
- * \brief Show the menu for the card management
- *
- * \param $p_dossier dossier 1
- *
- *
- *
- * \return nothing
- */
-function ShowMenuFiche($p_dossier)
-{
- $cn=new Database($p_dossier);
- $mod="&ac=".$_REQUEST['ac'];
- $str_dossier=dossier::get().$mod;
- echo '';
-}
/*! MenuAdmin */
/* \brief show the menu for user/database management
/*
@@ -82,11 +36,14 @@ function ShowMenuFiche($p_dossier)
function MenuAdmin()
{
$def=-1;
+ $http=new HttpInput();
+
if (isset($_REQUEST['UID']))
$def=0;
if ( isset ($_REQUEST['action']))
{
- switch ($_REQUEST['action'])
+ $action=$http->request('action');
+ switch ($action)
{
case 'user_mgt':
$def=0;
@@ -163,7 +120,8 @@ function MenuAdmin()
function menu_acc_plan($p_start=1)
{
- $base="?ac=".$_REQUEST['ac'];
+ $http=new HttpInput();
+ $base="?ac=".$http->request('ac');
$str_dossier="&".dossier::get();
for ($i=0;$i<10;$i++) { $class[$i]="tabs";}
$class[$p_start]="tabs_selected";
diff --git a/include/payment_middle.inc.php b/include/payment_middle.inc.php
index 1fadaee8f..f86f57eb4 100644
--- a/include/payment_middle.inc.php
+++ b/include/payment_middle.inc.php
@@ -19,133 +19,15 @@
// Copyright Author Dany De Bontridder danydb@aevalys.eu
if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
-require_once NOALYSS_INCLUDE.'/class/acc_payment.class.php';
-require_once NOALYSS_INCLUDE.'/lib/sort_table.class.php';
-//---------------------------------------------------------------------------
-// Common variable
-$td='| ';
-$etd=' | ';
-$tr='';
-$etr='
';
-$th='';
-$eth=' | ';
-global $http;
-/*!\file
- * \brief payment mode
- */
-$sb=$http->request('sb', "string","");
-echo '';
-//----------------------------------------------------------------------
-// change
-if ( $sb=='change')
-{
- if ( !isset($_GET['id'])) exit;
- $row=new Acc_Payment($cn,$_GET['id']);
- $row->load();
- echo '';
- return;
-}
-//----------------------------------------------------------------------
-// Save the change
-//
-if ( $sb=='save')
-{
- $http=new HttpInput();
- $delete=$http->post("delete_ck","string", 0);
- if ( $delete == 0 )
- {
- $row=new Acc_Payment($cn,$_POST ['id']);
- $row->from_array($_POST);
- $row->update();
- } else {
-//---------------------------------------------------------------------------
-// Delete a card
-//---------------------------------------------------------------------------
- $row=new Acc_Payment($cn,$_POST['id']);
- $row->from_array($_POST);
- $row->delete();
-
- }
-}
-//---------------------------------------------------------------------------
-// Insert a new mod of payment
-//---------------------------------------------------------------------------
-if ( isset($_POST['insert']))
-{
- $row=new Acc_Payment($cn);
- $row->from_array($_POST);
- $row->insert();
- $sb="list";
-}
+require_once NOALYSS_INCLUDE."/database/payment_method_sql.class.php";
+require_once NOALYSS_INCLUDE."/class/payment_method_mtable.class.php";
-//---------------------------------------------------------------------------
-// Show form to enter a new one
-//---------------------------------------------------------------------------
-if ($sb=='ins')
-{
- $mp=new Acc_Payment($cn);
- $r=$mp->blank();
- echo '';
+$payment_method_sql=new Payment_method_SQL($cn);
+$payment_method_mtable=new Payment_Method_MTable($payment_method_sql);
- return;
-}
-//--------------------------------------------------------------------------------
-//LIST
-//--------------------------------------------------------------------------------
-/* Get the data from database */
-$header=new Sort_Table();
-$base_url=$_SERVER['PHP_SELF']."?".Dossier::get()."&ac=".$_REQUEST['ac'];
+$payment_method_mtable->add_json_param("op", "payment_method");
+$payment_method_mtable->set_callback("ajax_misc.php");
+$payment_method_mtable->create_js_script();
-$header->add(_("Libelle"),$base_url,"order by mp_lib asc","order by mp_lib desc",'la','ld');
-$header->add(_("Pour le journal"),$base_url,"order by jrn_def_name asc","order by jrn_def_name desc",'ja','jd');
-$header->add(_("Type de fiche"),$base_url,"order by fd_label asc","order by fd_label desc",'tc','td');
-$header->add(_("Enregistré dans le journal"),$base_url,"order by jrn_target asc","order by jrn_target desc",'jta','jtd');
-$header->add(_("Avec la fiche"),$base_url,"order by vw_name asc","order by vw_name desc",'na','nd');
-
-$order=(isset($_REQUEST['ord']))?$_REQUEST['ord']:'la';
-
-$sql=$header->get_sql_order($order);
-
-$array=$cn->get_array("
- select
- mp_id,mp_lib,mp_jrn_def_id,mp_fd_id,mp_qcode,j.jrn_def_id,
- j.jrn_def_name as jrn_def_name,
- j2.jrn_def_name as jrn_target,
- fd_label,
- coalesce(mp_qcode,'A choisir à l''encodage') as vw_name
- from mod_payment as mp
- left join jrn_def as j on (j.jrn_def_id=mp.jrn_def_id)
- left join jrn_def as j2 on (j2.jrn_def_id=mp.mp_jrn_def_id)
- left join fiche_def as fd on (mp.mp_fd_id=fd.fd_id)
- $sql
- ");
-/* if there are data show them in a table */
-if ( ! empty ($array))
-{
-
- require_once NOALYSS_TEMPLATE.'/list_mod_payment.php';
-}
-echo HtmlInput::button_anchor("Ajout", $base_url."&sb=ins","","","smallbutton");
-echo '
';
-?>
+echo $payment_method_mtable->display_table();
diff --git a/include/sql/patch/upgrade134.sql b/include/sql/patch/upgrade134.sql
new file mode 100644
index 000000000..17d4f18a8
--- /dev/null
+++ b/include/sql/patch/upgrade134.sql
@@ -0,0 +1,8 @@
+begin;
+
+update attr_def set ad_extra = '[sql] fd_id in (select fd_id from fiche_def where frd_id in (4,8,9,14))' where ad_id=25;
+
+alter table mod_payment rename to payment_method;
+
+insert into version (val,v_description) values (135,'rename table mod_payment');
+commit ;
\ No newline at end of file
diff --git a/include/sql/patch/upgrade135.sql b/include/sql/patch/upgrade135.sql
new file mode 100644
index 000000000..e45fa03c6
--- /dev/null
+++ b/include/sql/patch/upgrade135.sql
@@ -0,0 +1,23 @@
+begin;
+
+insert into menu_ref (me_code,me_menu,me_file,me_description,me_type,me_description_etendue)
+values('PRINTTVA','Résumé TVA','tax_summary.inc.php','totaux par TVA et par journal','ME','Calcul des totaux par TVA et par journal');
+
+insert into profile_menu (me_code,me_code_dep,p_id,p_order,p_type_display,pm_default,pm_id_dep)
+select me_code,'PRINT',1,250,'E',0,6 from menu_ref where me_code='PRINTTVA'
+union
+select me_code,'PRINT',1,250,'E',0,35 from menu_ref where me_code='PRINTTVA'
+union
+select me_code,'PRINT',2,250,'E',0,719 from menu_ref where me_code='PRINTTVA'
+union
+select me_code,'PRINT',2,250,'E',0,716 from menu_ref where me_code='PRINTTVA'
+;
+insert into menu_ref (me_code,me_menu,me_file,me_type)
+values ('CSV:printtva','Export Résumé TVA','export_printtva_csv.php','PR'),
+ ('PDF:printtva','Export Résumé TVA','export_printtva_pdf.php','PR')
+;
+
+insert into profile_menu(me_code,p_id,p_type_display) values ('CSV:printtva',1,'P'),('PDF:printtva',1,'P'),('CSV:printtva',2,'P'),('PDF:printtva',2,'P');
+
+insert into version (val,v_description) values (136,'new feature PRINTTVA');
+commit ;
\ No newline at end of file
diff --git a/include/template/acc_ledger_history_purchase_detail.php b/include/template/acc_ledger_history_purchase_detail.php
index 02d4fae07..d69372270 100644
--- a/include/template/acc_ledger_history_purchase_detail.php
+++ b/include/template/acc_ledger_history_purchase_detail.php
@@ -151,7 +151,8 @@ foreach ($this->data as $line) {
$sep="";
for ($e=0;$e<$max;$e++) {
$row=Database::fetch_array($ret_reconcile, $e);
- echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $row['jr_internal']);
+ $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal'];
+ echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $msg);
$sep=' ,';
}
}
diff --git a/include/template/acc_ledger_history_purchase_extended.php b/include/template/acc_ledger_history_purchase_extended.php
index f229d5c3f..b079604f7 100644
--- a/include/template/acc_ledger_history_purchase_extended.php
+++ b/include/template/acc_ledger_history_purchase_extended.php
@@ -111,7 +111,8 @@ for ($i=0;$i<$nb_data;$i++):
$sep="";
for ($e=0;$e<$max;$e++) {
$row=Database::fetch_array($ret_reconcile, $e);
- echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $row['jr_internal']);
+ $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal'];
+ echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $msg);
$sep=' ,';
}
} ?>
diff --git a/include/template/acc_ledger_history_purchase_oneline.php b/include/template/acc_ledger_history_purchase_oneline.php
index da9c5b460..fcae528b9 100644
--- a/include/template/acc_ledger_history_purchase_oneline.php
+++ b/include/template/acc_ledger_history_purchase_oneline.php
@@ -65,6 +65,9 @@ if (!defined('ALLOWED'))
|
+
+
+ |
data);
@@ -129,7 +132,8 @@ for ($i=0;$i<$nb_data;$i++):
$sep="";
for ($e=0;$e<$max;$e++) {
$row=Database::fetch_array($ret_reconcile, $e);
- echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $row['jr_internal']);
+ $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal'];
+ echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $msg);
$sep=' ,';
}
} ?>
diff --git a/include/template/acc_ledger_history_sale_detail.php b/include/template/acc_ledger_history_sale_detail.php
index 320632115..d15f30918 100644
--- a/include/template/acc_ledger_history_sale_detail.php
+++ b/include/template/acc_ledger_history_sale_detail.php
@@ -138,7 +138,8 @@ foreach ($this->data as $line) {
$sep="";
for ($e=0;$e<$max;$e++) {
$row=Database::fetch_array($ret_reconcile, $e);
- echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $row['jr_internal']);
+ $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal'];
+ echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $msg);
$sep=' ,';
}
}
diff --git a/include/template/acc_ledger_history_sale_extended.php b/include/template/acc_ledger_history_sale_extended.php
index 97157fd0b..09d836d0c 100644
--- a/include/template/acc_ledger_history_sale_extended.php
+++ b/include/template/acc_ledger_history_sale_extended.php
@@ -111,7 +111,9 @@ for ($i=0;$i<$nb_data;$i++):
$sep="";
for ($e=0;$e<$max;$e++) {
$row=Database::fetch_array($ret_reconcile, $e);
- echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $row['jr_internal']);
+ $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal'];
+ echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $msg);
+
$sep=' ,';
}
} ?>
diff --git a/include/template/acc_ledger_history_sale_oneline.php b/include/template/acc_ledger_history_sale_oneline.php
index 439c25cd6..61da0c119 100644
--- a/include/template/acc_ledger_history_sale_oneline.php
+++ b/include/template/acc_ledger_history_sale_oneline.php
@@ -112,7 +112,8 @@ for ($i=0;$i<$nb_data;$i++):
$sep="";
for ($e=0;$e<$max;$e++) {
$row=Database::fetch_array($ret_reconcile, $e);
- echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $row['jr_internal']);
+ $msg=( $row['qcode_bank'] != "")?"[".$row['qcode_bank']."]":$row['jr_internal'];
+ echo $sep.HtmlInput::detail_op($row['jr_id'],$row['jr_date'].' '. $msg);
$sep=' ,';
}
} ?>
diff --git a/scenario/ajax-save-operation.php b/scenario/ajax-save-operation.php
index 6149ee7b8..80fdd7365 100644
--- a/scenario/ajax-save-operation.php
+++ b/scenario/ajax-save-operation.php
@@ -28,7 +28,8 @@ $_POST=array (
'rapt' => '',
'div' => 'det2',
'act' => 'save',
- 'op'=>'ledger'
+ 'op'=>'ledger',
+ 'jr_optype'=>'NOR'
);
$_POST['gDossier']=$gDossierLogInput;
$_GET['gDossier']=$gDossierLogInput;
diff --git a/scenario/select-box-test.php b/scenario/select-box-test.php
index 3c23ff6b2..d9dc0a916 100644
--- a/scenario/select-box-test.php
+++ b/scenario/select-box-test.php
@@ -46,7 +46,7 @@ div.select_box a:hover,div.select_box ul li:hover {
add_url("List (link)","?id=5&".Dossier::get());
$a->add_javascript("Hello (Javascript)","alert('hello')");
@@ -56,6 +56,24 @@ div.select_box a:hover,div.select_box ul li:hover {
echo $a->input();
+ ?>
+ set_filter(_("recherche"));
+ $a->add_value("Value = 10 (set value)",10);
+ $a->add_value("Value = 1 (set value)",1);
+ $a->add_value("Value = 17 (set value)",15);
+ $a->add_value("Value = 18 (set value)",15);
+ $a->add_value("Value = 19 (set value)",15);
+ $a->add_value("Value = 20 (set value)",15);
+ $a->add_value("Value = 25 (set value)",15);
+ $a->add_value("Value = 30 (set value)",15);
+ $a->add_value("Value = 40 (set value)",15);
+ $a->add_value("Value = 50 (set value)",15);
+ $a->add_value("Value = 51 (set value)",15);
+
+ echo $a->input();
+
?>