194 Commits

Author	SHA1	Message	Date
Laurent Destailleur	7b47ef3ca1	Change order or field	2017-12-02 11:34:56 +01:00
Laurent Destailleur	e8327fd9a1	Fix the eatby/sellby date was not visible.	2017-12-02 10:43:01 +01:00
Laurent Destailleur	e3671da37f	Fix edit shipment line when line is a not predefined product	2017-12-01 14:33:06 +01:00
Laurent Destailleur	46b015d205	Fix usage of option STOCK_SUPPORTS_SERVICES	2017-12-01 13:40:24 +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	feb04b4a22	Merge branch 'develop' into 7.0_new_shipment_update	2017-11-02 15:43:31 +01:00
Laurent Destailleur	38e620d656	Fix edit of incoterm from the shipments tab	2017-11-02 12:48:40 +01:00
Laurent Destailleur	cfacfab6cf	NEW Show badge with nbr of shipment on shimpen tab of order ... NEW Add button cancel on shipment creation	2017-11-02 12:38:36 +01:00
fappels	28604b4d82	New add delete lot ... Add empty lot row for adding new lot When lot qty 0, lot will be deleted from line.	2017-11-02 11:44:36 +01:00
fappels	3f5112ff48	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update	2017-10-31 16:49:54 +01:00
Laurent Destailleur	b29f32171c	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/comm/action/class/actioncomm.class.php htdocs/contrat/card.php htdocs/core/lib/project.lib.php htdocs/filefunc.inc.php	2017-10-30 18:22:26 +01:00
fappels	08f931b73c	Only show show lot from same src warehouse. ... When shipping from multiple warehouse, only allow lot from same src warehouse. (expeditiondet_batch is on to many from expeditiondet).	2017-10-30 12:39:06 +01:00
fappels	cd5c678534	Only update new lot number	2017-10-29 19:01:42 +01:00
Laurent Destailleur	cd5e43483e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/contrat/card.php htdocs/core/lib/project.lib.php htdocs/expedition/card.php htdocs/projet/class/task.class.php	2017-10-28 22:08:16 +02:00
Laurent Destailleur	e31223d7be	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-27 02:33:14 +02:00
Laurent Destailleur	07b25e457b	Merge pull request #7652 from fappels/5.0_Fix_old_batch_not_shown_multi_shipping ... FIX old batch not shown in multi shipping	2017-10-27 02:26:45 +02:00
Laurent Destailleur	78e3c63ead	Update card.php	2017-10-27 02:26:37 +02:00
Laurent Destailleur	4c5bb7660c	Merge pull request #7713 from atm-gauthier/6.0_fix_hook_on_shipping_card ... FIX : hook formObjectOptions() must use $expe and not $object which i…	2017-10-27 02:15:30 +02:00
Laurent Destailleur	8058712d47	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/index.php htdocs/contrat/class/contrat.class.php htdocs/product/list.php	2017-10-26 17:06:11 +02:00
Laurent Destailleur	67208b111d	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/compta/facture.php htdocs/expedition/card.php htdocs/product/list.php	2017-10-26 17:02:40 +02:00
gauthier	ce6d1d306d	FIX : hook formObjectOptions() must use $expe and not $object which is an order here	2017-10-26 11:32:26 +02:00
Laurent Destailleur	f24204c79a	Error management after extrafield update	2017-10-24 19:04:40 +02:00
fappels	eaafe83ae4	Only show old batch number and qty	2017-10-24 16:05:41 +02:00
fappels	914b8c1c71	cleanup	2017-10-24 11:45:11 +02:00
fappels	0c38944daa	Fix delete multi warehouse line	2017-10-24 11:37:17 +02:00
fappels	7f7e621ea9	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into 7.0_new_shipment_update	2017-10-24 10:53:34 +02:00
fappels	ba189277ee	Fix update extrafield	2017-10-24 10:53:11 +02:00
fappels	b2cd2290e1	Update card for line update	2017-10-23 22:18:15 +02:00
atm-ph	08d5ff4736	Fix shipment ref is empty	2017-10-20 12:28:33 +02:00
Laurent Destailleur	7f85d73001	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/contrat/card.php htdocs/expensereport/card.php htdocs/fichinter/list.php htdocs/fourn/commande/card.php htdocs/fourn/commande/list.php htdocs/fourn/facture/card.php htdocs/fourn/paiement/card.php htdocs/livraison/card.php htdocs/modulebuilder/template/myobject_list.php htdocs/societe/rib.php htdocs/supplier_proposal/list.php htdocs/user/card.php	2017-10-18 19:51:29 +02:00
fappels	146f17faa6	Add delete line to expedition card	2017-10-18 18:18:17 +02:00
Laurent Destailleur	8626d6279a	Fix perm to delete files	2017-10-18 17:21:30 +02:00
fappels	6b557fd92f	Fix old batches not displayed in multi warehouse shipping ... Old batches not available in product_lot table are not shown for shipping from multiple warehouses	2017-10-17 22:19:45 +02:00
Laurent Destailleur	33624e1001	NEW Attaching doc automatically in email is now a parameter of template.	2017-10-08 16:34:42 +02:00
Laurent Destailleur	a501a20487	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
Laurent Destailleur	d7dd6ed334	Fix undefined var	2017-09-26 16:15:22 +02:00
Laurent Destailleur	e3da4188e2	GETPOST must not clean data for text input.	2017-09-25 00:16:52 +02:00
Laurent Destailleur	934edd9f5a	Merge branch 'develop' into 6.0-api	2017-09-24 22:01:07 +02:00
fappels	ddeca6cc06	fix oddeven revert	2017-09-19 18:52:27 +02:00
fappels	13d5471dd0	Fix extrafield copy shipment	2017-09-19 18:43:00 +02:00
Laurent Destailleur	149ab80b3a	The event array of an object is visible even if no event yet recorded.	2017-09-13 14:18:36 +02:00
BENKE Charlene	7c3640a4c3	Bad ojbject for extrafields ... https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/59536-extrafields-commande-dans-expedition	2017-08-22 10:37:21 +02:00
Laurent Destailleur	47ac770d93	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 ... Conflicts: htdocs/expedition/card.php htdocs/expedition/list.php	2017-08-02 17:51:19 +02:00
Laurent Destailleur	52d39d9d5a	Code comment	2017-08-02 17:45:35 +02:00
Laurent Destailleur	6f82837b0f	Fix GETPOST of lang_id	2017-06-27 17:27:01 +02:00
Laurent Destailleur	50bf1bb21f	Fix error in count of qty in other shipments	2017-06-27 16:41:57 +02:00
Laurent Destailleur	ba3a74576c	Merge 5.0	2017-06-12 18:22:51 +02:00
atm-ph	5157981751	Fix 6962 wrong permission check	2017-06-11 12:59:54 +02:00
Laurent Destailleur	a96362e2f9	Fix #formmailbeforetitle not supported everywhere	2017-06-11 11:40:01 +02:00
Laurent Destailleur	e93cefbbf0	FIX #6985	2017-06-11 10:37:58 +02:00