Laurent Destailleur 0a7ce338f9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ...

Conflicts:
	htdocs/core/class/commondocgenerator.class.php

2018-08-28 02:23:34 +02:00

..

ajax

Fix select zip/town

2018-08-13 16:44:49 +02:00

boxes

Fix trans

2018-08-27 23:42:47 +02:00

class

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-28 02:23:34 +02:00

db

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-07-16 15:44:44 +02:00

filemanagerdol

…

js

…

lib

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-23 19:50:58 +02:00

login

…

menus

Fix menu payment not required if only module bank on

2018-08-13 02:04:38 +02:00

modules

Fix cron task label

2018-08-21 14:01:03 +02:00

tpl

Merge pull request #9099 from ATM-Nicolas/7.0

2018-07-24 18:02:21 +02:00

triggers

Fix name of constant for module TICKET

2018-07-06 13:09:07 +02:00

actions_addupdatedelete.inc.php

Fix clone with new architecture

2018-06-19 09:21:23 +02:00

actions_builddoc.inc.php

…

actions_changeselectedfields.inc.php

…

actions_comments.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

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

2018-08-08 17:31:23 +02:00

actions_printing.inc.php

Update actions_printing.inc.php

2018-08-21 12:54:02 +02:00

actions_sendmails.inc.php

Fix option MAIN_MAIL_ENABLED_USER_DEST_SELECT

2018-05-22 20:17:31 +02:00

actions_setmoduleoptions.inc.php

…

actions_setnotes.inc.php

…

antispamimage.php

…

commonfieldsinexport.inc.php

…

datepicker.php

…

doxygen.php

…

extrafieldsinexport.inc.php

…

get_info.php

…

get_menudiv.php

FIX Menu scheduled jobs not visible on jmobile conf

2018-06-19 13:10:13 +02:00

index.html

…

photos_resize.php

Fix conflict with external ticketsup module

2018-06-04 21:49:29 +02:00

search_page.php

…

search.php

…

tools.php

…

website.inc.php

…