[IMP]purchase_requisition: change state name and button name
bzr revid: pja@tinyerp.com-20120531095913-rozhb44r5wn2s060
This commit is contained in:
parent
35962e14c7
commit
f2d8b751aa
|
@ -43,7 +43,7 @@ class purchase_requisition(osv.osv):
|
|||
'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
|
||||
'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase',states={'done': [('readonly', True)]}),
|
||||
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
|
||||
'state': fields.selection([('draft','New'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'Status', required=True)
|
||||
'state': fields.selection([('draft','New'),('in_progress','Sent to Suppliers'),('cancel','Cancelled'),('done','Purchase Done')], 'Status', required=True)
|
||||
}
|
||||
_defaults = {
|
||||
'date_start': time.strftime('%Y-%m-%d %H:%M:%S'),
|
||||
|
@ -224,7 +224,7 @@ class product_product(osv.osv):
|
|||
_inherit = 'product.product'
|
||||
|
||||
_columns = {
|
||||
'purchase_requisition': fields.boolean('Purchase Requisition', help="Check this box so that requisitions generates purchase requisitions instead of directly requests for quotations.")
|
||||
'purchase_requisition': fields.boolean('Purchase Requisition', help="Check this box so that procurement generates purchase requisition instead of only generating requests for quotation.")
|
||||
}
|
||||
_defaults = {
|
||||
'purchase_requisition': False
|
||||
|
|
|
@ -34,9 +34,9 @@
|
|||
<field name="arch" type="xml">
|
||||
<form layout="manual">
|
||||
<div class="oe_form_topbar">
|
||||
<button name="tender_in_progress" states="draft" string="Start" type="object" />
|
||||
<button name="tender_in_progress" states="draft" string="Send to Suppliers" type="object" />
|
||||
<button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
|
||||
<button name="tender_done" states="in_progress" string="Done" type="object" />
|
||||
<button name="tender_done" states="in_progress" string=" Purchase Done" type="object" />
|
||||
<button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
|
||||
<div class="oe_right">
|
||||
<field name="state" nolabel="1" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
|
||||
|
@ -70,8 +70,12 @@
|
|||
</form>
|
||||
|
||||
</field>
|
||||
</page>
|
||||
<page string="Quotations">
|
||||
<group col="8" colspan="4">
|
||||
<label colspan="6" string=""/>
|
||||
<button name="%(action_purchase_requisition_partner)d" string="Request a Quotation" type="action" icon="gtk-execute"
|
||||
attrs="{'readonly': [('state', '=', 'done')]}" />
|
||||
</group>
|
||||
<separator colspan="4" string="Quotations"/>
|
||||
<field colspan="4" name="purchase_ids" nolabel="1" mode="tree,form">
|
||||
<tree string="Purchase Order">
|
||||
<field name="name" string="Reference"/>
|
||||
|
@ -87,13 +91,8 @@
|
|||
<button name="purchase_approve" states="confirmed" string="Approved by Supplier" icon="gtk-ok"/>
|
||||
</tree>
|
||||
</field>
|
||||
<separator colspan="4" string=""/>
|
||||
<group col="8" colspan="4">
|
||||
<label colspan="6" string=""/>
|
||||
<button name="%(action_purchase_requisition_partner)d" string="Request a Quotation" type="action" icon="gtk-execute"
|
||||
attrs="{'readonly': [('state', '=', 'done')]}" />
|
||||
</group>
|
||||
</page>
|
||||
</page>
|
||||
|
||||
<page string="Notes">
|
||||
<field name="description" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
|
|
Loading…
Reference in New Issue