Grand Philippe
|
b599481ef6
|
standardize code
|
2013-06-20 09:18:12 +02:00 |
|
Laurent Destailleur
|
8a82c8c5d5
|
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/margin/agentMargins.php
htdocs/margin/tabs/productMargins.php
|
2013-05-07 13:08:30 +02:00 |
|
fhenry
|
4a1eb1a588
|
Fix margin calculation
|
2013-05-03 15:26:20 +02:00 |
|
fhenry
|
a35a44b23e
|
Fix margin calculation problem
|
2013-05-03 15:22:41 +02:00 |
|
fhenry
|
9038549d0d
|
fix margin calculation problem
|
2013-05-03 11:50:13 +02:00 |
|
Laurent Destailleur
|
350bcea183
|
Merge
|
2013-03-22 17:10:17 +01:00 |
|
Laurent Destailleur
|
8a6adb8a49
|
Merge pull request #756 from cbattarel/3.3
various fixes on margin :
|
2013-03-18 06:25:54 -07:00 |
|
Christophe Battarel
|
f8291a9efe
|
use ifsql function
|
2013-03-18 14:18:17 +01:00 |
|
Christophe Battarel
|
e59084cafc
|
various fixes on margin :
- fix on sortorder
- fix for credit notes
- fix for total
|
2013-03-18 13:04:08 +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
|
c3e3595d9c
|
Look: Uniformize style
|
2012-12-08 17:42:08 +01: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 |
|
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 |
|
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 |
|
Laurent Destailleur
|
474a67a4a4
|
Fix: picto
|
2012-07-22 16:11:23 +02:00 |
|
Regis Houssin
|
fafd79a0f8
|
Fix: uniformize code (in progress)
|
2012-07-20 09:57:50 +02:00 |
|