Skip to content

Commit

Permalink
[FLAKE8]
Browse files Browse the repository at this point in the history
  • Loading branch information
legalsylvain committed Feb 27, 2015
1 parent 4cf24d7 commit 44fbf99
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
6 changes: 3 additions & 3 deletions integrated_trade_purchase_sale/model/purchase_order.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,9 @@ def write(self, cr, uid, ids, vals, context=None):
raise except_osv(
_("Error!"),
_("""You can not change Lines of a Sent Purchase"""
"""Order because of 'Integrated 'Trade' Rules."""
""" Please cancel this Purchase Order and create"""
""" a new one, duplicating it."""))
""" Order because of 'Integrated 'Trade'"""
""" Rules. Please cancel this Purchase Order"""
""" and create a new one, duplicating it."""))
rit = self._get_res_integrated_trade(
cr, uid, po.partner_id.id, po.company_id.id,
context=context)
Expand Down
12 changes: 5 additions & 7 deletions integrated_trade_purchase_sale/model/sale_order.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- encoding: utf-8 -*-
##############################################################################
#
# Integrated Trade - Purchase module for OpenERP
# Integrated Trade - Purchase - Sale module for OpenERP
# Copyright (C) 2015-Today GRAP (http://www.grap.coop)
# @author Sylvain LE GAL (https://twitter.com/legalsylvain)
#
Expand All @@ -20,7 +20,6 @@
#
##############################################################################

from openerp import netsvc
from openerp.osv import fields
from openerp.osv.orm import Model
from openerp.osv.osv import except_osv
Expand Down Expand Up @@ -161,10 +160,10 @@ def write(self, cr, uid, ids, vals, context=None):
raise except_osv(
_("Error!"),
_("""You can not change Lines of a Sent Sale"""
"""Order because of 'Integrated 'Trade' Rules."""
""" Please ask to your Customer to cancel the"""
""" Purchase Order and create a new one,"""
""" duplicating it."""))
""" Order because of 'Integrated 'Trade'"""
""" Rules. Please ask to your Customer to"""
""" cancel the Purchase Order and create a"""
""" new one, duplicating it."""))
return res

def action_button_confirm(self, cr, uid, ids, context=None):
Expand Down Expand Up @@ -193,7 +192,6 @@ def action_button_confirm(self, cr, uid, ids, context=None):
('sale_id', '=', so.id)],
context=context)[0]

import pdb; pdb.set_trace()
# Associate Picking Out and Picking In
sp_obj.write(cr, uid, [spo_id], {
'integrated_trade_picking_in_id': spi_id}, context=context)
Expand Down
6 changes: 2 additions & 4 deletions integrated_trade_stock/model/stock_picking.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@
#
##############################################################################

from openerp import netsvc
from openerp.osv import fields
from openerp.osv.orm import Model
from openerp.osv.osv import except_osv
from openerp.tools.translate import _
# from openerp.osv.osv import except_osv
# from openerp.tools.translate import _


class stock_picking(Model):
Expand Down Expand Up @@ -56,4 +55,3 @@ def _get_integrated_trade(
readonly=True,
),
}

0 comments on commit 44fbf99

Please sign in to comment.