| '; + echo ''; + echo "Tous les tests du module $title "; + echo ''; + echo ' | '; + echo ''; + echo ''; + echo 'Tous les scripts'; + echo ''; + echo ' | '; + echo '|
| '; + echo $e; + echo ' | '; + echo ''; + echo ''; + echo basename($aHtml_files[$e]['file']); + echo ''; + echo ' | '; + echo ''.$aHtml_files[$e]['desc'].' | '; + echo '
| '; - echo ''; - echo "Tous "; - echo ''; - echo ' | '; - echo 'Tous les scripts | '; - echo '|
| '; - echo $e; - echo ' | '; - echo ''; - echo ''; - echo $scenario[$e]['file']; - echo ''; - echo ' | '; - echo ''.$scenario[$e]['desc'].' | '; - echo '
start mem : ".$start_mem; - echo '
'; - echo "end mem : ".$end_mem; - echo '
'; - echo "Diff = ".($end_mem-$start_mem)." bytes "; - echo "
Diff = ".(round(($end_mem-$start_mem)/1024, 2))." kbytes "; - echo "
Diff = ".(round(($end_mem-$start_mem)/1024/1024, 2))." Mbytes "; - echo '
'; - echo "Execution script ".$script." time = ".(round(($end_time-$start_time), 4))." secondes
"; - $nb++; - if ( $nb == $maxscan ) { - echo "Dernier test"; - } else { - $get='test.php?'.http_build_query(array('script'=>"all", 'gDossier'=>$gDossierLogInput, 'nb_script'=>$nb)); - echo ''; - echo $scenario[$nb]['file']; + } + + $maxscan=$http->get('nb_script', "number",count($scenario)-1); + $maxscan++; + for ($i=$nb;$i< $maxscan;$i++) { + echo 'start mem : ".$start_mem; + echo '
'; + echo "end mem : ".$end_mem; + echo '
'; + echo "Diff = ".($end_mem-$start_mem)." bytes "; + echo "
Diff = ".(round(($end_mem-$start_mem)/1024, 2))." kbytes "; + echo "
Diff = ".(round(($end_mem-$start_mem)/1024/1024, 2))." Mbytes "; + echo '
'; + echo "Execution script ".$script." time = ".(round(($end_time-$start_time), 4))." secondes
"; + $nb++; + if ( $nb == $maxscan ) { + echo "Dernier test"; + } else { + $get='test.php?'.http_build_query(array('script'=>"all", 'gDossier'=>$gDossierLogInput, 'nb_script'=>$nb)); + echo ''; + echo $scenario[$nb]['file']; + echo ''; + } } } else { $start_mem=memory_get_usage(); $start_time=microtime(true); - $script=noalyss_str_replace('../', '', $script); $description=$http->get("description","string", "aucune description"); echo 'description = '.$description.'
'; - include '../scenario/'.$script; + include $script; $end_mem=memory_get_usage(); $end_time=microtime(true); @@ -225,4 +276,4 @@ else echo "
Diff = ".(round(($end_mem-$start_mem)/1024/1024, 2))." Mbytes "; echo '
'; echo "Execution script ".$script." time = ".(round(($end_time-$start_time), 4))." secondes
"; -} \ No newline at end of file +} diff --git a/include/ajax/ajax_card.php b/include/ajax/ajax_card.php index 7e0dcf1f7..466ab6aae 100644 --- a/include/ajax/ajax_card.php +++ b/include/ajax/ajax_card.php @@ -326,7 +326,8 @@ case 'st': $r.=''.h($array[$i]['fd_label']).''; $r.=''; $r.='| "; + $hid->input("type","poste").$hid->input('ac',$http->request('ac')).""; } $id=uniqid("pdf_"); @@ -668,21 +669,21 @@ class Acc_Account_Ledger HtmlInput::hidden('act',$action_pdf). $hid->input("type","poste").$str_ople. $hid->input('p_action','impress'). - $hid->input("from_periode",$_REQUEST['from_periode']). - $hid->input("to_periode",$_REQUEST['to_periode']) + $hid->input("from_periode",$http->request('from_periode')). + $hid->input("to_periode",$http->request('to_periode')) ; if ( isset($_REQUEST['letter'] )) echo HtmlInput::hidden('letter','2'); if ( isset($_REQUEST['solded'] )) echo HtmlInput::hidden('solded','1'); if (isset($_REQUEST['from_poste'])) - echo HtmlInput::hidden('from_poste',$_REQUEST['from_poste']); + echo HtmlInput::hidden('from_poste',$http->request('from_poste')); if (isset($_REQUEST['to_poste'])) - echo HtmlInput::hidden('to_poste',$_REQUEST['to_poste']); + echo HtmlInput::hidden('to_poste',$http->request('to_poste')); if (isset($_REQUEST['poste_id'])) - echo HtmlInput::hidden("poste_id",$_REQUEST['poste_id']); + echo HtmlInput::hidden("poste_id",$http->request('poste_id')); if (isset($_REQUEST['poste_fille'])) echo $hid->input('poste_fille','on'); @@ -697,17 +698,17 @@ class Acc_Account_Ledger HtmlInput::hidden('act',$action_csv). $hid->input("type","poste").$str_ople. $hid->input('p_action','impress'). - $hid->input("from_periode",$_REQUEST['from_periode']). - $hid->input("to_periode",$_REQUEST['to_periode']); + $hid->input("from_periode",$http->request('from_periode')). + $hid->input("to_periode",$http->request('to_periode')); if (isset($_REQUEST['from_poste'])) - echo HtmlInput::hidden('from_poste',$_REQUEST['from_poste']); + echo HtmlInput::hidden('from_poste',$http->request('from_poste')); if (isset($_REQUEST['to_poste'])) - echo HtmlInput::hidden('to_poste',$_REQUEST['to_poste']); + echo HtmlInput::hidden('to_poste',$http->request('to_poste')); if (isset($_REQUEST['poste_id'])) - echo HtmlInput::hidden("poste_id",$_REQUEST['poste_id']); + echo HtmlInput::hidden("poste_id",$http->request('poste_id')); if ( isset($_REQUEST['letter'] )) echo HtmlInput::hidden('letter','2'); if ( isset($_REQUEST['solded'] )) echo HtmlInput::hidden('solded','1'); @@ -716,7 +717,7 @@ class Acc_Account_Ledger echo $hid->input('poste_fille','on'); if (isset($_REQUEST['oper_detail'])) echo $hid->input('oper_detail','on'); - if (isset($_REQUEST['poste_id'])) echo $hid->input("poste_id",$_REQUEST['poste_id']); + if (isset($_REQUEST['poste_id'])) echo $hid->input("poste_id",$http->request('poste_id')); echo ""; echo ' | ';
diff --git a/include/class/acc_ledger.class.php b/include/class/acc_ledger.class.php
index 51fc616f2..ca9223c9f 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -22,12 +22,13 @@ require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
require_once NOALYSS_INCLUDE.'/database/jrn_def_sql.class.php';
require_once NOALYSS_INCLUDE.'/database/operation_currency_sql.class.php';
-/** \file
+/**
+ * \file
* @brief Class for jrn, class acc_ledger for manipulating the ledger
*/
/**
- * @class
+ * @class Acc_Ledger
* @brief Class for jrn, class acc_ledger for manipulating the ledger AND some acc. operations
*
*/
@@ -45,6 +46,7 @@ class Acc_Ledger extends jrn_def_sql
/**
+ * @brief construct
* @param $p_cn database connexion
* @param $p_id jrn.jrn_def_id
*/
@@ -896,7 +898,7 @@ class Acc_Ledger extends jrn_def_sql
$add_js="";
if ($g_parameter->MY_PJ_SUGGEST !='N')
{
- $add_js="update_pj();";
+ $add_js="update_receipt();";
}
if ($g_parameter->MY_DATE_SUGGEST=='Y')
{
diff --git a/include/class/acc_ledger_fin.class.php b/include/class/acc_ledger_fin.class.php
index 394284953..153000c69 100644
--- a/include/class/acc_ledger_fin.class.php
+++ b/include/class/acc_ledger_fin.class.php
@@ -311,7 +311,7 @@ class Acc_Ledger_Fin extends Acc_Ledger
if ($g_parameter->MY_DATE_SUGGEST=='Y')
$onchange.='get_last_date();';
if ($g_parameter->MY_PJ_SUGGEST=='Y')
- $onchange.='update_pj();';
+ $onchange.='update_receipt();';
$add_js='onchange="'.$onchange.'"';
$wLedger=$this->select_ledger('FIN', 2, FALSE);
diff --git a/include/class/acc_ledger_history.class.php b/include/class/acc_ledger_history.class.php
index 38b2b8847..d244cb9f0 100644
--- a/include/class/acc_ledger_history.class.php
+++ b/include/class/acc_ledger_history.class.php
@@ -38,7 +38,7 @@ abstract class Acc_Ledger_History
public $db; //!< database connx
protected $ledger_type; //! type of ledger VEN , ACH , ODS, FIN
protected $filter_operation; //!< to filter paid, unpaid or all operation
-
+ protected $data; // Contains data see acc_ledger_history_financial->get_row
/**
*
* @param Database $cn
diff --git a/include/class/acc_ledger_history_generic.class.php b/include/class/acc_ledger_history_generic.class.php
index 6bbabe3b1..53f5bcf2d 100644
--- a/include/class/acc_ledger_history_generic.class.php
+++ b/include/class/acc_ledger_history_generic.class.php
@@ -33,7 +33,7 @@
class Acc_Ledger_History_Generic extends Acc_Ledger_History
{
- private $data; //!< array of rows
+
/**
* Constructor
diff --git a/include/class/acc_ledger_history_purchase.class.php b/include/class/acc_ledger_history_purchase.class.php
index 0dca3160f..3e03c08c0 100644
--- a/include/class/acc_ledger_history_purchase.class.php
+++ b/include/class/acc_ledger_history_purchase.class.php
@@ -32,8 +32,6 @@
class Acc_Ledger_History_Purchase extends Acc_Ledger_History
{
- private $data;//!< Contains rows from SQL
-
/**
* @param mixed $data
*/
diff --git a/include/class/acc_ledger_history_sale.class.php b/include/class/acc_ledger_history_sale.class.php
index 0240db9b1..0b3b80208 100644
--- a/include/class/acc_ledger_history_sale.class.php
+++ b/include/class/acc_ledger_history_sale.class.php
@@ -31,8 +31,7 @@
class Acc_Ledger_History_Sale extends Acc_Ledger_History
{
- private $data; //!< Contains rows from SQL
-
+
public function __construct(\Database $cn, $pa_ledger, $p_from, $p_to,
$p_mode)
diff --git a/include/class/acc_ledger_purchase.class.php b/include/class/acc_ledger_purchase.class.php
index ad114e14f..6c1c6031c 100644
--- a/include/class/acc_ledger_purchase.class.php
+++ b/include/class/acc_ledger_purchase.class.php
@@ -19,27 +19,32 @@
// Copyright Author Dany De Bontridder danydb@aevalys.eu
-/*!\file
+/*!
+ * \file
* \brief class for the purchase, herits from acc_ledger
*/
require_once NOALYSS_INCLUDE.'/lib/user_common.php';
require_once NOALYSS_INCLUDE.'/lib/ac_common.php';
-/*!\brief Handle the ledger of purchase,
+/*!
+ * \class Acc_Ledger_Purchase
+ * \brief Handle the ledger of purchase,
*
*
*/
class Acc_Ledger_Purchase extends Acc_Ledger
{
private $payment_operation; /*ledger_type='ACH';
parent::__construct($p_cn,$p_init);
$this->payment_operation=-1;
}
- /*!\brief verify that the data are correct before inserting or confirming
+ /*!
+ * \brief verify that the data are correct before inserting or confirming
*\param an array (usually $_POST)
*\return String
*\throw Exception if an error occurs
@@ -472,7 +477,8 @@ class Acc_Ledger_Purchase extends Acc_Ledger
}
}
- /*!\brief insert into the database, it calls first the verify function
+ /*!
+ * \brief insert into the database, it calls first the verify function
* change the value of this->jr_id and this->jr_internal.
* It generates the document and save the middle of payment, if 'gen_invoice is set
* and e_mp
@@ -548,19 +554,36 @@ class Acc_Ledger_Purchase extends Acc_Ledger
try
{
bcscale(4);
- // total amount of the purchase
+ // variable : $tot_amount float : total amount of the purchase (debit)
$tot_amount=0;
+ // variable : $tot_tva float : total amount of the VAT
$tot_tva=0;
+
$tot_debit=0;
$this->db->start();
+ // variable : $tot_nd float total not Deductible
$tot_nd=0;
+ // variable : $tot_perso float total private amount
$tot_perso=0;
+ // variable : $tot_tva_nd float total vat not deductible
$tot_tva_nd=0;
+
+ // variable : $tot_tva_ndded float total vat not deductible - deductible via another tax
$tot_tva_ndded=0;
- $tot_tva_reversed=0;
+
+ $tot_tva_reversed=0; //@todo to remove
+
+ // variable : $tva array that will contain all the VAT Amount
$tva=array();
+
+ // variable : $tva_reverse array that contain all the VAT autoreverse AND negative
+ $tva_reverse = array();
+
+ // variable : $tot_amount_cur : total amount in currency
$tot_amount_cur=0;
+
// find the currency from v_currency_last_value
+ // variable : $currency_rate_ref Acc_Currency , currency object for this operation
$currency_rate_ref=new Acc_Currency($this->db, $p_currency_code);
/* Save all the items without vat and no deductible vat and expense*/
@@ -571,7 +594,8 @@ class Acc_Ledger_Purchase extends Acc_Ledger
/* First we save all the items without vat */
$fiche=new Fiche($this->db);
$fiche->get_by_qcode(${"e_march".$i});
- $tva_both=0;
+ // variable : $tva_both integer 1 for autoreverse ,0 normal, fetch it once for this item,
+ $tva_both=0;
/* tva */
if ($g_parameter->MY_TVA_USE=='Y')
{
@@ -676,13 +700,14 @@ class Acc_Ledger_Purchase extends Acc_Ledger
if ( $g_parameter->MY_TVA_USE=='Y')
{
$tva_item=$acc_amount->amount_vat;
-
- if (isset($tva[$idx_tva]))
- {
+ $tva[$idx_tva]=(isset( $tva[$idx_tva]))? $tva[$idx_tva]:0;
+ if ($tva_both == 0 || $tva_item >= 0){
$tva[$idx_tva]=bcadd($tva[$idx_tva], $tva_item);
+ }else {
+ // $tva_item < 0 && $tva_both == 1
+ $tva_reverse[$idx_tva]=(isset($tva_reverse[$idx_tva]))?$tva_reverse[$idx_tva]:0;
+ $tva_reverse[$idx_tva]=bcadd($tva_item,$tva_reverse[$idx_tva]);
}
- else
- $tva[$idx_tva]=$tva_item;
}
/* Save the stock */
/* if the quantity is < 0 then the stock increase (return of
@@ -853,8 +878,6 @@ class Acc_Ledger_Purchase extends Acc_Ledger
foreach ($tva as $i => $value)
{
$oTva=Acc_Tva::build($this->db,$i);
- $oTva->load();
-
$poste_vat=$oTva->get_side('d');
$cust_amount=round(bcadd($tot_amount,$tot_tva),2);
@@ -867,12 +890,15 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$acc_operation->type='d';
$acc_operation->periode=$tperiode;
if ( $value > 0 ) $tot_debit=bcadd($tot_debit,abs($value));
+ if ( $oTva->get_parameter("both_side") == 1 && $value ==0 ) continue;
$acc_operation->insert_jrnx();
// if TVA is on both side, we deduce it immediately
if ( $oTva->get_parameter("both_side")==1 )
{
- $poste_vat=$oTva->get_side('c');
+ // $x temp variable is the tva_reverse_account and will be used to check $poste_vat
+ $x=$oTva->get_parameter("tva_reverse_account");
+ $poste_vat =(trim($x??"")=="")? $oTva->get_side('c'):$x;
if ( $poste_vat == '#')
{
$poste_vat=$oTva->get_side('d');
@@ -880,16 +906,54 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$acc_operation=new Acc_Operation($this->db);
$acc_operation->date=$e_date;
$acc_operation->poste=$poste_vat;
- $acc_operation->amount=$tot_tva_reversed;
+ $acc_operation->amount=$value;
$acc_operation->grpt=$seq;
$acc_operation->jrn=$p_jrn;
$acc_operation->type='c';
$acc_operation->periode=$tperiode;
$acc_operation->insert_jrnx();
- if ( $value < 0 ) $tot_debit=bcadd($tot_debit,abs($value));
+ //if ( $value < 0 ) $tot_debit=bcadd($tot_debit,abs($value));
}
- }
+ } // LOOP : foreach $tva
+ foreach ($tva_reverse as $i => $value) {
+ $oTva = Acc_Tva::build($this->db,$i);
+ $poste_vat = $oTva->get_side('d');
+ if ( $poste_vat == '#')
+ {
+ $poste_vat=$oTva->get_side('c');
+ }
+
+ $acc_operation = new Acc_Operation($this->db);
+ $acc_operation->date = $e_date;
+ $acc_operation->poste = $poste_vat;
+ $acc_operation->amount = $value;
+ $acc_operation->grpt = $seq;
+ $acc_operation->jrn = $p_jrn;
+ $acc_operation->type = 'd';
+ $acc_operation->periode = $tperiode;
+
+ $acc_operation->insert_jrnx();
+
+ // if TVA is on both side, we deduce it immediately
+ $poste_vat = $oTva->get_side('c');
+ if ( $poste_vat == '#')
+ {
+ $poste_vat=$oTva->get_side('d');
+ }
+ $acc_operation = new Acc_Operation($this->db);
+ $acc_operation->date = $e_date;
+ $acc_operation->poste = $poste_vat;
+ $acc_operation->amount = $value;
+ $acc_operation->grpt = $seq;
+ $acc_operation->jrn = $p_jrn;
+ $acc_operation->type = 'c';
+ $acc_operation->periode = $tperiode;
+ $acc_operation->insert_jrnx();
+ $tot_debit = bcadd($tot_debit, $value);
+ $tot_debit = round($tot_debit, 2);
+ $n_both = $value;
+ } //LOOP: foreach $tva_reverse
}
/* insert into jrn */
@@ -1015,7 +1079,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$acc_pay->grpt=$acseq;
$acc_pay->jrn=$mp->get_parameter('ledger_target');
$acc_pay->periode=$tperiode;
- $acc_pay->type=($famount>=0)?'d':'c';
+ $acc_pay->type=($famount>=0)?'d':'c';
$let_other=$acc_pay->insert_jrnx();
// insert into operation_currency
@@ -1057,11 +1121,11 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$r1=$this->get_id($internal);
$r2=$this->get_id($acinternal);
- /*
- * add lettering
- */
- $oletter=new Lettering($this->db);
- $oletter->insert_couple($let_client,$let_other);
+ /*
+ * add lettering
+ */
+ $oletter=new Lettering($this->db);
+ $oletter->insert_couple($let_client,$let_other);
/* set the flag paid */
$Res=$this->db->exec_sql("update jrn set jr_rapt='paid' where jr_id=$1",array($r1));
@@ -1225,7 +1289,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
$add_js="";
if ( $g_parameter->MY_PJ_SUGGEST !='N')
{
- $add_js="update_pj();";
+ $add_js="update_receipt();";
}
if ($g_parameter->MY_DATE_SUGGEST == 'Y')
{
@@ -1518,7 +1582,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger
/* if we suggest the pj n# the run the script */
if ( $g_parameter->MY_PJ_SUGGEST !='N')
{
- $r.='';
+ $r.='';
}
// set focus on date
$r.= create_script("$('".$Date->id."').focus()");
diff --git a/include/class/acc_ledger_sale.class.php b/include/class/acc_ledger_sale.class.php
index 2f57664fe..1888669fc 100644
--- a/include/class/acc_ledger_sale.class.php
+++ b/include/class/acc_ledger_sale.class.php
@@ -300,21 +300,28 @@ class Acc_Ledger_Sale extends Acc_Ledger {
bcscale(4);
try {
- // total amount of the sales (credit)
+ // variable : $tot_amount : total amount of the sales (credit)
$tot_amount = 0;
- // total amount of the VAT
+ // variable : $tot_tva : total amount of the VAT
$tot_tva = 0;
// tot debit if item's amount < 0
$tot_debit = 0;
- // total amount in currency
+ // variable : $tot_amount_cur : total amount in currency
$tot_amount_cur=0;
$this->db->start();
+ // variable : $tva array that will contain all the VAT Amount
$tva = array();
+ // variable : $tva_reverse array that contain all the VAT autoreverse AND negative
+ $tva_reverse = array();
+
// find the currency from v_currency_last_value
+ // variable : $currency_rate_ref Acc_Currency , currency object for this operation
$currency_rate_ref=new Acc_Currency($this->db, $p_currency_code);
+
/* Save all the items without vat */
for ($i = 0; $i < $nb_item; $i++) {
+ // variable : $n_both float auto-reverse amount
$n_both = 0;
if ( empty(${'e_march'.$i}) || empty(${'e_quant'.$i}) ) continue;
@@ -328,7 +335,6 @@ class Acc_Ledger_Sale extends Acc_Ledger {
$tot_amount = bcadd($tot_amount, $amount);
$tot_amount = round($tot_amount, 2);
- if ( DEBUGNOALYSS > 1 ) { echo __LINE__." tot_amount $tot_amount ";} $acc_operation = new Acc_Operation($this->db); $acc_operation->date = $e_date; $sposte = $fiche->strAttribut(ATTR_DEF_ACCOUNT); @@ -367,39 +373,44 @@ class Acc_Ledger_Sale extends Acc_Ledger { if ($g_parameter->MY_TVA_USE == 'Y') { /* Compute sum vat */ $oTva = Acc_Tva::build($this->db, trim(${'e_march' . $i . '_tva_id'})); - $oTva->load(); $idx_tva =$oTva->get_parameter("id"); + // variable : $auto_reverse = if the oTVA autoreverse, fetch it once for this item, + $auto_reverse=$oTva->get_parameter("both_side"); $tva_item_currency = ${'e_march' . $i . '_tva_amount'}; /* if empty then we need to compute it */ if (trim($tva_item_currency) == '' || ${'e_march'.$i.'_tva_amount'} == 0) { - /* retrieve tva */ - $l = Acc_Tva::build($this->db, $idx_tva); - $l->load(); - $tva_item_currency = bcmul($amount, $l->get_parameter('rate')); - $tva_item=round($tva_item_currency,2); + $tva_item_currency = bcmul($amount, $oTva->get_parameter('rate')); + $tva_item=round($tva_item_currency,2); } $tva_item=bcdiv($tva_item_currency,$p_currency_rate); $tva_item=round($tva_item,2); - if (isset($tva[$idx_tva])) + + $tva[$idx_tva]=(isset($tva[$idx_tva]))?$tva[$idx_tva]:0; + + if ( $auto_reverse == 0) { $tva[$idx_tva]=bcadd($tva_item,$tva[$idx_tva]); $tva[$idx_tva]=round($tva[$idx_tva],2); + $tot_tva = bcadd($tva_item, $tot_tva); + $tot_tva = round($tot_tva, 2); } else { - $tva[$idx_tva]=$tva_item; - } - if ($oTva->get_parameter("both_side") == 0) { - $tot_tva = bcadd($tva_item, $tot_tva); - $tot_tva = round($tot_tva, 2); - } else { $n_both = $tva_item; $tva_item_currency = 0; if ($n_both<0) { $tot_debit=round(bcadd($tot_debit, abs($n_both)),2); + $tva_reverse[$idx_tva]=(isset($tva_reverse[$idx_tva]))?$tva_reverse[$idx_tva]:0; + $tva_reverse[$idx_tva]=bcadd($tva_item,$tva_reverse[$idx_tva]); + $tva_reverse[$idx_tva]=round($tva_reverse[$idx_tva],2); + + } else { + $tva[$idx_tva]=bcadd($tva_item,$tva[$idx_tva]); + $tva[$idx_tva]=round($tva[$idx_tva],2); + } } } @@ -548,20 +559,16 @@ class Acc_Ledger_Sale extends Acc_Ledger { $operation_currency->j_id=$let_tiers ; $operation_currency->insert(); - - /** save all vat + + /************************************************************************************************** + * save all vat * $i contains the tva_id and value contains the vat amount * if if ($g_parameter->MY_TVA_USE == 'Y' ) - */ + ************************************************************************************************** */ if ($g_parameter->MY_TVA_USE == 'Y') { - if ( DEBUGNOALYSS > 1 ) { - var_dump($tva); - } + foreach ($tva as $i => $value) { $oTva = Acc_Tva::build($this->db,$i); - - $oTva->load(); - $poste_vat = $oTva->get_side('c'); $cust_amount = bcadd($tot_amount, $tot_tva); @@ -578,14 +585,16 @@ class Acc_Ledger_Sale extends Acc_Ledger { $tot_debit=bcadd($tot_debit, abs($value)); $tot_debit=round($tot_debit, 2); } + if ( $oTva->get_parameter("both_side") == 1 && $value ==0 ) continue; $acc_operation->insert_jrnx(); - if ( DEBUGNOALYSS > 1 ) { - echo __LINE__." tot_tva $tot_tva "; - } // if TVA is on both side, we deduce it immediately - if ($oTva->get_parameter("both_side") == 1) { - $poste_vat = $oTva->get_side('d'); + if ($oTva->get_parameter("both_side") == 1 ) { + // $x temp variable is the tva_reverse_account and will be used to check $poste_vat + $x=$oTva->get_parameter("tva_reverse_account"); + + $poste_vat =(trim($x??"")=="")? $oTva->get_side('d'):$x; + if ($poste_vat == '#') $poste_vat=$oTva->get_side('c'); $cust_amount = bcadd($tot_amount, $tot_tva); $acc_operation = new Acc_Operation($this->db); $acc_operation->date = $e_date; @@ -600,7 +609,52 @@ class Acc_Ledger_Sale extends Acc_Ledger { $tot_debit = round($tot_debit, 2); $n_both = $value; } + } + foreach ($tva_reverse as $i => $value) { + $oTva = Acc_Tva::build($this->db,$i); + $poste_vat = $oTva->get_side('c'); + if ( $poste_vat == '#') + { + $poste_vat=$oTva->get_side('d'); + } + + $acc_operation = new Acc_Operation($this->db); + $acc_operation->date = $e_date; + $acc_operation->poste = $poste_vat; + $acc_operation->amount = $value; + $acc_operation->grpt = $seq; + $acc_operation->jrn = $p_jrn; + $acc_operation->type = 'c'; + $acc_operation->periode = $tperiode; + if ($value<0) + { + $tot_debit=bcadd($tot_debit, abs($value)); + $tot_debit=round($tot_debit, 2); + } + $acc_operation->insert_jrnx(); + + // if TVA is on both side, we deduce it immediately + $poste_vat = $oTva->get_side('d'); + if ( $poste_vat == '#') + { + $poste_vat=$oTva->get_side('c'); + } + $acc_operation = new Acc_Operation($this->db); + $acc_operation->date = $e_date; + $acc_operation->poste = $poste_vat; + $acc_operation->amount = $value; + $acc_operation->grpt = $seq; + $acc_operation->jrn = $p_jrn; + $acc_operation->type = 'd'; + $acc_operation->periode = $tperiode; + $acc_operation->insert_jrnx(); + $tot_debit = bcadd($tot_debit, $value); + $tot_debit = round($tot_debit, 2); + $n_both = $value; + + } + } // if ($g_parameter->MY_TVA_USE=='Y') /* * Balance the amount on D and C , the difference must be inserted as "difference due to a rounded value" @@ -1366,7 +1420,7 @@ EOF; /* if we suggest the next pj, then we need a javascript */ $add_js = ""; if ($g_parameter->MY_PJ_SUGGEST != 'N') { - $add_js = "update_pj();"; + $add_js = "update_receipt();"; } if ($g_parameter->MY_DATE_SUGGEST == 'Y') { $add_js.='get_last_date();'; diff --git a/include/class/acc_ledger_search.class.php b/include/class/acc_ledger_search.class.php index d94dd2a37..2a25e2fbc 100644 --- a/include/class/acc_ledger_search.class.php +++ b/include/class/acc_ledger_search.class.php @@ -35,10 +35,10 @@ class Acc_Ledger_Search protected $cn; //!< Database Connection private $type; //!< type of ledger : FIN,ODS,VEN,ACH - private $all; //!< Flag to indicate if all ledgers must searched (1 for yes) - private $div; //! prefix for id of DOM id - //! id of the ledger - var $id ; + private $all; //!< Flag to indicate if all ledgers must be searched (1 for yes) + private $div; //!< prefix for id of DOM id + var $id ; //!< id of the ledger + /** * @brief return a HTML string with the form for the search * @param $p_type if the type of ledger possible values=ALL,VEN,ACH,ODS,FIN: uppercase ! @@ -47,9 +47,9 @@ class Acc_Ledger_Search * - 1 means all the ledger of this type * - 0 No have the "Tous les journaux" availables * @param $div is the div (for reconciliation) - * @param type $p_type - * @param type $p_all - * @param type $p_div + * @param string $p_type ACH, VEN , ODS or FIN + * @param int $p_all 1 means all the ledger + * @param string $p_div prefix of the DOM ID * * @todo the parameter $all_type_ledger is useless : ALL means all the ledgers, VEN all the ledger of sales... */ @@ -258,7 +258,7 @@ class Acc_Ledger_Search } /** - * Build the button for managing the filter for search + * @brief Build the button for managing the filter for search * @param type $p_div id prefix of the div, button, table .. * @param $this->type if the type of ledger possible values=ALL,VEN,ACH,ODS,FIN * @param $all_type_ledger diff --git a/include/class/acc_operation.class.php b/include/class/acc_operation.class.php index a09581c95..08c332870 100644 --- a/include/class/acc_operation.class.php +++ b/include/class/acc_operation.class.php @@ -860,9 +860,12 @@ EOF; $cn=Dossier::connect(); $g_user=new Noalyss_user($cn); $a=new Acc_Operation($cn); - $a->jr_id=1444; + $a->jr_id=993; $b=$a->get_quant(); + echo h1('contain of get_quant() '); var_dump($b); + echo h1('contain of get_jrnx_detail()'); + var_dump($a->get_jrnx_detail()); } /** * Return a select object to choose the type of operation diff --git a/include/class/acc_operation_note.class.php b/include/class/acc_operation_note.class.php index 9a2638347..c6188b6e8 100644 --- a/include/class/acc_operation_note.class.php +++ b/include/class/acc_operation_note.class.php @@ -25,7 +25,7 @@ */ /*! - * \class + * \class Acc_Operation_Note * \brief Manage the note attached to an operation */ diff --git a/include/class/acc_tva.class.php b/include/class/acc_tva.class.php index d9fcf4d28..43a66b9b7 100644 --- a/include/class/acc_tva.class.php +++ b/include/class/acc_tva.class.php @@ -41,13 +41,17 @@ class Acc_Tva "comment"=>"tva_comment", "account"=>"tva_poste", "both_side"=>'tva_both_side', - 'tva_code'); + 'tva_reverse_account'=>'tva_reverse_account', + 'tva_code'=>'tva_code'); public $tva_id, $tva_label, $tva_rate, $tva_comment, $tva_poste, - $tva_both_side,$tva_code; + $tva_both_side, + $tva_code, + $tva_reverse_account; + private $cn; //!< Database connection private Tva_Rate_SQL $tva_rate_sql; @@ -63,6 +67,7 @@ class Acc_Tva $this->tva_poste=&$this->tva_rate_sql->tva_poste; $this->tva_both_side=&$this->tva_rate_sql->tva_both_side; $this->tva_code=&$this->tva_rate_sql->tva_code; + $this->tva_reverse_account=&$this->tva_rate_sql->tva_reverse_account; } /** @@ -90,7 +95,7 @@ class Acc_Tva return $this->$idx; } - echo (__FILE__.":".__LINE__.'Erreur attribut inexistant'); + echo (__FILE__.":".__LINE__."AT97:Erreur attribut inexistant [$p_string]"); } public function set_parameter($p_string,$p_value) { diff --git a/include/class/admin.class.php b/include/class/admin.class.php index e22468b5b..a90254638 100644 --- a/include/class/admin.class.php +++ b/include/class/admin.class.php @@ -40,7 +40,7 @@ class Admin extends Fiche var $vat_number; /*!< $vat_number vat number */ /*! \brief Constructor - /* only a db connection is needed */ + * only a db connection is needed */ function __construct($p_cn,$p_id=0) { $this->fiche_def_ref=FICHE_TYPE_ADM_TAX; diff --git a/include/class/anc_operation.class.php b/include/class/anc_operation.class.php index 49ff5aa44..ceb7cd033 100644 --- a/include/class/anc_operation.class.php +++ b/include/class/anc_operation.class.php @@ -717,16 +717,15 @@ EOF; return $result; } /** - * Save the ND VAT with prorata + * @brief Save the ND VAT in ANL, and distribute the amount among ANL Axis proportionnaly to the source * - * @param $p_array usually $_POST - * @param $p_item item of the form - * @param $p_j_id jrnx.j_id concerned writing - * @param $p_nd amount nd vat - * @see Anc_Operation::save_form_plan_vat_nd - * @return type + * @param $p_array array usually $_POST + * @param $p_item int nb of the item of the form + * @param $p_j_id int jrnx.j_id concerned writing + * @param $p_nd float amount nd vat + * @see Anc_Operation::save_form_plan() */ - function save_form_plan_vat_nd($p_array,$p_item,$p_j_id,$p_nd) + function save_form_plan_vat_nd($p_array,$p_item,$p_j_id,$p_nd):void { bcscale(4); extract($p_array, EXTR_SKIP); @@ -734,18 +733,16 @@ EOF; if ( ! isset(${'amount_t'.$p_item}) ) throw new Exception ('amount not set'); - - $tot=0; - /* variable for in array - pa_id array of existing pa_id - hplan double array with the pa_id (column) - val double array by row with amount - op contains sequence - p_item is used to identify what op is concerned + + /** + * variable for in array + * @var pa_id array of existing pa_id + @var hplan double array with the pa_id as key (column) + @var val double array by row with amount + * @var op contains sequence + @var p_item is used to identify what op is concerned */ - /* echo "j_id = $j_id p_item = $p_item hplan=".var_export($hplan[$p_item],true)." val = ".var_export($val[$p_item],true).' '; */ - /* for each row */ - // for ($i=0;$i '; + print "ERROR : $lineno"; + print $msg; + print ' '; + } + // prepare test + $old_value=[]; + try { + $cn->start(); + $old_value[0]=$cn->get_row('select * from document_type where dt_id=$1',[8]); + $old_value[1]=$cn->get_row('select * from document_type where dt_id=$1',[6]); + + $cn->exec_sql("update document_type set dt_value='Email' where dt_id=$1",[6]); + $cn->exec_sql("update document_type set dt_prefix='PML' where dt_id=$1",[8]); + $document_type=new Document_Type($cn,8); + echo $document_type; + + if ( $document_type->get() == 1 ) { + } + + if ( $document_type->dt_prefix!='PML') { + prv_echo_error("PREFIX :". $document_type,__LINE__); + } + + $document_type->set_number(6); + $document_type->get(); + + if ( $document_type->dt_value!='Email') { + prv_echo_error("VALUE :". $document_type,__LINE__); + } + $list=Document_Type::get_list($cn); + + // list array > 1 and key =5 + if (count ($list) == 0) { + prv_echo_error("GET_LIST :EMPTY",__LINE__); + } else { + foreach (['js_mod','dt_id','dt_value','dt_prefix','js_remove'] as $key) { + if ( ! isset ($list[0][$key])) { + prv_echo_error ('NOT SET '.$key,__LINE__); + } else { + echo ''; + var_dump( $list[0][$key]); + echo ''; + } + } + } + } catch (\Exception $e) { + prv_echo_error("EXCEPTION :". $document_type,__LINE__); + print_r($e->getTraceAsString()); + } + $cn->rollback(); + } } diff --git a/include/class/follow_up.class.php b/include/class/follow_up.class.php index c058174ad..6f0748dd5 100644 --- a/include/class/follow_up.class.php +++ b/include/class/follow_up.class.php @@ -34,7 +34,7 @@ require_once NOALYSS_INCLUDE.'/lib/user_common.php'; */ /** - * \class + * \class Follow_Up * \brief class_action for manipulating actions * action can be : *
input('p_alphanum') ?>
diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php
index f0eafa255..9943602d8 100644
--- a/include/compta_ven.inc.php
+++ b/include/compta_ven.inc.php
@@ -302,7 +302,7 @@ echo '';
/* if we suggest the pj n# the run the script */
if ( $g_parameter->MY_PJ_SUGGEST=='Y')
{
- echo '';
+ echo '';
}
$e_date=$http->request("e_date","string","");
diff --git a/include/constant.php b/include/constant.php
index e81d73934..806867ebb 100644
--- a/include/constant.php
+++ b/include/constant.php
@@ -28,7 +28,7 @@ global $version_noalyss;
define('NOALYSS_VERSION', 9300 );
// Database schema version
-define("DBVERSION", 202);
+define("DBVERSION", 203);
// version for MONO_DATABASE
define("MONO_DATABASE", 25);
diff --git a/include/database/operation_exercice_detail_sql.class.php b/include/database/operation_exercice_detail_sql.class.php
index a05afb44b..551bc9e97 100644
--- a/include/database/operation_exercice_detail_sql.class.php
+++ b/include/database/operation_exercice_detail_sql.class.php
@@ -27,8 +27,8 @@
*/
/**
- * @class
- * @brief abstract of the table
+ * @class Operation_Exercice_Detail_SQL
+ * @brief abstract of the table operation_exercice_detail
*/
class Operation_Exercice_Detail_SQL extends Table_Data_SQL
{
diff --git a/include/database/tva_rate_sql.class.php b/include/database/tva_rate_sql.class.php
index 5fc0593da..78bb589b4 100644
--- a/include/database/tva_rate_sql.class.php
+++ b/include/database/tva_rate_sql.class.php
@@ -51,6 +51,7 @@ class Tva_Rate_SQL extends Table_Data_SQL
,"tva_payment_purchase"=>"tva_payment_purchase"
,"tva_payment_sale"=>"tva_payment_sale"
,"tva_code"=>"tva_code"
+ ,'tva_reverse_account'=>'tva_reverse_account'
);
/*
* Type of columns
@@ -65,6 +66,7 @@ class Tva_Rate_SQL extends Table_Data_SQL
,"tva_payment_purchase"=>"text"
,"tva_payment_sale"=>"text"
,"tva_code"=>"text"
+ ,'tva_reverse_account'=>'text'
);
diff --git a/include/database/v_tva_rate_sql.class.php b/include/database/v_tva_rate_sql.class.php
index f336b6433..5d74a662b 100644
--- a/include/database/v_tva_rate_sql.class.php
+++ b/include/database/v_tva_rate_sql.class.php
@@ -49,6 +49,7 @@ class V_Tva_Rate_SQL extends Table_Data_SQL
, "tva_purchase"=>"tva_purchase"
, "tva_sale"=>"tva_sale"
, "tva_both_side"=>"tva_both_side"
+ ,'tva_reverse_account'=>'tva_reverse_account'
,'tva_payment_purchase'=>'tva_payment_purchase'
,'tva_payment_sale'=>'tva_payment_sale'
@@ -65,6 +66,7 @@ class V_Tva_Rate_SQL extends Table_Data_SQL
, "tva_purchase"=>"text"
, "tva_sale"=>"text"
, "tva_both_side"=>"numeric"
+ ,'tva_reverse_account'=>'text'
, 'tva_payment_purchase'=>'text'
, 'tva_payment_sale'=>'text'
);
diff --git a/include/export/export_gl_csv.php b/include/export/export_gl_csv.php
index 98a7411da..f02cd464b 100644
--- a/include/export/export_gl_csv.php
+++ b/include/export/export_gl_csv.php
@@ -35,7 +35,7 @@
[from_poste] =>
[to_poste] =>
)
-@encode
+@endcode
*/
if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis');
diff --git a/include/extension_choice.inc.php b/include/extension_choice.inc.php
deleted file mode 100644
index 8bc6c1785..000000000
--- a/include/extension_choice.inc.php
+++ /dev/null
@@ -1,54 +0,0 @@
-';
-@html_page_start($_SESSION[SESSION_KEY.'g_theme']);
-
-$cn=Dossier::connect();
-global $g_user;
-$g_user=new Noalyss_user($cn);
-$g_user->check();
-$only_plugin=$g_user->check_dossier(dossier::id());
-
-
-/* javascript file */
-echo load_all_script();
-
-/* show all the extension we can access */
-$a=new ISelect('plugin_code');
-$a->value=Extension::make_array($cn);
-$a->selected=(isset($_REQUEST['plugin_code']))?strtoupper($_REQUEST['plugin_code']):'';
-
-/* no plugin available */
-if ( count($a->value) == 0 )
-{
- alert(j(_("Aucune extension disponible")));
- exit;
-}
-
-/* only one plugin available then we don't propose a choice*/
-if ( count($a->value)==1 )
-{
- $_REQUEST['plugin_code']=$a->value[0]['value'];
-}
-echo ' ';
-/*else
-{
- if (!isset($_REQUEST['ac'])) echo_warning ("ac non positionné");
- echo ''; -}*/ - -//if ( isset($_REQUEST['plugin_code'])) -// require_once NOALYSS_INCLUDE.'/extension_get.inc.php'; -?> diff --git a/include/lettering.gestion.inc.php b/include/lettering.gestion.inc.php index e3251389c..ac201118d 100644 --- a/include/lettering.gestion.inc.php +++ b/include/lettering.gestion.inc.php @@ -1,7 +1,29 @@ '; @@ -22,13 +44,13 @@ $periode=new Periode($cn); list($first_per,$last_per)=$periode->get_limit($exercice); $start=new IDate('start'); -$start->value=(isset($_GET['start']))?$http->get('start'):$first_per->first_day(); +$start->value=(isset($_GET['start']))?$http->get('start','date'):$first_per->first_day(); $r=td(_('Date début')); $r.=td($start->input()); echo tr($r); $end=new IDate('end'); -$end->value=(isset($_GET['end']))?$_GET['end']:$last_per->last_day(); +$end->value=(isset($_GET['end']))?$http->get('end','date'):$last_per->last_day(); $r=td(_('Date fin')); $r.=td($end->input()); echo tr($r); @@ -52,7 +74,7 @@ echo ' '; echo HtmlInput::submit("seek",_('Recherche')); echo ''; echo ''; -//if (! isset($_REQUEST['seek'])) exit; + echo ' '; //-------------------------------------------------------------------------------- // record the data @@ -74,7 +96,7 @@ if ( isset($_GET['start']) && isset($_GET['end'])) } } echo ' ';
-$fiche=new Fiche($cn,$_REQUEST['f_id']);
+$fiche=new Fiche($cn, $http->request('f_id',"number"));
$quick_code=$fiche->get_quick_code();
$letter=new Lettering_Card($cn);
$letter->set_parameter('quick_code',$quick_code);
diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index 9b5a2a87a..588d06292 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -36,9 +36,9 @@ function h($p_string)
{
return ( $p_string === null)?"":htmlspecialchars($p_string,ENT_QUOTES|ENT_HTML5,'UTF-8',true);
}
-function p($p_string)
+function p($p_string, $p_extra='')
{
- return ' ';
- return;
-}
-/* --------------------------------------------------
- * Step 2 choose now the exercice of this folder
- */
-$back='do.php?ac='.$http->request("ac").'&'.dossier::get();
-if ($sa=='step2')
-{
- echo ''.$p_string." "; + return ''.$p_string.""; } function span($p_string, $p_extra='') { @@ -1800,4 +1800,5 @@ function sanitize_filename($filename) $new_filename=strtolower($filename_no)."-".date("Ymd-Hi").$filename_suff; return $new_filename; -} \ No newline at end of file +} + diff --git a/include/lib/function_javascript.php b/include/lib/function_javascript.php index c5478fa92..c94def571 100644 --- a/include/lib/function_javascript.php +++ b/include/lib/function_javascript.php @@ -2784,7 +2784,9 @@ EOF; echo js_include('acc_currency.js'); echo js_include('taggroup.js'); echo js_include('noalyss_checkbox.js'); - + if (DEBUGNOALYSS > 1) { + echo js_include('noalyss_debug.js'); + } } /** diff --git a/include/lib/http_input.class.php b/include/lib/http_input.class.php index 535573f4b..894095439 100644 --- a/include/lib/http_input.class.php +++ b/include/lib/http_input.class.php @@ -172,7 +172,7 @@ class HttpInput } if (!array_key_exists($p_name,$this->array)) { - throw new Exception(_('Paramètre invalide')."[$p_name]", + throw new Exception("C175."._('Paramètre invalide')."[$p_name]", EXC_PARAM_VALUE); } $this->check_type($p_name, $p_type); diff --git a/include/lib/icard.class.php b/include/lib/icard.class.php index 01b5a8dc0..8d195cc83 100644 --- a/include/lib/icard.class.php +++ b/include/lib/icard.class.php @@ -476,7 +476,7 @@ class ICard extends HtmlInput } $input=' '.
- Icon_Action::clean_zone(uniqid("remove"),"$('{$this->id}').value=''").
+ Icon_Action::clean_zone(uniqid("remove"),"clean_Fid('{$this->id}');compute_all_ledger();").
" ";
$input.=sprintf('
diff --git a/include/lib/input_checkbox.class.php b/include/lib/input_checkbox.class.php
index aa1cc8f5f..f14ecd7cd 100644
--- a/include/lib/input_checkbox.class.php
+++ b/include/lib/input_checkbox.class.php
@@ -28,7 +28,7 @@
* value , either 1 or 0 EXPERIMENTAL
*/
/**
- * @class
+ * @class InputCheckBox
* @brief modern checkbox, using a javascript to change the icon when clicked and a hidden field, there is always a
* value , either 1 or 0 , EXPERIMENTAL
*/
diff --git a/include/lib/iposte.class.php b/include/lib/iposte.class.php
index 74ea4b054..3cd03c11a 100644
--- a/include/lib/iposte.class.php
+++ b/include/lib/iposte.class.php
@@ -88,12 +88,12 @@ class IPoste extends HtmlInput
$this->extra2="all";
$this->extra="";
$this->attribute=array();
- $this->id=$p_id;
+ $this->id=$p_id;
$this->nb_row=1;
}
- static function ipopup($p_name)
+ static function ipopup($p_name)
{
$ip=new IPopup($p_name);
$ip->title='Plan comptable';
diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php
index e0f2b6b39..fbce42565 100644
--- a/include/lib/manage_table_sql.class.php
+++ b/include/lib/manage_table_sql.class.php
@@ -218,7 +218,7 @@ class Manage_Table_SQL
*/
function send_header()
{
- header('Content-type:text/xml;charset="UTF-8"');
+ @header('Content-type:text/xml;charset="UTF-8"');
}
/**
diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php
index 75b38033c..a42c4bfdf 100644
--- a/include/lib/message_javascript.php
+++ b/include/lib/message_javascript.php
@@ -121,4 +121,6 @@ content[84]="";
content[86]="";
content[87]="";
+content[88]="";
+
diff --git a/include/lib/noalyss_csv.class.php b/include/lib/noalyss_csv.class.php
index 0ac94699f..11dcbb700 100644
--- a/include/lib/noalyss_csv.class.php
+++ b/include/lib/noalyss_csv.class.php
@@ -77,11 +77,16 @@ class Noalyss_Csv
}
/***
- *@brief Send an header for CSV , the filename is corrected
+ *@brief Send an header for CSV , the filename is corrected. If TEST_UNIT is defined, the function is called
+ * from a test file (located in scenario , see manual )and no header are requested
*/
function send_header()
{
$this->correct_name();
+ if ( defined('TEST_UNIT')) {
+
+ return;
+ }
header('Pragma: public');
header('Content-type: application/csv');
header("Content-Disposition: attachment;filename=\"{$this->filename}\"",
@@ -292,5 +297,32 @@ class Noalyss_Csv
$this->size = $size;
return $this;
}
+ /**
+ * @brief convert CSV strings (content of a file) into HTML table,
+ * @param $string CSV files
+ */
+ static function csv2table ($string)
+ {
+ $a_field=[';',','];
+ $sep_field=$a_field[$_SESSION[SESSION_KEY.'csv_fieldsep']];
+ $a_field=['.',','];
+ $sep_dec=$a_field[$_SESSION[SESSION_KEY.'csv_decimal']];
+ $encoding=$_SESSION[SESSION_KEY.'csv_encoding'];
+ $aRow=explode("\r\n", $string);
+
+ echo '
Très longue chaine HTML pour 2" + . " Très longue chaine HTML pour 2" + . " Très longue chaine HTML pour 2" + . " Très longue chaine HTML pour 2" + . " Très longue chaine HTML pour 2" + . " Très longue chaine HTML pour 2" + . " Très longue chaine HTML pour 2" + . " Très longue chaine HTML pour 2" + . " Très longue chaine HTML pour 2" + . " Très longue chaine HTML pour 2" + . " Très longue chaine HTML pour 2" + . " Très longue chaine HTML pour 2"); + + $tab3 = new Html_Tab('tab3',_("Titre 3")); + $tab3->set_content(' '
+ . " '._("Opération enregistrée")." "._("Piece ").h($ledger->pj).''; - if (strcmp($ledger->pj, $_POST['e_pj'])!=0) - { - echo ''._('Attention numéro pièce existante, elle a du être adaptée').''; - } - printf('%s', - $jr_id, dossier::id(), $ledger->internal); - - // show feedback - echo ' '; echo ' ';
- echo $ledger->confirm($_POST, true);
- }
- catch (Exception $e)
- {
- require(NOALYSS_INCLUDE.'/operation_ods_new.inc.php');
- alert($e->getMessage());
- }
- return;
-}
-
-
-/* --------------------------------------------------
- * step 1 if nothing is asked we show the available folders
- */
-if ($sa=='')
-{
- echo ''.$ledger->get_name().''; echo '';
-
- echo ' ';
- echo ''._("Etape 1 : choix du dossier").''; - - echo _('Choisissez le dossier où sont les soldes à importer'); - $avail=$g_user->get_available_folder(); - - if (empty($avail)) - { - echo '*** '._("Aucun dossier").' ***'; - return; - } - echo ''; - echo ''.
- ' '._('Etape 2 : période').''. - ''.dossier::name($_REQUEST['f']).''. - '"; - echo HtmlInput::button_anchor(_('Retour'), $back); - exit(0); -} -/* -------------------------------------------------- - * select the ledger where we will import the data - */ -if ($sa=='step3') -{ - echo ''.
- ' Etape 3'. - ''.dossier::name($_REQUEST['f']).''. - '"; - echo HtmlInput::button_anchor('Retour', - $back.'&sa=step2&f='.$_REQUEST['f']); - exit(0); -} -/* -------------------------------------------------- - * Step 4 we import data from the selected folder and year and - * transform it into a misc operation - */ -if ($sa=='step4') -{ - echo '';
- echo ' '._("étape 4").''; - $dossier_id=$http->request("f","number"); - $p_periode=$http->request("p_periode","number"); - $p_jrn=$http->request("p_jrn","number"); - $cn_target=new Database($dossier_id); - $saldo=new Acc_Ledger($cn_target, 0); - $array=$saldo->get_saldo_exercice($p_periode); - /* we need to transform the array into a Acc_Ledger array */ - - $result=array(); - $result['desc']=sprintf(_("Ecriture d'ouverture %d"),$g_user->get_exercice()); - $result['nb_item']=sizeof($array); - $result['p_jrn']=$p_jrn; - $result["ac"]=$http->request("ac"); - $result['p_periode']=$p_periode; - $result['gDossier']=Dossier::id(); - $result['jr_optype']="OPE"; - // default date = first day of Exercice - $periode=new Periode($cn,$g_user->get_periode()); - list($periode_start,$periode_end)=$periode->get_limit($g_user->get_exercice()); - $result["e_date"]=$periode_start->first_day(); - - $idx=0; - - foreach ($array as $row) - { - $qcode='qc_'.$idx; - $poste='poste'.$idx; - $amount='amount'.$idx; - $ck='ck'.$idx; - $result[$qcode]=$row['j_qcode']; - if (trim($row['j_qcode']??"")=='') - $result[$poste]=$row['j_poste']; - $result[$amount]=abs($row['solde']); - if ($row['solde']>0) - $result[$ck]='on'; - $idx++; - } - $cn=Dossier::connect(); - $jrn=new Acc_Ledger($cn,$p_jrn); - $_POST=$result; - $_REQUEST=$result; - $ledger=new Acc_Ledger($cn, $p_jrn); - require_once NOALYSS_INCLUDE.'/operation_ods_new.inc.php'; - - echo ' | ||
| @@ -112,19 +133,19 @@ echo $f_accounting->input(); ?> | |
| - + div."tag_option"); $iselect->value=array( array("value"=>0,"label"=>_("Toutes les étiquettes")), array("value"=>1,"label"=>_("Au moins une étiquette")) ); - + $iselect->set_value($http->request($this->div."tag_option","number",0)); - echo $iselect->input(); - + echo $iselect->input(); + ?> div); @@ -132,7 +153,7 @@ echo $f_accounting->input(); ?> | - request($this->div."tag","string",0); if (is_array($aTag) ) { $nb_tag=count($aTag); @@ -142,9 +163,9 @@ echo $f_accounting->input(); ?> } } ?> - + |