Laurent Destailleur 7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php

2017-10-18 19:51:29 +02:00

..

admin

NEW Can set email of thirdparty as unique and/or mandatory

2017-09-02 12:36:53 +02:00

ajax

Look and feel v6

2017-06-21 11:37:34 +02:00

canvas

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

2017-10-18 19:51:29 +02:00

checkvat

Standardize code

2017-05-13 17:04:46 +02:00

class

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

2017-10-18 11:28:20 +02:00

notify

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

tpl

Fix email

2017-09-01 17:18:07 +02:00

agenda.php

Standardize code for events

2017-10-04 12:58:13 +02:00

ajaxcompanies.php

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

2017-06-18 21:13:48 +02:00

ajaxcountries.php

Escape hml tags

2017-06-18 19:42:59 +02:00

card.php

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

2017-10-18 19:51:29 +02:00

commerciaux.php

Look and feel v6

2017-07-01 14:23:24 +02:00

consumption.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

contact.php

No more need of contacts on each tab by default

2017-09-27 20:15:56 +02:00

document.php

Look and feel v6

2017-07-01 14:23:24 +02:00

index.php

New: getEntity function use true $shared value by default

2017-05-30 18:50:54 +02:00

list.php

Scrutinizer Auto-Fixes

2017-10-13 11:28:26 +00:00

note.php

Look and feel v6

2017-07-01 14:23:24 +02:00

price.php

Fix remove warnings

2017-09-19 00:31:51 +02:00

project.php

Look and feel v6

2017-07-01 14:23:24 +02:00

rib.php

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

2017-10-18 19:51:29 +02:00

societecontact.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00