lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
57,211 Commits 43 Branches 150 Tags 886 MiB
fd09a3d35e
Commit Graph

683 Commits

Author SHA1 Message Date
Laurent Destailleur
9e44eb0d15 Fix return code REST similar for all api with POST 2016-12-23 02:08:22 +01:00
Laurent Destailleur
ecab7cb70e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/class/product.class.php
 2016-12-14 12:29:41 +01:00
Laurent Destailleur
43d18cd70c FIX if a supplier price reference is changed after creating an order, we 
can't clone order.
 2016-12-13 13:22:24 +01:00
Laurent Destailleur
95d8faef04 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/product/class/product.class.php
 2016-12-11 10:51:15 +01:00
Laurent Destailleur
7fd75c793a FIX Regression when deleting product 2016-12-11 10:39:48 +01:00
Laurent Destailleur
9b436ce871 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/product/class/product.class.php
 2016-12-11 02:51:32 +01:00
Laurent Destailleur
b42a2616bc Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-12-11 02:34:59 +01:00
Maxime Kohlhaas
3befe1b83f Fix product photo in tooltip 2016-12-10 23:34:32 +01:00
Laurent Destailleur
cdba7cfa1c Clean api rest 2016-12-10 19:04:56 +01:00
Maxime Kohlhaas
97e21cb775 Fix : delete product was not possible if batch stock 2016-12-10 13:05:46 +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
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
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +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
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
dd27a52a85 Fix several problems on new REST API on project/tasks 2016-11-19 16:08:27 +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
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
e59c2bb61c Debug accounting menu. Can now edit product account if already set. 2016-11-04 16:15:31 +01:00
Alexis Algoud
8ed13714f7 Merge branch 'develop' into FIX_vitual_product_virtual_stock 2016-10-31 00:04:22 +01:00
Laurent Destailleur
6df4666cf3 Uniformize code 2016-10-30 16:19:31 +01:00
Laurent Destailleur
cc43732c56 Responsive enhancements 2016-10-29 17:02:48 +02:00
BENKE Charlie
632fe49fb9 bad setting on get_entity fournisseur 2016-10-26 16:59:58 +02:00
Laurent Destailleur
f67863e1aa NEW Can use any filter on all REST API to list. 2016-10-25 19:15:47 +02:00
Laurent Destailleur
aad4380689 Uniformise code 2016-10-24 20:52:21 +02:00
Laurent Destailleur
3c3c5d06a1 Merge branch 'NEW_parent_warehouse' of 
https://github.com/atm-gauthier/dolibarr into
atm-gauthier-NEW_parent_warehouse

Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-10-24 00:58:02 +02:00
gauthier
59941f9980 FIX : must not get full path with recursive query 2016-10-20 14:29:51 +02:00
Laurent Destailleur
79d376ee12 Debug accountancy module 2016-10-14 13:05:01 +02:00
gauthier
61a3188353 FIX : new parameter documentation 2016-10-14 11:59:07 +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
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
43da410b95 FIX #5763 Bug: Cannot Create Supplier Price Request 2016-10-01 16:36:01 +02:00
Laurent Destailleur
d39d7d92c9 Uniformize code. 2016-09-26 02:13:58 +02:00
Laurent Destailleur
8fa8bc7d34 Rename table for a better understanding 2016-09-22 11:39:43 +02:00
Laurent Destailleur
cef02a9766 Merge pull request #5764 from atm-gauthier/NEW_add_limit_stock_product_by_warehouse 
New add limit stock product by warehouse
 2016-09-22 09:15:05 +02:00
Laurent Destailleur
d4e324d15a Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture.php
 2016-09-21 18:38:30 +02:00
Laurent Destailleur
9c12444a03 Fix size of warehouse and height of confirm box 2016-09-21 18:20:18 +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