Commit Graph

63668 Commits

Author SHA1 Message Date
Regis Houssin
1bdffa961f Fix: wrong translation if multilang activated 2017-12-08 10:41:14 +01:00
Laurent Destailleur
f0bdf3a537
Merge pull request #7917 from IonAgorria/fix-7914
FIX #7914: More informative error message in dynamics prices
2017-12-08 10:41:06 +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
50150cf897
Merge pull request #7918 from atm-maxime/develop
Fix scrutinizer
2017-12-08 10:35:24 +01:00
Laurent Destailleur
7e358afa39
Merge pull request #7920 from atm-maxime/fix_button_createevent
Fix : no need for action button on cards, link is now available
2017-12-08 10:35:10 +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
Laurent Destailleur
94570528d0
Merge pull request #7922 from atm-maxime/new_mainmenuicons
Add icons on home page menu
2017-12-08 10:31:02 +01:00
alexis Algoud
62cd77d999 NEW automatic activation of external module on country set 2017-12-08 10:13:03 +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
Laurent Destailleur
cf5265d405 Minor fix 2017-12-07 21:44:12 +01:00
Ferran Marcet
bfc476a118 FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable 2017-12-07 18:44:33 +01:00
Maxime Kohlhaas
6b278a6740 Add icons on home page menu 2017-12-07 16:01:52 +01:00
Maxime Kohlhaas
8a39e2a413 Fix : no need for action button on cards, link is now available 2017-12-07 00:36:23 +01:00
Maxime Kohlhaas
3fb8ec5067 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_menu_expense_holidays 2017-12-06 23:52:02 +01:00
Maxime Kohlhaas
fd26d95533 Ruleset 250 to 300 cyclomatic complexity 2017-12-06 23:51:57 +01:00
Maxime Kohlhaas
2a64eb2983 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2017-12-06 23:45:37 +01:00
Maxime Kohlhaas
50203cdf01 Fix : link to create action is not a button but a top list link 2017-12-06 23:44:34 +01:00
Laurent Destailleur
74a63ca18c Fix scrutinizer 2017-12-06 23:43:59 +01:00
Laurent Destailleur
98149ae316 Fix regression 2017-12-06 23:31:42 +01:00
Maxime Kohlhaas
0fa77160d9 Fix scrutinizer 2017-12-06 23:21:58 +01:00
Ion
669e080670 More informative error message in dynamics price 2017-12-06 14:51:29 +01:00
atm-ph
c90ece1188 Fix include class WorkboardResponse 2017-12-06 14:22:37 +01:00
Marc de Lima Lucio
d43acefac4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_hook_openelements_dashboard 2017-12-06 12:39:50 +01:00
Marc de Lima Lucio
32d911b1df NEW: hook to enrich homepage open elements dashboard 2017-12-06 12:31:00 +01:00
atm-ph
c70dff89dd Fix $boad instead of $board 2017-12-06 12:13:15 +01:00
Laurent Destailleur
56b0279ed7 Fix translation 2017-12-05 20:46:36 +01:00
Laurent Destailleur
2c19c0a10e Fix test 2017-12-05 20:16:28 +01:00
Laurent Destailleur
c6e1087834 Fix test on vat amount 2017-12-05 19:47:46 +01:00
Laurent Destailleur
776b7f03b6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-05 19:28:12 +01:00
Laurent Destailleur
005006c508 Update changelog 2017-12-05 19:26:08 +01:00
Laurent Destailleur
ccd4f74f51 Fix PHPunit 2017-12-05 19:24:26 +01:00
Laurent Destailleur
21ba8509c9
Merge pull request #7910 from ATM-Nicolas/6.0_fix_project_conf
NEW link project from other company conf
2017-12-05 19:18:07 +01:00
Alexis Algoud
ad46bf9a94 NEW option to avoid countries to disable there blockedlog 2017-12-05 18:30:48 +01:00
Alexis Algoud
cc9b55cb45 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_blockedlog_reset_warning 2017-12-05 18:08:53 +01:00
Laurent Destailleur
5ab7fa7422 Fix location on good page 2017-12-05 15:48:24 +01:00
Laurent Destailleur
3a9bf455e2 FIX #7870 2017-12-05 13:38:24 +01:00
Laurent Destailleur
93311e3817 FIX #7885 2017-12-05 12:31:57 +01:00
ATM-Nicolas
bdf1e30ef3
Merge branch 'develop' into 6.0_fix_project_conf 2017-12-05 12:20:48 +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
22d61426a1 FIX #7903 2017-12-05 11:53:19 +01:00
alexis Algoud
a2df87ab15 NEW warning on module blocked log reset if country code is FR
fix wrong paste click
2017-12-05 11:40:42 +01:00
Laurent Destailleur
8019f73f99 Fix: protection to not delete invoice if invoice is in bookkeeping 2017-12-05 10:01:30 +01:00
ATM-Nicolas
36bcd26e27 FIX : link project from other company conf 2017-12-05 09:21:24 +01:00
Laurent Destailleur
78c4b7f912 Fix look and feel v7 2017-12-04 20:17:07 +01:00
Laurent Destailleur
c1791b87b4 Fix status tracked 2017-12-04 18:04:52 +01:00
Laurent Destailleur
c6d035392f Fix status message inverted 2017-12-04 17:58:21 +01:00