[Phpcompta-dev] r189 - trunk/modop

[phpcompta-dev]

Author: danydb
Date: 2011-11-14 11:28:44 +0100 (Mon, 14 Nov 2011)
New Revision: 189

Modified:
   trunk/modop/class_modop_operation.php
   trunk/modop/index.php
   trunk/modop/modop_confirm.php
   trunk/modop/modop_display.php
   trunk/modop/modop_save.php
Log:
Adapt to version 6.0

Modified: trunk/modop/class_modop_operation.php
===================================================================
--- trunk/modop/class_modop_operation.php       2011-10-30 17:15:52 UTC (rev 
188)
+++ trunk/modop/class_modop_operation.php       2011-11-14 10:28:44 UTC (rev 
189)
@@ -35,7 +35,7 @@
     /**
      address@hidden retrieve data from jrnx, jrn, quant_xxx and format them to
      * usable for the acc_leger input function
-     address@hidden 
Acc_Ledger::show_form(),Acc_Ledger_Purchase::input(),Acc_Ledger_Sold::input(),
+     address@hidden 
Acc_Ledger::input(),Acc_Ledger_Purchase::input(),Acc_Ledger_Sold::input(),
      */
     function format()
     {
@@ -205,18 +205,13 @@
       */
     function suspend_strict()
     {
-        $owner=new Own($this->db);
-        if ( $owner->MY_STRICT == 'Y')
-        {
-            $owner->MY_STRICT='N';
-            $owner->save('MY_STRICT');
-            $this->strict=true;
-        }
-        else
-            $this->strict=false;
+        global $g_parameter;
+        $g_parameter->MY_STRICT='N';
+       $this->strict=false;
     }
     /**
      address@hidden activate strict mode, only if $this->strict=true
+     * @deprecated
      address@hidden suspend_receipt
      */
     function activate_strict()
@@ -233,18 +228,13 @@
       */
     function suspend_receipt()
     {
-        $owner=new Own($this->db);
-        if ( $owner->MY_PJ_SUGGEST == 'Y')
-        {
-            $owner->MY_PJ_SUGGEST='N';
-            $owner->save('MY_PJ_SUGGEST');
-            $this->toggle=true;
-        }
-        else
-            $this->toggle=false;
+        global $g_parameter;
+        $g_parameter->MY_PJ_SUGGEST='N';
+        $this->toggle=false;
     }
     /**
      address@hidden activate receipt, only if $this->toggle=true
+     address@hidden
      address@hidden suspend_receipt
      */
     function activate_receipt()

Modified: trunk/modop/index.php
===================================================================
--- trunk/modop/index.php       2011-10-30 17:15:52 UTC (rev 188)
+++ trunk/modop/index.php       2011-11-14 10:28:44 UTC (rev 189)
@@ -36,6 +36,7 @@
 ?>
 <FORM METHOD="GET">
   <? echo HtmlInput::extension().dossier::hidden();?>
+  <? echo HtmlInput::hidden('ac',$_REQUEST['ac']);?>
 <?=_("Code interne de l'opération à modifier") ?>
   <?=$str->input()?>
   <?=HtmlInput::submit('seek','retrouver')?>
@@ -43,8 +44,6 @@
   <?=$search->input()?>
 <hr>
 <?php
-echo IButton::show_calc();
-
   if ( isset($_GET['seek'])) {
     /* retrieve and show the accounting */
     if ( trim($_GET['jr_internal'])=='') {

Modified: trunk/modop/modop_confirm.php
===================================================================
--- trunk/modop/modop_confirm.php       2011-10-30 17:15:52 UTC (rev 188)
+++ trunk/modop/modop_confirm.php       2011-11-14 10:28:44 UTC (rev 189)
@@ -35,6 +35,7 @@
   $jrn=new Acc_Ledger_Purchase($cn,$_GET['p_jrn']);
   try {
   echo '<FORM METHOD="GET">';
+  echo HtmlInput::hidden('ac',$_REQUEST['ac']);
   echo HtmlInput::extension().dossier::hidden();
   echo HtmlInput::hidden('action','save');
   echo HtmlInput::hidden('ext_jr_id',$_GET['ext_jr_id']);
@@ -55,6 +56,7 @@
   try {
   $a=$jrn->confirm($_GET);
   echo '<FORM METHOD="GET">';
+  echo HtmlInput::hidden('ac',$_REQUEST['ac']);
   echo HtmlInput::extension().dossier::hidden();
   echo HtmlInput::hidden('action','save');
   echo HtmlInput::hidden('ext_jr_id',$_GET['ext_jr_id']);
@@ -76,8 +78,9 @@
   $jrn->with_concerned=false;
   try {
     $jrn->verify($_GET);
-    $a= $jrn->show_form($_GET,1);
+    $a= $jrn->input($_GET,1);
     echo '<FORM METHOD="GET">';
+    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     echo HtmlInput::extension().dossier::hidden();
     echo HtmlInput::hidden('action','save');
     echo HtmlInput::hidden('ext_jr_id',$_GET['ext_jr_id']);

Modified: trunk/modop/modop_display.php
===================================================================
--- trunk/modop/modop_display.php       2011-10-30 17:15:52 UTC (rev 188)
+++ trunk/modop/modop_display.php       2011-11-14 10:28:44 UTC (rev 189)
@@ -96,6 +96,7 @@
 
     echo '<FORM METHOD="GET" class="print">';
     $op->suspend_receipt();
+    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     echo $jrn->input($op->array);
     echo HtmlInput::extension().dossier::hidden();
     echo HtmlInput::hidden('action','confirm');
@@ -105,7 +106,6 @@
     echo HtmlInput::hidden('ext_jr_internal',$op->jr_internal);
     echo HtmlInput::button('add_item',_('Ajout article'),      ' 
onClick="ledger_add_row()"');
     echo '</form>';
-    $op->activate_receipt();
 
 }
 /* ---------------------------------------------------------------------- */
@@ -130,8 +130,7 @@
 
     echo '<FORM METHOD="GET" class="print">';
     echo $jrn->input($op->array);
-    $op->activate_receipt();
-
+    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     echo HtmlInput::extension().dossier::hidden();
     echo HtmlInput::hidden('action','confirm');
     echo HtmlInput::submit('save','Sauve');
@@ -159,9 +158,8 @@
     $op->suspend_receipt();
 
     echo '<FORM METHOD="GET" class="print">';
-    echo $jrn->show_form($op->array);
-    $op->activate_receipt();
-
+    echo $jrn->input($op->array);
+    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     echo HtmlInput::extension().dossier::hidden();
     echo HtmlInput::hidden('action','confirm');
     echo HtmlInput::submit('save','Sauve');
@@ -201,6 +199,7 @@
     $f_add_button->javascript=" select_card_type(this);";
     $str_add_button=$f_add_button->input();
     echo '<FORM METHOD="GET" class="print">';
+    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     $Date=new IDate("e_date",$op->array['e_date']);
     $f_date=$Date->input();
     $label=HtmlInput::infobulle(3);
@@ -208,7 +207,6 @@
     // Ledger (p_jrn)
     //--
     $add_js="";
-    $owner=new Own($cn);
 
     $wLedger=$jrn->select_ledger('FIN',2);
     $wLedger->javascript=$add_js;

Modified: trunk/modop/modop_save.php
===================================================================
--- trunk/modop/modop_save.php  2011-10-30 17:15:52 UTC (rev 188)
+++ trunk/modop/modop_save.php  2011-11-14 10:28:44 UTC (rev 189)
@@ -40,8 +40,6 @@
         $pj=$_GET['e_pj'];
         $_GET['e_pj']=microtime();
         $new_internal=$jrn->insert($_GET);
-        $op->activate_receipt();
-        $op->activate_strict();
     }
     catch (Exception $e)
     {
@@ -89,8 +87,6 @@
         $pj=$_GET['e_pj'];
         $_GET['e_pj']=microtime();
         $new_internal=$jrn->insert($_GET);
-        $op->activate_receipt();
-        $op->activate_strict();
     }
     catch (Exception $e)
     {
@@ -143,8 +139,6 @@
         $_GET['e_pj']=microtime();
         $jrn->save($_GET);
         $new_internal=$jrn->internal;
-        $op->activate_receipt();
-        $op->activate_strict();
     }
     catch (Exception $e)
     {