[Phpcompta-dev] r5137 - phpcompta/tags/rel650/include

[phpcompta-dev]

Author: danydb
Date: 2012-10-02 23:01:27 +0200 (Tue, 02 Oct 2012)
New Revision: 5137

Modified:
   phpcompta/tags/rel650/include/class_acc_ledger.php
   phpcompta/tags/rel650/include/class_acc_ledger_fin.php
   phpcompta/tags/rel650/include/class_acc_ledger_purchase.php
   phpcompta/tags/rel650/include/class_acc_ledger_sold.php
   phpcompta/tags/rel650/include/compta_ach.inc.php
   phpcompta/tags/rel650/include/compta_fin.inc.php
   phpcompta/tags/rel650/include/operation_ods_new.inc.php
Log:
Fix problem with date suggest

Modified: phpcompta/tags/rel650/include/class_acc_ledger.php
===================================================================
--- phpcompta/tags/rel650/include/class_acc_ledger.php  2012-10-02 16:58:34 UTC 
(rev 5136)
+++ phpcompta/tags/rel650/include/class_acc_ledger.php  2012-10-02 21:01:27 UTC 
(rev 5137)
@@ -1536,8 +1536,10 @@
                {
                        $add_js = "update_pj();";
                }
-               $add_js.='get_last_date();';
-
+               if ($g_parameter->MY_DATE_SUGGEST=='Y')
+               {
+                       $add_js.='get_last_date();';
+               }
                $ret = "";
                if ($g_user->check_action(FICADD) == 1)
                {

Modified: phpcompta/tags/rel650/include/class_acc_ledger_fin.php
===================================================================
--- phpcompta/tags/rel650/include/class_acc_ledger_fin.php      2012-10-02 
16:58:34 UTC (rev 5136)
+++ phpcompta/tags/rel650/include/class_acc_ledger_fin.php      2012-10-02 
21:01:27 UTC (rev 5137)
@@ -292,7 +292,7 @@
                // Ledger (p_jrn)
                //--
 
-               $add_js = 
'onchange="update_pj();update_bank();get_last_date();ajax_saldo(\'first_sold\');update_name();"';
+               $add_js = 
'onchange="update_pj();update_bank();ajax_saldo(\'first_sold\');update_name();"';
 
                if ($g_parameter->MY_DATE_SUGGEST == 'Y')
                        $add_js = 
'onchange="update_pj();update_bank();get_last_date();ajax_saldo(\'first_sold\');update_name();"';

Modified: phpcompta/tags/rel650/include/class_acc_ledger_purchase.php
===================================================================
--- phpcompta/tags/rel650/include/class_acc_ledger_purchase.php 2012-10-02 
16:58:34 UTC (rev 5136)
+++ phpcompta/tags/rel650/include/class_acc_ledger_purchase.php 2012-10-02 
21:01:27 UTC (rev 5137)
@@ -972,7 +972,10 @@
         {
             $add_js="update_pj();";
         }
-        $add_js.='get_last_date();';
+               if ($g_parameter->MY_DATE_SUGGEST == 'Y')
+               {
+                       $add_js.='get_last_date();';
+               }
                $add_js.='update_name();';
                $add_js.='update_pay_method()';
 

Modified: phpcompta/tags/rel650/include/class_acc_ledger_sold.php
===================================================================
--- phpcompta/tags/rel650/include/class_acc_ledger_sold.php     2012-10-02 
16:58:34 UTC (rev 5136)
+++ phpcompta/tags/rel650/include/class_acc_ledger_sold.php     2012-10-02 
21:01:27 UTC (rev 5137)
@@ -1104,7 +1104,10 @@
         {
             $add_js="update_pj();";
         }
-        $add_js.='get_last_date();';
+               if ($g_parameter->MY_DATE_SUGGEST == 'Y')
+               {
+                       $add_js.='get_last_date();';
+               }
                $add_js.='update_name();';
                $add_js.='update_pay_method()';
 

Modified: phpcompta/tags/rel650/include/compta_ach.inc.php
===================================================================
--- phpcompta/tags/rel650/include/compta_ach.inc.php    2012-10-02 16:58:34 UTC 
(rev 5136)
+++ phpcompta/tags/rel650/include/compta_ach.inc.php    2012-10-02 21:01:27 UTC 
(rev 5137)
@@ -232,7 +232,7 @@
 echo '</div>';
 echo "</FORM>";
 
-if (!isset($_POST['e_date']))
+if (!isset($_POST['e_date']) && $g_parameter->MY_DATE_SUGGEST=='Y')
        echo create_script(" get_last_date()");
 
 echo '</div>';

Modified: phpcompta/tags/rel650/include/compta_fin.inc.php
===================================================================
--- phpcompta/tags/rel650/include/compta_fin.inc.php    2012-10-02 16:58:34 UTC 
(rev 5136)
+++ phpcompta/tags/rel650/include/compta_fin.inc.php    2012-10-02 21:01:27 UTC 
(rev 5137)
@@ -25,7 +25,7 @@
  */
 require_once ('class_acc_ledger_fin.php');
 require_once('class_ipopup.php');
-global $g_user;
+global $g_user,$g_parameter;
 
 $gDossier=dossier::id();
 
@@ -142,9 +142,11 @@
 echo HtmlInput::submit('save',_('Sauve'));
 echo HtmlInput::reset(_('Effacer'));
 
-if ( ! isset ($_POST['e_date']) )
+if ( ! isset ($_POST['e_date'])&& $g_parameter->MY_DATE_SUGGEST=='Y')
 {
        echo create_script(" get_last_date();ajax_saldo('first_sold');");
+}else {
+       echo create_script(" ajax_saldo('first_sold');");
 }
 
 exit();
\ No newline at end of file

Modified: phpcompta/tags/rel650/include/operation_ods_new.inc.php
===================================================================
--- phpcompta/tags/rel650/include/operation_ods_new.inc.php     2012-10-02 
16:58:34 UTC (rev 5136)
+++ phpcompta/tags/rel650/include/operation_ods_new.inc.php     2012-10-02 
21:01:27 UTC (rev 5137)
@@ -28,7 +28,7 @@
 require_once 'class_pre_op_ods.php';
 require_once 'class_iconcerned.php';
 
-global $g_user;
+global $g_user,$g_parameter;
 $cn=new Database(dossier::id());
 
 $id = (isset($_REQUEST['p_jrn'])) ? $_REQUEST['p_jrn'] : -1;
@@ -107,8 +107,10 @@
 
 echo "<script>checkTotalDirect();</script>";
 
-echo create_script(" get_last_date()");
-
+if ($g_parameter->MY_DATE_SUGGEST=='Y')
+{
+       echo create_script(" get_last_date()");
+}
 echo '</div>';
 
 ?>



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu