Commit Graph

76036 Commits

Author SHA1 Message Date
Nicolas ZABOURI
2fea95f813 Merge remote-tracking branch 'Dolibarr/develop' into develop 2019-05-19 00:24:18 +02:00
Maxime Kohlhaas
1d980342ec Fix #8344 2019-05-19 00:05:23 +02:00
florian HENRY
c3dbbe51cf fix missing migration sql for ticket now stable on 10 2019-05-18 23:57:00 +02:00
Laurent Destailleur
3e3ed6f9e7 Fix phpcs 2019-05-18 20:11:51 +02:00
ATM-Marc
9b805f742b FIX: modulebuilder: hardcoded llx_ 2019-05-18 20:09:00 +02:00
Laurent Destailleur
34b5399329
Merge pull request #11209 from atm-maxime/fix_holiday_missing_stats
Fix holiday missing stats
2019-05-18 19:33:36 +02:00
Laurent Destailleur
b35cdf88e8
Merge pull request #11210 from atm-florian/develop
fix :email collector for event creation
2019-05-18 19:31:21 +02:00
Laurent Destailleur
41cb13b1cc Fix warning 2019-05-18 19:28:14 +02:00
Laurent Destailleur
4517d84e3a FIX Disable a module 2019-05-18 19:22:17 +02:00
florian HENRY
099906a73b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-18 18:43:02 +02:00
florian HENRY
0787eee9b8 fix :email collector for event creation 2019-05-18 18:42:46 +02:00
Maxime Kohlhaas
4f64250ad6 Fix menu links for holidays 2019-05-18 17:12:25 +02:00
Maxime Kohlhaas
ea4dcbc77a Add translation 2019-05-18 17:07:55 +02:00
Maxime Kohlhaas
6c195d7bdf Add warning delay for holidays 2019-05-18 17:07:29 +02:00
Maxime Kohlhaas
ea1efa5e88 Fix missing dashboard stats for holidays 2019-05-18 17:06:33 +02:00
Maxime Kohlhaas
28a4785b3a Fix missing TOKEN 2019-05-18 17:06:23 +02:00
Laurent Destailleur
a9e96031de Fix phpcs 2019-05-18 17:04:37 +02:00
Laurent Destailleur
2c78524d4f Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 17:03:33 +02:00
Laurent Destailleur
e46481d837 Fix phpcs 2019-05-18 17:03:21 +02:00
Laurent Destailleur
a1ec074d03
Merge pull request #11205 from ATM-Marc/NEW_supplier_proposal_contact_type
FIX: add contact types for supplier proposals (Issue #10949)
2019-05-18 16:56:40 +02:00
Laurent Destailleur
50335179d3
Merge pull request #11208 from atm-florian/develop
fix:  scrunitizer
2019-05-18 16:46:49 +02:00
Laurent Destailleur
1ad2c09800 Fix size of popup 2019-05-18 16:38:52 +02:00
Laurent Destailleur
5f598b1c3f Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 16:26:03 +02:00
Laurent Destailleur
b40eb92ce7 Mass action for closing members 2019-05-18 16:25:45 +02:00
florian HENRY
ebe37df9db scrunitizer 2019-05-18 16:19:44 +02:00
florian HENRY
47ae988b57 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-18 16:18:22 +02:00
florian HENRY
12a8008107 scrunitizer 2019-05-18 16:18:14 +02:00
Laurent Destailleur
94f5f6c655
Merge pull request #11207 from atm-john/FIX_scrutyniser
FIX: scrutinizer feedback
2019-05-18 16:05:24 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
Laurent Destailleur
263919c49c
Merge pull request #11206 from atm-florian/develop
fix: bad sql request
2019-05-18 15:59:19 +02:00
ATM John BOTELLA
f714b45efb FIX scrutinizer feedback 2019-05-18 15:53:07 +02:00
florian HENRY
c519906c9e fix scrunitizer 2019-05-18 15:46:49 +02:00
florian HENRY
f1aad766ca fix: bad sql request 2019-05-18 15:11:12 +02:00
florian HENRY
f3315bb8f5 fix: bad sql request 2019-05-18 15:09:03 +02:00
ATM-Marc
2c104ccc4a NEW: contact types for supplier proposals 2019-05-18 14:22:04 +02:00
florian HENRY
9ef5767fd5 phpcs 2019-05-18 12:28:39 +02:00
florian HENRY
c2b1c8d439 remove bad fix 2019-05-18 12:26:36 +02:00
florian HENRY
730820bb26 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-18 12:11:48 +02:00
florian HENRY
02af7ca25e fix pb with multicompny payment dictionnary on faxcture card 2019-05-18 12:11:28 +02:00
Laurent Destailleur
26d4875f8f Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 02:27:23 +02:00
Laurent Destailleur
6c4a4c34c4 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-18 02:26:40 +02:00
Laurent Destailleur
b33d0fcb26
Merge pull request #11201 from homer8173/develop
missing file on bom
2019-05-18 02:24:59 +02:00
Laurent Destailleur
a850c7aede Fix if setup not complete 2019-05-18 02:22:23 +02:00
Laurent Destailleur
d4f356c8f6
Merge pull request #11200 from atm-maxime/fix_project_beluga
Fix project beluga order status
2019-05-18 02:16:50 +02:00
Laurent Destailleur
c6af18b240 Remove infosin debug too dangerous for security 2019-05-18 01:38:42 +02:00
Laurent Destailleur
9e38f3122d Update for pgsql 2019-05-18 01:26:44 +02:00
Norbert Penel / OSCSS
26fd2ee99d missing file on bom
agenda was not here
2019-05-18 01:14:35 +02:00
Laurent Destailleur
a44c454a18 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-18 01:13:34 +02:00
Laurent Destailleur
bf6dc0ab20 Update changelog 2019-05-18 01:13:29 +02:00
Maxime Kohlhaas
095fd2769a Fix project beluga order status 2019-05-18 01:11:34 +02:00