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

develop

Conflicts:
	htdocs/compta/ventilation/card.php
	htdocs/compta/ventilation/fournisseur/card.php
	htdocs/compta/ventilation/fournisseur/list.php
	htdocs/compta/ventilation/list.php
	htdocs/core/menus/init_menu_auguria.sql

2014-09-29 16:31:35 +02:00

..

bank

Merge remote-tracking branch 'Upstream/develop' into develop

2014-09-20 06:42:31 +02:00

charges

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

2014-07-04 13:43:50 +02:00

deplacement

Merge remote-tracking branch 'Upstream/develop' into develop

2014-09-20 06:42:31 +02:00

dons

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

facture

Uniformize code for error reporting after a hook.

2014-09-28 03:41:32 +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

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

paiement

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

2014-09-23 00:02: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.6' into develop

2014-09-28 02:14:32 +02:00

resultat

Merge pull request #1910 from FHenry/develop

2014-09-22 23:48:32 +02:00

salaries

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

sociales

add the clone action for a social contribution

2014-09-23 16:52:15 +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

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

2014-09-21 20:30:55 +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

Removed closing php tag

2014-05-03 18:18:44 +02:00

facture.php

Merge pull request #1925 from tiaris/develop

2014-09-29 15:40:31 +02:00

hrm.php

Add label on search boxes

2014-07-11 13:26:02 +02:00

index.php

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00

paiement_charge.php

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

2014-05-06 23:58:17 +02:00

paiement.php

Uniformize code for error reporting after a hook.

2014-09-28 03:41:32 +02:00

recap-compta.php

Qual: Renamed all files & links "fiche.php" into "card.php"

2014-09-18 21:18:25 +02:00