Merge lp:~vauxoo/addons-vauxoo/7.0-purchaser_id_order-dev-yani into lp:~vauxoo/addons-vauxoo/addons-vauxoo-cicsa

[Yanina Aular (Vauxoo)]

purchaser_id is added in purchase order.

[lp:~vauxoo/addons-vauxoo/7.0-purchaser_id_order-dev-yani]

1149. By Yanina Aular (Vauxoo) on 2014-11-27

[ADD] purchase_order_contract_analyst module added

1150. By Yanina Aular (Vauxoo) on 2014-11-27

[IMP] pass purchaser_id from PR to PO

1151. By Yanina Aular (Vauxoo) on 2014-11-28

[ADD] merge from trunk

1152. By Yanina Aular (Vauxoo) on 2014-11-28

[ADD] default in purchaser_id

[Yanina Aular (Vauxoo) (yanina-aular)]

review: Approve

[Yanina Aular (Vauxoo) (yanina-aular)]

Runbot is running, but will be merged.

=== added directory 'purchase_order_contract_analyst'
=== added file 'purchase_order_contract_analyst/__init__.py'
--- purchase_order_contract_analyst/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_order_contract_analyst/__init__.py	2014-11-28 03:17:17 +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/>.
+###############################################################################
+
+from . import model
+from . import wizard

=== added file 'purchase_order_contract_analyst/__openerp__.py'
--- purchase_order_contract_analyst/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_order_contract_analyst/__openerp__.py	2014-11-28 03:17:17 +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 Order Contract Analyst",
+    "version": "1.0",
+    "author": "Vauxoo",
+    "category": "purchase",
+    "description": """
+Purchase Order Contract Analyst
+===============================
+
+Extend the purchase order document to add an contract analyst that will
+be responsible for evaluate the purchase order.
+""",
+    "website": "http://www.vauxoo.com/",
+    "license": "",
+    "depends": [
+        "purchase",
+        "purchase_requisition_contract_analyst",
+    ],
+    "demo": [],
+    "data": [
+        "view/purchase_order_view.xml",
+    ],
+    "test": [],
+    "js": [],
+    "css": [],
+    "qweb": [],
+    "installable": True,
+    "auto_install": False,
+    "active": False
+}

=== added directory 'purchase_order_contract_analyst/data'
=== added directory 'purchase_order_contract_analyst/demo'
=== added directory 'purchase_order_contract_analyst/doc'
=== added directory 'purchase_order_contract_analyst/doc/images'
=== added directory 'purchase_order_contract_analyst/i18n'
=== added directory 'purchase_order_contract_analyst/model'
=== added file 'purchase_order_contract_analyst/model/__init__.py'
--- purchase_order_contract_analyst/model/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_order_contract_analyst/model/__init__.py	2014-11-28 03:17:17 +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/>.
+###############################################################################
+
+from . import purchase_order

=== added file 'purchase_order_contract_analyst/model/purchase_order.py'
--- purchase_order_contract_analyst/model/purchase_order.py	1970-01-01 00:00:00 +0000
+++ purchase_order_contract_analyst/model/purchase_order.py	2014-11-28 03:17:17 +0000
@@ -0,0 +1,59 @@
+#!/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/>.
+###############################################################################
+
+from openerp.osv import osv, fields
+
+
+class purchase_order(osv.Model):
+
+    _inherit = 'purchase.order'
+    _columns = {
+        'purchaser_id': fields.many2one(
+            'res.users',
+            'P&C Analyst',
+            domain=[('is_purchaser', '=', True)],
+            help=('Contract Analyst responsible to evaluate the current'
+                  ' purchase order.')),
+    }
+    _defaults = {
+        'purchaser_id': lambda s, c, u, ctx: u,
+            }
+
+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)
+
+        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:
+                po_obj.write(cr, uid, [po_id], {'purchaser_id': requisition.purchaser_id}, context=context)
+        return res

=== added directory 'purchase_order_contract_analyst/report'
=== added directory 'purchase_order_contract_analyst/security'
=== added directory 'purchase_order_contract_analyst/static'
=== added directory 'purchase_order_contract_analyst/static/description'
=== added file 'purchase_order_contract_analyst/static/description/index.html'
=== added directory 'purchase_order_contract_analyst/static/src'
=== added directory 'purchase_order_contract_analyst/static/src/css'
=== added directory 'purchase_order_contract_analyst/static/src/img'
=== added file 'purchase_order_contract_analyst/static/src/img/icon.png'
Binary files purchase_order_contract_analyst/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and purchase_order_contract_analyst/static/src/img/icon.png	2014-11-28 03:17:17 +0000 differ
=== added directory 'purchase_order_contract_analyst/static/src/js'
=== added directory 'purchase_order_contract_analyst/static/src/xml'
=== added directory 'purchase_order_contract_analyst/test'
=== added directory 'purchase_order_contract_analyst/view'
=== added file 'purchase_order_contract_analyst/view/purchase_order_view.xml'
--- purchase_order_contract_analyst/view/purchase_order_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_order_contract_analyst/view/purchase_order_view.xml	2014-11-28 03:17:17 +0000
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record id="purchase_order_ca_form" model="ir.ui.view">
+            <field name="name">purchase.order.contract.analyst.form</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='journal_id']" position="after">
+                    <field name="purchaser_id"/>
+                </xpath>
+            </field>
+        </record>
+        <!--
+        <record id="purchase_order_ca_tree" model="ir.ui.view">
+            <field name="name">purchase.order.contract.analyst.tree</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase.purchase_order_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='user_id']" position="before">
+                    <field name="purchaser_id"/>
+                </xpath>
+            </field>
+        </record>
+        -->
+
+        <!--
+        <record id="purchase_order_ca_search" model="ir.ui.view">
+            <field name="name">purchase.order.contract.analyst.search</field>
+            <field name="model">purchase.order</field>
+            <field name="inherit_id" ref="purchase_order.view_purchase_order_filter"/>
+            <field name="arch" type="xml">
+
+                <xpath expr="//field[@name='exclusive']" position="after">
+                    <field name="purchaser_id"/>
+                </xpath>
+
+                <xpath expr="//group" position="inside">
+                    <filter string="P&amp;C Analyst" icon="terp-personal" context="{'group_by':'purchaser_id'}"/>
+                </xpath>
+
+            </field>
+        </record>
+
+        <record id="res_users_purchaser_form" model="ir.ui.view">
+            <field name="name">res.users.purchaser.form</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='tz']" position="after">
+                    <field name="is_purchaser"/>
+                </xpath>
+            </field>
+        </record>
+        -->
+
+    </data>
+</openerp>

=== added directory 'purchase_order_contract_analyst/wizard'
=== added file 'purchase_order_contract_analyst/wizard/__init__.py'
--- purchase_order_contract_analyst/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_order_contract_analyst/wizard/__init__.py	2014-11-28 03:17:17 +0000
@@ -0,0 +1,24 @@
+#!/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_order_contract_analyst/workflow'