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 |
|
Laurent Destailleur
|
fe78996026
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/product/stock/fiche.php
htdocs/product/stock/valo.php
|
2015-11-05 22:04:18 +01:00 |
|
Christophe Battarel
|
f566b38296
|
FIX pmp
|
2015-11-05 15:29:51 +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 |
|
philippe grand
|
0e343ae3b2
|
syntax error
|
2015-10-08 09:34:02 +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 |
|
Florian HENRY
|
89b723b2a7
|
FIX : multientity warehouse management
|
2015-09-08 16:23:00 +02:00 |
|
Florian HENRY
|
63a817c3a4
|
Fix wahrehouse multientty management
|
2015-09-08 16:13:15 +02:00 |
|
Florian HENRY
|
52cb9581ff
|
Fix multientity stock management
|
2015-09-08 16:00:13 +02:00 |
|
Regis Houssin
|
1a08f65942
|
Fix: problem with pagination
|
2015-09-02 17:22:19 +02:00 |
|
Regis Houssin
|
fdf6c32fbc
|
Fix: place the form outside the table for avoid errors
|
2015-08-13 12:47:04 +02:00 |
|
maxime peyrot
|
bcb4754585
|
FIX #2856 : Wrong table design
|
2015-05-21 17:40:36 +02:00 |
|
Laurent Destailleur
|
9b55bedf66
|
FIX bad calculation for stock value
|
2015-05-04 22:04:58 +02:00 |
|
Juanjo Menent
|
d7ba9b3312
|
Fix: Bad permission assignments for stock movements actions
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/product/stock/mouvement.php
|
2015-04-07 20:40:48 +02:00 |
|
Juanjo Menent
|
9d8cb459f1
|
Fix: Bad permission assignments for stock movements actions
|
2015-04-07 20:28:45 +02:00 |
|
Laurent Destailleur
|
3cc4358e72
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
build/makepack-dolibarr.pl
htdocs/commande/liste.php
htdocs/product/stock/product.php
|
2015-03-29 15:24:17 +02:00 |
|
Maxime Kohlhaas
|
b250c5588e
|
Fix : Quantity displayed for virtual stock explanations was wrong
|
2015-03-25 16:11:36 +01: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
|
fa2e57eaa3
|
pcpcs
|
2015-03-04 01:10:23 +01:00 |
|
Laurent Destailleur
|
8a00109baf
|
Fix: Several bugs int replenishment feature.
|
2015-03-01 16:05:20 +01:00 |
|
Laurent Destailleur
|
206a453ce2
|
Solve confusion into number of order or qty into order.
|
2015-02-12 15:40:06 +01:00 |
|
Laurent Destailleur
|
c727e2b8ec
|
Fix bad translation
Conflicts:
htdocs/product/stock/product.php
|
2015-02-12 15:29:21 +01:00 |
|
Laurent Destailleur
|
9850b753fa
|
Tooltip at wrong place.
|
2015-01-28 19:37:09 +01:00 |
|
Laurent Destailleur
|
31fd03790e
|
Fixed: Prices visible into stock tab.
Conflicts:
htdocs/product/stock/product.php
|
2015-01-12 18:26:11 +01:00 |
|
Laurent Destailleur
|
9be99b2987
|
Fixed: We must use PMP of product. Not warehouse.
|
2014-12-09 14:27:02 +01:00 |
|
Laurent Destailleur
|
6a70af2b67
|
Fixed: bug into produc batch management
|
2014-12-09 14:03:10 +01:00 |
|
Laurent Destailleur
|
7afe9de1c0
|
Start to debug batch/serial module
|
2014-12-03 00:42:14 +01:00 |
|
Laurent Destailleur
|
e395fd8096
|
Fix CRLF
|
2014-11-30 15:24:39 +01:00 |
|
Laurent Destailleur
|
7303983610
|
Fixed: Ton of old bugs when debugging POS.
|
2014-11-30 01:35:58 +01:00 |
|
Laurent Destailleur
|
7f0a01936e
|
Fix a very old bug of conflicth into decrease stock when using point of
sale, not compatible with option defined into stock module.
|
2014-11-28 20:41:52 +01:00 |
|
Laurent Destailleur
|
bc1d88d324
|
Fixed: The visualization of status with mutualized picto was lost, so i
restore old feature to keep same visual for all status and add hidden
option to switch to new.
|
2014-11-24 01:16:26 +01:00 |
|
Frédéric FRANCE
|
99e88c16c4
|
Update /product/stock/mouvement.php
|
2014-11-23 17:45:04 +01:00 |
|
Laurent Destailleur
|
97a6bd842d
|
Minor fixes.
|
2014-11-23 12:39:53 +01:00 |
|
Laurent Destailleur
|
5094c2c066
|
Merge pull request #1998 from frederic34/iconstock
Try to improve stock display for all stock increase/decrease options
|
2014-11-07 21:48:04 +01:00 |
|
aspangaro
|
acbbe823e8
|
Typo
|
2014-11-06 20:04:51 +01:00 |
|
frederic34
|
f23f16da86
|
Try to improve stock display for all stock increase/decrease options
|
2014-11-01 21:38:50 +01:00 |
|
Laurent Destailleur
|
4226c27ccf
|
Merge pull request #1965 from frederic34/patch-4
On/Off for Object (do not restrict to product)
|
2014-10-30 18:21:50 +01:00 |
|
Laurent Destailleur
|
9619c0cdea
|
Fix: [ bug #1581 ] SQL injection possbile
|
2014-10-27 00:58:56 +01:00 |
|
Frédéric FRANCE
|
8133b67878
|
Update product.php
|
2014-10-18 22:50:17 +02:00 |
|
Frédéric FRANCE
|
3144fd6845
|
Update product.php
|
2014-10-18 18:52:16 +02:00 |
|
Frédéric FRANCE
|
3a49965820
|
Update product.php
|
2014-10-18 15:52:37 +02:00 |
|
Frédéric FRANCE
|
889dbec97b
|
Use javascript On/Off tosell-tobuy if enabled
|
2014-10-18 15:07:38 +02:00 |
|
Regis Houssin
|
a2446e51db
|
New: add context "globalcard" for declaring only once all cards
|
2014-10-06 07:20:58 +02:00 |
|
Laurent Destailleur
|
97eec37f1c
|
Uniformize code: property "nom" for thirdparty is aliased into "name"
everywhere.
|
2014-10-04 17:20:17 +02:00 |
|
Laurent Destailleur
|
5ac63ec534
|
Solve fixme.
|
2014-10-03 02:00:50 +02:00 |
|
Regis Houssin
|
4248c7bed2
|
Fix: strict mode paradise
|
2014-10-02 09:30:31 +02:00 |
|