Commit Graph

6370 Commits

Author SHA1 Message Date
Maxime Kohlhaas
266a4b2891 Fix scrutinizer 2022-05-22 00:36:53 +02:00
Laurent Destailleur
9fd6d4bb1e
Merge pull request #20874 from Hystepik/develop#3
New : import fields in societe class
2022-05-21 22:50:36 +02:00
Lucas Marcouiller
adfee839d7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-21 19:19:02 +02:00
Laurent Destailleur
d38b9187f3
Merge branch 'develop' into dev_new_add_ref_clinet_intervention 2022-05-21 10:48:09 +02:00
Laurent Destailleur
305798906b
Merge pull request #20928 from Hystepik/develop#7
Fix : bug import societe with null status
2022-05-21 00:33:31 +02:00
Laurent Destailleur
d9dbfd063b Debug v16 2022-05-20 23:34:58 +02:00
Laurent Destailleur
ee6131612a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
2022-05-20 23:28:01 +02:00
Lucas Marcouiller
98af6f8606 Fix : import on societe with null status 2022-05-20 22:01:39 +02:00
Lucas Marcouiller
c887f48dee fix in social import 2022-05-20 21:12:55 +02:00
Laurent Destailleur
168d1d4334
Merge pull request #20890 from Hystepik/develop#1
Fix : php 8.0 warnings
2022-05-20 19:41:20 +02:00
Florian HENRY
8af848c539 add Ref client in PDF and send to propal on create 2022-05-20 10:40:59 +02:00
Laurent Destailleur
4b996f79a9 Debug v16 2022-05-19 13:52:29 +02:00
Laurent Destailleur
d0db89faf9 debug 2022-05-19 12:02:04 +02:00
Laurent Destailleur
e5cda0b80e Debug v16 2022-05-19 11:55:14 +02:00
Laurent Destailleur
5f9ef61d32 Debug v16 2022-05-19 09:36:47 +02:00
Laurent Destailleur
d38697d74b Missing data in resource module 2022-05-19 08:46:50 +02:00
Laurent Destailleur
6b88655213 Fix num_rows 2022-05-18 23:40:42 +02:00
Laurent Destailleur
8c14f42d60 phpcs 2022-05-18 13:09:17 +02:00
Laurent Destailleur
308e7a3d9b Fix scrutinizer 2022-05-18 12:40:44 +02:00
lmarcouiller
cf2c46b583 Fix : php 8.0 warnings 2022-05-18 12:31:09 +02:00
Laurent Destailleur
48cb30bd9b Fix scrutinizer 2022-05-18 11:34:54 +02:00
Laurent Destailleur
177e8c17fb Fix scrutinizer 2022-05-18 11:23:21 +02:00
Laurent Destailleur
ed2e1bda46 Clean code v16 2022-05-18 11:00:43 +02:00
lmarcouiller
7e4070faa5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-18 10:31:56 +02:00
lvessiller
978db41f37 FIX qty received label in Squille PDF model 2022-05-17 15:50:45 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
lmarcouiller
23da46938a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#3 2022-05-17 10:15:35 +02:00
Laurent Destailleur
37f7fed003 Maxi debug of export profiles for v16 2022-05-17 00:51:47 +02:00
lmarcouiller
1e406276c5 New : import fields in societe class 2022-05-13 15:04:30 +02:00
Laurent Destailleur
43e7da685b NEW Add more fields to detect duplicate for import of thirdparties 2022-05-12 02:19:31 +02:00
Laurent Destailleur
9ec23c7073 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 02:02:36 +02:00
Laurent Destailleur
a261b05866
Merge pull request #20825 from Easya-Solutions/fix-incoterms-dictionary-table-name
FIX dictionary table name in incoterms for Debug v16
2022-05-12 02:02:20 +02:00
Laurent Destailleur
7f1e8384dc Clean code 2022-05-12 02:02:04 +02:00
lvessiller
aed0296ae2 FIX dictionary table name in incoterms for Debug v16 2022-05-11 11:08:53 +02:00
lvessiller
cdf9b89c0a FIX dictionary table for Debug v16 2022-05-11 10:51:43 +02:00
Laurent Destailleur
3a5fe5063d Debug v16 2022-05-10 16:19:00 +02:00
Laurent Destailleur
fea6771a7a Module Partnership is stable 2022-05-10 15:57:52 +02:00
Laurent Destailleur
d0c95d87af Debug v16 2022-05-09 18:59:11 +02:00
Laurent Destailleur
779b75bf65 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
2022-05-09 16:53:53 +02:00
Laurent Destailleur
b3b6337c4c
Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
30597d7f89
Merge pull request #18163 from FHenry/dev_new_project_upgrade_external_user_perms_project
NEW: Separate read-only and adding time on projects
2022-05-08 19:50:46 +02:00
Laurent Destailleur
90c95bc638
Merge pull request #20610 from hregis/fix_missng_signature_library
FIX missing signature library when ODT model is used
2022-05-08 19:36:06 +02:00
Laurent Destailleur
f52a7a26f6 Debug v16 - Fix for postgresql - Fix for sql loading per module - php8 2022-05-08 15:18:34 +02:00
Florian HENRY
9192596ec3 merge 2022-05-06 11:17:29 +02:00
Florian HENRY
a54c0fb247 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project 2022-05-06 11:13:44 +02:00
Laurent Destailleur
f256207cd5 Save logs 2022-05-03 23:54:40 +02:00
Laurent Destailleur
51e9a7c251 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
2022-05-03 13:05:51 +02:00
Laurent Destailleur
9f379dfcf4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/core/modules/modCashDesk.class.php
	htdocs/debugbar/class/DataCollector/DolLogsCollector.php
	htdocs/langs/en_US/admin.lang
2022-05-03 12:17:54 +02:00
Laurent Destailleur
affde55169 FIX deprecated module are not more viewed as external modules
Trans debugbar
2022-05-03 12:08:24 +02:00
Laurent Destailleur
6aa32e7c70 Retrograde intracommreport from experimental to dev 2022-05-02 20:21:58 +02:00