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

Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php

2017-10-18 19:51:29 +02:00

..

bank

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

2017-10-17 11:14:58 +02:00

charges

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

2017-10-13 22:01:56 +02:00

deplacement

Add more robust php unit to detect not escaped sql. Fix not escaped sql

2017-09-15 15:41:07 +02:00

facture

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

2017-10-18 19:51:29 +02:00

journal

Clean code

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

localtax

Add more robust php unit to detect not escaped sql. Fix not escaped sql

2017-09-15 15:41:07 +02:00

paiement

Fix test on entity must always be done using the "IN" instead of "="

2017-10-03 17:41:22 +02:00

payment_sc

Fix creation of tax payment

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

prelevement

Scrutinizer Auto-Fixes

2017-10-13 11:28:26 +00:00

resultat

CSS on report

2017-10-14 01:03:59 +02:00

salaries

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

2017-10-02 11:51:27 +02:00

sociales

Look and feel v6

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

stats

Standardize code

2017-09-05 09:43:22 +02:00

tva

Fix: use default $shared value

2017-09-27 17:40:02 +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

Fix translation done twice into field title of array

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

index.php

Update index.php

2017-07-18 14:35:11 +02:00

paiement_charge.php

Look and feel v6

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

paiement.php

Fix test on entity must always be done using the "IN" instead of "="

2017-10-03 17:41:22 +02:00

recap-compta.php

Fix syntax error

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