Commit Graph

223 Commits

Author SHA1 Message Date
ATM John BOTELLA
6a4df05fd0 fix error message details 2018-12-08 17:29:07 +01:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
36323752ed Project must be on a dedicated field 2018-10-24 12:00:54 +02:00
Laurent Destailleur
eaab953ba2 Renamed mouvement.php into movement_list.php to follow dev rules 2018-10-24 03:50:18 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
Philippe GRAND
357173f0ef Standardize and update code 2018-10-12 09:30:53 +02:00
atm-quentin
aaace60b0d FIX stock movement on close reception and set status if too much receive$ 2018-10-10 15:33:35 +02:00
Philippe GRAND
574cfad48f Standardize and update code 2018-09-28 14:49:34 +02:00
Frédéric FRANCE
4ea582ad4a
move phpcs:ignore 2018-09-02 11:12:07 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Philippe GRAND
0c75c41e7b Update and standardize code 2018-08-22 19:56:24 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
b00164ca39
test phpcs v3 2018-08-09 11:03:50 +02:00
fappels
e0f9605483 Fix add missing properties for trigger 2018-06-03 11:05:02 +02:00
wdammak
9ec6387a63
Add movement generateDocument function (mode dev) 2018-05-28 05:21:53 +01:00
All-3kcis
c35b454455 Fix bug productlot created without entity 2018-04-12 17:13:42 +02:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
Laurent Destailleur
64d29709d5 FIX #7881 error not reported/blocking when subprodut need lot 2017-12-01 18:12:29 +01:00
Laurent Destailleur
934edd9f5a Merge branch 'develop' into 6.0-api 2017-09-24 22:01:07 +02:00
Laurent Destailleur
8773a6860f Fix HTML5 use of <br> is preferred to <br /> 2017-09-15 23:49:04 +02:00
fappels
681c2a67bd Fix batch required for lot product error message. 2017-09-11 23:22:44 +02:00
Laurent Destailleur
f598bf8bef Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2017-04-06 21:59:11 +02:00
Laurent Destailleur
18fc5bec9b Better log 2017-04-06 10:56:37 +02:00
Laurent Destailleur
c72e7c1057 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/files.lib.php
2017-03-10 14:54:35 +01:00
Laurent Destailleur
c260325863 Lang not loaded 2017-03-06 12:32:07 +01:00
Laurent Destailleur
f291e1c470 Fix test on qty for stock move 2017-03-06 12:30:59 +01:00
atm-ph
8e9a9637a0 Fix travis 2017-01-30 21:52:52 +01:00
atm-ph
ccad6d6dde New show on project "overview" tab the informations about movements stock 2017-01-29 13:36:33 +01:00
atm-ph
56d75c552d New movement stock can be linked to project 2017-01-29 13:04:06 +01:00
Laurent Destailleur
7ac96da0d4 Several fix in warehouse stock change (rounding, api rest) 2016-11-18 16:34:03 +01:00
Laurent Destailleur
b412baa880 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-29 10:49:47 +02:00
fappels
acbd00286c Fix stock decrement of lot qty on delivery 2016-09-26 17:31:55 +02:00
Laurent Destailleur
b107b0644f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:07:17 +02:00
Laurent Destailleur
8c4324d912 FIX #5674 2016-09-02 21:15:48 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
fappels
f9a9d4d2d8 Fix sellby without hour check 2016-08-11 20:59:56 +02:00
BENKE Charlie
66d0d09769 Add : additionnal origin of mouvement
Main problem is the difference between folder and the class of project
Maybe one time (for a major version of dolibarr (5, 6 ...) we start to standadisation of all modules
2016-07-23 16:30:12 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
__AMOUNT_WO_TAX__ into emails templates.
2016-07-21 20:45:30 +02:00
Laurent Destailleur
f90946dbde Fix test on eat and sell date 2016-07-21 19:12:05 +02:00
Laurent Destailleur
97b03e225b NEW Add option "Stock can be negative". Off by default. 2016-07-15 19:57:35 +02:00
phf
8c133d8546 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_develop_issue_2858
Conflicts:
	htdocs/core/class/ldap.class.php
2016-06-30 17:09:22 +02:00
Laurent Destailleur
59c6c90200 Remove a FIXME. 2016-06-08 11:40:50 +02:00
phf
67392fbac5 Fix move the code into mouvementstock class 2016-06-07 12:27:43 +02:00
Laurent Destailleur
79be93d998 FIX The table llx_product_lot is now filled/used to store eatby/sellby
dates.
2016-05-17 18:19:36 +02:00
Laurent Destailleur
3b99fb01ee Fix duplicate table 2016-05-17 10:51:03 +02:00
Laurent Destailleur
95ea20eb44 Clean code for stock movement when lot are used. We should not get
duplicate records into llx_product_batch
2016-05-17 01:10:11 +02:00
Laurent Destailleur
20a2e9394d Fix typo comment 2016-05-16 22:44:11 +02:00
Laurent Destailleur
f324c662c2 Better update of database cleaning non expected records. 2016-04-30 21:58:00 +02:00
Laurent Destailleur
50323afe94 Add comment 2016-04-30 21:33:18 +02:00
Laurent Destailleur
e723966583 FIX: Qty in stock must be float like it is in stock movement.
FIX: Can't create a stock transfer from product card
Performance enhancement of stock information loading.
2016-04-28 11:01:56 +02:00
Laurent Destailleur
7b16482cee Add comment to show directoves to solve conception error on lot
management (add a table to store all lots and their properties: date,
note, ...)
Removed deprecated field pmp at stock level (pmp is at product level)
2016-04-09 10:01:22 +02:00
fappels
9fa742ceb2 [QUAL] Shipment error handling 2015-12-14 21:38:26 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
12702ee128 Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/report.lib.php
	htdocs/product/stock/class/mouvementstock.class.php
2015-12-03 12:59:13 +01:00
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
62792c08eb Merge pull request #3591 from GPCsolutions/inherited
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
9f2545b95d [Qual] Replaced deprecated dol_clone by native clone 2015-09-24 17:24:40 +02:00
Laurent Destailleur
03435d7d90 Fix bad error management 2015-09-01 12:36:43 +02:00
BENKE Charlie
af7302fa90 change done 2015-08-23 00:30:11 +02:00
BENKE Charlie
1b117d5581 add in get_origin function generic origintype
actually we have only internal module origintype 
propose to add feature to add stockmovement from other external module
2015-08-21 14:10:55 +02:00
Laurent Destailleur
3bdd342df1 Fix #3116 2015-08-14 23:53:59 +02:00
Laurent Destailleur
8ebad7a395 A serious rewrite of a lot of code to have the module batch number
stable.
2015-04-12 17:08:14 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Marcos García de La Fuente
831177ef99 Implemented constants for Product class 2015-03-30 03:14:07 +02:00
Laurent Destailleur
a55af4387b Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	.travis.yml
	htdocs/core/class/notify.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	test/phpunit/AllTests.php
	test/phpunit/MouvementStockTest.php
2015-03-22 12:10:39 +01:00
Laurent Destailleur
c9b569ad1a Fix calculation of PMP of product.
Also add phpunit test to avoid this in future.
2015-03-21 15:31:11 +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
Alexis Algoud
0c53121553 - use incdec into virtual product definition.
- improve screen of virtual product
2015-02-23 12:19:19 +01:00
Gauthier
02d59cce5a NEW : Product stock and subproduct stock are independant 2015-02-16 16:06:50 +01:00
Laurent Destailleur
6adfc6f6f4 Work on batch module. Add batch, eatby and sellby into movement table.
Clean language files for direct print module.
2015-02-12 15:23:31 +01:00
Laurent Destailleur
78ba1fe86e Fix bad null management 2015-02-12 00:01:31 +01:00
Laurent Destailleur
179cbbd187 Maxi debug and enhancement of module batch. 2015-02-11 22:54:06 +01:00
Laurent Destailleur
43702cf662 New: Enhance stock management: Introduce tag to define if a subproduct
must have stock decreased and add inventory code on stock movements.
2015-01-30 01:51:28 +01:00
frederic34
73fda2cb86 WIP PSR2 2015-01-08 18:36:03 +01:00
Laurent Destailleur
6a70af2b67 Fixed: bug into produc batch management 2014-12-09 14:03:10 +01:00
Maxime Kohlhaas
6349e5e4a2 Class MouvementStock was not extending CommonObject so error on call_trigger function 2014-07-29 15:45:53 +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
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
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
205ff535a9 Fix: [ bug #919 ] SQL error in product/stock/product.php 2013-06-04 00:30:38 +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
7f2c6dc6eb Only code comments 2012-11-03 14:44:06 +01: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
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
5a73c32f46 Migrated ClassName to __construct() function
Changed $DB to $db
lower-cased "Class"
2012-07-30 17:17:33 +02:00
Laurent Destailleur
d07e68e12f Fix: Combo list of warehouse not saved.
Fix: Validate of shipment in error
when using not predefined products.
2012-07-17 01:22:19 +02:00
Laurent Destailleur
bacf2003f1 Checkstyle 2012-01-22 21:17:02 +01:00
Regis Houssin
5f02432d90 Fix: add possibility to force date of stock movement 2011-12-18 20:59:05 +01:00
Laurent Destailleur
b52fc32853 Fix: fix not initialized variables 2011-12-05 19:41:38 +01:00
Laurent Destailleur
12963265d7 Add confirm message when going back to draft 2011-11-14 16:23:59 +01:00
Laurent Destailleur
d9408d1847 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
b75d19c264 Qual: Uniformize constructors 2011-09-11 18:35:38 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
37ead2f97e Fix: Avoid errors into rpm packages 2011-07-31 23:19:04 +00:00
Laurent Destailleur
edd91b7d26 Qual: Clean stock increase/decrease code 2011-05-23 23:46:39 +00:00
Laurent Destailleur
5440ad97c6 New: Add default label into stock movement label 2011-05-18 17:18:42 +00:00
Laurent Destailleur
9ff7905f0c Fix: Bad parameter 2011-05-18 16:44:11 +00:00
tiaris
46057271f2 Add trigger on movement create 2011-05-04 13:37:53 +00:00
Regis Houssin
3b4ea76538 Fix: compatibility with pgsql, replace all addslashes by $this->db->escape in class 2011-02-24 18:11:12 +00:00
Laurent Destailleur
76a7e8f424 Add more units 2010-08-26 14:49:40 +00:00
Laurent Destailleur
9b48cd789b Fix: Error in stock correction 2010-08-01 17:25:42 +00:00
Laurent Destailleur
5da647ccad Fix: Doxygen 2010-07-27 22:38:28 +00:00
Laurent Destailleur
fc2213a8f1 Doxygen 2010-07-21 12:35:56 +00:00
Laurent Destailleur
f55d82dee5 Fix: A lot of fix in stock value calculation. 2010-07-14 15:41:39 +00:00
Laurent Destailleur
f83954daef Fix: Change status of order to cancel 2010-05-17 12:43:36 +00:00
Philippe Grand
391c595dda according to new tree directory 2010-04-29 08:50:46 +00:00