[FIX]purchase/purchase_requisition: fix button cancel on tender, and RFQ product onchange with error on price
bzr revid: csn@openerp.com-20130613151120-sc14jeawwpettd03
This commit is contained in:
parent
96e676d6d9
commit
27be52fb28
|
@ -1046,6 +1046,7 @@ class purchase_order_line(osv.osv):
|
||||||
# - determine lead time value for product
|
# - determine lead time value for product
|
||||||
product_lead_time = supplierinfo.delay if supplierinfo else 0
|
product_lead_time = supplierinfo.delay if supplierinfo else 0
|
||||||
res['value'].update({'product_lead_time': product_lead_time})
|
res['value'].update({'product_lead_time': product_lead_time})
|
||||||
|
price = price_unit
|
||||||
if state not in ('sent','bid'):
|
if state not in ('sent','bid'):
|
||||||
# - determine price_unit and taxes_id
|
# - determine price_unit and taxes_id
|
||||||
if pricelist_id:
|
if pricelist_id:
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
<button name="tender_reset" states="cancel" string="Reset to Draft" type="object" />
|
<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="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="generate_po" states="open" string="Make Purchase" type="object" class="oe_highlight"/>
|
||||||
<button name="cancel_requisition" states="draft,in_progress" string="Cancel Requisition" type="object" />
|
<button name="cancel_requisition" states="draft,in_progress" string="Cancel Requisition"/>
|
||||||
<field name="state" widget="statusbar" statusbar_visible="draft,in_progress,open,done" statusbar_colors='{"in_progress":"blue"}'/>
|
<field name="state" widget="statusbar" statusbar_visible="draft,in_progress,open,done" statusbar_colors='{"in_progress":"blue"}'/>
|
||||||
</header>
|
</header>
|
||||||
<sheet>
|
<sheet>
|
||||||
|
|
Loading…
Reference in New Issue