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

Update api_thirdparties.class.php

Browse Source
This commit is contained in:
Laurent Destailleur 2018-09-19 14:44:16 +02:00 committed by GitHub
parent b1fc45fe3d
commit 019ba74225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/societe/class/api_thirdparties.class.php
View File

@ -1175,14 +1175,14 @@ class Thirdparties extends DolibarrApi
/** /**
* Generate a sepamandate Document * Generate a sepamandate Document
* *
* @param int $socid thirdparty id * @param int $id thirdparty id
* @param int $id companybankid * @param int $companybankid companybankid
*
* @return void
* *
* @return array Check success * @url GET {id}/generateMandat/{companybankid}
*
* @url GET /generateMandat/{socid}
*/ */
public function generateMandat($socid, $id = null){ public function generateMandat($id, $companybankid = null){
$this->langs->load("database"); $this->langs->load("database");
$this->langs->load("main"); $this->langs->load("main");
@ -1201,16 +1201,14 @@ class Thirdparties extends DolibarrApi
$model = "sepamandate"; $model = "sepamandate";
$this->company->fetch($socid); $this->company->fetch($id);
$action = 'builddoc'; $action = 'builddoc';
if(! DolibarrApiAccess::$user->rights->societe->creer) if(! DolibarrApiAccess::$user->rights->societe->creer)
throw new RestException(401); throw new RestException(401);
// Reload to get all modified line records and be ready for hooks // Reload to get all modified line records and be ready for hooks
$this->company->setDocModel($user, $model); $this->company->setDocModel($user, $model);
$this->company->fk_bank = $this->company->fk_account; $this->company->fk_bank = $this->company->fk_account;
@ -1218,8 +1216,6 @@ class Thirdparties extends DolibarrApi
$outputlangs = $this->langs; $outputlangs = $this->langs;
$newlang=''; $newlang='';
if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09'); if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang=$this->company->thirdparty->default_lang; // for proposal, order, invoice, ... if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->thirdparty->default_lang)) $newlang=$this->company->thirdparty->default_lang; // for proposal, order, invoice, ...
if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang=$this->company->default_lang; // for thirdparty if ($this->conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->company->default_lang)) $newlang=$this->company->default_lang; // for thirdparty
@ -1238,10 +1234,9 @@ class Thirdparties extends DolibarrApi
$sql = "SELECT rowid"; $sql = "SELECT rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."societe_rib"; $sql.= " FROM ".MAIN_DB_PREFIX."societe_rib";
if ($socid) $sql.= " WHERE fk_soc = ".$socid." "; if ($id) $sql.= " WHERE fk_soc = ".$id." ";
if ($id) $sql.= " AND id = ".$id.""; if ($companybankid) $sql.= " AND id = ".$companybankid."";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if($result->num_rows == 0 ){ if($result->num_rows == 0 ){
@ -1265,7 +1260,8 @@ class Thirdparties extends DolibarrApi
$i++; $i++;
} }
} }
else{ else
{
throw new RestException(404, 'Account not found'); throw new RestException(404, 'Account not found');
} }
@ -1274,14 +1270,8 @@ class Thirdparties extends DolibarrApi
'use_companybankid'=>$accounts[0]->id, 'use_companybankid'=>$accounts[0]->id,
'force_dir_output'=>$this->conf->societe->multidir_output[$this->company->entity].'/'.dol_sanitizeFileName($this->company->id) 'force_dir_output'=>$this->conf->societe->multidir_output[$this->company->entity].'/'.dol_sanitizeFileName($this->company->id)
); );
$result = 0; $result = 0;
$result = $this->company->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams); $result = $this->company->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);