pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX]purchase_requisition: TYPO

Browse Source 
bzr revid: csn@openerp.com-20130620132548-o1ykifxvjt1xvmyx
This commit is contained in:
Cedric Snauwaert
2013-06-20 15:25:48 +02:00
parent 02f92dd2b6
commit 1b77b92363
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/purchase_requisition/purchase_requisition.py
+2 -2
View File
@@ -50,7 +50,7 @@ class purchase_requisition(osv.osv):
'date_start': fields.datetime('Date'),
'date_end': fields.datetime('Bid Submission Deadline'),
'user_id': fields.many2one('res.users', 'Responsible'),
'exclusive': fields.selection([('exclusive','Purchase Requisition (exclusive)'),('multiple','Multiple Requisitions')],'Requisition Type', required=True, help="Purchase Requisition (exclusive): On the confirmation of a purchase order, it cancels the remaining purchase order.\nPurchase Requisition(Multiple): It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
'exclusive': fields.selection([('exclusive','Select one entire bid'),('multiple','Select lines from different bids')],'Bid Selection Type', required=True, help="Purchase Requisition (exclusive): On the confirmation of a purchase order, it cancels the remaining purchase order.\nPurchase Requisition(Multiple): It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"""),
'description': fields.text('Description'),
'company_id': fields.many2one('res.company', 'Company', required=True),
'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders',states={'done': [('readonly', True)]}),
@@ -58,7 +58,7 @@ class purchase_requisition(osv.osv):
'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase',states={'done': [('readonly', True)]}),
'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null'),
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
'state': fields.selection([('draft','Draft Tender'),('in_progress','Tender Confirmed'),('open','Close Bids'),('done','PO Created'),('cancel','Cancelled')],
'state': fields.selection([('draft','Draft'),('in_progress','Confirmed'),('open','Bid Selection'),('done','PO Created'),('cancel','Cancelled')],
'Status', track_visibility='onchange', required=True),
'multiple_rfq_per_supplier': fields.boolean('Multiple RFQ per supplier'),
'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account'),
addons/purchase_requisition/purchase_requisition_view.xml
+5 -5
View File
@@ -30,12 +30,12 @@
<field name="arch" type="xml">
<form string="Call for Bids" version="7.0">
<header>
<button name="sent_suppliers" states="draft" string="Confirm Tender" class="oe_highlight"/>
<button name="open_bid" states="in_progress" string="Close Bids" class="oe_highlight"/>
<button name="sent_suppliers" states="draft" string="Confirm Call" class="oe_highlight"/>
<button name="open_bid" states="in_progress" string="Close Call for Bids" class="oe_highlight"/>
<button name="tender_reset" states="cancel" string="Reset to Draft" type="object" />
<button name="open_product_line" states="open" string="Choose product lines" type="object" class="oe_highlight" groups="purchase.group_advance_bidding"/>
<button name="generate_po" states="open" string="Make Purchase" type="object" class="oe_highlight"/>
<button name="cancel_requisition" states="draft,in_progress" string="Cancel Requisition"/>
<button name="cancel_requisition" states="draft,in_progress" string="Cancel Call"/>
<field name="state" widget="statusbar" statusbar_visible="draft,in_progress,open,done" statusbar_colors='{"in_progress":"blue"}'/>
</header>
<sheet>
@@ -92,7 +92,7 @@
<button name="%(action_purchase_requisition_partner)d" type="action"
string="Request a Quotation" icon="gtk-execute"
attrs="{'invisible': ['|', ('line_ids','=',[]),('state', 'in', ('draft' ,'open','done'))]}"/>
<button name="open_rfq" type="object" string="View RFQ" attrs="{'invisible': [('state', 'in', ('draft'))]}"/>
<button name="open_rfq" type="object" string="View RFQs/Bids" attrs="{'invisible': [('state', 'in', ('draft'))]}"/>
</div>
<separator string="Requests for Quotation"/>
<field name="purchase_ids" readonly="1">
@@ -166,7 +166,7 @@
<record model="ir.actions.act_window" id="action_purchase_requisition">
<field name="name">Call for Bids</field>
<field name="name">Calls for Bids</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">purchase.requisition</field>
<field name="view_type">form</field>