~vauxoo/addons-vauxoo/6.0-trunk

« back to all changes in this revision

Viewing changes to mrp_production_cancel/mrp.py

  • Committer: Moises Lopez
  • Date: 2014-10-09 21:30:17 UTC
  • mfrom: (879.1.7 trunk-addons-vauxoo)
  • Revision ID: moylop260@vauxoo.com-20141009213017-u3jicyg8xery3r8c
[MERGE] upforward 7.0
-Fix unused import
-Fix relative import
-Fix full path import
-Fix trailing whitespace pylint error C0303
-Fix autopep8 ignoring E501 & E128
-Fix reimported
-Fix __openerp__.py files
-Translate update

Show diffs side-by-side

added added

removed removed

Lines of Context:
23
23
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
24
24
#
25
25
##############################################################################
26
 
from openerp.osv import osv, fields
27
 
from openerp.tools.translate import _
 
26
from openerp.osv import osv
28
27
 
29
 
from datetime import datetime
30
28
import openerp.netsvc as netsvc
31
29
 
32
30
 
49
47
                                   x.id for x in production.move_lines2])
50
48
            if production.move_created_ids2:
51
49
                move_obj.action_cancel(cr, uid, [
52
 
                                x.id for x in production.move_created_ids2])
 
50
                    x.id for x in production.move_created_ids2])
53
51
        return super(mrp_production, self).action_cancel(cr, uid, ids,
54
 
                                                            context=context)
 
52
                                                         context=context)