Philippe GRAND
0dc812cf10
precise label comment
2018-09-01 13:02:27 +02:00
Philippe GRAND
0e5d4206c9
Merge remote-tracking branch 'upstream/develop' into develop
2018-09-01 12:47:34 +02:00
Laurent Destailleur
8bd231adb0
Merge pull request #9357 from joseplluis/patch-3
...
FIX undefined rights_class on modules may lose setup when module disabled
2018-09-01 12:42:22 +02:00
Laurent Destailleur
007381907e
Merge pull request #9356 from ptibogxiv/patch-52
...
Add shipping_method label in fetch
2018-09-01 12:40:26 +02:00
Philippe GRAND
1944ef0dc3
conflict resolution
2018-09-01 12:38:22 +02:00
Laurent Destailleur
8341765375
Merge pull request #9351 from frederic34/patch-9
...
restore build badge for develop
2018-09-01 12:37:28 +02:00
Laurent Destailleur
9f33d586ff
Merge pull request #9346 from frederic34/patch-16
...
Create index.html
2018-09-01 12:34:10 +02:00
Laurent Destailleur
b89202572e
Merge pull request #9342 from ptibogxiv/patch-51
...
fix multicompany and footer ticket public page
2018-09-01 12:33:55 +02:00
Laurent Destailleur
fc5ebc8099
Merge pull request #9340 from ptibogxiv/patch-49
...
Fix image if multicompany + no login in onlinesign
2018-09-01 12:32:38 +02:00
Laurent Destailleur
cbe89af8f3
Merge pull request #9339 from ptibogxiv/patch-48
...
add logo with multicompany
2018-09-01 12:31:56 +02:00
Laurent Destailleur
0913b871aa
Merge pull request #9338 from ptibogxiv/patch-47
...
Fix multicompany
2018-09-01 12:30:53 +02:00
Laurent Destailleur
59a27085fd
Merge pull request #9336 from ptibogxiv/patch-45
...
fix multicompany in public ticket page
2018-09-01 12:20:06 +02:00
Laurent Destailleur
bb22d5e083
Merge pull request #9341 from ptibogxiv/patch-50
...
header/footer uniformization in ticket public page
2018-09-01 12:19:18 +02:00
Laurent Destailleur
3b1cf41823
Fix eol
2018-09-01 12:17:52 +02:00
Laurent Destailleur
c7020d4243
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-09-01 12:11:13 +02:00
Laurent Destailleur
b863b5176d
Merge pull request #9322 from grandoc/new_branch_29_08_2018
...
New branch 29 08 2018
2018-09-01 12:11:01 +02:00
Laurent Destailleur
c791f37da9
Doc
2018-09-01 12:09:40 +02:00
Laurent Destailleur
c47d65702f
Merge pull request #9334 from frederic34/patch-10
...
Update config for blockedlog.lang
2018-09-01 12:09:12 +02:00
Laurent Destailleur
9b8be2f7db
Merge pull request #9343 from frederic34/patch-13
...
Create index.html
2018-09-01 12:07:54 +02:00
Laurent Destailleur
b89f69df79
Merge pull request #9345 from frederic34/patch-15
...
Create index.html
2018-09-01 12:07:20 +02:00
Laurent Destailleur
14a64e438e
Merge pull request #9344 from frederic34/patch-14
...
Create index.html
2018-09-01 12:07:09 +02:00
Laurent Destailleur
482ddd548a
Merge pull request #9332 from frederic34/functionClosingBrace
...
PSR2 FunctionClosingBrace
2018-09-01 12:06:08 +02:00
Laurent Destailleur
28fe74bf13
FIX #9371
2018-09-01 11:57:18 +02:00
Laurent Destailleur
bb2f5ad588
Fix missing migration
2018-09-01 11:30:14 +02:00
Philippe GRAND
3a8bde227b
Standardize and update code
2018-08-31 19:26:08 +02:00
Philippe GRAND
bb05e80a87
Standardize and update code
2018-08-31 18:47:25 +02:00
Philippe GRAND
edaa575435
Standardize and update code
2018-08-31 18:36:15 +02:00
Philippe GRAND
70ae8c6081
Standardize and update code
2018-08-31 18:27:16 +02:00
Philippe GRAND
2f307aae21
Standardize and update code
2018-08-31 18:06:17 +02:00
Philippe GRAND
9e880d3e72
Standardize and update code
2018-08-31 17:55:31 +02:00
Philippe GRAND
7973489f8a
fix display comment issue
2018-08-31 17:18:08 +02:00
Philippe GRAND
cd6ea37ea0
Merge branch 'new_branch_30_08_2018' of github.com:grandoc/dolibarr into develop
2018-08-31 17:10:10 +02:00
Philippe GRAND
a62a5ab636
Merge remote-tracking branch 'upstream/develop' into develop
2018-08-31 17:00:46 +02:00
Philippe GRAND
c60c38dfb3
Merge branch 'new_branch_30_08_2018' of github.com:grandoc/dolibarr into new_branch_30_08_2018
2018-08-31 16:42:38 +02:00
Philippe GRAND
6474646e4b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_branch_30_08_2018
2018-08-31 16:37:03 +02:00
Laurent Destailleur
7b1a705be4
Clean duplicate code
2018-08-31 13:50:58 +02:00
Laurent Destailleur
e7d4956f5b
Clean not used function
2018-08-31 11:29:30 +02:00
Laurent Destailleur
9cc6533d11
Fix td alignement
2018-08-30 18:57:30 +02:00
Josep Lluís
d70e548f94
Fix: undefined rights_class on modules
...
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
2018-08-30 18:12:02 +02:00
Laurent Destailleur
d14bd829fb
FIX trans on null object
2018-08-30 17:01:22 +02:00
Philippe Grand
5ec22d9fad
Update accountingaccount.class.php
2018-08-30 14:25:25 +02:00
Philippe Grand
e96e3bdf42
Update accountancycategory.class.php
2018-08-30 14:19:21 +02:00
ptibogxiv
49729c3118
Add shipping_method label
2018-08-30 13:54:10 +02:00
Philippe GRAND
ba6a48360e
Standardize and update code
2018-08-30 12:26:59 +02:00
Frédéric FRANCE
8af6c170ff
restore build badge for develop
2018-08-30 12:19:54 +02:00
Philippe Grand
b3c84ac3bc
Merge branch 'develop' into new_branch_29_08_2018
2018-08-30 12:09:40 +02:00
Philippe GRAND
2e66c65650
WTF...
2018-08-30 12:03:20 +02:00
Frédéric FRANCE
302179c739
Create index.html
2018-08-30 08:10:51 +02:00
Frédéric FRANCE
663745b787
Create index.html
2018-08-30 08:09:03 +02:00
Frédéric FRANCE
82302e5516
Create index.html
2018-08-30 08:08:01 +02:00
