Juanjo Menent 05b0a9b675 Merge remote-tracking branch 'origin/3.7' into 3.8 ...

# Conflicts:
#	htdocs/core/menus/standard/eldy.lib.php

2015-08-01 14:50:07 +02:00

..

bank

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

2015-08-01 14:50:07 +02:00

charges

Move my address email to new one

2015-07-15 20:30:33 +02:00

deplacement

Fix bad parameters of function select_date

2015-07-12 12:50:24 +02:00

facture

Fix serious deadlock feature. It was possible to link with no way to

2015-07-28 14:13:16 +02:00

journal

Move my address email to new one

2015-07-15 20:30:33 +02:00

localtax

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

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

paiement

Merge remote-tracking branch 'Upstream/3.8' into 3.8-1

2015-07-18 05:29:57 +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.7' into develop

2015-07-19 12:26:31 +02:00

resultat

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

2015-08-01 14:50:07 +02:00

salaries

Move my address email to new one

2015-07-15 20:30:33 +02:00

sociales

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

2015-07-19 15:32:20 +02:00

stats

New : add stats by qty on report turnover by product (+ clean code)

2015-06-22 19:22:13 +02:00

tva

Fix: Show vat_by_thirdparty when module accounting is on

2015-07-15 23:24:28 +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 serious deadlock feature. It was possible to link with no way to

2015-07-28 14:13:16 +02:00

hrm.php

Move my address email to new one

2015-07-15 20:30:33 +02:00

index.php

Fix: wrong link

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

paiement_charge.php

Forms are using the tab look, even in creation mode

2015-06-29 21:58:38 +02:00

paiement.php

Prepare merge of merge tools and invoice list

2015-06-30 14:32:17 +02:00

recap-compta.php

Finishment of look

2015-06-20 23:33:13 +02:00