Merge lp:~npg-team/openobject-addons/assembly_bom_npg into lp:openobject-addons

[Novapoint Group]

NovaPoint Group has developed this module to provide true assembly sales bom support to OpenERP. Adds a new bom type, allows for assembling the BOM at time of picking. Accurately records the inventory.

[Fabien (Open ERP) (fp-tinyerp)]

s/ecoding/encoding/g

[Fabien (Open ERP) (fp-tinyerp)]

We think it's better to implement this in a community module.

[Fabien (Open ERP) (fp-tinyerp)]

it's not normal to add a reporting engine in this module.

[Fabien (Open ERP) (fp-tinyerp)]

Hello,

Thank you for this good contribution. I checked your branches and I would suggest to keep them in your own branch for now on, instead of putting them in the official release. Please register them in apps.openerp.com if it's not already done; if people use them in v6.1, we will think about merging them to the official branch.

As these modules have thousands lines of code, we would not have the time to efficiently review the code, check the usability experience and test for v6.1. I propose to review this later on, if we see people using it from apps.

Thanks,

[Olivier Dony (Odoo) (odo-openerp)]

Hello,

I would like to explain a little bit more why this merge proposal was rejected, in 2 parts: our policy for merge proposals, then some specific hints.

1. Merge Proposal Acceptance Policy
===================================
There may have been contradicting messages about how and when it is useful to make a merge proposal.
We would like to state this policy very clearly, especially now that extra-addons have been deprecated due to the introduction of OpenERP Apps. So we have now added an official Merge Proposal Acceptance Policy to our contributor documentation, please have a look: http://bit.ly/openerp-contrib-mp

2. Remarks specific to this merge proposal
==========================================
In approximate order of importance:

- based on your minimal description (it would help to have more), it looks like this module should be:
  + either a general purpose extra feature that would be a great addition for OpenERP Apps, as explained in the policy, but does not need to be included in official addons now
  + or simply a modification of the original mrp module, to make the implementation simpler and less brittle (if validated functionally)
- the size of the merge proposal diff is very large (+3000 lines) compared to the scope:
  + lot of copy/pasted code from original addons, are they all really necessary? (if yes, please make merge proposals to split the original functions into smaller, more extensible functions)
  + you included a "tiny_sxw2rml.py" script and dependent files that look totally useless and out of place (1100+ lines!)
  + some parts look quite optional or not directly related to the module's purpose, reports, etc.
- there's a cr.commit() in your code, this is unacceptable! (see coding guidelines)
- usability: no tooltips explaining what an assembly bom is and how it differs from phantom bom (on the Bom type selection)
- you should be careful when comparing computed float values, due to float rounding
- no proper description of the features in the module manifest, nor how to use them
- many useless python imports (netsvc, pooler, ...)
- multiple leftover "print" debugging statements
- some remaining commented out code lines, which should be removed

I hope this helps,

Thanks!

review: Disapprove (policy + quick technical scan)

Unmerged revisions

5304. By Novapoint Group on 2011-10-06

[Add]: assembly_bom module to provide true assembly sales support to OpenERP

=== added directory 'assembly_bom'
=== added file 'assembly_bom/__init__.py'
--- assembly_bom/__init__.py	1970-01-01 00:00:00 +0000
+++ assembly_bom/__init__.py	2011-10-06 15:31:48 +0000
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 mrp
+import report
+import wizard
+import product
+import procurement
+import stock
+import sale
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'assembly_bom/__openerp__.py'
--- assembly_bom/__openerp__.py	1970-01-01 00:00:00 +0000
+++ assembly_bom/__openerp__.py	2011-10-06 15:31:48 +0000
@@ -0,0 +1,53 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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/>
+#
+##############################################################################
+
+{
+    "name" : "Assembly BoM",
+    "version" : "0.22",
+    "author" : 'NovaPoint Group LLC',
+    "description": """
+    Adds a new catagory for the BOM as 'assembly bom'
+    """,
+    "category" : "Customization",
+    "website" : "http://www.novapointgroup.com/",
+    "depends" : [
+                 'base',
+                 'mrp',
+                 'sale',
+                 'stock',
+                ],
+    "init_xml" : [],
+
+    "demo_xml" : [],
+
+    "update_xml" : [
+                    'report/report_view.xml',
+                    'wizard/consumption_report_wizard.xml',
+                    'stock_view.xml',
+                    'product_view.xml',
+                    ],
+    "test" : [],
+    "active": False,
+    "installable": True,
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'assembly_bom/change_log.txt'
--- assembly_bom/change_log.txt	1970-01-01 00:00:00 +0000
+++ assembly_bom/change_log.txt	2011-10-06 15:31:48 +0000
@@ -0,0 +1,85 @@
+Version 0.22 by Janeesh (22 Sept 2011)
+	* Updation of Weights and price of products of all Bom types
+	
+Version 0.21 by Vinod (16 Sept 2011)
+	* Weights and price of products which are of type assembly bom is automatically updated with the sum of the values of its components when they change for any component.
+Version 0.20 by Vinod (15 Sept 2011)
+	* Customized the product view to include the BOM Stock.
+
+Version 0.19 by Jabir (18 July 2011)
+	* Removed location filtering according to available products
+
+Version 0.18 by Arif (5 July 2011)
+	* Update method on bom
+
+Version 0.16 > 0.17
+	* Display warning on no stock available for product with normal bom and make to order
+	
+Version 0.15 > 0.16
+	* Display warning on no stock available according to the location selected
+	
+Version 0.14 > 0.15
+	* Fixed the issue with product onchange function on sale order line
+	* Add filtering of stock location according to stock availability on delivery order line
+Version 0.13 > 0.14
+	* Done stock checking for assembly bom product
+	* Fixed the default date issue for stock move and stock picking
+Version 0.12 > 0.13
+	* Filter Source Location in Stock Moves
+	* Show pop-up alertif there is no stock available in stock move
+
+Version 0.11 > 0.12
+	* Call action_assign for all moves
+
+Version 0.10 > 0.11
+	* commenting
+Version 0.09 > 0.10
+	* Added the reference in the report
+	* cleared the issue with the extra move
+	* Added the sale id for the move with sale order of a product with normal BOM
+	* Added the from and to dates in the report
+	* cleared issue with the updation of the shipped (Delivered) field in Sale order Form
+
+Version 0.08 > 0.09
+	* Added the _product_qty function in the product object to correct bom stock value
+
+Version 0.07 > 0.08
+	* Added Sale Order Ref in stock move
+
+Version 0.06 > 0.07
+	* Added date fields in the wizard for consumption report
+	* Made modifications in the find consumption details method
+	* Added one more column in the consumption details report
+	* Modified the find consumption details method in product accordingly
+
+Version 0.05 > 0.06
+	* modified the method 'action_produce_assign_product' in procurement.order object
+		to remove the duplication of production order while the procurement is tried to run from the sale order
+		with a product with assembly bom
+
+	* Added new py files procurement and product and stock to neatly handle the objects
+
+Version 0.04 > 0.05
+	* Removed unwanted lines from files and modified the consumption report to be working with multiple documents
+	* and showing a no consumption details message in the report if the product is no longer consumed
+
+Version 0.03 > 0.04  by Sinoj
+	* Added the defaults value for ware house in the product consumption wizard
+
+Version 0.02 > 0.03  by Vijayakanth
+	* Added stock moves to suffice the proper updation of stock ie a move from production to stock then to output and then to
+		customer location and modified the assembly order destination location id so as to move the finished products to stock
+
+	* Added field parent_bom_id in the move object to support multiple lines in sale order (detailed check pending)
+
+Version 0.01 > 0.02  by Vijayakanth
+	* Added a wizard and report to the assembly bom module
+	* Added one more field production ids in stock move table to make it easy
+	  for getting the relation ship with production
+	* Added the kit_id field in the move object to store assembly process id (production object)
+	* This is solely for the assembly bom
+
+	* phantom bom subproducts are sold separately and stock move occures to customer location
+	* assembly bom subroducts are moved to production and tracked using kit_id and finshed goods to customers
+	* Normal bom subproduct move occures when procurement operation completes and its also tracked using production_ids field
+

=== added file 'assembly_bom/mrp.py'
--- assembly_bom/mrp.py	1970-01-01 00:00:00 +0000
+++ assembly_bom/mrp.py	2011-10-06 15:31:48 +0000
@@ -0,0 +1,98 @@
+# -*- ecoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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/>
+#
+##############################################################################
+
+from osv import fields, osv
+import netsvc
+import datetime
+import time
+
+class bom(osv.osv):
+    
+    def _update_product_weight(self, cr, uid, bom_obj, context=None):
+        weight = 0.00
+        weight_net = 0.00
+        standard_price = 0.00
+        if not context:
+            context = {}
+        child_ids = self.search(cr, uid, [('bom_id', 'child_of', [bom_obj.id])], context=context)
+        if child_ids and bom_obj.id in child_ids:
+            child_ids.remove(bom_obj.id)
+        if len(child_ids) == 0:
+            weight = bom_obj.product_id.weight * bom_obj.product_qty
+            weight_net = bom_obj.product_id.weight_net * bom_obj.product_qty
+            standard_price = bom_obj.product_id.standard_price * bom_obj.product_qty
+        else:
+            for bom_child in self.browse(cr, uid, child_ids, context=context):
+                res = self._update_product_weight(cr, uid, bom_child, context=context)
+                weight += res[0]
+                weight_net += res[1]
+                standard_price += res[2]
+            cr.execute('update product_template set weight=%s, weight_net=%s, standard_price=%s where id=%s'%(weight/bom_obj.product_qty, weight_net/bom_obj.product_qty, standard_price/bom_obj.product_qty, bom_obj.product_id.product_tmpl_id.id))
+#            self.write(cr, uid, bom_obj.product_id.id, {'weight' : weight, 'weight_net' : weight_net, 'standard_price' : standard_price}, context=context)
+        return (weight, weight_net, standard_price)
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        
+        result = super(bom, self).write(cr, uid, ids, vals, context=context)
+        if result:
+            for bom_obj in self.browse(cr,uid,ids,context={}):
+                res = self._update_product_weight(cr,uid,bom_obj,context)
+#               cr.execute('update product_template set weight=%s, weight_net=%s, standard_price=%s where id=%s'%(res[0], res[1], res[2], bom_obj.product_id.product_tmpl_id.id))
+        return result
+    
+    def create(self, cr, uid, vals, context=None):
+        result = super(bom, self).create(cr, uid, vals, context)
+        bom_obj = self.browse(cr,uid,result,context={})    
+        res = self._update_product_weight(cr,uid,bom_obj,context)
+        return result
+    def _compute_type(self, cr, uid, ids, field_name, arg, context=None):
+        print """ Sets particular method for the selected bom type.
+        @param field_name: Name of the field
+        @param arg: User defined argument
+        @return:  Dictionary of values
+        """
+        res = dict(map(lambda x: (x,''), ids))
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.type in ('phantom','assembly') and not line.bom_id:
+                res[line.id] = 'set'
+                continue
+            if line.bom_lines or line.type == 'phantom':
+                continue
+            if line.product_id.supply_method == 'produce':
+                if line.product_id.procure_method == 'make_to_stock':
+                    res[line.id] = 'stock'
+                else:
+                    res[line.id] = 'order'
+        return res
+
+
+
+    _inherit='mrp.bom'
+    _columns={
+              'method': fields.function(_compute_type, string='Method', method=True, type='selection', selection=[('',''),('stock','On Stock'),('order','On Order'),('set','Set / Pack')]),
+              'type': fields.selection([('normal','Normal BoM'),('phantom','Sets / Phantom'),('assembly','Assembly BoM')], 'BoM Type', required=True,
+                                 help= "If a sub-product is used in several products, it can be useful to create its own BoM. "\
+                                 "Though if you don't want separated production orders for this sub-product, select Set/Phantom as BoM type. "\
+                                 "If a Phantom BoM is used for a root product, it will be sold and shipped as a set of components, instead of being produced."),
+              }
+bom()
+

=== added file 'assembly_bom/procurement.py'
--- assembly_bom/procurement.py	1970-01-01 00:00:00 +0000
+++ assembly_bom/procurement.py	2011-10-06 15:31:48 +0000
@@ -0,0 +1,60 @@
+# -*- ecoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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/>
+#
+##############################################################################
+
+from osv import fields, osv
+import netsvc
+import datetime
+import time
+
+class procurement(osv.osv):
+    _inherit="procurement.order"
+
+    def action_produce_assign_product(self, cr, uid, ids, context=None):
+        """ Blocks the procurement being run for products with assembly bom
+         @param self: The object pointer.
+         @param ids: ids of the procurement order document
+         @param context: standard dictionary
+         @comment: Blocks the procurement to be run for products with assembly bom
+         @return: returns either the Manufacturing order id or 0
+        """
+        procurement_obj = self.pool.get('procurement.order')
+        bom_obj=self.pool.get('mrp.bom')
+        sale_line_obj=self.pool.get('sale.order.line')
+        res=[]
+        for procure_record in procurement_obj.browse(cr,uid,ids,context=context):
+            sale_line_ids=sale_line_obj.search(cr,uid,[('procurement_id','=',procure_record.id)],context=context)
+            sale_line_id=sale_line_ids and sale_line_ids[0] or False
+            if sale_line_id:
+                line=sale_line_obj.browse(cr,uid,sale_line_id,context=context)
+                if line.product_id:
+                    bom_ids=bom_obj.search(cr,uid,[('product_id','=',line.product_id.id),('type','=','assembly')],context={})
+                    bom_id=bom_ids and bom_ids[0] or False
+                    if bom_id:
+                        #1. print 'PROCUREMENT:"PROCUREMENT FOR THE PRODUCT:%s, Name:%s" HAS BEEN BLOCKED'%(line.product_id.id,line.product_id.name)
+                        return 0
+            return super(procurement, self).action_produce_assign_product( cr, uid, [procure_record.id], context=context)
+
+procurement()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
+

=== added file 'assembly_bom/product.py'
--- assembly_bom/product.py	1970-01-01 00:00:00 +0000
+++ assembly_bom/product.py	2011-10-06 15:31:48 +0000
@@ -0,0 +1,242 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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/>
+#
+
+from osv import fields, osv
+import netsvc
+import datetime
+import time
+
+class product_inherit(osv.osv):
+
+    _inherit = 'product.product'
+
+    def _product_available(self, cr, uid, ids, field_names=None, arg=False, context=None):
+        """
+        For showing the bom stock value as 0 for the products with no bom
+         @param self: The object pointer.
+         @param ids: ids of the procurement order document
+         @param context: standard dictionary
+         @comment: If 'bom_stock' is there in the field_names list then if the product is having not bom the bom stock value was
+                     shown as real stock value. This override modifies it to zero
+         @return: returns 0 for the above conditions in the standard format dictionary for multi function fields
+        """
+        res = super(product_inherit, self)._product_available(cr, uid, ids, field_names, arg, context=context)
+        bom_obj=self.pool.get('mrp.bom')
+        if 'bom_stock' in field_names:
+            for product_id, stock_qty in res.iteritems():
+                product = self.browse(cr, uid, product_id)
+                bom_ids = bom_obj._bom_find(cr, uid, product.id, product.uom_id.id, properties=[])
+                if not bom_ids:
+                    res[product_id]['bom_stock'] = 0
+        #1. If possible do this by adding this line at 102 c2c_bom_stock.py this is the reason why its not showing the
+        #stock value properly for the products with no boms
+
+        return res
+
+
+    def find_consumption_details(self,cr,uid,ids,context={}):
+        """
+        Finds the consumption details for the products with ids in 'ids'
+         @param self: The object pointer.
+         @param ids: ids of the procurement order document
+         @param context: standard dictionary
+         @return: returns a list of dictionaries that carries the information regarding the product consumption
+        """
+        move_obj=self.pool.get('stock.move')
+        product_ids=ids
+        source_loc_id=context.get("source_loc_id",False)
+        start_date=context.get("start_date",False)
+        end_date=context.get("end_date",False)
+        if source_loc_id :
+            for product_id in product_ids:
+                detail_list=[]
+                args=[('product_id',"=",product_id),
+                                                 ('location_id','=',source_loc_id),
+                                                 ('state','=','done')]
+                start_date and args.append(('date',">=",start_date+" 00:00:00"))
+                end_date and args.append(('date',"<=",end_date+" 00:00:00"))
+                move_ids=move_obj.search(cr,uid,args)
+                detail_list=[]
+                for move in move_obj.browse(cr,uid,move_ids):
+                    details={}
+
+                    #1. If move is having sale_line_id its assumed to be related with sale
+                    if move.sale_line_id:
+                        line=move.sale_line_id
+                        product_qty=move.product_qty
+                        parent_product=move.product_id
+                        details={
+                                 'product_name':parent_product.name or "",
+                                 'reference':parent_product.default_code or "",
+                                 'type':'sale',
+                                 "product_qty":product_qty,
+                                 'consumption':parent_product.name
+                                 }
+
+                    #2. If move is having production_ids its assumed to be related with production using normal bom
+                    if move.production_ids:
+                        production=move.production_ids[0]
+                        bom=production.bom_id and production.bom_id or False
+                        if bom:
+                            bom_type=bom.type
+                            if bom_type=='normal':
+                                parent_product=production.product_id
+                                product_name=parent_product.name
+                                details={
+                                         'bom_type':bom_type,
+                                         "product_name":product_name,
+                                         "product_qty":move.product_qty,
+                                         "parent_product":parent_product,
+                                         'type':'production',
+                                         'consumption':product_name+'- '+bom_type,
+                                         'bom_type':bom_type,
+                                         'reference':parent_product.default_code or ""
+
+                                         }
+                    #3. If move is having kit_id its assumed to be related with production using assembly bom
+                    if move.kit_id:
+                        production=move.kit_id
+                        if production.state=='done':
+                            parent_product=production.product_id
+                            bom=production.bom_id and production.bom_id or False
+                            if bom:
+                                bom_type=bom.type
+                                if bom_type=='assembly':
+                                    product_name=parent_product.name
+                                    product_qty=move.product_qty
+                                    details={
+                                             'bom_type':bom_type,
+                                             "product_name":product_name,
+                                             "product_qty":move.product_qty,
+                                             "parent_product":parent_product,
+                                             'type':'production',
+                                             'consumption':product_name+'- '+bom_type,
+                                                 'bom_type':bom_type,
+                                         'reference':parent_product.default_code or ""
+                                             }
+
+                    details and detail_list.append(details)
+                    details={}
+                consumpt_lines=[]
+                res={}
+                #4. This block analyses the details to aggregate them with reference to type of consumption
+
+                for detail in detail_list:
+                    product_name=detail.get('product_name')
+                    consumption=detail.get('consumption')
+
+                    if detail.get('type',False) and detail.get('type',False)=='sale':
+                        if res.has_key(consumption):
+                            new_qty=res.get(consumption,{}).get('product_qty',0)+detail.get('product_qty',0)
+                            res[consumption].update({
+                                                      'product_qty':new_qty,
+                                                      'product_name':product_name
+                                                      }
+                                                      )
+                        else:
+                            res[consumption]={
+                                                      'product_qty':detail.get('product_qty',0),
+                                                      'consumption':"%(product_name)s- sold separately"%detail,
+                                                      'product_name':product_name,
+                                                      'bom_type':detail.get('bom_type',' '),
+                                                      'type':'Sold separately',
+                                         'reference':detail.get("reference","")
+                                                      }
+                    if detail.get('type',False) and detail.get('type',False)=='production':
+
+                        if res.has_key(consumption):
+                            new_qty=res.get(consumption,{}).get('product_qty',0)+detail.get('product_qty',0)
+                            res[consumption].update({
+                                                      'product_qty':new_qty,
+                                                      }
+                                                      )
+                        else:
+                            res[consumption]={
+                                              'product_qty':detail.get('product_qty',0),
+                                              'consumption':consumption,
+                                              'product_name':product_name,
+                                              'bom_type':detail.get('bom_type',' '),
+                                              'type':'Production using: '+detail.get('bom_type',' ')+' BOM',
+                                         'reference':detail.get("reference","")
+                                              }
+
+
+                consumpt_lines=res.values()
+                total_qty=0
+                #5. Calculating percentage consumption
+                for line in consumpt_lines:
+                    total_qty+=line.get('product_qty',0)
+                total_qty=float(total_qty)
+                new_consumpt_lines=[]
+                for line in consumpt_lines:
+                    line.update({
+                                 'percentage':round(line.get('product_qty',0)*100/total_qty, 2)
+                                 })
+                    new_consumpt_lines.append(line)
+                consumpt_lines=new_consumpt_lines
+
+                if not consumpt_lines:
+                    consumpt_lines=False
+
+                ret={"source_loc_id":source_loc_id,'detail_list':consumpt_lines}
+
+                return ret
+        else:
+            return {}
+    _columns = {
+        'qty_available': fields.function(_product_available, method=True, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available'),
+        'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available'),
+        'immediately_usable_qty': fields.function(_product_available, method=True, type='float', string='Immediately Usable Stock', help="Quantities of products really available for sale. Computed as: Real Stock - Outgoing.", multi='qty_available'),
+        'bom_stock': fields.function(_product_available, method=True, type='float', string='BoM Stock Value', help="Quantities of products,  useful to know how much of this product you could have. Computed as:  (Reference stock of This product + How much could I produce of this product)", multi='qty_available'),
+    }
+    
+    def _get_root_bom(self, cr, uid, bom_obj, context=None):
+        if not context:
+            context = {}
+        if not bom_obj.bom_id:
+#            if bom_obj.type == 'assembly':
+            return bom_obj
+        else:
+            return self._get_root_bom(cr, uid, bom_obj.bom_id, context=context)
+        
+        return False
+            
+                    
+    def write(self, cr, uid, ids, vals, context=None):
+        if not context:
+            context = {}
+        res = super(product_inherit, self).write(cr, uid, ids, vals, context=context)
+
+        if res and (vals.get('weight', False) or vals.get('weight_net', False) or vals.get('standard_price', False)):
+            updated_boms = []
+            mrp_bom_pool = self.pool.get('mrp.bom')
+            for prod in self.browse(cr, uid, ids, context=context):
+                bom_ids = mrp_bom_pool.search(cr, uid, [('product_id', '=', prod.id)], context=context)
+                for bom_obj in mrp_bom_pool.browse(cr, uid, bom_ids, context=context):
+                    root_bom = self._get_root_bom(cr, uid, bom_obj, context=context)
+                    if root_bom and root_bom not in updated_boms:
+                        updated_boms.append(root_bom)
+                        res = mrp_bom_pool._update_product_weight(cr, uid, root_bom, context=context)
+                        cr.execute('update product_template set weight=%s, weight_net=%s, standard_price=%s where id=%s'%(res[0]/root_bom.product_qty, res[1]/root_bom.product_qty, res[2]/root_bom.product_qty, root_bom.product_id.product_tmpl_id.id))
+#                        self.write(cr, uid, root_bom.product_id.id, {'weight' : res[0], 'weight_net' : res[1], 'standard_price' : res[2]}, context=context)
+        return res
+    
+product_inherit()
\ No newline at end of file

=== added file 'assembly_bom/product_view.xml'
--- assembly_bom/product_view.xml	1970-01-01 00:00:00 +0000
+++ assembly_bom/product_view.xml	2011-10-06 15:31:48 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="product_product_tree_view_inherit" model="ir.ui.view">
+            <field name="name">product.product.tree.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="product.product_product_tree_view"/>
+            <field eval="22" name="priority"/>
+            <field name="arch" type="xml">
+            	<xpath expr="//field[@name='virtual_available']" position="after">
+            		<field name="bom_stock"/>
+				</xpath>
+            </field>
+        </record>
+        
+    </data>
+</openerp>

=== added directory 'assembly_bom/report'
=== added file 'assembly_bom/report/__init__.py'
--- assembly_bom/report/__init__.py	1970-01-01 00:00:00 +0000
+++ assembly_bom/report/__init__.py	2011-10-06 15:31:48 +0000
@@ -0,0 +1,24 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import consumption_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'assembly_bom/report/consumption_report.py'
--- assembly_bom/report/consumption_report.py	1970-01-01 00:00:00 +0000
+++ assembly_bom/report/consumption_report.py	2011-10-06 15:31:48 +0000
@@ -0,0 +1,87 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import time
+
+from report import report_sxw
+
+class consumption_report(report_sxw.rml_parse):
+    def _get_consumption_lines(self,product_id):
+
+        """ Finds the consumption details for the product
+         @param self: The object pointer.
+         @param product_id: ID of the product
+         @comment: fetches the consumption details of the product using 'find_consumption_details'
+                   which analyses stock moves to find consumption details
+         @return: List of dictionaries showing the consumption details
+        """
+        res=[]
+        detail_list=self.localcontext.get('detail_list',[])
+        cr=self.cr;uid=self.uid
+        details=self.pool.get("product.product").find_consumption_details(cr,uid,[product_id],context=self.localcontext)
+        detail_list=details.get('detail_list',[])
+        return detail_list
+
+    def _get_us_date(self,date_string):
+        """ Converts the input date string to us format
+         @param self: The object pointer.
+         @param date_string: Expects date in ISO format YYYY-MM-DD
+         @comment: uses format_lang method to convert the date to the us format
+         @return: Returns either the us format date or an empty string
+        """
+        us_string=''
+        if date_string:
+            us_string=self.formatLang(date_string,date=True)
+        return us_string
+
+    def _format_product_name(self,product_name,reference):
+        """ Adds the product name and reference
+         @param self: The object pointer.
+         @param product_name: name of the product
+         @param reference: Reference of the product
+         @comment: adds the the reference and the product name if there is a reference string
+         @return: returns '[reference] product_name' or 'product_name'
+        """
+        if reference:
+            reference="[%s] "%reference
+        else:
+            reference=""
+        return reference+product_name
+
+    def __init__(self, cr, uid, name, context=None):
+        """ Parser __init__ override
+        """
+        super(consumption_report, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'time': time,
+            '_get_consumption_lines':self._get_consumption_lines,
+            '_get_':self._get_consumption_lines,
+            '_get_us_date':self._get_us_date,
+            '_format_product_name':self._format_product_name,
+            'source_loc_id':context.get('source_loc_id', False),#1. location id selected for getting consumption details in the wizard
+            'start_date':context.get('start_date',False),#2. getting start date selected in the wizard
+            'end_date':context.get('end_date',False),#3. getting end date selected in the wizard
+        })
+
+report_sxw.report_sxw('report.product.consumption', 'product.product', 'addons/assembly_bom/report/consumption_report.rml', parser=consumption_report, header=False)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'assembly_bom/report/consumption_report.rml'
--- assembly_bom/report/consumption_report.rml	1970-01-01 00:00:00 +0000
+++ assembly_bom/report/consumption_report.rml	2011-10-06 15:31:48 +0000
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="P4" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="10.0" leading="13" alignment="CENTER"/>
+    <paraStyle name="P8" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="P10" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P2">Product Consumption Report</para>
+    <para style="P4">From: [[(_get_us_date(start_date) and _get_us_date(end_date)) and _get_us_date(start_date) or removeParentNode('para')]], To: [[_get_us_date(end_date)]]</para>
+    <para style="P4">From: [[(_get_us_date(start_date) and not _get_us_date(end_date)) and _get_us_date(start_date) or removeParentNode('para')]]</para>
+    <para style="P4">To: [[(_get_us_date(end_date) and not _get_us_date(start_date)) and _get_us_date(end_date) or removeParentNode('para')]]</para>
+    <para style="P8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="478.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P1">[[repeatIn(objects,'o')]]</para>
+          <blockTable colWidths="473.0" style="Table2">
+            <tr>
+              <td>
+                <para style="P7">[[(_get_consumption_lines(o.id) and ' ') or removeParentNode('para')]]Product Name: <font face="Times-Roman">[[o.name]]</font></para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="142.0,142.0,95.0,95.0" repeatRows="1" style="Table3">
+            <tr>
+              <td>
+                <para style="P9">Product[[(_get_consumption_lines(o.id) and ' ') or removeParentNode('blockTable')]]</para>
+              </td>
+              <td>
+                <para style="P10">Consumption Type</para>
+              </td>
+              <td>
+                <para style="terp_tblheader_General_Centre">Quantity</para>
+              </td>
+              <td>
+                <para style="terp_tblheader_General_Centre">Percentage Consumption</para>
+              </td>
+            </tr>
+          </blockTable>
+          <blockTable colWidths="142.0,141.0,95.0,95.0" repeatRows="1" style="Table4">
+            <tr>
+              <td>
+                <para style="P5">[[repeatIn(_get_consumption_lines(o.id),'line')]] [[_format_product_name(line.get('product_name'),line.get('reference'))]]</para>
+                <para style="P5">[[(_get_consumption_lines(o.id) and ' ') or removeParentNode('blockTable')]]</para>
+              </td>
+              <td>
+                <para style="P5">[[line.get('type')]]</para>
+              </td>
+              <td>
+                <para style="P6">[[line.get('product_qty')]]</para>
+              </td>
+              <td>
+                <para style="P6">[[line.get('percentage')]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+

=== added file 'assembly_bom/report/consumption_report.sxw'
Binary files assembly_bom/report/consumption_report.sxw	1970-01-01 00:00:00 +0000 and assembly_bom/report/consumption_report.sxw	2011-10-06 15:31:48 +0000 differ
=== added file 'assembly_bom/report/consumption_report_reference+name.sxw'
Binary files assembly_bom/report/consumption_report_reference+name.sxw	1970-01-01 00:00:00 +0000 and assembly_bom/report/consumption_report_reference+name.sxw	2011-10-06 15:31:48 +0000 differ
=== added file 'assembly_bom/report/consumption_report_reference_column.sxw'
Binary files assembly_bom/report/consumption_report_reference_column.sxw	1970-01-01 00:00:00 +0000 and assembly_bom/report/consumption_report_reference_column.sxw	2011-10-06 15:31:48 +0000 differ
=== added file 'assembly_bom/report/delivery_report.py'
--- assembly_bom/report/delivery_report.py	1970-01-01 00:00:00 +0000
+++ assembly_bom/report/delivery_report.py	2011-10-06 15:31:48 +0000
@@ -0,0 +1,70 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import time
+
+from report import report_sxw
+
+class delivery_report(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context=None):
+        super(delivery_report, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update({
+            'time': time,
+#            'detail_list':context.get('detail_list', [])
+            '_get_parent':self._get_parent,
+            '_get_childs':self._get_childs
+        })
+
+    def _get_parent(self,pick_id):
+        cr=self.cr
+        uid=self.uid
+        context=self.localcontext
+        move_obj=self.pool.get('stock.move')
+        move_ids=move_obj.search(cr,uid,[('picking_id','=',pick_id),("parent_bom_id","!=",False)])
+        moves=move_obj.browse(cr,uid,move_ids,context=context)
+        for move in moves:
+            production=move.kit_id
+            if production:
+                product_qty=production.product_qty
+                sale_id=move.sale_id.id
+
+                parent_move_ids=move_obj.search(cr,uid,[("sale_id","=",sale_id),
+                                                       ("product_qty","=",product_qty),
+                                                       ("product_id","=",production.product_id.id)])
+                parent_moves=move_obj.browse(cr,uid,parent_move_ids)
+                print "parent_move_ids",parent_move_ids
+#                return {'child_moves':moves,"parent_moves":parent_moves}
+                return parent_moves
+                break
+
+    def _get_childs(self,pick_id):
+        cr=self.cr
+        uid=self.uid
+        context=self.localcontext
+        move_obj=self.pool.get('stock.move')
+        move_ids=move_obj.search(cr,uid,[('picking_id','=',pick_id),("parent_bom_id","!=",False)])
+        print move_ids,'====================move_ids================================'
+        return move_obj.browse(cr,uid,move_ids,context=context)
+
+report_sxw.report_sxw('report.delivery.bom', 'stock.picking', 'addons/assembly_bom/report/delivery_report.rml', parser=delivery_report, header=False)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'assembly_bom/report/delivery_report.rml'
--- assembly_bom/report/delivery_report.rml	1970-01-01 00:00:00 +0000
+++ assembly_bom/report/delivery_report.rml	2011-10-06 15:31:48 +0000
@@ -0,0 +1,384 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Address_detail">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Title_String">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Header_Order_Reference_Tbl">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Content_Order_Reference_Table">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Move_Line_Header">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Move_Line_Contect_Assign_State">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,2" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="2,2" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,2" stop="2,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="3,2" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="3,2" stop="3,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="4,2" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="4,2" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="4,2" stop="4,2"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,3" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,3" stop="0,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,3" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,3" stop="1,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="2,3" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,3" stop="2,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="3,3" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="3,3" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="3,3" stop="3,3"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" alignment="LEFT"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="14.0" leading="17" alignment="LEFT"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Italic" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_5cm_Above_Space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1cm_above_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P1">[[repeatIn(objects,'picking')]] </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="269.0,269.0" style="Table_Address_detail">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">Shipping Address :</para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title.name) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Contact Address :</para>
+          <para style="terp_default_9">[[ picking.address_id and picking.address_id.title.name or '' ]] [[ picking.address_id and picking.address_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ picking.address_id and picking.address_id.street or '' ]]</para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.street2) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ picking.address_id and picking.address_id.zip or '' ]] [[ picking.address_id and picking.address_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">[[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_5cm_Above_Space">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_5cm_Above_Space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="538.0" style="Table_Title_String">
+      <tr>
+        <td>
+          <para style="terp_header">Packing List: [[ picking.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_5cm_Above_Space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="100.0,100.0,108.0,107.0,109.0" style="Header_Order_Reference_Tbl">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Journal</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Order(Origin)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Recipient</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Expected Shipping Date </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">weight</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,100.0,108.0,107.0,109.0" style="Content_Order_Reference_Table">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ picking.stock_journal_id.name]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ picking.origin or '']]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ (picking.address_id and picking.address_id.title.name) or '' ]] [[ (picking.address_id and picking.address_id.name) or '' ]] </para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ 'weight' in picking._columns.keys() and picking.weight or '']]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_5cm_Above_Space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="256.0,73.0,59.0,59.0,71.0" repeatRows="1" style="Move_Line_Header">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Lot</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">State</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Location</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_tblheader_Details_Right">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_2">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="522.0" style="Move_Line_Contect_Assign_State">
+        <tr>
+          <td>
+            <para style="P9">[[_get_parent(picking.id)[0].product_id.name]]</para>
+            <para style="P9">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="P12">[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]]</para>
+            <para style="P10">
+              <font face="Times-Roman" size="9.0">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</font>
+            </para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <blockTable colWidths="129.0,129.0,129.0,129.0" style="Table1">
+              <tr>
+                <td>
+                  <para style="terp_default_9">[[move_lines.product_id.name and '*'*4+(move_lines.product_id.name)or removeParentNode('tr')]] </para>
+                </td>
+                <td>
+                  <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
+                </td>
+                <td>
+                  <para style="terp_default_9">[[ move_lines.state ]]</para>
+                </td>
+                <td>
+                  <para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para>
+                </td>
+              </tr>
+            </blockTable>
+            <para style="P9">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
+    <para style="terp_default_Bold_9">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_2"/>
+    <section>
+      <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]]</para>
+      <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para>
+      <blockTable colWidths="257.0,74.0,57.0,61.0,72.0" style="Table4">
+        <tr>
+          <td>
+            <para style="terp_default_9"><font face="Times-Roman" size="9.0">[[ (move_lines.product_id.default_code) or removeParentNode('font') ]] </font>[[“..”*5 +move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ move_lines.state ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="388.0,56.0,77.0" style="Table5">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Total</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(get_qtytotal(picking.move_lines)['quantity']) ]] [[ get_qtytotal(picking.move_lines)['uom'] ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P11">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+

=== added file 'assembly_bom/report/normalized_oo2rml.xsl'
--- assembly_bom/report/normalized_oo2rml.xsl	1970-01-01 00:00:00 +0000
+++ assembly_bom/report/normalized_oo2rml.xsl	2011-10-06 15:31:48 +0000
@@ -0,0 +1,696 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:fo="http://www.w3.org/1999/XSL/Format"
+  xmlns:office="http://openoffice.org/2000/office"
+  xmlns:style="http://openoffice.org/2000/style"
+  xmlns:text="http://openoffice.org/2000/text"
+  xmlns:table="http://openoffice.org/2000/table"
+  xmlns:draw="http://openoffice.org/2000/drawing"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xmlns:number="http://openoffice.org/2000/datastyle"
+  xmlns:svg="http://www.w3.org/2000/svg"
+  xmlns:chart="http://openoffice.org/2000/chart"
+  xmlns:dr3d="http://openoffice.org/2000/dr3d"
+  xmlns:math="http://www.w3.org/1998/Math/MathML"
+  xmlns:form="http://openoffice.org/2000/form"
+  xmlns:script="http://openoffice.org/2000/script"
+  office:class="text" office:version="1.0"
+  exclude-result-prefixes = "xsl fo office style text table draw xlink number svg chart dr3d math form script">
+
+  <!--TODO's: indent, picture cache (trml2pdf) -->
+
+<xsl:output method="xml" indent="yes" />
+<xsl:strip-space elements="*"/>
+
+<xsl:key name="text_style" match="style:style[@style:family='text']" use="@style:name" />
+<xsl:key name="page_break_before" match="style:style[@style:family='paragraph' and ./style:properties/@fo:break-before='page']" use="@style:name" />
+<xsl:key name="page_break_after" match="style:style[@style:family='paragraph' and ./style:properties/@fo:break-after='page']" use="@style:name" />
+<xsl:key name="table_column_style" match="style:style[@style:family='table-column']" use="@style:name" />
+<xsl:key name="table_cell_style" match="style:style[@style:family='table-cell']" use="@style:name" />
+<xsl:key name="paragraph_style" match="style:style[@style:family='paragraph']" use="@style:name" />
+
+<xsl:template match="office:document-content">
+  <document filename="test.pdf">
+    <xsl:apply-templates select="office:automatic-styles" />
+    <xsl:apply-templates select="office:body" />
+  </document>
+</xsl:template>
+
+<xsl:template name="page_size">
+  <xsl:attribute name="pageSize">
+    <xsl:text>(</xsl:text>
+    <xsl:value-of select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+    <xsl:text>,</xsl:text>
+    <xsl:value-of select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height" />
+    <xsl:text>)</xsl:text>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="fixed_frame">
+	<xsl:for-each select="//draw:text-box">
+		<frame>
+			<xsl:attribute name="id"><xsl:value-of select="./@draw:name" /></xsl:attribute>
+			<xsl:attribute name="x1"><xsl:value-of select="./@svg:x" /></xsl:attribute>
+			<xsl:attribute name="y1">
+				<xsl:value-of
+					select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height - ./@svg:y - ./@fo:min-height" />
+			</xsl:attribute>
+			<xsl:attribute name="width">
+				<xsl:value-of select="./@svg:width" />
+			</xsl:attribute>
+			<xsl:attribute name="height">
+				<xsl:value-of select="./@fo:min-height" />
+			</xsl:attribute>
+		</frame>
+	</xsl:for-each>
+</xsl:template>
+
+<xsl:template name="margin_sizes">
+  <xsl:variable name="margin_left" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-left" />
+  <xsl:variable name="margin_right" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-right" />
+  <xsl:variable name="margin_top" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-top" />
+  <xsl:variable name="margin_bottom" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-bottom" />
+  <xsl:variable name="page_width" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+  <xsl:variable name="page_height" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-height" />
+  <xsl:attribute name="x1"><xsl:value-of select="$margin_left" /></xsl:attribute>
+  <xsl:attribute name="y1"><xsl:value-of select="$margin_bottom" /></xsl:attribute>
+  <xsl:attribute name="width"><xsl:value-of select="$page_width - $margin_left - $margin_right"/></xsl:attribute>
+  <xsl:attribute name="height"><xsl:value-of select="$page_height - $margin_bottom - $margin_top"/></xsl:attribute>
+</xsl:template>
+
+<xsl:template name="text_width">
+  <!-- You need this for the workaround to make primitive outlines-->
+  <xsl:variable name="margin_left" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-left" />
+  <xsl:variable name="margin_right" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:margin-right" />
+  <xsl:variable name="page_width" select="//transferredfromstylesxml/style:page-master[1]/style:properties/@fo:page-width" />
+  <xsl:value-of select="$page_width - $margin_left - $margin_right - 18"/>
+</xsl:template>
+
+
+
+<xsl:template match="office:automatic-styles">
+  <!--<template pageSize="(21cm, 29.7cm)" leftMargin="1.0cm" rightMargin="2.0cm" topMargin="1.0cm" bottomMargin="1.0cm" title="Test" author="Martin Simon" allowSplitting="20">-->
+  <template pageSize="(21cm, 29.7cm)" title="Test" author="Martin Simon" allowSplitting="20">
+    <xsl:call-template name="page_size" />
+    <pageTemplate id="first">
+	  <xsl:call-template name="fixed_frame" />
+      <frame id="first" x1="2cm" y1="2cm" width="17cm" height="26cm">
+        <xsl:call-template name="margin_sizes" />
+      </frame>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <!--A table style to simulate primitive outlines -till the <addOutline> tag is implemented in trml2pdf -->
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <!--use two standard table grid styles like PyOpenOffice "Old Way": with and without a grid-->
+    <!--TODO insert table cell colors here, not within the <td> tag - otherwise
+         it will not work with flowables as cell content-->
+    <xsl:call-template name="make_blocktablestyle" />
+    <initialize>
+      <paraStyle name="all" alignment="justify" />
+    </initialize>
+    <xsl:apply-templates select="style:style" />
+  </stylesheet>
+</xsl:template>
+
+<xsl:template name="make_blocktablestyle">
+  <xsl:for-each select="//table:table">
+    <xsl:variable name="test">
+      <xsl:value-of select="./@table:name" />
+    </xsl:variable>
+    <xsl:if test="not(boolean(count(preceding-sibling::table:table[@table:name=$test])))">
+      <!--Test if this is the first table with this style, nested tables not counted-->
+      <blockTableStyle id="{@table:name}">
+	    <xsl:if test=".//draw:image">
+	      <blockTopPadding value="0"/>
+	      <blockBottomPadding value="0"/>
+	    </xsl:if>
+        <blockAlignment value="LEFT" />
+        <blockValign value="TOP" />
+        <xsl:call-template name="make_linestyle" />
+        <xsl:call-template name="make_tablebackground" />
+      </blockTableStyle>
+    </xsl:if>
+  </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="make_linestyle">
+	<xsl:for-each select=".//table:table-row">
+		<xsl:variable name="row" select="position() - 1"/>
+		<xsl:for-each select=".//table:table-cell">
+			<xsl:variable name="col" select="position() - 1"/>
+			<xsl:variable name="linebefore">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-left"/>
+			</xsl:variable>
+			<xsl:if test="not($linebefore='') and not($linebefore='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($linebefore,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+			</xsl:if>
+			<xsl:variable name="lineafter">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-right"/>
+			</xsl:variable>
+			<xsl:if test="not($lineafter='') and not($lineafter='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($lineafter,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+			</xsl:if>
+			<xsl:variable name="lineabove">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-top"/>
+			</xsl:variable>
+			<xsl:if test="not($lineabove='') and not($lineabove='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($lineabove,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEABOVE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
+			</xsl:if>
+			<xsl:variable name="linebelow">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border-bottom"/>
+			</xsl:variable>
+			<xsl:if test="not($linebelow='') and not($linebelow='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($linebelow,'#')"/>
+				</xsl:variable>
+				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
+			</xsl:if>
+			<xsl:variable name="grid">
+				<xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:border"/>
+			</xsl:variable>
+			<xsl:if test="not($grid='') and not($grid='none')">
+				<xsl:variable name="colorname">
+					<xsl:value-of select="substring-after($grid,'#')"/>
+				</xsl:variable>
+				<!-- Don't use grid because we don't need a line between each rows -->
+				<lineStyle kind="LINEBEFORE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+				<lineStyle kind="LINEAFTER" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},-1"/>
+				<lineStyle kind="LINEABOVE" colorName="#{$colorname}" start="{$col},{$row}" stop="{$col},{$row}"/>
+				<lineStyle kind="LINEBELOW" colorName="#{$colorname}" start="{$col},{-1}" stop="{$col},{-1}"/>
+			</xsl:if>
+		</xsl:for-each>
+	</xsl:for-each>
+</xsl:template>
+
+<!-- Was needed to simulate bulleted lists:
+<xsl:template match="text:ordered-list|text:unordered-list">
+  <xsl:variable name = "text_width">
+    <xsl:call-template name="text_width" />
+  </xsl:variable>
+  <blockTable style="Standard_Outline" colWidths="18,{$text_width}">
+  <xsl:apply-templates match="text:list-item" />
+</blockTable>
+</xsl:template>
+
+<xsl:template match="text:list-item">
+  <tr>
+    <td><para><font face="Helvetica-Bold" size="10">*</font></para></td>
+    <td>
+      <xsl:apply-templates />
+    </td>
+  </tr>
+</xsl:template>
+
+-->
+
+
+<xsl:template match="office:body">
+  <story>
+    <xsl:apply-templates />
+	<xsl:for-each select="//draw:text-box">
+		<currentFrame>
+			<xsl:attribute name="name">
+				<xsl:value-of select="./@draw:name" />
+			</xsl:attribute>
+		</currentFrame>
+		<xsl:apply-templates>
+			<xsl:with-param name="skip_draw" select="0" />
+		</xsl:apply-templates>
+		<frameEnd />
+	</xsl:for-each>
+	<xsl:for-each select="//text:ordered-list">
+		<para><seqReset id="{./@text:style-name}"/></para>
+	</xsl:for-each>
+  </story>
+</xsl:template>
+
+<xsl:template match="table:table">
+  <blockTable>
+    <xsl:attribute name="colWidths">
+      <xsl:call-template name="make_columns" />
+    </xsl:attribute>
+    <xsl:call-template name="make_tableheaders" />
+    <xsl:attribute name="style">
+      <xsl:value-of select="@table:name" />
+    </xsl:attribute>
+    <xsl:apply-templates />
+  </blockTable>
+</xsl:template>
+
+<xsl:template name="make_tableheaders">
+  <xsl:if test="boolean(count(table:table-header-rows))">
+    <xsl:attribute name="repeatRows">1</xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_tablebackground">
+  <xsl:for-each select=".//table:table-row">
+    <!--Be careful when there are table:table-header-rows as
+         parent node of table:table-row -->
+    <xsl:variable name="row" select="position() - 1" />
+    <xsl:for-each select="./table:table-cell">
+      <xsl:variable name="col" select="position() - 1" />
+      <xsl:variable name="background">
+        <xsl:value-of select="key('table_cell_style',@table:style-name)/style:properties/@fo:background-color" />
+      </xsl:variable>
+      <xsl:if test="not($background='') and boolean(key('table_cell_style',@table:style-name)/style:properties/@fo:background-color) and starts-with($background,'#')">
+        <!--only RGB hexcolors are accepted -->
+		<blockBackground colorName="{$background}" start="{$col},{$row}" stop="{$col},-1" />
+      </xsl:if>
+     </xsl:for-each>
+   </xsl:for-each>
+</xsl:template>
+
+<xsl:template name="make_columns">
+  <xsl:variable name="columns" >
+    <xsl:for-each select="table:table-column">
+      <xsl:value-of select="key('table_column_style',@table:style-name)/style:properties/@style:column-width" />
+      <xsl:text>,</xsl:text>
+    </xsl:for-each>
+  </xsl:variable>
+  <xsl:value-of select="substring($columns,1,string-length($columns) - 1)" />
+  <!--strip the last comma-->
+</xsl:template>
+
+<xsl:template match="table:table-row">
+  <tr>
+    <xsl:apply-templates />
+  </tr>
+</xsl:template>
+
+<xsl:template match="table:table-cell">
+  <td>
+    <xsl:apply-templates />
+  </td>
+</xsl:template>
+
+<xsl:template match="text:section">
+  <section>
+    <xsl:apply-templates />
+  </section>
+</xsl:template>
+
+
+<xsl:template match="text:span">
+  <font>
+    <xsl:call-template name="make_fontnames_span" />
+    <xsl:call-template name="make_fontsize_span" />
+    <xsl:apply-templates />
+  </font>
+</xsl:template>
+
+<xsl:template name="make_fontsize_span">
+  <xsl:variable name ="fontsize">
+    <xsl:value-of select="key('text_style',@text:style-name)/style:properties/@fo:font-size" />
+  </xsl:variable>
+  <xsl:if test="not($fontsize='') and boolean(key('text_style',@text:style-name)/style:properties/@fo:font-size)" >
+    <xsl:attribute name="size">
+      <xsl:value-of select="$fontsize" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontnames_span">
+  <xsl:attribute name="face">
+    <xsl:call-template name="make_fontnames">
+      <xsl:with-param name="fontName" select="key('text_style',@text:style-name)/style:properties/@style:font-name"  />
+      <xsl:with-param name="fontWeight" select="key('text_style',@text:style-name)/style:properties/@fo:font-weight"  />
+      <xsl:with-param name="fontStyle" select="key('text_style',@text:style-name)/style:properties/@fo:font-style" />
+    </xsl:call-template>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="make_image">
+  <illustration height="{.//draw:image/@svg:height}" width="{.//draw:image/@svg:width}">
+    <image x="0" y="0" file="{substring-after(.//draw:image/@xlink:href,'#Pictures/')}" height="{.//draw:image/@svg:height}" width="{.//draw:image/@svg:width}" />
+  </illustration>
+</xsl:template>
+
+<xsl:template name="empty_paragraph">
+  <xsl:if test="not(boolean(count(descendant::node())))">
+    <xsl:call-template name="distance_point">
+      <xsl:with-param name="background" select="key('paragraph_style',@text:style-name)/style:properties/@fo:background-color" />
+    </xsl:call-template>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="distance_point">
+  <xsl:param name="background" />
+  <xsl:param name="tab_stop"></xsl:param>
+  <xsl:variable name="local_back">
+    <xsl:choose>
+      <xsl:when test="not(boolean($background)) or not(contains($background,'#'))">
+        <!-- Do not accept OO colors like "transparent", only hex-colors -->
+        <xsl:text>white</xsl:text>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$background" />
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <font color="{$local_back}">
+    <xsl:text> </xsl:text>
+    <xsl:if test="boolean($tab_stop)">
+      <!-- simulate a tabstop with white/background-color points -->
+      <xsl:text>.........</xsl:text>
+    </xsl:if>
+  </font>
+</xsl:template>
+
+<xsl:template match="text:ordered-list">
+  <xsl:apply-templates />
+
+  <!-- Reset the counter. seqreset is not a trml2pdf tag, but a Platypus Intra Paragraph Markup,
+       so it needs a dummy paragraph to enclose it -->
+</xsl:template>
+
+<xsl:template name="make_listitem">
+  <xsl:if test="(name(..)='text:list-item')">
+    <xsl:attribute name="leftIndent">15</xsl:attribute>
+    <xsl:attribute name="bulletIndent">0</xsl:attribute>
+    <xsl:choose>
+      <xsl:when test="(name(../..)='text:unordered-list')">
+        <xsl:variable name="fontsize">
+          <xsl:value-of select="number(key('paragraph_style',@text:style-name)/style:properties/@fo:font-size)" />
+        </xsl:variable>
+        <xsl:choose>
+          <xsl:when test="$fontsize='NaN'">
+            <!-- you should exclude non-numerical values for bulletFontSize. <== Sometimes the preprocessing went wrong.-->
+            <!--use a default bullet font size-->
+            <xsl:attribute name="bulletFontSize">6</xsl:attribute>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:attribute name="bulletFontSize"><xsl:value-of select="floor(($fontsize div 2) + 1)" /></xsl:attribute>
+          </xsl:otherwise>
+        </xsl:choose>
+        <xsl:attribute name="bulletFontName">ZapfDingbats</xsl:attribute>
+        <xsl:attribute name="bulletText">l</xsl:attribute>
+      </xsl:when>
+      <xsl:otherwise>
+        <!-- Generate the numbers for an ordered list -->
+        <xsl:variable name="size">
+          <xsl:value-of select="key('paragraph_style',@text:style-name)/style:properties/@fo:font-size" />
+        </xsl:variable>
+        <!-- For ordered lists we use the bullet tag from Platypus Intra Paragraph Markup -->
+        <bullet>
+          <xsl:if test="not($size='') and boolean(key('paragraph_style',@text:style-name)/style:properties/@fo:font-size)">
+            <xsl:attribute name="size">
+              <!-- adapt the fontsize to the fontsize of the current paragraph -->
+              <xsl:value-of select="$size" />
+            </xsl:attribute>
+          </xsl:if>
+          <seq id="{../../@text:style-name}"/>.</bullet>
+
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="text:drop-down">
+    <xsl:value-of select="text:label[2]/@text:value" />
+</xsl:template>
+
+
+<xsl:template match="text:p|text:h">
+	<xsl:param name="skip_draw" select="1" />
+  <xsl:if test="boolean(key('page_break_before',@text:style-name))" >
+    <pageBreak />
+  </xsl:if>
+  <xsl:choose>
+    <xsl:when test="boolean(.//draw:image)">
+      <xsl:call-template name="make_image" />
+    </xsl:when>
+	<xsl:when test="boolean(name(..) = 'draw:text-box') and boolean($skip_draw)">
+	</xsl:when>
+    <xsl:otherwise>
+      <para>
+        <xsl:attribute name="style">
+          <xsl:value-of select="@text:style-name" />
+        </xsl:attribute>
+        <xsl:call-template name="make_listitem" />
+        <xsl:apply-templates />
+        <xsl:call-template name="empty_paragraph" />
+      </para>
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:if test="boolean(key('page_break_after',@text:style-name))" >
+    <pageBreak />
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="text:p/text:tab-stop">
+  <!-- simulate a tabstop -->
+  <xsl:call-template name="distance_point">
+    <xsl:with-param name="background" select="key('paragraph_style',@text:style-name)/style:properties/@fo:background-color" />
+    <xsl:with-param name="tab_stop">yes</xsl:with-param>
+  </xsl:call-template>
+</xsl:template>
+
+<!-- experimental - switched off
+<xsl:template match="text:h">
+  <para>
+    <xsl:attribute name="style">
+      <xsl:value-of select="@text:style-name" />
+    </xsl:attribute>
+    <xsl:call-template name="make_number" />
+    <xsl:apply-templates />
+    <xsl:call-template name="empty_paragraph" />
+  </para>
+</xsl:template>
+
+<xsl:template name="make_number">
+  <xsl:choose>
+    <xsl:when test="@text:level='1'">
+      <xsl:number format="1. " />
+    </xsl:when>
+    <xsl:when test="@text:level='2'">
+      <xsl:number count="text:h[@text:level='1']|text:h[text:level='2']" level="any" format="1.1." />
+    </xsl:when>
+  </xsl:choose>
+</xsl:template>
+
+-->
+
+<xsl:template match="style:style[@style:family='paragraph']">
+  <paraStyle>
+    <xsl:attribute name="name">
+      <xsl:value-of select="@style:name" />
+    </xsl:attribute>
+    <xsl:call-template name="make_indent_paragraph" />
+    <xsl:call-template name="make_fontnames_paragraph" />
+    <xsl:call-template name="make_fontsize" />
+    <!--<xsl:call-template name="make_parent" /> not necessary -
+         parent styles processed by PyOpenOffice -->
+    <xsl:call-template name="make_alignment" />
+    <xsl:call-template name="make_background" />
+    <xsl:call-template name="make_space_beforeafter" />
+    <xsl:call-template name="make_fontcolor" />
+  </paraStyle>
+</xsl:template>
+
+<xsl:template name="make_indent_paragraph">
+  <xsl:variable name="right_indent"><xsl:value-of select="style:properties/@fo:margin-right" /></xsl:variable>
+  <xsl:variable name="left_indent"><xsl:value-of select="style:properties/@fo:margin-left" /></xsl:variable>
+  <xsl:if test="not($right_indent='') and boolean(style:properties/@fo:margin-right)">
+    <xsl:attribute name="rightIndent">
+      <xsl:value-of select="$right_indent" />
+    </xsl:attribute>
+  </xsl:if>
+  <xsl:if test="not($left_indent='') and boolean(style:properties/@fo:margin-left)">
+    <xsl:attribute name="leftIndent">
+      <xsl:value-of select="$left_indent" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_background">
+  <xsl:variable name="background">
+    <xsl:value-of select="style:properties/@fo:background-color" />
+  </xsl:variable>
+  <xsl:if test="not($background='') and boolean(style:properties/@fo:background-color) and starts-with($background,'#')" >
+    <xsl:attribute name="backColor">
+      <xsl:value-of select="$background" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_space_beforeafter">
+  <xsl:variable name="before">
+    <xsl:value-of select="style:properties/@fo:margin-top" />
+  </xsl:variable>
+  <xsl:variable name="after">
+    <xsl:value-of select="style:properties/@fo:margin-bottom" />
+  </xsl:variable>
+  <xsl:if test="not($before='') and boolean(style:properties/@fo:margin-top)" >
+    <xsl:attribute name="spaceBefore">
+      <xsl:value-of select="$before" />
+    </xsl:attribute>
+  </xsl:if>
+  <xsl:if test="not($after='') and boolean(style:properties/@fo:margin-bottom)" >
+    <xsl:attribute name="spaceAfter">
+      <xsl:value-of select="$after" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontsize">
+  <xsl:variable name="fontSize">
+    <xsl:value-of select="style:properties/@fo:font-size" />
+  </xsl:variable>
+  <xsl:if test="not($fontSize='') and boolean(style:properties/@fo:font-size)">
+    <xsl:attribute name="fontSize">
+      <xsl:value-of select="$fontSize" />
+    </xsl:attribute>
+    <xsl:attribute name="leading">
+      <xsl:value-of select="$fontSize + floor($fontSize div 5) + 1" />
+      <!--use a standard leading related to the font size -->
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!--this template is not needed anymore for "normalized" sxw files -->
+<xsl:template name="make_parent">
+  <xsl:variable name="parent">
+    <xsl:value-of select="@style:parent-style-name" />
+  </xsl:variable>
+  <xsl:if test="not($parent='') and boolean(@style:parent-style-name)">
+    <xsl:attribute name="parent">
+      <xsl:value-of select="$parent" />
+    </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_alignment">
+  <xsl:variable name="alignment">
+    <xsl:value-of select="style:properties/@fo:text-align" />
+  </xsl:variable>
+  <xsl:if test="not($alignment='') and boolean(style:properties/@fo:text-align)">
+    <xsl:choose>
+      <xsl:when test="$alignment='start'">
+        <xsl:attribute name="alignment">LEFT</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='center'">
+        <xsl:attribute name="alignment">CENTER</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='end'">
+        <xsl:attribute name="alignment">RIGHT</xsl:attribute>
+      </xsl:when>
+      <xsl:when test="$alignment='justify'">
+        <xsl:attribute name="alignment">JUSTIFY</xsl:attribute>
+      </xsl:when>
+    </xsl:choose>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="make_fontnames_paragraph">
+  <xsl:attribute name="fontName">
+    <xsl:call-template name="make_fontnames">
+      <xsl:with-param name="fontName" select="style:properties/@style:font-name" />
+      <xsl:with-param name="fontWeight" select="style:properties/@fo:font-weight" />
+      <xsl:with-param name="fontStyle" select="style:properties/@fo:font-style" />
+    </xsl:call-template>
+  </xsl:attribute>
+</xsl:template>
+
+<xsl:template name="make_fontnames">
+  <!--much too verbose, needs improvement-->
+<xsl:param name="fontName" />
+<xsl:param name="fontWeight" />
+<xsl:param name="fontStyle" />
+<xsl:choose>
+<xsl:when test="not($fontName='') and boolean($fontName)">
+  <xsl:choose>
+    <xsl:when test="contains($fontName,'Courier')">
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Courier-BoldOblique</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Courier-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Courier-Oblique</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Courier</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:when test="contains($fontName,'Helvetica') or contains($fontName,'Arial') or contains($fontName,'Sans')">
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Helvetica-BoldOblique</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Helvetica-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Helvetica-Oblique</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Helvetica</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:choose>
+        <xsl:when test="($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Times-BoldItalic</xsl:text>
+        </xsl:when>
+        <xsl:when test="($fontWeight='bold') and not ($fontStyle='italic')">
+          <xsl:text>Times-Bold</xsl:text>
+        </xsl:when>
+        <xsl:when test="not($fontWeight='bold') and ($fontStyle='italic')">
+          <xsl:text>Times-Italic</xsl:text>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text>Times-Roman</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:when>
+<xsl:otherwise>
+  <!--Use this as default -->
+  <xsl:text>Times-Roman</xsl:text>
+</xsl:otherwise>
+</xsl:choose>
+</xsl:template>
+<xsl:template name="make_fontcolor">
+  <xsl:variable name="textColor">
+    <xsl:value-of select="style:properties/@fo:color"/>
+  </xsl:variable>
+  <xsl:if test="not($textColor='') and boolean(style:properties/@fo:color)">
+  <xsl:attribute name="textColor">
+      <xsl:value-of select="$textColor" />
+   </xsl:attribute>
+  </xsl:if>
+</xsl:template>
+
+<!--
+This stylesheet is part of:
+PyOpenOffice Version 0.4
+Copyright (C) 2005: Martin Simon
+Homepage: www.bezirksreiter.de
+
+GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999
+-->
+
+</xsl:stylesheet>
+
+

=== added file 'assembly_bom/report/picking_bom.sxw'
Binary files assembly_bom/report/picking_bom.sxw	1970-01-01 00:00:00 +0000 and assembly_bom/report/picking_bom.sxw	2011-10-06 15:31:48 +0000 differ
=== added file 'assembly_bom/report/report_view.xml'
--- assembly_bom/report/report_view.xml	1970-01-01 00:00:00 +0000
+++ assembly_bom/report/report_view.xml	2011-10-06 15:31:48 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+	<report
+		auto="False"
+		id="report_product_consumption_id"
+		model="product.product"
+		name="product.consumption"
+		rml="addons/assembly_bom/report/consumption_report.rml"
+		string="Product Consumption"
+		menu="False"
+		/>
+
+	<!--report
+		auto="False"
+		id="report_delivery_bom_id"
+		model="stock.picking"
+		name="delivery.bom"
+		rml="addons/assembly_bom/report/delivery_report.rml"
+		string="Assembly Delivery Order"
+		/-->
+</data>
+</openerp>

=== added file 'assembly_bom/report/tiny_sxw2rml.py'
--- assembly_bom/report/tiny_sxw2rml.py	1970-01-01 00:00:00 +0000
+++ assembly_bom/report/tiny_sxw2rml.py	2011-10-06 15:31:48 +0000
@@ -0,0 +1,377 @@
+#!/usr/bin/python
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c):
+#
+#     2005 pyopenoffice.py Martin Simon (http://www.bezirksreiter.de)
+#     2005 Fabien Pinckaers, TINY SPRL. (http://tiny.be)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contact a Free Software
+# Service Company
+#
+# 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 2
+# 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, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+"""
+Tiny SXW2RML - The Open ERP's report engine
+
+Tiny SXW2RMLis part of the Tiny report project.
+Tiny Report is a module that allows you to render high quality PDF document
+from an OpenOffice template (.sxw) and any relationnal database.
+
+The whole source code is distributed under the terms of the
+GNU Public Licence.
+
+(c) 2005 pyopenoffice.py Martin Simon (http://www.bezirksreiter.de)
+(c) 2005-TODAY, Fabien Pinckaers - Tiny sprl
+"""
+__version__ = '0.9'
+
+
+import re
+import string
+import os
+import zipfile
+import xml.dom.minidom
+from reportlab.lib.units import toLength
+import base64
+
+class DomApiGeneral:
+    """General DOM API utilities."""
+    def __init__(self,content_string="",file=""):
+        self.content_string = content_string
+        self.re_digits = re.compile(r"(.*?\d)(pt|cm|mm|inch|in)")
+
+    def _unitTuple(self,string):
+        """Split values and units to a tuple."""
+        temp = self.re_digits.findall(string)
+        if not temp:
+            return (string,"")
+        else:
+            return (temp[0])
+
+    def stringPercentToFloat(self,string):
+        temp = string.replace("""%""","")
+        return float(temp)/100
+
+    def findChildrenByName(self,parent,name,attr_dict={}):
+        """Helper functions. Does not work recursively.
+        Optional: also test for certain attribute/value pairs."""
+        children = []
+        for c in parent.childNodes:
+            if c.nodeType == c.ELEMENT_NODE and c.nodeName == name:
+                children.append(c)
+        if attr_dict == {}:
+            return children
+        else:
+            return self._selectForAttributes(nodelist=children,attr_dict=attr_dict)
+
+    def _selectForAttributes(self,nodelist,attr_dict):
+        "Helper function."""
+        selected_nodes = []
+        for n in nodelist:
+            check = 1
+            for a in attr_dict.keys():
+                if n.getAttribute(a) != attr_dict[a]:
+                    # at least one incorrect attribute value?
+                    check = 0
+            if check:
+                selected_nodes.append(n)
+        return selected_nodes
+
+    def _stringToTuple(self,s):
+        """Helper function."""
+        try:
+            temp = string.split(s,",")
+            return int(temp[0]),int(temp[1])
+        except:
+            return None
+
+    def _tupleToString(self,t):
+        try:
+            return self.openOfficeStringUtf8("%s,%s" % (t[0],t[1]))
+        except:
+            return None
+
+    def _lengthToFloat(self,value):
+        v = value
+        if not self.re_digits.search(v):
+            return v
+        try:
+            if v[-4:] == "inch":
+                # OO files use "inch" instead of "in" in Reportlab units
+                v = v[:-2]
+        except:
+            pass
+        try:
+            c = round(toLength(v))
+            return c
+        except:
+            return v
+
+    def openOfficeStringUtf8(self,string):
+        if type(string) == unicode:
+            return string.encode("utf-8")
+        tempstring = unicode(string,"cp1252").encode("utf-8")
+        return tempstring
+
+class DomApi(DomApiGeneral):
+    """This class provides a DOM-API for XML-Files from an SXW-Archive."""
+    def __init__(self,xml_content,xml_styles):
+        DomApiGeneral.__init__(self)
+        self.content_dom = xml.dom.minidom.parseString(xml_content)
+        self.styles_dom = xml.dom.minidom.parseString(xml_styles)
+        body = self.content_dom.getElementsByTagName("office:body")
+        self.body = body and body[0]
+
+        # TODO:
+        self.style_dict = {}
+        self.style_properties_dict = {}
+
+        # ******** always use the following order:
+        self.buildStyleDict()
+        self.buildStylePropertiesDict()
+        if self.styles_dom.getElementsByTagName("style:page-master").__len__()<>0:
+            self.page_master = self.styles_dom.getElementsByTagName("style:page-master")[0]
+        if  self.styles_dom.getElementsByTagName("style:page-layout").__len__()<>0 :
+			self.page_master = self.styles_dom.getElementsByTagName("style:page-layout")[0]        
+        self.document = self.content_dom.getElementsByTagName("office:document-content")[0]
+
+    def buildStylePropertiesDict(self):
+        for s in self.style_dict.keys():
+            self.style_properties_dict[s] = self.getStylePropertiesDict(s)
+
+    def updateWithPercents(self,dict,updatedict):
+        """Sometimes you find values like "115%" in the style hierarchy."""
+        if not updatedict:
+            # no style hierarchies for this style? =>
+            return
+        new_updatedict = copy.copy(updatedict)
+        for u in new_updatedict.keys():
+            try:
+                if new_updatedict[u].find("""%""") != -1 and dict.has_key(u):
+                    number = float(self.re_digits.search(dict[u]).group(1))
+                    unit = self.re_digits.search(dict[u]).group(2)
+                    new_number = self.stringPercentToFloat(new_updatedict[u]) * number
+                    if unit == "pt":
+                        new_number = int(new_number)
+                        # no floats allowed for "pt"
+                        # OOo just takes the int, does not round (try it out!)
+                    new_updatedict[u] = "%s%s" % (new_number,unit)
+                else:
+                    dict[u] = new_updatedict[u]
+            except:
+                dict[u] = new_updatedict[u]
+        dict.update(new_updatedict)
+
+    def normalizeStyleProperties(self):
+        """Transfer all style:style-properties attributes from the
+        self.style_properties_hierarchical dict to the automatic-styles
+        from content.xml. Use this function to preprocess content.xml for
+        XSLT transformations etc.Do not try to implement this function
+        with XSlT - believe me, it's a terrible task..."""
+        styles_styles = self.styles_dom.getElementsByTagName("style:style")
+        automatic_styles = self.content_dom.getElementsByTagName("office:automatic-styles")[0]
+        for s in styles_styles:
+            automatic_styles.appendChild(s.cloneNode(deep=1))
+        content_styles = self.content_dom.getElementsByTagName("style:style")
+        # these are the content_styles with styles_styles added!!!
+        for s in content_styles:
+            c = self.findChildrenByName(s,"style:properties")
+            if c == []:
+                # some derived automatic styles do not have "style:properties":
+                temp = self.content_dom.createElement("style:properties")
+                s.appendChild(temp)
+                c = self.findChildrenByName(s,"style:properties")
+            c = c[0]
+            dict = self.style_properties_dict[(s.getAttribute("style:name")).encode("utf-8")] or {}
+            for attribute in dict.keys():
+                c.setAttribute(self.openOfficeStringUtf8(attribute),self.openOfficeStringUtf8(dict[attribute]))
+
+    def transferStylesXml(self):
+        """Transfer certain sub-trees from styles.xml to the normalized content.xml
+        (see above). It is not necessary to do this - for example - with paragraph styles.
+        the "normalized" style properties contain all information needed for
+        further processing."""
+        # TODO: What about table styles etc.?
+        outline_styles = self.styles_dom.getElementsByTagName("text:outline-style")
+        t = self.content_dom.createElement("transferredfromstylesxml")
+        self.document.insertBefore(t,self.body)
+        t_new = self.body.previousSibling
+        try:
+            page_master = self.page_master
+            t_new.appendChild(page_master.cloneNode(deep=1))
+            t_new.appendChild(outline_styles[0].cloneNode(deep=1))
+        except:
+            pass
+
+    def normalizeLength(self):
+        """Normalize all lengthes to floats (i.e: 1 inch = 72).
+        Always use this after "normalizeContent" and "transferStyles"!"""
+        # TODO: The complex attributes of table cell styles are not transferred yet.
+        #all_styles = self.content_dom.getElementsByTagName("style:properties")
+        #all_styles += self.content_dom.getElementsByTagName("draw:image")
+        all_styles = self.content_dom.getElementsByTagName("*")
+        for s in all_styles:
+            for x in s._attrs.keys():
+                v = s.getAttribute(x)
+                s.setAttribute(x,"%s" % self._lengthToFloat(v))
+                # convert float to string first!
+
+    def normalizeTableColumns(self):
+        """Handle this strange table:number-columns-repeated attribute."""
+        columns = self.content_dom.getElementsByTagName("table:table-column")
+        for c in columns:
+            if c.hasAttribute("table:number-columns-repeated"):
+                number = int(c.getAttribute("table:number-columns-repeated"))
+                c.removeAttribute("table:number-columns-repeated")
+                for i in range(number-1):
+                    (c.parentNode).insertBefore(c.cloneNode(deep=1),c)
+
+    def buildStyleDict(self):
+        """Store all style:style-nodes from content.xml and styles.xml in self.style_dict.
+        Caution: in this dict the nodes from two dom apis are merged!"""
+        for st in (self.styles_dom,self.content_dom):
+            for s in st.getElementsByTagName("style:style"):
+                name = s.getAttribute("style:name").encode("utf-8")
+                self.style_dict[name] = s
+        return True
+
+    def toxml(self):
+        return self.content_dom.toxml(encoding="utf-8")
+
+    def getStylePropertiesDict(self,style_name):
+        res = {}
+
+        if self.style_dict[style_name].hasAttribute("style:parent-style-name"):
+            parent = self.style_dict[style_name].getAttribute("style:parent-style-name").encode("utf-8")
+            res = self.getStylePropertiesDict(parent)
+
+        childs = self.style_dict[style_name].childNodes
+        for c in childs:
+            if c.nodeType == c.ELEMENT_NODE and c.nodeName.find("properties")>0 :
+                for attr in c._attrs.keys():
+                    res[attr] = c.getAttribute(attr).encode("utf-8")
+        return res
+
+class PyOpenOffice(object):
+    """This is the main class which provides all functionality."""
+    def __init__(self, path='.', save_pict=False):
+        self.path = path
+        self.save_pict = save_pict
+        self.images = {}
+
+    def oo_read(self,fname):
+        z = zipfile.ZipFile(fname,"r")
+        content = z.read('content.xml')
+        style = z.read('styles.xml')
+        all = z.namelist()
+        for a in all:
+            if a[:9]=='Pictures/' and len(a)>10:
+                pic_content = z.read(a)
+                self.images[a[9:]] = pic_content
+                if self.save_pict:
+                    f=open(os.path.join(self.path, os.path.basename(a)),"wb")
+                    f.write(pic_content)
+                    f.close()
+        z.close()
+        return content,style
+
+    def oo_replace(self,content):
+        regex = [
+            (r"<para[^>]*/>", ""),
+            #(r"<text:ordered-list.*?>(.*?)</text:ordered-list>", "$1"),
+            #(r"<text:unordered-list.*?>(.*?)</text:unordered-list>", "$1"),
+            (r"<para(.*)>(.*?)<text:line-break[^>]*/>", "<para$1>$2</para><para$1>"),
+        ]
+        for key,val in regex:
+            content = re.sub(key, val, content)
+        return content
+
+    def unpackNormalize(self,sourcefile):
+        c,s = self.oo_read(sourcefile)
+        c = self.oo_replace(c)
+        dom = DomApi(c,s)
+        dom.normalizeStyleProperties()
+        dom.transferStylesXml()
+        dom.normalizeLength()
+        dom.normalizeTableColumns()
+        new_c = dom.toxml()
+        return new_c
+
+def sxw2rml(sxw_file, xsl, output='.', save_pict=False):
+    from lxml import etree
+    from StringIO import StringIO
+
+    tool = PyOpenOffice(output, save_pict = save_pict)
+    res = tool.unpackNormalize(sxw_file)
+    
+    f = StringIO(xsl)
+    styledoc = etree.parse(f)
+    style = etree.XSLT(styledoc)
+    
+    f = StringIO(res)
+    doc = etree.parse(f)
+    result = style(doc)
+    root = etree.XPathEvaluator(result)("/document/stylesheet")
+    
+    if root:
+        root=root[0]
+        images = etree.Element("images")
+        for img in tool.images:
+            node = etree.Element('image', name=img)
+            node.text = base64.encodestring(tool.images[img])
+            images.append(node)
+        root.append(images)
+
+    try:
+        xml = str(result)
+        return xml
+    except:
+        return result
+
+if __name__ == "__main__":
+    import optparse
+    parser = optparse.OptionParser(
+        version="Tiny Report v%s" % __version__,
+        usage = 'tiny_sxw2rml.py [options] file.sxw')
+    parser.add_option("-v", "--verbose", default=False, dest="verbose", help="enable basic debugging")
+    parser.add_option("-o", "--output", dest="output", default='.', help="directory of image output")
+    (opt, args) = parser.parse_args()
+    if len(args) != 1:
+        parser.error("incorrect number of arguments")
+
+    import sys
+    import StringIO
+
+    fname = sys.argv[1]
+    f = fname
+    xsl_file = 'normalized_oo2rml.xsl'
+    z = zipfile.ZipFile(fname,"r")
+    mimetype = z.read('mimetype')
+    if mimetype.split('/')[-1] == 'vnd.oasis.opendocument.text' :
+		xsl_file = 'normalized_odt2rml.xsl'
+    xsl = file(os.path.join(os.getcwd(), os.path.dirname(sys.argv[0]), xsl_file)).read()
+    result = sxw2rml(f, xsl, output=opt.output, save_pict=False)
+
+    print result
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'assembly_bom/sale.py'
--- assembly_bom/sale.py	1970-01-01 00:00:00 +0000
+++ assembly_bom/sale.py	2011-10-06 15:31:48 +0000
@@ -0,0 +1,71 @@
+# -*- ecoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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/>
+#
+##############################################################################
+
+from osv import fields, osv
+import netsvc
+import datetime
+import time
+from tools.translate import _
+
+class sale_order_line(osv.osv):
+    _inherit = 'sale.order.line'
+    def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
+            uom=False, qty_uos=0, uos=False, name='', partner_id=False,
+            lang=False, update_tax=True, date_order=False, packaging=False, fiscal_position=False, flag=False,partner_shipping_id=False, shop_id=False, context={}):
+        
+        ret=super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty=qty,uom=uom, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id,lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag)
+        if not ret.get('warning') and product:
+            product_obj = self.pool.get('product.product')
+            product_uom_obj = self.pool.get('product.uom')
+            product_obj = product_obj.browse(cr, uid, product, context=context)
+            uom2 = False
+            if uom:
+                uom2 = product_uom_obj.browse(cr, uid, uom)
+                if product_obj.uom_id.category_id.id != uom2.category_id.id:
+                    uom = False
+
+            if (product_obj.type=='product') and product_obj.procure_method=='make_to_order':
+                bom_id = self.pool.get('mrp.bom').search(cr, uid, [
+                            ('product_id', '=', product_obj.id),
+                            ('bom_id', '=', False),
+                            ('type', '=', 'assembly')])
+                if bom_id:
+                    bom_id = bom_id[0]
+                    bom_obj = self.pool.get('mrp.bom').browse(cr, uid, bom_id)
+                if bom_id and 'bom_stock_value' in bom_obj._columns.keys() and (bom_obj.bom_stock_value  < qty * product_obj.uom_id.factor):
+                        warning = {
+                            'title': _('Not enough stock !'),
+                            'message': _('You plan to move %.2f %s but you only have %.2f %s available !\nThe real stock is %.2f %s. (without reservations)') %
+                                (qty, uom2 and uom2.name or product_obj.uom_id.name,
+                                 max(0,bom_obj.bom_stock_value), product_obj.uom_id.name,
+                                 max(0,product_obj.qty_available), product_obj.uom_id.name)
+                        }     
+                        ret['warning'] = warning
+        return ret
+sale_order_line()
+
+
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'assembly_bom/stock.py'
--- assembly_bom/stock.py	1970-01-01 00:00:00 +0000
+++ assembly_bom/stock.py	2011-10-06 15:31:48 +0000
@@ -0,0 +1,378 @@
+# -*- ecoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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/>
+#
+##############################################################################
+
+from osv import fields, osv
+import netsvc
+import datetime
+import time
+from tools.translate import _
+
+class StockMove(osv.osv):
+    _inherit = 'stock.move'
+
+    def _action_explode(self, cr, uid, move, context=None):
+        """ Explodes pickings to produce many moves as per the bom lines for products assembly bom.
+        @param move: Stock moves
+        @constraints: explode takes place for pickings related to sale order
+        @return: True
+        """
+        result=super(StockMove, self)._action_explode(cr, uid, move, context=context)
+        bom_obj = self.pool.get('mrp.bom')
+        move_obj = self.pool.get('stock.move')
+        procurement_obj = self.pool.get('procurement.order')
+        product_obj = self.pool.get('product.product')
+        wf_service = netsvc.LocalService("workflow")
+        production_obj=self.pool.get('mrp.production')
+        if move.product_id.supply_method == 'produce' and move.product_id.procure_method == 'make_to_order':
+            bis = bom_obj.search(cr, uid, [
+                ('product_id','=',move.product_id.id),
+                ('bom_id','=',False),
+                ('type','=','assembly')])
+            if bis:
+                factor = move.product_qty
+                bom_point = bom_obj.browse(cr, uid, bis[0], context=context)
+                res = bom_obj._bom_explode(cr, uid, bom_point, factor, [])
+                dest = move.product_id.product_tmpl_id.property_stock_production.id
+
+                if move.sale_line_id:
+
+                    #1. partial delivery is not allowed for kit type bom product
+                    move.picking_id.write({'move_type':'one'})
+
+                    #2. manually changing the state to confirmed for each exploded move to allow checking bom stock value
+                        #related to mrp_jit
+                    state = 'confirmed'
+                    if move.state == 'assigned':
+                        state = 'assigned'
+                    if res[0] and res[0][0]:
+                        line=res[0][0]
+                        valdef = {
+                                'picking_id': move.picking_id.id,
+                                'product_id': line['product_id'],
+                                'product_uom': line['product_uom'],
+                                'product_qty': line['product_qty'],
+                                'product_uos': line['product_uos'],
+                                'product_uos_qty': line['product_uos_qty'],
+                                'move_dest_id': move.id,
+                                'state': state,
+                                'name': line['name'],
+                                'location_dest_id': dest,
+                                #'move_history_ids': [(6,0,[move.id])],
+                                #'move_history_ids2': [(6,0,[])],
+                                'procurements': [],
+                                'sale_line_id':False,
+                                "kit_id":False,
+                                "parent_bom_id":bis[0],
+                                'sale_id':move.sale_line_id.order_id.id
+                                
+                            }
+                        move.write(valdef)
+                        
+                    for line in res[0][1:]:
+                        valdef = {
+                            'picking_id': move.picking_id.id,
+                            'product_id': line['product_id'],
+                            'product_uom': line['product_uom'],
+                            'product_qty': line['product_qty'],
+                            'product_uos': line['product_uos'],
+                            'product_uos_qty': line['product_uos_qty'],
+                            'move_dest_id': move.id,
+                            'state': state,
+                            'name': line['name'],
+                            'location_dest_id': dest,
+                            #'move_history_ids': [(6,0,[move.id])],
+                            #'move_history_ids2': [(6,0,[])],
+                            'procurements': [],
+                            'sale_line_id':False,
+                            "kit_id":False,
+                            "parent_bom_id":bis[0],
+                            'sale_id':move.sale_line_id.order_id.id
+                        }
+                        mid = move_obj.copy(cr, uid, move.id, default=valdef)
+                        move_obj.action_assign(cr, uid, [mid])
+                        prodobj = product_obj.browse(cr, uid, line['product_id'], context=context)
+
+                    cr.commit()
+        return result
+
+
+    _columns={
+              'sale_id': fields.many2one('sale.order',"Sale Reference"),
+              'kit_id':fields.many2one('mrp.production',"Assembly"),
+              'production_ids': fields.many2many('mrp.production', 'mrp_production_move_ids', 'move_id', 'production_id', 'Related Production'),
+              'parent_bom_id':fields.many2one("mrp.bom",'Related Bom')
+              }
+    def onchange_quantity(self, cr, uid, ids, product_id, product_qty,
+                          product_uom, product_uos,location_id=False):
+        """ On change of product quantity finds UoM and UoS quantities
+        @param product_id: Product id
+        @param product_qty: Changed Quantity of product
+        @param product_uom: Unit of measure of product
+        @param product_uos: Unit of sale of product
+        @return: Dictionary of values
+        """
+        context={}
+        if location_id:
+            context['location'] =[location_id]
+        result=super(StockMove,self).onchange_quantity(cr, uid, ids, product_id, product_qty, product_uom, product_uos)
+        if (not product_id) or (product_qty <=0.0):
+            return result
+        product_obj = self.pool.get('product.product').browse(cr, uid, [product_id],context=context)[0]
+        uom2 = product_obj.uom_id
+        if (product_obj.type=='product') and (product_obj.virtual_available * uom2.factor < product_qty * product_obj.uom_id.factor) \
+                  and (product_obj.procure_method=='make_to_stock'):
+                    warning = {
+                        'title': _('Not enough stock !'),
+                        'message': _('You plan to move %.2f %s but you only have %.2f %s available !\nThe real stock is %.2f %s. (without reservations)') %
+                            (product_qty, uom2 and uom2.name or product_obj.uom_id.name,
+                             max(0,product_obj.virtual_available), product_obj.uom_id.name,
+                             max(0,product_obj.qty_available), product_obj.uom_id.name)
+                    }     
+                    result['warning'] = warning
+                    
+        if (product_obj.type=='product') and product_obj.procure_method=='make_to_order':
+            bom_id = self.pool.get('mrp.bom').search(cr, uid, [
+                        ('product_id', '=', product_obj.id),
+                        ('bom_id', '=', False)])
+            bom_obj = False
+            if bom_id:
+                bom_obj = self.pool.get('mrp.bom').browse(cr, uid, bom_id[0])
+            
+            if bom_obj and (bom_obj.bom_stock_value  < product_qty * product_obj.uom_id.factor) \
+                  and (product_obj.procure_method=='make_to_order'):
+                    warning = {
+                        'title': _('Not enough stock !'),
+                        'message': _('You plan to move %.2f %s but you only have %.2f %s available !\nThe real stock is %.2f %s. (without reservations)') %
+                            (product_qty, uom2 and uom2.name or product_obj.uom_id.name,
+                             max(0,bom_obj.bom_stock_value), product_obj.uom_id.name,
+                             max(0,product_obj.qty_available), product_obj.uom_id.name)
+                    }     
+                    result['warning'] = warning                    
+                    
+        return result
+    def onchange_product_id(self, cr, uid, ids, prod_id=False, loc_id=False,
+                            loc_dest_id=False, address_id=False,product_qty=0):
+        """ On change of product id, .
+        @param prod_id: Changed Product id
+        @param loc_id: Source location id
+        @param loc_id: Destination location id
+        @param address_id: Address id of partner
+        @param product_qty: Product Quantity
+        @return: Dictionary of values
+        """
+        warning = {}
+        context = {}
+        res=super(StockMove,self).onchange_product_id(cr, uid, ids, prod_id=prod_id, loc_id=loc_id,
+                            loc_dest_id=loc_dest_id, address_id=address_id)
+        if not prod_id:
+            return res
+        if loc_id:
+            context['location'] = [loc_id]
+        product_obj = self.pool.get('product.product').browse(cr, uid, [prod_id],context=context)[0]
+        uom2 = product_obj.uom_id
+        if (product_obj.type=='product') and (product_obj.virtual_available * uom2.factor < product_qty * product_obj.uom_id.factor) \
+                  and (product_obj.procure_method=='make_to_stock'):
+                    warning = {
+                        'title': _('Not enough stock !'),
+                        'message': _('You plan to move %.2f %s but you only have %.2f %s available !\nThe real stock is %.2f %s. (without reservations)') %
+                            (product_qty, uom2 and uom2.name or product_obj.uom_id.name,
+                             max(0,product_obj.virtual_available), product_obj.uom_id.name,
+                             max(0,product_obj.qty_available), product_obj.uom_id.name)
+                    }     
+                    res['warning'] = warning
+        if (product_obj.type=='product') and product_obj.procure_method=='make_to_order':
+            bom_id = self.pool.get('mrp.bom').search(cr, uid, [
+                        ('product_id', '=', product_obj.id),
+                        ('bom_id', '=', False)])
+            if bom_id:
+                bom_obj = self.pool.get('mrp.bom').browse(cr, uid, bom_id[0])
+            if bom_id and (bom_obj.bom_stock_value  < product_qty * product_obj.uom_id.factor):
+                    warning = {
+                        'title': _('Not enough stock !'),
+                        'message': _('You plan to move %.2f %s but you only have %.2f %s available !\nThe real stock is %.2f %s. (without reservations)') %
+                            (product_qty, uom2 and uom2.name or product_obj.uom_id.name,
+                             max(0,bom_obj.bom_stock_value), product_obj.uom_id.name,
+                             max(0,product_obj.qty_available), product_obj.uom_id.name)
+                    }     
+                    res['warning'] = warning
+        return res
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+        'date_expected': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+    }
+    
+StockMove()
+
+
+class stock_picking(osv.osv):
+    _inherit="stock.picking"
+
+    def do_partial(self, cr, uid, ids, partial_datas, context=None):
+        """Creates and processes the assembly (MO) operation for delivery of product with assembly bom during sale
+         @param self: The object pointer.
+         @param ids: ids of the procurement order document
+         @param context: standard dictionary
+         @comment: Creates Production order for assembly of the product with assembly bom and
+                    deliveres the product to customers making moves to ensure stock tracking
+         @return: returns dictionary carrying delivered picking details
+        """
+        bom_obj = self.pool.get('mrp.bom')
+        picking_obj=self.pool.get('stock.picking')
+        produce_wiz_obj=self.pool.get("mrp.product.produce")
+        production_obj=self.pool.get('mrp.production')
+        move_obj=self.pool.get("stock.move")
+        sale_obj=self.pool.get("sale.order")
+        wf_service=netsvc.LocalService('workflow')
+        res=super(stock_picking,self).do_partial(cr, uid, ids, partial_datas)
+        picking_details=res.values()
+        picking_id=picking_details and picking_details[0].get('delivered_picking',False) or False
+        if picking_id:
+            #expecting the picking state will not be 'done'
+            picking=picking_obj.browse(cr,uid,picking_id,context=context)
+            sale_order=picking.sale_id
+            if not sale_order:
+                return res
+
+            sale_obj.action_ship_end(cr, uid, [picking.sale_id.id], context=context)
+            for line in sale_order.order_line:
+                bom_ids=bom_obj.search(cr,uid,[('product_id','=',line.product_id.id)],context={})
+#                procure_id=production_obj.create(cr,uid,{ 'name':'ASSEMBLY'+sale_order.name,
+                bom_id=bom_ids and bom_ids[0] or False
+                if bom_id:
+                    bom=bom_obj.browse(cr,uid,bom_id)
+                    if bom and bom.type=='normal':
+                        move_ids=[move.id for move in picking.move_lines] or []
+                        normal_move_ids=move_obj.search(cr,uid,[('id','in',move_ids),('product_id','=',line.product_id.id)])
+                        ###Expecting
+                        #1. Sale order is having only one line with the product having normal bom
+                        if normal_move_ids:
+                            normal_move_id=normal_move_ids[0]#Refer:#1
+                            normal_move=move_obj.browse(cr,uid,normal_move_id)
+                            normal_move.write({
+                                        'sale_id':line.order_id.id
+                                        })
+
+                    if bom and bom.type=='assembly':
+                        #1. Warehouse stock and output location selected as stock and output
+                        stock_id = sale_order.shop_id.warehouse_id.lot_stock_id.id#stock location
+                        output_id = sale_order.shop_id.warehouse_id.lot_output_id.id#output warehouse location
+                        #2. sale partner customer location selected as customer
+                        customer_loc_id=sale_order.partner_id.property_stock_customer.id or False#customer location
+                        mo_sequence=self.pool.get('ir.sequence').get(cr, uid, 'mrp.production')
+                        src_loc_id=line.product_id.property_stock_production.id#stock location_id
+                        production_id=production_obj.create(cr,uid,{
+                                                                 'name': mo_sequence or sale_order.name,
+                                                                'origin':sale_order.name,
+                                                                'product_id':line.product_id.id,
+                                                                'product_qty':line.product_uom_qty,
+                                                                'product_uom':line.product_uom.id,
+                                                                'product_uos_qty':(line.product_uos and line.product_uos_qty)\
+                                                                                or line.product_uom_qty,
+                                                                'product_uos':(line.product_uos and line.product_uos.id)\
+                                                                                or line.product_uom.id,
+                                                                'location_src_id':src_loc_id,
+    #                                                            'location_dest_id':sale_order.shop_id.warehouse_id.lot_stock_id.id,
+                                                                'location_dest_id':stock_id,
+                                                                'date_start':time.strftime('%Y-%m-%d'),
+                                                                'bom_id':bom_ids and bom_ids[0] or False,
+                                                                'picking_id':picking_id,
+    #                                                            'procure_id':line.procurement_id.id,
+                                                                },context=context)
+
+                        # 3.To suit sale order with multiple lines its achieved by comparing the product in production order
+                        # and the one sold  and the one associated with the parent_bom stored in the move object
+
+                        for move in picking.move_lines:
+                            sold_product_id=line.product_id.id
+                            parent_product_id=move.parent_bom_id and move.parent_bom_id.product_id.id or False
+                            if parent_product_id and parent_product_id==sold_product_id:
+                                move.write({'kit_id':production_id})
+
+
+                        production=production_obj.browse(cr,uid,production_id)
+                        wf_service.trg_validate(uid, 'mrp.production', production_id, 'button_confirm', cr)
+                        move_ids=[move.id for move in production.move_lines]
+                        move_obj.write(cr,uid,move_ids,{'sale_id':line.order_id.id},context=context)
+                        production_obj.force_production(cr, uid, [production_id])
+                        move_ids=[move.id for move in production.move_lines]
+                        production_obj.action_produce(cr, uid, production_id,production.product_qty,'consume_produce')
+                        wf_service.trg_validate(uid, 'mrp.production',production_id,'button_produce_done', cr)
+                        date_planned=time.strftime('%Y-%m-%d')
+                        cr.commit()
+                        production=production_obj.browse(cr,uid,production_id)
+                        production_finished=(production.state=='done')
+                        if production_finished:
+                            finished_ids=[move.id for move in production.move_created_ids2]
+
+                            move_obj.write(cr,uid,finished_ids,{'sale_id':line.order_id.id},context=context)
+
+                            finished_move_stock_id = self.pool.get('stock.move').create(cr, uid, {
+							'name': line.name[:64],
+                            'picking_id': False,
+                            'product_id': line.product_id.id,
+                            'date': time.strftime('%Y-%m-%d'),
+                            'date_expected': time.strftime('%Y-%m-%d'),
+                            'product_qty': line.product_uom_qty,
+                            'product_uom': line.product_uom.id,
+                            'product_uos_qty': line.product_uos_qty,
+                            'product_uos': (line.product_uos and line.product_uos.id)\
+                                    or line.product_uom.id,
+                            'product_packaging': line.product_packaging.id,
+                            'address_id': line.address_allotment_id.id or sale_order.partner_shipping_id.id,
+                            'location_id': stock_id,
+                            'location_dest_id':output_id,#move destination to output location of the warehouse
+                            'sale_line_id': line.id,
+                            'tracking_id': False,
+                            'state': 'draft',
+                            #'state': 'waiting',
+                            'note': line.notes,
+                            'kit_id':False,
+                            'company_id': sale_order.company_id.id,
+                            'sale_id': sale_order.id,
+                        })
+
+                            move2_id=move_obj.copy(cr,uid,finished_move_stock_id,{'location_id':output_id, 'sale_line_id':False,'location_dest_id': customer_loc_id})#move to customer location
+
+                            status=move_obj.action_confirm(cr,uid,[finished_move_stock_id,move2_id])
+
+                            move_obj.action_done(cr,uid,[finished_move_stock_id,move2_id])
+        return res
+
+    def action_confirm(self, cr, uid, ids, context=None):        
+        res=super(stock_picking,self).action_confirm(cr, uid, ids, context)
+        cr.commit()
+        try:
+            self.action_assign(cr, uid, ids)
+        except Exception, e:
+            print e
+        return True
+    _defaults = {
+        'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
+    }
+
+
+stock_picking()
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'assembly_bom/stock_view.xml'
--- assembly_bom/stock_view.xml	1970-01-01 00:00:00 +0000
+++ assembly_bom/stock_view.xml	2011-10-06 15:31:48 +0000
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+    
+           <record id="view_picking_out_form_inherit" model="ir.ui.view">
+            <field name="name">stock.picking.out.form.inherit</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+          	<field name="inherit_id" ref="stock.view_picking_out_form" />
+            <field name="arch" type="xml">
+	            <xpath expr="//field/form/group/field[@name='product_id']" position="replace">
+	            	<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id, product_qty)" colspan="4"/>
+	            </xpath>
+	            <xpath expr="//form/group/field[@name='product_qty']" position="replace">
+	            	<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos,location_id)" colspan="3" />
+	            </xpath>
+	            <xpath expr="//tree/field[@name='product_qty']" position="replace">
+	            	<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos,location_id)" />
+	            </xpath>
+	        </field>
+           </record>
+            
+    
+           <record id="view_picking_form_inherit" model="ir.ui.view">
+            <field name="name">stock.picking.forminherit</field>
+            <field name="model">stock.picking</field>
+            <field name="type">form</field>
+          	<field name="inherit_id" ref="stock.view_picking_form" />
+	            <field name="arch" type="xml">
+			            <xpath expr="//field/form/group/field[@name='product_id']" position="replace">
+			            	<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.address_id, product_qty)" colspan="4"/>
+			            </xpath>
+			            <xpath expr="//form/group/field[@name='product_qty']" position="replace">
+			            	<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos,location_id)" colspan="3" />
+			            </xpath>
+			            <xpath expr="//tree/field[@name='product_qty']" position="replace">
+			            	<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos,location_id)" />
+			            </xpath>
+	            </field>
+           </record>
+    
+           <record id="view_move_form_inherit22" model="ir.ui.view">
+            <field name="name">stock.move.form.inherit</field>
+            <field name="model">stock.move</field>
+            <field name="type">form</field>
+            <field eval="4" name="priority"/>
+          	<field name="inherit_id" ref="stock.view_move_form" />
+	            <field name="arch" type="xml">
+		            <data>
+			            <xpath expr="//field[@name='prodlot_id']" position="after">
+			                <field name="sale_id" readonly="1" select="1" />
+			            </xpath>
+			            <xpath expr="//field[@name='product_id']" position="replace">
+			            	<field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False, product_qty)"/>
+			            </xpath>
+			            <xpath expr="//field[@name='product_qty']" position="replace">
+			            	<field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos,location_id)"/>
+			            </xpath>
+			            
+		            </data>
+	            </field>
+           </record>
+
+
+        <record id="view_move_tree_inherit22" model="ir.ui.view">
+            <field name="name">stock.move.tree_inherit</field>
+            <field name="model">stock.move</field>
+            <field name="type">tree</field>
+            <field eval="6" name="priority"/>
+          	<field name="inherit_id" ref="stock.view_move_tree" />
+            <field name="arch" type="xml">
+	            <data>
+		            <xpath expr="//field[@name='origin']" position="after">
+		                <field name="sale_id" readonly="1"/>
+		            </xpath>
+	            </data>
+            </field>
+       </record>
+
+        <record id="view_move_search_inherit22" model="ir.ui.view">
+            <field name="name">stock.move.search_inherit</field>
+            <field name="model">stock.move</field>
+            <field name="type">search</field>
+            <field eval="3" name="priority"/>
+          	<field name="inherit_id" ref="stock.view_move_search" />
+            <field name="arch" type="xml">
+	            <data>
+		            <xpath expr="//field[@name='origin']" position="after">
+		                <field name="sale_id" />
+		            </xpath>
+	            </data>
+            </field>
+       </record>
+
+
+
+
+    </data>
+</openerp>

=== added directory 'assembly_bom/wizard'
=== added file 'assembly_bom/wizard/__init__.py'
--- assembly_bom/wizard/__init__.py	1970-01-01 00:00:00 +0000
+++ assembly_bom/wizard/__init__.py	2011-10-06 15:31:48 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 consumption_report_wizard
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== added file 'assembly_bom/wizard/consumption_report_wizard.py'
--- assembly_bom/wizard/consumption_report_wizard.py	1970-01-01 00:00:00 +0000
+++ assembly_bom/wizard/consumption_report_wizard.py	2011-10-06 15:31:48 +0000
@@ -0,0 +1,93 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 NovaPoint Group LLC (<http://www.novapointgroup.com>)
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#
+#    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 wizard
+import pooler
+from osv import osv,fields
+import tools
+from tools.translate import _
+
+class consumption_report_wizard(osv.osv_memory):
+
+    def print_consumption_report(self,cr,uid,ids,context={}):
+        """ Updates the context with the details given in the wizard form
+         @param self: The object pointer.
+         @param ids: ids of the procurement order document
+         @param context: standard dictionary
+         @comment: The data for stock move analysis is passed through context
+         @return: returns standard dictionary to make report
+        """
+        data = self.read(cr, uid, ids[0])
+        warehouse_id=data and data.get('warehouse_id',False) or False
+        start_date=data and data.get('start_date',False) or False
+        end_date=data and data.get('end_date',False) or False
+        warehouse=self.pool.get('stock.warehouse').browse(cr,uid,warehouse_id)
+        product_ids=context.get('active_ids',[])
+        source_loc_id=warehouse.lot_stock_id and warehouse.lot_stock_id.id or False
+        return {
+        'type': 'ir.actions.report.xml',
+        'report_name':"product.consumption",
+        'datas': {
+                'model':'product.product',
+                'id': product_ids and product_ids[0] or False,
+                'ids': product_ids and product_ids or [],
+                'report_type': 'pdf',
+            },
+        'nodestroy': False,
+        'context':{
+                   "source_loc_id":source_loc_id,
+                   "start_date":start_date,
+                   "end_date":end_date
+                   },
+
+        }
+
+    _name="product.consumption"
+    _columns={
+              'warehouse_id':fields.many2one('stock.warehouse','Select Your Warehouse'),
+              'start_date':fields.date("Start Date"),
+              'end_date':fields.date("End Date")
+
+              }
+
+
+    def _get_warehouse(self, cr, uid, context=None):
+        """ Fetches the default warehouse
+         @param self: The object pointer.
+         @param ids: ids of the procurement order document
+         @param context: standard dictionary
+         @comment: Pre-fills the warehouse field by the ware house related to user company
+         @return: returns standard dictionary to make report
+        """
+        cmpny_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
+        shop = self.pool.get('sale.shop').search(cr, uid, [('company_id', '=', cmpny_id)])
+        if shop:
+            shop_obj = self.pool.get('sale.shop').browse(cr, uid, shop[0], context=context)
+            return shop_obj.warehouse_id and shop_obj.warehouse_id.id
+        return False
+
+    _defaults = {
+        'warehouse_id': _get_warehouse,
+    }
+
+consumption_report_wizard()
+
+

=== added file 'assembly_bom/wizard/consumption_report_wizard.xml'
--- assembly_bom/wizard/consumption_report_wizard.xml	1970-01-01 00:00:00 +0000
+++ assembly_bom/wizard/consumption_report_wizard.xml	2011-10-06 15:31:48 +0000
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!--  Make Procurement -->
+
+        <record id="view_product_consumption_id" model="ir.ui.view">
+            <field name="name">Product Consumption</field>
+            <field name="model">product.consumption</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Product Consumption">
+                    <field name="warehouse_id" colspan="4" required="1"/>
+                    <newline/>
+                    <field name="start_date" colspan="2"/>
+                    <field name="end_date" colspan="2" />
+                    <button type="object" name="print_consumption_report" icon="gtk-print" string="Print"/>
+                    <button special="cancel" icon="gtk-cancel" string="Cancel"/>
+                </form>
+            </field>
+        </record>
+
+
+
+        <act_window name="Product Consumption"
+            res_model="product.consumption"
+            src_model="product.product"
+            view_mode="form"
+            target="new"
+            key2="client_print_multi"
+            id="act_product_consumption_id"
+            />
+
+
+		<!--wizard
+			string="Consumption Report xxx"
+			model="product.product"
+			name="product.consumption.wiz"
+			keyword="client_print_multi"
+			id="product_consumption_wizard_id"/-->
+
+	</data>
+</openerp>
\ No newline at end of file