Laurent Destailleur 2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7 ...

Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php

2015-07-19 12:04:30 +02:00

..

bank

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

2015-07-19 12:04:30 +02:00

charges

Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors

2014-12-23 13:07:16 +01:00

deplacement

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

2015-04-19 00:23:46 +02:00

dons

FIX : #2901

2015-05-29 17:27:05 +02:00

facture

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

2015-07-19 12:04:30 +02:00

journal

Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6

2014-09-21 20:30:55 +02:00

localtax

FIX Close bug #2855 Wrong translation key in localtax report page

2015-06-12 16:27:17 +02:00

paiement

Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into

2015-02-18 22:54:02 +01: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.6' into 3.7

2015-07-19 12:04:30 +02:00

resultat

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

2015-02-18 23:51:41 +01:00

salaries

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

2015-03-11 03:29:52 +01:00

sociales

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

2015-07-19 12:04:30 +02:00

stats

Fixed: Bad value for % increase for first year.

2014-12-21 14:15:36 +01:00

tva

PHPDoc and misc fixes for several folders

2015-02-10 13:17:37 +01: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: add filter for "dol_most_recent_files" for avoid conflict with

2015-06-06 13:03:02 +02:00

hrm.php

Fix: Use correct permission on correct field.

2014-10-30 12:19:38 +01:00

index.php

Fix remove </a> not needed

2014-11-25 18:54:56 +01:00

paiement_charge.php

Lowecased booleans to fit with PSR-2 specification.

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

paiement.php

PHPDoc and misc fixes for several folders

2015-02-10 13:17:37 +01:00

recap-compta.php

Uniformize code: property "nom" for thirdparty is aliased into "name"

2014-10-04 17:20:17 +02:00