Laurent Destailleur 782ab6a02b Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ...

Conflicts:
	htdocs/core/modules/barcode/modules_barcode.class.php
	htdocs/product/admin/product.php

2016-08-05 00:42:40 +02:00

..

bank

Fix bad translation. Confusionbetween internal tranfert and bank

2016-07-30 17:28:18 +02:00

charges

Fix contextpage lost on submitting form or sorting

2016-06-07 14:06:00 +02:00

deplacement

Fix css class opacitymedium was not used everywhere.

2016-06-07 15:58:02 +02:00

facture

Fix strict sql

2016-08-02 13:45:35 +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

Minor fix

2016-06-21 12:15:41 +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 branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2016-08-05 00:42:40 +02:00

resultat

Fix css class opacitymedium was not used everywhere.

2016-06-07 15:58:02 +02:00

salaries

Uniformize presentation salary payment

2016-08-01 07:40:05 +02:00

sociales

Fix missing "back to list" link

2016-06-14 20:49:34 +02:00

stats

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

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

tva

Fix contextpage lost on submitting form or sorting

2016-06-07 14:06:00 +02: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 'Upstream/4.0' into 4.0-p36

2016-08-01 07:27:49 +02:00

index.php

Fix better error message when possible refering objects list is empty.

2016-07-16 14:37:35 +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