Laurent Destailleur 358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php

2021-04-13 20:19:05 +02:00

..

ajax

Merge remote-tracking branch 'upstream/develop' into 14a36

2021-04-12 21:35:03 +02:00

boxes

Merge remote-tracking branch 'upstream/develop' into 14a36

2021-04-12 21:35:03 +02:00

class

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

2021-04-13 20:19:05 +02:00

data

Remove one thousand of useless files

2021-04-12 15:57:16 +02:00

db

Remove one thousand of useless files

2021-04-12 15:57:16 +02:00

filemanagerdol

Remove one thousand of useless files

2021-04-12 15:57:16 +02:00

js

Remove one thousand of useless files

2021-04-12 15:57:16 +02:00

lib

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

2021-04-13 20:19:05 +02:00

login

Remove one thousand of useless files

2021-04-12 15:57:16 +02:00

menus

Merge remote-tracking branch 'upstream/develop' into 14a36

2021-04-12 21:35:03 +02:00

modules

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

2021-04-13 20:19:05 +02:00

tpl

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

2021-04-13 19:39:08 +02:00

triggers

Merge remote-tracking branch 'upstream/develop' into 14a36

2021-04-12 21:35:03 +02:00

actions_addupdatedelete.inc.php

…

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

Debug mass action after regression on close on proposal

2021-04-13 19:38:55 +02:00

actions_printing.inc.php

…

actions_sendmails.inc.php

…

actions_setmoduleoptions.inc.php

on goung

2021-03-29 17:26:43 +02:00

actions_setnotes.inc.php

…

antispamimage.php

…

commonfieldsinexport.inc.php

…

customreports.php

Clean code

2021-04-02 13:33:41 +02:00

datepicker.php

…

doxygen.php

…

extrafieldsinexport.inc.php

…

get_info.php

…

get_menudiv.php

…

photos_resize.php

Look and feel v14

2021-03-24 01:53:08 +01:00

search_page.php

…

search.php

…

tools.php

…

website.inc.php

FIX #yogosha5746 - next step (work in progress)

2021-03-30 18:17:13 +02:00