Rename "On Order Confirmed" into "On Order Processed"
issue2473
This commit is contained in:
+2
-2
@@ -21,11 +21,11 @@ With the possibilities:
|
||||
- to follow invoice and shipment states from the sale order.
|
||||
- to define invoice method:
|
||||
- Manual
|
||||
- On Order Confirmed
|
||||
- On Order Processed
|
||||
- On shipment Sent
|
||||
- to define shipment method:
|
||||
- Manual
|
||||
- On Order Confirmed
|
||||
- On Order Processed
|
||||
- On Invoice Paid
|
||||
''',
|
||||
'description_bg_BG': ''' Задаване на поръчка за продажба.
|
||||
|
||||
+2
-2
@@ -17,14 +17,14 @@ class Configuration(ModelSingleton, ModelSQL, ModelView):
|
||||
], required=True))
|
||||
sale_invoice_method = fields.Property(fields.Selection([
|
||||
('manual', 'Manual'),
|
||||
('order', 'On Order Confirmed'),
|
||||
('order', 'On Order Processed'),
|
||||
('shipment', 'On Shipment Sent')
|
||||
], 'Sale Invoice Method', states={
|
||||
'required': Bool(Eval('context', {}).get('company', 0)),
|
||||
}))
|
||||
sale_shipment_method = fields.Property(fields.Selection([
|
||||
('manual', 'Manual'),
|
||||
('order', 'On Order Confirmed'),
|
||||
('order', 'On Order Processed'),
|
||||
('invoice', 'On Invoice Paid'),
|
||||
], 'Sale Shipment Method', states={
|
||||
'required': Bool(Eval('context', {}).get('company', 0)),
|
||||
|
||||
+5
-5
@@ -49,12 +49,12 @@ optional or completed with sensible default values:
|
||||
- Tax: The tax amount.
|
||||
- Total: The total amount.
|
||||
- State: The state of the sale. May take one of the following
|
||||
values: Draft, Quotation, Confirmed, Cancelled.
|
||||
values: Draft, Quotation, Confirmed, Processing, Cancelled.
|
||||
- Company: The company which issue the sale order.
|
||||
- Invoice Method: May take one of the following values:
|
||||
|
||||
- On Order Confirmed: The invoice is created when the sale order is
|
||||
confirmed.
|
||||
- On Order Processed: The invoice is created when the sale order is
|
||||
processed.
|
||||
- On Shipment Sent: The invoice is created when the shipment is sent
|
||||
and will contains the shipped quantities. If there are several
|
||||
shipments for the same sale, several invoices will be created.
|
||||
@@ -62,8 +62,8 @@ optional or completed with sensible default values:
|
||||
|
||||
- Shipment Method: May take one of the following values:
|
||||
|
||||
- On Order Confirmed: The customer shipment is created when the sale
|
||||
order is confirmed.
|
||||
- On Order Processed: The customer shipment is created when the sale
|
||||
order is processed.
|
||||
- On Invoice Paid: The customer shipment is created when the invoice
|
||||
is paid.
|
||||
- Manual: Tryton doesn't create any shipment automatically.
|
||||
|
||||
@@ -101,7 +101,7 @@ class Sale(ModelWorkflow, ModelSQL, ModelView):
|
||||
depends=['currency_digits']), 'get_function_fields')
|
||||
invoice_method = fields.Selection([
|
||||
('manual', 'Manual'),
|
||||
('order', 'On Order Confirmed'),
|
||||
('order', 'On Order Processed'),
|
||||
('shipment', 'On Shipment Sent'),
|
||||
],
|
||||
'Invoice Method', required=True, states={
|
||||
@@ -126,7 +126,7 @@ class Sale(ModelWorkflow, ModelSQL, ModelView):
|
||||
'get_function_fields')
|
||||
shipment_method = fields.Selection([
|
||||
('manual', 'Manual'),
|
||||
('order', 'On Order Confirmed'),
|
||||
('order', 'On Order Processed'),
|
||||
('invoice', 'On Invoice Paid'),
|
||||
], 'Shipment Method', required=True,
|
||||
states={
|
||||
|
||||
Reference in New Issue
Block a user