Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-29 04:03:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
129,525 Commits 38 Branches 191 Tags
b1492818f61ba4e9ee97eed24ae827e69c8d64fc
Commit Graph

231 Commits

Author SHA1 Message Date
Laurent Destailleur (aka Eldy)
1f360ca498 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-01-20 12:28:49 +01:00
Laurent Destailleur (aka Eldy)
1b42078d1e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2025-01-20 10:24:30 +01:00
atm-florian
ba4e97f07b FIX 17.0 API endpoints "PUT": prevent overwriting all extrafields if only some are supplied in the request cf. PR #29237 
+ security for Tickets API: disable updating rowid
 2025-01-16 10:37:29 +01:00
Laurent Destailleur
e9f7a1996f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-05-03 18:18:39 +02:00
Laurent Destailleur
4fef808efa Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-05-03 18:16:58 +02:00
Florian Mortgat
cf6cbafa8c FIX: PUT /thirdparties/{id} and PUT /contacts/{id} should throw exception if update returns < 0 (#29596) 
+ FIX some PHPDoc (types and throws)
+ FIX issue #29594: trigger should be called on contact update by API
 2024-05-03 18:03:14 +02:00
Laurent Destailleur
16e5d08b36 FIX #yogosha21416 2024-03-14 23:40:46 +01:00
Laurent Destailleur
d92c65ad91 FIX infinite loop in API call/trigger by adding a caller 2023-12-15 12:15:33 +01:00
Frédéric FRANCE
91d8758e52 fix phpstan 2023-12-02 22:28:04 +01:00
matthieu-michou-wattandsea
71a1c6a497 Update api_thirdparties.class.php 
fix API REST changed POST to PUT in thirdparties addCategory
 2023-12-02 10:30:01 +01:00
Laurent Destailleur
3a78357253 Try an implementation a fix to avoid infinite loop in sync api - trigger 2023-11-29 16:20:37 +01:00
Pascal Hubrecht
f1e384cc51 FIX #26881 (#26883) 2023-11-28 11:30:48 +01:00
Laurent Destailleur
075ee02901 Fix php8.2 warnings 2023-11-27 12:08:48 +01:00
Alexandre Janniaux
c3b3840f08 QUAL Refactor merging companies and fix #26272 with Reception objects (#26320) 
* societe: add missing model_pdf field

The field is used by the class but wasn't declared.

* societe: expose Societe::mergeCompany

The code is directly copied from societe/card.php with as less changes
as possible.

The original code came from deb91ad7c1.

* societe: remove fields from property copy

$phone_pro and $fk_project are not existing for societe. This was added
from deb91ad7c1.

* SocieteTest: test the merge functionality

This test is a simple smoke test to check that the mergeCompany() will
work correctly on simple case and actually merge the details of the
company.

More complex deduplication pattern with objects referencing the deleted
Societe object, will be written for each of the different object class
in their respective test file.

* societe: card: use the new mergeCompany function

Since the code is almost the same, there should be no differences in
behaviour right now.

* societe: api_thirdparties: use Societe::mergeCompany()

* societe: fix issue when merging companies

When a Societe object is merged against another, its related objects are
supposed to reference the new Societe object so that the databse doesn't
raise foreign key errors.

The list references the objects that need to be transformed, and
Reception objects weren't part of this list.

Fix #26272

* ReceptionTest: check company merge hook

Before a Societe object is destroyed from the database, every object
referencing the FK should be destroyed or should reference another
object.

In the case of two companies being merged, the case arises and Reception
objects need to be moved to the new company. This commit brings a
non-regression test for this case.

Refs #26272

* Update societe.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-26 16:30:38 +02:00
Laurent Destailleur
b8c8e903c2 Fix php8.2 warnings 2023-10-15 18:39:13 +02:00
pascal
80f060c771 fix tab indentation 2023-09-26 18:43:25 +02:00
pascal
871f896962 implementation of properties filter 2023-09-26 18:04:48 +02:00
Laurent Destailleur
b49c326824 Clean deprecated code on old fields skype, twitter, ... 2023-08-26 10:57:49 +02:00
Laurent Destailleur
c1b0f187bc Fix warnings 2023-08-06 13:02:33 +02:00
Frédéric France
ebf83fdab6 use user hasRight 2023-06-19 23:18:13 +02:00
Laurent Destailleur
31474d80f1 Doxygen 2023-06-19 00:52:43 +02:00
Laurent Destailleur
ebfe632efe Debug v18 2023-06-03 15:33:46 +02:00
Laurent Destailleur
10a58e5513 Fix phpdoc 2023-05-02 03:48:21 +02:00
Laurent Destailleur
5d23fd0956 Fix warnings 2023-05-02 03:38:57 +02:00
Laurent Destailleur
382f45ec14 Clean code 2023-04-30 03:36:02 +02:00
Frédéric FRANCE
fa849696fb use isModEnabled 2023-04-18 20:16:02 +02:00
Laurent Destailleur
ed5c890769 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-02-25 20:12:48 +01:00
Laurent Destailleur
cbb6ca071a Fix #yogosha15157 2023-02-25 19:51:05 +01:00
FLIO
0080b0a80f fix (qodana) fix condlicts 2023-02-01 23:38:49 +01:00
Laurent Destailleur
2a0a0fc470 Clean old deprecated code on social networks fields 2023-01-30 14:13:02 +01:00
FLIO
c4521efa57 fix(qodana) fix function comment bad return 2023-01-23 16:31:14 +01:00
Laurent Destailleur
a33603b6ae Doxygen 2023-01-18 23:58:26 +01:00
Christian Humpel
c24a958fc8 Fix_#23239_API_Filter_for_ExtraFields 2022-12-15 20:34:23 +01:00
Laurent Destailleur
c22d9f282a Merge pull request #23016 from inovea-conseil/FIX_product_type9 
FIX product_type 9
 2022-11-30 00:41:35 +01:00
Laurent Destailleur
7884216197 Merge pull request #23003 from rycks/14_fix_api_status_on_delete 
fix #22766: better API response HTTP code
 2022-11-26 10:26:21 +01:00
stickler-ci
3fd81293a3 Fixing style errors. 2022-11-25 23:57:35 +00:00
Eric Seigne
616e2b79ef fix #22766: better API response HTTP code 2022-11-26 00:50:45 +01:00
Laurent Destailleur
4c02652d87 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-23 12:07:42 +01:00
Laurent Destailleur
207f56ff64 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-11-23 12:06:21 +01:00
Laurent Destailleur
2f0880020c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-11-23 12:02:25 +01:00
Laurent Destailleur
c9930ee6ce Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-11-23 11:58:46 +01:00
Laurent Destailleur
a59bdfba0c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-11-23 00:00:47 +01:00
Laurent Destailleur
2c1571c514 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2022-11-22 22:05:33 +01:00
Maxime Kohlhaas
7be0e0da1c Fix API right check 2022-11-22 13:46:42 +01:00
Laurent Destailleur
41a07f5e7d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-29 12:51:51 +02:00
Laurent Destailleur
064f3dd209 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-10-24 19:11:59 +02:00
Maxime Kohlhaas
39934a9a81 Fix scrutinizer api_thirdparties.class.php 5 issues 2022-10-23 11:19:23 +02:00
Philippe GRAND
e10abd95f1 update code toward php8 compliance 2022-09-24 14:56:50 +02:00
Philippe GRAND
1b5465d7d0 update code toward php8 compliance 2022-09-10 11:19:54 +02:00
Philippe GRAND
1485e3bd79 update code toward php8 compliance 2022-09-10 11:10:33 +02:00