Commit Graph

16 Commits

Author SHA1 Message Date
Laurent Destailleur
4f0e4be449 Merge pull request #402 from cbattarel/develop
add option to select contact type associated to commercial agents for margin and commission modules
2012-09-18 01:24:00 -07:00
Christophe Battarel
951b98a963 add option to select contact type associated to commercial agents for margin and commission modules 2012-09-18 09:44:34 +02:00
Regis Houssin
125f499e82 Fix: dol_htmloutput_events is already call in llxFooter 2012-09-13 16:15:36 +02:00
Laurent Destailleur
c11c3897ef Qual: Uniformize code 2012-09-12 20:45:01 +02:00
Christophe Battarel
2b010c9ba4 dont use lines without buying price for margin calculation if ForceBuyPriceIfNull is set 2012-09-06 13:49:39 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Christophe Battarel
cbd54291b1 also take lines without buying_price in commissions 2012-08-07 09:46:26 +02:00
Laurent Destailleur
acad2191d5 Fix: Style 2012-07-31 00:06:39 +02:00
FHenry
af91a7185a Checkstyle (from hudson) 2012-07-30 20:11:55 +02:00
Regis Houssin
fb23364511 Fix: uniformize code 2012-07-23 16:10:54 +02:00
Regis Houssin
01ab1aa66f Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into develop

Conflicts:
	htdocs/core/modules/modCommissions.class.php
2012-07-23 11:07:53 +02:00
Regis Houssin
bf807c27e5 Fix: uniformize code 2012-07-23 11:01:36 +02:00
Laurent Destailleur
ea93e62e91 Fix: Checkstyle 2012-07-23 10:46:09 +02:00
Christophe Battarel
b8fa4468ce add commissions module 2012-07-20 16:21:35 +02:00