Laurent Destailleur
|
a832bbb348
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/facture/stats/index.php
|
2017-12-01 16:18:03 +01:00 |
|
Laurent Destailleur
|
5308acdcde
|
Merge pull request #7895 from atm-alexis/FIX_add_line_bad_price_and_ref
FIX add line bad price and ref
|
2017-12-01 16:03:21 +01:00 |
|
Alexis ALGOUD
|
b2effa7cc8
|
fix travis
|
2017-11-30 11:36:35 +01:00 |
|
root
|
b7f26ea788
|
FIX add line bad price and ref
|
2017-11-30 11:10:01 +01:00 |
|
Laurent Destailleur
|
d2135fd139
|
Merge pull request #7888 from atm-gauthier/5.0_fix_where_fk_status
FIX : test for filter fk_status
|
2017-11-29 15:32:51 +01:00 |
|
Laurent Destailleur
|
acd2d0121d
|
Merge pull request #7886 from ptibogxiv/patch-8
Fix for multicompany
|
2017-11-29 15:31:21 +01:00 |
|
Laurent Destailleur
|
9fa6bfd1a5
|
Fix edit external user or not
|
2017-11-29 15:30:41 +01:00 |
|
Laurent Destailleur
|
359e82fd3e
|
Merge pull request #7884 from jfefe/patch-15
FIX : external user cannot be set as internal
|
2017-11-29 15:07:18 +01:00 |
|
Laurent Destailleur
|
dbde97f25f
|
Update card.php
|
2017-11-29 15:07:09 +01:00 |
|
gauthier
|
f04af6c1b3
|
FIX : test for filter fk_status
|
2017-11-29 11:06:33 +01:00 |
|
ptibogxiv
|
c194538609
|
Update fraise.modules.php
|
2017-11-29 10:45:16 +01:00 |
|
ptibogxiv
|
883c9dbf99
|
Fix for multicompany
last fix for multicompany compliance
|
2017-11-29 09:28:03 +01:00 |
|
jfefe
|
d0ab117488
|
FIX : external user cannot be set as internal
|
2017-11-28 15:06:23 +01:00 |
|
Laurent Destailleur
|
3071796bc3
|
Merge pull request #7876 from ptibogxiv/patch-6
fix for multicompany
|
2017-11-28 12:12:50 +01:00 |
|
Laurent Destailleur
|
fa1bb9d672
|
Merge pull request #7874 from ptibogxiv/patch-4
Fix stat don in multicompany
|
2017-11-28 12:10:35 +01:00 |
|
ptibogxiv
|
a9e4fcfdca
|
Update fraise.modules.php
|
2017-11-27 15:49:28 +01:00 |
|
ptibogxiv
|
780e8ce470
|
fix for multicompany
|
2017-11-27 15:13:14 +01:00 |
|
ptibogxiv
|
2e9952439e
|
Fix stat don in multicompany
|
2017-11-27 15:03:34 +01:00 |
|
Laurent Destailleur
|
61798d1af0
|
FIX list of module not complete when module mb_strlen not available
Conflicts:
dev/dolibarr_changes.txt
|
2017-11-25 02:34:24 +01:00 |
|
Laurent Destailleur
|
4cbcf5189a
|
FIX #7806
|
2017-11-25 01:24:24 +01:00 |
|
Laurent Destailleur
|
38c770ffb3
|
FIX #7806
|
2017-11-25 01:16:12 +01:00 |
|
Laurent Destailleur
|
07cd1fb3c2
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-11-24 16:54:38 +01:00 |
|
Laurent Destailleur
|
2493c2468d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/core/class/conf.class.php
htdocs/core/lib/files.lib.php
|
2017-11-24 16:51:59 +01:00 |
|
Laurent Destailleur
|
306dcf3600
|
Merge pull request #7863 from atm-quentin/6.0
FIX too much users on holiday list
|
2017-11-24 16:39:06 +01:00 |
|
Laurent Destailleur
|
c2f84309db
|
Update holiday.class.php
|
2017-11-24 16:38:52 +01:00 |
|
atm-quentin
|
314c30f489
|
FIX too much users on holiday list
|
2017-11-23 14:26:26 +01:00 |
|
Laurent Destailleur
|
1e4844fd1c
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-11-22 17:25:49 +01:00 |
|
Laurent Destailleur
|
e1344eb97c
|
Fix edit of time spent
|
2017-11-22 17:25:31 +01:00 |
|
Laurent Destailleur
|
356f36c5bf
|
Merge pull request #7851 from atm-gauthier/5.0_backport_feature
Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876)
|
2017-11-22 11:58:09 +01:00 |
|
Laurent Destailleur
|
9a75cb466a
|
Merge pull request #7834 from ptibogxiv/patch-2
FIX list of donation not filtered on multicompany
|
2017-11-22 11:23:13 +01:00 |
|
Laurent Destailleur
|
dc5127e619
|
Merge pull request #7831 from ptibogxiv/patch-1
FIX createfromorder
|
2017-11-22 11:17:00 +01:00 |
|
Regis Houssin
|
a9bfe0f48f
|
Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876)
|
2017-11-22 10:12:51 +01:00 |
|
ptibogxiv
|
5d6555b9dd
|
Update list.php
|
2017-11-19 21:54:14 +01:00 |
|
ptibogxiv
|
3f360601af
|
Fix entity
Fix entity in list.php
|
2017-11-19 21:52:18 +01:00 |
|
ptibogxiv
|
35182066a8
|
update createfromorder
lack of 2 fields date_start and date_end not imported from order
|
2017-11-19 16:25:35 +01:00 |
|
Laurent Destailleur
|
a6e4e4ddb0
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/product/stock/replenishorders.php
|
2017-11-17 14:17:49 +01:00 |
|
Laurent Destailleur
|
c3c14277e1
|
Merge
|
2017-11-17 14:15:07 +01:00 |
|
Laurent Destailleur
|
42b7d80567
|
FIX #7824
Conflicts:
htdocs/product/stock/replenishorders.php
|
2017-11-17 14:12:53 +01:00 |
|
Laurent Destailleur
|
fde33594a2
|
FIX #7824
|
2017-11-17 14:06:08 +01:00 |
|
Laurent Destailleur
|
7f28c9fff6
|
FIX #7824
Conflicts:
htdocs/product/stock/replenishorders.php
|
2017-11-17 14:01:21 +01:00 |
|
Laurent Destailleur
|
57a6ada2a3
|
FIX #7824
|
2017-11-17 13:57:40 +01:00 |
|
Laurent Destailleur
|
5741d4d67d
|
Merge pull request #7811 from atm-florian/6.0_fixvatcodesupplier
fix : return vat code for supplier price
|
2017-11-17 13:02:56 +01:00 |
|
Laurent Destailleur
|
4b90510b82
|
Fix time assigned to wrong user
|
2017-11-16 22:35:55 +01:00 |
|
Laurent Destailleur
|
924cf871a7
|
FIX CSS for IE10
|
2017-11-15 10:40:24 +01:00 |
|
Laurent Destailleur
|
77b6ef7396
|
Code comment
|
2017-11-14 19:41:57 +01:00 |
|
Laurent Destailleur
|
388b90a94c
|
Fix repair of utf8
|
2017-11-14 19:00:52 +01:00 |
|
Laurent Destailleur
|
f789714f14
|
Fix translation
|
2017-11-14 18:16:01 +01:00 |
|
florian HENRY
|
e195cf0b95
|
fix : return vat code for supplier price
|
2017-11-14 09:53:06 +01:00 |
|
Laurent Destailleur
|
a2c80a704f
|
Code comment
|
2017-11-13 19:06:58 +01:00 |
|
Laurent Destailleur
|
b5196b7164
|
FIX A lot of several fix on local taxes and NPR tax
|
2017-11-13 14:24:40 +01:00 |
|