';
-if ( isset($_POST['mod'])) echo hb('Information sauvée');
-
-$adm=new Fiche($cn,$f_id);
-$p_readonly=($g_user->check_action(FICADD)==0)?true:false;
-if ( ! $p_readonly) echo '';
-}
-echo $return->input();
-echo '
';
-
-
diff --git a/include/detail_client.inc.php b/include/detail_client.inc.php
deleted file mode 100644
index 71b8f8601..000000000
--- a/include/detail_client.inc.php
+++ /dev/null
@@ -1,76 +0,0 @@
-Save();
-
-}
-
-echo '
';
-$f_id=$_REQUEST['f_id'];
-echo '
';
-if ( isset($_POST['mod'])) echo hb(_('Information sauvée'));
-
-$client=new Customer($cn,$f_id);
-$p_readonly=($g_user->check_action(FICADD)==0)?true:false;
-if ( ! $p_readonly) echo '';
-}
-echo $return;
-echo '
';
-
-
diff --git a/include/export_anc_acc_list.php b/include/export_anc_acc_list.php
deleted file mode 100644
index 5a3ef5b54..000000000
--- a/include/export_anc_acc_list.php
+++ /dev/null
@@ -1,34 +0,0 @@
-get_request();
-$atable->export_csv();
\ No newline at end of file
diff --git a/include/export_poste_detail.php b/include/export_poste_detail.php
deleted file mode 100644
index 14e302fd8..000000000
--- a/include/export_poste_detail.php
+++ /dev/null
@@ -1,161 +0,0 @@
-Check();
-$User->check_dossier($gDossier);
-
-if ( isset ( $_REQUEST['poste_fille']) )
-{ //choisit de voir tous les postes
- $a_poste=$cn->get_array("select pcm_val from tmp_pcmn where pcm_val::text like $1||'%'",array($_REQUEST["poste_id"]));
-}
-else
-{
- $a_poste=$cn->get_array("select pcm_val from tmp_pcmn where pcm_val = $1",array($_REQUEST['poste_id']));
-}
-
-if ( ! isset ($_REQUEST['oper_detail']))
-{
- if ( count($a_poste) == 0 )
- exit;
-
- foreach ($a_poste as $pos)
- {
- $Poste=new Acc_Account_Ledger($cn,$pos['pcm_val']);
- $name=$Poste->get_name();
- list($array,$tot_deb,$tot_cred)=$Poste->get_row_date( $_REQUEST['from_periode'],
- $_REQUEST['to_periode'],
- $_GET['ople']
- );
- if ( count($Poste->row ) == 0 )
- continue;
-
- echo '"Poste";'.
- '"n° pièce";'.
- '"Lib.";'.
- "\"Code interne\";".
- "\"Date\";".
- "\"Description\";".
- "\"Débit\";".
- "\"Crédit\";".
- "\"Prog.\"";
- printf("\n");
-
- $prog=0;
- foreach ( $Poste->row as $op )
- {
- $diff=bcsub($op['deb_montant'],$op['cred_montant']);
- $prog=bcadd($prog,$diff);
- echo '"'.$pos['pcm_val'].'";'.
- '"'.$op['jr_pj_number'].'"'.";".
- '"'.$name.'";'.
- '"'.$op['jr_internal'].'"'.";".
- '"'.$op['j_date_fmt'].'"'.";".
- '"'.$op['description'].'";'.
- nb($op['deb_montant']).";".
- nb($op['cred_montant']).";".
- nb(abs($prog));
- printf("\n");
-
-
- }
- $solde_type=($tot_deb>$tot_cred)?"solde débiteur":"solde créditeur";
- $diff=abs($tot_deb-$tot_cred);
- printf(
- '"'."$solde_type".'"'.";".
- nb($diff).";".
- nb($tot_deb).";".
- nb($tot_cred)."\n");
- }
-}
-else
-{
- /* detail of all operation */
- if ( count($a_poste) == 0 )
- exit;
-
- foreach ($a_poste as $pos)
- {
- $Poste=new Acc_Account_Ledger($cn,$pos['pcm_val']);
- $Poste->get_name();
- list($array,$tot_deb,$tot_cred)=$Poste->get_row_date( $_REQUEST['from_periode'],
- $_REQUEST['to_periode']
- );
- if ( count($Poste->row ) == 0 )
- continue;
-
- echo '"Poste";'.
- '"Lib.";'.
- '"QuickCode";'.
- "\"Code interne\";".
- "\"Date\";".
- "\"Description\";".
- "\"Montant\";".
- "\"D/C\"";
- printf("\n");
-
-
- foreach ( $Poste->row as $a )
- {
- $op=new Acc_Operation($cn);
- $op->jr_id=$a['jr_id'];
- $result=$op->get_jrnx_detail();
- foreach ( $result as $r)
- {
- printf('"%s";"%s";"%s";"%s";"%s";"%s";"%s";%12.2f;"%s"',
- $r['j_poste'],
- $r['pcm_lib'],
- $r['j_qcode'],
- $r['jr_internal'],
- $r['jr_date'],
- $a['description'],
- $a['jr_pj_number'],
- nb($r['j_montant']),
- $r['debit']);
- printf("\r\n");
-
- }
-
-
-
- }
- }
- exit;
-}
-?>
diff --git a/include/export_table_csv.php b/include/export_table_csv.php
deleted file mode 100644
index 56716a9c0..000000000
--- a/include/export_table_csv.php
+++ /dev/null
@@ -1,34 +0,0 @@
-get_request();
-$atable->export_csv();
\ No newline at end of file
diff --git a/include/operation_adm.inc.php b/include/operation_adm.inc.php
deleted file mode 100644
index 45062541a..000000000
--- a/include/operation_adm.inc.php
+++ /dev/null
@@ -1,41 +0,0 @@
-get_quick_code();
-$_GET['qcode']=$qcode;
-$_REQUEST['qcode']=$qcode;
-
-$var_array=compute_variable('ledger_type=ALL');
-put_global($var_array);
-require_once ('history_operation.inc.php');
-
diff --git a/include/operation_client.inc.php b/include/operation_client.inc.php
deleted file mode 100644
index ea4c6f8b3..000000000
--- a/include/operation_client.inc.php
+++ /dev/null
@@ -1,41 +0,0 @@
-get_quick_code();
-$_GET['qcode']=$qcode;
-$_REQUEST['qcode']=$qcode;
-$var_array=compute_variable('ledger_type=ALL');
-put_global($var_array);
-require_once ('history_operation.inc.php');
-
-
diff --git a/include/preod.inc.php b/include/preod.inc.php
index 70a74bd16..05013423d 100644
--- a/include/preod.inc.php
+++ b/include/preod.inc.php
@@ -64,16 +64,13 @@ if ( $sa == 'jrn' )
{
$op=new Pre_operation($cn);
$op->set_jrn($_GET['jrn']);
- if ( isset($_GET['direct']))
- {
- $op->od_direct='true';
- }
- else
- {
- $op->od_direct='false';
- }
- $array=$op->get_list_ledger();
- if ( empty($array) == true )
+ $is_ods = $cn->get_value("select count(*)
+ from jrn_def where
+ jrn_def_id=$1
+ and jrn_def_type='ODS'", array($_GET['jrn']));
+ $op->od_direct = ($is_ods > 0) ? 't' : 'f';
+ $array = $op->get_list_ledger();
+ if (empty($array) == true)
{
echo "Aucun enregistrement";
exit();
diff --git a/include/suivi_adm.inc.php b/include/suivi_adm.inc.php
deleted file mode 100644
index 2fbb4cbec..000000000
--- a/include/suivi_adm.inc.php
+++ /dev/null
@@ -1,48 +0,0 @@
-get_quick_code();
-$_REQUEST['qcode']=$fiche->get_quick_code();
-echo '
';
-require_once('action.common.inc.php');
-echo '
';
diff --git a/include/suivi_client.inc.php b/include/suivi_client.inc.php
deleted file mode 100644
index cedc5abe3..000000000
--- a/include/suivi_client.inc.php
+++ /dev/null
@@ -1,50 +0,0 @@
-get_quick_code();
-$_REQUEST['qcode']=$fiche->get_quick_code();
-echo '
';
-require_once('action.common.inc.php');
-echo '
';
diff --git a/include/supplier.inc.php b/include/supplier.inc.php
index 222207f6c..889916866 100644
--- a/include/supplier.inc.php
+++ b/include/supplier.inc.php
@@ -115,7 +115,6 @@ if ( $low_action == "list" )
/* Add button */
$f_add_button=new IButton('add_card');
$f_add_button->label=_('Créer une nouvelle fiche');
- $f_add_button->set_attribute('ipopup','ipop_newcard');
$f_add_button->set_attribute('win_refresh','yes');
$f_add_button->set_attribute('type_cat',FICHE_TYPE_FOURNISSEUR);
@@ -123,7 +122,6 @@ if ( $low_action == "list" )
echo $f_add_button->input();
$f_cat_button=new IButton('add_cat');
- $f_cat_button->set_attribute('ipopup','ipop_cat');
$f_cat_button->set_attribute('type_cat',FICHE_TYPE_FOURNISSEUR);
$f_cat_button->label=_('Ajout d\'une catégorie');
$f_cat_button->javascript='add_category(this)';
@@ -142,32 +140,11 @@ if ( $low_action == "list" )
if ( $low_action == 'detail')
{
/* Menu */
- require_once('supplier_card.inc.php');
+ require_once('category_card.inc.php');
exit();
}
-if ( $low_action=="insert" )
-{
- /* security : check if user can add card */
- if ( $g_user->check_action(FICADD) == 0 )
- {
- alert('Vous ne pouvez pas ajouter de fiche');
- return;
- }
- $supplier=new Supplier($cn);
- $supplier->Save($_REQUEST['fd_id']);
- echo '
';
- echo "
";
- echo $supplier->Display(true);
- echo "
";
- $retour=new IAction();
- $retour->label="Retour";
- $retour->value="?p_action=supplier&".dossier::get();
- echo $retour->input();
- echo '
';
-
-}
html_page_stop();
?>
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
new file mode 100644
index 000000000..d9d757547
--- /dev/null
+++ b/sql/upgrade.sql
@@ -0,0 +1,52 @@
+CREATE OR REPLACE FUNCTION comptaproc.check_balance(p_grpt integer)
+ RETURNS numeric AS
+$BODY$
+declare
+ amount_jrnx_debit numeric;
+ amount_jrnx_credit numeric;
+ amount_jrn numeric;
+begin
+ select coalesce(sum (j_montant),0) into amount_jrnx_credit
+ from jrnx
+ where
+ j_grpt=p_grpt
+ and j_debit=false;
+
+ select coalesce(sum (j_montant),0) into amount_jrnx_debit
+ from jrnx
+ where
+ j_grpt=p_grpt
+ and j_debit=true;
+
+ select coalesce(jr_montant,0) into amount_jrn
+ from jrn
+ where
+ jr_grpt_id=p_grpt;
+
+ if ( amount_jrnx_debit != amount_jrnx_credit )
+ then
+ return abs(amount_jrnx_debit-amount_jrnx_credit);
+ end if;
+ if ( amount_jrn != amount_jrnx_credit)
+ then
+ return -1*abs(amount_jrn - amount_jrnx_credit);
+ end if;
+ return 0;
+end;
+$BODY$
+ LANGUAGE plpgsql;
+
+update op_predef set od_direct='t' where od_jrn_type='ODS';
+
+INSERT INTO menu_ref(
+ me_code, me_menu, me_file, me_url, me_description, me_parameter,
+ me_javascript, me_type)
+ VALUES ('BK', 'Banque', 'bank.inc.php', null, 'Information Banque', null,null,'ME');
+
+INSERT INTO profile_menu(
+ me_code, me_code_dep, p_id, p_order, p_type_display, pm_default)
+ VALUES ('BK', 'GESTION', 1, 4, 'E', 0);
+INSERT INTO profile_menu(
+ me_code, me_code_dep, p_id, p_order, p_type_display, pm_default)
+ VALUES ('BK', 'GESTION', 2, 4, 'E', 0);
+