Juanjo Menent
|
f4ca6916cd
|
Merge remote-tracking branch 'upstream/7.0' into 8.0
# Conflicts:
# htdocs/contrat/services_list.php
# htdocs/expensereport/list.php
# htdocs/projet/list.php
|
2019-05-11 17:31:23 +02:00 |
|
Juanjo Menent
|
3a99ef7319
|
Fix: missing GETPOST params
|
2019-05-11 17:04:05 +02:00 |
|
Juanjo Menent
|
3ae2d71ea6
|
Fix: missing GETPOST params
|
2019-05-11 17:00:55 +02:00 |
|
Juanjo Menent
|
91ae365588
|
Fix: missing GETPOST params
|
2019-05-11 16:58:00 +02:00 |
|
Juanjo Menent
|
6206519456
|
Fix: missing GETPOST params
|
2019-05-11 16:54:56 +02:00 |
|
Juanjo Menent
|
2e6cb2afaa
|
Fix: missing GETPOST params
|
2019-05-11 16:53:16 +02:00 |
|
Juanjo Menent
|
dc9f8a349f
|
Fix: missing GETPOST params
|
2019-05-11 16:50:31 +02:00 |
|
Juanjo Menent
|
80ef97e215
|
FIX: #11025
|
2019-05-11 16:41:01 +02:00 |
|
Juanjo Menent
|
759427f6ac
|
FIX: #11025
|
2019-05-11 16:36:35 +02:00 |
|
Juanjo Menent
|
81bf7d07e3
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2019-05-11 16:32:02 +02:00 |
|
Juanjo Menent
|
72dd3705ed
|
Merge remote-tracking branch 'upstream/7.0' into 7.0
|
2019-05-10 09:13:33 +02:00 |
|
Laurent Destailleur
|
6a5af0511d
|
Merge pull request #11105 from atm-greg/FIX_stock_movement_link_to_project
fix project link for stock correction
|
2019-05-03 11:27:17 +02:00 |
|
atm-greg
|
e0c3cf8360
|
fix project link for stock correction
|
2019-05-03 10:24:49 +02:00 |
|
Laurent Destailleur
|
45d618cd7a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-05-02 14:37:54 +02:00 |
|
Laurent Destailleur
|
ae7ba162f2
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-05-02 14:37:46 +02:00 |
|
Laurent Destailleur
|
1a16dc1166
|
Merge pull request #11089 from frederic34/patch-5
Fix do not delete all discount when splitting (supplier)
|
2019-05-02 14:05:49 +02:00 |
|
Laurent Destailleur
|
50b1a54dca
|
FIX Update/delete currency on same languages
|
2019-05-01 14:06:30 +02:00 |
|
Frédéric FRANCE
|
d9a1c2b235
|
Fix do not delete all discount when splitting
|
2019-04-30 13:54:50 +02:00 |
|
Laurent Destailleur
|
a7530b7eff
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-04-27 13:28:36 +02:00 |
|
Laurent Destailleur
|
0532598ecf
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-04-27 13:28:05 +02:00 |
|
Laurent Destailleur
|
410a3801da
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2019-04-27 13:27:52 +02:00 |
|
Laurent Destailleur
|
5259547b96
|
Merge pull request #11069 from atm-gauthier/6.0_fix_select_prev_situ
Fix prev situation invoice selection (backport fix 8.0)
|
2019-04-25 18:59:48 +02:00 |
|
gauthier
|
31897f54ac
|
Fix prev situation invoice selection (backport fix 8.0)
|
2019-04-25 12:37:05 +02:00 |
|
Laurent Destailleur
|
50a4d54d8a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-04-25 01:37:32 +02:00 |
|
Laurent Destailleur
|
07caf22647
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-04-25 01:37:25 +02:00 |
|
Laurent Destailleur
|
b62323939e
|
Merge pull request #11064 from atm-greg/FIX_create_supplier_invoice_button
FIX test to display create invoice button on supplier_order card
|
2019-04-24 21:07:15 +02:00 |
|
atm-greg
|
70017da95a
|
testing if customer invoice module is activated doesn't make sense on supplier commande card...
|
2019-04-24 14:59:54 +02:00 |
|
Laurent Destailleur
|
fb01f550f4
|
Merge pull request #11016 from ATM-Nicolas/fix_activity_perweek
FIX : Total per day in timespent per week
|
2019-04-24 10:21:08 +02:00 |
|
Laurent Destailleur
|
21b79d314a
|
Merge pull request #11059 from atm-greg/FIX_actioncomm_for_long_trigger_name
fix actioncomm module for long trigger names
|
2019-04-24 10:06:55 +02:00 |
|
atm-greg
|
6e425d1895
|
add origin of line in fourn orderstoinvoice.php
|
2019-04-24 08:56:06 +02:00 |
|
atm-greg
|
3231e54abd
|
fix actioncomm module for long trigger names
|
2019-04-23 16:19:58 +02:00 |
|
Laurent Destailleur
|
bf7fcce1b2
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-04-23 12:24:25 +02:00 |
|
Laurent Destailleur
|
11d737f23a
|
Merge pull request #11029 from ATM-Marc/FIX_7.0_sort_events
FIX: actioncomm: sort events by date after external calendars and hook (into 7.0)
|
2019-04-19 13:06:09 +02:00 |
|
Laurent Destailleur
|
c9445ee700
|
Merge pull request #11038 from atm-john/FIX_error_messages_not_displayed
FIX error messages not displayed
|
2019-04-19 12:55:30 +02:00 |
|
John BOTELLA
|
0855d84ccf
|
FIX error messages not displayed
|
2019-04-18 10:40:34 +02:00 |
|
Laurent Destailleur
|
91af1f8702
|
Merge pull request #11011 from ATM-Nicolas/fix_search_contact_list
FIX : Wrong variable name
|
2019-04-16 23:43:58 +02:00 |
|
Laurent Destailleur
|
c0defe3965
|
Update index.php
|
2019-04-16 23:27:45 +02:00 |
|
Marc de Lima Lucio
|
1669d497b4
|
FIX: actioncomm: sort events by date after external calendars and hook
|
2019-04-16 17:36:27 +02:00 |
|
ATM-Nicolas
|
93365addd1
|
FIX : Total per day shows 00:00 if the total time spent is equal to 12:00
|
2019-04-15 11:40:58 +02:00 |
|
ATM-Nicolas
|
d4a7c0abc6
|
FIX : Wrong variable name
|
2019-04-15 10:05:46 +02:00 |
|
Juanjo Menent
|
1b5cabad71
|
Fix: #10956
|
2019-04-12 18:50:48 +02:00 |
|
Laurent Destailleur
|
6cd24ab210
|
Merge pull request #10998 from atm-gauthier/8.0_fix_ProductAccountancySellIntraCode_is_feature_level_1
FIX : Product accountancey sell intra code must be visible if main feature level 1
|
2019-04-11 16:20:11 +02:00 |
|
gauthier
|
9a24007c0a
|
FIX : better test
|
2019-04-11 15:32:50 +02:00 |
|
gauthier
|
524b186959
|
FIX : Product accountancey sell intra code must be visible if main feature level 1
|
2019-04-11 15:19:40 +02:00 |
|
Laurent Destailleur
|
ffca289bff
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-04-08 14:04:42 +02:00 |
|
Laurent Destailleur
|
125796b0f5
|
Merge pull request #10967 from atm-ph/fix_7.0_timesheet_init_hook
Fix no init hook on timesheet
|
2019-04-08 13:49:21 +02:00 |
|
Laurent Destailleur
|
c1f0826005
|
Update perweek.php
|
2019-04-08 13:49:16 +02:00 |
|
Laurent Destailleur
|
153e563c9f
|
Update perday.php
|
2019-04-08 13:49:05 +02:00 |
|
Laurent Destailleur
|
cd1322de79
|
Merge pull request #10959 from atm-arnaud/8.0_fix_shipping_default_warehouse_if_one
FIX shipping default warehouse if only one warehouse
|
2019-04-08 13:32:34 +02:00 |
|
atm-ph
|
ea87b2ddb6
|
Fix no init hook on timesheet
|
2019-04-05 11:26:11 +02:00 |
|