Laurent Destailleur 922fa088b4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ...

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/boxes/box_services_expired.php

2017-05-10 23:47:33 +02:00

..

ajax

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop

2016-12-18 11:57:04 +01:00

boxes

FIX #6677 Expired contracts dashboard box does not show the name of the thirdparty

2017-05-01 12:05:52 +02:00

class

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

2017-05-10 23:47:33 +02:00

db

Fix last_insert_id at a better place

2017-03-10 15:19:15 +01:00

filemanagerdol

Fix more then 30 security defects

2016-12-18 01:44:26 +01:00

js

…

lib

FIX Link to files on bank account tab broken with multicompany

2017-05-10 19:08:07 +02:00

login

FIX #6445

2017-03-10 14:49:17 +01:00

menus

fix :missing mainmenu and leftmenu into accoutancy menu descriptor

2017-04-14 12:27:53 +02:00

modules

Code comment

2017-05-10 18:56:18 +02:00

tpl

FIX extrafield css for boolean type

2017-04-24 00:46:27 +02:00

triggers

Fix trigger of automatic events

2017-03-30 11:25:28 +02:00

actions_builddoc.inc.php

…

actions_changeselectedfields.inc.php

…

actions_dellink.inc.php

…

actions_extrafields.inc.php

…

actions_fetchobject.inc.php

…

actions_lineupdown.inc.php

…

actions_linkedfiles.inc.php

…

actions_massactions.inc.php

fix the from e-mail on mass action

2017-03-17 17:55:25 +01:00

actions_printing.inc.php

…

actions_sendmails.inc.php

FIX #6270

2017-01-16 13:06:26 +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

…

get_menudiv.php

…

index.html

…

photos_resize.php

Fix photo resize

2016-12-20 19:35:47 +01:00

search_page.php

…

search.php

…

tools.php

…