Commit Graph

168 Commits

Author SHA1 Message Date
Laurent Destailleur
f884f16564 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/admin/boxes.php
	htdocs/comm/action/card.php
	htdocs/core/class/html.formfile.class.php
2014-12-03 12:54:42 +01:00
Laurent Destailleur
7afe9de1c0 Start to debug batch/serial module 2014-12-03 00:42:14 +01:00
Laurent Destailleur
01209ff844 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/product/stock/card.php
2014-11-30 14:15:38 +01:00
Laurent Destailleur
7303983610 Fixed: Ton of old bugs when debugging POS. 2014-11-30 01:35:58 +01:00
Laurent Destailleur
d9cb9c1585 Merge pull request #2102 from aspangaro/develop-center
Task 1603 - Remove <center> deprecated HTML5 tags
2014-11-27 23:58:44 +01:00
aspangaro
ef991e6c5d HTML5 - <center> is deprecated - Need CSS - continue working 2014-11-24 06:43:15 +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
Laurent Destailleur
97a6bd842d Minor fixes. 2014-11-23 12:39:53 +01:00
frederic34
f23f16da86 Try to improve stock display for all stock increase/decrease options 2014-11-01 21:38:50 +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
Laurent Destailleur
605919be76 Fix: Too many parameter
Fix: Can't delete bank account
2014-08-01 14:51:40 +02:00
KreizIT
4666de85e2 Fix: [ bug #1508 ] STOCK_MOVEMENT does not show trigger error message 2014-07-04 16:18:54 +02:00
Maxime Kohlhaas
959c41e8db Fix : virtual stock was not correctly calculated because reception was not included. 2014-07-03 10:24:29 +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
417a1232ef Uniformize usage of function price 2014-04-11 18:00:58 +02: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
0d03f13777 Add comments 2014-02-12 15:21:06 +01:00
simnandez
72752f9a30 Fix: Bad navigation into stock product tab 2014-01-23 16:01:27 +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
Laurent Destailleur
bd06ee1abe Prototyping for other table outputs (div or datatable) 2013-10-17 18:37:08 +02:00
Cédric Salvador
6927274d2a copyright 2013-07-29 12:31:05 +02:00
Cédric Salvador
ea2d94451a added the desired stock field to the Stock UI 2013-07-29 12:31:04 +02:00
Grand Philippe
dd248e9d58 fix : dyslexia 2013-03-11 17:19:03 +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
430b63f4e1 Fix: Bad message 2012-10-06 22:54:23 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +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
Regis Houssin
3438305169 FIXME: with ajax autocompleter, does not see the products that have no
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
2012-08-17 15:16:07 +02:00
Regis Houssin
5564421e3f Fix: update method return $this->error not $this->errors 2012-08-07 12:00:22 +02:00
Regis Houssin
71a4a2b7f9 Fix: dol_htmloutput_events() already loaded in footer 2012-08-07 11:48:28 +02:00
Laurent Destailleur
5d9f16ca20 New: More surface control on stock correction page 2012-08-07 11:33:11 +02:00
Laurent Destailleur
1e28904d56 New: task #185 : Can input amount when correcting stock to recalculate
PMP.
2012-08-06 19:41:03 +02:00
Maxime Kohlhaas
c2b38e8415 task #185 2012-08-06 18:11:00 +02:00
Maxime Kohlhaas
e8a3af017e task #185 : Can input HT amount when correcting stock to recalculate PMP 2012-08-06 17:10:55 +02:00
Regis Houssin
c69fa495fa Fix: compatibility with multicompany 2012-07-02 15:42:35 +02:00
Laurent Destailleur
6f8ad124a1 New: Can correct stock of a warehouse from warehouse card. 2012-06-15 02:16:35 +02:00
Laurent Destailleur
bacf2003f1 Checkstyle 2012-01-22 21:17:02 +01:00
Laurent Destailleur
3f8d2cbef8 Qual: Remove checkstyle warnings 2012-01-04 21:23:50 +01:00
Regis Houssin
00ffbd5e90 Fix: change the last database prefix 2011-11-23 21:25:02 +01:00
Regis Houssin
cbec43e098 Fix: change 'editfieldkey' and 'editfieldval' for compatibility with
external module and hook system.
Fix: uniform code
2011-11-09 06:14:42 +08:00
Regis Houssin
f0c327c070 Fix: uniform code
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
2011-11-08 17:22:31 +08:00
Laurent Destailleur
83f2061e0e Start to work on feature to select stock id for increase/decrease. 2011-11-06 15:42:53 +01:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
eldy
be01d88e2d Qual: Removed warning
Look: Uniformize code
2011-10-01 12:48:31 +02:00