Merge lp:~rvalyi/openobject-addons/smile-5-0-patches into lp:openobject-addons/5.0

[Raphaël Valyi - http://www.akretion.com]

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

clean up and ergonomic fixes. Care has be taken for not introducing regressions. See blueprint definition. Also please notice that nothing has been added to the data model, only existing data are used, in my opinion using existing data by default just makes sense.

[Husen Daudi (husendaudi)]

merged code for adding purchases link on product form.

review: Approve

=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml	2009-03-10 07:12:13 +0000
+++ purchase/purchase_view.xml	2009-04-29 10:13:57 +0000
@@ -28,6 +28,8 @@
                 </graph>
             </field>
         </record>
+        
+        <act_window domain="[('product_id','=',active_id)]" id="action_purchase_line_product_tree" name="Product purchases" res_model="purchase.order.line" src_model="product.product"/>
 
         <record id="purchase_order_form" model="ir.ui.view">
             <field name="name">purchase.order.form</field>

=== modified file 'sale/__init__.py'
--- sale/__init__.py	2009-01-04 22:12:50 +0000
+++ sale/__init__.py	2009-04-29 10:13:57 +0000
@@ -27,6 +27,7 @@
 import sale
 import stock
 import product
+import invoice
 
 import wizard
 import report

=== modified file 'sale/__terp__.py'
--- sale/__terp__.py	2009-02-03 17:02:20 +0000
+++ sale/__terp__.py	2009-04-29 09:32:01 +0000
@@ -56,8 +56,7 @@
         'sale_report.xml',
         'sale_wizard.xml',
         'stock_view.xml',
-        'process/sale_process.xml',
-        'product_view.xml'
+        'process/sale_process.xml'
     ],
     'demo_xml': ['sale_demo.xml'],
     'installable': True,

=== added file 'sale/invoice.py'
--- sale/invoice.py	1970-01-01 00:00:00 +0000
+++ sale/invoice.py	2009-04-29 10:13:57 +0000
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 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 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+import netsvc
+from osv import fields, osv
+
+
+class account_invoice(osv.osv):
+    _inherit = "account.invoice"
+
+    _columns = {
+            'sale_ids': fields.many2many('sale.order', 'sale_order_invoice_rel', 'invoice_id', 'order_id', 'Sale Orders')
+    }
+
+account_invoice()

=== removed file 'sale/product_view.xml'
--- sale/product_view.xml	2008-12-18 19:54:16 +0000
+++ sale/product_view.xml	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-
-    </data>
-</openerp>

=== modified file 'sale/sale.py'
--- sale/sale.py	2009-04-09 10:02:19 +0000
+++ sale/sale.py	2009-04-29 09:59:22 +0000
@@ -220,7 +220,7 @@
         'project_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft':[('readonly', False)]}),
 
         'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft':[('readonly',False)]}),
-        'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoice', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
+        'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
         'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Packing', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
         'shipped':fields.boolean('Picked', readonly=True),
         'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2009-04-06 12:38:10 +0000
+++ sale/sale_view.xml	2009-04-29 10:13:57 +0000
@@ -210,11 +210,6 @@
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
-                        <page string="History">
-                            <separator colspan="4" string="Related invoices"/>
-                            <field colspan="4" name="invoice_ids" nolabel="1"/>
-                            <field colspan="4" name="picking_ids" nolabel="1"/>
-                        </page>
                     </notebook>
                 </form>
             </field>
@@ -455,6 +450,11 @@
 
         <act_window domain="[('product_id','=',active_id)]" id="action_order_line_product_tree" name="Product sales" res_model="sale.order.line" src_model="product.product"/>
 
+        <act_window domain="[('sale_id','=',active_id)]" id="action_picking_from_sale" name="Packing" res_model="stock.picking" src_model="sale.order" view_mode="tree,form" view_type="form"/>
+
+        <act_window domain="[('sale_ids','in',[active_id])]" id="action_invoices_from_sale" name="Invoices" res_model="account.invoice" src_model="sale.order" view_mode="tree,form" view_type="form"/>
+
+
         <!-- configartion view -->
 
         <record id="view_config_picking_policy" model="ir.ui.view">