Commit Graph

75458 Commits

Author SHA1 Message Date
John BOTELLA
efed7ae6aa Fix tabs badges 2019-03-06 16:00:09 +01:00
Laurent Destailleur
0c2a0c643b NEW Performance enhancement: Replace dirname(__FILE__) with __DIR__ 2019-03-06 14:33:05 +01:00
John BOTELLA
5fd3a253ab add new dolGetStatus to LibStatut in order class 2019-03-06 14:19:40 +01:00
Laurent Destailleur
d4409ffb08 Restore menu MRP on new eldy code 2019-03-06 14:18:58 +01:00
Laurent Destailleur
df180a7682
Merge pull request #10451 from wdammak/patch-25
Update eldy.lib.php
2019-03-06 13:59:16 +01:00
Laurent Destailleur
1ab3949e9c Optimize js code 2019-03-06 13:01:01 +01:00
gauthier
0ff2905180 FIX : we need to keep originline special_code 2019-03-06 12:10:24 +01:00
Lionel VESSILLER
b56cd11f02 Fix default contact id for update and clone actions in event card 2019-03-06 12:00:55 +01:00
Laurent Destailleur
5a07281bb3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-06 11:49:52 +01:00
Laurent Destailleur
1ee52131b4 Fix badge for sf download 2019-03-06 11:49:41 +01:00
Christophe Battarel
6c6a1a02f0 allow this script to be included in custom themes 2019-03-06 11:06:35 +01:00
Christophe Battarel
cb131c56bf Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-06 11:01:51 +01:00
Lionel VESSILLER
bf5b482f3d Fix replace TRUE and FALSE for php checkstyle and aliasing label instead of note in SQL request 2019-03-06 09:05:07 +01:00
Frédéric FRANCE
2745f98644
PSR2.Classes.PropertyDeclaration.VarUsed 2019-03-05 22:10:46 +01:00
Frédéric FRANCE
b4851e3d40
Update mailinglist_mymodule_myobject.modules.php
Warning: Declaration of mailing_***********::add_to_target($mailing_id) should be compatible with MailingTargets::add_to_target($mailing_id, $cibles)
2019-03-05 21:54:51 +01:00
Laurent Destailleur
9ad1597fcc
Merge pull request #10747 from atm-gauthier/9.0_fix_extrafields_always_visible_in_view_mode
FIX : extrafields always visible on view mode
2019-03-05 18:54:51 +01:00
Laurent Destailleur
cfd39a1483
Merge pull request #10742 from OPEN-DSI/fix-pdf-beluga-orientation
Fix authorize long references in Beluga PDF model (uses Landscape mode)
2019-03-05 18:45:02 +01:00
Laurent Destailleur
22bb62d900
Merge pull request #10737 from atm-gauthier/6.0_fix_wrong_redirect_link
FIX : wrong redirect link on holiday refuse
2019-03-05 18:43:57 +01:00
Laurent Destailleur
39e5c6238d
Merge pull request #10739 from frederic34/patch-3
Update list.php
2019-03-05 18:43:36 +01:00
Laurent Destailleur
0d6a2f446c
Merge pull request #10740 from frederic34/patch-4
Update mymodulewidget1.php
2019-03-05 18:43:02 +01:00
Laurent Destailleur
ec15f9251d
Merge pull request #10738 from frederic34/patch-2
phpcs fix
2019-03-05 18:42:22 +01:00
Laurent Destailleur
3db8218cba
Merge pull request #10745 from frederic34/patch-6
add session newtoken
2019-03-05 18:41:50 +01:00
Laurent Destailleur
db3f362d10
Merge pull request #10746 from ptibogxiv/patch-139
FIX: date in ticket.class.php
2019-03-05 18:41:32 +01:00
Laurent Destailleur
c06d2f6c3b Remove warning 2019-03-05 18:22:03 +01:00
Frédéric FRANCE
906e1b8425
Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-05 18:21:46 +01:00
Laurent Destailleur
db5dd7f9aa Fix phpunit 2019-03-05 18:19:37 +01:00
Laurent Destailleur
4aa93181d3 Fix phpunit 2019-03-05 18:17:26 +01:00
Frédéric FRANCE
0c2a77cb53
Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-05 18:14:15 +01:00
John BOTELLA
e382f13637 remove test 2019-03-05 17:16:38 +01:00
John BOTELLA
ef9ad4d109 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-05 17:14:59 +01:00
John BOTELLA
600f0c9fa6 Fix condition 2019-03-05 17:14:29 +01:00
John BOTELLA
72d96d2ac3 prepare badges 2019-03-05 17:13:20 +01:00
John BOTELLA
6b98eecd32 fix compatibility status 2019-03-05 16:58:05 +01:00
gauthier
598d1fc914 FIX : extrafields always visible on view mode 2019-03-05 16:53:36 +01:00
Laurent Destailleur
756b9ca07f Fix phpunit 2019-03-05 16:51:16 +01:00
ptibogxiv
2ebffb2ffe
FIX: date in ticket.class.php
dolibarize date
2019-03-05 16:29:53 +01:00
Laurent Destailleur
1e95802a41 Fix phpcs 2019-03-05 16:29:24 +01:00
Laurent Destailleur
bbbffae72b Fix phpcs 2019-03-05 16:27:19 +01:00
Laurent Destailleur
16e90ffae4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/langs/en_US/website.lang
2019-03-05 15:59:42 +01:00
Laurent Destailleur
d18a5853df Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
2019-03-05 15:57:31 +01:00
Laurent Destailleur
98f5bb2ed3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-05 15:55:08 +01:00
Laurent Destailleur
e66447eabc Fix phpcs 2019-03-05 15:53:57 +01:00
Laurent Destailleur
28a4217660 Prepare 9.0.1 2019-03-05 15:52:03 +01:00
Laurent Destailleur
f402966eb8 Missing translation 2019-03-05 15:48:12 +01:00
John BOTELLA
7a4540088a Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-05 15:37:17 +01:00
Frédéric FRANCE
1bbf6737ec
add session newtoken 2019-03-05 15:27:31 +01:00
John BOTELLA
95981ca14c PR feedback 2019-03-05 15:26:19 +01:00
Lionel VESSILLER
9b797eb980 Fix sort by field in all events (action and emailing type) and fix multiple contacts in one event 2019-03-05 14:55:04 +01:00
Laurent Destailleur
7d37b4c46d CSS 2019-03-05 13:04:54 +01:00
Laurent Destailleur
b851911708 Dolibarize module ticket 2019-03-05 12:18:46 +01:00