2
0
forked from Wavyzz/dolibarr
Commit Graph

74307 Commits

Author SHA1 Message Date
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
9.0.1
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
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
Lionel VESSILLER
ef10a32069 Fix authorize long references in Beluga PDF model (uses Landscape mode) 2019-03-05 11:18:44 +01:00
Lionel VESSILLER
5cf8421d87 Fix remove "canceled" invoices in all reports 2019-03-05 09:56:49 +01:00
Frédéric FRANCE
784012a47e Update main.inc.php 2019-03-04 23:47:40 +01:00
Frédéric FRANCE
162f2614e5 Update mymodulewidget1.php 2019-03-04 23:25:23 +01:00
Frédéric FRANCE
023992f2e1 Update list.php 2019-03-04 23:06:23 +01:00
Frédéric FRANCE
e8b21887e2 phpcs 2019-03-04 21:41:00 +01:00
Frédéric FRANCE
2f1106e170 Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-04 21:39:55 +01:00
Frédéric FRANCE
2f3c3aeb05 test 2019-03-04 21:24:48 +01:00
Laurent Destailleur
b7066d92cc More info 2019-03-04 20:37:03 +01:00
Laurent Destailleur
e974a3b2b3 Add more info 2019-03-04 20:36:05 +01:00
Frédéric FRANCE
098bab8b1a Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-04 20:21:53 +01:00
Laurent Destailleur
1cfbf5f551 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/security.php
2019-03-04 20:18:23 +01:00
Laurent Destailleur
c95c8b4dcb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/login/functions_dolibarr.php
2019-03-04 20:17:16 +01:00
Frédéric FRANCE
16c73af0cb remove test ticketlog 2019-03-04 20:16:18 +01:00
Laurent Destailleur
54b9681257 More log to help debug 2019-03-04 20:15:31 +01:00