Laurent Destailleur 60e5369db2 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/bookmarks/card.php

2014-11-27 22:01:02 +01:00

..

bank

Doxygen

2014-11-23 17:53:44 +01:00

charges

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

2014-10-18 21:08:09 +02:00

deplacement

Update /compta/deplacement/list.php

2014-11-23 17:44:13 +01:00

dons

Merge pull request #2083 from frederic34/patch-2

2014-11-23 17:47:43 +01:00

facture

Update apercu.php

2014-11-26 20:35:08 +01: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: Pb of object with wrong type.

2014-11-15 18:24:38 +01:00

paiement

Update /compta/paiement/cheque/list.php

2014-11-23 17:45:18 +01:00

payment_sc

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

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

prelevement

Update /compta/prelevement/list.php

2014-11-23 17:44:16 +01:00

resultat

Minor look enhancement during debug

2014-11-07 23:25:39 +01:00

salaries

Update /compta/salaries/index.php

2014-11-23 17:44:37 +01:00

sociales

Update /compta/sociales/index.php

2014-11-23 17:44:25 +01:00

stats

Fixed: [ bug #1648 ] Can't see turnover report by product/services

2014-11-21 23:45:56 +01:00

tva

Update /compta/tva/reglement.php

2014-11-23 17:44:21 +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 : tva not coming from multiprice

2014-11-07 15:31:06 +02:00

hrm.php

Fix: Use correct permission on correct field.

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

index.php

Lowecased booleans to fit with PSR-2 specification.

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

paiement_charge.php

Lowecased booleans to fit with PSR-2 specification.

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

paiement.php

Lowecased booleans to fit with PSR-2 specification.

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

recap-compta.php

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

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