Commit Graph

75768 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
15138aa543 FIX error on setup of password if pass generators have a .old file. 2019-03-04 20:00:36 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
Frédéric FRANCE
d5c809c1ed
Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-04 19:56:25 +01:00
Laurent Destailleur
1d6028dfb0 FIX PHPUnit 2019-03-04 19:38:52 +01:00
Laurent Destailleur
ff9b6c2f04 Module ticket 2019-03-04 19:19:20 +01:00
Laurent Destailleur
4a582485b9 Debug module ticket 2019-03-04 19:19:09 +01:00
Frédéric FRANCE
bdba88a6d5
remove warning 2019-03-04 18:23:52 +01:00
Frédéric FRANCE
5dc3cbcdfc
remove warning 2019-03-04 18:22:59 +01:00
Frédéric FRANCE
7bcc4e8775
Update mouvementstock.class.php 2019-03-04 18:21:48 +01:00
Frédéric FRANCE
8feca792f1
Update mouvementstock.class.php 2019-03-04 18:07:37 +01:00
Laurent Destailleur
0d49f27831 Code style 2019-03-04 17:36:45 +01:00
Laurent Destailleur
68bb95079a Ignore 2 rules 2019-03-04 17:36:03 +01:00
Laurent Destailleur
69794f5293 Fix phpcs 2019-03-04 17:31:50 +01:00
markus
c905575d3e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-04 17:26:40 +01:00
Laurent Destailleur
bb9a64fd07 Fix phpcs 2019-03-04 17:25:13 +01:00
gauthier
dada8c8ff5 FIX : wrong redirect link on holiday refuse 2019-03-04 17:23:29 +01:00
Laurent Destailleur
06a40726bb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-04 16:29:23 +01:00
Laurent Destailleur
27402f432a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/don/class/don.class.php
	htdocs/product/stock/card.php
	htdocs/theme/eldy/style.css.php
2019-03-04 16:29:16 +01:00
Laurent Destailleur
c3b08a604f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-04 16:20:57 +01:00
Laurent Destailleur
07dca25b96 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-04 16:20:49 +01:00
Laurent Destailleur
acaf5cabef
Merge pull request #10332 from ATM-Nicolas/fix_check_picture_name
FIX : Check for old picture name if the new one was not found
2019-03-04 16:20:29 +01:00
Laurent Destailleur
4a260cce49
Merge pull request #10732 from futurehousestore/futurehousestore-patch-1
Show full product names on product list
2019-03-04 16:13:49 +01:00
Laurent Destailleur
3b48808916
Update list.php 2019-03-04 16:13:38 +01:00
Laurent Destailleur
4446b80a23
Merge pull request #10733 from ptibogxiv/patch-136
Fixe date on fetch don.class.php
2019-03-04 16:11:29 +01:00
Laurent Destailleur
ea68f28c55
Merge pull request #10730 from frederic34/html5-accountancy
replace html by html5 in accountancy
2019-03-04 16:10:47 +01:00