Laurent Destailleur
7105fabb79
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/langs/en_US/users.lang
htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:51:49 +01:00
Marcos García de La Fuente
9f27e2323f
FIX #3734 Do not show empty links of deleted source objects in stock movement list
2015-11-21 11:51:23 +01:00
Christophe Battarel
fa088eb6cc
FIX bad calculation for stock value
2015-11-05 14:57:58 +01:00
Laurent Destailleur
9b85a70013
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
2015-10-16 09:52:38 +02:00
Alexis Algoud
0251728e28
FIX double db escape add too quote
2015-10-12 17:36:24 +02:00
Laurent Destailleur
0c3ebe63c2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/class/html.formproduct.class.php
htdocs/product/stock/index.php
htdocs/product/stock/liste.php
htdocs/product/stock/mouvement.php
htdocs/product/stock/product.php
htdocs/product/stock/valo.php
2015-09-12 11:44:07 +02:00
Maxime Kohlhaas
c6081f0fa2
Fix multientity stock management (F.Henry followup)
2015-09-11 20:38:32 +02:00
Laurent Destailleur
9b55bedf66
FIX bad calculation for stock value
2015-05-04 22:04:58 +02:00
Laurent Destailleur
4f9aef6150
Fix calculation of PMP of product.
...
Also add phpunit test to avoid this in future.
2015-03-21 15:29:23 +01:00
Laurent Destailleur
6a70af2b67
Fixed: bug into produc batch management
2014-12-09 14:03:10 +01:00
aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
Laurent Destailleur
ad8b92541d
Fix: sql request with pgsql
...
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
2014-09-20 00:57:29 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Maxime Kohlhaas
6349e5e4a2
Class MouvementStock was not extending CommonObject so error on call_trigger function
2014-07-29 15:45:53 +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
KreizIT
5e7c0639b0
Refactor: various trigger
2014-07-11 16:02:27 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
BENKE Charles
13ce63ce99
replace mvid by $mvid, wrong week-end
2014-06-22 22:59:25 +02:00
BENKE Charles
3a886dfeb4
Update mouvementstock.class.php
...
return mouvement id instead simply "1", i need to store the movement id on my factory modules (to update it at the end of the build process if it's need)
2014-06-21 17:51:50 +02:00
BENKE Charles
7d76458488
Update entrepot.class.php
2014-06-21 11:39:21 +02:00
BENKE Charles
51a2c2f5cb
Update entrepot.class.php
...
bad element name
2014-06-21 10:43:47 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
ca0a6cb307
Removed SQL string from call debug log
2014-06-13 01:34:39 +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
Maxime Kohlhaas
233a8fa917
Add new PHPUnit test on Entrepot
2014-03-16 11:38:39 +01:00
Maxime Kohlhaas
67342486a6
Task 1074 : add link to source document on stock movement
2014-03-15 02:18:39 +01:00
KreizIT
feae560aa3
Travis correction.
2014-03-05 11:28:40 +01:00
KreizIT
58f2bf078b
-Add batch record management
...
-Implements stock increase or decrease with batch number record on product's warehouse tab
2014-03-05 10:54:07 +01:00
Laurent Destailleur
da569ea8d4
Fix: Serious pb with loading stocks. If we use product->stock_reel or
...
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
2013-12-10 19:39:28 +01:00
Francis Appels
d7fc0eea43
fix: _create()
...
add 'require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';'
to htdocs/product/stock/class/mouvementstock.class.php _create method.
This to support product class instance used in function.
2013-10-15 11:12:41 +02:00
Laurent Destailleur
ae8f0c3efd
New: Add number of product in stock before and after selected period
...
when a filter is done on a period + a specific product.
2013-10-10 17:16:15 +02:00
Laurent Destailleur
3fb890e9b7
New: Add total of unique different product into warehouse
2013-10-02 12:49:28 +02:00
Laurent Destailleur
205ff535a9
Fix: [ bug #919 ] SQL error in product/stock/product.php
2013-06-04 00:30:38 +02:00
Grand Philippe
44dee53350
english language standardization
2013-02-25 18:21:12 +01:00
Grand Philippe
b081589129
english language standardization
2013-02-25 09:52:24 +01:00
Grand Philippe
6decab1847
english language standardization
2013-02-25 09:17:38 +01:00
Grand Philippe
86de772b31
english language standardization
2013-02-24 17:08:52 +01:00
Grand Philippe
88458ca466
english standardization
2013-02-23 10:18:05 +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
Regis Houssin
8908f977b8
Fix: converting line delimiters !!!
2012-11-14 11:31:08 +01:00
simnandez
353c932e11
Fix: if no results do not charge data
2012-11-06 12:33:35 +01:00
Laurent Destailleur
7f2c6dc6eb
Only code comments
2012-11-03 14:44:06 +01:00
simnandez
7aec227694
New: More import options. Products stocks
2012-10-26 17:52:53 +02:00
Regis Houssin
d705995a49
Fix: convert line delimiters
2012-10-18 10:36:53 +02:00
Laurent Destailleur
a41186b4c5
[ bug #70 ] Champ Stock toujours vide dans export produit
2012-10-17 20:30:17 +02:00
Laurent Destailleur
4789b5e2d1
Fix: Usage of specific mysql function is forbidden
2012-10-06 22:46:54 +02:00
Maxime Kohlhaas
12128a6226
Task # 186 : Stock calculation on product, migration + update product
2012-10-04 15:25:34 +02:00
Regis Houssin
43c0a03758
Fix: strict mode tornado
2012-09-15 11:21:22 +02:00
