Merge lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1-mrp_production_analytic_acc-dev_rodo into lp:addons-vauxoo/6.1

[Rodolfo Lopez]

[ADD][mrp_production_analytic_acc] analytic account in move in production and analytic account in entries of production

[lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1-mrp_production_analytic_acc-dev_rodo]

515. By Rodolfo Lopez on 2012-10-16

[ADD][mrp_production_analytic_acc] analytic account in move in production and analytic account in entries of production

=== added directory 'mrp_production_analytic_acc'
=== added file 'mrp_production_analytic_acc/__init__.py'
--- mrp_production_analytic_acc/__init__.py	1970-01-01 00:00:00 +0000
+++ mrp_production_analytic_acc/__init__.py	2012-10-16 16:39:20 +0000
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: Luis Torres ([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 stock
+import mrp

=== added file 'mrp_production_analytic_acc/__openerp__.py'
--- mrp_production_analytic_acc/__openerp__.py	1970-01-01 00:00:00 +0000
+++ mrp_production_analytic_acc/__openerp__.py	2012-10-16 16:39:20 +0000
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: Luis torres ([e-mail])
+#              Rodo ([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': 'mrp account analytics',
+    "version" : "1.1",
+    'author': 'Vauxoo',
+    "category" : "analytic production",
+    'depends': ['stock','account','mrp'],
+    'description': """
+        Added field for account analitic
+    """,
+    'update_xml':[
+        'stock_view.xml',
+        'mrp_view.xml',
+    ],
+    'active': False,
+    'installable': True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'mrp_production_analytic_acc/mrp.py'
--- mrp_production_analytic_acc/mrp.py	1970-01-01 00:00:00 +0000
+++ mrp_production_analytic_acc/mrp.py	2012-10-16 16:39:20 +0000
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: Luis Torres ([e-mail]),Rodo ([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 osv import fields, osv
+
+class mrp_production(osv.osv):
+    _inherit= "mrp.production"
+    
+    def product_id_change(self, cr, uid, ids, product_id, context=None):
+        bom_obj=self.pool.get('mrp.bom')
+        res=super(mrp_production, self).product_id_change(cr, uid, ids,product_id,context=None)
+        bom=bom_obj.browse(cr,uid,[res['value']['bom_id']],context=context)
+        res['value']['analytic_acc_rm']=bom and bom[0].analytic_acc_rm.id or False
+        res['value']['analytic_acc_fg']=bom and bom[0].analytic_acc_fg.id or False
+        return res
+        
+    _columns={
+        'analytic_acc_rm': fields.many2one('account.analytic.account','Analytic Account RM',),
+        'analytic_acc_fg': fields.many2one('account.analytic.account','Analytic Account FG',)
+    }
+
+        
+class mrp_bom(osv.osv):
+    _inherit= "mrp.bom"
+    
+
+    
+    _columns={
+        'analytic_acc_rm': fields.many2one('account.analytic.account','Analytic Account RM',),
+        'analytic_acc_fg': fields.many2one('account.analytic.account','Analytic Account FG',)
+    }
+
+

=== added file 'mrp_production_analytic_acc/mrp_view.xml'
--- mrp_production_analytic_acc/mrp_view.xml	1970-01-01 00:00:00 +0000
+++ mrp_production_analytic_acc/mrp_view.xml	2012-10-16 16:39:20 +0000
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_mrp_bom_inherit_analytic_acc_form">
+            <field name="name">view.mrp.bom.inherit.analytic.acc.form</field>
+            <field name="model">mrp.bom</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="mrp.mrp_bom_form_view"/>
+            <field name="arch" type="xml">
+                <field name="company_id" position="after">
+                    <field name="analytic_acc_rm" select="2"/>
+                     <field name="analytic_acc_fg" select="2"/>
+                </field>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_mrp_production_inherit_analytic_acc_form2">
+            <field name="name">view.mrp.production.inherit.analytic.acc.form2</field>
+            <field name="model">mrp.production</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
+            <field name="arch" type="xml">
+                <field name="location_dest_id" position="after">
+                    <field name="analytic_acc_rm" select="2"/>
+                     <field name="analytic_acc_fg" select="2"/>
+                </field>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_mrp_production_inherit_analytic_acc_tree">
+            <field name="name">view.mrp.production.inherit.analytic.acc.tree</field>
+            <field name="model">mrp.production</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='move_lines']/tree[@string='Products to Consume']/field[@name='location_id']" position="after">
+                    <field name="analytic_acc" colspan="2"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mrp_production_consumed_inherit_analytic_acc_tree">
+            <field name="name">view.mrp.production.consumed.inherit.analytic.acc.tree</field>
+            <field name="model">mrp.production</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='move_lines2']/tree[@string='Consumed Products']/field[@name='prodlot_id']" position="after">
+                    <field name="analytic_acc" colspan="2"/>
+                </xpath>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_mrp_production_to_finish_inherit_analytic_acc_tree">
+            <field name="name">view.mrp.production.to.finish.inherit.analytic.acc.tree</field>
+            <field name="model">mrp.production</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='move_created_ids']/tree[@string='Products to Finish']/field[@name='product_uom']" position="after">
+                    <field name="analytic_acc" colspan="2"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mrp_production_finish_inherit_analytic_acc_tree">
+            <field name="name">view.mrp.production.finish.inherit.analytic.acc.tree</field>
+            <field name="model">mrp.production</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='move_created_ids2']/tree[@string='Finished Products']/field[@name='prodlot_id']" position="after">
+                    <field name="analytic_acc" colspan="2"/>
+                </xpath>
+            </field>
+        </record>
+        
+
+    </data>
+</openerp>  

=== added directory 'mrp_production_analytic_acc/patch'
=== added file 'mrp_production_analytic_acc/patch/mrp_analytic.patch'
--- mrp_production_analytic_acc/patch/mrp_analytic.patch	1970-01-01 00:00:00 +0000
+++ mrp_production_analytic_acc/patch/mrp_analytic.patch	2012-10-16 16:39:20 +0000
@@ -0,0 +1,28 @@
+=== modified file 'mrp/mrp.py'
+--- mrp/mrp.py	2012-10-05 10:44:47 +0000
++++ mrp/mrp.py	2012-10-16 16:26:16 +0000
+@@ -913,6 +913,7 @@
+                         'location_dest_id': destination_location_id,
+                         'state': 'waiting',
+                         'company_id': production.company_id.id,
++                        'analytic_acc': production.analytic_acc_rm and production.analytic_acc_rm.id or False,
+                 })
+           
+     def _make_production_internal_shipment(self, cr, uid, production, context=None):
+@@ -964,6 +965,7 @@
+             'move_dest_id': production.move_prod_id.id,
+             'state': 'waiting',
+             'company_id': production.company_id.id,
++            'analytic_acc': production.analytic_acc_fg and production.analytic_acc_fg.id or False,
+         }
+         move_id = stock_move.create(cr, uid, data, context=context)
+         production.write({'move_created_ids': [(6, 0, [move_id])]}, context=context)
+@@ -992,6 +994,7 @@
+             'move_dest_id': parent_move_id,
+             'state': 'waiting',
+             'company_id': production.company_id.id,
++            'analytic_acc': production.analytic_acc_rm and production.analytic_acc_rm.id or False,
+         })
+         production.write({'move_lines': [(4, move_id)]}, context=context)
+         return move_id
+

=== added file 'mrp_production_analytic_acc/patch/stock_analytic.patch'
--- mrp_production_analytic_acc/patch/stock_analytic.patch	1970-01-01 00:00:00 +0000
+++ mrp_production_analytic_acc/patch/stock_analytic.patch	2012-10-16 16:39:20 +0000
@@ -0,0 +1,19 @@
+=== modified file 'stock/stock.py'
+--- stock/stock.py	2012-08-07 10:04:35 +0000
++++ stock/stock.py	2012-10-16 04:42:28 +0000
+@@ -2277,6 +2277,7 @@
+                     'partner_id': partner_id,
+                     'debit': reference_amount,
+                     'account_id': dest_account_id,
++                    'analytic_account_id': move.analytic_acc and move.analytic_acc.id or False,
+         }
+         credit_line_vals = {
+                     'name': move.name,
+@@ -2287,6 +2288,7 @@
+                     'partner_id': partner_id,
+                     'credit': reference_amount,
+                     'account_id': src_account_id,
++                    'analytic_account_id': move.analytic_acc and move.analytic_acc.id or False,
+         }
+ 
+         # if we are posting to accounts in a different currency, provide correct values in both currencies correctly

=== added file 'mrp_production_analytic_acc/stock.py'
--- mrp_production_analytic_acc/stock.py	1970-01-01 00:00:00 +0000
+++ mrp_production_analytic_acc/stock.py	2012-10-16 16:39:20 +0000
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+###########################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#
+#    Copyright (c) 2012 Vauxoo - http://www.vauxoo.com
+#    All Rights Reserved.
+#    [e-mail]
+############################################################################
+#    Coded by: Luis Torres ([e-mail]),Rodo ([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 osv import fields, osv
+
+class stock_move(osv.osv):
+    _inherit= "stock.move"
+    
+    _columns={
+        'analytic_acc': fields.many2one('account.analytic.account','Analytic Account',)
+    }
+

=== added file 'mrp_production_analytic_acc/stock_view.xml'
--- mrp_production_analytic_acc/stock_view.xml	1970-01-01 00:00:00 +0000
+++ mrp_production_analytic_acc/stock_view.xml	2012-10-16 16:39:20 +0000
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_stock_move_inc_inherit_analytic_acc_form">
+            <field name="name">view.stock.move.inc.inherit.analytic.acc.form</field>
+            <field name="model">stock.move</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_move_form_reception_picking"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/group/field[@name='address_id']" position="after">
+                    <field name="analytic_acc" colspan="2"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_stock_move_out_inherit_analytic_acc_form">
+            <field name="name">view.stock.move.out.inherit.analytic.acc.form</field>
+            <field name="model">stock.move</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_move_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/group/field[@name='address_id']" position="after">
+                    <field name="analytic_acc" colspan="2"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_stock_picking_out_inherit_analytic_acc_form">
+            <field name="name">view.stock.picking.out.inherit.analytic.acc.form</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_picking_out_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='move_lines']/form[@string='Stock Moves']/group/field[@name='location_dest_id']" position="after">
+                    <field name="analytic_acc" colspan="2"/>
+                </xpath>
+            </field>
+        </record>
+    
+        <record model="ir.ui.view" id="view_stock_move_lines_inc_inherit_analytic_acc_form">
+            <field name="name">view.stock.move.lines.inc.inherit.type.analytic.acc.form</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_picking_in_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='move_lines']/form[@string='Stock Moves']/group/field[@name='location_dest_id']" position="after">
+                    <field name="analytic_acc" colspan="2"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record model="ir.ui.view" id="view_stock_move_lines_int_inherit_analytic_acc_form">
+            <field name="name">view.stock.move.lines.int.inherit.analytic.acc.form</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="stock.view_picking_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/notebook/page/field[@name='move_lines']/form[@string='Stock Moves']/group/field[@name='location_dest_id']" position="after">
+                    <field name="analytic_acc" colspan="2"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>