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

Fix translation Customer order into Sales order

Browse Source
This commit is contained in:
Laurent Destailleur 2019-01-10 12:15:42 +01:00
parent 074f163fe5
commit 653acf556b
16 changed files with 44 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/langs/en_US/admin.lang
View File

@ -498,8 +498,8 @@ Module22Name=Mass Emailings
Module22Desc=Manage bulk emailing
Module23Name=Energy
Module23Desc=Monitoring the consumption of energies
Module25Name=Customer Orders
Module25Desc=Customer order management
Module25Name=Sales Orders
Module25Desc=Sales order management
Module30Name=Invoices
Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
Module40Name=Vendors
@ -853,7 +853,7 @@ Permission1237=Export purchase orders and their details
Permission1251=Run mass imports of external data into database (data load)
Permission1321=Export customer invoices, attributes and payments
Permission1322=Reopen a paid bill
Permission1421=Export customer orders and attributes
Permission1421=Export sales orders and attributes
Permission20001=Read leave requests (your leave and those of your subordinates)
Permission20002=Create/modify your leave requests (your leave and those of your subordinates)
Permission20003=Delete leave requests
@ -1263,7 +1263,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
##### Suppliers Orders #####
BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
##### Orders #####
OrdersSetup=Customer Order management setup
OrdersSetup=Sales Orders management setup
OrdersNumberingModules=Orders numbering models
OrdersModelModule=Order documents models
FreeLegalTextOnOrders=Free text on orders
@ -1747,7 +1747,7 @@ ExpectedChecksum=Expected Checksum
CurrentChecksum=Current Checksum
ForcedConstants=Required constant values
MailToSendProposal=Customer proposals
MailToSendOrder=Customer orders
MailToSendOrder=Sales orders
MailToSendInvoice=Customer invoices
MailToSendShipment=Shipments
MailToSendIntervention=Interventions

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

@ -72,7 +72,7 @@ OrderRefusedInDolibarr=Order %s refused
OrderBackToDraftInDolibarr=Order %s go back to draft status
ProposalSentByEMail=Commercial proposal %s sent by email
ContractSentByEMail=Contract %s sent by email
OrderSentByEMail=Customer order %s sent by email
OrderSentByEMail=Sales order %s sent by email
InvoiceSentByEMail=Customer invoice %s sent by email
SupplierOrderSentByEMail=Purchase order %s sent by email
SupplierInvoiceSentByEMail=Vendor invoice %s sent by email

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

@ -12,7 +12,7 @@ BoxLastProposals=Latest commercial proposals
BoxLastProspects=Latest modified prospects
BoxLastCustomers=Latest modified customers
BoxLastSuppliers=Latest modified suppliers
BoxLastCustomerOrders=Latest customer orders
BoxLastCustomerOrders=Latest sales orders
BoxLastActions=Latest actions
BoxLastContracts=Latest contracts
BoxLastContacts=Latest contacts/addresses
@ -52,7 +52,7 @@ ClickToAdd=Click here to add.
NoRecordedCustomers=No recorded customers
NoRecordedContacts=No recorded contacts
NoActionsToDo=No actions to do
NoRecordedOrders=No recorded customer orders
NoRecordedOrders=No recorded sales orders
NoRecordedProposals=No recorded proposals
NoRecordedInvoices=No recorded customer invoices
NoUnpaidCustomerBills=No unpaid customer invoices
@ -67,7 +67,7 @@ BoxLatestSupplierOrders=Latest purchase orders
NoSupplierOrder=No recorded purchase order
BoxCustomersInvoicesPerMonth=Customer Invoices per month
BoxSuppliersInvoicesPerMonth=Vendor Invoices per month
BoxCustomersOrdersPerMonth=Customer Orders per month
BoxCustomersOrdersPerMonth=Sales Orders per month
BoxSuppliersOrdersPerMonth=Vendor Orders per month
BoxProposalsPerMonth=Proposals per month
NoTooLowStockProducts=No products are under the low stock limit
@ -76,7 +76,7 @@ BoxProductDistributionFor=Distribution of %s by %s
BoxTitleLastModifiedSupplierBills=Vendor Invoices: last %s modified
BoxTitleLatestModifiedSupplierOrders=Vendor Orders: last %s modified
BoxTitleLastModifiedCustomerBills=Customer Invoices: last %s modified
BoxTitleLastModifiedCustomerOrders=Customer Orders: last %s modified
BoxTitleLastModifiedCustomerOrders=Sales Orders: last %s modified
BoxTitleLastModifiedPropals=Latest %s modified proposals
ForCustomersInvoices=Customers invoices
ForCustomersOrders=Customers orders

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

@ -59,7 +59,7 @@ ActionAC_FAC=Send customer invoice by mail
ActionAC_REL=Send customer invoice by mail (reminder)
ActionAC_CLO=Close
ActionAC_EMAILING=Send mass email
ActionAC_COM=Send customer order by mail
ActionAC_COM=Send sales order by mail
ActionAC_SHIP=Send shipping by mail
ActionAC_SUP_ORD=Send purchase order by mail
ActionAC_SUP_INV=Send vendor invoice by mail

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

@ -127,7 +127,7 @@ OpenBaseDir=PHP openbasedir parameter
YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide the login/password of superuser (bottom of form).
YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide the login/password of superuser (bottom of form).
NextStepMightLastALongTime=The current step may take several minutes. Please wait until the next screen is shown completely before continuing.
MigrationCustomerOrderShipping=Migrate shipping for customer orders storage
MigrationCustomerOrderShipping=Migrate shipping for sales orders storage
MigrationShippingDelivery=Upgrade storage of shipping
MigrationShippingDelivery2=Upgrade storage of shipping 2
MigrationFinished=Migration finished

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

@ -927,7 +927,7 @@ SearchIntoProjects=Projects
SearchIntoTasks=Tasks
SearchIntoCustomerInvoices=Customer invoices
SearchIntoSupplierInvoices=Vendor invoices
SearchIntoCustomerOrders=Customer orders
SearchIntoCustomerOrders=Sales orders
SearchIntoSupplierOrders=Purchase orders
SearchIntoCustomerProposals=Customer proposals
SearchIntoSupplierProposals=Vendor proposals

22
htdocs/langs/en_US/orders.lang
View File

@ -16,14 +16,14 @@ MakeOrder=Make order
SupplierOrder=Purchase order
SuppliersOrders=Purchase orders
SuppliersOrdersRunning=Current purchase orders
CustomerOrder=Customer Order
CustomersOrders=Customer Orders
CustomersOrdersRunning=Current customer orders
CustomersOrdersAndOrdersLines=Customer orders and order details
OrdersDeliveredToBill=Customer orders delivered to bill
OrdersToBill=Customer orders delivered
OrdersInProcess=Customer orders in process
OrdersToProcess=Customer orders to process
CustomerOrder=Sales Order
CustomersOrders=Sales Orders
CustomersOrdersRunning=Current sales orders
CustomersOrdersAndOrdersLines=Sales orders and order details
OrdersDeliveredToBill=Sales orders delivered to bill
OrdersToBill=Sales orders delivered
OrdersInProcess=Sales orders in process
OrdersToProcess=Sales orders to process
SuppliersOrdersToProcess=Purchase orders to process
StatusOrderCanceledShort=Canceled
StatusOrderDraftShort=Draft
@ -76,8 +76,8 @@ OrdersOpened=Orders to process
NoDraftOrders=No draft orders
NoOrder=No order
NoSupplierOrder=No purchase order
LastOrders=Latest %s customer orders
LastCustomerOrders=Latest %s customer orders
LastOrders=Latest %s sales orders
LastCustomerOrders=Latest %s sales orders
LastSupplierOrders=Latest %s purchase orders
LastModifiedOrders=Latest %s modified orders
AllOrders=All orders
@ -120,7 +120,7 @@ SupplierOrderSubmitedInDolibarr=Purchase Order %s submitted
SupplierOrderClassifiedBilled=Purchase Order %s set billed
OtherOrders=Other orders
##### Types de contacts #####
TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
TypeContact_commande_internal_SALESREPFOLL=Representative following-up sales order
TypeContact_commande_internal_SHIPPING=Representative following-up shipping
TypeContact_commande_external_BILLING=Customer invoice contact
TypeContact_commande_external_SHIPPING=Customer shipping contact

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

@ -31,8 +31,8 @@ NextYearOfInvoice=Following year of invoice date
DateNextInvoiceBeforeGen=Date of next invoice (before generation)
DateNextInvoiceAfterGen=Date of next invoice (after generation)
Notify_ORDER_VALIDATE=Customer order validated
Notify_ORDER_SENTBYMAIL=Customer order sent by mail
Notify_ORDER_VALIDATE=Sales order validated
Notify_ORDER_SENTBYMAIL=Sales order sent by mail
Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
Notify_ORDER_SUPPLIER_VALIDATE=Purchase order recorded
Notify_ORDER_SUPPLIER_APPROVE=Purchase order approved
@ -179,13 +179,13 @@ DolibarrDemo=Dolibarr ERP/CRM demo
StatsByNumberOfUnits=Statistics for sum of qty of products/services
StatsByNumberOfEntities=Statistics in number of referring entities (no. of invoice, or order...)
NumberOfProposals=Number of proposals
NumberOfCustomerOrders=Number of customer orders
NumberOfCustomerOrders=Number of sales orders
NumberOfCustomerInvoices=Number of customer invoices
NumberOfSupplierProposals=Number of vendor proposals
NumberOfSupplierOrders=Number of purchase orders
NumberOfSupplierInvoices=Number of vendor invoices
NumberOfUnitsProposals=Number of units on proposals
NumberOfUnitsCustomerOrders=Number of units on customer orders
NumberOfUnitsCustomerOrders=Number of units on sales orders
NumberOfUnitsCustomerInvoices=Number of units on customer invoices
NumberOfUnitsSupplierProposals=Number of units on vendor proposals
NumberOfUnitsSupplierOrders=Number of units on purchase orders

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

@ -15,7 +15,7 @@ ToPay=Do payment
YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
Continue=Next
ToOfferALinkForOnlinePayment=URL for %s payment
ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount

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

@ -81,7 +81,7 @@ GoToListOfTasks=Go to list of tasks
GoToGanttView=Go to Gantt view
GanttView=Gantt View
ListProposalsAssociatedProject=List of the commercial proposals related to the project
ListOrdersAssociatedProject=List of customer orders related to the project
ListOrdersAssociatedProject=List of sales orders related to the project
ListInvoicesAssociatedProject=List of customer invoices related to the project
ListPredefinedInvoicesAssociatedProject=List of customer template invoices related to the project
ListSupplierOrdersAssociatedProject=List of purchase orders related to the project

32
htdocs/langs/en_US/receptions.lang
View File

@ -6,7 +6,6 @@ AllReceptions=All Receptions
Reception=Reception
Receptions=Receptions
ShowReception=Show Receptions
Receivings=Delivery Receipts
ReceptionsArea=Receptions area
ListOfReceptions=List of receptions
ReceptionMethod=Reception method
@ -17,12 +16,7 @@ NumberOfReceptionsByMonth=Number of receptions by month
ReceptionCard=Reception card
NewReception=New reception
CreateReception=Create reception
QtyShipped=Qty shipped
QtyPreparedOrShipped=Qty prepared or shipped
QtyToShip=Qty to ship
QtyReceived=Qty received
QtyInOtherReceptions=Qty in other receptions
KeepToShip=Remain to ship
OtherReceptionsForSameOrder=Other receptions for this order
ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
ReceptionsToValidate=Receptions to validate
@ -37,34 +31,12 @@ ReceptionSheet=Reception sheet
ConfirmDeleteReception=Are you sure you want to delete this reception?
ConfirmValidateReception=Are you sure you want to validate this reception with reference <b>%s</b>?
ConfirmCancelReception=Are you sure you want to cancel this reception?
DocumentModelMerou=Merou A5 model
WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated. Date used is date of validation of reception (planed delivery date is not always known).
DateDeliveryPlanned=Planned date of delivery
RefDeliveryReceipt=Ref delivery receipt
StatusReceipt=Status delivery receipt
DateReceived=Date delivery received
SendReceptionByEMail=Send reception by email
SendReceptionRef=Submission of reception %s
ActionsOnReception=Events on reception
LinkToTrackYourPackage=Link to track your package
ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the order card.
ReceptionLine=Reception line
ProductQtyInCustomersOrdersRunning=Product quantity into open customer orders
ProductQtyInSuppliersOrdersRunning=Product quantity into open purchase orders
ProductQtyInReceptionAlreadySent=Product quantity from open customer order already sent
ProductQtyInReceptionAlreadySent=Product quantity from open sales order already sent
ProductQtyInSuppliersReceptionAlreadyRecevied=Product quantity from open supplier order already received
NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
WeightVolShort=Weight/Vol.
ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.
# Reception methods
# ModelDocument
DocumentModelTyphon=More complete document model for delivery receipts (logo...)
Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
SumOfProductVolumes=Sum of product volumes
SumOfProductWeights=Sum of product weights
# warehouse details
DetailWarehouseNumber= Warehouse details
DetailWarehouseFormat= W:%s (Qty: %d)
ValidateOrderFirstBeforeReception=You must first validate the order before being able to make receptions.

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

@ -52,9 +52,9 @@ ActionsOnShipping=Events on shipment
LinkToTrackYourPackage=Link to track your package
ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
ShipmentLine=Shipment line
ProductQtyInCustomersOrdersRunning=Product quantity into open customer orders
ProductQtyInCustomersOrdersRunning=Product quantity into open sales orders
ProductQtyInSuppliersOrdersRunning=Product quantity into open purchase orders
ProductQtyInShipmentAlreadySent=Product quantity from open customer order already sent
ProductQtyInShipmentAlreadySent=Product quantity from open sales order already sent
ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from open purchase order already received
NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
WeightVolShort=Weight/Vol.

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

@ -64,7 +64,7 @@ OrderDispatch=Item receipts
RuleForStockManagementDecrease=Choose Rule for automatic stock decrease (manual decrease is always possible, even if an automatic decrease rule is activated)
RuleForStockManagementIncrease=Choose Rule for automatic stock increase (manual increase is always possible, even if an automatic increase rule is activated)
DeStockOnBill=Decrease real stocks on validation of customer invoice/credit note
DeStockOnValidateOrder=Decrease real stocks on validation of customer order
DeStockOnValidateOrder=Decrease real stocks on validation of sales order
DeStockOnShipment=Decrease real stocks on shipping validation
DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
ReStockOnBill=Increase real stocks on validation of vendor invoice/credit note
@ -82,7 +82,7 @@ RealStock=Real Stock
RealStockDesc=Physical/real stock is the stock currently in the warehouses.
RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
VirtualStock=Virtual stock
VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, customer orders shipped etc.)
VirtualStockDesc=Virtual stock is the calculated stock available once all open/pending actions (that affect stocks) are closed (purchase orders received, sales orders shipped etc.)
IdWarehouse=Id warehouse
DescWareHouse=Description warehouse
LieuWareHouse=Localisation warehouse

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

@ -16,7 +16,7 @@ StripeDoPayment=Pay with Credit or Debit Card (Stripe)
YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
Continue=Next
ToOfferALinkForOnlinePayment=URL for %s payment
ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a sales order
ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount

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

@ -50,7 +50,7 @@ StatusMotif0=Unspecified
StatusMotif1=Insufficient funds
StatusMotif2=Request contested
StatusMotif3=No direct debit payment order
StatusMotif4=Customer Order
StatusMotif4=Sales Order
StatusMotif5=RIB unusable
StatusMotif6=Account without balance
StatusMotif7=Judicial Decision

12
htdocs/langs/en_US/workflow.lang
View File

@ -3,16 +3,16 @@ WorkflowSetup=Workflow module setup
WorkflowDesc=This module provides some automatic actions. By default, the workflow is open (you can do things in the order you want) but here you can activate some automatic actions.
ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
# Autocreate
descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (the new order will have same amount as the proposal)
descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a commercial proposal is signed (the new order will have same amount as the proposal)
descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (the new invoice will have same amount as the proposal)
descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (the new invoice will have same amount as the order)
descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a sales order is closed (the new invoice will have same amount as the order)
# Autoclassify customer proposal or order
descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when sales order is set to billed (and if the amount of the order is the same as the total amount of the signed linked proposal)
descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the signed linked proposal)
descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)
descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source sales order as billed when customer invoice is set to paid (and if the amount of the invoice is the same as the total amount of the linked order)
descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source sales order as shipped when a shipment is validated (and if the quantity shipped by all shipments is the same as in the order to update)
# Autoclassify purchase order
descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source vendor proposal as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked proposal)
descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source purchase order as billed when vendor invoice is validated (and if the amount of the invoice is the same as the total amount of the linked order)