Merge lp:~vauxoo/addons-vauxoo/purchase_requisition_line_analytic-rev1-yani into lp:addons-vauxoo/7.0

[Yanina Aular (Vauxoo)]

New module that adds a cost center to the purchase requisition line

[lp:~vauxoo/addons-vauxoo/purchase_requisition_line_analytic-rev1-yani]

1059. By Yanina Aular (Vauxoo) on 2014-06-13

[IMP] description and name

=== modified file 'purchase_requisition_line_analytic/model/purchase_requisition.py'
--- purchase_requisition_line_analytic/model/purchase_requisition.py	2014-06-11 21:45:45 +0000
+++ purchase_requisition_line_analytic/model/purchase_requisition.py	2014-06-13 14:00:51 +0000
@@ -35,7 +35,7 @@
 
     _columns = {
         'account_analytic_id': fields.many2one(
-            'account.analytic.plan.instance', 'Analytic Distribution',
+            'account.analytic.account', 'Analytic Account',
                 help='This field is used to assign the selected'\
                 ' analytic account to the line of the purchase order'),
     }
@@ -63,5 +63,5 @@
                 for pol_id in pol_ids:
                     pol_brw = pol_obj.browse(cr, uid, pol_id) 
                     pol_obj.write(cr, uid, [pol_brw.id], {'account_analytic_id':
-                        pol_brw.purchase_requisition_line_id.account_analytic_id}, context=context)
+                        pol_brw.purchase_requisition_line_id.account_analytic_id.id}, context=context)
         return res
 
=== added directory 'purchase_requisition_line_plan'
=== added file 'purchase_requisition_line_plan/__init__.py'
--- purchase_requisition_line_plan/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_plan/__init__.py	2014-06-13 14:00:51 +0000
@@ -0,0 +1,27 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by: Yanina Aular <[e-mail]>
+#    Planified by: Humberto Arocha <[e-mail]>
+#    Audited by: Humberto Arocha <[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
+import wizard
 
=== added file 'purchase_requisition_line_plan/__openerp__.py'
--- purchase_requisition_line_plan/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_plan/__openerp__.py	2014-06-13 14:00:51 +0000
@@ -0,0 +1,54 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by: Yanina Aular <[e-mail]>
+#    Planified by: Humberto Arocha <[e-mail]>
+#    Audited by: Humberto Arocha <[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': 'Purchase Requisition Line Plan',
+    'version': '1.0',
+    'author': 'Vauxoo',
+    'website': 'http://www.vauxoo.com/',
+    'category': '',
+    'description': '''
+A account analytic plan instance is added in purchase requisition lines
+
+Add analytic account plan instance on purchase requisition line and purchase order line, so the purchase order takes
+the account analytic value from the purchase requisition.
+''',
+    'depends': [
+        'account_analytic_plans',
+        'purchase_requisition',
+        'purchase_requisition_line_view',
+        'pr_line_related_po_line',
+        ],
+    'data': [
+        'view/purchase_requisition_view.xml',
+        ],
+    'demo': [],
+    'test': [],
+    'qweb': [],
+    'js': [],
+    'css': [],
+    'active': False,
+    'installable': True,
+}
 
=== added directory 'purchase_requisition_line_plan/data'
=== added directory 'purchase_requisition_line_plan/demo'
=== added directory 'purchase_requisition_line_plan/doc'
=== added directory 'purchase_requisition_line_plan/doc/images'
=== added directory 'purchase_requisition_line_plan/i18n'
=== added directory 'purchase_requisition_line_plan/model'
=== added file 'purchase_requisition_line_plan/model/__init__.py'
--- purchase_requisition_line_plan/model/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_plan/model/__init__.py	2014-06-13 14:00:51 +0000
@@ -0,0 +1,26 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by: Yanina Aular <[e-mail]>
+#    Planified by: Humberto Arocha <[e-mail]>
+#    Audited by: Humberto Arocha <[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 purchase_requisition
 
=== added file 'purchase_requisition_line_plan/model/purchase_requisition.py'
--- purchase_requisition_line_plan/model/purchase_requisition.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_plan/model/purchase_requisition.py	2014-06-13 14:00:51 +0000
@@ -0,0 +1,75 @@
+# -*- encoding: utf-8 -*-
+########################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    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 datetime import datetime
+from dateutil.relativedelta import relativedelta
+import time
+from openerp import netsvc
+
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
+import openerp.addons.decimal_precision as dp
+from openerp import tools
+
+class purchase_order_line(osv.Model):
+    _inherit = "purchase.order.line"
+
+    _columns = {
+        'account_analytic_plan_id': fields.many2one(
+            'account.analytic.plan.instance', 'Analytic Distribution',
+            help='This field is used to assign the selected'\
+                ' analytic account to the line of the purchase order'),
+            
+    }
+
+    
+class purchase_requisition_line(osv.Model):
+    _inherit = "purchase.requisition.line"
+
+    _columns = {
+        'account_analytic_plan_id': fields.many2one(
+            'account.analytic.plan.instance', 'Analytic Distribution',
+            help='This field is used to assign the selected'\
+                ' analytic account to the line of the purchase order'),
+    }
+
+class purchase_requisition(osv.Model):
+    _inherit = "purchase.requisition"
+
+
+    def make_purchase_order(self, cr, uid, ids, partner_id, context=None):
+        if context is None:
+            context = {}
+        res = super(purchase_requisition, self).make_purchase_order(cr, uid, ids, partner_id, context=context)
+        
+        pol_obj = self.pool.get('purchase.order.line')
+        prl_obj = self.pool.get('purchase.requisition.line')
+        po_obj = self.pool.get('purchase.order') 
+
+        for requisition in self.browse(cr, uid, ids, context=context):
+            po_req = po_obj.search(cr, uid, [('requisition_id','=',requisition.id)], context=context)
+            for po_id in po_req:
+                pol_ids = pol_obj.search(cr, uid, [('order_id','=',po_id)])
+                for pol_id in pol_ids:
+                    pol_brw = pol_obj.browse(cr, uid, pol_id) 
+                    pol_obj.write(cr, uid, [pol_brw.id], {'account_analytic_plan_id':
+                        pol_brw.purchase_requisition_line_id.account_analytic_plan_id.id}, context=context)
+        return res
 
=== added directory 'purchase_requisition_line_plan/report'
=== added directory 'purchase_requisition_line_plan/security'
=== added directory 'purchase_requisition_line_plan/static'
=== added directory 'purchase_requisition_line_plan/static/description'
=== added file 'purchase_requisition_line_plan/static/description/index.html'
=== added directory 'purchase_requisition_line_plan/static/src'
=== added directory 'purchase_requisition_line_plan/static/src/css'
=== added directory 'purchase_requisition_line_plan/static/src/img'
=== added file 'purchase_requisition_line_plan/static/src/img/icon.png'
 Binary files purchase_requisition_line_plan/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and purchase_requisition_line_plan/static/src/img/icon.png	2014-06-13 14:00:51 +0000 differ
=== added directory 'purchase_requisition_line_plan/static/src/js'
=== added directory 'purchase_requisition_line_plan/static/src/xml'
=== added directory 'purchase_requisition_line_plan/test'
=== added directory 'purchase_requisition_line_plan/view'
=== added file 'purchase_requisition_line_plan/view/purchase_requisition_view.xml'
--- purchase_requisition_line_plan/view/purchase_requisition_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_plan/view/purchase_requisition_view.xml	2014-06-13 14:00:51 +0000
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record id="view_purchase_requisition_form_account_analytic_plan" model="ir.ui.view">
+            <field name="name">purchase.requisition.form.account.analytic.plan</field>
+            <field name="model">purchase.requisition</field>
+            <field name="inherit_id" ref="purchase_requisition.view_purchase_requisition_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='line_ids']//form//field[@name='product_qty']" position="after">
+                    <field name="account_analytic_plan_id"/>                                        
+                </xpath>
+                <xpath expr="//field[@name='line_ids']//tree//field[@name='product_qty']" position="after">
+                    <field name="account_analytic_plan_id"/>                                        
+                </xpath> 
+            </field>
+        </record> 
+
+        <record id="view_purchase_requisition_line_form_account_analytic" model="ir.ui.view">
+            <field name="name">purchase.requisition.line.form.account.analytic</field>
+            <field name="model">purchase.requisition.line</field>
+            <field name="inherit_id" ref="purchase_requisition_line_view.view_purchase_requisition_line_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='product_qty']" position="after">
+                    <field name="account_analytic_plan_id"/>                                        
+                </xpath>
+            </field>
+        </record> 
+
+        <record id="view_purchase_requisition_line_tree_account_analytic" model="ir.ui.view">
+            <field name="name">purchase.requisition.line.tree.account.analytic</field>
+            <field name="model">purchase.requisition.line</field>
+            <field name="inherit_id" ref="purchase_requisition_line_view.view_purchase_requisition_line_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='product_qty']" position="after">
+                    <field name="account_analytic_plan_id" groups="purchase.group_analytic_accounting"/>                                        
+                </xpath>
+            </field>
+        </record> 
+    </data>
+</openerp>
 
=== added directory 'purchase_requisition_line_plan/wizard'
=== added file 'purchase_requisition_line_plan/wizard/__init__.py'
--- purchase_requisition_line_plan/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_plan/wizard/__init__.py	2014-06-13 14:00:51 +0000
@@ -0,0 +1,25 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+###############################################################################
+#    Module Writen to OpenERP, Open Source Management Solution
+#    Copyright (C) OpenERP Venezuela (<http://www.vauxoo.com>).
+#    All Rights Reserved
+############# Credits #########################################################
+#    Coded by: Yanina Aular <[e-mail]>
+#    Planified by: Humberto Arocha <[e-mail]>
+#    Audited by: Humberto Arocha <[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/>.
+###############################################################################
+
 
=== added directory 'purchase_requisition_line_plan/workflow'