merge
This commit is contained in:
Cédric Krier committed
commit
668bd1f42d
2 files changed
+31
-31
No files matched your search
@@ -46,7 +46,7 @@ class Sale(ModelWorkflow, ModelSQL, ModelView):
|
||||
domain="[('party', '=', party)]", states={
|
||||
'readonly': "state != 'draft'",
|
||||
})
|
||||
packing_address = fields.Many2One('party.address', 'Packing Address',
|
||||
packing_address = fields.Many2One('party.address', 'Shipment Address',
|
||||
domain="[('party', '=', party)]", states={
|
||||
'readonly': "state != 'draft'",
|
||||
})
|
||||
@@ -73,7 +73,7 @@ class Sale(ModelWorkflow, ModelSQL, ModelView):
|
||||
invoice_method = fields.Selection([
|
||||
('manual', 'Manual'),
|
||||
('order', 'On Order Confirmed'),
|
||||
('packing', 'On Packing Sent'),
|
||||
('packing', 'On Shipment Sent'),
|
||||
], 'Invoice Method', required=True, states={
|
||||
'readonly': "state != 'draft'",
|
||||
})
|
||||
@@ -97,7 +97,7 @@ class Sale(ModelWorkflow, ModelSQL, ModelView):
|
||||
('manual', 'Manual'),
|
||||
('order', 'On Order Confirmed'),
|
||||
('invoice', 'On Invoice Paid'),
|
||||
], 'Packing Method', required=True, states={
|
||||
], 'Shipment Method', required=True, states={
|
||||
'readonly': "state != 'draft'",
|
||||
})
|
||||
packing_state = fields.Selection([
|
||||
@@ -105,15 +105,15 @@ class Sale(ModelWorkflow, ModelSQL, ModelView):
|
||||
('waiting', 'Waiting'),
|
||||
('sent', 'Sent'),
|
||||
('exception', 'Exception'),
|
||||
], 'Packing State', readonly=True, required=True)
|
||||
], 'Shipment State', readonly=True, required=True)
|
||||
packings = fields.Function('get_function_fields', type='many2many',
|
||||
relation='stock.packing.out', string='Packings')
|
||||
relation='stock.packing.out', string='Shipments')
|
||||
moves = fields.Function('get_function_fields', type='many2many',
|
||||
relation='stock.move', string='Moves')
|
||||
packing_done = fields.Function('get_function_fields', type='boolean',
|
||||
string='Packing Done')
|
||||
string='Shipment Done')
|
||||
packing_exception = fields.Function('get_function_fields', type='boolean',
|
||||
string='Packings Exception')
|
||||
string='Shipments Exception')
|
||||
|
||||
def __init__(self):
|
||||
super(Sale, self).__init__()
|
||||
@@ -124,7 +124,7 @@ class Sale(ModelWorkflow, ModelSQL, ModelView):
|
||||
]
|
||||
self._error_messages.update({
|
||||
'wrong_method': 'Wrong combination of method!',
|
||||
'addresses_required': 'Invoice and Packing addresses must be '
|
||||
'addresses_required': 'Invoice and Shipment addresses must be '
|
||||
'defined for the quotation.',
|
||||
})
|
||||
|
||||
@@ -1602,7 +1602,7 @@ Invoice()
|
||||
|
||||
|
||||
class HandlePackingExceptionAsk(ModelView):
|
||||
'Packing Exception Ask'
|
||||
'Shipment Exception Ask'
|
||||
_name = 'sale.handle.packing.exception.ask'
|
||||
_description = __doc__
|
||||
|
||||
@@ -1639,7 +1639,7 @@ class HandlePackingExceptionAsk(ModelView):
|
||||
HandlePackingExceptionAsk()
|
||||
|
||||
class HandlePackingException(Wizard):
|
||||
'Handle Packing Exception'
|
||||
'Handle Shipment Exception'
|
||||
_name = 'sale.handle.packing.exception'
|
||||
states = {
|
||||
'init': {
|
||||
|
||||
@@ -12,7 +12,7 @@ this repository contains the full copyright notices and license terms. -->
|
||||
</record>
|
||||
|
||||
<record model="ir.action.wizard" id="wizard_packing_handle_exception">
|
||||
<field name="name">Handle Packing Exception</field>
|
||||
<field name="name">Handle Shipment Exception</field>
|
||||
<field name="wiz_name">sale.handle.packing.exception</field>
|
||||
<field name="model">sale.sale</field>
|
||||
</record>
|
||||
@@ -95,7 +95,7 @@ this repository contains the full copyright notices and license terms. -->
|
||||
icon="tryton-go-next"/>
|
||||
<button name="%(wizard_packing_handle_exception)d"
|
||||
type="action"
|
||||
string="Handle Packing Exception"
|
||||
string="Handle Shipment Exception"
|
||||
states="{'invisible': '''packing_state != 'exception' or state == 'cancel' ''', 'readonly': '''%(group_sale)d not in groups'''}"
|
||||
icon="tryton-go-next"/>
|
||||
<button name="confirm" string="Confirm"
|
||||
@@ -134,7 +134,7 @@ this repository contains the full copyright notices and license terms. -->
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<page string="Packings" id="packings">
|
||||
<page string="Shipments" id="packings">
|
||||
<separator name="moves" colspan="4"/>
|
||||
<field name="moves" colspan="4">
|
||||
<tree string="Moves">
|
||||
@@ -217,7 +217,7 @@ this repository contains the full copyright notices and license terms. -->
|
||||
</record>
|
||||
|
||||
<record model="ir.action.act_window" id="act_packing_form">
|
||||
<field name="name">Packings</field>
|
||||
<field name="name">Shipments</field>
|
||||
<field name="res_model">stock.packing.out</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="domain">[("id", "in", packings)]</field>
|
||||
@@ -408,36 +408,36 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<field name="action">write({'invoice_state': 'paid'})</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_packing_invoice_method">
|
||||
<field name="name">Packing Invoice Method</field>
|
||||
<field name="name">Shipment Invoice Method</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="split_mode">OR</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_packing_invoice">
|
||||
<field name="name">Packing Invoice</field>
|
||||
<field name="name">Shipment Invoice</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">create_packing()</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_waiting_packing_invoice">
|
||||
<field name="name">Waiting Packing Invoice</field>
|
||||
<field name="name">Waiting Shipment Invoice</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">write({'packing_state': 'waiting'}) create_packing()</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_packing_invoice_exception">
|
||||
<field name="name">Packing Invoice Exception</field>
|
||||
<field name="name">Shipment Invoice Exception</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">write({'packing_state': 'exception'})</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_packing_invoice_done">
|
||||
<field name="name">Packing Invoice Done</field>
|
||||
<field name="name">Shipment Invoice Done</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">write({'packing_state': 'sent'})</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_packing_invoice_method_done">
|
||||
<field name="name">Packing Invoice Method Done</field>
|
||||
<field name="name">Shipment Invoice Method Done</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_invoice_method_done">
|
||||
@@ -445,64 +445,64 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_packing_method">
|
||||
<field name="name">Packing Method</field>
|
||||
<field name="name">Shipment Method</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_packing">
|
||||
<field name="name">Packing</field>
|
||||
<field name="name">Shipment</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">create_packing()</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_waiting_packing">
|
||||
<field name="name">Waiting Packing</field>
|
||||
<field name="name">Waiting Shipment</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">write({'packing_state': 'waiting'}) create_packing()</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_packing_exception">
|
||||
<field name="name">Packing Exception</field>
|
||||
<field name="name">Shipment Exception</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">write({'packing_state': 'exception'})</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_invoice_packing_method">
|
||||
<field name="name">Invoice Packing Method</field>
|
||||
<field name="name">Invoice Shipment Method</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="split_mode">OR</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_invoice_packing">
|
||||
<field name="name">Invoice Packing</field>
|
||||
<field name="name">Invoice Shipment</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">create_invoice() write({'invoice_state': 'waiting'})</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_waiting_invoice_packing">
|
||||
<field name="name">Waiting Invoice Packing</field>
|
||||
<field name="name">Waiting Invoice Shipment</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">write({'invoice_state': 'waiting', 'packing_state': 'sent'})</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_invoice_packing_exception">
|
||||
<field name="name">Invoice Packing Exception</field>
|
||||
<field name="name">Invoice Shipment Exception</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">write({'invoice_state': 'exception'})</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_invoice_packing_done">
|
||||
<field name="name">Invoice Packing Done</field>
|
||||
<field name="name">Invoice Shipment Done</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">write({'invoice_state': 'paid'})</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_invoice_packing_method_done">
|
||||
<field name="name">Invoice Packing Method Done</field>
|
||||
<field name="name">Invoice Shipment Method Done</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
<field name="kind">function</field>
|
||||
<field name="action">write({'packing_state': 'sent'})</field>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_packing_method_done">
|
||||
<field name="name">Packing Method Done</field>
|
||||
<field name="name">Shipment Method Done</field>
|
||||
<field name="workflow" ref="sale_workflow"/>
|
||||
</record>
|
||||
<record model="workflow.activity" id="sale_activity_done">
|
||||
|
||||
Reference in new issue
Block a user