Commit Graph

3412 Commits

Author SHA1 Message Date
aspangaro
31fcf9aff9 Fix warehouse presentation 2016-12-10 22:13:06 +01:00
Laurent Destailleur
518049bed4 Fix pagination 2016-12-10 19:26:58 +01:00
Laurent Destailleur
cdba7cfa1c Clean api rest 2016-12-10 19:04:56 +01:00
Laurent Destailleur
ce41c84c95 Fix td class 2016-12-10 16:00:33 +01:00
Laurent Destailleur
d23604701c Fix responsive 2016-12-07 15:00:20 +01:00
fappels
bbbc768fa7 Change filter parameter to string with comma seperated values
Change warehousefilter from int to string with comma seperated values
for selectWarehouses and select_produits form functions.
2016-12-06 20:07:19 +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
fappels
18478eaa31 Add warehouse status filter to load_stock function 2016-12-05 18:08:09 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
fappels
fbdc0c25e3 Add STATUS_OPEN_INTERNAL to stock change/move pages 2016-12-05 11:42:03 +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
fappels
2d4807190e Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-11-30 13:03:24 +01:00
fappels
49442c0b7f Add filter on warehouse status to object line product list 2016-11-30 13:03:17 +01:00
Laurent Destailleur
592b9d0b20 Merge pull request #6061 from mrsof/patch-6
Fix: Product barcode generation in edit mode
2016-11-29 23:34:18 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Sof
e05de2942b Fix: update informations 2016-11-29 12:19:01 +01:00
Sof
53d1dbf4b9 Fix: Codebar suggestion in edit mode 2016-11-29 12:06:58 +01:00
Laurent Destailleur
663f7938f8 Fxi responsive design 2016-11-27 20:02:57 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
Laurent Destailleur
e4a8342aef Fix div-table-form balance on all lists (solve responsive design) 2016-11-27 11:41:10 +01:00
Laurent Destailleur
e6fb118155 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2016-11-26 15:52:17 +01:00
Laurent Destailleur
b63ad019ce Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-11-26 15:49:11 +01:00
Laurent Destailleur
e539842c28 Fix eatdate and selldate not correctly set. 2016-11-26 15:46:41 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
5acd09b2d5 Fix require_once instead of require. 2016-11-24 17:03:18 +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
12350f180a Merge pull request #5993 from fappels/develop-product-delete-batch
Fix Delete from product_batch on product delete
2016-11-22 19:33:07 +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
fappels
c09d09b869 Remove hasbatch test
Intention is to remove all data linked to product_stock, which will be
deleted.
2016-11-20 22:30:40 +01:00
Laurent Destailleur
34b42d5913 Merge pull request #6008 from defrance/patch-44
if supplier have multiple price return it several times
2016-11-19 21:08:59 +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
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
Laurent Destailleur
ad981a0f07 FIX the key for getEntity was different for same element. 2016-11-18 12:54:08 +01:00
BENKE Charlie
8a37db3f1c if supplier have multiple price return it several times 2016-11-18 08:23:12 +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
fappels
2e6b27f094 Delete from product_batch on product delete 2016-11-15 11:29:12 +01:00
Laurent Destailleur
ecbe719f23 FIX Several problems into shipment management with lot enabled 2016-11-14 13:40:41 +01:00
Laurent Destailleur
381b77850c Fix do not show cloning of virtual product if option is off 2016-11-14 02:08:41 +01:00
Laurent Destailleur
b79048e6bd Fix cloning virtual products 2016-11-14 01:46:59 +01:00
Laurent Destailleur
899ba6d90b NEW Add option to include parent products too in stats of orders 2016-11-11 14:17:11 +01:00
Laurent Destailleur
e2b7773353 Merge pull request #5943 from atm-alexis/FIX_vitual_product_virtual_stock
Fix vitual product virtual stock
2016-11-11 14:11:56 +01:00
Laurent Destailleur
ab269bd7a6 Better responsive 2016-11-11 01:15:41 +01:00
BENKE Charlie
6da82762f2 Update card.php 2016-11-05 11:09:54 +01:00