Marcos García de La Fuente 87f97ed545 Merge branch 'develop' into units ...

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php

2015-04-18 23:38:14 +02:00

..

class

Merge branch 'develop' into units

2015-04-18 23:38:14 +02:00

stats

Removed closing php tag

2014-05-03 18:18:44 +02:00

tpl

Differentiate title for customer and supplier orders/invoices.

2015-03-31 11:32:47 +02:00

apercu.php

Update apercu.php

2014-11-27 21:03:51 +01:00

card.php

Merge branch 'develop' into units

2015-04-18 23:38:14 +02:00

contact.php

Miscelaneous debug on barcode features.

2015-02-18 21:01:17 +01:00

customer.php

QUAL: Traduce terms + remove <center>

2015-03-15 14:04:07 +01:00

document.php

Qual: Renamed all files & links "liste.php" into "list.php"

2014-09-18 20:33:37 +02:00

index.php

Update index.php

2015-01-19 20:35:29 +01:00

info.php

Merge remote-tracking branch 'origin/3.5' into 3.6

2014-09-13 19:10:05 +02:00

list.php

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

2015-04-01 16:33:39 +02:00

note.php

Qual: Renamed all files & links "liste.php" into "list.php"

2014-09-18 20:33:37 +02:00

orderstoinvoice.php

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

2015-02-19 00:01:26 +01:00