Commit Graph

63009 Commits

Author SHA1 Message Date
Regis Houssin
ffc9b02322 FIX missing one column 2018-11-15 18:28:12 +01:00
Regis Houssin
38b4b719f0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug2 2018-11-15 18:27:50 +01:00
Regis Houssin
03acd7a40c FIX travis error again 2018-11-15 18:24:32 +01:00
Laurent Destailleur
e58dd3c0b1 Merge pull request #10024 from hregis/develop_bug
FIX travis errors
2018-11-15 18:21:25 +01:00
Laurent Destailleur
7d5c9959bc Close #9978
Better way to address the feature. Work in most cases, need less code
and less sql access.
2018-11-15 18:20:38 +01:00
Regis Houssin
531b6e8d2b FIX travis errors 2018-11-15 18:13:07 +01:00
Laurent Destailleur
103dfe2aa7 FIX go back to create form if error 2018-11-15 17:55:27 +01:00
Regis Houssin
2d2e836965 FIX more simple 2018-11-15 17:45:33 +01:00
Laurent Destailleur
b51004e809 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-15 17:34:36 +01:00
Laurent Destailleur
2d6f7f926c FIX xss injection on user address 2018-11-15 17:34:11 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Laurent Destailleur
e1407c8289 Merge pull request #10012 from hregis/develop_mc
FIX compatibility between proposal sharing and proposalnumber sharing
2018-11-15 17:19:28 +01:00
Laurent Destailleur
6297e03ea9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-15 17:16:12 +01:00
Laurent Destailleur
4fa694569e Merge pull request #10018 from Tetras-Libre/develop
Fix issue #9956 User can edit some of their data without permissons
2018-11-15 16:56:57 +01:00
Laurent Destailleur
8a97ba4ba9 Update card.php 2018-11-15 16:56:12 +01:00
Laurent Destailleur
ff0a5d9fe1 Merge pull request #10016 from WSoptics/wsoptics-8.0
FIX: sql errors
2018-11-15 16:47:52 +01:00
Laurent Destailleur
6ffd63c965 Update projectstats.class.php 2018-11-15 16:47:40 +01:00
Laurent Destailleur
f2bbb54b8f Merge pull request #10011 from atm-gauthier/7.0_fix_search_categ_product_on_supplierorderlist
FIX : filter on product category doesn't work
2018-11-15 16:44:40 +01:00
Laurent Destailleur
f3228dc4f8 Merge pull request #10010 from atm-john/Fix_cat_photo_upload
Fix event message on upload category picture fail
2018-11-15 16:43:59 +01:00
Laurent Destailleur
d20bb41cde Merge pull request #10017 from hregis/8.0_bug
FIX avoid error if $object->fk_account =< 0 for getNomUrl
2018-11-15 16:43:00 +01:00
Laurent Destailleur
b0d1174600 Merge pull request #10020 from mwelters/develop
for Denmark: forme_jurisdisque additions
2018-11-15 16:39:32 +01:00
Laurent Destailleur
8bfcbc8f9d Merge pull request #10015 from frederic34/patch-9
doc bookkeeping class
2018-11-15 16:28:42 +01:00
Laurent Destailleur
f2fba05475 Merge branch 'develop' into new_branch_13_11_2018 2018-11-15 16:23:54 +01:00
Laurent Destailleur
c04fcf170b Work on emailcollector 2018-11-15 16:23:07 +01:00
Laurent Destailleur
85cdc44105 Several fixes in project creation, cache of dolGetIfFromCode, ... 2018-11-15 13:39:12 +01:00
markus
ac0f46f9e5 for Denmark: forme_jurisdisque additions 2018-11-15 11:10:54 +01:00
Laurent Destailleur
3ca45e0e40 Fix double dot in sql filename 2018-11-15 10:59:55 +01:00
Regis Houssin
6f90516f57 FIX check write permission for multicurrency 2018-11-15 09:40:08 +01:00
Frédéric FRANCE
92cda2a75c fix cant use method return value 2018-11-14 23:29:24 +01:00
Frédéric FRANCE
b13ad8170f correctly check intl extension 2018-11-14 22:42:09 +01:00
Frédéric FRANCE
1c15d249b3 replace specific php7 code 2018-11-14 22:05:21 +01:00
Laurent Destailleur
e94b545cb6 Fix field not required 2018-11-14 18:38:09 +01:00
David Beniamine
01947288fb Fix issue #9956 User can edit some of their data without permissons 2018-11-14 18:29:15 +01:00
Regis Houssin
bcc83408e0 FIX avoid error if $object->fk_account =< 0 for getNomUrl 2018-11-14 18:10:41 +01:00
Regis Houssin
976094043b FIX missing GETPOST('entity') 2018-11-14 17:34:27 +01:00
Regis Houssin
0907a6d611 FIX wrong object name (travis error) 2018-11-14 16:55:14 +01:00
Regis Houssin
0592e8a31c FIX config is override by multicompany module 2018-11-14 16:44:10 +01:00
Regis Houssin
874e27ef84 FIX multicompany override constants of current entity 2018-11-14 15:37:10 +01:00
Regis Houssin
93a1e941a4 FIX new method: override constants of current entity 2018-11-14 15:34:39 +01:00
Regis Houssin
2bc25fc008 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2018-11-14 15:24:41 +01:00
Regis Houssin
9ff4b31843 FIX compatibility with invoice sharing and invoice number sharing 2018-11-14 15:24:22 +01:00
Regis Houssin
3294fada3d FIX working on invoice sharing (multicompany) 2018-11-14 14:59:36 +01:00
Laurent Destailleur
1f6ccd4a66 Fix permission to edit websites 2018-11-14 13:58:00 +01:00
Laurent Destailleur
a7989eb893 Fix menu 2018-11-14 13:55:10 +01:00
Laurent Destailleur
df2aa2e2f6 Fix column balance 2018-11-14 13:52:43 +01:00
Laurent Destailleur
ba22ae45e7 Fix column balance 2018-11-14 13:45:20 +01:00
Laurent Destailleur
0201939ebe Fix column balance 2018-11-14 13:43:39 +01:00
Laurent Destailleur
7aa042172e Fix sql error 2018-11-14 13:06:40 +01:00
Frédéric FRANCE
4909e3afc4 doc bookkeeping class 2018-11-14 08:28:20 +01:00
Frédéric FRANCE
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00