Laurent Destailleur f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ...

Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php

2017-07-08 18:32:34 +02:00

..

bank

Merge pull request #7125 from aspangaro/6.0-fec3

2017-07-07 20:32:27 +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 6.0

2017-07-08 18:32:34 +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

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

2017-07-08 18:32:34 +02:00

payment_sc

Fix var not sanitized

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

prelevement

Fixing pages warning when value is null

2017-06-24 16:45:45 +02:00

resultat

Fix pgsql

2017-06-20 01:45:44 +02:00

salaries

Debug v6

2017-07-01 02:22:08 +02:00

sociales

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

2017-07-08 18:32:34 +02:00

stats

Look and feel v6

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

tva

Close #7095

2017-07-07 19:32:03 +02:00

ajaxpayment.php

…

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