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

Fix Travis

Browse Source
This commit is contained in:
Alexandre SPANGARO 2020-10-09 15:19:09 +02:00
parent 473702487d
commit b938cc92f2
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
htdocs/intracommreport/class/intracommreport.class.php
View File

@ -69,22 +69,9 @@ class IntracommReport extends CommonObject
* *
* @param DoliDB $db Database handle * @param DoliDB $db Database handle
*/ */
public function __construct($db) public function __construct(DoliDB $db)
{ {
global $conf;
$this->db = $db; $this->db = $db;
/*
parent::set_table(MAIN_DB_PREFIX.'deb_prodouane');
parent::add_champs('numero_declaration,entity','type=entier;');
parent::add_champs('type_declaration,periode,mode','type=chaine;');
parent::add_champs('content_xml','type=text;');
parent::add_champs('exporttype', array('type'=>'string', 'size'=>'10'));
parent::start();
parent::_init_vars();
*/
$this->exporttype = 'deb'; $this->exporttype = 'deb';
} }
@ -99,7 +86,7 @@ class IntracommReport extends CommonObject
public function getXML($mode = 'O', $type = 'introduction', $period_reference = '') public function getXML($mode = 'O', $type = 'introduction', $period_reference = '')
{ {
global $db, $conf, $mysoc; global $conf, $mysoc;
/**************Construction de quelques variables********************/ /**************Construction de quelques variables********************/
$party_id = substr(strtr($mysoc->tva_intra, array(' '=>'')), 0, 4).$mysoc->idprof2; $party_id = substr(strtr($mysoc->tva_intra, array(' '=>'')), 0, 4).$mysoc->idprof2;
@ -154,7 +141,7 @@ class IntracommReport extends CommonObject
*/ */
public function getXMLDes($period_year, $period_month, $type_declaration = 'expedition') public function getXMLDes($period_year, $period_month, $type_declaration = 'expedition')
{ {
global $db, $conf, $mysoc; global $mysoc;
$e = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8" ?><fichier_des></fichier_des>'); $e = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8" ?><fichier_des></fichier_des>');
@ -185,13 +172,13 @@ class IntracommReport extends CommonObject
*/ */
public function addItemsFact(&$declaration, $type, $period_reference, $exporttype = 'deb') public function addItemsFact(&$declaration, $type, $period_reference, $exporttype = 'deb')
{ {
global $db, $conf; global $conf;
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php'; require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$sql = $this->getSQLFactLines($type, $period_reference, $exporttype); $sql = $this->getSQLFactLines($type, $period_reference, $exporttype);
$resql = $db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$i=1; $i=1;
@ -202,12 +189,12 @@ class IntracommReport extends CommonObject
} }
if ($exporttype == 'deb' && $conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT > 0) { if ($exporttype == 'deb' && $conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT > 0) {
$categ_fraisdeport = new Categorie($db); $categ_fraisdeport = new Categorie();
$categ_fraisdeport->fetch($conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT); $categ_fraisdeport->fetch($conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT);
$TLinesFraisDePort = array(); $TLinesFraisDePort = array();
} }
while ($res = $db->fetch_object($resql)) { while ($res = $this->db->fetch_object($resql)) {
if ($exporttype == 'des') if ($exporttype == 'des')
{ {
$this->addItemXMlDes($declaration, $res, '', $i); $this->addItemXMlDes($declaration, $res, '', $i);
@ -339,7 +326,7 @@ class IntracommReport extends CommonObject
public function addItemFraisDePort(&$declaration, &$TLinesFraisDePort, $type, &$categ_fraisdeport, $i) public function addItemFraisDePort(&$declaration, &$TLinesFraisDePort, $type, &$categ_fraisdeport, $i)
{ {
global $db, $conf; global $conf;
if ($type=='expedition') { if ($type=='expedition') {
$table = 'facture'; $table = 'facture';
@ -376,8 +363,8 @@ class IntracommReport extends CommonObject
) )
)'; )';
$resql = $db->query($sql); $resql = $this->db->query($sql);
$ress = $db->fetch_object($resql); $ress = $this->db->fetch_object($resql);
$this->addItemXMl($declaration, $res, $ress->customcode, $i); $this->addItemXMl($declaration, $res, $ress->customcode, $i);
@ -392,10 +379,8 @@ class IntracommReport extends CommonObject
*/ */
public function getNextDeclarationNumber() public function getNextDeclarationNumber()
{ {
global $db; $resql = $this->db->query('SELECT MAX(numero_declaration) as max_numero_declaration FROM '.$this->get_table().' WHERE exporttype="'.$this->exporttype.'"');
if ($resql) $res = $this->db->fetch_object($resql);
$resql = $db->query('SELECT MAX(numero_declaration) as max_numero_declaration FROM '.$this->get_table().' WHERE exporttype="'.$this->exporttype.'"');
if ($resql) $res = $db->fetch_object($resql);
return ($res->max_numero_declaration + 1); return ($res->max_numero_declaration + 1);
} }