Laurent Destailleur
|
a08a0b4c1d
|
Merge pull request #10469 from atm-gauthier/7.0_fix_wrong_test_enabled
FIX : wrong test enabled
|
2019-02-01 15:34:55 +01:00 |
|
Laurent Destailleur
|
7fc00001d5
|
Merge pull request #10470 from frederic34/patch-2
remove psr2 else if warning
|
2019-02-01 15:34:23 +01:00 |
|
Laurent Destailleur
|
959d29dc8f
|
Merge pull request #10465 from andreubisquerra/master
Subcategories in TakePOS
|
2019-02-01 15:33:44 +01:00 |
|
Laurent Destailleur
|
75252283c0
|
Merge branch 'develop' into master
|
2019-02-01 15:33:36 +01:00 |
|
Laurent Destailleur
|
cc17aff405
|
Merge pull request #10472 from atm-florian/8.0
FIX : quick search for supplier orders
|
2019-02-01 15:31:57 +01:00 |
|
Laurent Destailleur
|
aa9feaec55
|
Update doc
|
2019-02-01 15:19:57 +01:00 |
|
Laurent Destailleur
|
eb3621839a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
|
2019-02-01 15:14:19 +01:00 |
|
Laurent Destailleur
|
97c8bca5ee
|
Fix doc
|
2019-02-01 15:09:05 +01:00 |
|
Laurent Destailleur
|
95a6957035
|
Fix setup doc
|
2019-02-01 15:04:44 +01:00 |
|
Laurent Destailleur
|
ae81bbac93
|
Better var name
|
2019-02-01 13:49:07 +01:00 |
|
Laurent Destailleur
|
b14a16a119
|
Code comment
|
2019-02-01 13:48:09 +01:00 |
|
Laurent Destailleur
|
849b3b640b
|
Code comment
|
2019-02-01 13:41:23 +01:00 |
|
Francis Appels
|
c4915c679a
|
Merge develop
|
2019-02-01 11:47:03 +01:00 |
|
Francis Appels
|
2c5623c53e
|
check if price already logged, if not first log current price
|
2019-02-01 11:37:46 +01:00 |
|
ATM-Nicolas
|
2cbb58c2eb
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_contact_related_item_tab
|
2019-02-01 10:54:42 +01:00 |
|
ATM-Nicolas
|
f432a874e6
|
NEW : Contact related items tab
|
2019-02-01 10:51:28 +01:00 |
|
florian HENRY
|
f7bed44441
|
FIX : quick search for supplier orders
|
2019-01-31 21:39:02 +01:00 |
|
Laurent Destailleur
|
3e6aef472d
|
css
|
2019-01-31 20:53:59 +01:00 |
|
Laurent Destailleur
|
a0c0b377b2
|
css
|
2019-01-31 20:53:47 +01:00 |
|
Laurent Destailleur
|
c05628c746
|
Fix edit member module setup
|
2019-01-31 20:27:55 +01:00 |
|
Pierre Ardoin
|
2d6f5ca8ab
|
#Fix : Error in Total Products/Services
Its correct an error in the total of stat Products/Services total.
|
2019-01-31 20:22:56 +01:00 |
|
Laurent Destailleur
|
0a56069f67
|
Fix trans
|
2019-01-31 19:42:55 +01:00 |
|
Frédéric FRANCE
|
b89b0e683a
|
remove psr2 else if warning
|
2019-01-31 18:32:39 +01:00 |
|
Frédéric FRANCE
|
b2e2b2e186
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-31 18:27:27 +01:00 |
|
Laurent Destailleur
|
189323ad58
|
Fix when using image into description
|
2019-01-31 18:12:34 +01:00 |
|
Laurent Destailleur
|
4254ad0d33
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-31 15:51:54 +01:00 |
|
Laurent Destailleur
|
14dea53700
|
FIX Missing field in import/export of users
|
2019-01-31 15:51:02 +01:00 |
|
Philippe GRAND
|
c5bbaa4aa3
|
fix translation
|
2019-01-31 15:15:18 +01:00 |
|
Philippe GRAND
|
7cf51a5e35
|
fix translation
|
2019-01-31 14:05:55 +01:00 |
|
Philippe GRAND
|
1501ce2c9f
|
update with html5 compliant code
|
2019-01-31 13:34:32 +01:00 |
|
Philippe GRAND
|
6c6a8db2df
|
update with html5 compliant code
|
2019-01-31 13:29:34 +01:00 |
|
Laurent Destailleur
|
fd67253e40
|
Clean package
|
2019-01-31 13:16:54 +01:00 |
|
Laurent Destailleur
|
57797b1309
|
Remove image
|
2019-01-31 12:48:51 +01:00 |
|
gauthier
|
caa937660d
|
FIX : wrong test enabled
|
2019-01-31 12:43:39 +01:00 |
|
Philippe GRAND
|
0cc8053708
|
update with html5 compliant code
|
2019-01-31 12:42:38 +01:00 |
|
Philippe GRAND
|
1cda3106b2
|
update with html5 compliant code
|
2019-01-31 12:40:50 +01:00 |
|
Philippe GRAND
|
2a9c378c1f
|
update with html5 compliant code
|
2019-01-31 12:35:49 +01:00 |
|
Philippe GRAND
|
ff46a0ee30
|
update with html5 compliant code
|
2019-01-31 12:33:01 +01:00 |
|
gauthier
|
bfc7265cbc
|
FIX : better test on fetch
|
2019-01-31 11:53:10 +01:00 |
|
Laurent Destailleur
|
4c31749f4b
|
Add tooltip on setup
|
2019-01-31 11:11:56 +01:00 |
|
gauthier
|
09ba059c21
|
FIX : need an order by in case we found other invoice with same number but not same date
|
2019-01-31 11:03:06 +01:00 |
|
Laurent Destailleur
|
2bed90e9db
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/sociales/class/chargesociales.class.php
|
2019-01-31 10:24:52 +01:00 |
|
Laurent Destailleur
|
7d4475f812
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-31 10:23:16 +01:00 |
|
Laurent Destailleur
|
4c2b27560d
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/viewimage.php
|
2019-01-31 10:22:32 +01:00 |
|
Laurent Destailleur
|
484b4371c1
|
FIX XSS
Conflicts:
htdocs/viewimage.php
|
2019-01-31 10:19:23 +01:00 |
|
Laurent Destailleur
|
5e46a359e0
|
FIX XSS
|
2019-01-31 10:18:06 +01:00 |
|
Laurent Destailleur
|
21c089fee9
|
FIX XSS
|
2019-01-31 10:17:29 +01:00 |
|
Laurent Destailleur
|
6121771c5f
|
FIX XSS
|
2019-01-31 10:16:49 +01:00 |
|
gauthier
|
0c4e5a6487
|
FIX : better test
|
2019-01-31 09:30:07 +01:00 |
|
Laurent Destailleur
|
045b8b13ed
|
css
|
2019-01-30 23:20:57 +01:00 |
|