Florian HENRY ab50437331 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ...

develop

Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/html.form.class.php

2015-01-19 09:38:00 +01:00

..

bank

Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into

2015-01-17 15:11:12 +01:00

charges

Fixed: [ bug #1690 ] Sorting on salary table triggers SQL errors

2014-12-25 12:08:10 +01:00

deplacement

Add some "classfortooltip"

2015-01-09 00:07:54 +01:00

dons

Add some "classfortooltip"

2015-01-09 00:07:54 +01:00

facture

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

2015-01-19 09:38:00 +01:00

journal

Invoices: added situation (or interim) invoices support

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

localtax

Merge pull request #2225 from frederic34/psr2

2015-01-09 22:53:06 +01:00

paiement

Merge pull request #2020 from GPCsolutions/situationsinvoices

2015-01-17 14:44:05 +01: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.7' into develop

2015-01-18 18:44:22 +01:00

resultat

Invoices: added situation (or interim) invoices support

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

salaries

Add some "classfortooltip"

2015-01-09 00:07:54 +01:00

sociales

Add some "classfortooltip"

2015-01-09 00:07:54 +01:00

stats

Invoices: added situation (or interim) invoices support

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

tva

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

2015-01-09 23:09:10 +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

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

2015-01-18 18:44:22 +01:00

hrm.php

Fix: Use correct permission on correct field.

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

index.php

Typo

2014-12-27 11:28:10 +01:00

paiement_charge.php

Replace <center> tags

2014-11-25 20:13:43 +01:00

paiement.php

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

2015-01-18 18:44:22 +01:00

recap-compta.php

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

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