Laurent Destailleur 4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php

2016-08-09 13:26:08 +02:00

..

bank

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

2016-08-01 15:15:32 +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

Move button to link to, in same part of code than code to output links.

2016-08-05 15:30:28 +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 '4.0' of git@github.com:Dolibarr/dolibarr.git into develop

2016-08-09 13:26:08 +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

typo

2016-06-19 20:24:20 +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

…

clients.php

[Qual] Close database handler should be after Footer

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

facture.php

Move button to link to, in same part of code than code to output links.

2016-08-05 15:30:28 +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

select bank and payment mode for social contrib

2016-06-19 18:53:19 +02:00

paiement.php

Update paiement.php

2016-07-26 11:55:26 +02:00

recap-compta.php

Debug and fix when using dolibarr with jmobile

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