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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-03-03 23:11:16 +01:00
commit 5e6ca6e61c
17 changed files with 77 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/bom/class/bom.class.php
View File

@ -561,7 +561,7 @@ class BOM extends CommonObject
{
$num = $this->ref;
}
$this->newref = $num;
$this->newref = dol_sanitizeFileName($num);
// Validate
$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;

58
htdocs/comm/propal/class/api_proposals.class.php
View File

@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2020 Thibault FOUCART <support@ptibogxiv.net>
*
* 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
@ -64,11 +65,66 @@ class Proposals extends DolibarrApi
*/
public function get($id, $contact_list = 1)
{
return $this->_fetch($id, '', '', '', $contact_list);
}
/**
* Get properties of an proposal object by ref
*
* Return an array with proposal informations
*
* @param string $ref Ref of object
* @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
* @return array|mixed data without useless information
*
* @url GET ref/{ref}
*
* @throws RestException
*/
public function getByRef($ref, $contact_list = 1)
{
return $this->_fetch('', $ref, '', '', $contact_list);
}
/**
* Get properties of an proposal object by ref_ext
*
* Return an array with proposal informations
*
* @param string $ref_ext External reference of object
* @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
* @return array|mixed data without useless information
*
* @url GET ref_ext/{ref_ext}
*
* @throws RestException
*/
public function getByRefExt($ref_ext, $contact_list = 1)
{
return $this->_fetch('', '', $ref_ext, '', $contact_list);
}
/**
* Get properties of an proposal object
*
* Return an array with proposal informations
*
* @param int $id ID of order
* @param string $ref Ref of object
* @param string $ref_ext External reference of object
* @param string $ref_int Internal reference of other objec
* @param int $contact_list 0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
* @return array|mixed data without useless information
*
* @throws RestException
*/
private function _fetch($id, $ref = '', $ref_ext = '', $ref_int = '', $contact_list = 1)
{
if(! DolibarrApiAccess::$user->rights->propal->lire) {
throw new RestException(401);
}
$result = $this->propal->fetch($id);
$result = $this->propal->fetch($id, $ref, $ref_ext, $ref_int);
if( ! $result ) {
throw new RestException(404, 'Commercial Proposal not found');
}

2
htdocs/comm/propal/class/propal.class.php
View File

@ -1803,7 +1803,7 @@ class Propal extends CommonObject
{
$num = $this->ref;
}
$this->newref = $num;
$this->newref = dol_sanitizeFileName($num);
$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
$sql .= " SET ref = '".$this->db->escape($num)."',";

2
htdocs/commande/class/commande.class.php
View File

@ -384,7 +384,7 @@ class Commande extends CommonOrder
{
$num = $this->ref;
}
$this->newref = $num;
$this->newref = dol_sanitizeFileName($num);
// Validate
$sql = "UPDATE ".MAIN_DB_PREFIX."commande";

4
htdocs/compta/facture/class/api_invoices.class.php
View File

@ -104,9 +104,9 @@ class Invoices extends DolibarrApi
}
/**
* Get properties of an order object
* Get properties of an invoice object
*
* Return an array with order informations
* Return an array with invoice informations
*
* @param int $id ID of order
* @param string $ref Ref of object

2
htdocs/compta/facture/class/facture.class.php
View File

@ -2530,7 +2530,7 @@ class Facture extends CommonInvoice
{
$num = $this->ref;
}
$this->newref = $num;
$this->newref = dol_sanitizeFileName($num);
if ($num)
{

6
htdocs/compta/facture/invoicetemplate_list.php
View File

@ -536,21 +536,21 @@ if ($resql)
}
if (!empty($arrayfields['f.total']['checked']))
{
print '<td class="right">'.price($objp->total).'</td>'."\n";
print '<td class="nowrap right">'.price($objp->total).'</td>'."\n";
if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total';
$totalarray['val']['f.total'] += $objp->total;
}
if (!empty($arrayfields['f.tva']['checked']))
{
print '<td class="right">'.price($objp->total_vat).'</td>'."\n";
print '<td class="nowrap right">'.price($objp->total_vat).'</td>'."\n";
if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.tva';
$totalarray['val']['f.tva'] += $objp->total_vat;
}
if (!empty($arrayfields['f.total_ttc']['checked']))
{
print '<td class="right">'.price($objp->total_ttc).'</td>'."\n";
print '<td class="nowrap right">'.price($objp->total_ttc).'</td>'."\n";
if (!$i) $totalarray['nbfield']++;
if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
$totalarray['val']['f.total_ttc'] += $objp->total_ttc;

2
htdocs/contrat/class/contrat.class.php
View File

@ -517,7 +517,7 @@ class Contrat extends CommonObject
{
$num = $this->ref;
}
$this->newref = $num;
$this->newref = dol_sanitizeFileName($num);
if ($num)
{

2
htdocs/expedition/class/expedition.class.php
View File

@ -697,7 +697,7 @@ class Expedition extends CommonObject
{
$numref = "EXP".$this->id;
}
$this->newref = $numref;
$this->newref = dol_sanitizeFileName($numref);
$now = dol_now();

2
htdocs/expensereport/class/expensereport.class.php
View File

@ -1163,7 +1163,7 @@ class ExpenseReport extends CommonObject
}
if (empty($num) || $num < 0) return -1;
$this->newref = $num;
$this->newref = dol_sanitizeFileName($num);
$this->db->begin();

2
htdocs/fichinter/class/fichinter.class.php
View File

@ -544,7 +544,7 @@ class Fichinter extends CommonObject
{
$num = $this->ref;
}
$this->newref = $num;
$this->newref = dol_sanitizeFileName($num);
$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
$sql .= " SET fk_statut = 1";

4
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -587,7 +587,7 @@ class CommandeFournisseur extends CommonOrder
{
$num = $this->ref;
}
$this->newref = $num;
$this->newref = dol_sanitizeFileName($num);
$sql = 'UPDATE '.MAIN_DB_PREFIX."commande_fournisseur";
$sql .= " SET ref='".$this->db->escape($num)."',";
@ -971,7 +971,7 @@ class CommandeFournisseur extends CommonOrder
{
$num = $this->ref;
}
$this->newref = $num;
$this->newref = dol_sanitizeFileName($num);
// Do we have to change status now ? (If double approval is required and first approval, we keep status to 1 = validated)
$movetoapprovestatus = true;

2
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -1413,7 +1413,7 @@ class FactureFournisseur extends CommonInvoice
{
$num = $this->ref;
}
$this->newref = $num;
$this->newref = dol_sanitizeFileName($num);
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
$sql .= " SET ref='".$num."', fk_statut = 1, fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'";

2
htdocs/holiday/class/holiday.class.php
View File

@ -716,7 +716,7 @@ class Holiday extends CommonObject
{
$num = $this->ref;
}
$this->newref = $num;
$this->newref = dol_sanitizeFileName($num);
// Update status
$sql = "UPDATE ".MAIN_DB_PREFIX."holiday SET";

2
htdocs/livraison/class/livraison.class.php
View File

@ -404,7 +404,7 @@ class Livraison extends CommonObject
{
$numref = $this->ref;
}
$this->newref = $numref;
$this->newref = dol_sanitizeFileName($numref);
// Test if is not already in valid status. If so, we stop to avoid decrementing the stock twice.
$sql = "SELECT ref";

2
htdocs/reception/class/reception.class.php
View File

@ -546,7 +546,7 @@ class Reception extends CommonObject
$numref = $this->ref;
}
$this->newref = $numref;
$this->newref = dol_sanitizeFileName($numref);
$now = dol_now();

2
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -1462,7 +1462,7 @@ class SupplierProposal extends CommonObject
{
$num = $this->ref;
}
$this->newref = $num;
$this->newref = dol_sanitizeFileName($num);
$sql = "UPDATE ".MAIN_DB_PREFIX."supplier_proposal";
$sql .= " SET ref = '".$this->db->escape($num)."',";