Marcos García de La Fuente
|
863efcbc5d
|
NEW Removed unused FormOrder::selectSourcesCommande function
Also refactored select functions to avoid using HTML and encourage using Form::selectarray function
|
2016-04-16 21:33:23 +02:00 |
|
Laurent Destailleur
|
d396612a7c
|
NEW: Add a new method for margin calculation. Added margin on "cost
price" to margin on WAP price and margin on "best supplier price".
|
2016-01-13 12:48:59 +01:00 |
|
philippe grand
|
de0a13ae8f
|
[Qual] Uniformize code
|
2015-12-12 10:59:02 +01:00 |
|
Laurent Destailleur
|
b3491ef4e5
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
|
2015-10-16 10:12:36 +02:00 |
|
Laurent Destailleur
|
72cabe2fc3
|
More complete description of margin rules calculation
|
2015-10-06 19:27:48 +02:00 |
|
Raphaël Doursenaud
|
631ee83745
|
[Qual] Replaced deprecated print_fiche_titre()
|
2015-09-24 18:34:58 +02:00 |
|
Laurent Destailleur
|
9e39c73f5f
|
Better translation
|
2015-07-16 13:28:40 +02:00 |
|
Laurent Destailleur
|
1485ead215
|
Fix: MARGIN_TYPE == 2 is "using PMP price" so i remove a duplicate
option to get same behaviour.
|
2015-06-24 21:36:28 +02:00 |
|
jfefe
|
c905f88498
|
Change generic and setup image title
|
2015-04-18 23:13:48 +02:00 |
|
Marcos García de La Fuente
|
4349f27299
|
Revert "Revert "Refactor 1""
|
2015-03-23 01:39:12 +01:00 |
|
Laurent Destailleur
|
2d90256640
|
Revert "Refactor 1"
|
2015-03-22 12:51:29 +01:00 |
|
Marcos García de La Fuente
|
e3853a648f
|
Redundant code
|
2015-02-25 19:44:12 +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 |
|
Marcos García
|
4318d5c02d
|
Missing succes message in margin module config page
|
2013-05-19 12:19:31 +02:00 |
|
Marcos García
|
be5fcfdce3
|
Improved es_ES translations + replaced lang key in margins module admin page
|
2013-04-27 12:56:57 +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
|
b119ab5539
|
Prepare 3.3 freeze.
|
2012-12-08 14:24:57 +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 |
|
Regis Houssin
|
be13602c71
|
Fix: use getDocumentsLink method
|
2012-09-15 09:02:20 +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 |
|
Marcos García
|
4209898d20
|
Lower-cased Header function
|
2012-08-31 05:58:38 +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
|
706d79986c
|
Removed parenthesis from all require_once and replaced with single quotes
|
2012-08-22 23:11:24 +02:00 |
|
Marcos García
|
a0eb690d0f
|
Fixed untranslated string and broken image
|
2012-07-30 03:28:16 +02:00 |
|
Regis Houssin
|
fb23364511
|
Fix: uniformize code
|
2012-07-23 16:10:54 +02:00 |
|