Commit Graph

91623 Commits

Author SHA1 Message Date
Laurent Destailleur
0d19d2d5e4
Merge pull request #15372 from glu000/patch-1
Extrafields from type "select" depending on other fields not working in Safari & jquery select2 #15371
2020-11-13 10:03:46 +01:00
Laurent Destailleur
5498800ad6
Update commonobject.class.php 2020-11-13 10:02:34 +01:00
Laurent Destailleur
3b908e5f78
Merge pull request #15367 from cfoellmann/fix-tasks-delete
fix not able to delete time entry from task
2020-11-13 10:00:34 +01:00
Laurent Destailleur
b91123a84c
Merge pull request #15368 from cfoellmann/fix-new-contact-button
fix new company in contacts template file
2020-11-13 10:00:09 +01:00
Laurent Destailleur
b71cd0edea
Merge pull request #15378 from orebd/debug_ticket
Fix some tickets issue
2020-11-13 09:58:57 +01:00
Laurent Destailleur
b8e8ba0c97
Update extrafields_list_array_fields.tpl.php 2020-11-13 09:58:47 +01:00
Laurent Destailleur
1d252c18fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-13 09:56:08 +01:00
Laurent Destailleur
6d4d3c618d FIX #15369 and standardize permission "readall" 2020-11-13 09:55:53 +01:00
Laurent Destailleur
56bc788d16
Merge pull request #15375 from frederic34/patch-6
doxygen
2020-11-13 09:33:36 +01:00
Laurent Destailleur
d6d8d3364f
Merge pull request #15376 from andreubisquerra/master
Compatibility with new TakePOS connector
2020-11-13 09:33:04 +01:00
Aurélien
d9d32524f7
Fix #14460 2020-11-13 00:36:25 +01:00
Aurélien
283645ae12
Fix ticket/list.php Warning: Cannot modify header information - headers already sent by (output started at /var/www/html/core/tpl/extrafields_list_array_fields.tpl.php:3) in /var/www/html/main.inc.php on line 1152 2020-11-13 00:27:57 +01:00
Aurélien
47fe1b4fd1
Fix ticket/index.php Warning: mysqli_result::free_result(): Couldn't fetch mysqli_result in /var/www/html/core/db/mysqli.class.php on line 390 2020-11-13 00:25:12 +01:00
andreubisquerra
5e7f1a545e
Fix travis 2020-11-12 22:50:46 +01:00
jove@bisquerra.com
a5ffac1935 Compatibility with new TakePOS connector 2020-11-12 22:31:32 +01:00
Laurent Destailleur
7be3a2267e Add missing vat rates 2020-11-12 22:23:21 +01:00
Laurent Destailleur
350d694181 Fix security page 2020-11-12 19:15:44 +01:00
Frédéric FRANCE
64c48a246a
The method PrestaShopWebservice::... is not static, but was called statically 2020-11-12 18:53:26 +01:00
Frédéric FRANCE
caa82a1e2f
Update PSWebServiceLibrary.class.php 2020-11-12 18:43:52 +01:00
Frédéric FRANCE
9c7d698cc7
Create index.html 2020-11-12 18:40:34 +01:00
Frédéric FRANCE
9e59a9aa8c
Create index.html 2020-11-12 18:39:50 +01:00
Günter Lukas
2da8fb75a8
Fix #15371
Extrafields from type "select" depending on other fields not working in Safari & jquery select2 #15371
2020-11-12 15:59:42 +01:00
Laurent Destailleur
754a9778ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/modUser.class.php
2020-11-12 14:17:10 +01:00
Laurent Destailleur
0764cb2abd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-12 14:13:19 +01:00
Laurent Destailleur
777ae9af9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-12 14:12:13 +01:00
Laurent Destailleur
02158928cc FIX #15365 export of extrafields for user and resources 2020-11-12 14:11:59 +01:00
Christian Foellmann
2061d0f858 fix new company in contacts template file 2020-11-12 14:03:18 +01:00
Christian Foellmann
1502b254eb fix not able to delete time entry from task 2020-11-12 13:58:59 +01:00
Laurent Destailleur
1dbc91e343 Clean code 2020-11-12 13:44:57 +01:00
Laurent Destailleur
c3000e5098 Remove rule with +99% of false positive 2020-11-12 13:20:39 +01:00
Laurent Destailleur
5c672cca1d Fix exclude of dirs 2020-11-12 13:16:55 +01:00
Laurent Destailleur
0cc1cfbede Remove rule with +99% of false positive 2020-11-12 13:15:49 +01:00
Laurent Destailleur
0b6123328d Removed rule with +99% of false positives 2020-11-12 13:12:38 +01:00
Laurent Destailleur
e5b615f484 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-12 13:02:24 +01:00
Laurent Destailleur
84cc0ef19b Add a protection to avoid infinite loop when we will trigger ACTION_ 2020-11-12 12:55:09 +01:00
Laurent Destailleur
0e9100fe75
Merge pull request #15359 from andreubisquerra/master
Update receipt tab in TakePOS setup
2020-11-12 12:45:18 +01:00
Laurent Destailleur
e68284871b
Update receipt.php 2020-11-12 12:44:34 +01:00
Laurent Destailleur
d94471c2e2
Merge pull request #15349 from frederic34/patch-8
Update thirdparty_lettering_supplier.php
2020-11-12 12:40:07 +01:00
Laurent Destailleur
026d73d9f9
Update thirdparty_lettering_supplier.php 2020-11-12 12:39:56 +01:00
Laurent Destailleur
bf8de86091
Merge pull request #15354 from frederic34/patch-14
Update adherent.class.php
2020-11-12 12:38:39 +01:00
Laurent Destailleur
bfd4475315
Merge pull request #15355 from frederic34/patch-6
Update user.class.php
2020-11-12 12:37:16 +01:00
Laurent Destailleur
dd46ca9c3c
Merge pull request #15356 from FHenry/12_fix_php7.4_deprecated
fix deprecated warning php 7.4
2020-11-12 12:36:19 +01:00
Laurent Destailleur
d3e95f9341
Merge pull request #15361 from frederic34/patch-10
doxygen
2020-11-12 12:34:12 +01:00
Laurent Destailleur
2907df8253
Merge pull request #15364 from frederic34/patch-15
Fix missing getpost for scandir odt path
2020-11-12 12:33:59 +01:00
Laurent Destailleur
a168c3fbb1 Remove warnings 2020-11-12 12:33:29 +01:00
Laurent Destailleur
d9beced0e3 Add skeleton of script to clean email database 2020-11-12 12:09:36 +01:00
Laurent Destailleur
31fcf12643 Add script reset-invalid-emails.php 2020-11-12 12:03:43 +01:00
Frédéric FRANCE
ad05451427
Fix missing getpost for scandir odt path 2020-11-12 11:23:03 +01:00
Laurent Destailleur
ec283dc04f Removed duplicated translation keys 2020-11-11 23:50:46 +01:00
Laurent Destailleur
576e1e1de8 Fix pdf crabe 2020-11-11 23:42:24 +01:00