Commit Graph

178 Commits

Author SHA1 Message Date
Laurent Destailleur
dc2fec8f57 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 19:37:04 +02:00
Laurent Destailleur
d871b8964f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-07-24 19:23:40 +02:00
Laurent Destailleur
e9eb8da61b Update replenish.php 2018-07-24 18:09:50 +02:00
gauthier
33aa373362 FIX: when stock is empty for current entity but > 0 in other entity, until this commit product wasn't displaied on replenishment, it must depends on multientity stock sharing 2018-07-16 15:27:37 +02:00
Laurent Destailleur
3eac1f410d Merge pull request #8983 from atm-greg/Add_hook_on_replenish
Add hook on replenish
2018-07-16 10:02:26 +02:00
atm-greg
2cdae2ec98 remove globalcard context 2018-06-18 11:30:38 +02:00
atm-greg
72449ddef4 add hooks on stock replenish 2018-06-15 16:55:23 +02:00
Frédéric FRANCE
d986909109 loadlangs 2018-05-26 23:52:52 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +02:00
Laurent Destailleur
55d3e72463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/societe/card.php
2018-03-12 19:02:30 +01:00
Laurent Destailleur
d5d6939fd9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/core/class/commonobject.class.php
2018-03-11 19:28:39 +01:00
Maxime Kohlhaas
fd36ade61a Fix unit in replenish #7225 2018-03-10 11:20:32 +01:00
Laurent Destailleur
af1028576d Fix on search all (trim search + search from smartphone). 2017-12-12 11:31:30 +01:00
Laurent Destailleur
a0231b5c60 Fix responsive 2017-12-01 12:55:28 +01:00
Laurent Destailleur
9f235e1ff6 Standardize database: field ref of warehouse was renamed label -> ref 2017-11-24 15:27:00 +01:00
Laurent Destailleur
8e0da9bfeb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/holiday/document.php
2017-10-04 13:32:53 +02:00
arnaud
7f807986d7 FIX replenish if line test GETPOST on line 0 2017-09-27 10:53:29 +02:00
Laurent Destailleur
051ca6fdc4 Merge pull request #7162 from hguibourgdev/patch-5
NEW Can show stock in alert even if alter is set to 0
2017-09-25 18:17:18 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
hguibourgdev
3825e7fd52 Update replenish.php
FIX ">=" instead of ">" for alert test in order to work when negatif stock are allowed
2017-07-15 18:55:52 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
Regis Houssin
bfd6116e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Alexandre SPANGARO
4dc7d5cd8d Fix : tooltip on bank in customer invoice card 2017-05-14 21:20:35 +02:00
Laurent Destailleur
e5c898e0d6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	build/makepack-dolibarr.pl
	htdocs/fichinter/list.php
	htdocs/product/list.php
	htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d FIX Better sanitizing of search all parameter. 2017-05-09 19:36:10 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
8e70c4a0b7 Work on 6.0 new look and feel 2017-03-30 15:39:50 +02:00
Quentin Vial-Gouteyron
bf8d510541 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2017-03-06 15:52:59 +01:00
Quentin Vial-Gouteyron
b378279440 New_filter_to_add_draft_order_to_validated_one 2017-03-06 15:50:17 +01:00
Laurent Destailleur
c6e0a4cc87 Fix column label 2017-02-07 12:39:45 +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
fappels
3ca9664595 Filter stock on warehouse status for replenishment
Do not show stock of closed warehouse
2016-12-05 18:14:42 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
Laurent Destailleur
da92be1a9f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fichinter/card.php
	htdocs/fourn/facture/card.php
2016-11-22 20:55:57 +01:00
Laurent Destailleur
cbd85f7b82 FIX #5958 no discount on supplier command made by replenishment 2016-11-22 20:50:13 +01:00
Laurent Destailleur
ad981a0f07 FIX the key for getEntity was different for same element. 2016-11-18 12:54:08 +01:00
Laurent Destailleur
aad4380689 Uniformise code 2016-10-24 20:52:21 +02:00
Laurent Destailleur
92dc385307 Merge pull request #5838 from atm-gauthier/develop_NEW_filter_by_supplier_on_replenishment_card
Develop new filter by supplier on replenishment card
2016-10-11 20:04:02 +02:00
gauthier
fee0a88d27 Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card 2016-10-07 09:25:18 +02:00
gauthier
18496f9159 FIX : params order 2016-10-07 09:19:10 +02:00
gauthier
ee014681b0 Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card 2016-10-05 15:30:23 +02:00
gauthier
9c8ecdc8d8 NEW : filter by supplier on replenish.php 2016-10-05 15:06:30 +02:00
florian HENRY
d3146234b8 FIX : New add limit stock product by warehouse #5764 for PgSQL 2016-10-04 09:23:13 +02:00
Laurent Destailleur
8fa8bc7d34 Rename table for a better understanding 2016-09-22 11:39:43 +02:00
gauthier
dc15eb079a FIX : keep params when we search or skip to another page 2016-09-20 14:38:05 +02:00
gauthier
a698e40c45 NEW : filter fk_warehouse on replenishment card 2016-09-20 11:55:38 +02:00
Laurent Destailleur
54df49aebe Fix strict sql 2016-08-02 13:36:16 +02:00
paolo
ff95bb1644 fix #4467 2016-06-04 18:31:31 +02:00