Commit Graph

101988 Commits

Author SHA1 Message Date
Administrator
2a9cd21b71 FIX: Travis Sanitize SQL 2021-10-28 14:14:25 +02:00
Administrator
44eedb8c6e FIX: Replenish: SQL error when no warehouse has been created + Warning when there are no warehouses 2021-10-28 12:58:14 +02:00
Laurent Destailleur
82a35f82b4 CSS 2021-10-28 11:33:22 +02:00
Laurent Destailleur
f033e91cb0 phpcs 2021-10-28 11:03:27 +02:00
Laurent Destailleur
41bba0e879 Fix import of members 2021-10-28 00:12:41 +02:00
Laurent Destailleur
5df25fece7 Trans and log 2021-10-27 11:15:26 +02:00
Frédéric FRANCE
dc15d09f12
remove duplicate code 2021-10-27 09:37:22 +02:00
Alexandre SPANGARO
9bfd5c4f41 Merge branch '14.0' into 14p23 2021-10-27 09:36:22 +02:00
Florian HENRY
46119c99a2 fix: warning dol_print_date setTimeStamp when time empty 2021-10-27 09:23:54 +02:00
Laurent Destailleur
f12c709ec1 Fix checkbox 2021-10-27 03:09:12 +02:00
Laurent Destailleur
e85548d470 Fix look and feel v14 2021-10-27 03:06:50 +02:00
Laurent Destailleur
637e8f44e6 Fix phpcs 2021-10-27 00:05:40 +02:00
Laurent Destailleur
19734c89d6 Fix css 2021-10-26 22:09:07 +02:00
Laurent Destailleur
4e844b4687 Fix phpcs 2021-10-26 20:45:00 +02:00
Florian HENRY
96f08082a2 fix: getFilterSelectQuery get correct table 2021-10-26 18:25:49 +02:00
stickler-ci
6fd08bc5ef Fixing style errors. 2021-10-26 14:56:56 +00:00
atm-greg
406089ef0c FIX restrictedArea for payment delete 2021-10-26 16:47:16 +02:00
Laurent Destailleur
7cd09eb649 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 16:34:25 +02:00
Laurent Destailleur
7393abea8f Fix phpcs 2021-10-26 14:42:26 +02:00
Laurent Destailleur
2436f0967b Fix translation of Nature of member in import. 2021-10-26 14:37:15 +02:00
Laurent Destailleur
fcdfd370ba Fix css 2021-10-26 14:31:55 +02:00
Florian HENRY
89ba133c61 fix: categorie display if none 2021-10-26 14:11:51 +02:00
Laurent Destailleur
da2ce063b3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/product/card.php
	htdocs/public/emailing/mailing-unsubscribe.php
2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
2021-10-26 13:29:47 +02:00
Laurent Destailleur
181991ee47 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-26 13:10:23 +02:00
Laurent Destailleur
d82cbf6636 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-26 13:09:15 +02:00
Laurent Destailleur
e87e354bd5 Fix: can't reset country of origin 2021-10-26 13:08:22 +02:00
Alexandre SPANGARO
a129e91198 Merge branch '14.0' into 14p23 2021-10-26 06:23:31 +02:00
Laurent Destailleur
cffee1df4b Fix phpcs 2021-10-25 22:09:21 +02:00
Laurent Destailleur
02f8ac4cbc Fix error phpunit 2021-10-25 21:49:25 +02:00
Frédéric FRANCE
1683f46d9b
backport fix 2021-10-25 21:21:48 +02:00
Laurent Destailleur
678e23b13a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-25 13:05:22 +02:00
Laurent Destailleur
1106198c05 css 2021-10-25 12:34:12 +02:00
Laurent Destailleur
4ab759b067 Fix check/uncheck of ping 2021-10-24 14:23:35 +02:00
Laurent Destailleur
ad3297b0ef Use of MAIN_FIRST_PING_OK_ID = 'disabled' works when forcing reinstall. 2021-10-24 14:01:38 +02:00
Laurent Destailleur
d3f630e4b5 Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14.0 2021-10-24 13:06:41 +02:00
Laurent Destailleur
dc32350ee7 Code comment 2021-10-24 13:02:45 +02:00
Laurent Destailleur
58b2365f8a
Merge pull request #19176 from atm-maxime/fix_ecm_autotree
Fix #8716 : tasks were not shown in ecm auto tree
2021-10-24 12:35:43 +02:00
Maxime Kohlhaas
6abd4cc120 Fix #8716 : tasks were not shown in ecm auto tree 2021-10-24 11:38:45 +02:00
Laurent Destailleur
664eafd810
Merge pull request #19168 from atm-maxime/fix_massmovments
Fix #18916 : mass stock movements not displayed if error while adding line
2021-10-24 00:44:39 +02:00
Laurent Destailleur
66a732c005
Merge pull request #19167 from atm-maxime/fix_currency_sync
Fix #18922 : multicurrency sync in http with good currencylayer url
2021-10-24 00:44:19 +02:00
Laurent Destailleur
c8bcd01a10
Merge pull request #19162 from atm-maxime/fix_no_mail_in_now_unsubscribe
Fix #18961 : no_email field has been replaced by mailing_unsubscribe table
2021-10-24 00:42:48 +02:00
Maxime Kohlhaas
0a2c950401 Fix #18916 : mass stock movements not displayed if error while adding line 2021-10-24 00:31:57 +02:00
Maxime Kohlhaas
983e28691b Use a subselect instead of a join 2021-10-24 00:02:55 +02:00
Laurent Destailleur
4ab59eebf3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-23 23:58:27 +02:00
Laurent Destailleur
fc29aa7d3b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-10-23 23:58:00 +02:00
Laurent Destailleur
1750e385a9
Merge pull request #19164 from tiaris/14.0_bug18934
FIX #18934 on-registration in the extrafieldsline database for deliveries
2021-10-23 23:57:23 +02:00
Maxime Kohlhaas
77c716565e Fix #18922 : multicurrency sync in http with good currencylayer url 2021-10-23 23:42:06 +02:00
stickler-ci
53e9da4748 Fixing style errors. 2021-10-23 20:37:07 +00:00
Maxime Kohlhaas
29950a6afa Replace != by <> in SQL requests 2021-10-23 22:27:29 +02:00