Commit Graph

16259 Commits

Author SHA1 Message Date
Laurent Destailleur
359f2c6e81 NEW Add option MAIN_ALLOW_SELECT2_WITH_SMARTPHONE
Removed migration files
2019-03-02 12:16:37 +01:00
Laurent Destailleur
9b58ca8227 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-28 11:28:20 +01:00
Laurent Destailleur
488004026f Fix syntax error 2019-02-28 11:28:10 +01:00
Laurent Destailleur
7606c73fd5
Merge pull request #10704 from iouston/patch-1
NEW add hidden option MAIN_DOC_UPLOAD_NOT_RENAME_BY_DEFAULT
2019-02-28 11:18:12 +01:00
Laurent Destailleur
c240c66789
Update html.formfile.class.php 2019-02-28 11:17:43 +01:00
Laurent Destailleur
4ca6b248c3
Merge pull request #10708 from wdammak/patch-33
phpcs simplification
2019-02-28 11:06:33 +01:00
Laurent Destailleur
c444521abc IFTTT 2019-02-28 11:00:40 +01:00
Laurent Destailleur
b8b55fb748 WIP Add IFTTT module 2019-02-28 10:30:27 +01:00
wdammak
8e8c68345a
phpcs simplification 2019-02-27 21:41:55 +01:00
Laurent Destailleur
3bffa69f1d Remove deprecated code 2019-02-27 15:23:56 +01:00
Laurent Destailleur
29cfa03fa4 Fix font awesome 5 regressions 2019-02-27 13:54:39 +01:00
Laurent Destailleur
836eff1233
Merge pull request #10698 from wdammak/patch-32
Add parent establishment
2019-02-27 13:34:50 +01:00
Laurent Destailleur
f2dc687202
Update html.formfile.class.php 2019-02-27 13:26:37 +01:00
iouston
d1716babef
disable the auto renaming on upload
add a global variable for disable the auto renaming on upload file
corresponds to the request of this post : https://www.dolibarr.fr/forum/12-howto--aide/55094-fichiers-joints-decocher-la-case-sauver-sous#107392
2019-02-27 11:17:33 +01:00
wdammak
64bd995978
Fix camelCase syntax and remove disabling of phpcs 2019-02-27 04:02:11 +01:00
Laurent Destailleur
401f587868 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/boxes/box_project.php
2019-02-27 02:27:33 +01:00
Laurent Destailleur
cbaa57b1e2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-27 02:25:42 +01:00
Laurent Destailleur
86e2ffe323
Merge pull request #10390 from glu000/8.0
Fix #10278
2019-02-27 02:24:55 +01:00
Laurent Destailleur
238894a7e4
Merge pull request #10624 from frederic34/patch-2
selectMulticurrency avoid malformed empty value
2019-02-27 02:06:24 +01:00
Laurent Destailleur
7618a7348f
Merge branch 'develop' into 10.0_accountancy2 2019-02-27 01:51:01 +01:00
bomuux
9c5a4e303c SQL error in box_project.php
Corrected a bug : for an internal user with no rights to see all
projects, the project box on home cause an error in log.
Finally a lot of simplification because
Project::getProjectsAuthorizedForUser do most of the filtering.

Conflicts:
	htdocs/core/boxes/box_project.php
2019-02-27 01:44:15 +01:00
Laurent Destailleur
64f81e8f65
Merge pull request #10628 from bomuux/patch-4
FIX: sql error in box_project.php
2019-02-27 01:38:03 +01:00
Laurent Destailleur
d6651f3998
Update box_project.php 2019-02-27 01:37:20 +01:00
Laurent Destailleur
014c199173 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
2019-02-27 01:28:12 +01:00
Laurent Destailleur
6373e1db84
Merge branch 'develop' into 10.0_linkedin 2019-02-27 01:16:21 +01:00
Laurent Destailleur
94166c505b
Merge pull request #10690 from frederic34/patch-3
Update extrafields.class.php
2019-02-27 01:15:13 +01:00
Laurent Destailleur
49c4e5b694
Merge pull request #10700 from frederic34/patch-4
Update html.formticket.class.php
2019-02-27 01:14:34 +01:00
Laurent Destailleur
fb2b7a6c09
Merge pull request #10693 from atm-quentin/NEW_field_tasklist
add data elem on task list
2019-02-27 01:14:07 +01:00
Laurent Destailleur
58e2901d14 Fix phpcs 2019-02-27 00:54:07 +01:00
Frédéric FRANCE
242bf0ba49
Update html.formticket.class.php 2019-02-26 22:56:50 +01:00
Laurent Destailleur
9e82c37963 WIP Start module BOM 2019-02-26 19:27:04 +01:00
wdammak
99fb702833
Add Select Establishment 2019-02-26 18:42:05 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
Laurent Destailleur
5bcce53e40 Fix preselection when key is '0' 2019-02-26 12:20:22 +01:00
Laurent Destailleur
e0c7c32fae Fix preselection when key is '0' 2019-02-26 11:44:44 +01:00
Laurent Destailleur
528bfca690 Fix preselection when key is '0' 2019-02-26 11:44:16 +01:00
atm-quentin
35762c0d4e add data elem on task list 2019-02-26 11:25:40 +01:00
Frédéric FRANCE
1e6ed94c5e
Update extrafields.class.php
The property $errno was declared of type integer, but $this->db->lasterrno() is of type string
2019-02-25 21:39:45 +01:00
Alexandre SPANGARO
2da1447a0b Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin 2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00
Cristian Torres
c781eeb17d [FIX] ORDER BY before custom filters for where
When filtering data "and cac.libelle" would be appended after ORDER BY
2019-02-24 20:55:27 +01:00
Laurent Destailleur
dfd6a0feaa
Merge pull request #10643 from tony13tv/patch-3
[FIX] ORDER BY before custom filters for where
2019-02-24 20:55:01 +01:00
Laurent Destailleur
6b46a927f1
Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket 2019-02-24 20:53:54 +01:00
ptibogxiv
47f5ff3303 Fix declare functions2.lib.php for donations API 2019-02-24 20:51:00 +01:00
Laurent Destailleur
c002fd68ae
Merge pull request #10679 from ptibogxiv/patch-129
Fix declare functions2.lib.php for donations API
2019-02-24 20:49:59 +01:00
Laurent Destailleur
e349fe780e
Merge pull request #10641 from OPEN-DSI/fix-show-action-done-emailing
Fix url for emailing type event (link to emailing card)
2019-02-24 20:48:57 +01:00
Laurent Destailleur
89087473e1
Merge pull request #10674 from frederic34/patch-4
Update printgcp.modules.php
2019-02-24 20:44:08 +01:00
Laurent Destailleur
2eb48a6046
Merge pull request #10673 from frederic34/patch-3
Update extrafields.class.php
2019-02-24 20:43:44 +01:00
Laurent Destailleur
52bcef38fc
Merge pull request #10672 from frederic34/patch-1
Update html.formfile.class.php
2019-02-24 20:39:32 +01:00
Laurent Destailleur
3fa2680859
Merge pull request #10669 from frederic34/html5fix
replace by html5 in ticket supplier_proposal, stripe, societe
2019-02-24 20:36:24 +01:00