admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged revisions 4060-4063 via svnmerge from

Browse source 
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
........
This commit is contained in:
Dany De Bontridder 2011-04-07 20:55:33 +00:00
parent 7614caceb2
commit 440e736f31
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
html/priv_user.php
View file

@ -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 '<H2 class="info"> Password remis à phpcompta</H2>';
}
}

2
include/action.common.inc.php
View file

@ -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 '<p><a class="mtitle" href="'.$url.'">'.hb('Action Sauvée : '.$act->ag_ref).'</a></p>';

4
include/class_acc_ledger_sold.php
View file

@ -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.='<br>';