Commit Graph

3319 Commits

Author SHA1 Message Date
BENKE Charlie
272b16fe1a Duplicate product declation
Once is enough
2016-10-06 08:36:21 +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
b412baa880 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-29 10:49:47 +02:00
Laurent Destailleur
c3f5962058 Normalize code 2016-09-28 18:14:44 +02:00
fappels
acbd00286c Fix stock decrement of lot qty on delivery 2016-09-26 17:31:55 +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
d39d7d92c9 Uniformize code. 2016-09-26 02:13:58 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +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
gauthier
b95b84a665 FIX : doc comment for parameter $fk_product 2016-09-20 15:31:55 +02:00
gauthier
dc15eb079a FIX : keep params when we search or skip to another page 2016-09-20 14:38:05 +02:00
gauthier
d508d44fef NEW : migration script from 4.0.0 to 5.0.0 and langs 2016-09-20 12:10:25 +02:00
gauthier
a0ec91cb94 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_add_limit_stock_product_by_warehouse 2016-09-20 12:03:55 +02:00
gauthier
a698e40c45 NEW : filter fk_warehouse on replenishment card 2016-09-20 11:55:38 +02:00
gauthier
43e77d23e9 NEW : Delete product stock warehouse 2016-09-19 17:40:59 +02:00
gauthier
a4d0eed503 NEW : Save product stock warehouse in database and display list 2016-09-19 17:33:29 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +02:00
Laurent Destailleur
d1c4f02bf7 Uniformize code and style 2016-09-18 14:41:17 +02:00
Laurent Destailleur
407d9e6904 Merge pull request #5741 from atm-quentin/new_hook_stock_product_develop_dolibarr
NEW Hook on stock product card
2016-09-17 18:04:39 +02:00
gauthier
7a0577ccfc NEW : add limit stock product by warehouse 2016-09-16 17:09:38 +02:00
Quentin Vial-Gouteyron
6d304f4a23 NEW Hook formObjectOptions 2016-09-13 14:56:57 +02:00
Quentin Vial-Gouteyron
f8912267cb NEW Hook on stock product card 2016-09-13 11:56:39 +02:00
Laurent Destailleur
0ab377440d Complete param of setValueFrom 2016-09-12 20:16:39 +02:00
Laurent Destailleur
5c1127fc54 NEW Enhance function setValueFrom so we can use it for "edit in form"
feature.
2016-09-12 20:00:47 +02:00
Laurent Destailleur
1f9aa856d5 NEW the list of linked files on card does not forget external links. 2016-09-12 18:37:40 +02:00
Laurent Destailleur
2587958c89 Introduce hidden constant PRODUCT_ADD_FORM_ADD_TO for an old feature not
used so we can disable/enabled if we want.
2016-09-12 18:15:01 +02:00
Laurent Destailleur
5ea9fc7467 NEW Support extrafields on product lot. 2016-09-12 17:27:44 +02:00
Laurent Destailleur
359ebed882 FIX #5696 2016-09-12 02:57:28 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/expedition/list.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/list.php
	htdocs/societe/list.php
	htdocs/supplier_proposal/list.php
	htdocs/theme/eldy/style.css.php
2016-09-12 01:50:38 +02:00
Laurent Destailleur
4ea5068966 FIX Clean of search fields 2016-09-12 00:15:27 +02:00
Laurent Destailleur
1bb278a587 Fix #5712 2016-09-11 23:01:04 +02:00
Laurent Destailleur
25c5f40bf1 Add css on picto status 2016-09-10 19:44:55 +02:00
Ferran Marcet
4777faf49b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 14:02:27 +02:00
Ferran Marcet
b5db70342b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 13:58:41 +02:00
Laurent Destailleur
72e149e1a6 FIX SEC Improve CSRF protection. Reduce usage of NOCSRFCHECK. 2016-09-08 12:12:00 +02:00
fappels
6574ebcbff Replace non existing ref parameter
Replace non existing ref parameter with product_id and batch to fetch a
specific batch from a product.
Remove unused sceleton methods.
2016-09-07 12:40:15 +02:00
Laurent Destailleur
13746a3c03 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:37:59 +02:00
Laurent Destailleur
acdce83f9c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/product/price.php
2016-09-02 22:37:01 +02:00
Laurent Destailleur
b107b0644f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 22:07:17 +02:00
Laurent Destailleur
8c4324d912 FIX #5674 2016-09-02 21:15:48 +02:00
Laurent Destailleur
4fa94e3a25 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-02 19:25:04 +02:00
Laurent Destailleur
ba76f12a28 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/product/price.php
	htdocs/product/stock/class/mouvementstock.class.php
2016-09-02 19:24:28 +02:00