Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-training-document-type-ysa into lp:~openobject-training/openobject-addons/training.
Requested reviews: OpenObject Training (openobject-training) For more details, see: https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-document-type-ysa/+merge/55879 document_type:- convert this module into v6. -- https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-document-type-ysa/+merge/55879 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-document-type-ysa.
=== modified file 'document_type/__init__.py' --- document_type/__init__.py 2011-03-16 09:00:25 +0000 +++ document_type/__init__.py 2011-04-01 08:32:38 +0000 @@ -1,1 +1,3 @@ import object + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'document_type/__openerp__.py' --- document_type/__openerp__.py 2011-03-29 13:18:18 +0000 +++ document_type/__openerp__.py 2011-04-01 08:32:38 +0000 @@ -20,6 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## + { 'name': 'document_type', 'version': '0.1', @@ -46,3 +47,5 @@ 'active': False, 'installable': True, } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'document_type/object/__init__.py' --- document_type/object/__init__.py 2011-01-20 11:27:44 +0000 +++ document_type/object/__init__.py 2011-04-01 08:32:38 +0000 @@ -1,3 +1,5 @@ import document_type import document_directory_i import ir_attachment_i + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'document_type/object/document_directory_i.py' --- document_type/object/document_directory_i.py 2011-01-20 11:27:44 +0000 +++ document_type/object/document_directory_i.py 2011-04-01 08:32:38 +0000 @@ -9,14 +9,19 @@ _inherit = 'document.directory' def _selection_get_type_default_id(self, cr, uid, context=None): + if context is None: + context = {} doctype_pool = self.pool.get('document.type') ids = doctype_pool.search(cr, uid, [], context=context) - r = [ (x.code, x.name) \ + result = [ (x.code, x.name) \ for x in doctype_pool.browse(cr, uid, ids, context=context) ] - r.append(('', '')) - return r + result.append(('', '')) + return result _columns = { 'type_default': fields.selection(_selection_get_type_default_id, 'Default Type', size=32, select=True), } + document_directory_default_type() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'document_type/object/document_type.py' --- document_type/object/document_type.py 2010-12-13 12:04:10 +0000 +++ document_type/object/document_type.py 2011-04-01 08:32:38 +0000 @@ -35,4 +35,7 @@ _sql_constraints = [ ('uniq_document_type_code', 'UNIQUE(code)', 'Code of document type must be unique !'), ] + document_type() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'document_type/object/ir_attachment_i.py' --- document_type/object/ir_attachment_i.py 2011-01-20 11:27:44 +0000 +++ document_type/object/ir_attachment_i.py 2011-04-01 08:32:38 +0000 @@ -28,18 +28,22 @@ _inherit = 'ir.attachment' def _selection_get_type_id(self, cr, uid, context=None): + if context is None: + context = {} doctype_pool = self.pool.get('document.type') ids = doctype_pool.search(cr, uid, [], context=context) - r = [ (x.code, x.name) \ + result = [ (x.code, x.name) \ for x in doctype_pool.browse(cr, uid, ids, context=context) ] - r.append(('', '')) - return r + result.append(('', '')) + return result _columns = { - 'type': fields.selection(_selection_get_type_id, 'Type', size=32, select=True), + 'type': fields.selection(_selection_get_type_id, 'Type', size=32), } def create(self, cr, uid, vals, context=None): + if context is None: + context = {} if vals.get('parent_id',False): directory = self.pool.get('document.directory').read(cr, uid, vals['parent_id'], ['type_default'], context=context) if directory and directory.get('type_default'): @@ -47,3 +51,5 @@ return super(ir_attachment_i, self).create(cr, uid, vals, context=context) ir_attachment_i() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'document_type/view/document_directory_i.xml' --- document_type/view/document_directory_i.xml 2011-01-20 11:27:44 +0000 +++ document_type/view/document_directory_i.xml 2011-04-01 08:32:38 +0000 @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> -<data> - - <record model="ir.ui.view" id="view_document_directory_type_form"> - <field name="name">document.directory.type.form</field> - <field name="model">document.directory</field> - <field name="type">form</field> - <field name="inherit_id" ref="document.view_document_directory_form"/> - <field name="arch" type="xml"> - <field name="ressource_parent_type_id" position="after"> - <field name="type_default"/> - </field> - </field> - </record> - -</data> + <data> + + <record model="ir.ui.view" id="view_document_directory_type_form"> + <field name="name">document.directory.type.form</field> + <field name="model">document.directory</field> + <field name="type">form</field> + <field name="inherit_id" ref="document.view_document_directory_form"/> + <field name="arch" type="xml"> + <field name="ressource_parent_type_id" position="after"> + <field name="type_default"/> + </field> + </field> + </record> + + </data> </openerp> === modified file 'document_type/view/document_type.xml' --- document_type/view/document_type.xml 2011-03-17 11:35:47 +0000 +++ document_type/view/document_type.xml 2011-04-01 08:32:38 +0000 @@ -25,11 +25,24 @@ </field> </record> + <record model="ir.ui.view" id="document_type_search_view"> + <field name="name">document.type.search</field> + <field name="model">document.type</field> + <field name="type">search</field> + <field name="arch" type="xml"> + <search string="Document Type"> + <field name="name"/> + <field name="code"/> + </search> + </field> + </record> + <record model="ir.actions.act_window" id="document_type_action"> <field name="name">Document Type</field> <field name="res_model">document.type</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> + <field name="search_view_id" ref="document_type_search_view"/> </record> <menuitem id="document_type_menu"
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-web Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-web More help : https://help.launchpad.net/ListHelp
