Commit Graph

1978 Commits

Author SHA1 Message Date
Frédéric FRANCE
850ac34020 mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +02:00
Laurent Destailleur
3d4d42462c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-12 16:30:21 +02:00
Laurent Destailleur
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
Laurent Destailleur
39f4eae07e Fix look and feel v8 2018-08-09 23:11:49 +02:00
Philippe GRAND
59cd0a5e5e uniformize 2018-08-04 15:58:05 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
Juanjo Menent
37a9a2df56 Merge pull request #9167 from frederic34/include
Include and co are statements
2018-08-02 11:03:44 +02:00
Juanjo Menent
738caa605f Merge pull request #9160 from hregis/develop_api
FIX compatibility with multicompany transverse mode
2018-08-02 10:57:27 +02:00
Philippe GRAND
541e919ae0 Clean and update code 2018-07-27 14:49:33 +02:00
Regis Houssin
e1877625a0 FIX clean code 2018-07-27 13:42:44 +02:00
Frédéric FRANCE
a0a5d33641 test include 2018-07-26 17:30:53 +02:00
Regis Houssin
e48eec583d FIX compatibility with multicompany transverse mode 2018-07-25 17:00:49 +02:00
Regis Houssin
ff733c5ad7 FIX clean code 2018-07-24 20:10:27 +02:00
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Laurent Destailleur
438cdfc004 FIX #9141 2018-07-24 17:16:21 +02:00
Philippe GRAND
010c5af245 Clean and update code 2018-07-19 16:48:20 +02:00
Laurent Destailleur
387abf2da8 Merge pull request #9057 from inoveaconseil/checkRightOnLink
ADD Check right on link
2018-07-16 09:31:21 +02:00
Laurent Destailleur
d968a61445 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-15 20:17:17 +02:00
Laurent Destailleur
f3b7bc53bd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
2018-07-15 20:16:08 +02:00
atm-ph
0c252d9778 Fix user rights overrided by user group rights 2018-07-11 18:09:29 +02:00
Laurent Destailleur
31d5b739e7 Merge pull request #9048 from hregis/8.0_rights
NEW possibility to add all rights of all modules in one time
2018-07-10 10:38:17 +02:00
Laurent Destailleur
fb84211714 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-06 12:45:44 +02:00
Laurent Destailleur
af3ab84ebb Fix backward compatibility with old multicompany module 2018-07-05 22:15:55 +02:00
Inovea Conseil
30cff2bb36 ADD check user's rights 2018-07-05 11:52:41 +02:00
Regis Houssin
d796199ed0 Fix: avoid warning with multicompany tranverse mode 2018-07-04 14:48:00 +02:00
Regis Houssin
ca13d7b560 NEW possibility to add all rights of all modules in one time 2018-07-03 21:46:20 +02:00
Laurent Destailleur
fec9a96ad1 Fix travis 2018-07-02 09:34:34 +02:00
Laurent Destailleur
982a1ffbaf NEW Automatic position of scroll when creating an extrafield 2018-06-30 14:22:05 +02:00
Laurent Destailleur
a9e78f27d9 Merge branch 'develop' into patch-115 2018-06-30 01:21:58 +02:00
Laurent Destailleur
eb88f1e5c9 Fix look and feel v8 2018-06-23 12:41:03 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Laurent Destailleur
ad2df304b4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/fourn/commande/card.php
	htdocs/societe/class/societe.class.php
2018-06-18 13:31:29 +02:00
atm-ph
3c80ce501b Fix missing hook on usercard (addMoreActionsButtons) 2018-06-15 16:05:50 +02:00
Inovea Conseil
d5a3e63e05 Fix missing paramater for generateDocument 2018-06-15 09:47:28 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Laurent Destailleur
916424943e Merge pull request #8942 from grandoc/new_branch_10_06_2018
New branch 10 06 2018
2018-06-13 20:48:22 +02:00
Laurent Destailleur
e983566422 Merge pull request #8947 from glu000/develop
Fix for Bug #8946
2018-06-13 20:41:54 +02:00
Günter Lukas
fcbf50467e Update user.class.php 2018-06-12 09:52:55 +02:00
Günter Lukas
3c42a282f5 Fix for Bug #8946
Add element fields to class user
2018-06-12 09:48:03 +02:00
Philippe GRAND
9a44a433b8 clean code 2018-06-07 18:32:00 +02:00
Philippe GRAND
4fd2468b6f clean code 2018-06-07 18:13:00 +02:00
Laurent Destailleur
6e62727c37 Fix scrutinizer bug 2018-06-06 18:18:50 +02:00
Laurent Destailleur
29ee5dffc4 Clean code 2018-06-04 12:55:55 +02:00
Frédéric FRANCE
812b182680 loadlangs 2018-05-26 17:04:23 +02:00
Frédéric FRANCE
e87ff4d9b0 loadlangs 2018-05-26 16:24:54 +02:00
Laurent Destailleur
e51aa68284 Fix link to warehouses for events 2018-05-24 12:16:04 +02:00
BENKE Charlene
0dad083cb5 Update card.php 2018-05-12 18:05:06 +02:00
BENKE Charlene
caa35e0359 Update user.class.php 2018-05-12 17:59:43 +02:00