Laurent Destailleur b57476153f Merge remote-tracking branch 'origin/3.9' into develop ...

Conflicts:
	htdocs/admin/menus/edit.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/consumption.php

2016-06-04 01:14:36 +02:00

..

bank

Fix duplicate translation key

2016-05-21 12:30:58 +02:00

charges

FIX Remove a total that has no sense

2016-04-22 17:11:12 +02:00

deplacement

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

facture

Fix date of recurrin invoice

2016-06-03 22:10:33 +02:00

journal

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

localtax

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

2016-04-22 21:02:20 +02:00

paiement

Fix column size

2016-05-18 21:04:37 +02:00

payment_sc

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

prelevement

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

2016-04-22 21:02:20 +02:00

resultat

Last change

2016-05-19 16:50:18 +02:00

salaries

FIX The include file for action on files should not be a template file

2016-04-02 14:16:16 +02:00

sociales

FIX Button must be out of tabs

2016-06-02 21:11:14 +02:00

stats

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

2016-04-29 20:43:42 +02:00

tva

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

2016-03-25 16:24:26 +01:00

ventilation

Revert "Corrected non-static usages of Form::selectarray function"

2016-03-25 15:34:37 +01: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

[Qual] Close database handler should be after Footer

2015-12-11 14:19:38 +01:00

facture.php

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

2016-06-04 01:14:36 +02:00

index.php

put colspan in td instead tr

2016-05-04 16:49:15 +02:00

paiement_charge.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

paiement.php

NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead

2016-04-17 15:24:22 +02:00

recap-compta.php

Debug and fix when using dolibarr with jmobile

2016-01-03 16:23:23 +01:00