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

Conflicts:
	ChangeLog
	htdocs/categories/fiche.php
	htdocs/comm/action/index.php
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fourn/fiche.php
	htdocs/product/composition/fiche.php
	htdocs/product/price.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php

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

..

bank

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

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

charges

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

2014-07-04 13:43:50 +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

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

2014-10-12 02:54:34 +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

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

2014-10-12 02:54:34 +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