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

Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php

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

..

bank

Fix component to select journal

2017-06-15 20:27:40 +02:00

charges

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

2017-06-06 15:03:36 +02:00

deplacement

FIX #6985

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

facture

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

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

journal

Update code using new css class

2017-05-10 16:41:19 +02:00

localtax

FIX #6985

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

paiement

Fix remove a FIXME tag.

2017-06-11 16:18:21 +02:00

payment_sc

Fix var not sanitized

2017-05-16 13:27:32 +02:00

prelevement

Fix syntax error

2017-06-08 14:55:12 +02:00

resultat

Fix syntax error

2017-06-08 14:55:12 +02:00

salaries

FIX #6985

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

sociales

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

2017-06-06 15:03:36 +02:00

stats

New: getEntity function use true $shared value by default

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

tva

FIX #6985

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

ajaxpayment.php

Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode

2014-07-30 15:47:19 +02:00

clients.php

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

2017-06-06 15:03:36 +02:00

index.php

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

2017-04-14 13:02:29 +02:00

paiement_charge.php

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

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

paiement.php

Look and feel v6

2017-05-29 11:38:23 +02:00

recap-compta.php

Fix syntax error

2017-06-08 14:55:12 +02:00