Commit Graph

76532 Commits

Author SHA1 Message Date
Laurent Destailleur
3c1b860da4 Fix css 2019-05-20 12:16:39 +02:00
ATM-Nicolas
5def839813 FIX : Padding on create project icon 2019-05-20 11:56:26 +02:00
Laurent Destailleur
6780befb2d Fix css 2019-05-19 21:59:03 +02:00
Laurent Destailleur
c92994f7ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-19 19:15:28 +02:00
Laurent Destailleur
e84e3ef01f Move module into external module 2019-05-19 19:15:18 +02:00
Laurent Destailleur
27ed095181 Debug BOM module 2019-05-19 16:40:25 +02:00
Laurent Destailleur
2debffe170 Debug modulebuilder for lines 2019-05-19 16:21:11 +02:00
Laurent Destailleur
2900f8828a Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-19 13:52:28 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Laurent Destailleur
d86fc28aba Fix CSS 2019-05-19 13:01:11 +02:00
Frédéric FRANCE
a368a6a43e
Update adherent_type.class.php 2019-05-19 11:52:34 +02:00
Alexandre SPANGARO
5a05cc184b Fix Accountancy Export OpenConcerto 2019-05-19 10:48:43 +02:00
Frédéric FRANCE
a09584ae4b
The method _load_ldap_dn() cannot be called...
The method _load_ldap_dn() cannot be called from this context as it is declared private in class AdherentType.
2019-05-19 09:46:47 +02:00
Frédéric FRANCE
7b317c4cbf
printObjectLines return void 2019-05-19 09:28:34 +02:00
Frédéric FRANCE
ff37fddcf1
Update myobject_agenda.php 2019-05-19 09:16:45 +02:00
Frédéric FRANCE
53a09a0dd4
Update agenda.php 2019-05-19 09:15:51 +02:00
Frédéric FRANCE
c8027ccf1a
Update agenda.php 2019-05-19 09:15:10 +02:00
Frédéric FRANCE
7d66cc1ab1
Update agenda.php 2019-05-19 09:14:29 +02:00
Frédéric FRANCE
06421c200d
Update agenda.php 2019-05-19 09:13:46 +02:00
Frédéric FRANCE
19085ed200
dol_print_object_info return void 2019-05-19 09:08:59 +02:00
Laurent Destailleur
3109f8e07a
Merge pull request #11217 from inoveaconseil/FIX11135
FIX #11135
2019-05-19 02:23:49 +02:00
Laurent Destailleur
4b3d0ed50c
Update user.class.php 2019-05-19 02:21:42 +02:00
Laurent Destailleur
ea5ffbb0bf
Merge pull request #11216 from atm-florian/8.0
fix:  #11187
2019-05-19 02:19:12 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:15:01 +02:00
Nicolas ZABOURI
61c17f8d0f FIX #11135 2019-05-19 02:06:37 +02:00
Laurent Destailleur
71ef8c881b Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
2019-05-19 02:06:20 +02:00
florian HENRY
e4d87ab2e7 fix: #11189 2019-05-19 02:05:13 +02:00
Laurent Destailleur
7738787729 Merge branch '7.0' of https://github.com/dolibarr/dolibarr into 8.0
Conflicts:
	htdocs/core/actions_sendmails.inc.php
2019-05-19 02:03:16 +02:00
florian HENRY
6e7fe1a6c2 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr into 8.0 2019-05-19 01:58:38 +02:00
florian HENRY
4311a1ece8 fix: #11187 2019-05-19 01:58:20 +02:00
Laurent Destailleur
0f3ae6dc39
Merge pull request #11215 from ATM-Marc/FIX_8.0_invoice_default_product_type
FIX: invoice class: bad SQL request if product type not set
2019-05-19 01:58:13 +02:00
Laurent Destailleur
2fd3eb8bdf
Update facture.class.php 2019-05-19 01:58:01 +02:00
Laurent Destailleur
91fce6bd2b
Merge pull request #11213 from atm-florian/develop
fix missing migration sql for ticket now stable on 10
2019-05-19 01:56:34 +02:00
Laurent Destailleur
684cbbdddb
Merge pull request #11212 from ATM-Marc/FIX_8.0_modulebuilder_foreignkey
FIX: modulebuilder: hardcoded llx_
2019-05-19 01:55:02 +02:00
Laurent Destailleur
234ad4c76a
Merge pull request #11214 from atm-maxime/7.0
Fix #8344
2019-05-19 01:53:13 +02:00
florian HENRY
7f8c118466 fix: #11015 2019-05-19 01:52:50 +02:00
florian HENRY
272b5f7d6a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-05-19 01:52:14 +02:00
Laurent Destailleur
32485c2782 Fix phpcs 2019-05-19 01:45:33 +02:00
Laurent Destailleur
a4cea5b877 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-05-19 01:41:53 +02:00
Laurent Destailleur
c6ccb92a51 Fix table shown when there is no perm
Fix edit admin status of another admin
2019-05-19 01:41:42 +02:00
ATM-Marc
83c38570e9 FIX: invoice class: bad SQL request if product type not set 2019-05-19 01:01:21 +02:00
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