Laurent Destailleur
|
b671edb116
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-12-08 13:10:30 +01:00 |
|
Laurent Destailleur
|
09d3db145b
|
Merge
|
2017-12-08 13:10:13 +01:00 |
|
Laurent Destailleur
|
8dc3d7323d
|
Merge pull request #7923 from fmarcet/6.0
FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
|
2017-12-08 13:02:07 +01:00 |
|
Laurent Destailleur
|
9b9b5adf66
|
Fix must be compatible with old and new storage location
|
2017-12-08 13:01:45 +01:00 |
|
Laurent Destailleur
|
08abb1490a
|
Remove code using not defined var
|
2017-12-08 12:54:08 +01:00 |
|
Laurent Destailleur
|
8a5c53550b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-08 12:43:53 +01:00 |
|
Laurent Destailleur
|
049a038f56
|
Merge pull request #7925 from hregis/5.0_bug
Fix: wrong translation if multilang activated
|
2017-12-08 12:43:37 +01:00 |
|
Laurent Destailleur
|
e526162e8e
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-08 12:42:22 +01:00 |
|
Regis Houssin
|
1b16eb731d
|
Fix: missing load product translation file
|
2017-12-08 11:00:23 +01:00 |
|
Regis Houssin
|
1bdffa961f
|
Fix: wrong translation if multilang activated
|
2017-12-08 10:41:14 +01:00 |
|
Laurent Destailleur
|
6de3a40546
|
Merge pull request #7916 from atm-ph/fix_4.0_require_class
Fix include class WorkboardResponse
|
2017-12-08 10:40:26 +01:00 |
|
Laurent Destailleur
|
5f71165020
|
Merge pull request #7924 from hregis/6.0_bug2
Fix: Avoid warning "A non-numeric value encountered"
|
2017-12-08 10:34:54 +01:00 |
|
Regis Houssin
|
04327189f7
|
Fix: access error when user not right to view all customers
|
2017-12-08 09:41:33 +01:00 |
|
Regis Houssin
|
c4b2c3e697
|
FIXME $accounts[$bid] is a label !
|
2017-12-08 09:17:12 +01:00 |
|
Regis Houssin
|
8e1a9064cb
|
Fix: avoid warning again
|
2017-12-08 09:00:05 +01:00 |
|
Regis Houssin
|
95fa183fac
|
Fix: Avoid warning "A non-numeric value encountered"
|
2017-12-08 08:49:03 +01:00 |
|
Ferran Marcet
|
bfc476a118
|
FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
|
2017-12-07 18:44:33 +01:00 |
|
atm-ph
|
c90ece1188
|
Fix include class WorkboardResponse
|
2017-12-06 14:22:37 +01:00 |
|
Laurent Destailleur
|
340287f073
|
FIX #7903
Conflicts:
htdocs/holiday/class/holiday.class.php
|
2017-12-05 11:56:32 +01:00 |
|
Laurent Destailleur
|
365639a6c0
|
Prepare 6.0.5
|
2017-12-05 11:54:26 +01:00 |
|
Laurent Destailleur
|
44e5566ee5
|
Update changelog
|
2017-12-02 14:17:49 +01:00 |
|
Laurent Destailleur
|
38be224665
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-12-02 14:14:26 +01:00 |
|
Laurent Destailleur
|
29568287ef
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-02 14:13:44 +01:00 |
|
Laurent Destailleur
|
5fae19b4d6
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-02 14:13:29 +01:00 |
|
Laurent Destailleur
|
c7d0e917fb
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-12-02 14:12:43 +01:00 |
|
Laurent Destailleur
|
9cafb08759
|
Merge pull request #7853 from atm-ph/fix_5.0_invoice_updateline_calcul_price_total
Fix product type is ignored and can generate a diffrent result with s…
|
2017-12-02 14:06:25 +01:00 |
|
Laurent Destailleur
|
03fd69c3b9
|
Fix missing lang
|
2017-12-01 16:48:43 +01:00 |
|
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 |
|
atm-ph
|
5fef6478a5
|
Fix wrong calcul_price_total() update
|
2017-11-27 11:26:41 +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 |
|