lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Update fiscalyear.class.php to filter on entity

Browse Source
This commit is contained in:
Alexandre SPANGARO 2020-03-16 10:05:22 +01:00
parent 1ee959a11f
commit 301b97f6d2
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
htdocs/core/class/fiscalyear.class.php
View File

@ -1,5 +1,7 @@
<?php
/* Copyright (C) 2014-2018 Alexandre Spangaro <aspangaro@open-dsi.fr>
/* Copyright (C) 2014-2020 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2020 OScss-Shop <support@oscss-shop.fr>
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -381,13 +383,19 @@ class Fiscalyear extends CommonObject
* @param int $dateend Date end to scan
* @return string Number of entries
*/
public function getAccountancyEntriesByFiscalYear($datestart, $dateend)
public function getAccountancyEntriesByFiscalYear($datestart = '', $dateend = '')
{
global $conf;
if(empty($datestart) )
$datestart = $this->date_start;
if(empty($dateend) )
$dateend = $this->date_end;
$sql = "SELECT count(DISTINCT piece_num) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
$sql.= " WHERE doc_date >= '".$datestart."' and doc_date <= '".$dateend."'";
$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
$sql.= " WHERE entity IN (".getEntity('bookkeeping', 0).")";
$sql.= " AND doc_date >= '".$this->db->idate($datestart)."' and doc_date <= '".$this->db->idate($dateend)."'";
$resql=$this->db->query($sql);
if ($resql)
@ -407,13 +415,19 @@ class Fiscalyear extends CommonObject
* @param int $dateend Date end to scan
* @return string Number of movements
*/
public function getAccountancyMovementsByFiscalYear($datestart, $dateend)
public function getAccountancyMovementsByFiscalYear($datestart = '', $dateend = '')
{
global $conf;
if(empty($datestart) )
$datestart = $this->date_start;
if(empty($dateend) )
$dateend = $this->date_end;
$sql = "SELECT count(rowid) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
$sql.= " WHERE doc_date >= '".$datestart."' AND doc_date <= '".$dateend."'";
$sql.= " WHERE entity IN (".getEntity('bookkeeping', 0).")";
$sql.= " AND doc_date >= '".$this->db->idate($datestart)."' and doc_date <= '".$this->db->idate($dateend)."'";
$resql=$this->db->query($sql);
if ($resql)