Laurent Destailleur
1931f43ce7
Revert MAIN_ALLOW_SELECT2_WITH_SMARTPHONE into
...
MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE
2019-03-03 00:05:07 +01:00
Frédéric FRANCE
3037e4a157
Update DolibarrModules.class.php
2019-03-02 20:49:53 +01:00
Laurent Destailleur
e91a933635
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-03-02 19:13:48 +01:00
Laurent Destailleur
8fce6e5e31
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/core/modules/mailings/xinputfile.modules.php
htdocs/fourn/facture/card.php
2019-03-02 19:13:37 +01:00
Laurent Destailleur
40e923ec85
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/modules/modAgenda.class.php
2019-03-02 19:07:14 +01:00
Laurent Destailleur
8f8aaf1e8c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-03-02 19:05:51 +01:00
Laurent Destailleur
a2eefab696
Merge pull request #10714 from ATM-Marc/FIX_7.0_export_actioncomm
...
FIX: actioncomm export: ORDER BY clause / event type filter
2019-03-02 18:44:34 +01:00
Laurent Destailleur
f7daa53a2c
Merge pull request #10724 from frederic34/patch-4
...
Update admin_extrafields_view.tpl.php
2019-03-02 18:42:28 +01:00
Laurent Destailleur
a5711a51ab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/json.lib.php
test/phpunit/JsonLibTest.php
2019-03-02 18:30:17 +01:00
Laurent Destailleur
4f9981063f
Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing
2019-03-02 18:26:50 +01:00
Laurent Destailleur
e215bfdb66
Merge pull request #10721 from frederic34/bad-exclude-pattern
...
fix exclude from phpcs
2019-03-02 18:23:02 +01:00
Laurent Destailleur
4288a09101
Merge pull request #10723 from frederic34/swiftmailer-autoloader
...
autoloader for egulias lib needed by swiftmailer
2019-03-02 18:21:31 +01:00
Laurent Destailleur
03237d1730
NEW Look and feel v10 - Add CSS tabBarNoTop
2019-03-02 18:20:13 +01:00
Frédéric FRANCE
b5def5fd59
Update admin_extrafields_view.tpl.php
2019-03-02 18:11:47 +01:00
Frédéric FRANCE
8c23b41f9a
autoloader for egulias lib needed by swiftmailer
2019-03-02 14:32:52 +01:00
Laurent Destailleur
5f6ca1119a
Replace arrow picto with fontawesome
2019-03-02 14:07:13 +01:00
Frédéric FRANCE
65551864d5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-03-02 12:24:15 +01:00
Laurent Destailleur
359f2c6e81
NEW Add option MAIN_ALLOW_SELECT2_WITH_SMARTPHONE
...
Removed migration files
2019-03-02 12:16:37 +01:00
Frédéric FRANCE
d04716c018
wip
2019-03-02 10:16:13 +01:00
Frédéric FRANCE
40d34940f1
fix exclude from phpcs
2019-03-02 10:00:51 +01:00
Frédéric FRANCE
014f69850e
add visibility
2019-03-01 23:08:57 +01:00
Frédéric FRANCE
c5c27fdb77
add visibility
2019-03-01 19:24:06 +01:00
Frédéric FRANCE
bd2e541fd6
add visibility
2019-03-01 18:28:51 +01:00
John BOTELLA
421c009e58
Standardise new function name
2019-03-01 15:33:23 +01:00
John BOTELLA
162c3249cf
Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu
2019-03-01 13:49:42 +01:00
John BOTELLA
b222c44bb9
Add helper functions and little review size of badges
2019-03-01 12:01:25 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility
2019-02-28 23:19:58 +01:00
Frédéric FRANCE
0022c4fe72
add visibility
2019-02-28 22:44:12 +01:00
Frédéric FRANCE
7e31ca48d8
add visibility
2019-02-28 22:07:48 +01:00
Frédéric FRANCE
4f9e35f350
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-28 20:48:23 +01:00
Frédéric FRANCE
92c5c15033
add visibility
2019-02-28 20:48:07 +01:00
Marc de Lima Lucio
b96ac794e9
FIX: actioncomm export: ORDER BY clause is in wrong export property + event type filter does not work
2019-02-28 16:15:32 +01:00
Laurent Destailleur
429da47d68
Fix default language of reminders
2019-02-28 13:11:14 +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
cefaeb583f
Update xinputfile.modules.php
2019-02-28 11:24:43 +01:00
Laurent Destailleur
85d46a5270
Update xinputfile.modules.php
2019-02-28 11:24:07 +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
Frédéric FRANCE
ba4ca5d7c2
add visibility
2019-02-28 00:15:32 +01:00
Frédéric FRANCE
cc1ee2d883
add visibility
2019-02-27 23:55:18 +01:00
wdammak
8e8c68345a
phpcs simplification
2019-02-27 21:41:55 +01:00
Frédéric FRANCE
9b165f6b3f
add visibility
2019-02-27 20:45:07 +01:00
Laurent Destailleur
b3fb0eaf5b
Merge branch 'develop' into Squiz.Scope.MethodScope.Missing
2019-02-27 15:48:31 +01:00
Laurent Destailleur
3bffa69f1d
Remove deprecated code
2019-02-27 15:23:56 +01:00
gauthier
1237a6d3e9
FIX : same thing here
2019-02-27 14:58:10 +01:00
gauthier
49e03b009f
FIX : if empty error message, we just see "error" displayed
2019-02-27 14:50:01 +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
Frédéric FRANCE
5a4ac82880
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-27 08:23:29 +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
d608921f1e
add visibility
2019-02-26 23:15:28 +01:00
Frédéric FRANCE
242bf0ba49
Update html.formticket.class.php
2019-02-26 22:56:50 +01:00
Frédéric FRANCE
8b4e920d5e
add visibility
2019-02-26 22:42:19 +01:00
Frédéric FRANCE
5016bc7188
wip
2019-02-26 21:48:21 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-26 21:16:01 +01:00
Frédéric FRANCE
e6c3eb0ba1
wip
2019-02-26 21:13:07 +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
John BOTELLA
9f0a93f68f
Add color lib for color automation
2019-02-26 17:44:16 +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
675a17a74c
wip
2019-02-26 00:34:43 +01:00
Frédéric FRANCE
346d1f410c
wip
2019-02-25 23:15:48 +01:00
Frédéric FRANCE
915841eeb9
wip
2019-02-25 22:50:19 +01:00
Frédéric FRANCE
c89e4d79b8
wip
2019-02-25 22:27:04 +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
Frédéric FRANCE
1c07006015
wip
2019-02-25 21:36:27 +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
Laurent Destailleur
2b6fac3d54
Merge pull request #10664 from frederic34/patch-21
...
Update ajax.lib.php
2019-02-24 20:33:38 +01:00
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
2019-02-24 20:06:55 +01:00
ptibogxiv
efd27ec1d8
Fix declare functions2.lib.php for donations API
2019-02-24 16:11:52 +01:00
Frédéric FRANCE
167a857f4c
replace html code by html5 in contact
2019-02-24 14:47:47 +01:00
Frédéric FRANCE
e7706192b5
doc comment
2019-02-24 10:08:42 +01:00
Frédéric FRANCE
b51432790f
Update printgcp.modules.php
2019-02-24 09:39:48 +01:00
Frédéric FRANCE
485431a722
Update printgcp.modules.php
2019-02-24 09:31:19 +01:00
Frédéric FRANCE
03714e4bed
Update extrafields.class.php
2019-02-24 09:17:45 +01:00
Frédéric FRANCE
042c6cc56e
Update html.formfile.class.php
2019-02-24 08:50:35 +01:00
Frédéric FRANCE
51b29f2ed5
replace html code by html5 in tpl
2019-02-23 22:43:53 +01:00
Frédéric FRANCE
c7df326a91
replace html code by html5
2019-02-23 22:31:57 +01:00
Frédéric FRANCE
cdf5348b47
Update ajax.lib.php
2019-02-23 18:15:56 +01:00
Frédéric FRANCE
9dd58cf9ce
Update html.formfile.class.php
2019-02-23 16:52:26 +01:00
Laurent Destailleur
4da1bef6dc
Merge pull request #10654 from ptibogxiv/patch-125
...
FIX Stripe live Oauth
2019-02-23 14:21:25 +01:00
Laurent Destailleur
114cd5fa30
Merge pull request #10646 from grandoc/new_branch_21_02_2019
...
fix : When comparing two booleans, it is generally considered safer t…
2019-02-23 14:19:22 +01:00
Laurent Destailleur
bdc4cc0def
Merge pull request #10659 from frederic34/patch-21
...
variables does not seem to be defined for all execution paths
2019-02-23 14:15:32 +01:00
Laurent Destailleur
50da34e26b
Merge pull request #10660 from frederic34/patch-22
...
Update html.formmail.class.php
2019-02-23 14:09:54 +01:00
Laurent Destailleur
fa45d2c5a9
Merge pull request #10657 from frederic34/patch-17
...
doc comment html.formfile.class.php
2019-02-23 14:09:42 +01:00
Laurent Destailleur
0a83bc474c
Merge pull request #10635 from grandoc/new_branch_19_02_2019
...
update with html5 compliant code
2019-02-23 14:09:17 +01:00
Frédéric FRANCE
b75519fefe
Update html.formmail.class.php
2019-02-23 11:25:49 +01:00
Frédéric FRANCE
c3d1ed73d2
variables does not seem to be defined for all execution paths
2019-02-23 11:17:07 +01:00
Frédéric FRANCE
f7c0044e60
doc comment
2019-02-23 09:33:21 +01:00
ptibogxiv
dd160a6242
Create stripelive_oauthcallback.php
2019-02-22 14:56:39 +01:00
Laurent Destailleur
5a18588bb7
CSS
2019-02-21 22:27:56 +01:00
Laurent Destailleur
2891758c23
FIX Stock visibility for service when option stock on service is on
...
NEW Add option STOCK_SHOW_VIRTUAL_STOCK_IN_PRODUCTS_COMBO
2019-02-21 20:13:03 +01:00
Philippe GRAND
54da44b506
Translation
2019-02-21 19:50:03 +01:00
Philippe GRAND
5a88930062
fix : The property total_vat does not exist on Reception
2019-02-21 14:38:12 +01:00
Lionel VESSILLER
cdc2c5ae77
Company Lib : Fix contact events with no thirdparty
2019-02-21 09:49:46 +01:00
Cristian Torres
31aa3ec376
[FIX] ORDER BY before custom filters for where
...
When filtering data "and cac.libelle" would be appended after ORDER BY
2019-02-20 11:45:07 -06:00
Lionel VESSILLER
d10c5cab34
Company Lib : Fix url for emailing type event (link to emailing card)
2019-02-20 15:14:50 +01:00
Laurent Destailleur
a3a89b755f
NEW Gain space by moving the meteo on title line
2019-02-20 06:01:13 +01:00
Laurent Destailleur
c204b8bf7b
Fix menu level
2019-02-20 05:17:24 +01:00
Laurent Destailleur
4296f959ca
Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION
...
Reorganize levels of menu accountancy
2019-02-20 04:55:35 +01:00
Laurent Destailleur
abfd610bbc
Fix quote not closed
2019-02-20 03:44:08 +01:00
Philippe GRAND
d83b77432d
update with html5 compliant code
2019-02-19 17:42:12 +01:00
Philippe GRAND
047ec90d78
update with html5 compliant code
2019-02-19 17:38:14 +01:00
Laurent Destailleur
c26dad446f
Merge pull request #10627 from AXeL-dev/patch-7
...
FIX: missing submenus in auguria menu manager
2019-02-19 13:30:20 +01:00
Laurent Destailleur
a3521474f1
Merge pull request #10621 from frederic34/html5fix
...
fix html5 in variant, user
2019-02-19 13:22:46 +01:00
Laurent Destailleur
f0f45858f5
Merge pull request #10629 from hregis/develop_mc
...
FIX wrong class name "CUnits instead CMeasuringUnits"
2019-02-19 13:19:01 +01:00
Regis Houssin
1c3541295b
FIX wrong class name "CUnits instead CMeasuringUnits"
2019-02-19 09:24:30 +01:00
bomuux
c22be202d9
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.
2019-02-18 23:17:03 +01:00
Laurent Destailleur
163db3d132
Code comment
2019-02-18 19:41:23 +01:00
Laurent Destailleur
ebfb6beee3
Merge
2019-02-18 19:14:42 +01:00
Laurent Destailleur
e4698fb6a5
Merge
2019-02-18 19:14:25 +01:00
AXeL-dev
b9749ae81c
add missing submenus for supplier orders list in auguria menu
2019-02-18 18:46:38 +01:00
Laurent Destailleur
ad7b8371da
FIX Mark credit note as available for credit note in other currency
...
Conflicts:
htdocs/compta/paiement.php
htdocs/core/class/discount.class.php
2019-02-18 18:30:15 +01:00
Laurent Destailleur
07d1559802
FIX Mark credit note as available for credit note in other currency
2019-02-18 18:27:06 +01:00
Alexandre SPANGARO
49a975beb3
Update works
2019-02-18 07:14:21 +01:00