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

Conflicts:
	htdocs/compta/localtax/index.php
	htdocs/compta/tva/quarter_report.php
	htdocs/core/lib/tax.lib.php

2018-03-29 03:08:01 +02:00

..

bank

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

2018-03-29 03:08:01 +02:00

charges

Fix: regression, restore primary key

2018-03-08 07:41:54 +01:00

deplacement

Fix scrutinizer bugs

2017-12-15 22:14:28 +01:00

facture

Enhance code for template invoices

2018-03-22 21:42:19 +01:00

journal

Clean code

2017-09-05 10:16:08 +02:00

localtax

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

2018-03-29 03:08:01 +02:00

paiement

Serious enhancement in auto subscription for member module

2018-03-23 22:49:08 +01:00

payment_sc

Fix creation of tax payment

2017-10-07 21:27:18 +02:00

prelevement

Duplicate translation

2018-03-17 15:17:35 +01:00

resultat

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

2018-03-29 03:08:01 +02:00

salaries

NEW Add stats in salaries module

2018-03-15 06:23:20 +01:00

sociales

Fix: regression, restore primary key

2018-03-08 07:41:54 +01:00

stats

Fix SQLi reported by op7ica

2018-03-15 01:55:16 +01:00

tva

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

2018-03-29 03:08:01 +02:00

ajaxpayment.php

…

clients.php

Fix translation done twice into field title of array

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

index.php

fix better thirdparty link

2018-03-09 22:36:00 +01:00

paiement_charge.php

Look and feel v6

2017-10-16 20:53:23 +02:00

paiement.php

Fix: regression, restore primary key

2018-03-08 07:41:54 +01:00

recap-compta.php

FIX #8192

2018-02-15 14:47:08 +01:00