lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
67,832 Commits 43 Branches 150 Tags 886 MiB
dfc42e56d3
Commit Graph

67832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
dfc42e56d3 Better log 2018-07-03 17:15:52 +02:00
Laurent Destailleur
f7b8e09268 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
 2018-07-03 13:53:34 +02:00
Laurent Destailleur
f93f5bd6e0 Fix travis 2018-07-03 13:49:41 +02:00
Laurent Destailleur
2a8f98be65 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:48:26 +02:00
Laurent Destailleur
da7b433cd0 Trans 2018-07-03 12:46:22 +02:00
Laurent Destailleur
e1e813b895 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:26 +02:00
Laurent Destailleur
12c43d7722 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-03 12:33:17 +02:00
Laurent Destailleur
cfb41d4329 FIX: If module workflow disabled, we must disable autoclassification too 2018-07-03 11:43:50 +02:00
Laurent Destailleur
7ef6b16d31 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/step1.php
 2018-07-03 10:04:25 +02:00
Laurent Destailleur
0138b0e0b7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-03 10:01:30 +02:00
Laurent Destailleur
01e8f78c30 Trans 2018-07-03 09:58:36 +02:00
Laurent Destailleur
c2499f298c Fix bad name of field 2018-07-02 18:08:55 +02:00
Laurent Destailleur
0f77e3c05c Fix bad name of field 2018-07-02 17:57:32 +02:00
Laurent Destailleur
3c176adb38 Fix more complete fix for bad label in creating invoice from other obj 2018-07-02 16:46:30 +02:00
Laurent Destailleur
cae7cabe6d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-02 16:22:55 +02:00
Laurent Destailleur
b22754c60b FIX label of source object 2018-07-02 16:22:40 +02:00
Laurent Destailleur
e72107422b
Merge pull request #9040 from defrance/patch-122 
add holliday_admin_prepare_head
 2018-07-02 16:18:25 +02:00
Laurent Destailleur
9a1c4238a3
Merge pull request #9037 from hregis/8.0_bug 
Fix: changelog
 2018-07-02 16:13:11 +02:00
Laurent Destailleur
4e7f9b1b4d
Merge pull request #9038 from hregis/8.0_multicompany 
Fix: possibility to overload permissions (multicompany sharing)
 2018-07-02 16:12:40 +02:00
Laurent Destailleur
5138a09db3 Fix sql of time spent per day 2018-07-02 15:54:21 +02:00
Laurent Destailleur
7c5aa148d9 Fix fetch 2018-07-02 15:26:01 +02:00
Laurent Destailleur
f9fa19e7ae Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-07-02 12:26:45 +02:00
Laurent Destailleur
9c5d34fc5f Fix translation 2018-07-02 12:26:32 +02:00
Laurent Destailleur
a2c89d8110 Fix page code in pdf 2018-07-02 12:25:09 +02:00
Laurent Destailleur
63f3143718 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-02 12:18:34 +02:00
Laurent Destailleur
dc69960b00 Code comment 2018-07-02 12:17:34 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
 2018-07-02 12:16:51 +02:00
Laurent Destailleur
af21222c30 Fix translation 2018-07-02 11:47:04 +02:00
Laurent Destailleur
e8b97b0be4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-07-02 11:33:49 +02:00
Laurent Destailleur
11021353da Fix text in payment area of crabe pdf 2018-07-02 11:33:33 +02:00
Regis Houssin
9709207a4f Fix: superadmin can show all users in master entity 2018-07-02 10:18:16 +02:00
Regis Houssin
df718cca5c Fix: better sql request with multicompany transverse mode 2018-07-02 10:09:56 +02:00
Laurent Destailleur
fec9a96ad1 Fix travis 2018-07-02 09:34:34 +02:00
Laurent Destailleur
7e7d419e2d Test travis 2018-07-02 08:43:08 +02:00
Laurent Destailleur
93184c5f66 Fix travis 2018-07-01 23:57:54 +02:00
Laurent Destailleur
884e8cee90 Test travis 2018-07-01 23:39:14 +02:00
Laurent Destailleur
41e1370f7a Fix travis 2018-07-01 23:27:27 +02:00
Laurent Destailleur
a04055dc47 Fix travis 2018-07-01 23:17:12 +02:00
Laurent Destailleur
c03d7b97db Test travis 2018-07-01 23:14:03 +02:00
Laurent Destailleur
216df5622f Test travis 2018-07-01 23:00:10 +02:00
Laurent Destailleur
c92d341996 Test travis 2018-07-01 22:56:23 +02:00
Laurent Destailleur
26306c90f4 Better log 2018-07-01 22:46:54 +02:00
Laurent Destailleur
c0eac8600d Test travis 2018-07-01 22:41:09 +02:00
Laurent Destailleur
2872cf0c2a Fix travis 2018-07-01 21:16:36 +02:00
Laurent Destailleur
0297290365 Travis test 2018-07-01 21:13:29 +02:00
Regis Houssin
233ad2945c Fix: missing hook parameter 2018-07-01 20:03:08 +02:00
Regis Houssin
26495fb698 Fix: !!!! Dont't use entity if you use rowid in fetch or others !!!! 2018-07-01 18:49:37 +02:00
Regis Houssin
f13dd9c9bd Fix: missing hook parameter 2018-07-01 18:22:18 +02:00
Regis Houssin
8f124efc15 Fix: wrong mysql resource name 2018-07-01 17:48:01 +02:00
BENKE Charlene
43c5d7abdc
add holliday_admin_prepare_head 
sorry eldy i forget it
 2018-07-01 17:33:35 +02:00