Laurent Destailleur
|
350bcea183
|
Merge
|
2013-03-22 17:10:17 +01:00 |
|
Laurent Destailleur
|
8d206fdfb0
|
Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
|
2013-01-16 15:36:08 +01:00 |
|
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 |
|
Laurent Destailleur
|
cd6a8fa761
|
New: Uniformize code
|
2012-09-17 02:07:14 +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
|
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 |
|
FHenry
|
bf2d0ea82a
|
correct checkstyle
|
2012-07-30 20:15:18 +02:00 |
|
Laurent Destailleur
|
dce9b96260
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/install/lib/repair.lib.php
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
|
2012-07-25 12:20:45 +02:00 |
|
Regis Houssin
|
fb23364511
|
Fix: uniformize code
|
2012-07-23 16:10:54 +02:00 |
|
Regis Houssin
|
fafd79a0f8
|
Fix: uniformize code (in progress)
|
2012-07-20 09:57:50 +02:00 |
|