[IMP] error messages during database creation failure, with thanks to Serpent Consulting

[odoo/odoo.git] / addons / product_margin / product_margin.py

diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index fd55337..5895fee 100644 (file)
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -92,41 +92,41 @@ class product_product(osv.osv):
         return res
 
     _columns = {
-        'date_from': fields.function(_product_margin, method=True, type='date', string='From Date', multi='product_margin'),
-        'date_to': fields.function(_product_margin, method=True, type='date', string='To Date', multi='product_margin'),
-        'invoice_state': fields.function(_product_margin, method=True, type='selection', selection=[
+        'date_from': fields.function(_product_margin, type='date', string='From Date', multi='product_margin'),
+        'date_to': fields.function(_product_margin, type='date', string='To Date', multi='product_margin'),
+        'invoice_state': fields.function(_product_margin, type='selection', selection=[
                 ('paid','Paid'),('open_paid','Open and Paid'),('draft_open_paid','Draft, Open and Paid')
             ], string='Invoice State',multi='product_margin', readonly=True),
-        'sale_avg_price' : fields.function(_product_margin, method=True, type='float', string='Avg. Unit Price', multi='product_margin',
+        'sale_avg_price' : fields.function(_product_margin, type='float', string='Avg. Unit Price', multi='product_margin',
             help="Avg. Price in Customer Invoices)"),
-        'purchase_avg_price' : fields.function(_product_margin, method=True, type='float', string='Avg. Unit Price', multi='product_margin',
+        'purchase_avg_price' : fields.function(_product_margin, type='float', string='Avg. Unit Price', multi='product_margin',
             help="Avg. Price in Supplier Invoices "),
-        'sale_num_invoiced' : fields.function(_product_margin, method=True, type='float', string='# Invoiced', multi='product_margin',
+        'sale_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced', multi='product_margin',
             help="Sum of Quantity in Customer Invoices"),
-        'purchase_num_invoiced' : fields.function(_product_margin, method=True, type='float', string='# Invoiced', multi='product_margin',
+        'purchase_num_invoiced' : fields.function(_product_margin, type='float', string='# Invoiced', multi='product_margin',
             help="Sum of Quantity in Supplier Invoices"),
-        'sales_gap' : fields.function(_product_margin, method=True, type='float', string='Sales Gap', multi='product_margin',
+        'sales_gap' : fields.function(_product_margin, type='float', string='Sales Gap', multi='product_margin',
             help="Expected Sale - Turn Over"),
-        'purchase_gap' : fields.function(_product_margin, method=True, type='float', string='Purchase Gap', multi='product_margin',
+        'purchase_gap' : fields.function(_product_margin, type='float', string='Purchase Gap', multi='product_margin',
             help="Normal Cost - Total Cost"),
-        'turnover' : fields.function(_product_margin, method=True, type='float', string='Turnover' ,multi='product_margin',
+        'turnover' : fields.function(_product_margin, type='float', string='Turnover' ,multi='product_margin',
             help="Sum of Multification of Invoice price and quantity of Customer Invoices"),
-        'total_cost'  : fields.function(_product_margin, method=True, type='float', string='Total Cost', multi='product_margin',
+        'total_cost'  : fields.function(_product_margin, type='float', string='Total Cost', multi='product_margin',
             help="Sum of Multification of Invoice price and quantity of Supplier Invoices "),
-        'sale_expected' :  fields.function(_product_margin, method=True, type='float', string='Expected Sale', multi='product_margin',
+        'sale_expected' :  fields.function(_product_margin, type='float', string='Expected Sale', multi='product_margin',
             help="Sum of Multification of Sale Catalog price and quantity of Customer Invoices"),
-        'normal_cost'  : fields.function(_product_margin, method=True, type='float', string='Normal Cost', multi='product_margin',
+        'normal_cost'  : fields.function(_product_margin, type='float', string='Normal Cost', multi='product_margin',
             help="Sum of Multification of Cost price and quantity of Supplier Invoices"),
-        'total_margin' : fields.function(_product_margin, method=True, type='float', string='Total Margin', multi='product_margin',
+        'total_margin' : fields.function(_product_margin, type='float', string='Total Margin', multi='product_margin',
             help="Turnorder - Standard price"),
-        'expected_margin' : fields.function(_product_margin, method=True, type='float', string='Expected Margin', multi='product_margin',
+        'expected_margin' : fields.function(_product_margin, type='float', string='Expected Margin', multi='product_margin',
             help="Expected Sale - Normal Cost"),
-        'total_margin_rate' : fields.function(_product_margin, method=True, type='float', string='Total Margin (%)', multi='product_margin',
+        'total_margin_rate' : fields.function(_product_margin, type='float', string='Total Margin (%)', multi='product_margin',
             help="Total margin * 100 / Turnover"),
-        'expected_margin_rate' : fields.function(_product_margin, method=True, type='float', string='Expected Margin (%)', multi='product_margin',
+        'expected_margin_rate' : fields.function(_product_margin, type='float', string='Expected Margin (%)', multi='product_margin',
             help="Expected margin * 100 / Expected Sale"),
     }
 
 product_product()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: