odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merge with parent brach and resolve the conflicts 

bzr revid: nco@tinyerp.com-20120601061200-hhlld3k829ajbgdh
This commit is contained in:
Nimesh (Open ERP) 2012-06-01 11:42:00 +05:30
parent 5703f9fd8d fb97abf406
commit 17927188c0
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/purchase_requisition/purchase_requisition.py
View File

@ -44,7 +44,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'),
@ -225,7 +225,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

26
addons/purchase_requisition/purchase_requisition_view.xml
View File

@ -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"}'/>
@ -51,7 +51,7 @@
<field name="date_start"/>
<field name="date_end"/>
<field name="origin"/>
<field name="warehouse_id" widget="selection"/>
<field name="warehouse_id" widget="selection" groups="stock.group_locations"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<notebook colspan="4">
@ -60,19 +60,21 @@
<tree string="Products" editable="bottom">
<field name="product_id" on_change="onchange_product_id(product_id,product_uom_id)"/>
<field name="product_qty"/>
<field name="product_uom_id"/>
<field name="product_uom_id" groups="product.group_uom"/>
</tree>
<form string="Products">
<field name="product_id" />
<field name="product_qty"/>
<field name="product_uom_id" />
<field name="product_uom_id" groups="product.group_uom"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</form>
</field>
<button name="%(action_purchase_requisition_partner)d" string="Request a Quotation" type="action" icon="gtk-execute"
attrs="{'invisible': [('state', 'in', ('done','draft','cancel')),('line_ids','=',0)]}" />
</page>
<page string="Quotations">
<group colspan="2">
<label colspan="2" string=""/>
<button name="%(action_purchase_requisition_partner)d" string="Request a Quotation" type="action" icon="gtk-execute"
attrs="{'readonly': [('state', '=', 'done')],'invisible': [('state', 'in', ('done','draft','cancel')),('line_ids','=',0)]}"/>
</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"/>
@ -88,11 +90,7 @@
<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=""/>
</group>
</page>
</page>
<page string="Notes">
<field name="description" colspan="4" nolabel="1"/>
</page>