Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 18:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
119,046 Commits 36 Branches 190 Tags
37fcbc34b8590c6cec21fb5e204c593f510ec87c
Commit Graph

220 Commits

Author SHA1 Message Date
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
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
1934db2dd1 Debug v17 2022-12-31 14:37:33 +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
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
lmarcouiller
7e4070faa5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-18 10:31:56 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
lmarcouiller
1e406276c5 New : import fields in societe class 2022-05-13 15:04:30 +02:00
lmarcouiller
cfc8ce2ea8 Revert "New : import fields in societe class" 
This reverts commit 2ec2dc59a4.
 2022-05-13 15:02:17 +02:00
lmarcouiller
2ec2dc59a4 New : import fields in societe class 2022-05-13 14:55:21 +02:00
stickler-ci
98f5edbfba Fixing style errors. 2022-05-10 10:47:18 +00:00
Gauthier PC portable 024
74ba2d551a Merge branch 'NEW/update_on_categorie_product_link_table' of github.com:atm-gauthier/dolibarr into NEW/develop_update_on_categorie_product_link_table 2022-05-10 12:36:49 +02:00
Gauthier PC portable 024
08a3ef5bbf NEW : method avoid being blocked when entry already exists for import in llx_categorie_product (use update keys) 2022-05-10 12:25:38 +02:00
Laurent Destailleur
2690f4459f NEW Enhance the import. Can use 'auto' for the ref (import of orders) 2022-04-04 13:17:45 +02:00
Laurent Destailleur
5eb6ddd7b4 Merge 20374 and add some fix. Need to be restested. 2022-03-23 15:32:05 +01:00
Laurent Destailleur
2b7797fa75 Clean code 2022-03-23 15:02:45 +01:00
Laurent Destailleur
279a8c9df5 Code comment 2022-03-23 14:39:10 +01:00
lvessiller
566bced9dc FIX escape values and find indexed columns by key 2022-03-18 08:53:54 +01:00
lvessiller
6d6e6ff70c NEW clean values and amount in FEC import 2022-03-16 10:49:16 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2022-02-18 21:50:08 +01:00
lvessiller
1107a60b58 FIX compute rule in FEC import 2022-02-18 16:53:55 +01:00
Laurent Destailleur
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2021-10-28 11:05:38 +02:00
Laurent Destailleur
41bba0e879 Fix import of members 2021-10-28 00:12:41 +02:00