Commit Graph

238 Commits

Author SHA1 Message Date
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
Laurent Destailleur
492bdd4a0e Merge 2023-10-20 13:14:10 +02:00
noec764
4675a93fc8 FIX: Error handling for computed values on import (#24897)
* FIX: Error handling for computed values on import

* Fixing style errors.

---------

Co-authored-by: stickler-ci <support@stickler-ci.com>
2023-10-15 21:18:03 +02:00
Laurent Destailleur
7cdfe05862 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-04 14:20:48 +02:00
Laurent Destailleur
93c8a35ec1 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-04 14:19:13 +02:00
Noé Courtier
5d165fb726 FIX: Change $key into $tmpkey 2023-05-29 11:33:10 +02:00
Noé Courtier
b7419ff73f FIX: String was compared to an integer 2023-05-26 14:39:06 +02:00
Laurent Destailleur
f59987af77 Fix typo 2023-05-11 02:04:25 +02:00
Laurent Destailleur
2d17e77ff7 Fix warning 2023-05-01 17:29:54 +02:00
Laurent Destailleur
382f45ec14 Clean code 2023-04-30 03:36:02 +02:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +02:00
Laurent Destailleur
2742da2379 Prepare charset 2023-04-18 16:56:17 +02:00
Laurent Destailleur
a4a014cfd5 Clean libelle into label 2023-04-08 15:08:55 +02:00
Laurent Destailleur
5e97c92004 Merge pull request #23067 from Easya-Solutions/new-import-filter-entity
NEW filter on entity in import
2023-03-31 20:11:22 +02:00
Jyhere
79a0b78116 Fix array of field names passed to class/method when using a field with compute rule 2023-03-27 15:49:19 +02:00
FLIO
cd289ca8ac fix(qodana) fix function comment wrong return 2023-02-08 19:09:05 +01:00
VESSILLER
f3f840f7e8 NEW remove keys whose table element is the same as element in map list 2023-01-26 15:05:59 +01:00
lvessiller-opendsi
1e8dc90b41 Update modules_import.php 2023-01-20 10:39:02 +01:00
VESSILLER
e6606f3b36 NEW map table to element for get entity in import 2023-01-18 11:22:52 +01:00
Laurent Destailleur
57358b618b Clean code 2022-12-31 17:08:10 +01:00
Laurent Destailleur
0f763d2606 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-31 15:01:24 +01:00
Laurent Destailleur
1934db2dd1 Debug v17 2022-12-31 14:37:33 +01:00
Laurent Destailleur
ea42fc7605 Clean code, fix warnings 2022-12-30 18:43:43 +01:00
Florent Poinsaut
51ac803aee FIX #23227 Don't retrieve the last insert id during a tag link import 2022-12-14 18:06:12 +01:00
VESSILLER
483e9814f9 NEW filter on entity in import 2022-12-01 14:33:35 +01:00
Laurent Destailleur
8a70e0de72 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-21 04:03:20 +01:00
Laurent Destailleur
7c1eac9774 Fix sqli ->escape after ->escapeforlike 2022-11-21 03:58:22 +01:00
Laurent Destailleur
02df7643f2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-10-19 17:12:46 +02:00
Laurent Destailleur
06d94c9a97 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-10-19 17:11:32 +02:00
Laurent Destailleur
0d17026276 FIX Import contact when duplicate thirdparties
FIX Import of socialnetwork field
2022-10-19 16:19:22 +02:00
Laurent Destailleur
801af96fcd FIX Import contact when duplicate thirdparties
FIX Import of socialnetwork field
2022-10-19 16:09:02 +02:00
lmarcouiller
b753968c18 Fix : import module sim message + warnings 2022-09-28 12:27:20 +02:00
Laurent Destailleur
35d8320328 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-14 17:26:20 +02:00
Laurent Destailleur
34da698537 FIX Import in upgrade when using a socialnetwork field. 2022-09-14 16:01:45 +02:00
Faustin
f5adbf7983 scrutinizer on core/modules/import/import_xlsx.modules.php : array $where not always defined 2022-09-11 22:57:00 +02:00
Laurent Destailleur
62385cf529 Merge pull request #21928 from dolibit-ut/patch-455
Update import_xlsx.modules.php
2022-08-29 00:45:01 +02:00
UT from dolibit
527f8abe44 Update import_xlsx.modules.php
line 136  ->  $this->thirdpartyobject 
and all following
2022-08-27 14:13:46 +02:00
UT from dolibit
98665b528d Update import_csv.modules.php
line 118 ->  $this->thirdpartyobject
and all following
2022-08-27 14:11:01 +02:00
Laurent Destailleur
6e153b9b75 Debug import FIX #yogosha11618 2022-06-30 22:55:58 +02:00
Laurent Destailleur
c88ee425ad Merge pull request #21087 from Hystepik/develop#3
New : update in import for socialnetworks
2022-06-01 19:40:54 +02:00
lmarcouiller
69e8c1abe4 New : update in import for socialnetworks 2022-06-01 11:44:07 +02:00
lmarcouiller
d345957b84 Fix: import update on xlsx 2022-06-01 11:36:47 +02:00
Laurent Destailleur
21e5189e18 Add phpunit for num2Alpha 2022-05-31 18:17:43 +02:00
Laurent Destailleur
a253938db9 Better error message 2022-05-31 18:08:53 +02:00
Laurent Destailleur
0dda1d7e76 Merge pull request #20814 from atm-gauthier/NEW/develop_update_on_categorie_product_link_table
New/develop update on categorie product link table
2022-05-29 11:30:26 +02:00
Laurent Destailleur
271fb43bc6 FIX Import of fk_stcomm 2022-05-25 23:08:53 +02:00
lmarcouiller
b1481d8495 Fix : socialnetworks import in db 2022-05-25 16:05:02 +02:00
Lucas Marcouiller
adfee839d7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-21 19:19:02 +02:00
Lucas Marcouiller
c887f48dee fix in social import 2022-05-20 21:12:55 +02:00
Laurent Destailleur
6b88655213 Fix num_rows 2022-05-18 23:40:42 +02:00