SUBSCRIPTION: improve layout and behavior
bzr revid: ced-51cd350d6c2ecbe531fbb0cc04962e86d5818c6e
This commit is contained in:
ced
parent
feddc3e6e7
commit
7b4eca839a
|
|
@ -40,8 +40,7 @@ class subscription_document(osv.osv):
|
|||
_columns = {
|
||||
'name': fields.char('Name', size=60, required=True),
|
||||
'active': fields.boolean('Active'),
|
||||
'model': fields.char('Model', size=40, required=True),
|
||||
'workflow_action': fields.char('Workflow Action', size=40),
|
||||
'model': fields.many2one('ir.model', 'Model', required=True),
|
||||
'field_ids': fields.one2many('subscription.document.fields', 'document_id', 'Fields')
|
||||
}
|
||||
_defaults = {
|
||||
|
|
@ -49,20 +48,20 @@ class subscription_document(osv.osv):
|
|||
}
|
||||
subscription_document()
|
||||
|
||||
class subscription_document_line(osv.osv):
|
||||
class subscription_document_fields(osv.osv):
|
||||
_name = "subscription.document.fields"
|
||||
_description = "Subscription document fields"
|
||||
_rec_name = 'field'
|
||||
_columns = {
|
||||
'name': fields.char('Name', size=60, required=True),
|
||||
'field': fields.char('Field name', size=60),
|
||||
'value': fields.selection([('false','/'),('date','Current Date')], 'Default Value', size=40),
|
||||
'field': fields.many2one('ir.model.fields', 'Field', domain="[('model_id', '=', parent.model)]", required=True),
|
||||
'value': fields.selection([('false','False'),('date','Current Date')], 'Default Value', size=40),
|
||||
'document_id': fields.many2one('subscription.document', 'Subscription Document', ondelete='cascade'),
|
||||
}
|
||||
_defaults = {}
|
||||
subscription_document_line()
|
||||
subscription_document_fields()
|
||||
|
||||
def _get_document_types(self, cr, uid, context={}):
|
||||
cr.execute('select model, name from subscription_document order by name')
|
||||
cr.execute('select m.model, s.name from subscription_document s, ir_model m WHERE s.model = m.id order by s.name')
|
||||
return cr.fetchall()
|
||||
|
||||
class subscription_subscription(osv.osv):
|
||||
|
|
@ -79,7 +78,7 @@ class subscription_subscription(osv.osv):
|
|||
'exec_init': fields.integer('Number of documents'),
|
||||
'date_init': fields.datetime('First Date'),
|
||||
'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State'),
|
||||
'doc_source': fields.char('Source Document', required=True, selection=_get_document_types, size=128),
|
||||
'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128),
|
||||
'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created'),
|
||||
'cron_id': fields.many2one('ir.cron', 'Cron Job')
|
||||
}
|
||||
|
|
@ -116,7 +115,7 @@ class subscription_subscription(osv.osv):
|
|||
|
||||
default = {'state':'draft'}
|
||||
doc_obj = self.pool.get('subscription.document')
|
||||
document_ids = doc_obj.search(cr, uid, [('model','=',model_name)])
|
||||
document_ids = doc_obj.search(cr, uid, [('model.model','=',model_name)])
|
||||
doc = doc_obj.browse(cr, uid, document_ids)[0]
|
||||
for f in doc.field_ids:
|
||||
if f.value=='date':
|
||||
|
|
@ -132,7 +131,7 @@ class subscription_subscription(osv.osv):
|
|||
if remaining == 1:
|
||||
state = 'done'
|
||||
id = self.pool.get(model_name).copy(cr, uid, id, default, context)
|
||||
self.pool.get('subscription.subscription.history').create(cr, uid, {'subscription_id': row['id'], 'name':row['name'], 'date':time.strftime('%Y-%m-%d %H:%M:%S'), 'document_id': model_name+','+str(id)})
|
||||
self.pool.get('subscription.subscription.history').create(cr, uid, {'subscription_id': row['id'], 'date':time.strftime('%Y-%m-%d %H:%M:%S'), 'document_id': model_name+','+str(id)})
|
||||
self.write(cr, uid, [row['id']], {'state':state})
|
||||
return True
|
||||
|
||||
|
|
@ -151,11 +150,11 @@ subscription_subscription()
|
|||
class subscription_subscription_history(osv.osv):
|
||||
_name = "subscription.subscription.history"
|
||||
_description = "Subscription history"
|
||||
_rec_name = 'date'
|
||||
_columns = {
|
||||
'name': fields.char('Name', size=60, required=True),
|
||||
'date': fields.date('Date'),
|
||||
'date': fields.datetime('Date'),
|
||||
'subscription_id': fields.many2one('subscription.subscription', 'Subscription', ondelete='cascade'),
|
||||
'document_id': fields.char('Source Document', required=True, selection=[('account.invoice','Invoice'),('sale.order','Sale Order')], size=128),
|
||||
'document_id': fields.reference('Source Document', required=True, selection=[('account.invoice','Invoice'),('sale.order','Sale Order')], size=128),
|
||||
}
|
||||
subscription_subscription_history()
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<field name="date_init"/>
|
||||
<field name="doc_source" colspan="4" widget="reference"/>
|
||||
<field name="notes" colspan="4"/>
|
||||
<separator string="State" colspan="4"/>
|
||||
<separator colspan="4"/>
|
||||
<field name="cron_id" colspan="4" readonly="1"/>
|
||||
<field name="state" readonly="1"/>
|
||||
<group col="3" colspan="2">
|
||||
|
|
@ -42,11 +42,27 @@
|
|||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="view_subscription_tree">
|
||||
<field name="name">subscription.subscription.tree</field>
|
||||
<field name="model">subscription.subscription</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Subscriptions">
|
||||
<field name="name"/>
|
||||
<field name="active"/>
|
||||
<field name="user_id"/>
|
||||
<field name="partner_id"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_subscription_form">
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">subscription.subscription</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_subscription_form"/>
|
||||
<field name="view_id" ref="view_subscription_tree"/>
|
||||
</record>
|
||||
<menuitem name="Tools/Subscriptions/All Subscriptions" id="menu_action_subscription_form" action="action_subscription_form"/>
|
||||
|
||||
|
|
@ -57,7 +73,6 @@
|
|||
<field name="arch" type="xml">
|
||||
<tree string="Subscription History">
|
||||
<field name="date"/>
|
||||
<field name="name"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -68,10 +83,8 @@
|
|||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Subscription History">
|
||||
<field name="name"/>
|
||||
<field name="date"/>
|
||||
<newline/>
|
||||
<field name="document_id" colspan="4" widget="reference"/>
|
||||
<field name="document_id" colspan="4"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -85,32 +98,53 @@
|
|||
<field name="name" select="1"/>
|
||||
<field name="active" select="1"/>
|
||||
<field name="model" select="1"/>
|
||||
<field name="workflow_action"/>
|
||||
<newline/>
|
||||
<field name="field_ids" colspan="4" widget="one2many_list"/>
|
||||
<field name="field_ids" colspan="4" nolabel="1"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="v2">
|
||||
<record model="ir.ui.view" id="document_tree">
|
||||
<field name="name">subscription.document.tree</field>
|
||||
<field name="model">subscription.document</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Subscription Document">
|
||||
<field name="name"/>
|
||||
<field name="active"/>
|
||||
<field name="model"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="document_fields_form">
|
||||
<field name="name">subscription.document.fields.form</field>
|
||||
<field name="model">subscription.document.fields</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Subscription Document Fields">
|
||||
<field name="name"/>
|
||||
<newline/>
|
||||
<field name="field"/>
|
||||
<field name="field" select="1"/>
|
||||
<field name="value"/>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.ui.view" id="document_fields_tree">
|
||||
<field name="name">subscription.document.fields.tree</field>
|
||||
<field name="model">subscription.document.fields</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Subscription Document Fields">
|
||||
<field name="field"/>
|
||||
<field name="value"/>
|
||||
</tree>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_document_form">
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">subscription.document</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="document_form"/>
|
||||
<field name="view_id" ref="document_tree"/>
|
||||
</record>
|
||||
<menuitem name="Tools/Subscriptions/Configuration/Document Types" id="menu_action_document_form" action="action_document_form"/>
|
||||
</data>
|
||||
|
|
|
|||
Loading…
Reference in New Issue