Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_US/stocks.lang
This commit is contained in:
Laurent Destailleur
2015-02-16 20:59:04 +01:00
parent aa380f6ee0 5688e8ecd8
commit 23562a01ab
10 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/productbatch.lang
View File

@@ -18,4 +18,4 @@ printQty=Qty: %d
AddDispatchBatchLine=Add a line for Shelf Life dispatching
BatchDefaultNumber=Undefined
WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
ProductDoesNotUseBatchSerial=This product does not use batch/serial number
ProductDoesNotUseBatchSerial=This product does not use batch/serial number

2
htdocs/langs/en_US/sendings.lang
View File

@@ -23,7 +23,7 @@ QtyOrdered=Qty ordered
QtyShipped=Qty shipped
QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Keep to ship
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
DateSending=Date sending order
DateSendingShort=Date sending order

1
htdocs/langs/en_US/stocks.lang
View File

@@ -130,3 +130,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.