Laurent Destailleur
|
4a5988accb
|
FIX security vulnerability reported by ADLab of Venustech
|
2017-12-21 12:52:19 +01:00 |
|
arnaud
|
b1ce3fc5c8
|
FIX stats trad for customerinvoice
|
2017-12-21 12:12:50 +01:00 |
|
arnaud
|
4ba039d229
|
FIX trans unactivate on contractline
|
2017-12-21 12:07:29 +01:00 |
|
arnaud
|
ae7f8c3fe4
|
FIX search on contact list
|
2017-12-21 12:01:30 +01:00 |
|
Juanjo Menent
|
dc930dd6c5
|
FIX: Bad name alias showing in name of third column
|
2017-12-20 16:46:49 +01:00 |
|
Laurent Destailleur
|
3f6b3b51ca
|
Fix css
|
2017-12-20 15:09:58 +01:00 |
|
Laurent Destailleur
|
6900771c70
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-12-20 13:17:39 +01:00 |
|
Laurent Destailleur
|
ca8ae3c723
|
Fix option MAIN_USE_JQUERY_JEDITABLE
|
2017-12-20 13:17:21 +01:00 |
|
Laurent Destailleur
|
b1f98b5903
|
Fix inline edit
|
2017-12-20 12:45:38 +01:00 |
|
Regis Houssin
|
2821459894
|
Fix: avoid php warning
|
2017-12-20 11:36:51 +01:00 |
|
Laurent Destailleur
|
a020dbf3d7
|
Merge pull request #7953 from atm-ph/fix_6.0_checkbox_credit_note
Fix since jquery 3 we can check all checkbox of credit note options
|
2017-12-16 01:13:55 +01:00 |
|
Frédéric FRANCE
|
ab558ee5fa
|
Update product.php
|
2017-12-14 09:49:55 +01:00 |
|
atm-ph
|
a2f4afbf88
|
Fix wrong or missing char for url
|
2017-12-13 16:17:22 +01:00 |
|
atm-ph
|
46770178d2
|
Fix since jquery 3 we can check all checkbox of credit note options
|
2017-12-13 15:24:09 +01:00 |
|
Laurent Destailleur
|
ef9468f78a
|
Fix missing field label
|
2017-12-12 11:48:51 +01:00 |
|
Laurent Destailleur
|
48499fb506
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-12-11 15:21:22 +01:00 |
|
Laurent Destailleur
|
f2e429e28f
|
Fix file integrity checker (exclude files excluded from package)
|
2017-12-11 15:03:34 +01:00 |
|
Laurent Destailleur
|
4017d09613
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-12-10 21:28:36 +01:00 |
|
Laurent Destailleur
|
fd85088a6c
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-10 21:27:03 +01:00 |
|
Laurent Destailleur
|
1d9d8980a9
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-12-10 21:16:49 +01:00 |
|
Laurent Destailleur
|
d3150ede42
|
Merge pull request #7942 from delcroip/fixDeleteSalaries
fix: unable to remove salaries, plus correct default rights management
|
2017-12-10 21:09:15 +01:00 |
|
Laurent Destailleur
|
f18edd5787
|
Update security.lib.php
|
2017-12-10 21:08:13 +01:00 |
|
Laurent Destailleur
|
7e69a31dd6
|
Merge pull request #7941 from atm-maxime/fix_errmsg_stockneg
Fix display error message when stock not enough on invoice validation #7846
|
2017-12-10 21:05:23 +01:00 |
|
Laurent Destailleur
|
e4725f4248
|
FIX #7933
|
2017-12-10 20:55:51 +01:00 |
|
patrick Delcroix
|
033016da7f
|
fix: unable to remove salaries, plus correct default rights management
|
2017-12-10 20:02:26 +01:00 |
|
Maxime Kohlhaas
|
12d0928244
|
Fix display error message when stock not enough on invoice validation
|
2017-12-10 19:59:56 +01:00 |
|
Maxime Kohlhaas
|
3db4d10fc0
|
Fix event late alert on third event list #7912
|
2017-12-10 08:12:49 +01:00 |
|
Alexandre SPANGARO
|
60fc500fa8
|
FIX : Edit accountancy account and warning message on loan
|
2017-12-10 07:00:46 +01:00 |
|
Laurent Destailleur
|
3ddc582edd
|
Merge pull request #7913 from atm-ph/fix_6.0_var_name
Fix $boad instead of $board
|
2017-12-08 16:55:28 +01:00 |
|
florian HENRY
|
eb03f8f08e
|
fix MAIN_COPY_FILE_IN_EVENT_AUTO
|
2017-12-08 15:03:42 +01:00 |
|
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
|
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 |
|
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 |
|
atm-ph
|
c70dff89dd
|
Fix $boad instead of $board
|
2017-12-06 12:13:15 +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
|
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 |
|
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
|
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
|
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 |
|
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 |
|
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
|
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 |
|
atm-ph
|
219e58d0e4
|
Fix product type is ignored and can generate a diffrent result with situation invoice
|
2017-11-22 12:15:02 +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 |
|
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
|
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 |
|
Laurent Destailleur
|
1a5bbef266
|
FIX Locatax were not propagated when cloning order or proposal
|
2017-11-13 13:07:31 +01:00 |
|
Laurent Destailleur
|
90615a8682
|
Fix busy tag not set sometimes
|
2017-11-13 02:44:02 +01:00 |
|