Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 13:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,347 Commits 36 Branches 190 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

848 Commits

Author SHA1 Message Date
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
Marcos García de La Fuente
d09a3628c5 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/compta/facture.php
 2017-01-14 23:59:14 +01:00
Gustavo Novaro
751aa2a2aa Improve code style 2017-01-12 12:11:45 -03:00
arnaud
b813144edb NEW generation ODT 2017-01-06 16:44:09 +01:00
Laurent Destailleur
1f2f03c287 Merge pull request #6222 from gnovaro/patch-4 
var to public
 2016-12-31 17:27:07 +01:00
Laurent Destailleur
f46ce68d08 NEW Can sort thumbs visible on product card 2016-12-31 16:16:20 +01:00
Marcos García de La Fuente
154425e2bc Fixed PHP fatal error 2016-12-27 16:13:39 +01:00
Marcos García de La Fuente
5669f734b8 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/comm/propal/card.php
#	htdocs/commande/card.php
#	htdocs/compta/facture.php
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/fourn/commande/card.php
#	htdocs/fourn/facture/card.php
#	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-12-24 21:39:40 +01:00
Gustavo Novaro
191f69ec79 var to public 
Improve code style
 2016-12-23 14:06:11 -03:00
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
BENKE Charlie
b7af046147 Add automated compute 2016-12-11 01:53:33 +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
BENKE Charlie
7c7626e445 allow to change height and width 2016-12-10 13:19:33 +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
Marcos García de La Fuente
cf0ee36150 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-11-27 18:10:01 +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
Marcos García de La Fuente
286095f5cd Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/fourn/facture/card.php
#	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-11-06 15:01:40 +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