Laurent Destailleur ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php

2018-09-04 21:35:43 +02:00

..

bank

Standardize and update code

2018-09-02 10:42:31 +02:00

charges

standardize

2018-07-30 17:28:44 +02:00

deplacement

Standardize and update code

2018-09-02 11:08:41 +02:00

facture

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

2018-09-04 21:35:43 +02:00

journal

Standardize

2018-08-08 12:29:36 +02:00

localtax

fix conflict

2018-09-01 22:40:38 +02:00

paiement

fix conflict

2018-09-01 22:40:38 +02:00

payment_sc

Standardize

2018-08-08 12:29:36 +02:00

prelevement

Merge remote-tracking branch 'upstream/develop' into camelCaps

2018-09-01 13:52:51 +02:00

resultat

Standardize

2018-08-08 12:29:36 +02:00

salaries

fix conflict

2018-09-01 22:40:38 +02:00

sociales

Merge pull request #9242 from frederic34/camelCaps

2018-09-01 15:37:56 +02:00

stats

Standardize

2018-08-08 12:29:36 +02:00

tva

fix conflict

2018-09-01 22:40:38 +02:00

ajaxpayment.php

FIX #8775 (try better fix)

2018-05-10 11:48:18 +02:00

clients.php

clean and update code

2018-06-17 14:33:29 +02:00

index.php

FIX adding GROUP BY for PostgreSQL

2018-08-16 01:14:42 +02:00

paiement_charge.php

clean and update code

2018-06-17 14:33:29 +02:00

paiement.php

clean and update code

2018-06-17 14:33:29 +02:00

recap-compta.php

clean and update code

2018-06-17 14:33:29 +02:00