From 440e736f31a8013902a80541eac56882b64484cb Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 7 Apr 2011 20:55:33 +0000 Subject: [PATCH] Merged revisions 4060-4063 via svnmerge from svn+ssh://danydb@svn/svn/phpcompta/branches/rel550 ........ r4060 | danydb | 2011-03-31 00:56:29 +0200 (Thu, 31 Mar 2011) | 2 lines fix problem with password reinit ........ r4061 | danydb | 2011-04-05 22:23:36 +0200 (Tue, 05 Apr 2011) | 2 lines fix problem with act2 ........ r4062 | danydb | 2011-04-05 22:34:13 +0200 (Tue, 05 Apr 2011) | 2 lines #248 Fix problem with payment with sales ........ r4063 | danydb | 2011-04-06 18:25:05 +0200 (Wed, 06 Apr 2011) | 2 lines #247 Bug in invoice generating ........ --- html/priv_user.php | 2 +- include/action.common.inc.php | 2 +- include/class_acc_ledger_sold.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/html/priv_user.php b/html/priv_user.php index df26b44ca..d8b42c1c5 100644 --- a/html/priv_user.php +++ b/html/priv_user.php @@ -75,7 +75,7 @@ if ( isset ( $_GET['reset_passwd']) ) /* prevent to change the password of superadmin */ if ( $uid != '1' ) { - $Res=$cn->exec_sql( "update ac_users set use_pass='$1' where use_id=$2",array($l_pass,$uid)); + $Res=$cn->exec_sql( "update ac_users set use_pass=$1 where use_id=$2",array($l_pass,$uid)); echo '

Password remis à phpcompta

'; } } diff --git a/include/action.common.inc.php b/include/action.common.inc.php index 05f38bfb4..9f068daeb 100644 --- a/include/action.common.inc.php +++ b/include/action.common.inc.php @@ -222,7 +222,7 @@ if ( $sub_action == "save_action_st2" ) // insert into action_gestion echo $act->save(); - $url="?$base&sa=detail&ag_id=".$act2->ag_id.'&'.dossier::get(); + $url="?$base&sa=detail&ag_id=".$act->ag_id.'&'.dossier::get(); echo '

'.hb('Action Sauvée : '.$act->ag_ref).'

'; diff --git a/include/class_acc_ledger_sold.php b/include/class_acc_ledger_sold.php index cd9c77a4c..afcc6a78f 100644 --- a/include/class_acc_ledger_sold.php +++ b/include/class_acc_ledger_sold.php @@ -571,7 +571,7 @@ class Acc_Ledger_Sold extends Acc_Ledger /* if ledger is FIN then insert into quant_fin */ if ( $prop['jrn_def_type'] == 'FIN' ) { - $ledger->insert_quant_fin($acfiche->id,$mp_jr_id,$cust->id,bcmul($cust_amount,-1)); + $ledger->insert_quant_fin($acfiche->id,$mp_jr_id,$cust->id,bcmul($cust_amount,1)); } } @@ -851,7 +851,7 @@ class Acc_Ledger_Sold extends Acc_Ledger $r.=HtmlInput::hidden('e_mp_qcode_'.$e_mp,${'e_mp_qcode_'.$e_mp}); /* needed for generating a invoice */ - $r.=HtmlInput::hidden('qcode_dest',${'e_mp_qcode_'.$e_mp}); + $r.=HtmlInput::hidden('qcode_benef',${'e_mp_qcode_'.$e_mp}); $r.=_("Payé par ").${'e_mp_qcode_'.$e_mp}; $r.='
';