diff --git a/html/annulation.php b/html/annulation_deprecated.php
similarity index 100%
rename from html/annulation.php
rename to html/annulation_deprecated.php
diff --git a/html/jrn_pdf.php b/html/jrn_pdf.php
index a74c57052..1fe200f28 100644
--- a/html/jrn_pdf.php
+++ b/html/jrn_pdf.php
@@ -30,7 +30,6 @@ require_once('class_dossier.php');
$gDossier=dossier::id();
require_once('class_pdf.php');
include_once('class_user.php');
-include_once("jrn.php");
include_once("ac_common.php");
require_once('class_database.php');
include_once("impress_inc.php");
diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js
index ecb8e1d30..7bfcc7677 100644
--- a/html/js/acc_ledger.js
+++ b/html/js/acc_ledger.js
@@ -348,7 +348,7 @@ function quick_writing_add_row(){
*/
function cancelOperation(p_value,p_dossier,p_jrn)
{
- var win=window.open('annulation.php?p_jrn='+p_jrn+'&jrn_op='+p_value+'&gDossier='+p_dossier,'Annule','toolbar=no,width=400,height=400,scrollbars=yes,resizable=yes');
+alert('NOT IMPLEMENTED');
}
function RefreshMe() {
window.location.reload();
@@ -463,10 +463,9 @@ function modifyOperation(p_value,dossier)
*/
function viewOperation(p_value,p_dossier)
- {
- var win=window.open('modify_op.php?action=view_ca&line='+p_value+'&gDossier='+p_dossier,'','toolbar=no,width=690,height=410,scrollbars=yes,resizable=yes');
- win.focus();
- }
+{
+ modifyOperation(p_value,p_dossier)
+}
function dropLink(p_dossier,p_div,p_jr_id,p_jr_id2) {
var querystring='?gDossier='+p_dossier;
querystring+='&div='+p_div;
@@ -627,4 +626,4 @@ function op_success(req) {
alert(e.message);
}
-}
\ No newline at end of file
+}
diff --git a/html/modify_op.php b/html/modify_op_deprecated.php
similarity index 100%
rename from html/modify_op.php
rename to html/modify_op_deprecated.php
diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php
index 34e98a744..d7ddb5e91 100644
--- a/include/class_acc_ledger.php
+++ b/include/class_acc_ledger.php
@@ -34,7 +34,6 @@ require_once ('class_anc_operation.php');
require_once ('class_acc_operation.php');
require_once ('class_acc_account_ledger.php');
require_once ('class_pre_op_advanced.php');
-require_once ('jrn.php');
require_once ('class_acc_reconciliation.php');
require_once ('class_periode.php');
require_once ('class_gestion_purchase.php');
diff --git a/include/import_inc.php b/include/import_inc.php
index e29388123..232b643aa 100644
--- a/include/import_inc.php
+++ b/include/import_inc.php
@@ -23,7 +23,6 @@
// Copyright Author Olivier Dzwoniarkiewicz
// Modified Dany De Bontridder ddebontridder@yahoo.fr
// $Revision$
-include_once("jrn.php");
include_once("user_common.php");
require_once("class_icard.php");
require_once("class_iconcerned.php");
diff --git a/include/impress_jrn.inc.php b/include/impress_jrn.inc.php
index bae2c5a81..fa5240317 100644
--- a/include/impress_jrn.inc.php
+++ b/include/impress_jrn.inc.php
@@ -190,7 +190,6 @@ require_once("class_acc_ledger.php");
} // if
else
{
- include_once("jrn.php");
// Simple printing
//---
diff --git a/include/param_jrn_add.inc.php b/include/param_jrn_add.inc.php
index 87d7041eb..a9e972ee9 100644
--- a/include/param_jrn_add.inc.php
+++ b/include/param_jrn_add.inc.php
@@ -24,7 +24,6 @@
*/
include_once ("ac_common.php");
-include_once("jrn.php");
require_once("class_itext.php");
require_once("class_iselect.php");
require_once ('class_acc_ledger.php');
diff --git a/include/user_action_gl.php b/include/user_action_gl.php
index 90e58ac1a..d61cb335b 100644
--- a/include/user_action_gl.php
+++ b/include/user_action_gl.php
@@ -26,7 +26,6 @@
include_once ("user_common.php");
include_once("class_user.php");
require_once("class_iselect.php");
-require_once("jrn.php");
require_once('class_acc_ledger.php');
$cn=new Database($gDossier);
echo js_include('accounting_item.js');
diff --git a/release-note b/release-note
index 5ca87b85f..d57d209b4 100644
--- a/release-note
+++ b/release-note
@@ -1,10 +1,12 @@
1. Ajout balance par catégorie de fiche
+2. changer le code pour ajouter de la CA ou la modifier dans un DIV HTML, le fichier jrn.php devient inutile (deprecated)
+
TODO1 réecriture de quant_* la liaison avec la jrn se fait à travers jr_id et non pas jr_internal qui n'est pas indexé.
Conséquence : réécriture de code, correction modop, ...
TODO2 Object pour extourner proprement une operation, le fichier annulation.php devient inutile (deprecated) depend de TODO1 TODO10
-TODO3 changer le code pour ajouter de la CA ou la modifier dans un DIV HTML, le fichier jrn.php devient inutile (deprecated)
+
TODO4 Ajout d'un lien sur les postes et client pour accèder avec un DIV contenant l'historique (au moins une partie / présentation par slice)/ bouton suivant-précédent )