[FIX]purchase_requisition: various TYPO
bzr revid: csn@openerp.com-20130625141852-95tbxxribzyj4j6f
This commit is contained in:
Cedric Snauwaert
@@ -174,7 +174,7 @@ class purchase_order(osv.osv):
|
||||
help="Reference of the document that generated this purchase order request; a sales order or an internal procurement request."
|
||||
),
|
||||
'partner_ref': fields.char('Supplier Reference', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, size=64,
|
||||
help="Reference of the sales order or quotation sent by your supplier. It's mainly used to do the matching when you receive the products as this reference is usually written on the delivery order sent by your supplier."),
|
||||
help="Reference of the sales order or bid sent by your supplier. It's mainly used to do the matching when you receive the products as this reference is usually written on the delivery order sent by your supplier."),
|
||||
'date_order':fields.date('Order Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, select=True, help="Date on which this document has been created."),
|
||||
'date_approve':fields.date('Date Approved', readonly=1, select=True, help="Date on which purchase order has been approved"),
|
||||
'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]},
|
||||
@@ -188,7 +188,7 @@ class purchase_order(osv.osv):
|
||||
'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')], states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]} ),
|
||||
'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
|
||||
'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", string="Currency",readonly=True, required=True),
|
||||
'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The status of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' status. Then the order has to be confirmed by the user, the status switch to 'Confirmed'. Then the supplier must confirm the order to change the status to 'Approved'. When the purchase order is paid and received, the status becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the status becomes in exception.", select=True),
|
||||
'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The status of the purchase order or the quotation request. A request for quotation is a purchase order in a 'Draft' status. Then the order has to be confirmed by the user, the status switch to 'Confirmed'. Then the supplier must confirm the order to change the status to 'Approved'. When the purchase order is paid and received, the status becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the status becomes in exception.", select=True),
|
||||
'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
|
||||
'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
|
||||
'notes': fields.text('Terms and Conditions'),
|
||||
|
||||
@@ -50,14 +50,14 @@ Example: Product: this product is deprecated, do not purchase more than 5.
|
||||
'module_purchase_double_validation': fields.boolean("Force two levels of approvals",
|
||||
help="""Provide a double validation mechanism for purchases exceeding minimum amount.
|
||||
This installs the module purchase_double_validation."""),
|
||||
'module_purchase_requisition': fields.boolean("Manage purchase requisitions",
|
||||
help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products.
|
||||
'module_purchase_requisition': fields.boolean("Manage calls for bids",
|
||||
help="""Calls for bids are used when you want to generate requests for quotations to several suppliers for a given set of products.
|
||||
You can configure per product if you directly do a Request for Quotation
|
||||
to one supplier or if you want a purchase requisition to negotiate with several suppliers."""),
|
||||
'group_advance_purchase_requisition': fields.boolean("Manage multiple bidding on purchase requisition",
|
||||
to one supplier or if you want a Call for Bids to compare offers from several suppliers."""),
|
||||
'group_advance_purchase_requisition': fields.boolean("Choose from several bids in a call for bids",
|
||||
implied_group='purchase.group_advance_bidding',
|
||||
help="""In the process of a public bidding, You can analyse the bidding lines and choose for each product from
|
||||
where you want to buy it as well as the quantity"""),
|
||||
help="""In the process of a public bidding, you can compare the bid lines and choose for each requested product from which bid you
|
||||
buy which quantity"""),
|
||||
'module_purchase_analytic_plans': fields.boolean('Use multiple analytic accounts on purchase orders',
|
||||
help ="""Allows the user to maintain several analysis plans. These let you split lines on a purchase order between several accounts and analytic plans.
|
||||
This installs the module purchase_analytic_plans."""),
|
||||
|
||||
@@ -45,7 +45,7 @@ class purchase_requisition(osv.osv):
|
||||
return result
|
||||
|
||||
_columns = {
|
||||
'name': fields.char('Requisition Reference', size=32,required=True),
|
||||
'name': fields.char('Call for Bids Reference', size=32,required=True),
|
||||
'origin': fields.char('Source Document', size=32),
|
||||
'date_start': fields.datetime('Date'),
|
||||
'date_end': fields.datetime('Bid Submission Deadline'),
|
||||
@@ -163,7 +163,7 @@ class purchase_requisition(osv.osv):
|
||||
|
||||
|
||||
def open_rfq(self, cr, uid, ids, context=None):
|
||||
""" This opens rfq view to view all quotations associated to the tender
|
||||
""" This opens rfq view to view all quotations associated to the call for bids
|
||||
@return: the RFQ tree view
|
||||
"""
|
||||
if context is None:
|
||||
@@ -339,7 +339,7 @@ class purchase_requisition(osv.osv):
|
||||
for quotation in tender.purchase_ids:
|
||||
if quotation.state in ['draft', 'sent', 'bid']:
|
||||
wf_service.trg_validate(uid, 'purchase.order', quotation.id, 'purchase_cancel', cr)
|
||||
po.message_post(cr, uid, [quotation.id], body=_('Cancelled by the tender associated to this quotation.'), context=context)
|
||||
po.message_post(cr, uid, [quotation.id], body=_('Cancelled by the call for bids associated to this request for quotation.'), context=context)
|
||||
return True
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<report auto="False" id="report_purchase_requisition" model="purchase.requisition" name="purchase.requisition" rml="purchase_requisition/report/purchase_requisition.rml" string="Request for Tender"/>
|
||||
<report auto="False" id="report_purchase_requisition" model="purchase.requisition" name="purchase.requisition" rml="purchase_requisition/report/purchase_requisition.rml" string="Call for Bids"/>
|
||||
</data>
|
||||
</openerp>
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
<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">
|
||||
<field name="purchase_ids">
|
||||
<tree string="Purchase Order">
|
||||
<field name="name" string="Reference"/>
|
||||
<field name="date_order" string="Order Date"/>
|
||||
@@ -177,11 +177,11 @@
|
||||
<p class="oe_view_nocontent_create">
|
||||
Click to start a new Call for Bids process.
|
||||
</p><p>
|
||||
A Call for Bids is the step before a request for quotation.
|
||||
In a purchase requisition (or purchase tender), you can record the
|
||||
products you need to buy and trigger the creation of RfQs to
|
||||
suppliers. After the negotiation, once you have reviewed all the
|
||||
supplier's offers, you can validate some and cancel others.
|
||||
A Call for Bids is a procedure for generating competing offers from
|
||||
different bidders. In the call for bids, you can record the
|
||||
products you need to buy and generate the creation of RfQs to
|
||||
suppliers. Once the bids have been registered, you can review and
|
||||
compare them and you can validate some and cancel others.
|
||||
</p>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -173,7 +173,7 @@
|
||||
<para style="terp_default_8">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<para style="terp_tblheader_Details">Product Detail [[ requisition.line_ids==[] and removeParentNode('para') ]]</para>
|
||||
<para style="terp_tblheader_Details">Products [[ requisition.line_ids==[] and removeParentNode('para') ]]</para>
|
||||
<blockTable colWidths="275.0,71.0,84.0,100.0" style="Table4">
|
||||
<tr>
|
||||
<td>
|
||||
@@ -186,7 +186,7 @@
|
||||
<para style="terp_tblheader_Details_Centre">Product UoM</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="terp_tblheader_Details_Centre">Schedule Date</para>
|
||||
<para style="terp_tblheader_Details_Centre">Scheduled Date</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
@@ -212,7 +212,7 @@
|
||||
<para style="terp_default_8">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<para style="terp_tblheader_Details">Request for Quotation [[ requisition.purchase_ids ==[] and removeParentNode('para') ]]</para>
|
||||
<para style="terp_tblheader_Details">Requests for Quotation [[ requisition.purchase_ids ==[] and removeParentNode('para') ]]</para>
|
||||
<blockTable colWidths="337.0,96.0,97.0" style="Table6">
|
||||
<tr>
|
||||
<td>
|
||||
@@ -244,4 +244,4 @@
|
||||
</section>
|
||||
</pto>
|
||||
</story>
|
||||
</document>
|
||||
</document>
|
||||
|
||||
@@ -38,7 +38,7 @@ class purchase_requisition_partner(osv.osv_memory):
|
||||
record_id = context and context.get('active_id', False) or False
|
||||
tender = self.pool.get('purchase.requisition').browse(cr, uid, record_id, context=context)
|
||||
if not tender.line_ids:
|
||||
raise osv.except_osv(_('Error!'), _('No Product in Tender.'))
|
||||
raise osv.except_osv(_('Error!'), _('No product in call for bids.'))
|
||||
return res
|
||||
|
||||
def create_order(self, cr, uid, ids, context=None):
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
<data>
|
||||
|
||||
<record id="view_purchase_requisition_partner" model="ir.ui.view">
|
||||
<field name="name">Request for Tender</field>
|
||||
<field name="name">Choose Supplier</field>
|
||||
<field name="model">purchase.requisition.partner</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Purchase Requisition" version="7.0">
|
||||
<form string="Choose Supplier" version="7.0">
|
||||
<group>
|
||||
<field name="partner_id" context="{'default_supplier': 1, 'default_customer': 0}"/>
|
||||
</group>
|
||||
@@ -19,7 +19,7 @@
|
||||
</record>
|
||||
|
||||
<record id="action_purchase_requisition_partner" model="ir.actions.act_window">
|
||||
<field name="name">Request for Tender</field>
|
||||
<field name="name">Choose Supplier</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">purchase.requisition.partner</field>
|
||||
<field name="view_type">form</field>
|
||||
|
||||
Reference in New Issue
Block a user