Laurent Destailleur 04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php

2018-02-27 19:18:43 +01:00

..

admin

Fix back link of look and feel v7

2018-02-26 09:20:05 +01:00

lib

Clean dead code

2017-05-17 14:52:27 +02:00

tabs

Fix responsive and search

2017-12-01 12:01:17 +01:00

agentMargins.php

Fix translation done twice into field title of array

2017-08-02 13:31:53 +02:00

checkMargins.php

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-01-24 11:49:36 +01:00

customerMargins.php

NEW : Add product and product categories filters on customer margins

2018-01-10 12:11:02 +01:00

index.php

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

2015-01-18 15:21:38 +01:00

productMargins.php

NEW : Add product categories filter on product margin

2018-01-10 11:17:23 +01:00