Commit Graph

208 Commits

Author SHA1 Message Date
fappels
681c2a67bd Fix batch required for lot product error message. 2017-09-11 23:22:44 +02:00
Laurent Destailleur
c213624c14 Fix migration into product_lot 2017-06-27 16:42:37 +02:00
Regis Houssin
2df33d1df3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
48a6e9e038 Removed not used files 2017-05-30 22:31:57 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
f5e29d6c86 Fix phpcs warning 2017-05-22 10:45:02 +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
d1fe6a408c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-11 12:41:47 +01:00
Laurent Destailleur
4e6ee4d12c Fix dol_banner on card for lot 2017-03-11 12:37:18 +01: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
2c6672d17a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/tpl/login.tpl.php
2017-01-12 11:32:51 +01:00
florian HENRY
2c2bb366bd fix : warehouse creation failed with mysql 5.7 (string 'NULL' instead of
"NULL")
2017-01-11 09:19:07 +01:00
Laurent Destailleur
febd23fe41 Clean dead code 2017-01-03 11:22:03 +01:00
Laurent Destailleur
9e44eb0d15 Fix return code REST similar for all api with POST 2016-12-23 02:08:22 +01:00
fappels
c3b43e18d1 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-05 18:15:08 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
fappels
c911f906c8 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-05 11:36:20 +01:00
Laurent Destailleur
f3bf5f82f8 FIX Minor fix on stock rounding for float qty before output on screen. 2016-12-05 11:18:54 +01:00
fappels
a7a20f45a1 Remove Only shipping and dispatch status
Remove Only shipping and dispatch status, better to create new future
option 'Routing' for this.
2016-12-02 11:03:21 +01:00
Scrutinizer Auto-Fixer
2a62564768 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-11-22 18:16:17 +00:00
Laurent Destailleur
e6a027911d Merge pull request #5997 from fappels/develop-fix-modify-warehouse
Fix #5994 unable to update warehouse
2016-11-19 20:58:54 +01:00
Laurent Destailleur
dd27a52a85 Fix several problems on new REST API on project/tasks 2016-11-19 16:08:27 +01:00
Laurent Destailleur
7ac96da0d4 Several fix in warehouse stock change (rounding, api rest) 2016-11-18 16:34:03 +01:00
Laurent Destailleur
9b66f8c320 Complete REST services 2016-11-18 13:12:44 +01:00
fappels
ed8edfceaf code intend 2016-11-15 20:01:16 +01:00
fappels
eeb62ea2b8 Fix update entrepot
fix int for fk_parent
clean parenthesis
fix clean parameter country_id
2016-11-15 19:56:58 +01:00
Laurent Destailleur
ecbe719f23 FIX Several problems into shipment management with lot enabled 2016-11-14 13:40:41 +01:00
Laurent Destailleur
32b6660f63 Uniformize code 2016-10-29 16:18:39 +02:00
Laurent Destailleur
220d81b350 Fix duplicate tooltips 2016-10-28 17:43:29 +02:00
gauthier
59941f9980 FIX : must not get full path with recursive query 2016-10-20 14:29:51 +02:00
gauthier
9a3d4031c5 FIX : param $protection - Deep counter to avoid infinite loop 2016-10-20 13:30:47 +02:00
gauthier
d85dd69184 NEW : get_full_arbo() & get_children_warehouses() functions documentation 2016-10-20 13:14:28 +02:00
gauthier
012be8e400 NEW : security check to avoid adding a parent warehouse chich is already a child of current one 2016-10-14 12:42:42 +02:00
gauthier
1a648cfc89 NEW : getNomUrl displays full path to warehouse
# Conflicts:
#	htdocs/product/stock/class/entrepot.class.php
2016-10-14 11:53:04 +02:00
gauthier
fe1bcb7e0a NEW : function to display full path to current warehouse 2016-10-14 11:39:46 +02:00
gauthier
416311a7b9 NEW : allow to save a parent warehouse
# Conflicts:
#	htdocs/product/stock/card.php
2016-10-14 11:29:14 +02:00
Laurent Destailleur
710e12420f Use correct picto for lot 2016-10-10 02:01:30 +02: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
Laurent Destailleur
c3f5962058 Normalize code 2016-09-28 18:14:44 +02:00
fappels
acbd00286c Fix stock decrement of lot qty on delivery 2016-09-26 17:31:55 +02:00
atm-quentin
4d828499ac Update entrepot.class.php 2016-09-26 14:41:30 +02:00
Quentin Vial-Gouteyron
bf0556bdf1 NEW Trigger on delete stock 2016-09-26 10:47:54 +02:00
Laurent Destailleur
8fa8bc7d34 Rename table for a better understanding 2016-09-22 11:39:43 +02:00
gauthier
2556e59ccf NEW : auto delete product_stock_entrepot elements when we drop a product or a warehouse 2016-09-21 16:21:23 +02:00