Laurent Destailleur 4a60d57544 Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/fiche.php
	htdocs/product/liste.php

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

..

bank

Miscellaneous fixes

2014-10-16 20:55:13 +02:00

charges

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

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

deplacement

New: add context "globalcard" for declaring only once all cards

2014-10-06 07:20:58 +02:00

dons

New: add context "globalcard" for declaring only once all cards

2014-10-06 07:20:58 +02:00

facture

Fix: Bad closing tab on preview pages.

2014-10-17 12:56:54 +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

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

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

paiement

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

2014-10-04 17:20:17 +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.6' into develop

2014-10-12 02:54:34 +02:00

resultat

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

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

salaries

New: add context "globalcard" for declaring only once all cards

2014-10-06 07:20:58 +02:00

sociales

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

2014-10-12 02:54:34 +02:00

stats

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

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

tva

New: add context "globalcard" for declaring only once all cards

2014-10-06 07:20:58 +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

Qual : refactoring extrafields display on objects into a single tpl file

2014-10-14 17:00:06 +02:00

hrm.php

Solve fixme.

2014-10-03 02:00:50 +02: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