Commit Graph

1946 Commits

Author SHA1 Message Date
Laurent Destailleur
481fec5291 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-05-21 20:12:45 +02:00
Laurent Destailleur
5b35b2be30 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-05-21 20:05:41 +02:00
lvessiller-opendsi
c4ad5e06f2 FIX back to page on error in contact card (#29627) 2024-05-07 21:28:58 +02:00
Laurent Destailleur
98fc9ffe14 fix tab 2024-05-03 19:21:47 +02: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
8474360271 FIX: contact/address title is always "New Contact/Address" even if the contact/address already exists (#29581) 2024-05-03 13:10:36 +02:00
Laurent Destailleur
1b0f4b542f Fix file not found 2024-05-02 20:55:08 +02:00
Laurent Destailleur
6303bceecd Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-22 14:19:59 +02:00
Laurent Destailleur
c454729f90 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-22 14:19:30 +02:00
lvessiller-opendsi
483c137535 FIX not redirtect when error occurs on updating card (#29388) 2024-04-18 13:11:12 +01:00
Laurent Destailleur
fedbc0f08e Fix use of not existing object 2024-02-02 12:51:11 +01:00
Laurent Destailleur
ba95db0175 Fix use of socid 2024-02-02 12:44:47 +01:00
Laurent Destailleur
cca01cbda4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-23 22:15:36 +01:00
Laurent Destailleur
b05d1c5f6e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-23 22:03:28 +01:00
Laurent Destailleur
9d40711723 Fix type of prospect level 2024-01-19 16:25:46 +01:00
Florian HENRY
5eecee1102 FIX: filter by entity on contact is missing 2024-01-19 09:22:12 +01:00
Laurent Destailleur
e770259b3f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-10 15:12:50 +01:00
Laurent Destailleur
f3911bccc8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-10 15:11:40 +01:00
MDW
834a7a078a Fix: vcard - add missing db argument in call to dol_print_error
# Fix: vcard - add missing db argument in call to dol_print_error

The first argument is the DoliDB object
2024-01-08 18:21:37 +01:00
Laurent Destailleur
b28ae5d8d3 Clean code 2023-12-27 12:12:20 +01:00
Laurent Destailleur
63c38da901 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-21 19:44:25 +01:00
Laurent Destailleur
5c6c5853ab Clean code 2023-12-21 15:27:13 +01:00
Laurent Destailleur
a767028464 Clean code 2023-12-20 21:35:23 +01:00
Laurent Destailleur
1f738e5a7b Clean code 2023-12-19 17:46:39 +01:00
Laurent Destailleur
7f5df80efd Debug v19 2023-12-19 11:51:48 +01:00
Regis Houssin
70e01178a9 FIX uniformization to use "intervention" 2023-12-18 09:27:52 +01:00
Laurent Destailleur
fb083a6cfc Fix warning with rector 2023-12-13 16:33:17 +01:00
Frédéric FRANCE
61b79fda17 avoid phpstan error with phpdoc 2023-12-06 15:46:39 +01:00
Laurent Destailleur
ba10d60a0b Fix with php-cs-fixer 2023-12-04 12:02:35 +01:00
Frédéric FRANCE
53c8a3acf8 clean phpdoc for phpstan (#26905) 2023-12-01 19:51:32 +01:00
Laurent Destailleur
56e8872ddc Clean code+warnings: The delete() method of AdherentType, Contact,
Delivery, MultiCurrency, CurrencyRate now need $user as first parameter.
2023-11-28 15:33:42 +01:00
Laurent Destailleur
53dab922fd Fix php8.2 warnings 2023-11-27 11:39:32 +01:00
Laurent Destailleur
e211c0e334 Clean code 2023-11-21 23:59:58 +01:00
Laurent Destailleur
a0bba05b02 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/class/api_orders.class.php
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/class/api_supplier_orders.class.php
	htdocs/fourn/class/fournisseur.facture-rec.class.php
	htdocs/langs/en_US/stocks.lang
2023-11-17 18:24:53 +01:00
Laurent Destailleur
9464c0a040 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-14 02:27:24 +01:00
Laurent Destailleur
c81f7a01d1 FIX #26518 2023-11-14 02:26:33 +01:00
Laurent Destailleur
a318031034 QUAL Standardize code. Renamed ID of user properties into ->user_xxx_id 2023-10-24 11:37:29 +02:00
Laurent Destailleur
1950669a24 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-24 03:23:37 +02:00
Laurent Destailleur
1734adfd27 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-24 03:05:46 +02:00
Alexandre SPANGARO
8da9a5e4bc PHP 8.1 #26307 - Fix warning (#26313) 2023-10-23 19:21:54 +02:00
MDW
e036e32caa qual Annotation/initialisation fixes (#26318) 2023-10-23 19:19:10 +02:00
Laurent Destailleur
0ec22fb228 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-20 13:32:13 +02:00
HENRY Florian
d23550c170 fix: Contact prospection fields are visible in contact list even if THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES is not set (#26295)
* fix: Contact prospection fields are visible in contact list even if THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES is not set

* fix: display of contact prospection filed in card
2023-10-20 13:08:39 +02:00
Laurent Destailleur
2cfa9f8290 Debug v19 2023-10-17 15:43:56 +02:00
Laurent Destailleur
1f38e54e78 Clean code 2023-10-15 15:32:35 +02:00
Christophe Battarel
3a9db24c2c NEW : TakePOS - add constant to choose contact instead of customer (#24807)
* add constant to choose contact instead of customer in TakePOS

* fix conflict

* fix

* check perm

* fix phpcs

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-13 16:19:10 +02:00
Laurent Destailleur
c32fe8dc5f QUAL: Use dol_clone with parameter 2 for ->oldcopy 2023-10-11 19:10:24 +02:00
Laurent Destailleur
39b6b34820 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2023-10-09 09:36:30 +02:00
Laurent Destailleur
ffbb05167a Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-09 09:28:51 +02:00