Laurent Destailleur 7b7d27920d Merge remote-tracking branch 'origin/3.7' into 3.8 ...

Conflicts:
	htdocs/adherents/type.php
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/tax.lib.php
	htdocs/product/composition/card.php

2015-10-10 18:56:28 +02:00

..

bank

syntax error

2015-10-08 09:34:02 +02:00

charges

Move my address email to new one

2015-07-15 20:30:33 +02:00

deplacement

Fix bad parameters of function select_date

2015-07-12 12:50:24 +02:00

facture

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-10-10 18:56:28 +02:00

journal

Fix style and sql error for field fde.ref not found

2015-08-28 18:20:51 +02:00

localtax

Merge remote-tracking branch 'origin/3.7' into develop

2015-06-14 17:18:45 +02:00

paiement

Fix the feature to log a cheque as returned.

2015-09-12 18:00:19 +02:00

payment_sc

Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into

2014-09-23 00:02:19 +02:00

prelevement

Merge remote-tracking branch 'origin/3.7' into develop

2015-07-19 12:26:31 +02:00

resultat

Merge remote-tracking branch 'origin/3.7' into 3.8

2015-10-04 20:46:17 +02:00

salaries

Merge remote-tracking branch 'origin/3.7' into develop

2015-08-30 21:20:50 +02:00

sociales

Merge remote-tracking branch 'origin/3.8' into develop

2015-07-19 15:32:20 +02:00

stats

syntax error

2015-10-08 09:34:02 +02:00

tva

Fix bad information in report

2015-09-26 11:53:36 +02:00

ventilation

Merge branch 'develop-accounting' of github.com:aspangaro/dolibarr into

2014-09-29 16:31:35 +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

Lowecased booleans to fit with PSR-2 specification.

2014-10-12 00:23:19 +02:00

facture.php

fix : Typo

2015-10-02 12:39:09 +02:00

hrm.php

Move my address email to new one

2015-07-15 20:30:33 +02:00

index.php

Merge remote-tracking branch 'origin/3.7' into develop

2015-09-03 10:49:41 +02:00

paiement_charge.php

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-08-10 12:14:18 +02:00

paiement.php

Prepare merge of merge tools and invoice list

2015-06-30 14:32:17 +02:00

recap-compta.php

Finishment of look

2015-06-20 23:33:13 +02:00