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

Merged revisions 3246-3260 via svnmerge from

Browse source 
file:///home/developper/svn/phpcompta/branches/rel510

........
  r3247 | danydb | 2010-05-26 10:47:02 +0200 (Wed, 26 May 2010) | 4 lines
  
  Before the fix: FIN ledger numbers the operations even when there is no 
  receipt nb
........
  r3248 | danydb | 2010-05-26 19:28:36 +0200 (Wed, 26 May 2010) | 1 line
  
  Problem with the creation of document (need verification)
........
  r3249 | danydb | 2010-05-26 21:02:27 +0200 (Wed, 26 May 2010) | 2 lines
  
  Check return value for Acc_Tva->load
........
  r3250 | danydb | 2010-05-26 21:07:49 +0200 (Wed, 26 May 2010) | 1 line
  
  Problem with the creation of document, bug due to a confusion between MY_TVA and MY_TVA_USE
........
  r3251 | danydb | 2010-05-28 10:31:02 +0200 (Fri, 28 May 2010) | 2 lines
  
  Account Export CSV :  Add the label to accountings
........
  r3252 | danydb | 2010-05-28 10:31:35 +0200 (Fri, 28 May 2010) | 2 lines
  
  typo
........
  r3253 | danydb | 2010-05-28 10:33:11 +0200 (Fri, 28 May 2010) | 2 lines
  
  Account export CSV : fix number of column
........
  r3254 | danydb | 2010-05-28 10:34:03 +0200 (Fri, 28 May 2010) | 1 line
  
  Account export CSV
........
  r3255 | danydb | 2010-05-28 10:35:14 +0200 (Fri, 28 May 2010) | 2 lines
  
  Balance PDF : bug column D & C are inversed
........
  r3256 | danydb | 2010-05-28 14:12:31 +0200 (Fri, 28 May 2010) | 1 line
  
  Fix bug : for quick_writing when a row is added, the value is duplicated
........
  r3257 | danydb | 2010-05-28 14:43:42 +0200 (Fri, 28 May 2010) | 1 line
  
  Fix problem with max article
........
  r3258 | danydb | 2010-05-28 14:45:57 +0200 (Fri, 28 May 2010) | 1 line
  
  Bug with predefined operation : the nb of item was incorrect in input
........
  r3259 | danydb | 2010-05-30 17:11:47 +0200 (Sun, 30 May 2010) | 2 lines
  
  Fix small bug : make_list remove bad heading and trailing coma
........
  r3260 | danydb | 2010-05-30 17:42:45 +0200 (Sun, 30 May 2010) | 2 lines
  
  Avoid duplicate in table fiche::HtmlTableDetail
........
This commit is contained in:
Dany De Bontridder 2010-05-31 13:52:09 +00:00
parent 17a8b3c777
commit 048f8e1f34
11 changed files with 41 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/class_document.php
View file

@ -656,12 +656,12 @@ class Document
extract ($_POST);
$id='e_march'.$counter.'_tva_id';
if ( !isset (${$id}) ) return "";
if ( ${$id} == -1 ) return "";
if ( ${$id} == -1 || ${$id}=='' ) return "";
$march_id='e_march'.$counter.'_price' ;
if ( ! isset (${$march_id})) return '';
$tva=new Acc_Tva($this->db);
$tva->set_parameter("id",${$id});
$tva->load();
if ( $tva->load() == -1) return '';
return $tva->get_parameter("rate");
break;
@ -722,8 +722,8 @@ class Document
|| strlen(trim( $price )) ==0
|| strlen(trim($qt)) ==0)
return "";
$oTva=new Acc_Tva($cn,${$tva});
if ($oTva->load() == null) return "";
$oTva=new Acc_Tva($this->db,${$tva});
if ($oTva->load() == -1 ) return "";
$r=round(${$price},2)*$oTva->get_parameter('rate');
$r=round($r,2);
break;
@ -739,8 +739,9 @@ class Document
|| strlen(trim( $price )) ==0
|| strlen(trim($qt)) ==0)
return "";
$tva=new Acc_Tva($cn,${$id});
if ($tva->load() == null) {
if ( ! isset (${$tva}) ) return '';
$tva=new Acc_Tva($this->db,${$tva});
if ($tva->load() == -1 ) {
$r=round(${$price},2);
}else {
$r=round(${$price}*$tva->get_parameter('rate')+${$price},2);