[Merge] : branch merged with lp:openobject-addons

bzr revid: mso@mso-20100419114426-end2ix8cyis4uw39

diff --cc addons/purchase/__openerp__.py
index 0000000,dfa362a..6687b33
mode 000000,100644..100644
--- /dev/null
--- 2/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@@ -1,0 -1,55 +1,58 @@@
+ # -*- coding: utf-8 -*-
+ ##############################################################################
+ #
+ #    OpenERP, Open Source Management Solution
+ #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+ #
+ #    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 Management',
+     'version': '1.1',
+     'category': 'Generic Modules/Sales & Purchases',
+     'description': """
+     Purchase module is for generating a purchase order for purchase of goods from a supplier.
+     A supplier invoice is created for the particular order placed
+ 
+     """,
+     'author': 'Tiny',
+     'website': 'http://www.openerp.com',
+     'depends': ['base', 'account', 'stock', 'process'],
+     'init_xml': [],
+     'update_xml': [
++                   
+         'security/purchase_security.xml',
+         'security/ir.model.access.csv',
+         'purchase_workflow.xml',
+         'purchase_sequence.xml',
+         'purchase_data.xml',
+         'wizard/purchase_order_group_view.xml',
++        'wizard/purchase_installer.xml',
++        'wizard/purchase_line_invoice_view.xml',
+         'purchase_view.xml',
+         'purchase_report.xml',
+         'stock_view.xml',
+         'partner_view.xml',
+         'process/purchase_process.xml',
+         'report/purchase_report_view.xml',
+     ],
+     'demo_xml': ['purchase_demo.xml'],
+     'installable': True,
+     'active': False,
+     'certificate': '0057234283549',
+ }
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc addons/purchase/purchase_view.xml
index cf01027,2dfe737..1ad0d01
--- 1/addons/purchase/purchase_view.xml
--- 2/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@@ -92,9 -92,7 +92,9 @@@
                                      <field name="product_qty"/>
                                      <field name="product_uom"/>
                                      <field name="price_unit"/>
-                                     <field name="price_subtotal"/>
-                                               <field name="invoiced"/>
 -                                    <field name="price_subtotal" groups="base.group_extended"/>
++                                                                      <field name="price_subtotal" groups="base.group_extended"/>
++                                    <field name="invoiced"/>
 +                                              <field name="state"/>                                    
                                  </tree>
                                  <!-- default form view -->
                              </field>

diff --cc addons/purchase_requisition/__openerp__.py
index 0000000,7dfe781..c5a9435
mode 000000,100644..100644
--- /dev/null
--- 2/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@@ -1,0 -1,39 +1,42 @@@
+ ##############################################################################
+ #
+ #    OpenERP, Open Source Management Solution
+ #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+ #
+ #    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 - Purchase Requisition",
+     "version" : "0.1",
+     "author" : "Tiny",
+     "category" : "Generic Modules/Sales & Purchases",
+     "website" : "http://www.openerp.com",
+     "description": """
+     This module allows you to manage your Purchase Requisition.
+     When a purchase order is created, you now have the opportunity to save the related requisition.
+     This new object will regroup and will allow you to easily keep track and order all your purchase orders.
+ """,
+     "depends" : ["purchase","mrp"],
+     "init_xml" : [],
+     "demo_xml" : [],
 -    "update_xml" : ["purchase_requisition_view.xml","security/ir.model.access.csv","purchase_requisition_sequence.xml"],
++    "update_xml" : ["wizard/purchase_requisition_partner_view.xml",
++                    "purchase_requisition_view.xml",
++                    "security/ir.model.access.csv","purchase_requisition_sequence.xml"],
++
+     "active": False,
+     "installable": True
+ }
+ # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+