Merge lp:~jgrandguillaume-c2c/openobject-addons/multi-company-cost-price into lp:openobject-addons

[Joël Grand-Guillaume @ camptocamp]

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi !

This is the merge proposal from Camptocamp to improve multi-company into OpenERP regarding to product costs in manufacturing industry and in services company.

What has been done here:

 * Add price type on company as a property (with default value based on standard price)

 * Stock accounting
  * Use the price type currency and field for cost valuation
  * Into stock move for standard price
  * Into stock move for average price

 * Analytic accounting
  * Use the price type currency and field for cost valuation (including timesheet)
  * Add multi-currency on analytic lines (similar to financial accounting)
  * Allow to share the same product between company employees, with different cost for each one
  * Correct all "costs" indicators into analytic account to base them on the right currency (owner's company)

 * By default, nothing change for single company implementation (base the cost valuation on standard price)

As a result, we can now really share the same product between companies that doesn't have the same currency and/or same cost price.
We can also manage one field per company on the product form to store the cost for a given price type (and so for a given company).

Refer to the blueprint for more details:

https://blueprints.launchpad.net/openobject-addons/+spec/multi-cost-price-and-product-currency

Thanks in advance for your review.

Regards,

Joël

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Hello, one thing that I can't understand is why you add a field in product and views called "standard_price_usd" by default?
Is that a typo?
If not, I think we shouldn't favor some country price by default, especially if there is just one like that. I agree that often you would need such field, but then I think you should rather add it at integration time, else is seems to me a bit arbitrary.
If that's a typo, please make sure you don't have such typo in your merge proposal.

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

review: Needs Fixing

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi !

I agree with you Raphaël. I understood that the multi_company module is only an example of multi-company config... So I add an example here to allow people understand how it should work.

Otherwise, the rest is clean. If you think I'm wrong with that, I'll remove it from multi_company module and suggest the merge again.

Personally, I think it's good to have an example, but it's ok for me to remove it.

Let me know,

Regards,

Joël

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi !

This is the merge proposal from Camptocamp to improve multi-company into OpenERP regarding to product costs in manufacturing industry and in services company.

What has been done here:

 * Add price type on company as a property (with default value based on standard price)

 * Stock accounting
  * Use the price type currency and field for cost valuation
  * Into stock move for standard price
  * Into stock move for average price

 * Analytic accounting
  * Use the price type currency and field for cost valuation (including timesheet)
  * Add multi-currency on analytic lines (similar to financial accounting)
  * Allow to share the same product between company employees, with different cost for each one
  * Correct all "costs" indicators into analytic account to base them on the right currency (owner's company)

 * By default, nothing change for single company implementation (base the cost valuation on standard price)

 * Factorise part of function field into analytic accounting

As a result, we can now really share the same product between companies that doesn't have the same currency and/or same cost price.
We can also manage one field per company on the product form to store the cost for a given price type (and so for a given company).

Refer to the blueprint for more details:

https://blueprints.launchpad.net/openobject-addons/+spec/multi-cost-price-and-product-currency

Thanks in advance for your review.

Regards,

Joël

P.S. The field standard_price_usd is an example, committed into an sample module to show how to configure this use case... It's not a typo errors...

[Fabien (Open ERP) (fp-tinyerp)]

It covers interesting needs but can not be merged as it. Lot's of things have to be rewritten to be more generic.

review: Disapprove

[Fabien (Open ERP) (fp-tinyerp)]

For example, this is not acceptable in the official, generic, version:

888 +class product_product(osv.osv):
889 + _inherit = "product.product"
891 + _columns = {
892 + 'standard_price_usd': fields.float('Cost Price USD', required=True, digits=(16, int(config['price_accuracy'])),
893 + help="Product's cost in USDfor accounting stock valuation."),
894 + }
896 +product_product()

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi,

First, thanks for reviewing :)

Please, Raphaal already told me this the first time, but this module is (in my own understanding) a demo on how to setup multi-company !

That's why I write it the "standard_price_usd" in the code, to illustrate how we can handle this problematic !! I put it in the multi_company module as Syleam and you did to put some demo data for multi company, I followed you !!!

Please, have a look closer, I'm ready to invest more time on that. It's a need my customer strongly want. We need a solution.

Could we discuss the features in their-self ? Not the demo stuff, I remove them in the minute if you want !

Let me know your advices, and I will correct what's need to be done. This way everyone win : My customer, me and OpenERP !

Thanks,

Kind regards,

Joël

[Stephane Wirtel (OpenERP) (stephane-openerp)]

Can you remove this point from your code and add a new comment with your example in this bug report.

Thanks

[lp:~jgrandguillaume-c2c/openobject-addons/multi-company-cost-price]

2551. By Joël Grand-Guillaume @ camptocamp on 2010-02-11

[DEL] Remove the demo data in multi-company module as asked by Fabien

2552. By Joël Grand-Guillaume @ camptocamp on 2010-02-11

[DEL] Remove the multi-company view from multi-company

2553. By Joël Grand-Guillaume @ camptocamp on 2010-02-11

[MRG] Merge the last trunk in order to ease the merge from Tiny

2554. By Joël Grand-Guillaume @ camptocamp on 2010-02-11

[REF] Refactoring : moving the project.py from account to analytic module as it was done by Tiny

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi,

Well it's done ! I just remove every example fields from demo data in multicompany module. I also merge the last trunk of the day for you, so it's easier for you to apply it.

If you don't agree with one of my new features, let me know. I really invest lots of time to design those new features with my customer. I'm expecting you to consider it seriouly : if you think to refuse it again, let me know how I could help to integrate it in the core.

I mean, this is my goal, I don't want a half solution. I want this in the core of OpenERP, whatever I have to change, as long as the needed feature are implemented.

Thanks for your time and consideration,

Joël

review: Needs Resubmitting

[Fabien (Open ERP) (fp-tinyerp)]

I checked the logic and it seems good. If someone can check the code and if it's right, you can merge.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Fabien considers the business logic good so I have no issue with that, but on the style/tech front I have a few from a quick overview of the branch:

Inconsistency
=============

stock/wizard/wizard_partial_move.py and stock/wizard/wizard_partial_picking.py seem to have been modified in similar but not identical ways: in both cases `amount_unit` is computed through `product.price_get(pricetype.field, context)[product.id]` but while the latter uses `amount_unit` on the next line, the former uses `product.amount_unit` and never calls `amount_unit`. This might be a bug in either of them.

(I also note a high level of redundancy between these wizards (at least on this specific method), they might benefit from from de-duplication in the future, to avoid that kind of potential issues)

Commented code
==============

In a few places, you commented existing code or committed commented code. Please remove these instances, removed code can be found via the VCS's history, and I don't quite see the justification for added already commented code (if it's work in progress its place is in a non-merged branch, if it's something to add/complete, it should be in a bug on the tracker):

* hr_timesheet_invoice/hr_timesheet_invoice.py at revid:<email address hidden> (commented existing code)
* account_analytic_analysis/account_analytic_analysis.py at revid:<email address hidden> (added a commented method)

Style
=====

At revid:<email address hidden>, in account_analytic_analysis/account_analytic_analysis.py you perform a test using dict.has_key. In this case, please either use `'key' in dict` (`has_key` is deprecated using Python2.6 -3, and doesn't exist anymore in Python 3). Furthermore this specific instance would probably be simpler by using `dict.setdefault` or a `collections.defaultdict` instance.

As a side note, in a few places you edited code using old-style difference operators (<>). If you can (not in this branch, but in the future) don't hesitate swapping them for "modern" difference operators (!=).

review: Needs Fixing

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi,

Thanks for those constructive comments !! I'll make those changes ASAP.

Little remark : those wizard are really fat, and I know that.. But I can't refactor everything at once right :) ?

I really appreciate you consider my work. I'll remember it !

Have a nice week-end,

Regards,

[Xavier (Open ERP) (xmo-deactivatedaccount)]

> Little remark : those wizard are really fat, and I know that.. But I can't refactor everything at once right :) ?

Yeah, it was more of a tentative note for me (or anybody who reads this thing)

> I really appreciate you consider my work. I'll remember it !

Pleasure.

[lp:~jgrandguillaume-c2c/openobject-addons/multi-company-cost-price]

2555. By Joël Grand-Guillaume @ camptocamp on 2010-02-15

[FIX] According to Xavier (OpenERP) to fit OpenERP requierements : remove commented code, use != instead of <>, fix picking wizard.

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi Xavier,

I change everything according to your comments. I hope this is fine for you now.

Summary:

- Change the stocks wizards (both with amount_unit)
- Remove commented code (hope I don't miss some...)
- Change <> for !=

Note, I don't find the ".has_key" you talked about. So, in case of trouble with this, feel free to rewrite that point for the merge.

Thanks in advance for merging this !

Regards,

Joël

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Merged, the _check_currency validator threw some error when trying to install all the demo data, but if there's a bug in that it'll probably be sniffed out during usage.

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi,

Thanks a lot for that !

Best regards,

Joël

=== modified file 'account/account_analytic_line.py'
--- account/account_analytic_line.py	2010-01-12 09:18:39 +0000
+++ account/account_analytic_line.py	2010-02-15 10:42:23 +0000
@@ -25,10 +25,46 @@
 from osv import osv
 from tools.translate import _
 import tools
+from tools import config
 
 class account_analytic_line(osv.osv):
     _name = 'account.analytic.line'
     _description = 'Analytic lines'
+    
+    def _amount_currency(self, cr, uid, ids, field_name, arg, context={}):
+        result = {}
+        for rec in self.browse(cr, uid, ids, context):
+            cmp_cur_id=rec.company_id.currency_id.id
+            aa_cur_id=rec.account_id.currency_id.id
+            # Always provide the amount in currency
+            if cmp_cur_id != aa_cur_id:
+                cur_obj = self.pool.get('res.currency')
+                ctx = {}
+                if rec.date and rec.amount:
+                    ctx['date'] = rec.date
+                    result[rec.id] = cur_obj.compute(cr, uid, rec.company_id.currency_id.id,
+                        rec.account_id.currency_id.id, rec.amount,
+                        context=ctx)
+            else:
+                result[rec.id]=rec.amount
+        return result
+        
+    def _get_account_currency(self, cr, uid, ids, field_name, arg, context={}):
+        result = {}
+        for rec in self.browse(cr, uid, ids, context):
+            # Always provide second currency
+            result[rec.id] = (rec.account_id.currency_id.id,rec.account_id.currency_id.code)
+        return result
+    
+    def _get_account_line(self, cr, uid, ids, context={}):
+        aac_ids = {}
+        for acc in self.pool.get('account.analytic.account').browse(cr, uid, ids):
+            aac_ids[acc.id] = True
+        aal_ids = []
+        if aac_ids:
+            aal_ids = self.pool.get('account.analytic.line').search(cr, uid, [('account_id','in',aac_ids.keys())], context=context)
+        return aal_ids
+
     _columns = {
         'name' : fields.char('Description', size=256, required=True),
         'date' : fields.date('Date', required=True),
@@ -42,14 +78,27 @@
         'journal_id' : fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='cascade', select=True),
         'code' : fields.char('Code', size=8),
         'user_id' : fields.many2one('res.users', 'User',),
+        'currency_id': fields.function(_get_account_currency, method=True, type='many2one', relation='res.currency', string='Account currency',
+                store={
+                    'account.analytic.account': (_get_account_line, ['company_id'], 50),
+                    'account.analytic.line': (lambda self,cr,uid,ids,c={}: ids, ['amount','unit_amount'],10),
+                },
+                help="The related account currency if not equal to the company one."),
+        'company_id': fields.many2one('res.company','Company',required=True),
+        'amount_currency': fields.function(_amount_currency, method=True, digits=(16, int(config['price_accuracy'])), string='Amount currency',
+                store={
+                    'account.analytic.account': (_get_account_line, ['company_id'], 50),
+                    'account.analytic.line': (lambda self,cr,uid,ids,c={}: ids, ['amount','unit_amount'],10),
+                },
+                help="The amount expressed in the related account currency if not equal to the company one."),
         'ref': fields.char('Reference', size=32),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', c),
     }
     _order = 'date'
     
-    
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         if context is None:
             context = {}
@@ -73,11 +122,15 @@
 #        (_check_company, 'You can not create analytic line that is not in the same company than the account line', ['account_id'])
     ]
     
-    def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount,
+    # Compute the cost based on the price type define into company
+    # property_valuation_price_type property
+    def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount,company_id,
             unit=False, context=None):
+        if context==None:
+            context={}
         uom_obj = self.pool.get('product.uom')
         product_obj = self.pool.get('product.product')
-#        if unit_amount and prod_id:
+        company_obj=self.pool.get('res.company')
         if  prod_id:
             prod = product_obj.browse(cr, uid, prod_id)
             a = prod.product_tmpl_id.property_account_expense.id
@@ -88,8 +141,14 @@
                         _('There is no expense account defined ' \
                                 'for this product: "%s" (id:%d)') % \
                                 (prod.name, prod.id,))
-            amount = unit_amount * uom_obj._compute_price(cr, uid,
-                    prod.uom_id.id, prod.standard_price, unit)
+            if not company_id:
+                company_id=company_obj._company_default_get(cr, uid, 'account.analytic.line', context)
+      
+            # Compute based on pricetype
+            pricetype=self.pool.get('product.price.type').browse(cr,uid,company_obj.browse(cr,uid,company_id).property_valuation_price_type.id)
+            amount_unit=prod.price_get(pricetype.field, context)[prod.id]
+
+            amount=amount_unit*unit_amount or 1.0
             return {'value': {
                 'amount': - round(amount, 2),
                 'general_account_id': a,
 
=== modified file 'account/project/project.py'
--- account/project/project.py	2010-02-05 15:09:27 +0000
+++ account/project/project.py	2010-02-15 10:42:23 +0000
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#
+#    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    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/>.
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
 
@@ -25,10 +25,6 @@
 from osv import fields
 from osv import osv
 
-#
-# Object definition
-#
-
 class account_analytic_journal(osv.osv):
     _name = 'account.analytic.journal'
     _columns = {
 
=== modified file 'account/project/project_view.xml'
--- account/project/project_view.xml	2010-01-19 07:35:47 +0000
+++ account/project/project_view.xml	2010-02-15 10:42:23 +0000
@@ -69,6 +69,7 @@
                         <field name="parent_id" on_change="on_change_parent(parent_id)"/>
                         <field name="company_id" select="2" widget="selection"/>
                         <field name="type" select="2"/>
+                        <field name="company_currency_id" select="2"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Account Data">
@@ -147,6 +148,9 @@
                     <field name="move_id" select="2"/>
                     <field name="unit_amount" select="2"/>
                     <field name="ref" select="2"/>
+                    <field name="currency_id" select="2"/>
+                    <field name="amount_currency" select="2"/>
+                    <field name="company_id" select="2"/>
                     <newline/>
                     <field name="product_id" select="2"/>
                     <field name="product_uom_id" select="2"/>
@@ -159,16 +163,19 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree editable="top" string="Analytic Entries">
-                    <field name="date"/>
+                    <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                     <field name="name"/>
-                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" sum="Total quantity"/>
-                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" sum="Total quantity"/>
+                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                     <field domain="[('type','=','normal')]" name="account_id"/>
-                    <field invisible="True" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                    <field invisible="True" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                     <field name="amount" sum="Total amount"/>
                     <field name="general_account_id"/>
                     <field name="journal_id"/>
                     <field name="ref"/>
+                    <field name="currency_id" />
+                    <field name="amount_currency" />
+                    <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                 </tree>
             </field>
         </record>
@@ -225,13 +232,16 @@
                 <form string="Project line">
                     <field name="name"/>
                     <field name="account_id"/>
-                    <field name="date"/>
+                    <field name="date" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                     <field name="journal_id"/>
-                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
-                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
-                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
+                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                     <field invisible="True" name="general_account_id"/>
                     <field name="amount"/>
+                    <field name="currency_id" />
+                    <field name="amount_currency" />
+                    <field name="company_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)"/>
                 </form>
             </field>
         </record>
 
=== modified file 'account_analytic_analysis/account_analytic_analysis.py'
--- account_analytic_analysis/account_analytic_analysis.py	2010-02-01 08:29:39 +0000
+++ account_analytic_analysis/account_analytic_analysis.py	2010-02-15 10:42:23 +0000
@@ -34,7 +34,8 @@
         res = {}
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         if ids2:
-            cr.execute("select account_analytic_line.account_id, COALESCE(sum(amount),0.0) \
+            acc_set = ",".join(map(str, ids2))
+            cr.execute("select account_analytic_line.account_id, COALESCE(sum(amount_currency),0.0) \
                     from account_analytic_line \
                     join account_analytic_journal \
                         on account_analytic_line.journal_id = account_analytic_journal.id  \
@@ -43,15 +44,8 @@
                     group by account_analytic_line.account_id" ,(ids2,))
             for account_id, sum in cr.fetchall():
                 res[account_id] = round(sum,2)
-        for obj_id in ids:
-            res.setdefault(obj_id, 0.0)
-            for child_id in self.search(cr, uid,
-                    [('parent_id', 'child_of', [obj_id])]):
-                if child_id != obj_id:
-                    res[obj_id] += res.get(child_id, 0.0)
-        for id in ids:
-            res[id] = round(res.get(id, 0.0),2)
-        return res
+                
+        return self._compute_currency_for_level_tree(cr, uid, ids, ids2, res, acc_set, context)
 
     def _ca_to_invoice_calc(self, cr, uid, ids, name, arg, context={}):
         res = {}
@@ -59,6 +53,10 @@
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         if ids2:
             # Amount uninvoiced hours to invoice at sale price
+            # Warnning
+            # This computation doesn't take care of pricelist !
+            # Just consider list_price
+            acc_set = ",".join(map(str, ids2))
             cr.execute("""SELECT account_analytic_account.id, \
                         COALESCE(sum (product_template.list_price * \
                             account_analytic_line.unit_amount * \
@@ -83,17 +81,6 @@
             for account_id, sum in cr.fetchall():
                 res[account_id] = round(sum,2)
 
-            # Expense amount and purchase invoice
-            #acc_set = ",".join(map(str, ids2))
-            #cr.execute ("select account_analytic_line.account_id, sum(amount) \
-            #        from account_analytic_line \
-            #        join account_analytic_journal \
-            #            on account_analytic_line.journal_id = account_analytic_journal.id \
-            #        where account_analytic_line.account_id IN (%s) \
-            #            and account_analytic_journal.type = 'purchase' \
-            #        GROUP BY account_analytic_line.account_id;"%acc_set)
-            #for account_id, sum in cr.fetchall():
-            #    res2[account_id] = round(sum,2)
         for obj_id in ids:
             res.setdefault(obj_id, 0.0)
             res2.setdefault(obj_id, 0.0)
@@ -160,7 +147,9 @@
         res = {}
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         if ids2:
-            cr.execute("""select account_analytic_line.account_id,COALESCE(sum(amount),0.0) \
+            acc_set = ",".join(map(str, ids2))
+            cr.execute("""select account_analytic_line.account_id,COALESCE(sum(amount_currency),0.0) \
+
                     from account_analytic_line \
                     join account_analytic_journal \
                         on account_analytic_line.journal_id = account_analytic_journal.id \
@@ -169,20 +158,16 @@
                     GROUP BY account_analytic_line.account_id""",(ids2,))
             for account_id, sum in cr.fetchall():
                 res[account_id] = round(sum,2)
-        for obj_id in ids:
-            res.setdefault(obj_id, 0.0)
-            for child_id in self.search(cr, uid,
-                    [('parent_id', 'child_of', [obj_id])]):
-                if child_id != obj_id:
-                    res[obj_id] += res.get(child_id, 0.0)
-        for id in ids:
-            res[id] = round(res.get(id, 0.0),2)
-        return res
-
+        return self._compute_currency_for_level_tree(cr, uid, ids, ids2, res, acc_set, context)
+ 
+    # TODO Take care of pricelist and purchase !
     def _ca_theorical_calc(self, cr, uid, ids, name, arg, context={}):
         res = {}
         res2 = {}
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
+        # Warnning
+        # This computation doesn't take care of pricelist !
+        # Just consider list_price
         if ids2:
             cr.execute("""select account_analytic_line.account_id as account_id, \
                         COALESCE(sum((account_analytic_line.unit_amount * pt.list_price) \
@@ -205,7 +190,7 @@
                 GROUP BY account_analytic_line.account_id""",(ids2,))
             for account_id, sum in cr.fetchall():
                 res2[account_id] = round(sum,2)
-
+                
         for obj_id in ids:
             res.setdefault(obj_id, 0.0)
             res2.setdefault(obj_id, 0.0)
@@ -214,7 +199,7 @@
                 if child_id != obj_id:
                     res[obj_id] += res.get(child_id, 0.0)
                     res[obj_id] += res2.get(child_id, 0.0)
-
+        
         # sum both result on account_id
         for id in ids:
             res[id] = round(res.get(id, 0.0),2) + round(res2.get(id, 0.0),2)
@@ -289,7 +274,7 @@
     def _remaining_hours_calc(self, cr, uid, ids, name, arg, context={}):
         res = {}
         for account in self.browse(cr, uid, ids):
-            if account.quantity_max <> 0:
+            if account.quantity_max != 0:
                 res[account.id] = account.quantity_max - account.hours_quantity
             else:
                 res[account.id]=0.0
@@ -323,7 +308,7 @@
         for account in self.browse(cr, uid, ids):
             if account.ca_invoiced == 0:
                 res[account.id]=0.0
-            elif account.total_cost <> 0.0:
+            elif account.total_cost != 0.0:
                 res[account.id] = -(account.real_margin / account.total_cost) * 100
             else:
                 res[account.id] = 0.0
@@ -334,7 +319,7 @@
     def _remaining_ca_calc(self, cr, uid, ids, name, arg, context={}):
         res = {}
         for account in self.browse(cr, uid, ids):
-            if account.amount_max <> 0:
+            if account.amount_max != 0:
                 res[account.id] = account.amount_max - account.ca_invoiced
             else:
                 res[account.id]=0.0
 
=== modified file 'analytic/project.py'
--- analytic/project.py	2010-02-05 15:09:27 +0000
+++ analytic/project.py	2010-02-15 10:42:24 +0000
@@ -33,65 +33,19 @@
     _name = 'account.analytic.account'
     _description = 'Analytic Accounts'
 
-    def _credit_calc(self, cr, uid, ids, name, arg, context={}):
-
-        where_date = ''
-        if context.get('from_date',False):
-            where_date += " AND l.date >= '" + context['from_date'] + "'"
-        if context.get('to_date',False):
-            where_date += " AND l.date <= '" + context['to_date'] + "'"
-
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount<0 and a.id =ANY(%s) GROUP BY a.id",(ids,))
-        r = dict(cr.fetchall())
-        for i in ids:
-            r.setdefault(i,0.0)
-        return r
-
-    def _debit_calc(self, cr, uid, ids, name, arg, context={}):
-
-        where_date = ''
-        if context.get('from_date',False):
-            where_date += " AND l.date >= '" + context['from_date'] + "'"
-        if context.get('to_date',False):
-            where_date += " AND l.date <= '" + context['to_date'] + "'"
-
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount>0 and a.id =ANY(%s) GROUP BY a.id" ,(ids,))
-        r= dict(cr.fetchall())
-        for i in ids:
-            r.setdefault(i,0.0)
-        return r
-
-    def _balance_calc(self, cr, uid, ids, name, arg, context={}):
-        res = {}
-        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
-        for i in ids:
-            res.setdefault(i,0.0)
-        if not ids2:
-            return res
-
-        where_date = ''
-        if context.get('from_date',False):
-            where_date += " AND l.date >= '" + context['from_date'] + "'"
-        if context.get('to_date',False):
-            where_date += " AND l.date <= '" + context['to_date'] + "'"
-
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE a.id =ANY(%s) GROUP BY a.id",(ids2,))
-
-        for account_id, sum in cr.fetchall():
-            res[account_id] = sum
-
-        cr.execute("SELECT a.id, r.currency_id FROM account_analytic_account a INNER JOIN res_company r ON (a.company_id = r.id) where a.id =ANY(%s)",(ids2,))
-
+    def _compute_currency_for_level_tree(self, cr, uid, ids, ids2, res, acc_set, context={}):
+        # Handle multi-currency on each level of analytic account
+        # This is a refactoring of _balance_calc computation
+        cr.execute("SELECT a.id, r.currency_id FROM account_analytic_account a INNER JOIN res_company r ON (a.company_id = r.id) where a.id in (%s)" % acc_set)
         currency= dict(cr.fetchall())
-
         res_currency= self.pool.get('res.currency')
         for id in ids:
             if id not in ids2:
                 continue
             for child in self.search(cr, uid, [('parent_id', 'child_of', [id])]):
-                if child <> id:
+                if child != id:
                     res.setdefault(id, 0.0)
-                    if  currency[child]<>currency[id]:
+                    if  currency[child]!=currency[id]:
                         res[id] += res_currency.compute(cr, uid, currency[child], currency[id], res.get(child, 0.0), context=context)
                     else:
                         res[id] += res.get(child, 0.0)
@@ -104,24 +58,88 @@
 
         return dict([(i, res[i]) for i in ids ])
 
+
+    def _credit_calc(self, cr, uid, ids, name, arg, context={}):
+        res = {}
+        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
+        acc_set = ",".join(map(str, ids2))
+        
+        for i in ids:
+            res.setdefault(i,0.0)
+            
+        if not ids2:
+            return res
+            
+        where_date = ''
+        if context.get('from_date',False):
+            where_date += " AND l.date >= '" + context['from_date'] + "'"
+        if context.get('to_date',False):
+            where_date += " AND l.date <= '" + context['to_date'] + "'"
+        cr.execute("SELECT a.id, COALESCE(SUM(l.amount_currency),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount_currency<0 and a.id =ANY(%s) GROUP BY a.id",(ids2,))
+        r = dict(cr.fetchall())
+        return self._compute_currency_for_level_tree(cr, uid, ids, ids2, r, acc_set, context)
+        
+    def _debit_calc(self, cr, uid, ids, name, arg, context={}):
+        res = {}
+        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
+        acc_set = ",".join(map(str, ids2))
+        
+        for i in ids:
+            res.setdefault(i,0.0)
+            
+        if not ids2:
+            return res
+        
+        where_date = ''
+        if context.get('from_date',False):
+            where_date += " AND l.date >= '" + context['from_date'] + "'"
+        if context.get('to_date',False):
+            where_date += " AND l.date <= '" + context['to_date'] + "'"
+        cr.execute("SELECT a.id, COALESCE(SUM(l.amount_currency),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE l.amount_currency>0 and a.id =ANY(%s) GROUP BY a.id" ,(ids2,))
+        r= dict(cr.fetchall())
+        return self._compute_currency_for_level_tree(cr, uid, ids, ids2, r, acc_set, context)
+        
+    def _balance_calc(self, cr, uid, ids, name, arg, context={}):
+        res = {}
+        ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
+        acc_set = ",".join(map(str, ids2))
+        
+        for i in ids:
+            res.setdefault(i,0.0)
+            
+        if not ids2:
+            return res
+        
+        where_date = ''
+        if context.get('from_date',False):
+            where_date += " AND l.date >= '" + context['from_date'] + "'"
+        if context.get('to_date',False):
+            where_date += " AND l.date <= '" + context['to_date'] + "'"
+		cr.execute("SELECT a.id, COALESCE(SUM(l.amount_currency),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id "+where_date+") WHERE a.id =ANY(%s) GROUP BY a.id",(ids2,))
+        
+        for account_id, sum in cr.fetchall():
+            res[account_id] = sum
+
+        return self._compute_currency_for_level_tree(cr, uid, ids, ids2, res, acc_set, context)
+                
     def _quantity_calc(self, cr, uid, ids, name, arg, context={}):
         #XXX must convert into one uom
         res = {}
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         acc_set = ",".join(map(str, ids2))
-
+        
         for i in ids:
             res.setdefault(i,0.0)
-
-        if not acc_set:
+            
+        if not ids2:
             return res
-
+        
         where_date = ''
         if context.get('from_date',False):
             where_date += " AND l.date >= '" + context['from_date'] + "'"
         if context.get('to_date',False):
             where_date += " AND l.date <= '" + context['to_date'] + "'"
-
+            
         cr.execute('SELECT a.id, COALESCE(SUM(l.unit_amount), 0) \
                 FROM account_analytic_account a \
                     LEFT JOIN account_analytic_line l ON (a.id = l.account_id ' + where_date + ') \
@@ -134,7 +152,7 @@
             if id not in ids2:
                 continue
             for child in self.search(cr, uid, [('parent_id', 'child_of', [id])]):
-                if child <> id:
+                if child != id:
                     res.setdefault(id, 0.0)
                     res[id] += res.get(child, 0.0)
         return dict([(i, res[i]) for i in ids])
@@ -161,11 +179,15 @@
             result[rec.id] = (rec.company_id.currency_id.id,rec.company_id.currency_id.code) or False
         return result
 
+    def _get_account_currency(self, cr, uid, ids, field_name, arg, context={}):
+        result=self._get_company_currency(cr, uid, ids, field_name, arg, context={})
+        return result
+            
     _columns = {
         'name' : fields.char('Account Name', size=128, required=True),
         'complete_name': fields.function(_complete_name_calc, method=True, type='char', string='Full Account Name'),
         'code' : fields.char('Account Code', size=24),
-#        'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the analytic account without removing it."),
+        # 'active' : fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the analytic account without removing it."),
         'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type'),
         'description' : fields.text('Description'),
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
@@ -190,6 +212,7 @@
                                   \n* And finally when all the transactions are over, it can be in \'Close\' state. \
                                   \n* The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
                                  \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'),
+       'currency_id': fields.function(_get_account_currency, method=True, type='many2one', relation='res.currency', string='Account currency', store=True),
     }
 
     def _default_company(self, cr, uid, context={}):
@@ -198,14 +221,14 @@
             return user.company_id.id
         return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
     _defaults = {
-#        'active' : lambda *a : True,
+        'active' : lambda *a : True,
         'type' : lambda *a : 'normal',
         'company_id': _default_company,
         'state' : lambda *a : 'open',
         'user_id' : lambda self,cr,uid,ctx : uid,
         'partner_id': lambda self,cr, uid, ctx: ctx.get('partner_id', False),
         'contact_id': lambda self,cr, uid, ctx: ctx.get('contact_id', False),
-        'date_start': lambda *a: time.strftime('%Y-%m-%d')
+		'date_start': lambda *a: time.strftime('%Y-%m-%d')
     }
 
     def check_recursion(self, cr, uid, ids, parent=None):
@@ -260,3 +283,4 @@
         return self.name_get(cr, uid, account, context=context)
 
 account_analytic_account()
+
 
=== modified file 'analytic_user_function/analytic_user_function.py'
--- analytic_user_function/analytic_user_function.py	2010-01-12 09:18:39 +0000
+++ analytic_user_function/analytic_user_function.py	2010-02-15 10:42:25 +0000
@@ -99,8 +99,11 @@
                         _('There is no expense account define ' \
                                 'for this product: "%s" (id:%d)') % \
                                 (r.product_id.name, r.product_id.id,))
-            amount = unit_amount *  self.pool.get('product.uom')._compute_price(cr, uid,
-                    r.product_id.uom_id.id, r.product_id.standard_price, False)
+            # Compute based on pricetype
+            amount_unit=self.on_change_unit_amount(cr, uid, ids, 
+                r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount']
+                
+            amount = unit_amount *  amount_unit
             res ['value']['amount']= - round(amount, 2)
             res ['value']['general_account_id']= a
         return res
@@ -132,8 +135,11 @@
                             _('There is no expense account define ' \
                                     'for this product: "%s" (id:%d)') % \
                                     (r.product_id.name, r.product_id.id,))
-                amount = unit_amount * r.product_id.uom_id._compute_price(cr, uid,
-                        r.product_id.uom_id.id, r.product_id.standard_price, False)
+                # Compute based on pricetype
+                amount_unit=self.on_change_unit_amount(cr, uid, ids, 
+                    r.product_id.id, unit_amount, r.product_id.uom_id.id)['value']['amount']
+                        
+                amount = unit_amount * amount_unit
                 res ['value']['amount']= - round(amount, 2)
                 res ['value']['general_account_id']= a
         return res
 
=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py	2010-02-01 08:29:39 +0000
+++ hr_expense/hr_expense.py	2010-02-15 10:42:25 +0000
@@ -210,12 +210,18 @@
         'date_value' : lambda *a: time.strftime('%Y-%m-%d'),
     }
     _order = "sequence"
-    def onchange_product_id(self, cr, uid, ids, product_id, uom_id, context={}):
+    def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context={}):
         v={}
         if product_id:
             product=self.pool.get('product.product').browse(cr,uid,product_id, context=context)
             v['name']=product.name
-            v['unit_amount']=product.standard_price
+            
+            # Compute based on pricetype of employee company
+            pricetype_id = self.pool.get('hr.employee').browse(cr,uid,employee_id).user_id.company_id.property_valuation_price_type.id
+            pricetype=self.pool.get('product.price.type').browse(cr,uid,pricetype_id)
+            amount_unit=product.price_get(pricetype.field, context)[product.id]
+            
+            v['unit_amount']=amount_unit
             if not uom_id:
                 v['uom_id']=product.uom_id.id
         return {'value':v}
 
=== modified file 'hr_expense/hr_expense_view.xml'
--- hr_expense/hr_expense_view.xml	2010-02-01 11:09:48 +0000
+++ hr_expense/hr_expense_view.xml	2010-02-15 10:42:25 +0000
@@ -73,8 +73,8 @@
                             <newline/>
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <form string="Expense Lines">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, uom_id)" select="2"/>
-                                    <field name="uom_id" on_change="onchange_product_id(product_id, uom_id)" select="2"/>
+                                    <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" select="2"/>
+                                    <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id)" select="2"/>
                                     <field name="name" select="1"/>
                                     <field name="date_value" select="1"/>
                                     <field name="unit_quantity" select="2"/>
 
=== modified file 'hr_timesheet/hr_timesheet.py'
--- hr_timesheet/hr_timesheet.py	2010-01-12 09:18:39 +0000
+++ hr_timesheet/hr_timesheet.py	2010-02-15 10:42:25 +0000
@@ -57,7 +57,9 @@
         res = {}
 #        if prod_id and unit_amount:
         if prod_id:
-            res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount,unit, context)
+            # find company
+            company_id=self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context)
+            res = self.pool.get('account.analytic.line').on_change_unit_amount(cr, uid, id, prod_id, unit_amount,company_id,unit, context)
         return res
 
     def _getEmployeeProduct(self, cr, uid, context):
 
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice.py'
--- hr_timesheet_invoice/hr_timesheet_invoice.py	2010-01-21 15:13:50 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice.py	2010-02-15 10:42:25 +0000
@@ -52,6 +52,7 @@
             res[id] = round(res.get(id, 0.0),2)
         return res
 
+
     _inherit = "account.analytic.account"
     _columns = {
         'pricelist_id' : fields.many2one('product.pricelist', 'Sale Pricelist'),
@@ -77,7 +78,7 @@
     }
 
     def unlink(self, cursor, user, ids, context=None):
-        self._check(cursor, user, ids)
+        # self._check(cursor, user, ids)
         return super(account_analytic_line,self).unlink(cursor, user, ids,
                 context=context)
 
@@ -90,11 +91,11 @@
         select = ids
         if isinstance(select, (int, long)):
             select = [ids]
-	if ( not vals.has_key('invoice_id')) or vals['invoice_id' ] == False:
-		for line in self.browse(cr, uid, select):
-		    if line.invoice_id:
-			raise osv.except_osv(_('Error !'),
-				_('You can not modify an invoiced analytic line!'))
+        if ( not vals.has_key('invoice_id')) or vals['invoice_id' ] == False:
+            for line in self.browse(cr, uid, select):
+                if line.invoice_id:
+                    raise osv.except_osv(_('Error !'),
+                        _('You can not modify an invoiced analytic line!'))
         return True
 
     def copy(self, cursor, user, obj_id, default=None, context=None):
 
=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_view.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_view.xml	2010-01-09 14:30:02 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_view.xml	2010-02-15 10:42:25 +0000
@@ -20,7 +20,19 @@
                 </field>
             </field>
         </record>
-
+        
+        <record id="view_account_analytic_account_form" model="ir.ui.view">
+            <field name="name">account.analytic.account.form</field>
+            <field name="model">account.analytic.account</field>
+            <field name="inherit_id" ref="account.view_account_analytic_account_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="company_currency_id" select="2" position="replace">
+                    <field name="currency_id" select="2"/>
+                </field>
+            </field>
+        </record>
+            
         <record id="hr_timesheet_line_form" model="ir.ui.view">
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
 
=== modified file 'multi_company/__init__.py'
--- multi_company/__init__.py	2010-01-12 09:18:39 +0000
+++ multi_company/__init__.py	2010-02-15 10:42:25 +0000
@@ -18,6 +18,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'multi_company/__terp__.py'
--- multi_company/__terp__.py	2010-01-12 09:18:39 +0000
+++ multi_company/__terp__.py	2010-02-15 10:42:25 +0000
@@ -32,7 +32,7 @@
     'depends': [
         'base',
         'sale',
-        'project'
+        'project',
     ],
     'init_xml': [],
     'update_xml': [
 
=== modified file 'product/__init__.py'
--- product/__init__.py	2010-01-12 09:18:39 +0000
+++ product/__init__.py	2010-02-15 10:42:25 +0000
@@ -23,6 +23,6 @@
 import report
 import partner
 import wizard
-
+import company
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'product/__terp__.py'
--- product/__terp__.py	2010-01-12 09:18:39 +0000
+++ product/__terp__.py	2010-02-15 10:42:25 +0000
@@ -54,6 +54,7 @@
         'product_view.xml',
         'pricelist_view.xml',
         'partner_view.xml',
+        'company_view.xml',
         'product_wizard.xml',
         'process/product_process.xml'
     ],
 
=== added file 'product/company.py'
--- product/company.py	1970-01-01 00:00:00 +0000
+++ product/company.py	2010-02-15 10:42:26 +0000
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    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 Affero General Public License for more details.
+#
+#    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/>.     
+#
+##############################################################################
+
+from osv import fields, osv
+
+
+class res_company(osv.osv):
+    _inherit = 'res.company'
+    _columns = {
+        'property_valuation_price_type': fields.property(
+            'product.price.type',
+            type='many2one', 
+            relation='product.price.type', 
+            domain=[],
+            string="Valuation Price Type", 
+            method=True,
+            view_load=True,
+            help="The price type field in the selected price type will be used, instead of the default one, \
+                  for valuation of product in the current company"),
+    }
+    
+    def _check_currency(self, cr, uid, ids):
+        for rec in self.browse(cr, uid, ids):
+            if rec.currency_id.id <> rec.property_valuation_price_type.currency_id.id:
+                return False
+        return True
+        
+    _constraints = [
+        (_check_currency, 'Error! You can not chooes a pricetype in a different currency than your company (Not supported now).', ['property_valuation_price_type'])
+    ]
+
+res_company()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
 
=== added file 'product/company_view.xml'
--- product/company_view.xml	1970-01-01 00:00:00 +0000
+++ product/company_view.xml	2010-02-15 10:42:26 +0000
@@ -0,0 +1,18 @@
+<openerp>
+    <data>
+
+    
+        <record id="view_company_property_form" model="ir.ui.view">
+            <field name="name">res.company.product.property.form.inherit</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+                <field name="currency_id" position="after">
+                    <field name="property_valuation_price_type"/>
+                </field>
+            </field>
+            </record>
+
+    </data>
+</openerp>
 
=== modified file 'product/pricelist.py'
--- product/pricelist.py	2010-02-01 08:29:39 +0000
+++ product/pricelist.py	2010-02-15 10:42:26 +0000
@@ -62,6 +62,7 @@
         "active": lambda *args: True,
         "currency_id": _get_currency
     }
+    
 price_type()
 
 #----------------------------------------------------------
 
=== modified file 'product/product_data.xml'
--- product/product_data.xml	2009-09-24 10:46:21 +0000
+++ product/product_data.xml	2010-02-15 10:42:26 +0000
@@ -73,7 +73,6 @@
         
         
         
-        
         <!--
 	Price list type
 	-->
@@ -81,6 +80,7 @@
             <field name="name">Sale Pricelist</field>
             <field name="key">sale</field>
         </record>
+ 
         
         <!--
 	Price list
@@ -107,5 +107,12 @@
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_product_pricelist')]"/>
             <field eval="'product.pricelist,'+str(ref('list0'))" name="value"/>
         </record>
+        
+        <record forcecreate="True" id="property_valuation_price_type" model="ir.property">
+            <field name="name">property_valuation_price_type</field>
+            <field name="fields_id" search="[('model','=','res.company'),('name','=','property_valuation_price_type')]"/>
+            <field eval="'product.price.type,'+str(ref('standard_price'))" name="value"/>
+        </record>
+        
     </data>
 </openerp>
 
=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py	2010-01-21 15:13:50 +0000
+++ project_timesheet/project_timesheet.py	2010-02-15 10:42:26 +0000
@@ -77,8 +77,12 @@
         vals_line['journal_id'] = result['journal_id']
         vals_line['amount'] = 00.0
         timeline_id = obj.create(cr, uid, vals_line, {})
-
-        vals_line['amount'] = (-1) * vals['hours']* ( obj.browse(cr,uid,timeline_id).product_id.standard_price or 0.0)
+        
+        # Compute based on pricetype
+        amount_unit=obj.on_change_unit_amount(cr, uid, line_id, 
+            vals_line['product_id'], vals_line['unit_amount'], unit, context)
+            
+        vals_line['amount'] = (-1) * vals['hours']* (unit_amount or 0.0)
         obj.write(cr, uid,[timeline_id], vals_line, {})
         vals['hr_analytic_timesheet_id'] = timeline_id
         return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
@@ -104,7 +108,12 @@
                 vals_line['date'] = vals['date'][:10]
             if 'hours' in vals:
                 vals_line['unit_amount'] = vals['hours']
-                vals_line['amount'] = (-1) * vals['hours'] * (obj.browse(cr,uid,line_id).product_id.standard_price or 0.0)
+                
+                # Compute based on pricetype
+                amount_unit=obj.on_change_unit_amount(cr, uid, line_id, 
+                    vals_line['product_id'], vals_line['unit_amount'], unit, context)
+                
+                vals_line['amount'] = (-1) * vals['hours'] * (amount_unit or 0.0)
             obj.write(cr, uid, [line_id], vals_line, {})
 
         return super(project_work,self).write(cr, uid, ids, vals, context)
 
=== modified file 'stock/stock.py'
--- stock/stock.py	2010-02-09 08:31:46 +0000
+++ stock/stock.py	2010-02-15 10:42:27 +0000
@@ -110,11 +110,15 @@
         cr.execute('select distinct product_id from stock_move where (location_id=%s) or (location_dest_id=%s)', (id, id))
         result = cr.dictfetchall()
         if result:
+            # Choose the right filed standard_price to read
+            # Take the user company
+            price_type_id=self.pool.get('res.users').browse(cr,uid,uid).company_id.property_valuation_price_type.id
+            pricetype=self.pool.get('product.price.type').browse(cr,uid,price_type_id)
             for r in result:
                 c = (context or {}).copy()
                 c['location'] = id
-                product = self.pool.get('product.product').read(cr, uid, r['product_id'], [field_to_read, 'standard_price'], context=c)
-                final_value += (product[field_to_read] * product['standard_price'])
+                product = self.pool.get('product.product').read(cr, uid, r['product_id'], [field_to_read, pricetype.field], context=c)
+                final_value += (product[field_to_read] * product[pricetype.field])
         return final_value
 
     def _product_value(self, cr, uid, ids, field_names, arg, context={}):
@@ -211,6 +215,10 @@
         if context is None:
             context = {}
         product_obj = self.pool.get('product.product')
+        # Take the user company and pricetype
+        price_type_id=self.pool.get('res.users').browse(cr,uid,uid).company_id.property_valuation_price_type.id
+        pricetype=self.pool.get('product.price.type').browse(cr,uid,price_type_id)
+        
         if not product_ids:
             product_ids = product_obj.search(cr, uid, [])
 
@@ -241,10 +249,16 @@
                         continue
                     product = products_by_id[product_id]
                     quantity_total += qty[product_id]
-                    price = qty[product_id] * product.standard_price
+                    
+                    # Compute based on pricetype
+                    # Choose the right filed standard_price to read
+                    amount_unit=product.price_get(pricetype.field, context)[product.id] 
+                    price = qty[product_id] * amount_unit
+                    # price = qty[product_id] * product.standard_price
+
                     total_price += price
                     result['product'].append({
-                        'price': product.standard_price,
+                        'price': amount_unit,
                         'prod_name': product.name,
                         'code': product.default_code, # used by lot_overview_all report!
                         'variants': product.variants or '',
@@ -645,7 +659,11 @@
     def _get_price_unit_invoice(self, cursor, user, move_line, type):
         '''Return the price unit for the move line'''
         if type in ('in_invoice', 'in_refund'):
-            return move_line.product_id.standard_price
+            # Take the user company and pricetype
+            price_type_id=self.pool.get('res.users').browse(cr,users,users).company_id.property_valuation_price_type.id
+            pricetype=self.pool.get('product.price.type').browse(cr,uid,price_type_id)            
+            amount_unit=move_line.product_id.price_get(pricetype.field, context)[move_line.product_id.id] 
+            return amount_unit
         else:
             return move_line.product_id.list_price
 
@@ -1408,13 +1426,19 @@
                     ref = move.picking_id and move.picking_id.name or False
                     product_uom_obj = self.pool.get('product.uom')
                     default_uom = move.product_id.uom_id.id
+                    date = time.strftime('%Y-%m-%d')
                     q = product_uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, default_uom)
                     if move.product_id.cost_method == 'average' and move.price_unit:
                         amount = q * move.price_unit
+                    # Base computation on valuation price type
                     else:
-                        amount = q * move.product_id.standard_price
-
-                    date = time.strftime('%Y-%m-%d')
+                        company_id=move.company_id.id
+                        
+                        pricetype=self.pool.get('product.price.type').browse(cr,uid,move.company_id.property_valuation_price_type.id)
+                        amount_unit=move.product_id.price_get(pricetype.field, context)[move.product_id.id]
+                        amount=amount_unit * q or 1.0
+                        # amount = q * move.product_id.standard_price
+                    
                     partner_id = False
                     if move.picking_id:
                         partner_id = move.picking_id.address_id and (move.picking_id.address_id.partner_id and move.picking_id.address_id.partner_id.id or False) or False
@@ -1492,7 +1516,8 @@
             move_line = []
             for line in inv.inventory_line_id:
                 pid = line.product_id.id
-                price = line.product_id.standard_price or 0.0
+                
+                # price = line.product_id.standard_price or 0.0
                 amount = self.pool.get('stock.location')._product_get(cr, uid, line.location_id.id, [pid], {'uom': line.product_uom.id})[pid]
                 change = line.product_qty - amount
                 lot_id = line.prod_lot_id.id
 
=== modified file 'stock/wizard/wizard_partial_move.py'
--- stock/wizard/wizard_partial_move.py	2010-01-12 09:18:39 +0000
+++ stock/wizard/wizard_partial_move.py	2010-02-15 10:42:27 +0000
@@ -55,7 +55,7 @@
 
     for move in move_lines:
         quantity = move.product_qty
-        if move.state <> 'assigned':
+        if move.state != 'assigned':
             quantity = 0
 
         _moves_arch_lst.append('<field name="move%s" />' % (move.id,))
@@ -124,7 +124,8 @@
             currency = data['form']['currency%s' % move.id]
 
             qty = uom_obj._compute_qty(cr, uid, uom, qty, product.uom_id.id)
-
+            pricetype=pool.get('product.price.type').browse(cr,uid,user.company_id.property_valuation_price_type.id)
+            
             if (qty > 0):
                 new_price = currency_obj.compute(cr, uid, currency,
                         user.company_id.currency_id.id, price)
@@ -133,15 +134,17 @@
                 if product.qty_available<=0:
                     new_std_price = new_price
                 else:
-                    new_std_price = ((product.standard_price * product.qty_available)\
+                    # Get the standard price
+                    amount_unit=product.price_get(pricetype.field, context)[product.id]
+                    new_std_price = ((amount_unit * product.qty_available)\
                         + (new_price * qty))/(product.qty_available + qty)
 
                 product_obj.write(cr, uid, [product.id],
-                        {'standard_price': new_std_price})
+                        {pricetype.field: new_std_price})
                 move_obj.write(cr, uid, move.id, {'price_unit': new_price})        
 
     for move in too_few:        
-        if data['form']['move%s' % move.id] <> 0:
+        if data['form']['move%s' % move.id] != 0:
             new_move = move_obj.copy(cr, uid, move.id,
                 {
                     'product_qty' : data['form']['move%s' % move.id],
 
=== modified file 'stock/wizard/wizard_partial_picking.py'
--- stock/wizard/wizard_partial_picking.py	2010-01-21 15:13:50 +0000
+++ stock/wizard/wizard_partial_picking.py	2010-02-15 10:42:27 +0000
@@ -61,7 +61,7 @@
         if m.state in ('done', 'cancel'):
             continue
         quantity = m.product_qty
-        if m.state<>'assigned':
+        if m.state!='assigned':
             quantity = 0
 
         _moves_arch_lst.append('<field name="move%s" />' % (m.id,))
@@ -133,7 +133,7 @@
             currency = data['form']['currency%s' % move.id]
 
             qty = uom_obj._compute_qty(cr, uid, uom, qty, product.uom_id.id)
-
+            pricetype=pool.get('product.price.type').browse(cr,uid,user.company_id.property_valuation_price_type.id)
             if (qty > 0):
                 new_price = currency_obj.compute(cr, uid, currency,
                         user.company_id.currency_id.id, price)
@@ -142,11 +142,14 @@
                 if product.qty_available<=0:
                     new_std_price = new_price
                 else:
-                    new_std_price = ((product.standard_price * product.qty_available)\
+                    # Get the standard price
+                    amount_unit=product.price_get(pricetype.field, context)[product.id]
+                    new_std_price = ((amount_unit * product.qty_available)\
                         + (new_price * qty))/(product.qty_available + qty)
-
+                        
+                # Write the field according to price type field
                 product_obj.write(cr, uid, [product.id],
-                        {'standard_price': new_std_price})
+                        {pricetype.field: new_std_price})
                 move_obj.write(cr, uid, [move.id], {'price_unit': new_price})
 
     for move in too_few:
@@ -158,7 +161,7 @@
                         'move_lines' : [],
                         'state':'draft',
                     })
-        if data['form']['move%s' % move.id] <> 0:
+        if data['form']['move%s' % move.id] != 0:
             new_obj = move_obj.copy(cr, uid, move.id,
                 {
                     'product_qty' : data['form']['move%s' % move.id],