Ion Agorria
5f9b1fa029
Changes for applying new paths
2015-03-14 16:50:02 +01:00
Laurent Destailleur
9c087e27d0
Fix permissions
2015-02-02 13:45:55 +01:00
Laurent Destailleur
1c7feb67ea
Merge branch 'dinamic-prices-product' of
...
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/fournisseurs.php
2015-01-31 14:53:14 +01:00
Laurent Destailleur
f92bc7986b
Add Weighted average price as default price for buying price for margin
...
calculation. Add option MARGIN_PMP_AS_DEFAULT_BUY_PRICE to replace
with first supplier price.
2015-01-14 10:46:50 +01:00
Laurent Destailleur
8b3faf46db
Add PMP into selection of buy price.
2015-01-13 15:38:59 +01:00
Ion Agorria
5bbcb58b44
Added expressions for product/service prices
2014-12-28 01:26:41 +01:00
Laurent Destailleur
1e8e4e7fda
Prepare 3.8 dev
...
Fix bad test.
Renamed table for dynamic prices.
2014-12-03 17:06:44 +01:00
Ion Agorria
fac46b3b46
Code for dinamic prices funcionality
2014-11-29 06:31:35 +01:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Marcos García de La Fuente
9fbd7806f0
More substitutions
2014-06-12 11:31:53 +02: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
3d62303d59
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
build/debian/get-orig-source.sh
build/debian/watch
htdocs/fourn/ajax/getSupplierPrices.php
2013-09-19 01:02:53 +02:00
Laurent Destailleur
b20b82df3d
Fix: we must use conf-currency as parameter of method price instead of
...
using langs->getCurrencySymbol
2013-09-15 13:04:38 +02:00
Christophe Battarel
d9d90f1088
Fix: Supplier price displayed on document lines didnt take discount
...
Conflicts:
htdocs/fourn/ajax/getSupplierPrices.php
2013-09-15 12:04:46 +02:00
Christophe Battarel
6959ccf627
Fix: Supplier price displayed on document lines didnt take discount
2013-09-15 11:41:41 +02:00
Christophe Battarel
26b8f29682
fix display of buying price on line edit when no supplier price is defined
2013-08-23 09:16:37 +02:00
Christophe Battarel
32dd1e4480
fix display of buying price on line edit when no supplier price is defined
2013-08-22 10:45:42 +02:00
Laurent Destailleur
869e877cb7
Qual: We must not concat currency symbol after a price, but use the
...
parameter currency of method price.
2013-06-17 11:58:55 +02:00
Laurent Destailleur
a5b174eccc
Fix: Architecture of getCurrency was wrong. Cache was not stored
...
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
2013-01-18 15:57:11 +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
Christophe Battarel
38e9290729
show costprice instead of buyingprice if setup of margin module is costprice
2013-01-11 15:33:34 +01:00
Regis Houssin
f322ec50ed
New: [ task #498 ] - final part
2012-08-25 15:21:34 +02:00
Regis Houssin
f4d75e87d3
Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
...
into task498_objectline
Conflicts:
htdocs/core/class/commonobject.class.php
2012-08-23 07:53:48 +02:00
Marcos García
f3674317ec
Removed parenthesis from all require and replaced with single quotes
2012-08-22 23:24:21 +02:00
Regis Houssin
2ae1d3d3b5
New: [ task #498 ]
2012-08-22 17:42:40 +02:00
Regis Houssin
beedf13324
Fix: restore broken feature, disable token renewal in ajax response
2012-07-29 09:54:58 +02:00
