Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 08:21:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,451 Commits 36 Branches 190 Tags
4d8e5ab0e6ce8e77e2286f59319b901b9e8d0460
Commit Graph

14494 Commits

Author SHA1 Message Date
atm-greg
8a0baaad17 fix #8480 2018-04-10 16:25:06 +02:00
Marc de Lima Lucio
7aa4d16eef NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked 2018-04-10 16:23:56 +02:00
Laurent Destailleur
0bf4381226 NEW The field "visible" on extrafield can accept expression as condition 2018-04-10 15:39:11 +02:00
Marc de Lima Lucio
1fd5dba118 FIX: payment term doc-specific label was not used 2018-04-10 15:24:57 +02:00
gauthier
5621d1f8ea FIX #8478 !empty instead of count to avoid warning 2018-04-10 15:03:15 +02:00
atm-greg
4f13a4f45b fix #8521 2018-04-10 14:16:01 +02:00
Laurent Destailleur
65996c47ff Fix clean email syntax to remove , to avoid error RFC-5321 address 2018-04-10 11:15:21 +02:00
Regis Houssin
97bf6fff7f Fix: missing User object with API REST 2018-04-10 08:07:23 +02:00
Laurent Destailleur
24f4d5040a Move isInEEC from common to thirdparty class. 2018-04-09 14:25:02 +02:00
John
63180f45a8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-09 09:17:26 +02:00
Frédéric FRANCE
f5b49aa93b do not fill error with success message 2018-04-09 00:21:29 +02:00
Laurent Destailleur
419b225120 Clean code 2018-04-07 21:11:58 +02:00
Laurent Destailleur
d7d9c8c338 Fix module descriptor of dav module 2018-04-07 21:04:08 +02:00
Laurent Destailleur
98b9f6bb47 DAV module 2018-04-07 19:12:41 +02:00
Laurent Destailleur
4d2d9193b9 Work on VAT reports to use option MAIN_INFO_VAT_RETURN 2018-04-07 15:47:13 +02:00
Laurent Destailleur
259f3b3020 Add hidden option MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP 2018-04-07 13:23:26 +02:00
Laurent Destailleur
093c367609 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2018-04-07 13:20:22 +02:00
Laurent Destailleur
5a34a22934 Code comment 2018-04-07 13:04:52 +02:00
Laurent Destailleur
d46a8eb8f0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/company.php
 2018-04-07 12:30:30 +02:00
Laurent Destailleur
0abcf5694c Fix message of discount 2018-04-06 20:18:36 +02:00
Laurent Destailleur
1a321e19c8 FIX XSS in company setup page 2018-04-06 19:12:13 +02:00
Laurent Destailleur
417c07a6e8 Fix REFLECTED XSS 2018-04-06 18:33:51 +02:00
Laurent Destailleur
85d4f7115b Better position of the substitution tooltip for emails 2018-04-06 16:16:08 +02:00
Laurent Destailleur
049b9b2a5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-06 14:19:25 +02:00
Laurent Destailleur
8e778df0ff Debug stripe module 2018-04-06 14:05:07 +02:00
Laurent Destailleur
d3adbdfbbc FIX Restaure way to have empty entry menu 2018-04-06 14:04:52 +02:00
Laurent Destailleur
a886fadc2d Merge pull request #8493 from aspangaro/8.0-a13 
NEW Module Assets
 2018-04-06 12:41:56 +02:00
Laurent Destailleur
956fc2376d FIX #8483 2018-04-06 12:27:55 +02:00
Laurent Destailleur
f3e1581ba0 Merge pull request #8483 from hregis/develop_ldap 
Fix: remove html tags and decode html entities
 2018-04-06 11:28:11 +02:00
Laurent Destailleur
9ce5d02fde Merge pull request #8517 from bafbes/master700 
define module part to include external modules menus
 2018-04-06 11:26:23 +02:00
Laurent Destailleur
151245a5e4 Update conf.class.php 2018-04-06 11:25:48 +02:00
Regis Houssin
b43aca0f8d Fix: use dol_string_nohtmltag instead (with strip_tags) 2018-04-06 08:52:02 +02:00
Laurent Destailleur
2524a699eb Standardize file name of lists 2018-04-06 00:36:52 +02:00
Alexandre SPANGARO
06dc70df09 Merge remote-tracking branch 'uptream/develop' into 8.0-a13 2018-04-05 20:42:28 +02:00
Alexandre SPANGARO
619805c7a5 Update works 2018-04-05 20:40:41 +02:00
Laurent Destailleur
658e1224d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 19:53:09 +02:00
Laurent Destailleur
48ff89c63b Fix regression 2018-04-05 19:52:54 +02:00
Laurent Destailleur
2d547abaa9 Merge pull request #8498 from atm-john/New_import_lines_from_linked_element 
New import lines from linked element
 2018-04-05 18:26:47 +02:00
Laurent Destailleur
6c409b2670 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 18:08:19 +02:00
Laurent Destailleur
d55657951d Merge pull request #8503 from ruistrecht-alt/FIX_pictos_in_agenda 
FIX: img_pictos for remove assigned user in agenda card
 2018-04-05 16:42:40 +02:00
bahfir abbes
16ae46e64c define module part to include external modules menus 2018-04-05 15:23:17 +01:00
Laurent Destailleur
d19514fd99 Merge pull request #8496 from hregis/develop_bug5 
Fix: multiple avoid Warning and errors
 2018-04-05 16:16:48 +02:00
Laurent Destailleur
dd934c89bf Merge pull request #8507 from frederic34/patch-2 
Translation of error message
 2018-04-05 16:12:36 +02:00
Laurent Destailleur
ab27b105c0 Merge pull request #8490 from hregis/7.0_bug6 
FIX limit access of email template page to internal users
 2018-04-05 16:11:04 +02:00
Laurent Destailleur
533de639ae Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/hookmanager.class.php
 2018-04-05 13:29:27 +02:00
Laurent Destailleur
45d074c39d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-05 13:25:59 +02:00
Laurent Destailleur
eeb2d5a4da Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/cron/list.php
 2018-04-05 13:24:36 +02:00
Laurent Destailleur
2b135dc951 FIX #8488 2018-04-05 13:13:45 +02:00
Regis Houssin
5914bfdf18 Fix: more complete 2018-04-05 13:00:55 +02:00
Regis Houssin
156d26ddb9 Fix: backward compatibility 2018-04-05 13:00:50 +02:00