From 125b577ef1f83b7da4745da7db86ae2ffb7712fb Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Tue, 15 Nov 2011 20:55:45 +0000 Subject: [PATCH] Fix small bugs payment method by ledger --- include/class_acc_ledger_purchase.php | 9 +++++---- include/class_acc_ledger_sold.php | 8 ++++---- include/class_acc_payment.php | 3 +++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/class_acc_ledger_purchase.php b/include/class_acc_ledger_purchase.php index 79ff460a0..0e17ae2ef 100644 --- a/include/class_acc_ledger_purchase.php +++ b/include/class_acc_ledger_purchase.php @@ -733,7 +733,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger /* jrnx */ $acseq=$this->db->get_next_seq('s_grpt'); - $acjrn=new Acc_Ledger($this->db,$mp->get_parameter('ledger')); + $acjrn=new Acc_Ledger($this->db,$mp->get_parameter('ledger_target')); $acinternal=$acjrn->compute_internal_code($acseq); /* Insert paid by */ @@ -757,7 +757,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger $acc_pay->amount=abs(round($cust_amount,2)); $acc_pay->desc=$e_comm; $acc_pay->grpt=$acseq; - $acc_pay->jrn=$mp->get_parameter('ledger'); + $acc_pay->jrn=$mp->get_parameter('ledger_target'); $acc_pay->periode=$tperiode; $acc_pay->type=($cust_amount>=0)?'c':'d'; $acc_pay->insert_jrnx(); @@ -770,7 +770,7 @@ class Acc_Ledger_Purchase extends Acc_Ledger $acc_pay->amount=abs(round($cust_amount,2)); $acc_pay->desc=$e_comm; $acc_pay->grpt=$acseq; - $acc_pay->jrn=$mp->get_parameter('ledger'); + $acc_pay->jrn=$mp->get_parameter('ledger_target'); $acc_pay->periode=$tperiode; $acc_pay->type=($cust_amount>=0)?'d':'c'; $let_other=$acc_pay->insert_jrnx(); @@ -819,7 +819,8 @@ class Acc_Ledger_Purchase extends Acc_Ledger echo ''. 'Erreur dans l\'enregistrement '. __FILE__.':'.__LINE__.' '. - $e->getMessage().$e->getTrace(); + $e->getMessage().$e->getTraceAsString(); + $this->db->rollback(); exit(); } diff --git a/include/class_acc_ledger_sold.php b/include/class_acc_ledger_sold.php index 34fa537e2..d23321c50 100644 --- a/include/class_acc_ledger_sold.php +++ b/include/class_acc_ledger_sold.php @@ -493,7 +493,7 @@ class Acc_Ledger_Sold extends Acc_Ledger /* jrnx */ $acseq=$this->db->get_next_seq('s_grpt'); - $acjrn=new Acc_Ledger($this->db,$mp->get_parameter('ledger')); + $acjrn=new Acc_Ledger($this->db,$mp->get_parameter('ledger_target')); $acinternal=$acjrn->compute_internal_code($acseq); /* Insert paid by */ @@ -517,7 +517,7 @@ class Acc_Ledger_Sold extends Acc_Ledger $acc_pay->amount=abs(round($cust_amount,2)); $acc_pay->desc=$e_comm; $acc_pay->grpt=$acseq; - $acc_pay->jrn=$mp->get_parameter('ledger'); + $acc_pay->jrn=$mp->get_parameter('ledger_target'); $acc_pay->periode=$tperiode; $acc_pay->type=($cust_amount>=0)?'d':'c'; $acc_pay->insert_jrnx(); @@ -530,7 +530,7 @@ class Acc_Ledger_Sold extends Acc_Ledger $acc_pay->amount=abs(round($cust_amount,2)); $acc_pay->desc=$e_comm; $acc_pay->grpt=$acseq; - $acc_pay->jrn=$mp->get_parameter('ledger'); + $acc_pay->jrn=$mp->get_parameter('ledger_target'); $acc_pay->periode=$tperiode; $acc_pay->type=($cust_amount>=0)?'c':'d'; $let_other=$acc_pay->insert_jrnx(); @@ -1284,7 +1284,7 @@ class Acc_Ledger_Sold extends Acc_Ledger $r.=""; return $r; } - + /*!\brief test function */ static function test_me($p_string='') diff --git a/include/class_acc_payment.php b/include/class_acc_payment.php index 9f73f7927..8d852b3fe 100644 --- a/include/class_acc_payment.php +++ b/include/class_acc_payment.php @@ -69,7 +69,10 @@ class Acc_Payment return $this->$idx; } else + { + throw new Exception("Attribut inexistant $p_string"); exit (__FILE__.":".__LINE__.'Erreur attribut inexistant'); + } } public function set_parameter($p_string,$p_value) {