lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/fappels/dolibarr into fappels-develop

Browse Source 
Conflicts:
	htdocs/langs/en_US/sendings.lang
This commit is contained in:
Laurent Destailleur 2015-04-18 20:29:25 +02:00
commit 8be83cd043
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -2400,7 +2400,7 @@ class CommandeFournisseur extends CommonOrder
} }
} }
if ($nb === 0) return $langs->trans('Undefined'); if ($nb === 0) return '';
else return $nb.' '.$langs->trans('Days'); else return $nb.' '.$langs->trans('Days');
} }

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

@ -19,4 +19,4 @@ printQty=Qty: %d
AddDispatchBatchLine=Add a line for Shelf Life dispatching AddDispatchBatchLine=Add a line for Shelf Life dispatching
BatchDefaultNumber=Undefined BatchDefaultNumber=Undefined
WhenProductBatchModuleOnOptionAreForced=When module Lot/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. WhenProductBatchModuleOnOptionAreForced=When module Lot/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 lot/serial number

46
htdocs/langs/en_US/products.lang
View File

@ -23,14 +23,14 @@ ProductOrService=Product or Service
ProductsAndServices=Products and Services ProductsAndServices=Products and Services
ProductsOrServices=Products or Services ProductsOrServices=Products or Services
ProductsAndServicesOnSell=Products and Services for sale or for purchase ProductsAndServicesOnSell=Products and Services for sale or for purchase
ProductsAndServicesNotOnSell=Products and Services out of sale ProductsAndServicesNotOnSell=Products and Services not for sale
ProductsAndServicesStatistics=Products and Services statistics ProductsAndServicesStatistics=Products and Services statistics
ProductsStatistics=Products statistics ProductsStatistics=Products statistics
ProductsOnSell=Product for sale or for pruchase ProductsOnSell=Product for sale or for purchase
ProductsNotOnSell=Product out of sale and out of purchase ProductsNotOnSell=Product not for sale and not for purchase
ProductsOnSellAndOnBuy=Products for sale and for purchase ProductsOnSellAndOnBuy=Products for sale and for purchase
ServicesOnSell=Services for sale or for purchase ServicesOnSell=Services for sale or for purchase
ServicesNotOnSell=Services out of sale ServicesNotOnSell=Services not for sale
ServicesOnSellAndOnBuy=Services for sale and for purchase ServicesOnSellAndOnBuy=Services for sale and for purchase
InternalRef=Internal reference InternalRef=Internal reference
LastRecorded=Last products/services on sell recorded LastRecorded=Last products/services on sell recorded
@ -71,21 +71,21 @@ SellingPriceTTC=Selling price (inc. tax)
PublicPrice=Public price PublicPrice=Public price
CurrentPrice=Current price CurrentPrice=Current price
NewPrice=New price NewPrice=New price
MinPrice=Minim. selling price MinPrice=Min. selling price
MinPriceHT=Minim. selling price (net of tax) MinPriceHT=Min. selling price (net of tax)
MinPriceTTC=Minim. selling price (inc. tax) MinPriceTTC=Min. selling price (inc. tax)
CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount. CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
ContractStatus=Contract status ContractStatus=Contract status
ContractStatusClosed=Closed ContractStatusClosed=Closed
ContractStatusRunning=Running ContractStatusRunning=Ongoing
ContractStatusExpired=expired ContractStatusExpired=expired
ContractStatusOnHold=Not running ContractStatusOnHold=On hold
ContractStatusToRun=To get running ContractStatusToRun=Make ongoing
ContractNotRunning=This contract is not running ContractNotRunning=This contract is not ongoing
ErrorProductAlreadyExists=A product with reference %s already exists. ErrorProductAlreadyExists=A product with reference %s already exists.
ErrorProductBadRefOrLabel=Wrong value for reference or label. ErrorProductBadRefOrLabel=Wrong value for reference or label.
ErrorProductClone=There was a problem while trying to clone the product or service. ErrorProductClone=There was a problem while trying to clone the product or service.
ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
Suppliers=Suppliers Suppliers=Suppliers
SupplierRef=Supplier's product ref. SupplierRef=Supplier's product ref.
ShowProduct=Show product ShowProduct=Show product
@ -117,12 +117,12 @@ ServiceLimitedDuration=If product is a service with limited duration:
MultiPricesAbility=Several level of prices per product/service MultiPricesAbility=Several level of prices per product/service
MultiPricesNumPrices=Number of prices MultiPricesNumPrices=Number of prices
MultiPriceLevelsName=Price categories MultiPriceLevelsName=Price categories
AssociatedProductsAbility=Activate the virtual package feature AssociatedProductsAbility=Activate the package feature
AssociatedProducts=Package product AssociatedProducts=Package product
AssociatedProductsNumber=Number of products composing this virtual package product AssociatedProductsNumber=Number of products composing this package product
ParentProductsNumber=Number of parent packaging product ParentProductsNumber=Number of parent packaging product
IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
EditAssociate=Associate EditAssociate=Associate
Translation=Translation Translation=Translation
KeywordFilter=Keyword filter KeywordFilter=Keyword filter
@ -179,12 +179,12 @@ CloneProduct=Clone product or service
ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ? ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
CloneContentProduct=Clone all main informations of product/service CloneContentProduct=Clone all main informations of product/service
ClonePricesProduct=Clone main informations and prices ClonePricesProduct=Clone main informations and prices
CloneCompositionProduct=Clone packaged product/services CloneCompositionProduct=Clone packaged product/service
ProductIsUsed=This product is used ProductIsUsed=This product is used
NewRefForClone=Ref. of new product/service NewRefForClone=Ref. of new product/service
CustomerPrices=Customers prices CustomerPrices=Customer prices
SuppliersPrices=Suppliers prices SuppliersPrices=Supplier prices
SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services) SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
CustomCode=Customs code CustomCode=Customs code
CountryOrigin=Origin country CountryOrigin=Origin country
HiddenIntoCombo=Hidden into select lists HiddenIntoCombo=Hidden into select lists
@ -214,7 +214,7 @@ CostPmpHT=Net total VWAP
ProductUsedForBuild=Auto consumed by production ProductUsedForBuild=Auto consumed by production
ProductBuilded=Production completed ProductBuilded=Production completed
ProductsMultiPrice=Product multi-price ProductsMultiPrice=Product multi-price
ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices) ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
ProductSellByQuarterHT=Products turnover quarterly VWAP ProductSellByQuarterHT=Products turnover quarterly VWAP
ServiceSellByQuarterHT=Services turnover quarterly VWAP ServiceSellByQuarterHT=Services turnover quarterly VWAP
Quarter1=1st. Quarter Quarter1=1st. Quarter
@ -237,10 +237,10 @@ ResetBarcodeForAllRecords=Define barcode value for all records (this will also r
PriceByCustomer=Different price for each customer PriceByCustomer=Different price for each customer
PriceCatalogue=Unique price per product/service PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customers AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
PriceByCustomerLog=Price by customer log PriceByCustomerLog=Price by customer log
MinimumPriceLimit=Minimum price can't be lower that %s MinimumPriceLimit=Minimum price can't be lower then %s
MinimumRecommendedPrice=Minimum recommended price is : %s MinimumRecommendedPrice=Minimum recommended price is : %s
PriceExpressionEditor=Price expression editor PriceExpressionEditor=Price expression editor
PriceExpressionSelected=Selected price expression PriceExpressionSelected=Selected price expression

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

@ -65,10 +65,10 @@ ShipmentLine=Shipment line
CarrierList=List of transporters CarrierList=List of transporters
SendingRunning=Product from ordered customer orders SendingRunning=Product from ordered customer orders
SuppliersReceiptRunning=Product from ordered supplier orders SuppliersReceiptRunning=Product from ordered supplier orders
ProductQtyInCustomersOrdersRunning=Product quantity into open customers orders ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
ProductQtyInSuppliersOrdersRunning=Product quantity into open suppliers orders ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open supplier order already received ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
# Sending methods # Sending methods
SendingMethodCATCH=Catch by customer SendingMethodCATCH=Catch by customer

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

@ -42,5 +42,5 @@ SentToSuppliers=Sent to suppliers
ListOfSupplierOrders=List of supplier orders ListOfSupplierOrders=List of supplier orders
MenuOrdersSupplierToBill=Supplier orders to invoice MenuOrdersSupplierToBill=Supplier orders to invoice
NbDaysToDelivery=Delivery delay in days NbDaysToDelivery=Delivery delay in days
DescNbDaysToDelivery=The biggest delay is display among order product list DescNbDaysToDelivery=The biggest deliver delay of the products from this order
UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)