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

Conflicts:
	htdocs/public/paybox/newpayment.php
	htdocs/public/payment/newpayment.php
	htdocs/public/paypal/newpayment.php
	htdocs/public/stripe/newpayment.php

2018-01-31 20:25:24 +01:00

..

admin

Fix translation of extrafields type

2017-10-24 18:05:43 +02:00

class

Fix for multicompany

2018-01-30 15:48:09 +01:00

card.php

Look and feel v6

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

edit.php

USe second parameter in GETPOST

2017-09-15 10:50:50 +02:00

index.php

Fix regression on categories

2017-08-27 12:28:59 +02:00

photos.php

FIX #7072

2017-07-25 19:57:51 +02:00

traduction.php

FIX #7072

2017-07-25 19:57:51 +02:00

viewcat.php

Show total number of records by category

2017-12-20 17:41:26 +01:00