Elabore/odoo-usability
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] remove blanc in picking_status selection keys

Browse Source
This commit is contained in:
Mourad
2019-09-09 16:35:17 +02:00
parent 30334e617d
commit 2bddfa49f6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sale_stock_usability/sale_stock.py
View File

@@ -12,8 +12,8 @@ class SaleOrder(models.Model):
incoterm = fields.Many2one(track_visibility='onchange') incoterm = fields.Many2one(track_visibility='onchange')
picking_status = fields.Selection([ picking_status = fields.Selection([
('deliverd', 'Fully deliverd'), ('deliverd', 'Fully deliverd'),
('partialy delivered', 'Partialy Delivered'), ('partialy_delivered', 'Partialy Delivered'),
('to deliver', 'To Deliver'), ('to_deliver', 'To Deliver'),
('no', 'Nothing to Deliver') ('no', 'Nothing to Deliver')
], string='Picking Status', compute='_get_delivered', store=True, readonly=True) ], string='Picking Status', compute='_get_delivered', store=True, readonly=True)
@@ -35,9 +35,9 @@ class SaleOrder(models.Model):
elif all(picking.state == 'done' for picking in order.picking_ids): elif all(picking.state == 'done' for picking in order.picking_ids):
picking_status = 'deliverd' picking_status = 'deliverd'
elif any(picking.state == 'done' for picking in order.picking_ids): elif any(picking.state == 'done' for picking in order.picking_ids):
picking_status = 'partialy delivered' picking_status = 'partialy_delivered'
elif all(picking.state in ('confirmed', 'assigned', 'waiting') for picking in order.picking_ids): elif all(picking.state in ('confirmed', 'assigned', 'waiting') for picking in order.picking_ids):
picking_status = 'to deliver' picking_status = 'to_deliver'
else: else:
picking_status = 'no' picking_status = 'no'

2
sale_stock_usability/sale_stock_view.xml
View File

@@ -59,7 +59,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<filter name="order_month" position="after"> <filter name="order_month" position="after">
<filter string="To Deliver" name="to_deliver" <filter string="To Deliver" name="to_deliver"
domain="['|', ('picking_status','=','to deliver'), ('picking_status','=','partialy delivered')]"/> domain="['|', ('picking_status','=','to_deliver'), ('picking_status','=','partialy_delivered')]"/>
<filter string="Fully deliverd" name="fully_deliverd" domain="[('picking_status','=','deliverd')]"/> <filter string="Fully deliverd" name="fully_deliverd" domain="[('picking_status','=','deliverd')]"/>
</filter> </filter>
</field> </field>