Merge lp:~domsense/stock-logistic-warehouse/adding_stock_optional_valuation into lp:stock-logistic-warehouse

[Lorenzo Battistini]

You can choose which stock moves have to generate inventory valutanion accounting entries, by specifying it in the location form

[lp:~domsense/stock-logistic-warehouse/adding_stock_optional_valuation]

35. By Lorenzo Battistini on 2013-06-05

[fix] when company_id is null

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

You may want to fix a typo in the __openerp__.py manifest:
s/valutanion/valuation

LGTM

review: Approve (code review, no test)

[lp:~domsense/stock-logistic-warehouse/adding_stock_optional_valuation]

36. By Lorenzo Battistini on 2013-06-19

 [fix] description

[Lorenzo Battistini (elbati)]

> You may want to fix a typo in the __openerp__.py manifest:
> s/valutanion/valuation
>
>
Done

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve (code review)

=== added directory 'stock_optional_valuation'
=== added file 'stock_optional_valuation/AUTHORS.txt'
--- stock_optional_valuation/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ stock_optional_valuation/AUTHORS.txt	2013-06-19 16:43:27 +0000
@@ -0,0 +1,2 @@
+Lorenzo Battistini <[e-mail]>
+Leonardo Pistone <[e-mail]>
 
=== added file 'stock_optional_valuation/__init__.py'
--- stock_optional_valuation/__init__.py	1970-01-01 00:00:00 +0000
+++ stock_optional_valuation/__init__.py	2013-06-19 16:43:27 +0000
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#
+#    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 stock
 
=== added file 'stock_optional_valuation/__openerp__.py'
--- stock_optional_valuation/__openerp__.py	1970-01-01 00:00:00 +0000
+++ stock_optional_valuation/__openerp__.py	2013-06-19 16:43:27 +0000
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#
+#    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 optional valuation",
+    'version': '0.1',
+    'category': 'Warehouse Management',
+    'description': """
+You can choose which stock moves have to generate inventory valuation accounting entries, by specifying it in the location form.
+""",
+    'author': 'Agile Business Group',
+    'website': 'http://www.agilebg.com',
+    'license': 'AGPL-3',
+    "depends": ['stock'],
+    "data": [
+        "stock_view.xml",
+    ],
+    "demo": [],
+    'test': [
+        'test/stock.yml'
+    ],
+    "active": False,
+    "installable": True
+}
 
=== added file 'stock_optional_valuation/stock.py'
--- stock_optional_valuation/stock.py	1970-01-01 00:00:00 +0000
+++ stock_optional_valuation/stock.py	2013-06-19 16:43:27 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    Copyright (C) 2013 Agile Business Group sagl (<http://www.agilebg.com>)
+#
+#    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, orm
+from openerp.tools.translate import _
+
+class stock_location(orm.Model):
+    _inherit = "stock.location"
+    
+    _columns = {
+        'consider_internal': fields.boolean('Consider internal', help="Consider as internal location for inventory valuation: stock moves from internal to internal will not generate accounting entries"),
+        }
+
+class stock_move(orm.Model):
+    _inherit = "stock.move"
+    
+    def _create_product_valuation_moves(self, cr, uid, move, context=None):
+        if (move.location_id.company_id and move.location_dest_id.company_id
+            and move.location_id.company_id != move.location_dest_id.company_id):
+            return super(stock_move,self)._create_product_valuation_moves(
+                cr, uid, move, context=context)
+        if (move.location_id.usage == 'internal' or
+            move.location_id.consider_internal) and (
+            move.location_dest_id.usage == 'internal' or
+            move.location_dest_id.consider_internal):
+            return
+        return super(stock_move,self)._create_product_valuation_moves(
+            cr, uid, move, context=context)
 
=== added file 'stock_optional_valuation/stock_view.xml'
--- stock_optional_valuation/stock_view.xml	1970-01-01 00:00:00 +0000
+++ stock_optional_valuation/stock_view.xml	2013-06-19 16:43:27 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+        <record id="view_location_form" model="ir.ui.view">
+            <field name="name">stock.location.form</field>
+            <field name="model">stock.location</field>
+            <field name="inherit_id" ref="stock.view_location_form"></field>
+            <field name="arch" type="xml">
+                <xpath expr="/form/group" position="inside">
+                    <group string="Inventory valuation" groups="stock.group_inventory_valuation">
+                        <field name="consider_internal"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+</data>
+</openerp>
 
=== added directory 'stock_optional_valuation/test'
=== added file 'stock_optional_valuation/test/stock.yml'
--- stock_optional_valuation/test/stock.yml	1970-01-01 00:00:00 +0000
+++ stock_optional_valuation/test/stock.yml	2013-06-19 16:43:27 +0000
@@ -0,0 +1,95 @@
+-
+ I need a product with real time valuation.
+-
+ !record {model: product.product, id: product.product_product_24}:
+    valuation: real_time
+    property_stock_account_input: account.o_expense
+    property_stock_account_output: account.o_income
+-
+ !record {model: stock.picking, id: outgoing_shipment}:
+    type: out
+-
+ !record {model: stock.move, id: outgoing_shipment_card}:
+    picking_id: outgoing_shipment
+    product_id: product.product_product_24
+    product_qty: 2.0
+    location_id: stock.stock_location_stock
+    location_dest_id: stock.location_inventory
+-
+  I confirm outgoing shipment of 2 Graphics Cards from Stock to Inventory Loss
+-
+  !workflow {model: stock.picking, action: button_confirm, ref: outgoing_shipment}
+-
+ I process the picking
+-
+  !python {model: stock.partial.picking}: |
+    context.update({'active_model': 'stock.picking', 'active_id': ref('outgoing_shipment'), 'active_ids': [ref('outgoing_shipment')]})
+-
+  !record {model: stock.partial.picking, id: partial_outgoing}:
+    move_ids:
+        - quantity: 2.0
+          product_id: product.product_product_24
+          product_uom: product.product_uom_unit
+          move_id: outgoing_shipment_card
+          location_id: stock.stock_location_stock
+          location_dest_id: stock.location_inventory
+-
+  !python {model: stock.partial.picking }: |
+    self.do_partial(cr, uid, [ref('partial_outgoing')], context=context)
+-
+  My picking should have generated a Journal Entry with the same name
+-
+  !python {model: stock.picking}: |
+    picking_name = self.browse(cr, uid, ref('outgoing_shipment'), context=context).name
+    a_move_obj = self.pool.get('account.move')
+    # count those
+    a_move_ids = a_move_obj.search(cr, uid, [('ref', '=', picking_name)])
+    assert len(a_move_ids) == 1, "An outgoing picking should generate a Journal Entry"
+-
+  Now I will consider the location to be Internal
+-
+  !record {model: stock.location, id: stock.location_inventory}:
+    consider_internal: True
+-
+  I repeate the process above. Now no Journal Entry should be generated.
+-
+ !record {model: stock.picking, id: outgoing_shipment_as_internal}:
+    type: out
+-
+ !record {model: stock.move, id: outgoing_shipment_as_internal_card}:
+    picking_id: outgoing_shipment_as_internal
+    product_id: product.product_product_24
+    product_qty: 2.0
+    location_id: stock.stock_location_stock
+    location_dest_id: stock.location_inventory
+
+-
+  I confirm outgoing shipment of 2 Graphics Cards from Stock to Inventory Loss
+-
+  !workflow {model: stock.picking, action: button_confirm, ref: outgoing_shipment_as_internal}
+-
+ I process the picking
+-
+  !python {model: stock.partial.picking}: |
+    context.update({'active_model': 'stock.picking', 'active_id': ref('outgoing_shipment_as_internal'), 'active_ids': [ref('outgoing_shipment_as_internal')]})
+-
+  !record {model: stock.partial.picking, id: partial_outgoing}:
+    move_ids:
+        - quantity: 2.0
+          product_id: product.product_product_24
+          product_uom: product.product_uom_unit
+          move_id: outgoing_shipment_as_internal_card
+          location_id: stock.stock_location_stock
+          location_dest_id: stock.location_inventory
+-
+  !python {model: stock.partial.picking }: |
+    self.do_partial(cr, uid, [ref('partial_outgoing')], context=context)
+-
+  Now there should be no Journal Entries with the same name
+-
+  !python {model: stock.picking }: |
+    picking_name = self.browse(cr, uid, ref('outgoing_shipment_as_internal'), context=context).name
+    a_move_obj = self.pool.get('account.move')
+    # count those
+    a_move_ids = a_move_obj.search(cr, uid, [('ref', '=', picking_name)])
+    assert len(a_move_ids) == 0, "Locations treater as internal should generate no Journal Entries"