Commit Graph

63483 Commits

Author SHA1 Message Date
Laurent Destailleur
0a73daba01 Security: on target=_blank, we must have rel="noopener" 2017-12-02 03:04:52 +01:00
Laurent Destailleur
46b281f703 Fix for #7697 2017-12-01 19:29:29 +01:00
Laurent Destailleur
89ef597690 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-01 18:12:52 +01:00
Laurent Destailleur
64d29709d5 FIX #7881 error not reported/blocking when subprodut need lot 2017-12-01 18:12:29 +01:00
Laurent Destailleur
4969ae2abb Fix missing the badge on virtual product tab 2017-12-01 17:48:51 +01:00
Laurent Destailleur
9ed679d19a FIX #7882 2017-12-01 17:22:32 +01:00
Laurent Destailleur
e36b62f539
Merge pull request #7900 from fappels/7.0_fix_warehouse_label_ref-
Fix dispatch not adapted for label to ref change for warehouse
2017-12-01 16:26:21 +01:00
Laurent Destailleur
1ce155728f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/mailings/fraise.modules.php
2017-12-01 16:25:13 +01:00
fappels
1c72dc608f Fix travis 2017-12-01 16:22:34 +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
Laurent Destailleur
c8f661021c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-01 15:58:58 +01:00
Laurent Destailleur
471f99c24c Fix look and feel v7 2017-12-01 15:58:35 +01:00
Laurent Destailleur
1d2b5dbe97
Merge pull request #7892 from atm-maxime/fix_contactlist_empty
Fix filters on contact list must always appear
2017-12-01 15:54:03 +01:00
Laurent Destailleur
ce32da6217 Fix debugs APIs 2017-12-01 15:39:18 +01:00
Laurent Destailleur
e3671da37f Fix edit shipment line when line is a not predefined product 2017-12-01 14:33:06 +01:00
Laurent Destailleur
09e611aa21 Move status of blockedlog to experimental 2017-12-01 13:41:37 +01:00
Laurent Destailleur
46b015d205 Fix usage of option STOCK_SUPPORTS_SERVICES 2017-12-01 13:40:24 +01:00
fappels
cec490dff5 Fix dispatch not adapted for label to ref change for warehouse 2017-12-01 12:57:56 +01:00
Laurent Destailleur
a0231b5c60 Fix responsive 2017-12-01 12:55:28 +01:00
Laurent Destailleur
670465fcd8 Fix responsive and search 2017-12-01 12:01:17 +01:00
Laurent Destailleur
b871c7e6ca Translation key 2017-11-30 15:16:01 +01:00
Laurent Destailleur
25bccfde8b Debug blockedlog module 2017-11-30 15:13:23 +01:00
Laurent Destailleur
8987e923f1 Update doc 2017-11-30 14:23:59 +01:00
Laurent Destailleur
6796c08cb8 Debug/rewrite Blockedlog 2017-11-30 14:21:55 +01:00
Alexis ALGOUD
b2effa7cc8
fix travis 2017-11-30 11:36:35 +01:00
Laurent Destailleur
39fdd1b37d Use correct link to changelog 2017-11-30 11:16:28 +01:00
root
b7f26ea788 FIX add line bad price and ref 2017-11-30 11:10:01 +01:00
Laurent Destailleur
dc692f333d Work on blockedlog 2017-11-30 10:45:55 +01:00
Maxime Kohlhaas
879a0812d7 Fix filters on contact list must always appear 2017-11-29 20:04:15 +01:00
Laurent Destailleur
33032a5474 Look and feel v6 2017-11-29 18:13:22 +01:00
Laurent Destailleur
c269dcc4d5 Fix scrutinizer 2017-11-29 17:58:13 +01:00
Laurent Destailleur
d9c416ee17 Complete example 2017-11-29 17:51:08 +01:00
Laurent Destailleur
9508c3e0b9 Fix trigger was not called 2017-11-29 16:34:44 +01:00
Laurent Destailleur
4245ad6e2a Return error messages 2017-11-29 16:26:19 +01:00
Laurent Destailleur
682afe8918 Fix scrutinizer 2017-11-29 16:25:12 +01:00
Laurent Destailleur
2693e5db6d Fix the trigger COMPANY_MODIFY provide information of thirdparty merged 2017-11-29 16:24:58 +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
Laurent Destailleur
9af3ff2926
Merge pull request #7883 from hregis/develop_member
Fix: move default fields before extrafields for best visibility
2017-11-29 15:03:39 +01:00
Laurent Destailleur
f9aaddb658 Add spec for french ecompte 2017-11-29 14:08:14 +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
Laurent Destailleur
755b7a2717 Start 7.0 beta 2017-11-29 09:34:55 +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
Regis Houssin
310e91ad01 Fix: move default fields before extrafields for best visibility 2017-11-28 13:10:21 +01:00