Skip to content

Commit

Permalink
[FIX] travis and data nouptade.
Browse files Browse the repository at this point in the history
  • Loading branch information
LoisRForgeFlow committed Mar 24, 2017
1 parent d9e3f95 commit 05dc31b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions sale_delivery_block/data/sale_delivery_block_reason_data.xml
Expand Up @@ -2,9 +2,9 @@
<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->

<odoo>
<odoo noupdate="1">
<record id="my_data_record" model="sale.delivery.block.reason">
<field name="name">Pay Before Deliver</field>
<field name="name">Pay Before Delivery</field>
<field name="description">Used to block the creation of deliveries until the customer pays.
Since you are not creating any procurement nor move, no demand will be generated or stock assigned to fulfill this sales order.
</field>
Expand Down
7 changes: 4 additions & 3 deletions sale_delivery_block/models/sale_order.py
Expand Up @@ -38,9 +38,10 @@ class SaleOrderLine(models.Model):
@api.multi
def _action_procurement_create(self):
new_procs = self.env['procurement.order']
# When module 'sale_procurement_group_by_line_is installed' we do not
# want to use this method but call super. See module
# 'sale_delivery_block_proc_group_by_line
# When module 'sale_procurement_group_by_line' is installed we do not
# want to use this method but call super. See module
# 'sale_delivery_block_proc_group_by_line'. This solves a inheritance
# order issue.
if 'group_by_line' in self.env.context:
return super(SaleOrderLine, self)._action_procurement_create()
for line in self:
Expand Down
Expand Up @@ -3,7 +3,7 @@
# (http://www.eficent.com)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).

from openerp import api, fields, models, _
from openerp import api, models


class SaleOrderLine(models.Model):
Expand Down

0 comments on commit 05dc31b

Please sign in to comment.