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-10-31 04:26:23 +01:00
commit f53483f983
28 changed files with 55 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/api/class/api_documents.class.php
View File

@ -474,15 +474,13 @@ class Documents extends DolibarrApi
}
$upload_dir = $conf->categorie->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'category').$object->id."/photos/".dol_sanitizeFileName($object->ref);
}
else
{
} else {
throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
}
$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
if (empty($filearray)) {
throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(!empty($object->Ref) ? ' or Ref '.$object->ref : '').' does not return any document.');
throw new RestException(404, 'Search for modulepart '.$modulepart.' with Id '.$object->id.(!empty($object->ref) ? ' or Ref '.$object->ref : '').' does not return any document.');
}
return $filearray;

4
htdocs/bom/class/api_boms.class.php
View File

@ -270,8 +270,8 @@ class Boms extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

2
htdocs/categories/class/api_categories.class.php
View File

@ -658,7 +658,7 @@ class Categories extends DolibarrApi
* Clean sensible object datas
*
* @param Categorie $object Object to clean
* @return array Array of cleaned object properties
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/comm/action/class/api_agendaevents.class.php
View File

@ -327,8 +327,8 @@ class AgendaEvents extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

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

@ -846,8 +846,8 @@ class Proposals extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/commande/class/api_orders.class.php
View File

@ -950,8 +950,8 @@ class Orders extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/compta/bank/class/api_bankaccounts.class.php
View File

@ -391,8 +391,8 @@ class BankAccounts extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

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

@ -1643,8 +1643,8 @@ class Invoices extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/contrat/class/api_contracts.class.php
View File

@ -633,8 +633,8 @@ class Contracts extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

6
htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
View File

@ -368,8 +368,8 @@ function zapierPostWebhook($url, $json)
/**
* Clean sensible object datas
*
* @param object $toclean Object to clean
* @return array Array of cleaned object properties
* @param Object $toclean Object to clean
* @return Object Object with cleaned properties
*/
function cleanObjectDatas($toclean)
{
@ -454,7 +454,7 @@ function cleanObjectDatas($toclean)
* Clean sensible object datas
*
* @param object $toclean Object to clean
* @return array Array of cleaned object properties
* @return Object Object with cleaned properties
*/
function cleanAgendaEventsDatas($toclean)
{

4
htdocs/don/class/api_donations.class.php
View File

@ -327,8 +327,8 @@ class Donations extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/expedition/class/api_shipments.class.php
View File

@ -610,8 +610,8 @@ class Shipments extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/expensereport/class/api_expensereports.class.php
View File

@ -494,8 +494,8 @@ class ExpenseReports extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/fichinter/class/api_interventions.class.php
View File

@ -420,8 +420,8 @@ class Interventions extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/fourn/class/api_supplier_invoices.class.php
View File

@ -677,8 +677,8 @@ class SupplierInvoices extends DolibarrApi
/**
* Clean sensible object datas
*
* @param Object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/fourn/class/api_supplier_orders.class.php
View File

@ -339,8 +339,8 @@ class SupplierOrders extends DolibarrApi
/**
* Clean sensible object datas
*
* @param Object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/modulebuilder/template/class/api_mymodule.class.php
View File

@ -290,8 +290,8 @@ class MyModuleApi extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/mrp/class/api_mos.class.php
View File

@ -270,8 +270,8 @@ class Mos extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/product/class/api_products.class.php
View File

@ -1740,8 +1740,8 @@ class Products extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/product/stock/class/api_stockmovements.class.php
View File

@ -276,8 +276,8 @@ class StockMovements extends DolibarrApi
/**
* Clean sensible object datas
*
* @param MouvementStock $object Object to clean
* @return array Array of cleaned object properties
* @param MouvementStock $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/product/stock/class/api_warehouses.class.php
View File

@ -255,8 +255,8 @@ class Warehouses extends DolibarrApi
/**
* Clean sensible object datas
*
* @param Entrepot $object Object to clean
* @return array Array of cleaned object properties
* @param Entrepot $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/projet/class/api_projects.class.php
View File

@ -542,8 +542,8 @@ class Projects extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/projet/class/api_tasks.class.php
View File

@ -550,8 +550,8 @@ class Tasks extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

2
htdocs/societe/class/api_contacts.class.php
View File

@ -519,7 +519,7 @@ class Contacts extends DolibarrApi
* Clean sensible object datas
*
* @param Object $object Object to clean
* @return array Array of cleaned object properties
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

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

@ -1771,8 +1771,8 @@ class Thirdparties extends DolibarrApi
/**
* Clean sensible object datas
*
* @param Object $object Object to clean
* @return Object Object with cleaned properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/supplier_proposal/class/api_supplier_proposals.class.php
View File

@ -193,8 +193,8 @@ class Supplierproposals extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
protected function _cleanObjectDatas($object)
{

4
htdocs/ticket/class/api_tickets.class.php
View File

@ -487,8 +487,8 @@ class Tickets extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*
* @todo use an array for properties to clean
*

4
htdocs/zapier/class/api_zapier.class.php
View File

@ -335,8 +335,8 @@ class ZapierApi extends DolibarrApi
/**
* Clean sensible object datas
*
* @param object $object Object to clean
* @return array Array of cleaned object properties
* @param Object $object Object to clean
* @return Object Object with cleaned properties
*/
public function _cleanObjectDatas($object)
{