Laurent Destailleur fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php

2013-05-03 00:15:02 +02:00

..

bank

Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d

2013-05-02 22:57:42 +02:00

charges

Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap

2013-04-25 01:13:13 +02:00

deplacement

Qual: Reduce number of methods. Mutualize update_note code.

2013-04-10 10:58:38 +02:00

dons

Try to solve some problems with table (replaced by div).

2013-04-25 20:27:45 +02:00

facture

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

2013-04-28 01:24:58 +02:00

journal

Merge pull request #851 from FHenry/develop

2013-04-20 12:02:16 -07:00

localtax

Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap

2013-04-25 01:13:13 +02:00

paiement

New: Compatibility with jmobile

2013-04-20 20:30:18 +02:00

payment_sc

Fix: $hookmanager is a global object

2013-01-26 10:35:30 +01:00

prelevement

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

2013-05-03 00:15:02 +02:00

resultat

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

2013-03-12 14:55:13 +01:00

sociales

Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap

2013-04-25 01:13:13 +02:00

stats

Fix: typo errors

2013-04-25 13:01:38 +02:00

tva

Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap

2013-04-25 01:13:13 +02:00

ventilation

Fix: Bad div closing

2013-03-30 19:40:52 +01:00

ajaxpayment.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

clients.php

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

2013-05-03 00:15:02 +02:00

facture.php

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

2013-04-28 01:24:58 +02:00

index.php

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

2013-04-28 01:24:58 +02:00

paiement_charge.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

paiement.php

Fix : set emetteur to MYCOMPANY when payment is a customer

2013-04-18 09:24:29 +02:00

recap-compta.php

Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap

2013-04-25 01:13:13 +02:00