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

Merged revisions 4810,4813-4821 via svnmerge from

Browse source 
svn+ssh://ns352270.ovh.net/svn/phpcompta/tags/rel601

........
  r4810 | danydb | 2012-04-24 20:55:23 +0200 (Tue, 24 Apr 2012) | 3 lines
  
  Removed merge tracking for "svnmerge" for 
  svn+ssh://danydb@ns352270.ovh.net/svn/phpcompta/tags/rel600
........
  r4813 | danydb | 2012-04-24 20:58:20 +0200 (Tue, 24 Apr 2012) | 1 line
  
  change SQL
........
  r4814 | danydb | 2012-04-24 21:33:02 +0200 (Tue, 24 Apr 2012) | 2 lines
  
  Fix bug predefined operation for misc ledger
........
  r4815 | danydb | 2012-04-24 21:33:27 +0200 (Tue, 24 Apr 2012) | 3 lines
  
  Fix bug predefined operation for misc ledger
  Fix bug for check_balance (null value)
........
  r4816 | danydb | 2012-04-24 21:51:04 +0200 (Tue, 24 Apr 2012) | 1 line
  
  fix bug : rounded value
........
  r4817 | danydb | 2012-05-01 16:49:39 +0200 (Tue, 01 May 2012) | 2 lines
  
  #569 réécriture des menus fournisseur, client et adm
........
  r4818 | danydb | 2012-05-01 16:51:35 +0200 (Tue, 01 May 2012) | 2 lines
  
  #568: Impossible d'ajouter une fiche BANQUE dans ADM
........
  r4819 | danydb | 2012-05-01 16:53:12 +0200 (Tue, 01 May 2012) | 2 lines
  
  #570: Ajout d'un menu contact
........
  r4820 | danydb | 2012-05-01 16:53:46 +0200 (Tue, 01 May 2012) | 1 line
  
  cosmetic  : message d'erreur quand on veut ajouter une fiche dans catégorie non existante
........
  r4821 | danydb | 2012-05-01 18:38:34 +0200 (Tue, 01 May 2012) | 1 line
  
  code : dead code
........
This commit is contained in:
Dany De Bontridder 2012-05-08 18:01:19 +00:00
parent 27a50547ad
commit 2e4dc23d33
28 changed files with 414 additions and 1168 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/class_fiche.php
View file

@ -468,7 +468,7 @@ class Fiche
{
$w=new ICard("av_text".$attr->ad_id);
// filter on frd_id
$sql=' select fd_id from fiche_def where frd_id in ('.FICHE_TYPE_CLIENT.','.FICHE_TYPE_FOURNISSEUR.','.FICHE_TYPE_ADM_TAX.')';
$sql=' select fd_id from fiche_def where frd_id in ('.FICHE_TYPE_CLIENT.','.FICHE_TYPE_FOURNISSEUR.','.FICHE_TYPE_ADM_TAX.','.FICHE_TYPE_FIN.')';
$filter=$this->cn->make_list($sql);
$w->set_attribute('ipopup','ipopcard');
$w->set_attribute('typecard',$filter);
@ -612,7 +612,8 @@ class Fiche
{
$w = new ICard("av_text" . $r->ad_id);
// filter on frd_id
$sql = ' select fd_id from fiche_def where frd_id in (' . FICHE_TYPE_CLIENT . ',' . FICHE_TYPE_FOURNISSEUR . ',' . FICHE_TYPE_ADM_TAX . ')';
$sql = ' select fd_id from fiche_def where frd_id in (' . FICHE_TYPE_CLIENT . ',' . FICHE_TYPE_FOURNISSEUR . ',' . FICHE_TYPE_ADM_TAX . '
,'.FICHE_TYPE_FIN.')';
$filter = $this->cn->make_list($sql);
$w->extra = $filter;
$w->extra2 = 0;
@ -829,7 +830,7 @@ class Fiche
{
$exist=$this->cn->count_sql("select f_id from fiche join fiche_def using (fd_id) ".
" join fiche_detail using(f_id) ".
" where frd_id in (8,9,14) and ad_id=".ATTR_DEF_QUICKCODE.
" where frd_id in (4,8,9,14) and ad_id=".ATTR_DEF_QUICKCODE.
" and ad_value='".sql_string($value)."'");
if ( $exist == 0 && sql_string($value) != null )
{
@ -1000,7 +1001,7 @@ class Fiche
{
$exist=$this->cn->exec_sql("select f_id from fiche join fiche_def using (fd_id) ".
" join fiche_detail using (f_id) ".
" where frd_id in (8,9,14) and ad_id=$1 ".
" where frd_id in (4,8,9,14) and ad_id=$1 ".
" and ad_value=upper($2)",
array(ATTR_DEF_QUICKCODE,$value));