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

Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php

2017-07-07 15:11:53 +02:00

..

class

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

2017-07-07 15:11:53 +02:00

stats

Start #6981

2017-06-20 12:17:13 +02:00

tpl

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00

card.php

Look and feel v6

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

contact.php

Look and feel v6

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

customer.php

Fix syntax error

2017-06-08 14:55:12 +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

info.php

Look and feel v6

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

list.php

Look and feel v6

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

note.php

Look and feel v6

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

orderstoinvoice.php

FIX #6985

2017-06-11 10:37:58 +02:00