Laurent Destailleur
|
301f509611
|
Merge pull request #8019 from atm-gauthier/6.0_fix_vat_mass_update
FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false
|
2018-01-04 21:03:20 +01:00 |
|
Laurent Destailleur
|
550fc37e62
|
Merge pull request #8017 from atm-florian/6.0
fix : linked object (new format of linked_object atribut on 6.0)
|
2018-01-04 21:02:31 +01:00 |
|
Laurent Destailleur
|
a14a3db2e9
|
Merge pull request #8013 from atm-john/FIX_invoice_filter_type
fix filter for TYPE_SITUATION invoice
|
2018-01-04 20:59:32 +01:00 |
|
Laurent Destailleur
|
e4d37c3e23
|
Merge pull request #8012 from ATM-Nicolas/fix_product_best_price
Fix product best price
|
2018-01-04 20:58:59 +01:00 |
|
Laurent Destailleur
|
b2feac9d90
|
CVE-2017-17971
|
2018-01-04 19:25:52 +01:00 |
|
Juanjo Menent
|
762ab74940
|
FIX: Cashdesk should not sell to inactive third parties
|
2018-01-04 18:09:25 +01:00 |
|
Juanjo Menent
|
9471495dca
|
Merge remote-tracking branch 'upstream/6.0' into 6.0
|
2018-01-04 18:05:55 +01:00 |
|
gauthier
|
58470e0913
|
FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false
|
2018-01-04 12:01:21 +01:00 |
|
Laurent Destailleur
|
f6ff6610e4
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-01-03 20:13:56 +01:00 |
|
Laurent Destailleur
|
c7798d11ce
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-01-03 20:13:17 +01:00 |
|
florian HENRY
|
25390e5f73
|
fix : linked object (new format of linked_object atribut on 6.0)
|
2018-01-03 17:03:00 +01:00 |
|
ATM-Nicolas
|
2e6c036ad8
|
Merge branch '6.0' of github.com:Dolibarr/dolibarr into fix_product_best_price
|
2018-01-02 17:22:53 +01:00 |
|
ATM-Nicolas
|
61efda4cbd
|
FIX : product best price on product list
|
2018-01-02 17:21:04 +01:00 |
|
John
|
1331e8add7
|
fix filter for TYPE_SITUATION invoice
|
2018-01-02 17:19:42 +01:00 |
|
Laurent Destailleur
|
0abe19c30d
|
Merge pull request #7998 from hregis/6.0_bug
Fix: avoid warning
|
2017-12-28 12:53:04 +01:00 |
|
Laurent Destailleur
|
bbcf70cf4e
|
Remove spaces
|
2017-12-28 09:48:41 +01:00 |
|
Laurent Destailleur
|
3ac413084f
|
Merge branch '6.0' into 6.0
|
2017-12-28 08:46:22 +01:00 |
|
Laurent Destailleur
|
3d4e6c9169
|
Merge pull request #7987 from atm-arnaud/FIX_trans_product_stats
FIX stats trad for customerinvoice
|
2017-12-28 07:10:14 +01:00 |
|
Laurent Destailleur
|
56bc0dbd25
|
Merge pull request #7986 from atm-arnaud/FIX_contractline_trans_unactivate
FIX trans unactivate on contractline
|
2017-12-28 07:09:28 +01:00 |
|
Laurent Destailleur
|
31b5d9df52
|
Merge pull request #7985 from atm-arnaud/FIX_search_contact_list
FIX search on contact list
|
2017-12-28 07:07:47 +01:00 |
|
Laurent Destailleur
|
de305cb3b2
|
Merge pull request #7980 from hregis/6.0_bug2
Fix: avoid php warning
|
2017-12-28 06:53:09 +01:00 |
|
Regis Houssin
|
59a89b250d
|
Fix: avoid warning (https://github.com/Dolibarr/dolibarr/issues/7993)
|
2017-12-27 11:56:58 +01:00 |
|
Ferran Marcet
|
1c7b99d3dc
|
Fix: Missing include for Project class
|
2017-12-26 12:13:35 +01:00 |
|
Juanjo Menent
|
b650ba21c4
|
Merge remote-tracking branch 'upstream/6.0' into 6.0
|
2017-12-26 10:52:46 +01:00 |
|
Laurent Destailleur
|
b70dd36ffa
|
Better js comment
|
2017-12-24 12:16:48 +01:00 |
|
Laurent Destailleur
|
6a62e13960
|
FIX security vulnerability reported by ADLab of Venustech
|
2017-12-21 13:32:16 +01:00 |
|
Laurent Destailleur
|
62f895e2ec
|
Fix: avoid infinite loop
|
2017-12-21 13:31:39 +01:00 |
|
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 |
|
Laurent Destailleur
|
36b4d50cff
|
FIX #7737
|
2017-11-12 20:41:25 +01:00 |
|
Laurent Destailleur
|
d421b90376
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-11-12 20:18:56 +01:00 |
|
Laurent Destailleur
|
356525730d
|
FIX #7786
|
2017-11-12 20:12:56 +01:00 |
|
Laurent Destailleur
|
d29233f553
|
Merge pull request #7801 from atm-maxime/fix_multi_vat_deposit
Fix multi VAT deposit when special lines are in origin document
|
2017-11-11 18:03:31 +01:00 |
|
Laurent Destailleur
|
5703c704f9
|
Merge pull request #7792 from atm-ph/fix_6.0_pdf_width_payment_term
Fix width of payment term is to large
|
2017-11-11 17:45:54 +01:00 |
|
Laurent Destailleur
|
50ed463b9f
|
Merge pull request #7784 from frederic34/patch-3
account number on create bank account
|
2017-11-11 17:37:29 +01:00 |
|
Laurent Destailleur
|
3889941406
|
Merge pull request #7783 from frederic34/patch-2
Update card.php
|
2017-11-11 17:36:51 +01:00 |
|
Maxime Kohlhaas
|
22a3721dda
|
Fix multi VAT deposit when special lines are in origin document
|
2017-11-11 16:10:06 +01:00 |
|
atm-ph
|
2636c2470b
|
Fix width of payment term is to large
|
2017-11-10 10:52:58 +01:00 |
|
Frédéric FRANCE
|
1ea6df14d0
|
Update card.php
|
2017-11-08 11:35:15 +01:00 |
|
Frédéric FRANCE
|
fe3ce78ae4
|
Update card.php
|
2017-11-08 11:24:33 +01:00 |
|
Frédéric FRANCE
|
27ace14fb7
|
Fetch right account
|
2017-11-07 16:28:51 +01:00 |
|
Ferran Marcet
|
7f1adc6a6a
|
FIX: Saving wrong localtax on order addline
|
2017-11-07 09:46:39 +01:00 |
|
Laurent Destailleur
|
6eb2204c2b
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
htdocs/product/list.php
|
2017-11-06 21:20:06 +01:00 |
|
Laurent Destailleur
|
1d9873e1a9
|
FIX #7756 Add better error message
|
2017-11-06 21:17:30 +01:00 |
|
Laurent Destailleur
|
bc9b816719
|
Fix deletion of files that contains __
|
2017-11-06 17:54:18 +01:00 |
|
Laurent Destailleur
|
825ceeaa8d
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-11-06 11:47:20 +01:00 |
|
Laurent Destailleur
|
864af9cc3b
|
Fix error not returned if output directory not writable
|
2017-11-06 11:47:03 +01:00 |
|
Laurent Destailleur
|
d453961afc
|
Merge pull request #7758 from atm-maxime/fix_search_service
Fix : type was forced to 0 so service are not in the list
|
2017-11-05 18:30:20 +01:00 |
|
Laurent Destailleur
|
d3a0cff30a
|
Merge pull request #7755 from frederic34/currency
default currency on propal create
|
2017-11-05 18:28:40 +01:00 |
|
Maxime Kohlhaas
|
e992e4bea5
|
Fix : type was forced to 0 so service are not in the list
|
2017-11-03 09:09:07 +01:00 |
|
Maxime Kohlhaas
|
13667e4850
|
Fix display of product/service list
|
2017-11-03 08:56:23 +01:00 |
|
Frédéric FRANCE
|
b58df17545
|
default currency on propal create
|
2017-11-02 18:14:55 +01:00 |
|
gauthier
|
03544f783a
|
FIX : Wrong alias sql
|
2017-11-02 16:16:29 +01:00 |
|
Laurent Destailleur
|
310bf4bde4
|
Update peruser.php
|
2017-11-02 15:51:35 +01:00 |
|
Laurent Destailleur
|
ec3a07cd52
|
Try to restore compatibility when actioncode=CODE1,CODE2,...
|
2017-11-02 15:50:55 +01:00 |
|
Laurent Destailleur
|
63a363080e
|
Update index.php
|
2017-11-02 15:48:56 +01:00 |
|
Laurent Destailleur
|
323a0d7d0d
|
Update index.php
|
2017-11-02 15:48:24 +01:00 |
|
gauthier
|
b7cf434ebd
|
FIX : Filter type on actioncomm with multiselect doesn't work
|
2017-11-02 14:58:33 +01:00 |
|
Laurent Destailleur
|
555b37411f
|
Merge pull request #7750 from atm-florian/6.0_missinghook
fix : missing hook in accountancy
|
2017-11-02 13:53:45 +01:00 |
|
florian HENRY
|
bd68b94411
|
fix : missing hook in accountancy
|
2017-11-02 13:27:09 +01:00 |
|
Laurent Destailleur
|
fb3f1ef667
|
Code comment
|
2017-11-02 09:49:41 +01:00 |
|
Laurent Destailleur
|
59df957181
|
Fix return HTTP code 501 if calling a non existing api
|
2017-11-02 01:43:27 +01:00 |
|
Laurent Destailleur
|
192dc43b87
|
Fix regression
|
2017-11-02 01:16:42 +01:00 |
|
Laurent Destailleur
|
a6879775bb
|
FIX Search into language is ok for file into external modules two.
|
2017-11-01 20:05:28 +01:00 |
|
Frédéric FRANCE
|
01a3787664
|
swap llxfooter() and $db->close()
|
2017-10-31 13:45:13 +01:00 |
|
Laurent Destailleur
|
3db101ffdd
|
Clean packager
|
2017-10-31 01:06:07 +01:00 |
|
Laurent Destailleur
|
892798bf79
|
Code comment
|
2017-10-30 12:40:12 +01:00 |
|
Laurent Destailleur
|
007783cf76
|
FIX Searching translation should not be case sensitive
|
2017-10-30 01:45:39 +01:00 |
|
Laurent Destailleur
|
0de1b878bd
|
Prepare 6.0.4
|
2017-10-29 16:17:52 +01:00 |
|
Laurent Destailleur
|
777d2f7027
|
Prepare 5.0.8
|
2017-10-29 16:17:36 +01:00 |
|
Laurent Destailleur
|
78645c718f
|
Fix position of quick search
|
2017-10-29 16:15:54 +01:00 |
|
Laurent Destailleur
|
cd5e43483e
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/contrat/card.php
htdocs/core/lib/project.lib.php
htdocs/expedition/card.php
htdocs/projet/class/task.class.php
|
2017-10-28 22:08:16 +02:00 |
|
Laurent Destailleur
|
02f47b5a91
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-10-28 22:03:23 +02:00 |
|
Laurent Destailleur
|
4feecbeab8
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-10-28 22:03:06 +02:00 |
|
Laurent Destailleur
|
783efd1a71
|
Merge pull request #7722 from fmarcet/4.0
FIX: paid supplier invoices are shown as abandoned
|
2017-10-28 22:01:30 +02:00 |
|
Laurent Destailleur
|
5313d61847
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-10-28 20:35:35 +02:00 |
|
Laurent Destailleur
|
92c33b76dc
|
Fix position of search element in quick search
|
2017-10-28 20:35:21 +02:00 |
|
Maxime Kohlhaas
|
7c1d6251f7
|
Fix : contract lines from origin were containing all lines desc
|
2017-10-27 13:27:38 +02:00 |
|
Ferran Marcet
|
9178d80349
|
Merge remote-tracking branch 'origin/4.0' into 4.0
|
2017-10-27 11:52:15 +02:00 |
|
Ferran Marcet
|
bc8127d685
|
Fix: paid supplier invoices are shown as abandoned on the consumption card.
|
2017-10-27 11:52:05 +02:00 |
|
Laurent Destailleur
|
8e18d5906d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-10-27 02:32:28 +02:00 |
|
Laurent Destailleur
|
f02e731c67
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/lib/project.lib.php
|
2017-10-27 02:32:09 +02:00 |
|
Laurent Destailleur
|
9bcf01bf3f
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-10-27 02:30:55 +02:00 |
|
Laurent Destailleur
|
fed0f3d09e
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/core/lib/project.lib.php
htdocs/projet/class/task.class.php
|
2017-10-27 02:30:33 +02:00 |
|
Laurent Destailleur
|
07b25e457b
|
Merge pull request #7652 from fappels/5.0_Fix_old_batch_not_shown_multi_shipping
FIX old batch not shown in multi shipping
|
2017-10-27 02:26:45 +02:00 |
|
Laurent Destailleur
|
78e3c63ead
|
Update card.php
|
2017-10-27 02:26:37 +02:00 |
|
Laurent Destailleur
|
6b7c59635e
|
Merge pull request #7715 from grandoc/new_branch_26_10_17
Fix : Warning: A non-numeric value encountered in on line 57 58 59
|
2017-10-27 02:18:26 +02:00 |
|
Laurent Destailleur
|
61909d842d
|
Update document.php
|
2017-10-27 02:18:11 +02:00 |
|
Laurent Destailleur
|
4c5bb7660c
|
Merge pull request #7713 from atm-gauthier/6.0_fix_hook_on_shipping_card
FIX : hook formObjectOptions() must use $expe and not $object which i…
|
2017-10-27 02:15:30 +02:00 |
|
Laurent Destailleur
|
bbc13b8ac9
|
Merge pull request #7712 from atm-florian/6.0
FIX : #7458
|
2017-10-27 01:58:51 +02:00 |
|
Laurent Destailleur
|
71622b9f86
|
Merge pull request #7711 from atm-ph/fix_6_0_empty_extrafields
Fix empty extrafields if from origin
|
2017-10-27 01:56:44 +02:00 |
|
Laurent Destailleur
|
82231b77a2
|
Fix data for supplier must be not visible if supplier module off
|
2017-10-27 01:46:54 +02:00 |
|
Laurent Destailleur
|
67208b111d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/facture.php
htdocs/expedition/card.php
htdocs/product/list.php
|
2017-10-26 17:02:40 +02:00 |
|
Laurent Destailleur
|
c48721e008
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-10-26 16:50:53 +02:00 |
|
Laurent Destailleur
|
0efd118d43
|
Fix hook on product list
|
2017-10-26 16:50:38 +02:00 |
|
Philippe GRAND
|
d9d4b6e06d
|
Fix : Warning: A non-numeric value encountered in on line 57 58 59
|
2017-10-26 13:03:39 +02:00 |
|
florian HENRY
|
f4a95f89ac
|
Ok, now suppliers payment are correctly logged
|
2017-10-26 12:26:25 +02:00 |
|
florian HENRY
|
a7655b69e8
|
agin fix blockedlog on supplier incvoive payument
|
2017-10-26 12:13:47 +02:00 |
|
gauthier
|
ce6d1d306d
|
FIX : hook formObjectOptions() must use $expe and not $object which is an order here
|
2017-10-26 11:32:26 +02:00 |
|
florian HENRY
|
5f89b4427f
|
fixagain blocked log supplier
|
2017-10-26 10:49:11 +02:00 |
|
florian HENRY
|
9427b2f4b1
|
fix supplier payamnet blockedlog
|
2017-10-26 10:40:36 +02:00 |
|
florian HENRY
|
1d0c93c0b6
|
FIX : #7458
|
2017-10-26 10:31:14 +02:00 |
|