Laurent Destailleur
|
469dd03673
|
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/filefunc.inc.php
htdocs/langs/nl_NL/margins.lang
|
2013-11-01 17:58:38 +01:00 |
|
Christophe Battarel
|
ba0273ccc4
|
fix bad rounding on margin calculation and display
|
2013-10-30 18:17:37 +01:00 |
|
Regis Houssin
|
bc0f65b73c
|
Fix: reorder lines problem
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
|
2013-10-12 11:58:38 +02:00 |
|
Regis Houssin
|
8801d7a1eb
|
Fix: reorder lines problem
|
2013-10-12 11:54:37 +02:00 |
|
Christophe Battarel
|
4c7741f5f0
|
manage user permissions for margin display
|
2013-08-20 12:11:19 +02:00 |
|
Florian Henry
|
9f03074127
|
- New: [ task #926 ] Add extrafield feature on order lines
- New: [ task #927 ] Add extrafield feature on Proposal lines
- New: [ task #928 ] Add extrafield feature on invoice lines
|
2013-06-10 16:05:41 +02:00 |
|
Laurent Destailleur
|
71e14df62f
|
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
|
2013-05-20 17:37:08 +02:00 |
|
Christophe Battarel
|
e3615d43bd
|
fix bug : external users should not see costprice and margin infos
|
2013-05-17 15:02:27 +02:00 |
|
Laurent Destailleur
|
4e0ef01389
|
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
|
2013-04-25 01:13:13 +02:00 |
|
Laurent Destailleur
|
10ab1a583a
|
Look: Optimize screens
|
2013-04-16 01:13:20 +02:00 |
|
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 |
|
Regis Houssin
|
b838895db9
|
Fix: change for a neutral email
|
2012-12-30 15:13:49 +01:00 |
|
Laurent Destailleur
|
215d7a883e
|
Fix: Revert bugged new feature that show false information.
|
2012-10-06 23:13:46 +02:00 |
|
Maxime Kohlhaas
|
16f82216bf
|
Task # 186 : Add stock column in sql request to get object lines + display alert icon if stock is too low
|
2012-10-04 16:26:33 +02:00 |
|
Regis Houssin
|
e19f8c54f1
|
Fix: strict mode hurricane
|
2012-09-15 10:01:35 +02:00 |
|
Regis Houssin
|
3e2be54ead
|
Fix: restore old method
|
2012-08-27 19:11:44 +02:00 |
|
Regis Houssin
|
f322ec50ed
|
New: [ task #498 ] - final part
|
2012-08-25 15:21:34 +02:00 |
|
Regis Houssin
|
c9113458d9
|
New: [ task #498 ] part 3
|
2012-08-25 03:28:30 +02:00 |
|
Regis Houssin
|
995c7f13d3
|
New: [ task #498 ] part3
|
2012-08-23 13:45:51 +02:00 |
|