diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index f7d73bfb739..4ab6251c7a2 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -35,7 +35,6 @@ class purchase_report(osv.osv):
'name': fields.char('Year',size=64,required=False, readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'state': fields.selection([('draft', 'Request for Quotation'),
- ('wait', 'Waiting'),
('confirmed', 'Waiting Supplier Ack'),
('approved', 'Approved'),
('except_picking', 'Shipping Exception'),
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 4acbfaa49c4..6beac5a4cd0 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -59,21 +59,12 @@ class purchase_config_settings(osv.osv_memory):
help="""Purchase Requisitions are used when you want to request quotations from 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."""),
- 'decimal_precision': fields.integer('specify decimal precision on price',help="As an example, a decimal precision of 2 will allow prices like: 9.99 EUR, whereas a decimal precision of 4 will allow prices like: 0.0231 EUR per unit."),
}
_defaults = {
'default_invoice_method': 'manual',
}
- def get_default_dp(self, cr, uid, fields, context=None):
- dp = self.pool.get('ir.model.data').get_object(cr,uid, 'product','decimal_purchase')
- return {'decimal_precision': dp.digits}
-
- def set_default_dp(self, cr, uid, ids, context=None):
- config = self.browse(cr, uid, ids[0], context)
- dp = self.pool.get('ir.model.data').get_object(cr,uid, 'product','decimal_purchase')
- dp.write({'digits': config.decimal_precision})
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index a490bea557c..23d89f1a7f1 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -32,10 +32,6 @@
-
-
-
-
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 9d9350e3257..cf0294730a7 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -69,7 +69,7 @@ class purchase_requisition(osv.osv):
purchase_order_obj = self.pool.get('purchase.order')
for purchase in self.browse(cr, uid, ids, context=context):
for purchase_id in purchase.purchase_ids:
- if str(purchase_id.state) in('draft','wait'):
+ if str(purchase_id.state) in('draft'):
purchase_order_obj.action_cancel(cr,uid,[purchase_id.id])
self.write(cr, uid, ids, {'state': 'cancel'})
self.cancel_send_note(cr, uid, ids, context=context)
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 8fecc17e62c..9f7ba06db95 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -266,13 +266,13 @@
[[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]]