Laurent Destailleur
770ddb6b0f
Merge branch 'task-1793' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-task-1793
Conflicts:
ChangeLog
htdocs/margin/lib/margins.lib.php
2015-01-31 14:29:15 +01:00
Marcos García de La Fuente
c667f8734a
[ task #1793 ] Create new permission to restrict commercial agent margin to logged user
2015-01-18 16:42:11 +01:00
Laurent Destailleur
08214999a7
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-01-18 15:21:38 +01:00
Marcos García de La Fuente
7e16d0c1d3
Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled
2015-01-13 01:48:58 +01:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
63bb09fbdf
Fix: Removed duplicate translation
2014-03-20 00:21:52 +01:00
Laurent Destailleur
7127f5fc21
fix: doxygen
2013-12-16 14:16:01 +01:00
Laurent Destailleur
cfec85c2d6
Fix: Rewrite content of getMarginInfos.
...
This solve bug of rounding with total price when we need a unit price.
This solve lso bug of rounding on non decimal basis that we don't want.
Also this remove calling database when not usefull so make possible to
call this function into fetch (this remove the FIXME not into comment
so).
2013-12-16 13:24:00 +01:00
Laurent Destailleur
ad420bbf42
Mark file as bugged (seriously)
2013-12-10 18:56:02 +01:00
Christophe Battarel
ba0273ccc4
fix bad rounding on margin calculation and display
2013-10-30 18:17:37 +01:00
Christophe Battarel
37e47272c7
fix bugs on margin reports
2013-10-05 10:21:38 +02:00
Christophe Battarel
775d259f88
Fix: Supplier price displayed on document lines and margin infos didnt take discount
2013-09-15 14:52:41 +02: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
4136c27516
RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
...
commits !
2012-12-01 15:45:05 +01:00
Laurent Destailleur
078b015db8
Work on multitax (vat). Need your test.
...
Qual: Because params were often missing in calculate_price(), params are
now mandatory.
2012-11-03 16:32:49 +01: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
Regis Houssin
fafd79a0f8
Fix: uniformize code (in progress)
2012-07-20 09:57:50 +02:00
