Merge lp:~vauxoo/addons-vauxoo/7.0-stock_property_account_product_dev_jorge into lp:addons-vauxoo/7.0

[Jorge Angel Naranjo Rogel - http://www.vauxoo.com]

Se crea modulo para agregar el campo property de valoración inventario en el producto. Ademas se modifica la función que genera la poliza de valoración de inventario, que tome como prioridad la cuenta de valoración de inventario del producto y después la de la categoría en caso de que el producto no tenga.

[Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com (josemoralesp)]

El modulo ya tiene traduccion?

review: Needs Fixing

[Jorge Angel Naranjo Rogel - http://www.vauxoo.com (jorge-nr)]

Si el property ya tiene traducción por eso no agrege esa parte.

review: Needs Resubmitting

[Moisés López - http://www.vauxoo.com (moylop260)]

@Jorge,
En lo personal no me gusta nada que sea "Method overriding"
Sin embargo, donde no hay otra opción, pues se hace.
Aunque también tenemos la via del "parche", que tampoco es la mejor opción.
O un branch paralelo al nativo, para agregar esta funcionalidad, y que se haga el merge en nuestros branches, e incluso lo proponemos para que OpenERP lo considere dentro de sus cambios.

Otra opción, es hacer un análisis de estas funciones para separar la preparación de los diccionarios (como hace stock.py), para que se puedan heredar fácilmente.

Otra opción (que en lo personal, no me gusta tampoco), para marearte más, es como lo hace el módulo de anglosaxon, que modifica la póliza una vez creada.

En resumen, vamos a tomar el siguiente camino:
-Hacer un branch clone de openobject-addons para agregar la parte que necesitamos.
-Reportar un bug (tipo wishlist) con el tema de que no están dejando heredable esta parte.

review: Needs Fixing

Unmerged revisions

802. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-09-12

[IMP][stock_valuation_account_product] Depends account_anglo_saxon

801. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-09-12

[IMP][stock_valuation_account_product] Delete function load_valuation_items and prints

800. By Jorge Angel Naranjo Rogel - http://www.vauxoo.com on 2013-09-12

[ADD][stock_valuation_account_product] This module added in form view of product in the seccion Accounting the field Stock Valuation Account

=== added directory 'stock_valuation_account_product'
=== added file 'stock_valuation_account_product/__init__.py'
--- stock_valuation_account_product/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_valuation_account_product/__init__.py	2013-09-12 21:23:37 +0000
@@ -0,0 +1,23 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+#
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) Vauxoo (<http://vauxoo.com>).
+#    All Rights Reserved
+#
+#    Coded by: Jorge Angel Naranjo Rogel ([e-mail])
+#
+#    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/>.
+#
+import model

=== added file 'stock_valuation_account_product/__openerp__.py'
--- stock_valuation_account_product/__openerp__.py	1970-01-01 00:00:00 +0000
+++ stock_valuation_account_product/__openerp__.py	2013-09-12 21:23:37 +0000
@@ -0,0 +1,51 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+#
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) Vauxoo (<http://vauxoo.com>).
+#    All Rights Reserved
+#
+#    Coded by: Jorge Angel Naranjo Rogel ([e-mail])
+#
+#    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/>.
+#
+{
+    "name": "Stock Valuation Account In Product",
+    "version": "1.0",
+    "depends": [
+                "product",
+                "stock",
+                "mrp",
+                "account_anglo_saxon",
+                ],
+    "author": "Vauxoo",
+    "description" : """
+Stock Valuation Account In Product
+====================================
+
+This module added in form view of product in the seccion Accounting
+the field Stock Valuation Account.
+
+    """,
+    "website": "http://vauxoo.com",
+    "category": "Addons Vauxoo",
+    "demo": [],
+    "test": [],
+    "data": [
+            'view/product_product_stock_valuation_account.xml',
+    ],
+    'application': True,
+    "active": False,
+    "installable": True,
+}

=== added directory 'stock_valuation_account_product/model'
=== added file 'stock_valuation_account_product/model/__init__.py'
--- stock_valuation_account_product/model/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_valuation_account_product/model/__init__.py	2013-09-12 21:23:37 +0000
@@ -0,0 +1,23 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+#
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) Vauxoo (<http://vauxoo.com>).
+#    All Rights Reserved
+#
+#    Coded by: Jorge Angel Naranjo Rogel ([e-mail])
+#
+#    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/>.
+#
+import product_product

=== added file 'stock_valuation_account_product/model/product_product.py'
--- stock_valuation_account_product/model/product_product.py	1970-01-01 00:00:00 +0000
+++ stock_valuation_account_product/model/product_product.py	2013-09-12 21:23:37 +0000
@@ -0,0 +1,256 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+#
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) Vauxoo (<http://vauxoo.com>).
+#    All Rights Reserved
+#
+#    Coded by: Jorge Angel Naranjo Rogel ([e-mail])
+#
+#    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 openerp.osv import fields, osv
+from openerp.tools.translate import _
+import datetime
+
+
+class product_product (osv.Model):
+    _inherit = "product.product"
+    _columns = {
+            'property_stock_valuation_account_id': fields.property('account.account',
+                type='many2one',
+                relation='account.account',
+                string="Stock Valuation Account",
+                view_load=True,
+                help="When real-time inventory valuation is enabled on a product, this account will hold the current value of the products.",),
+        }
+
+    def get_product_accounts(self, cr, uid, product_id, context=None):
+        """ To get the stock input account, stock output account and stock journal related to product.
+        @param product_id: product id
+        @return: dictionary which contains information regarding stock input account, stock output account and stock journal
+        """
+        if context is None:
+            context = {}
+        product_obj = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+
+        stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False
+        if not stock_input_acc:
+            stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
+
+        stock_output_acc = product_obj.property_stock_account_output and product_obj.property_stock_account_output.id or False
+        if not stock_output_acc:
+            stock_output_acc = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id or False
+
+        journal_id = product_obj.categ_id.property_stock_journal and product_obj.categ_id.property_stock_journal.id or False
+        account_valuation = product_obj.property_stock_valuation_account_id and product_obj.property_stock_valuation_account_id.id or False
+        if not account_valuation:
+            return super(product_product, self).get_product_accounts(cr, uid, product_id, context=context)
+        return {
+            'stock_account_input': stock_input_acc,
+            'stock_account_output': stock_output_acc,
+            'stock_journal': journal_id,
+            'property_stock_valuation_account_id': account_valuation
+        }
+
+
+    def do_change_standard_price(self, cr, uid, ids, datas, context=None):
+        """ Changes the Standard Price of Product and creates an account move accordingly.
+        @param datas : dict. contain default datas like new_price, stock_output_account, stock_input_account, stock_journal
+        @param context: A standard dictionary
+        @return:
+
+        """
+        location_obj = self.pool.get('stock.location')
+        move_obj = self.pool.get('account.move')
+        move_line_obj = self.pool.get('account.move.line')
+        if context is None:
+            context = {}
+
+        new_price = datas.get('new_price', 0.0)
+        stock_output_acc = datas.get('stock_output_account', False)
+        stock_input_acc = datas.get('stock_input_account', False)
+        journal_id = datas.get('stock_journal', False)
+        product_obj=self.browse(cr, uid, ids, context=context)[0]
+        account_valuation = product_obj.property_stock_valuation_account_id
+        if not account_valuation:
+            return super(product_product, self).do_change_standard_price(cr, uid, ids, datas, context=context)
+            
+        account_valuation_id = account_valuation and account_valuation.id or False
+        if not account_valuation_id: raise osv.except_osv(_('Error!'), _('Specify valuation Account for Product Category: %s.') % (product_obj.categ_id.name))
+        move_ids = []
+        loc_ids = location_obj.search(cr, uid,[('usage','=','internal')])
+        for rec_id in ids:
+            for location in location_obj.browse(cr, uid, loc_ids, context=context):
+                c = context.copy()
+                c.update({
+                    'location': location.id,
+                    'compute_child': False
+                })
+
+                product = self.browse(cr, uid, rec_id, context=c)
+                qty = product.qty_available
+                diff = product.standard_price - new_price
+                if not diff: raise osv.except_osv(_('Error!'), _("No difference between standard price and new price!"))
+                if qty:
+                    company_id = location.company_id and location.company_id.id or False
+                    if not company_id: raise osv.except_osv(_('Error!'), _('Please specify company in Location.'))
+                    #
+                    # Accounting Entries
+                    #
+                    if not journal_id:
+                        journal_id = product.categ_id.property_stock_journal and product.categ_id.property_stock_journal.id or False
+                    if not journal_id:
+                        raise osv.except_osv(_('Error!'),
+                            _('Please define journal '\
+                              'on the product category: "%s" (id: %d).') % \
+                                (product.categ_id.name,
+                                    product.categ_id.id,))
+                    move_id = move_obj.create(cr, uid, {
+                                'journal_id': journal_id,
+                                'company_id': company_id
+                                })
+
+                    move_ids.append(move_id)
+
+
+                    if diff > 0:
+                        if not stock_input_acc:
+                            stock_input_acc = product.\
+                                property_stock_account_input.id
+                        if not stock_input_acc:
+                            stock_input_acc = product.categ_id.\
+                                    property_stock_account_input_categ.id
+                        if not stock_input_acc:
+                            raise osv.except_osv(_('Error!'),
+                                    _('Please define stock input account ' \
+                                            'for this product: "%s" (id: %d).') % \
+                                            (product.name,
+                                                product.id,))
+                        amount_diff = qty * diff
+                        move_line_obj.create(cr, uid, {
+                                    'name': product.name,
+                                    'account_id': stock_input_acc,
+                                    'debit': amount_diff,
+                                    'move_id': move_id,
+                                    })
+                        move_line_obj.create(cr, uid, {
+                                    'name': product.categ_id.name,
+                                    'account_id': account_valuation_id,
+                                    'credit': amount_diff,
+                                    'move_id': move_id
+                                    })
+                    elif diff < 0:
+                        if not stock_output_acc:
+                            stock_output_acc = product.\
+                                property_stock_account_output.id
+                        if not stock_output_acc:
+                            stock_output_acc = product.categ_id.\
+                                    property_stock_account_output_categ.id
+                        if not stock_output_acc:
+                            raise osv.except_osv(_('Error!'),
+                                    _('Please define stock output account ' \
+                                            'for this product: "%s" (id: %d).') % \
+                                            (product.name,
+                                                product.id,))
+                        amount_diff = qty * -diff
+                        move_line_obj.create(cr, uid, {
+                                        'name': product.name,
+                                        'account_id': stock_output_acc,
+                                        'credit': amount_diff,
+                                        'move_id': move_id
+                                    })
+                        move_line_obj.create(cr, uid, {
+                                        'name': product.categ_id.name,
+                                        'account_id': account_valuation_id,
+                                        'debit': amount_diff,
+                                        'move_id': move_id
+                                    })
+
+            self.write(cr, uid, rec_id, {'standard_price': new_price})
+
+        return move_ids
+
+class mrp_production(osv.Model):
+    _inherit = 'mrp.production'
+    
+    def get_journal_accounts(self, cr, uid, product, production, context={}):
+
+        if not context:
+            context = {}
+
+        src_acc = False
+        dest_acc = False
+        entrie = False
+
+        if context.get('type', False) == 'consumed':
+            if product.quantity > 0:
+                if production.product_id.property_stock_production.valuation_in_account_id:
+                    src_acc = production.product_id.property_stock_production.valuation_in_account_id.id
+                if product.product_id.type == 'service':
+                    dest_acc = product.property_stock_valuation_account_id and\
+                    product.property_stock_valuation_account_id.id or False
+                    if not dest_acc:
+                        dest_acc = product.product_id.categ_id.property_stock_valuation_account_id and\
+                        product.product_id.categ_id.property_stock_valuation_account_id.id or False
+                        entrie = True
+                elif production.product_id.property_stock_production.variation_in_account_id:
+                    dest_acc = production.product_id.property_stock_production.variation_in_account_id.id
+                reference_amount = product.cost_variation
+
+            if product.quantity < 0:
+                if product.product_id.type == 'service':
+                    src_acc = product.property_stock_valuation_account_id and\
+                    product.property_stock_valuation_account_id.id or False
+                    if not src_acc:
+                        src_acc = product.product_id.categ_id.property_stock_valuation_account_id and\
+                        product.product_id.categ_id.property_stock_valuation_account_id.id or False
+                        entrie = True
+                elif production.product_id.property_stock_production.variation_in_account_id:
+                    src_acc = production.product_id.property_stock_production.variation_in_account_id.id
+                if production.product_id.property_stock_production.valuation_in_account_id:
+                    dest_acc = production.product_id.property_stock_production.valuation_in_account_id.id
+                reference_amount = product.cost_variation*-1
+        
+        if entrie:
+            return super(mrp_production, self).get_journal_accounts(cr, uid, product, production, context=context)
+       
+        if context.get('type', False) == 'produced':
+            if product.quantity > 0:
+                if production.product_id.property_stock_production.valuation_out_account_id:
+                    src_acc = production.product_id.property_stock_production.variation_out_account_id.id
+                if production.product_id.property_stock_production.variation_out_account_id:
+                    dest_acc = production.product_id.property_stock_production.valuation_out_account_id.id
+                reference_amount = product.cost_variation
+            if product.quantity < 0:
+                if production.product_id.property_stock_production.variation_out_account_id:
+                    src_acc = production.product_id.property_stock_production.valuation_out_account_id.id
+                if production.product_id.property_stock_production.valuation_out_account_id:
+                    dest_acc = production.product_id.property_stock_production.variation_out_account_id.id
+                reference_amount = product.cost_variation*-1
+
+        journal_id = product.product_id.categ_id.property_stock_journal.id
+        if not src_acc or not dest_acc:
+            raise osv.except_osv(_('Error!'), 
+                    _('There is no account defined for this location: "%s" ') %
+                    (production.product_id.property_stock_production.name,))
+
+        if not journal_id:
+            raise osv.except_osv(_('Error!'),
+                _('There is no journal defined on the product category:\
+                    "%s" (id: %d)') %
+                (product.product_id.categ_id.name,
+                    product.product_id.categ_id.id,))
+
+        return journal_id, src_acc, dest_acc, reference_amount

=== added directory 'stock_valuation_account_product/view'
=== added file 'stock_valuation_account_product/view/product_product_stock_valuation_account.xml'
--- stock_valuation_account_product/view/product_product_stock_valuation_account.xml	1970-01-01 00:00:00 +0000
+++ stock_valuation_account_product/view/product_product_stock_valuation_account.xml	2013-09-12 21:23:37 +0000
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<openerp>
+  <data> 
+    <record id="view_product_stock_valuation_account_inherit" model="ir.ui.view">
+        <field name="name">view.product.stock.valuation.account.inherit</field>
+        <field name="model">product.product</field>
+        <field name="inherit_id" ref="product.product_normal_form_view"/>
+        <field name="priority">30</field>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='property_stock_account_output']" position="after">
+                    <field name="property_stock_valuation_account_id" attrs="{'invisible':[('valuation', '!=', 'real_time')]}"
+                                domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+            </xpath>
+        </field>
+    </record>
+  </data>
+</openerp>
+
+
+