Laurent Destailleur 11b1a2adac Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/journal/bankjournal.php htdocs/accountancy/journal/expensereportsjournal.php htdocs/accountancy/journal/purchasesjournal.php htdocs/accountancy/journal/sellsjournal.php htdocs/comm/propal/class/api_proposals.class.php htdocs/comm/propal/class/propal.class.php htdocs/compta/bank/index.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php htdocs/includes/odtphp/Segment.php htdocs/langs/en_US/admin.lang htdocs/societe/soc.php		2017-05-05 14:49:25 +02:00
..
ajax	Fix browser notif	2017-04-30 05:01:53 +02:00
boxes	Fix compatibility with the removal of "constant".	2017-04-29 18:48:30 +02:00
class	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-05 14:49:25 +02:00
db	Fix travis	2017-04-30 14:16:58 +02:00
filemanagerdol	Fix more then 30 security defects	2016-12-18 01:44:26 +01:00
js	Fix browser notif	2017-04-30 05:01:53 +02:00
lib	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-05-05 14:49:25 +02:00
login	FIX #6445	2017-03-10 14:49:17 +01:00
menus	Finish to move accountancy journals list to page like dictionnary	2017-05-01 08:16:09 +02:00
modules	No payment information on a supplier proposal by default.	2017-05-05 13:50:14 +02:00
tpl	Look and feel v6	2017-05-01 12:46:40 +02:00
triggers	Fix script to send emailings	2017-05-02 18:21:50 +02:00
actions_builddoc.inc.php	NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class	2017-03-14 09:25:29 +01:00
actions_changeselectedfields.inc.php
actions_dellink.inc.php
actions_extrafields.inc.php
actions_fetchobject.inc.php
actions_lineupdown.inc.php
actions_linkedfiles.inc.php	Work on sorting/indexing upload files	2016-12-31 03:43:22 +01:00
actions_massactions.inc.php	NEW use pdktk to concat mass pdf	2017-04-27 16:37:44 +02:00
actions_printing.inc.php	Fix error management on direct print	2017-04-12 13:01:41 +02:00
actions_sendmails.inc.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-03-02 14:29:22 +01:00
actions_setnotes.inc.php
antispamimage.php
datepicker.php	Fix more then 30 security defects	2016-12-18 01:44:26 +01:00
doxygen.php
extrafieldsinexport.inc.php	FIX : Do not include separate extrafields into export cause "separate"	2016-12-09 17:17:58 +01:00
get_menudiv.php	Work on 6.0 look and feel	2017-04-01 12:46:47 +02:00
index.html
photos_resize.php	NEW Feature to crop/resize images available on user and expense reports	2017-04-14 13:53:39 +02:00
search_page.php	Work on module website	2017-02-24 21:13:40 +01:00
search.php
tools.php