From bb5d7cf5725bb6642838fc70717cbdc8b540588c Mon Sep 17 00:00:00 2001 From: Chris Halls Date: Fri, 16 Apr 2010 16:24:29 +0100 Subject: [PATCH 1/8] [FIX] When duplicating a production order, clear existing stock moves If a production order is duplicated, it will be because someone wants to build the same item(s) again. The copy function already puts the production order back into state draft but does not delete the related stock movements and consumed products. bzr revid: chris.halls@credativ.co.uk-20100416152429-2ygxfb32lvew3bgl --- addons/mrp/mrp.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index eda4f076602..0e051e7ac2e 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -560,8 +560,12 @@ class mrp_production(osv.osv): default.update({ 'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.production'), 'move_lines' : [], - 'move_created_ids': [], - 'state': 'draft' + 'move_lines2' : [], + 'move_created_ids' : [], + 'move_created_ids2' : [], + 'product_lines' : [], + 'state': 'draft', + 'picking_id': False }) return super(mrp_production, self).copy(cr, uid, id, default, context) From 1b171756d16752f9d52412bc4d9d8950f3dba6a1 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 30 Jun 2010 17:19:35 +0200 Subject: [PATCH 2/8] [IMP] wiki: minor improvements to usability bzr revid: odo@openerp.com-20100630151935-cfri7cvs1z6jxvfq --- addons/wiki/wiki.py | 42 ++++++--------------- addons/wiki/wiki_view.xml | 9 +---- addons/wiki_faq/wiki_faq.xml | 10 ++--- addons/wiki_sale_faq/wiki_sale_faq_data.xml | 5 ++- 4 files changed, 21 insertions(+), 45 deletions(-) diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py index a9b623611b8..a0c72825859 100644 --- a/addons/wiki/wiki.py +++ b/addons/wiki/wiki.py @@ -32,7 +32,6 @@ import difflib class Wiki(osv.osv): """ wiki """ - _name = "wiki.wiki" Wiki() @@ -78,7 +77,7 @@ class GroupLink(osv.osv): GroupLink() -class Wiki(osv.osv): +class Wiki2(osv.osv): """ Wiki Page """ _inherit = "wiki.wiki" @@ -87,19 +86,22 @@ class Wiki(osv.osv): _columns = { 'name': fields.char('Title', size=256, select=True, required=True), - 'write_uid': fields.many2one('res.users', "Last Author"), + 'write_uid': fields.many2one('res.users', "Last Author", select=True), 'text_area': fields.text("Content"), 'create_uid': fields.many2one('res.users', 'Author', select=True), 'create_date': fields.datetime("Created on", select=True), 'write_date': fields.datetime("Modification Date", select=True), - 'tags': fields.char('Tags', size=1024), + 'tags': fields.char('Tags', size=1024, select=True), 'history_id': fields.one2many('wiki.wiki.history', 'wiki_id', 'History Lines'), 'minor_edit': fields.boolean('Minor edit', select=True), 'summary': fields.char('Summary', size=256), - 'section': fields.char('Sequence', size=32, help="Use page section code like 1.2.1"), - 'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null'), - 'toc': fields.boolean('Table of Contents'), - 'review': fields.boolean('Need Review'), + 'section': fields.char('Section', size=32, help="Use page section code like 1.2.1", select=True), + 'group_id': fields.many2one('wiki.groups', 'Wiki Group', select=1, ondelete='set null', + help="Topic, also called Wiki Group"), + 'toc': fields.boolean('Table of Contents', + help="Indicates that this pages is a table of contents (linking to other pages)"), + 'review': fields.boolean('Needs Review', select=True, + help="Indicates that this page should be reviewed, raising the attention of other contributors"), 'parent_id': fields.many2one('wiki.wiki', 'Parent Page'), 'child_ids': fields.one2many('wiki.wiki', 'parent_id', 'Child Pages'), } @@ -176,29 +178,7 @@ class Wiki(osv.osv): history.create(cr, uid, res) return result - def open_wiki_page(self, cr, uid, ids, context): - - """ Opens Wiki Page for Editing - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of wiki page’s IDs - - """ - pages = self.pool.get('wiki.wiki').search(cr, uid, [('name', '=', 'Basic Wiki Editing')]) - if not pages: - raise osv.except_osv(_('Warning !'), _("No Help page is defined")) - value = { - 'view_type': 'form', - 'view_mode': 'form,tree', - 'res_model': 'wiki.wiki', - 'view_id': False, - 'res_id': pages[0], - 'type': 'ir.actions.act_window', - 'nodestroy': True, - } - return value - -Wiki() +Wiki2() class History(osv.osv): diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml index c1baa5cda20..a87341785d3 100644 --- a/addons/wiki/wiki_view.xml +++ b/addons/wiki/wiki_view.xml @@ -123,14 +123,9 @@
- -