Commit Graph

118 Commits

Author SHA1 Message Date
Laurent Destailleur
6cdf5c5673 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-21 22:28:25 +01:00
Regis Houssin
45d05da6ed FIX missing $ismultientitymanaged for previous/next ref 2019-02-14 16:14:19 +01:00
Laurent Destailleur
4d41b1b33c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-03 19:45:45 +01:00
Maxime Kohlhaas
bb3225809b Fix warehouse fetch was not checking parameters. Fixes #10414 2019-02-02 18:43:25 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Philippe GRAND
357173f0ef Standardize and update code 2018-10-12 09:30:53 +02:00
Philippe GRAND
b3925dd2bd Standardize code 2018-10-05 16:04:10 +02:00
Philippe GRAND
d2ec703b51 Standardize and update code 2018-10-04 09:24:57 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore 2018-09-02 09:57:19 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Philippe GRAND
3a8bde227b Standardize and update code 2018-08-31 19:26:08 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +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
87067b2bc9 Standardize and update code 2018-08-23 18:35:45 +02:00
Philippe GRAND
0c75c41e7b Update and standardize code 2018-08-22 19:56:24 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
7bb781eea8
function declaration 2018-08-15 14:28:34 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
wdammak
5fef8c2dc1
Add generateDocument function to entrepot class 2018-05-18 14:59:42 +01:00
Laurent Destailleur
493669e986 Fix look and feel v7 2017-12-22 14:19:12 +01:00
Laurent Destailleur
247c380d18 Several fixes 2017-12-12 16:11:40 +01:00
Laurent Destailleur
9f235e1ff6 Standardize database: field ref of warehouse was renamed label -> ref 2017-11-24 15:27:00 +01:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02: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
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
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
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
32b6660f63 Uniformize code 2016-10-29 16:18:39 +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
c3f5962058 Normalize code 2016-09-28 18:14:44 +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
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00