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

[Yanina Aular (Vauxoo)]

The field name is separated from the module purchase_requisition_make_po to purchase_requisition_line_description

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

The merge was made to monitor the RunBot. It is developing

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

1029. By Yanina Aular (Vauxoo) on 2014-06-02

[FIX] bad link to view

1030. By Yanina Aular (Vauxoo) on 2014-06-02

[ADD] dependence to purchase_requisition

1031. By Yanina Aular (Vauxoo) on 2014-06-02

[IMP] edit original view of purchase_requisition_line

1032. By Yanina Aular (Vauxoo) on 2014-06-02

[ADD] module description

1033. By Yanina Aular (Vauxoo) on 2014-06-02

[IMP] word line in view id

1034. By Yanina Aular (Vauxoo) on 2014-06-02

[DEL] code related with acccount_analytic and requisition user

1035. By Yanina Aular (Vauxoo) on 2014-06-02

[ADD] new module, related field purchase_order_line is added in purchase_requisition_line

1036. By Yanina Aular (Vauxoo) on 2014-06-02

[ADD] field purchase_requisition_line_id

1037. By Yanina Aular (Vauxoo) on 2014-06-02

[IMP] change name file python

1038. By Yanina Aular (Vauxoo) on 2014-06-02

[IMP] Overwrite method make_purchase_order, purchase_requisition_line field is added to purchase.order.line model

1039. By Yanina Aular (Vauxoo) on 2014-06-02

[ADD] field related from purchase order line to purchase requisition line

1040. By Yanina Aular (Vauxoo) on 2014-06-02

[ADD] module that adds a field related to purchase requisition line from purchase requisition order

1041. By Yanina Aular (Vauxoo) on 2014-06-02

[ADD] new module purchase_requisition_line_account_analytic

1042. By Yanina Aular (Vauxoo) on 2014-06-02

[FIX] view in purchase_requisition_line_account_analytic

1043. By Yanina Aular (Vauxoo) on 2014-06-02

[ADD] depends in purchase_requisition_make_po

1044. By Yanina Aular (Vauxoo) on 2014-06-02

[IMP] clean code in purchase_requisition_make_po

1045. By Yanina Aular (Vauxoo) on 2014-06-02

[ADD] new module purchase_requisition_requisitor

1046. By Yanina Aular (Vauxoo) on 2014-06-02

[IMP] clean in __openerp__.py of purchase_requisition_make_po and purchase_requisition_requisitor

1047. By Yanina Aular (Vauxoo) on 2014-06-02

[IMP] module name chaged by Purchase Requisition Line Analytic

1048. By Yanina Aular (Vauxoo) on 2014-06-02

[IMP] purchase_requisition_requisitor renamed to purchase_order_requisitor

1049. By Yanina Aular (Vauxoo) on 2014-06-02

[IMP] change depends in urchase_requisition_make_po

1050. By Yanina Aular (Vauxoo) on 2014-06-02

[IMP] module purchase_requisition_line_account_analytic name changed to purchase_requisition_line_analytic

1051. By Yanina Aular (Vauxoo) on 2014-06-02

[ADD] copy requisitor of purchase requisition line to purchase order

1052. By Yanina Aular (Vauxoo) on 2014-06-02

[ADD] description added to pr_line_related_po_line, purchase_requisition_line_analytic, and purchase_requisition_line_description modules

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

Ready to merge

review: Approve

=== added directory 'pr_line_related_po_line'
=== added file 'pr_line_related_po_line/__init__.py'
--- pr_line_related_po_line/__init__.py	1970-01-01 00:00:00 +0000
+++ pr_line_related_po_line/__init__.py	2014-06-02 22:18:31 +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 'pr_line_related_po_line/__openerp__.py'
--- pr_line_related_po_line/__openerp__.py	1970-01-01 00:00:00 +0000
+++ pr_line_related_po_line/__openerp__.py	2014-06-02 22:18:31 +0000
@@ -0,0 +1,52 @@
+#!/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': 'pr_line_related_po_line',
+    'version': '1.0',
+    'author': 'Vauxoo',
+    'website': 'http://www.vauxoo.com/',
+    'category': '',
+    'description': '''
+Add purchase_requisition_line_id field, it is id of purchase requisition line from where purchase
+order line is created, overwrite  the make_purchase_order method for add value of
+purchase_requisition_line_id to record purchase order line, it is help to make best inherit and
+modification of make_purchase_order method, as can be seen in
+purchase_requisition_line_description, purchase_requisition_line_analytic and
+purchase_requisition_requisitor modules.  
+''',
+    'depends': [
+        'purchase',
+        'purchase_requisition',
+        ],
+    'data': [],
+    'demo': [],
+    'test': [],
+    'qweb': [],
+    'js': [],
+    'css': [],
+    'active': False,
+    'installable': True,
+}

=== added directory 'pr_line_related_po_line/data'
=== added directory 'pr_line_related_po_line/demo'
=== added directory 'pr_line_related_po_line/doc'
=== added directory 'pr_line_related_po_line/doc/images'
=== added directory 'pr_line_related_po_line/i18n'
=== added directory 'pr_line_related_po_line/model'
=== added file 'pr_line_related_po_line/model/__init__.py'
--- pr_line_related_po_line/model/__init__.py	1970-01-01 00:00:00 +0000
+++ pr_line_related_po_line/model/__init__.py	2014-06-02 22:18:31 +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/>.
+###############################################################################
+import purchase_order_line

=== added file 'pr_line_related_po_line/model/purchase_order_line.py'
--- pr_line_related_po_line/model/purchase_order_line.py	1970-01-01 00:00:00 +0000
+++ pr_line_related_po_line/model/purchase_order_line.py	2014-06-02 22:18:31 +0000
@@ -0,0 +1,92 @@
+#!/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 fields, osv
+from openerp import netsvc
+from openerp.tools.translate import _
+
+class purchase_order_line(osv.Model):
+
+    _inherit = 'purchase.order.line'
+
+    _columns = {
+            'purchase_requisition_line_id': fields.many2one('purchase.requisition.line',"Purchase \
+                Requisition Line"),
+            }
+
+class purchase_requisition(osv.Model):
+
+    _inherit = 'purchase.requisition'
+
+    def make_purchase_order(self, cr, uid, ids, partner_id, context=None):
+        """
+        Create New RFQ for Supplier
+        """
+        if context is None:
+            context = {}
+        assert partner_id, 'Supplier should be specified'
+        purchase_order = self.pool.get('purchase.order')
+        purchase_order_line = self.pool.get('purchase.order.line')
+        res_partner = self.pool.get('res.partner')
+        fiscal_position = self.pool.get('account.fiscal.position')
+        supplier = res_partner.browse(cr, uid, partner_id, context=context)
+        supplier_pricelist = supplier.property_product_pricelist_purchase or False
+        res = {}
+        for requisition in self.browse(cr, uid, ids, context=context):
+            if supplier.id in filter(lambda x: x, [rfq.state <> 'cancel' and rfq.partner_id.id or None for rfq in requisition.purchase_ids]):
+                 raise osv.except_osv(_('Warning!'), _('You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation.') % rfq.state)
+            location_id = requisition.warehouse_id.lot_input_id.id
+            purchase_id = purchase_order.create(cr, uid, {
+                        'origin': requisition.name,
+                        'partner_id': supplier.id,
+                        'pricelist_id': supplier_pricelist.id,
+                        'location_id': location_id,
+                        'company_id': requisition.company_id.id,
+                        'fiscal_position': supplier.property_account_position and supplier.property_account_position.id or False,
+                        'requisition_id':requisition.id,
+                        'notes':requisition.description,
+                        'warehouse_id':requisition.warehouse_id.id ,
+            })
+            res[requisition.id] = purchase_id
+            for line in requisition.line_ids:
+                product = line.product_id
+                seller_price, qty, default_uom_po_id, date_planned = self._seller_details(cr, uid, line, supplier, context=context)
+                taxes_ids = product.supplier_taxes_id
+                taxes = fiscal_position.map_tax(cr, uid, supplier.property_account_position, taxes_ids)
+                purchase_order_line.create(cr, uid, {
+                    'order_id': purchase_id,
+                    #change
+                    'purchase_requisition_line_id': line.id,
+                    #end change
+                    'name': product.partner_ref,
+                    'product_qty': qty,
+                    'product_id': product.id,
+                    'product_uom': default_uom_po_id,
+                    'price_unit': seller_price,
+                    'date_planned': date_planned,
+                    'taxes_id': [(6, 0, taxes)],
+                }, context=context)
+                
+        return res

=== added directory 'pr_line_related_po_line/report'
=== added directory 'pr_line_related_po_line/security'
=== added directory 'pr_line_related_po_line/static'
=== added directory 'pr_line_related_po_line/static/description'
=== added file 'pr_line_related_po_line/static/description/index.html'
=== added directory 'pr_line_related_po_line/static/src'
=== added directory 'pr_line_related_po_line/static/src/css'
=== added directory 'pr_line_related_po_line/static/src/img'
=== added file 'pr_line_related_po_line/static/src/img/icon.png'
Binary files pr_line_related_po_line/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and pr_line_related_po_line/static/src/img/icon.png	2014-06-02 22:18:31 +0000 differ
=== added directory 'pr_line_related_po_line/static/src/js'
=== added directory 'pr_line_related_po_line/static/src/xml'
=== added directory 'pr_line_related_po_line/test'
=== added directory 'pr_line_related_po_line/view'
=== added directory 'pr_line_related_po_line/wizard'
=== added file 'pr_line_related_po_line/wizard/__init__.py'
--- pr_line_related_po_line/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ pr_line_related_po_line/wizard/__init__.py	2014-06-02 22:18:31 +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 'pr_line_related_po_line/workflow'
=== added directory 'purchase_order_requisitor'
=== added file 'purchase_order_requisitor/__init__.py'
--- purchase_order_requisitor/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_order_requisitor/__init__.py	2014-06-02 22:18:31 +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_order_requisitor/__openerp__.py'
--- purchase_order_requisitor/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_order_requisitor/__openerp__.py	2014-06-02 22:18:31 +0000
@@ -0,0 +1,48 @@
+#!/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 Requisitor',
+    'version': '1.0',
+    'author': 'Vauxoo',
+    'website': 'http://www.vauxoo.com/',
+    'category': '',
+    'description': '''
+    Add a user field named Requisitor. 
+''',
+    'depends': [
+        'purchase_requisition',
+        ],
+    'data': [
+        'view/purchase_requisition_view.xml',
+        ],
+    'demo': [],
+    'test': [],
+    'qweb': [],
+    'js': [],
+    'css': [],
+    'active': False,
+    'installable': True,
+}

=== added directory 'purchase_order_requisitor/data'
=== added directory 'purchase_order_requisitor/demo'
=== added directory 'purchase_order_requisitor/doc'
=== added directory 'purchase_order_requisitor/doc/images'
=== added directory 'purchase_order_requisitor/i18n'
=== added directory 'purchase_order_requisitor/model'
=== added file 'purchase_order_requisitor/model/__init__.py'
--- purchase_order_requisitor/model/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_order_requisitor/model/__init__.py	2014-06-02 22:18:31 +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

=== renamed file 'purchase_requisition_make_po/purchase_requisition.py' => 'purchase_order_requisitor/model/purchase_requisition.py'
--- purchase_requisition_make_po/purchase_requisition.py	2014-05-09 21:51:34 +0000
+++ purchase_order_requisitor/model/purchase_requisition.py	2014-06-02 22:18:31 +0000
@@ -29,112 +29,23 @@
 import openerp.addons.decimal_precision as dp
 from openerp import tools
 
-
-class purchase_requisition_line(osv.Model):
-    _inherit = "purchase.requisition.line"
+class purchase_order(osv.Model):
+    _inherit = "purchase.order"
 
     _columns = {
-        'name': fields.text('Description', required=True),
-        'account_analytic_id': fields.many2one(
-            'account.analytic.account', 'Analytic Account',
-                help='This field is used to assign the selected'\
-                ' analytic account to the line of the purchase order'),
+        'rfq_user_id': fields.many2one('res.users', 'Requisitor'),
     }
-    
-    def init(self, cr ):
-        cr.execute("""UPDATE purchase_requisition_line prl 
-                      SET name = (SELECT CONCAT('[',default_code,']',' ', name_template )
-                                  FROM product_product pp 
-                                  WHERE pp.id = prl.product_id)
-                                  WHERE prl.name is NULL""") 
-    
-    def onchange_product_id(self, cr, uid, ids, product_id,
-                            product_uom_id, context=None):
-        product_obj = self.pool.get('product.product')
-        res = {'value': {'name': ''}}
-        if product_id:
-            product_name = product_obj.name_get(
-                cr, uid, product_id, context=context)
-            dummy, name = product_name and product_name[0] or (False,
-                                                                False)
-
-            product = product_obj.browse(cr, uid, product_id,
-                                                    context=context)
-            if product.description_purchase:
-                name += '\n' + product.description_purchase
-            res['value'].update({'name': name})
-        return res
-
-purchase_requisition_line()
-
 
 class purchase_requisition(osv.Model):
     _inherit = "purchase.requisition"
 
+
     def make_purchase_order(self, cr, uid, ids, partner_id,
-                                    context=None):  # method override
-        """
-        Create New RFQ for Supplier
-        """
+                                    context=None):
         if context is None:
             context = {}
-        assert partner_id, 'Supplier should be specified'
-        purchase_order = self.pool.get('purchase.order')
-        purchase_order_line = self.pool.get('purchase.order.line')
-        res_partner = self.pool.get('res.partner')
-        fiscal_position = self.pool.get('account.fiscal.position')
-        supplier = res_partner.browse(cr, uid, partner_id,
-                                                        context=context)
-        supplier_pricelist =\
-                supplier.property_product_pricelist_purchase or False
-        res = {}
-        for requisition in self.browse(cr, uid, ids, context=context):
-            if supplier.id in filter(lambda x: x,
-                [rfq.state <> 'cancel' and rfq.partner_id.id or None\
-                    for rfq in requisition.purchase_ids]):
-                raise osv.except_osv(
-                    _('Warning!'), _('You have already one %s purchase'\
-                    ' order for this partner, you must cancel this'\
-                    ' purchase order to create a new quotation.') %\
-                                                              rfq.state)
-            location_id = requisition.warehouse_id.lot_input_id.id
-            purchase_id = purchase_order.create(cr, uid, {
-                'origin': requisition.name,
-                'partner_id': supplier.id,
-                'pricelist_id': supplier_pricelist.id,
-                'location_id': location_id,
-                'company_id': requisition.company_id.id,
-                'fiscal_position': supplier.property_account_position\
-                    and supplier.property_account_position.id or False,
-                'requisition_id': requisition.id,
-                'notes': requisition.description,
-                'warehouse_id': requisition.warehouse_id.id,
-            })
-            res[requisition.id] = purchase_id
-            for line in requisition.line_ids:
-                product = line.product_id
-                seller_price, qty, default_uom_po_id, date_planned =\
-                    self._seller_details(cr, uid, line, supplier,
-                                                        context=context)
-                taxes_ids = product.supplier_taxes_id
-                taxes = fiscal_position.map_tax(
-                    cr, uid, supplier.property_account_position,
-                                                            taxes_ids)
-                purchase_order_line.create(cr, uid, {
-                    'order_id': purchase_id,
-                    # start custom change
-                    #'name': product.partner_ref,
-                    'name': line.name,
-                    # end custom change
-                    'product_qty': qty,
-                    'product_id': product.id,
-                    'product_uom': default_uom_po_id,
-                    'price_unit': seller_price,
-                    'date_planned': date_planned,
-                    'taxes_id': [(6, 0, taxes)],
-                    'account_analytic_id': line.account_analytic_id\
-                            and line.account_analytic_id.id or False,
-                }, context=context)
+        res = super(purchase_requisition, self).make_purchase_order(cr, uid, ids, partner_id, context=context)
+
         if res:
             requisition_user = self.browse(
                 cr, uid, res.keys()[0], context=context).user_id
@@ -143,11 +54,3 @@
                             cr, uid, res[res.keys()[0]],
                             {'rfq_user_id': requisition_user.id})
         return res
-
-
-class purchase_order(osv.Model):
-    _inherit = "purchase.order"
-
-    _columns = {
-        'rfq_user_id': fields.many2one('res.users', 'Requisitor'),
-    }

=== added directory 'purchase_order_requisitor/report'
=== added directory 'purchase_order_requisitor/security'
=== added directory 'purchase_order_requisitor/static'
=== added directory 'purchase_order_requisitor/static/description'
=== added file 'purchase_order_requisitor/static/description/index.html'
=== added directory 'purchase_order_requisitor/static/src'
=== added directory 'purchase_order_requisitor/static/src/css'
=== added directory 'purchase_order_requisitor/static/src/img'
=== added file 'purchase_order_requisitor/static/src/img/icon.png'
Binary files purchase_order_requisitor/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and purchase_order_requisitor/static/src/img/icon.png	2014-06-02 22:18:31 +0000 differ
=== added directory 'purchase_order_requisitor/static/src/js'
=== added directory 'purchase_order_requisitor/static/src/xml'
=== added directory 'purchase_order_requisitor/test'
=== added directory 'purchase_order_requisitor/view'
=== renamed file 'purchase_requisition_make_po/purchase_requisition_view.xml' => 'purchase_order_requisitor/view/purchase_requisition_view.xml'
--- purchase_requisition_make_po/purchase_requisition_view.xml	2014-05-09 21:51:34 +0000
+++ purchase_order_requisitor/view/purchase_requisition_view.xml	2014-06-02 22:18:31 +0000
@@ -1,25 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <record id="view_purchase_requisition_form_inherit" model="ir.ui.view">
-            <field name="name">purchase.requisition.form.inherit</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']//tree//field[@name='product_qty']" position="before">
-                    <field name="name"/>
-                </xpath>
-                <xpath expr="//field[@name='line_ids']//form//field[@name='product_qty']" position="before">
-                    <field name="name"/>
-                </xpath>
-                <xpath expr="//field[@name='line_ids']//form//field[@name='name']" position="after">
-                    <field name="account_analytic_id" groups="purchase.group_analytic_accounting"/>                                        
-                </xpath>
-                <xpath expr="//field[@name='line_ids']//tree//field[@name='name']" position="after">
-                    <field name="account_analytic_id" groups="purchase.group_analytic_accounting"/>                                        
-                </xpath> 
-            </field>
-        </record> 
         <record model="ir.ui.view" id="inherit_purchase_order_view2">
             <field name="name">purchase.order.view.inherit2</field>
             <field name="model">purchase.order</field>

=== added directory 'purchase_order_requisitor/wizard'
=== added file 'purchase_order_requisitor/wizard/__init__.py'
--- purchase_order_requisitor/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_order_requisitor/wizard/__init__.py	2014-06-02 22:18:31 +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_order_requisitor/workflow'
=== added directory 'purchase_requisition_line_analytic'
=== added file 'purchase_requisition_line_analytic/__init__.py'
--- purchase_requisition_line_analytic/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_analytic/__init__.py	2014-06-02 22:18:31 +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_analytic/__openerp__.py'
--- purchase_requisition_line_analytic/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_analytic/__openerp__.py	2014-06-02 22:18:31 +0000
@@ -0,0 +1,53 @@
+#!/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 Analytic',
+    'version': '1.0',
+    'author': 'Vauxoo',
+    'website': 'http://www.vauxoo.com/',
+    'category': '',
+    'description': '''
+A account analytic is added in purchase requisition lines
+
+Add analytic account on purchase requisition line, so the purchase order takes
+the account analytic value from the purchase requisition.
+''',
+    'depends': [
+        '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_analytic/data'
=== added directory 'purchase_requisition_line_analytic/demo'
=== added directory 'purchase_requisition_line_analytic/doc'
=== added directory 'purchase_requisition_line_analytic/doc/images'
=== added directory 'purchase_requisition_line_analytic/i18n'
=== added directory 'purchase_requisition_line_analytic/model'
=== added file 'purchase_requisition_line_analytic/model/__init__.py'
--- purchase_requisition_line_analytic/model/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_analytic/model/__init__.py	2014-06-02 22:18:31 +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_analytic/model/purchase_requisition.py'
--- purchase_requisition_line_analytic/model/purchase_requisition.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_analytic/model/purchase_requisition.py	2014-06-02 22:18:31 +0000
@@ -0,0 +1,67 @@
+# -*- 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_requisition_line(osv.Model):
+    _inherit = "purchase.requisition.line"
+
+    _columns = {
+        'account_analytic_id': fields.many2one(
+            'account.analytic.account', 'Analytic Account',
+                help='This field is used to assign the selected'\
+                ' analytic account to the line of the purchase order'),
+    }
+    
+purchase_requisition_line()
+
+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_id':
+                        pol_brw.purchase_requisition_line_id.account_analytic_id}, context=context)
+        return res

=== added directory 'purchase_requisition_line_analytic/report'
=== added directory 'purchase_requisition_line_analytic/security'
=== added directory 'purchase_requisition_line_analytic/static'
=== added directory 'purchase_requisition_line_analytic/static/description'
=== added file 'purchase_requisition_line_analytic/static/description/index.html'
=== added directory 'purchase_requisition_line_analytic/static/src'
=== added directory 'purchase_requisition_line_analytic/static/src/css'
=== added directory 'purchase_requisition_line_analytic/static/src/img'
=== added file 'purchase_requisition_line_analytic/static/src/img/icon.png'
Binary files purchase_requisition_line_analytic/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and purchase_requisition_line_analytic/static/src/img/icon.png	2014-06-02 22:18:31 +0000 differ
=== added directory 'purchase_requisition_line_analytic/static/src/js'
=== added directory 'purchase_requisition_line_analytic/static/src/xml'
=== added directory 'purchase_requisition_line_analytic/test'
=== added directory 'purchase_requisition_line_analytic/view'
=== added file 'purchase_requisition_line_analytic/view/purchase_requisition_view.xml'
--- purchase_requisition_line_analytic/view/purchase_requisition_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_analytic/view/purchase_requisition_view.xml	2014-06-02 22:18:31 +0000
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record id="view_purchase_requisition_form_account_analytic" model="ir.ui.view">
+            <field name="name">purchase.requisition.form.account.analytic</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_id" groups="purchase.group_analytic_accounting"/>                                        
+                </xpath>
+                <xpath expr="//field[@name='line_ids']//tree//field[@name='product_qty']" position="after">
+                    <field name="account_analytic_id" groups="purchase.group_analytic_accounting"/>                                        
+                </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_id" groups="purchase.group_analytic_accounting"/>                                        
+                </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_id" groups="purchase.group_analytic_accounting"/>                                        
+                </xpath>
+            </field>
+        </record> 
+    </data>
+</openerp>

=== added directory 'purchase_requisition_line_analytic/wizard'
=== added file 'purchase_requisition_line_analytic/wizard/__init__.py'
--- purchase_requisition_line_analytic/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_analytic/wizard/__init__.py	2014-06-02 22:18:31 +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_analytic/workflow'
=== added directory 'purchase_requisition_line_description'
=== added file 'purchase_requisition_line_description/__init__.py'
--- purchase_requisition_line_description/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_description/__init__.py	2014-06-02 22:18:31 +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_description/__openerp__.py'
--- purchase_requisition_line_description/__openerp__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_description/__openerp__.py	2014-06-02 22:18:31 +0000
@@ -0,0 +1,61 @@
+#!/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 Description',
+    'version': '1.0',
+    'author': 'Vauxoo',
+    'website': 'http://www.vauxoo.com/',
+    'category': '',
+    'description': '''
+A description is added in purchase requisition lines
+
+Add description on product.
+
+Technical warning \n
+Add method override to def make_purchase_order from purchase_requisition\n
+When you install this module in the server show this warning:
+
+     WARNING: unable to set column name of table purchase_requisition_line not null !
+
+When you upgrade this module the field 'name' is set product name and 
+this warning not be displayed more.
+''',
+    'depends': [
+        '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_description/data'
=== added directory 'purchase_requisition_line_description/demo'
=== added directory 'purchase_requisition_line_description/doc'
=== added directory 'purchase_requisition_line_description/doc/images'
=== added directory 'purchase_requisition_line_description/i18n'
=== added directory 'purchase_requisition_line_description/model'
=== added file 'purchase_requisition_line_description/model/__init__.py'
--- purchase_requisition_line_description/model/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_description/model/__init__.py	2014-06-02 22:18:31 +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_line

=== added file 'purchase_requisition_line_description/model/purchase_requisition_line.py'
--- purchase_requisition_line_description/model/purchase_requisition_line.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_description/model/purchase_requisition_line.py	2014-06-02 22:18:31 +0000
@@ -0,0 +1,88 @@
+# -*- 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_requisition_line(osv.Model):
+    _inherit = "purchase.requisition.line"
+
+    _columns = {
+        'name': fields.text('Description', required=True),
+    }
+    
+    def init(self, cr ):
+        cr.execute("""UPDATE purchase_requisition_line prl 
+                      SET name = (SELECT CONCAT('[',default_code,']',' ', name_template )
+                                  FROM product_product pp 
+                                  WHERE pp.id = prl.product_id)
+                                  WHERE prl.name is NULL""") 
+    
+    def onchange_product_id(self, cr, uid, ids, product_id,
+                            product_uom_id, context=None):
+        product_obj = self.pool.get('product.product')
+        res = {'value': {'name': ''}}
+        if product_id:
+            product_name = product_obj.name_get(
+                cr, uid, product_id, context=context)
+            dummy, name = product_name and product_name[0] or (False,
+                                                                False)
+
+            product = product_obj.browse(cr, uid, product_id,
+                                                    context=context)
+            if product.description_purchase:
+                name += '\n' + product.description_purchase
+            res['value'].update({'name': name})
+        return res
+
+purchase_requisition_line()
+
+
+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], {'name':
+                        pol_brw.purchase_requisition_line_id.name}, context=context)
+        return res

=== added directory 'purchase_requisition_line_description/report'
=== added directory 'purchase_requisition_line_description/security'
=== added directory 'purchase_requisition_line_description/static'
=== added directory 'purchase_requisition_line_description/static/description'
=== added file 'purchase_requisition_line_description/static/description/index.html'
=== added directory 'purchase_requisition_line_description/static/src'
=== added directory 'purchase_requisition_line_description/static/src/css'
=== added directory 'purchase_requisition_line_description/static/src/img'
=== added file 'purchase_requisition_line_description/static/src/img/icon.png'
Binary files purchase_requisition_line_description/static/src/img/icon.png	1970-01-01 00:00:00 +0000 and purchase_requisition_line_description/static/src/img/icon.png	2014-06-02 22:18:31 +0000 differ
=== added directory 'purchase_requisition_line_description/static/src/js'
=== added directory 'purchase_requisition_line_description/static/src/xml'
=== added directory 'purchase_requisition_line_description/test'
=== added directory 'purchase_requisition_line_description/view'
=== added file 'purchase_requisition_line_description/view/purchase_requisition_view.xml'
--- purchase_requisition_line_description/view/purchase_requisition_view.xml	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_description/view/purchase_requisition_view.xml	2014-06-02 22:18:31 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record id="view_purchase_requisition_form_inherit_description" model="ir.ui.view">
+            <field name="name">purchase.requisition.form.inherit.description</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']//tree//field[@name='product_qty']" position="before">
+                    <field name="name"/>
+                </xpath>
+                <xpath expr="//field[@name='line_ids']//form//field[@name='product_qty']" position="before">
+                    <field name="name"/>
+                </xpath>
+            </field>
+        </record> 
+
+
+        <record id="view_purchase_requisition_line_form_description" model="ir.ui.view">
+            <field name="name">purchase.requisition.line.form.description</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_id']" position="after">
+                    <field name="name"/>
+                </xpath>
+            </field>
+        </record> 
+        <record id="view_purchase_requisition_line_tree_description" model="ir.ui.view">
+            <field name="name">purchase.requisition.line.tree.description</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_id']" position="after">
+                    <field name="name"/>
+                </xpath>
+            </field>
+        </record> 
+
+    </data>
+</openerp>

=== added directory 'purchase_requisition_line_description/wizard'
=== added file 'purchase_requisition_line_description/wizard/__init__.py'
--- purchase_requisition_line_description/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ purchase_requisition_line_description/wizard/__init__.py	2014-06-02 22:18:31 +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_description/workflow'
=== modified file 'purchase_requisition_make_po/__openerp__.py'
--- purchase_requisition_make_po/__openerp__.py	2014-05-09 21:51:34 +0000
+++ purchase_requisition_make_po/__openerp__.py	2014-06-02 22:18:31 +0000
@@ -40,9 +40,12 @@
 When you upgrade this module the field 'name' is set product name and 
 this warning not be displayed more.
 """,
-    'depends' : ['purchase_requisition'],
-    'data': [ 'purchase_requisition_view.xml',
-            ],
+    'depends' : ['purchase_requisition',
+                'purchase_requisition_line_description',
+                'purchase_requisition_line_analytic',
+                'purchase_order_requisitor',
+                ],
+    'data': [],
     'auto_install': False,
     'installable': True,
 }