470 Commits

Author	SHA1	Message	Date
Laurent Destailleur	4c93340de1	Merge pull request #5232 from atm-florian/develop ... Add trigger into expedition class	2016-05-29 13:15:35 +02:00
Laurent Destailleur	ef1e4d05ec	Doc comment	2016-05-27 17:01:23 +02:00
Laurent Destailleur	9511187f6e	FIX Change to status "Shipment in progress" for orders is done whane ... validating and not creating a shipment.	2016-05-27 16:49:55 +02:00
florian HENRY	4e707af0fd	Add demo information and transsaction management	2016-05-23 09:16:47 +02:00
florian HENRY	acdf781202	change tirrger name to harmonised	2016-05-20 20:12:23 +02:00
florian HENRY	32a0f4c530	Add trigger into expedition class	2016-05-20 20:03:29 +02:00
Laurent Destailleur	95ea20eb44	Clean code for stock movement when lot are used. We should not get ... duplicate records into llx_product_batch	2016-05-17 01:10:11 +02:00
Alexis Algoud	8d0e5479a0	Rename var	2016-05-14 19:22:27 +02:00
Alexis Algoud	e74e70287f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify ... Conflicts: htdocs/expedition/class/expedition.class.php htdocs/product/stock/replenish.php	2016-05-14 19:14:39 +02:00
Juanjo Menent	5f28070417	Fix Remove unused variables	2016-05-06 22:43:50 +02:00
Laurent Destailleur	0cde6ad98f	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/filefunc.inc.php	2016-04-29 20:43:42 +02:00
Laurent Destailleur	3d9456b202	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/expedition/class/expedition.class.php htdocs/fourn/facture/list.php	2016-04-29 20:42:35 +02:00
Laurent Destailleur	53386e22ea	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/commande/class/commande.class.php htdocs/expedition/class/expedition.class.php htdocs/index.php	2016-04-29 20:39:17 +02:00
Laurent Destailleur	56b57b0bc9	Code comment	2016-04-26 13:37:09 +02:00
Laurent Destailleur	66ea799eb7	Uniformize code and add more comment to understand workflow	2016-04-26 13:27:32 +02:00
Alexis Algoud	91bea8b9fe	fix inclusion	2016-04-25 18:54:28 +02:00
Alexis Algoud	b46c14812c	Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop	2016-04-25 18:37:47 +02:00
Alexis Algoud	b472a244db	NEW decrease stock on expedition closing/classifying	2016-04-25 18:33:39 +02:00
Laurent Destailleur	281b06a2d3	NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and ... MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.	2016-04-01 18:44:23 +02:00
Laurent Destailleur	d14f3d7e2b	FIX When deleting last shipment, status "shipment in progress" of order ... must move back to status "validated".	2016-04-01 16:59:08 +02:00
Laurent Destailleur	b3c3d3aac5	NEW Add total weight and volume on PDF ... NEW Can hide column qty ordered.	2016-02-25 14:18:32 +01:00
Laurent Destailleur	a95240e33d	FIX Some troubles into weight and volume calculation when unit differs. ... NEW Introduce a function showDimensionInBestUnit	2016-02-25 13:46:38 +01:00
Laurent Destailleur	513b46e1d4	NEW Can reopen an closed shipment	2016-02-24 13:19:25 +01:00
Laurent Destailleur	d3960b0809	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/comm/propal/class/propal.class.php htdocs/core/lib/member.lib.php htdocs/expedition/card.php	2016-02-20 04:25:39 +01:00
Laurent Destailleur	7def330f54	Fix missing error message and input lost in shipment create page	2016-02-20 03:58:52 +01:00
Laurent Destailleur	7aaae143fc	Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/expedition/card.php	2016-02-15 02:01:58 +01:00
Laurent Destailleur	3bcc7b0f8f	Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/comm/remise.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/filefunc.inc.php htdocs/societe/price.php	2016-02-15 01:37:23 +01:00
Laurent Destailleur	2fd01d71cf	Fix #4548 Check on stock enough must be done according to warehouse	2016-02-14 22:20:42 +01:00
fmarcet	6260c1ae9e	FIX: Check stock of batch on shippment	2016-02-03 11:33:13 +01:00
fmarcet	d6cda60ed1	FIX: Check stock of product by warehouse if $entrepot_id defined on shippings	2016-02-01 13:40:02 +01:00
Laurent Destailleur	d2f5f5c01f	Merge pull request #4266 from fappels/develop_multi_warehouse ... Add shipping and dispatching from/to multiple warehouses	2016-01-22 02:26:25 +01:00
Laurent Destailleur	71b264dd86	FIX Bug: Delivery order and date are not displayed #4372 ... Link between shipment and delivery receipt was lost. Status for receipt must not use same label than shipments.	2016-01-13 20:41:32 +01:00
fappels	51b08f579b	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse ... Fix Conflicts:	2016-01-12 13:56:00 +01:00
Laurent Destailleur	6f474c403c	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php htdocs/product/list.php htdocs/societe/notify/card.php htdocs/societe/price.php	2015-12-27 19:15:20 +01:00
Marcos García de La Fuente	d30c64413d	FIX #4055 SQL error when trying to access a non-existing expedition	2015-12-24 14:27:12 +01:00
fappels	982db2e01f	Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_multi_warehouse	2015-12-18 19:31:02 +01:00
fappels	7fc8007571	New add shipping and dispatching from/to multiple warehouses ... Add select2 to warehouse selectors Ship customer orderline from multiple warehouses Dispatch client orderline to multiple warehouses	2015-12-18 18:00:31 +01:00
cla	cb96618460	Merge branch 'develop' into develop_sunimport	2015-12-18 10:49:57 +01:00
Laurent Destailleur	5eea1ce7d9	Fix several warnings	2015-12-17 19:37:24 +01:00
cla	ef487c48a4	NEW ... Extrafields for: - expedition, expeditiondet, livraison, livraisondet	2015-12-16 16:18:29 +01:00
fappels	9fa742ceb2	[QUAL] Shipment error handling	2015-12-14 21:38:26 +01:00
Laurent Destailleur	ab177b43af	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: ChangeLog htdocs/.gitignore htdocs/comm/mailing/card.php htdocs/commande/list.php htdocs/compta/facture.php htdocs/expedition/class/expedition.class.php	2015-11-13 12:35:10 +01:00
Laurent Destailleur	93be4305c4	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: build/makepack-dolibarr.pl htdocs/accountancy/customer/card.php htdocs/accountancy/customer/list.php htdocs/accountancy/supplier/card.php htdocs/accountancy/supplier/list.php htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/fichinter/card.php htdocs/societe/rib.php	2015-11-13 12:18:46 +01:00
Laurent Destailleur	eac80d7db4	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: ChangeLog build/debian/changelog htdocs/commande/fiche.php htdocs/compta/facture.php	2015-11-13 11:43:29 +01:00
Christophe Battarel	4d11205a01	FIX: change object statut on close shipping and remove erratic db commit	2015-11-06 09:51:33 +01:00
Laurent Destailleur	04664c203d	Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/comm/action/card.php htdocs/expedition/class/expedition.class.php htdocs/product/stock/product.php	2015-11-05 22:13:08 +01:00
Laurent Destailleur	58cac2d895	Merge remote-tracking branch 'origin/3.7' into 3.8 ... Conflicts: htdocs/comm/action/card.php htdocs/expedition/class/expedition.class.php htdocs/product/stock/product.php	2015-11-05 22:09:54 +01:00
Laurent Destailleur	fe78996026	Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/commande/class/commande.class.php htdocs/product/stock/fiche.php htdocs/product/stock/valo.php	2015-11-05 22:04:18 +01:00
Christophe Battarel	80d2445540	FIX: bad stock valorisation	2015-11-05 17:00:22 +01:00
Laurent Destailleur	b3491ef4e5	Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: ChangeLog htdocs/comm/propal/class/propal.class.php htdocs/compta/facture/admin/facture_cust_extrafields.php htdocs/compta/facture/admin/facturedet_cust_extrafields.php htdocs/compta/facture/class/facture.class.php htdocs/contrat/card.php	2015-10-16 10:12:36 +02:00