jfefe 190ee35e86 Merge branch 'develop' into api_rest ...

Conflicts:
	htdocs/user/card.php
	htdocs/user/class/user.class.php

2015-06-15 14:29:34 +02:00

..

bank

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

2015-06-14 17:18:45 +02:00

charges

NEW Clean code into salary module, debug and add indexes

2015-05-13 08:57:39 +02:00

deplacement

Qual: added deprecation hinting

2015-06-01 11:00:11 +02:00

facture

Merge branch 'develop' into api_rest

2015-06-15 14:29:34 +02:00

journal

Invoices: added situation (or interim) invoices support

2015-01-06 17:12:13 +01:00

localtax

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

2015-06-14 17:18:45 +02:00

paiement

Qual: added deprecation hinting

2015-06-01 11:00:11 +02:00

payment_sc

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

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

prelevement

Css fix

2015-05-15 20:10:17 +02:00

resultat

NEW Forms are using the tab look, even in creation mode.

2015-05-13 17:53:25 +02:00

salaries

NEW: Add tab document on salaries payment

2015-05-28 07:33:50 +02:00

sociales

Qual: added deprecation hinting

2015-06-01 11:00:11 +02:00

stats

Include Categories class whenever Categorie::TYPE is used

2015-05-23 23:35:49 +02:00

tva

NEW Forms are using the tab look, even in creation mode

2015-05-20 07:03:17 +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

Fix: ereg more simple

2015-06-11 09:21:44 +02:00

hrm.php

Uniformize status & add price()

2015-03-08 07:21:07 +01:00

index.php

Fix: wrong link

2015-05-27 07:19:10 +02:00

paiement_charge.php

Fix: Missing language key

2015-03-27 06:59:21 +01:00

paiement.php

NEW Forms are using the tab look, even in creation mode

2015-05-27 07:41:25 +02:00

recap-compta.php

Implemented constants in Commande, Facture and Propal

2015-03-15 11:48:57 +01:00