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

Fix #28071 - New branch to fix bad merge (#28083)

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

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

* Qual: Introduce getDataToShowPhoto to prepare generic code

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

* Fix missing trans

* Fix langs

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

* Remove useless files in web templates

* Clean code

* Fix duplicate translation key

* Fix duplicate translation key

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

* Fix duplicate key

* Fix $object

* Debug v19

* WIP SMSing

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

* WIP EMAILINGS_SUPPORT_ALSO_SMS

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

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

* WIP SMSing

* Debug the "validate" feature

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

* Clean code

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

* Move rights->x->y into hasRight('x', 'y')

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

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

* Enhance rector to fix empty($user->rights->modulex->perm1)

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

* Fix template to use v19 dev rules

* Fix use v19 dev rules

* Fix phpunit

* Debug v19

* Clean code

* Use rector to convert user->rights into user->hasRight

* Clean code

* Use rector to convert user->rights into user->hasRight

* Use rector to convert user->rights into user->hasRight

* Clean code

* Fix phpcs

* add editorconfig for sql files (#27999)

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* add model_pdf field in llx_ticket-ticket.sql (#27996)

* add model_pdf field in llx_ticket-ticket.sql

* Update 19.0.0-20.0.0.sql

* Update 19.0.0-20.0.0.sql

* Improve wording in README (#27994)

* fix phpstan (#27989)

* fix phpstan

* Update UserRightsToFunction.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Qual: Fix spelling/working in datapolicy translations (#28006)

# Qual: Fix spelling/wording in datapolicy translations

Fixed some spelling and wording in datapolicy translations.

* qual: phpstan for htdocs/ticket/class/ticketstats.class.php (#27986)

htdocs/ticket/class/ticketstats.class.php	98	Parameter #1 $year (string) of method TicketStats::getNbByMonth() should be compatible with parameter $year (int) of method Stats::getNbByMonth()

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

* Fix user with readonly perm on email template must be able to read.

* Fix doc

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

* Better message

* Add missing fields in merge of thirdparty

* Debug v19 selection of ticket printer per terminal

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

* Use constant

* NEW: Adding a recipient on emails sent, change status to sent partialy.

* fix travis (#28052)

* fix travis

* Update partnership.class.php

* fix php doc (#28047)

* fix undefined array key (#28048)

* Add region and departament for Cuba (#28046)

* Update llx_10_c_regions.sql

Add Cuba Regions (id_country=77)

* Update llx_20_c_departements.sql

Add Provinces Cuba (id country=77)

* Find the typo (#28050)

* Find the typo

* clean code

* add last_main_doc field to product (#28045)

* add las_main_doc field to product

* add field fetch

* NEW Add Categorie filter for ActionComm (#28041)

* New Add Categorie filter for ActionComm

New Add Categorie filter for ActionComm

* Fix space errors

Fix space errors

* Fix space errors 2

Fix space errors 2

* Update cunits.class.php (#28056)

FIX: error SQL when creating a Cunit

* Update codespell-lines-ignore.txt to avoid PR merge conflict

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: thibdrev <thibault.drevet@gmail.com>
Co-authored-by: sonikf <93765174+sonikf@users.noreply.github.com>
Co-authored-by: Ikarus <44511582+LeKarSol@users.noreply.github.com>
Co-authored-by: Anthony Damhet <73399671+EchoLoGeek@users.noreply.github.com>
Co-authored-by: Quentin-Seekness <72733832+Quentin-Seekness@users.noreply.github.com>
This commit is contained in:
MDW
2024-02-09 15:58:49 +01:00
committed by GitHub
parent 275dbca5fa
commit 7b54824d49
523 changed files with 2895 additions and 7653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
htdocs/reception/class/api_receptions.class.php
View File

@@ -63,7 +63,7 @@ class Receptions extends DolibarrApi
*/
public function get($id)
{
if (!DolibarrApiAccess::$user->rights->reception->lire) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'lire')) {
throw new RestException(403);
}
@@ -100,7 +100,7 @@ class Receptions extends DolibarrApi
*/
public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '', $properties = '')
{
if (!DolibarrApiAccess::$user->rights->reception->lire) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'lire')) {
throw new RestException(403);
}
@@ -111,7 +111,7 @@ class Receptions extends DolibarrApi
// If the internal user must only see his customers, force searching by him
$search_sale = 0;
if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
if (!DolibarrApiAccess::$user->hasRight('societe', 'client', 'voir') && !$socids) {
$search_sale = DolibarrApiAccess::$user->id;
}
@@ -179,7 +179,7 @@ class Receptions extends DolibarrApi
*/
public function post($request_data = null)
{
if (!DolibarrApiAccess::$user->rights->reception->creer) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'creer')) {
throw new RestException(401, "Insuffisant rights");
}
// Check mandatory fields
@@ -221,16 +221,16 @@ class Receptions extends DolibarrApi
/*
public function getLines($id)
{
if(! DolibarrApiAccess::$user->rights->reception->lire) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'lire')) {
throw new RestException(403);
}
$result = $this->reception->fetch($id);
if( ! $result ) {
if (! $result) {
throw new RestException(404, 'Reception not found');
}
if( ! DolibarrApi::_checkAccessToResource('reception',$this->reception->id)) {
if (!DolibarrApi::_checkAccessToResource('reception',$this->reception->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
$this->reception->getLinesArray();
@@ -255,16 +255,16 @@ class Receptions extends DolibarrApi
/*
public function postLine($id, $request_data = null)
{
if(! DolibarrApiAccess::$user->rights->reception->creer) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'creer')) {
throw new RestException(403);
}
$result = $this->reception->fetch($id);
if ( ! $result ) {
if (! $result) {
throw new RestException(404, 'Reception not found');
}
if( ! DolibarrApi::_checkAccessToResource('reception',$this->reception->id)) {
if (!DolibarrApi::_checkAccessToResource('reception',$this->reception->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
@@ -323,16 +323,16 @@ class Receptions extends DolibarrApi
/*
public function putLine($id, $lineid, $request_data = null)
{
if (! DolibarrApiAccess::$user->rights->reception->creer) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'creer')) {
throw new RestException(403);
}
$result = $this->reception->fetch($id);
if ( ! $result ) {
if (! $result) {
throw new RestException(404, 'Reception not found');
}
if( ! DolibarrApi::_checkAccessToResource('reception',$this->reception->id)) {
if (!DolibarrApi::_checkAccessToResource('reception',$this->reception->id)) {
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
@@ -388,7 +388,7 @@ class Receptions extends DolibarrApi
*/
public function deleteLine($id, $lineid)
{
if (!DolibarrApiAccess::$user->rights->reception->creer) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'creer')) {
throw new RestException(403);
}
@@ -425,7 +425,7 @@ class Receptions extends DolibarrApi
*/
public function put($id, $request_data = null)
{
if (!DolibarrApiAccess::$user->rights->reception->creer) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'creer')) {
throw new RestException(403);
}
@@ -465,7 +465,7 @@ class Receptions extends DolibarrApi
*/
public function delete($id)
{
if (!DolibarrApiAccess::$user->rights->reception->supprimer) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'supprimer')) {
throw new RestException(403);
}
$result = $this->reception->fetch($id);
@@ -510,7 +510,7 @@ class Receptions extends DolibarrApi
*/
public function validate($id, $notrigger = 0)
{
if (!DolibarrApiAccess::$user->rights->reception->creer) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'creer')) {
throw new RestException(403);
}
$result = $this->reception->fetch($id);
@@ -556,19 +556,19 @@ class Receptions extends DolibarrApi
public function setinvoiced($id)
{
if(! DolibarrApiAccess::$user->rights->reception->creer) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'creer')) {
throw new RestException(403);
}
if(empty($id)) {
if (empty($id)) {
throw new RestException(400, 'Reception ID is mandatory');
}
$result = $this->reception->fetch($id);
if( ! $result ) {
if (!$result) {
throw new RestException(404, 'Reception not found');
}
$result = $this->reception->classifyBilled(DolibarrApiAccess::$user);
if( $result < 0) {
if ($result < 0) {
throw new RestException(400, $this->reception->error);
}
return $result;
@@ -595,19 +595,19 @@ class Receptions extends DolibarrApi
require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
if(! DolibarrApiAccess::$user->rights->reception->lire) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'lire')) {
throw new RestException(403);
}
if(! DolibarrApiAccess::$user->rights->reception->creer) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'creer')) {
throw new RestException(403);
}
if(empty($proposalid)) {
if (empty($proposalid)) {
throw new RestException(400, 'Order ID is mandatory');
}
$order = new Commande($this->db);
$result = $order->fetch($proposalid);
if( ! $result ) {
if (!$result) {
throw new RestException(404, 'Order not found');
}
@@ -632,7 +632,7 @@ class Receptions extends DolibarrApi
*/
public function close($id, $notrigger = 0)
{
if (!DolibarrApiAccess::$user->rights->reception->creer) {
if (!DolibarrApiAccess::$user->hasRight('reception', 'creer')) {
throw new RestException(403);
}