[MERGE] lp881356

[odoo/odoo.git] / addons / account / product.py

diff --git a/addons/account/product.py b/addons/account/product.py
index 78ad60a..9be49b4 100644 (file)
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -1,27 +1,24 @@
-# -*- encoding: utf-8 -*-
+# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
+#    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import time
-import netsvc
 from osv import fields, osv
 
 class product_category(osv.osv):
@@ -32,50 +29,47 @@ class product_category(osv.osv):
             type='many2one',
             relation='account.account',
             string="Income Account",
-            method=True,
             view_load=True,
-            help="This account will be used, instead of the default one, to value incoming stock for the current product category"),
+            help="This account will be used for invoices to value sales for the current product category"),
         'property_account_expense_categ': fields.property(
             'account.account',
             type='many2one',
             relation='account.account',
             string="Expense Account",
-            method=True,
             view_load=True,
-            help="This account will be used, instead of the default one, to value outgoing stock for the current product category"),
+            help="This account will be used for invoices to value expenses for the current product category"),
     }
 product_category()
 
 #----------------------------------------------------------
 # Products
 #----------------------------------------------------------
+
 class product_template(osv.osv):
     _inherit = "product.template"
     _columns = {
         'taxes_id': fields.many2many('account.tax', 'product_taxes_rel',
             'prod_id', 'tax_id', 'Customer Taxes',
-            domain=[('parent_id','=',False),('type_tax_use','=','sale')]),
+            domain=[('parent_id','=',False),('type_tax_use','in',['sale','all'])]),
         'supplier_taxes_id': fields.many2many('account.tax',
             'product_supplier_taxes_rel', 'prod_id', 'tax_id',
-            'Supplier Taxes', domain=[('parent_id', '=', False),('type_tax_use','=','purchase')]),
+            'Supplier Taxes', domain=[('parent_id', '=', False),('type_tax_use','in',['purchase','all'])]),
         'property_account_income': fields.property(
             'account.account',
             type='many2one',
             relation='account.account',
             string="Income Account",
-            method=True,
             view_load=True,
-            help="This account will be used, instead of the default one, to value incoming stock for the current product"),
+            help="This account will be used for invoices instead of the default one to value sales for the current product"),
         'property_account_expense': fields.property(
             'account.account',
             type='many2one',
             relation='account.account',
             string="Expense Account",
-            method=True,
             view_load=True,
-            help="This account will be used, instead of the default one, to value outgoing stock for the current product"),
+            help="This account will be used for invoices instead of the default one to value expenses for the current product"),
     }
+
 product_template()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-