Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/develop' into camelCaps

Browse Source
This commit is contained in:
Frédéric FRANCE
2018-08-21 20:57:58 +02:00
parent d68f176e7e db3c17668e
commit 6b6daf178f
216 changed files with 1840 additions and 818 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ class Shipments extends DolibarrApi
static $FIELDS = array(
'socid',
'origin_id',
'origin_type'
'origin_type',
);
/**
@@ -99,7 +99,8 @@ class Shipments extends DolibarrApi
*
* @throws RestException
*/
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '') {
function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
{
global $db, $conf;
$obj_ret = array();
@@ -217,7 +218,8 @@ class Shipments extends DolibarrApi
* @return int
*/
/*
function getLines($id) {
function getLines($id)
{
if(! DolibarrApiAccess::$user->rights->expedition->lire) {
throw new RestException(401);
}
@@ -250,7 +252,8 @@ class Shipments extends DolibarrApi
* @return int
*/
/*
function postLine($id, $request_data = null) {
function postLine($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->expedition->creer) {
throw new RestException(401);
}
@@ -312,7 +315,8 @@ class Shipments extends DolibarrApi
* @return object
*/
/*
function putLine($id, $lineid, $request_data = null) {
function putLine($id, $lineid, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->expedition->creer) {
throw new RestException(401);
}
@@ -372,7 +376,8 @@ class Shipments extends DolibarrApi
* @throws 401
* @throws 404
*/
function deleteLine($id, $lineid) {
function deleteLine($id, $lineid)
{
if(! DolibarrApiAccess::$user->rights->expedition->creer) {
throw new RestException(401);
}
@@ -407,7 +412,8 @@ class Shipments extends DolibarrApi
*
* @return int
*/
function put($id, $request_data = null) {
function put($id, $request_data = null)
{
if (! DolibarrApiAccess::$user->rights->expedition->creer) {
throw new RestException(401);
}
@@ -537,7 +543,8 @@ class Shipments extends DolibarrApi
* @throws 404
* @throws 405
*/
/* function setinvoiced($id) {
/* function setinvoiced($id)
{
if(! DolibarrApiAccess::$user->rights->expedition->creer) {
throw new RestException(401);
@@ -573,7 +580,8 @@ class Shipments extends DolibarrApi
* @throws 405
*/
/*
function createShipmentFromOrder($orderid) {
function createShipmentFromOrder($orderid)
{
require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
@@ -608,7 +616,8 @@ class Shipments extends DolibarrApi
* @param object $object Object to clean
* @return array Array of cleaned object properties
*/
function _cleanObjectDatas($object) {
function _cleanObjectDatas($object)
{
$object = parent::_cleanObjectDatas($object);