From 0d3b06d6a674da8abff6b06dea30a33bbe993a09 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Sat, 20 Sep 2008 18:06:51 +0530
Subject: [PATCH 01/72] Added function unlink in sale order for not to delete
 confirmed SO

bzr revid: ruchakpatel@gmail.com-20080920123651-p2yw2mh586w6sl8d
---
 addons/sale/sale.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 45783dd5978..2d278491fee 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -260,6 +260,17 @@ class sale_order(osv.osv):
     _order = 'name desc'
 
     # Form filling
+    def unlink(self, cr, uid, ids):
+        sale_orders = self.read(cr, uid, ids, ['state'])
+        unlink_ids = []
+        for s in sale_orders:
+            if s['state'] in ['draft','canceled']:
+                unlink_ids.append(s['id'])
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sale Order(s) which are already confirmed !'))
+        osv.osv.unlink(self, cr, uid, unlink_ids)
+        return True
+    
     def onchange_shop_id(self, cr, uid, ids, shop_id):
         v={}
         if shop_id:

From d3e1d24f1bc9bfc9760bffa1189716171115362e Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Sat, 20 Sep 2008 18:36:56 +0530
Subject: [PATCH 02/72] Moved Latest Inventory from report_stock to stock

bzr revid: ruchakpatel@gmail.com-20080920130656-wuf24lx0u40tnv6p
---
 addons/stock/stock.py       | 32 ++++++++++++++++++++++++++++++++
 addons/stock/stock_view.xml | 27 ++++++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 5b4a416f8fa..82143484ee1 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1395,4 +1395,36 @@ class product_product(osv.osv):
         return res
 
 product_product()
+
+
+class report_inventory_latest(osv.osv):
+    _name = "report.inventory.latest"
+    _description = "Latest inventories by product."
+    _auto = False
+    _columns = {
+            'name':  fields.datetime('Latest Date',readonly=True),
+            'product': fields.many2one('product.product', 'Product', readonly=True, select=True),
+            'inventory': fields.many2one('stock.inventory', 'Inventory Name', readonly=True, select=True),
+            'qty': fields.float('Quantity', readonly=True, select=True),
+            'uom' : fields.many2one('product.uom', 'UoM', readonly=True),
+#            'date' : fields.datetime('Latest Date',readonly=True),
+    }
+    _order = 'name desc'
+    def init(self, cr):
+        cr.execute("""
+            create or replace view report_inventory_latest as (
+            select  max(l.id) as id,
+            l.product_id as product, 
+            l.product_qty as qty, 
+            l.product_uom as uom ,
+            min(l.inventory_id) as inventory, 
+            i.date as name 
+            from stock_inventory_line l 
+                join stock_inventory i on (l.inventory_id=i.id)
+            group by l.product_uom,l.product_qty,l.product_id,i.date
+            
+            )""")
+report_inventory_latest()
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5e7d96ff2e4..e78edfc67e0 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1275,7 +1275,32 @@
             <field eval="True" name="object"/>			
         </record>   
 		
-	      
+	      <record id="report_stock_latest_tree" model="ir.ui.view">
+            <field name="name">report.inventory.latest.view</field>
+            <field name="model">report.inventory.latest</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Latest inventories by product">
+                    <field name="product" select="1"/>
+                    <field name="qty" select="1"/>
+                    <field name="uom"/>
+                    <field name="inventory"/>
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="action_report_stock_latest_form" model="ir.actions.act_window">
+            <field name="name">Latest Inventories by product</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">report.inventory.latest</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="domain">[('name','&gt;=',time.strftime('%Y-%m-01'))]</field>
+        </record>
+        
+        <menuitem action="action_report_stock_latest_form" id="menu_report_stock_latest" parent="next_id_62"/>
+        
 		
 
     </data>

From 5093e92aeeb8c707a28097af31a45644a8937606 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Mon, 22 Sep 2008 18:22:52 +0530
Subject: [PATCH 03/72] Check UoM In invoices like in sales : Minor changes in
 ivoice.py and invoice view

bzr revid: ruchakpatel@gmail.com-20080922125252-4bm2us5swwgolqed
---
 addons/account/account_invoice_view.xml | 5 ++++-
 addons/account/invoice.py               | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 46239314c40..2798975fd62 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -53,7 +53,10 @@
                     <notebook>
                         <page string="Line">
                             <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id)" select="1"/>
-                            <field name="uos_id"/>
+                            <field name="uos_id"
+                            context="product_id=product_id"
+                            on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id)"          
+                            />
                             <field name="quantity" select="1"/>
                             <field name="price_unit" select="1"/>
                             <field name="discount"/>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index a6d39d42f10..fc5dbb69d9f 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -847,7 +847,7 @@ class account_invoice_line(osv.osv):
             if type in ('in_invoice', 'in_refund'):
                 return {'domain':{'product_uom':[]}}
             else:
-                return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
+                return {'value': {'price_unit': 0.0 }, 'domain':{'uos_id': []}}
         lang=False
         context.update({'lang': lang})
         res = self.pool.get('product.product').browse(cr, uid, product, context=context)
@@ -892,11 +892,12 @@ class account_invoice_line(osv.osv):
             result['account_id'] = a
 
         domain = {}
-        result['uos_id'] = uom or res.uom_id.id or False
+        result['uos_id'] = res.uom_id.id or uom or False
         if result['uos_id']:
             res2 = res.uom_id.category_id.id
             if res2 :
                 domain = {'uos_id':[('category_id','=',res2 )]}
+                result
         return {'value':result, 'domain':domain}
 
     def move_line_get(self, cr, uid, invoice_id, context={}):

From bc6d378757021174712ad27a1ac84340ba52ab91 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Mon, 22 Sep 2008 18:51:14 +0530
Subject: [PATCH 04/72] Fill From  Unreceived Products : improved picking added
 new field in stock.move ,so that it shows only moves from the partner
 selected in the picking.

bzr revid: ruchakpatel@gmail.com-20080922132114-xl0jooywvj7qv34x
---
 addons/stock/stock.py       |  1 +
 addons/stock/stock_view.xml | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 82143484ee1..d7555ac1b25 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -908,6 +908,7 @@ class stock_move(osv.osv):
         'state': fields.selection([('draft','Draft'),('waiting','Waiting'),('confirmed','Confirmed'),('assigned','Assigned'),('done','Done'),('cancel','cancel')], 'Status', readonly=True, select=True),
         'price_unit': fields.float('Unit Price',
             digits=(16, int(config['price_accuracy']))),
+        'partner_id':fields.related('picking_id','address_id',type='many2one',relation='res.partner.address', string='Partner'),
     }
     
     _constraints = [
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index e78edfc67e0..55c68761f72 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -448,7 +448,7 @@
                 <form string="Move Lines">
                     <field name="address_id" invisible="True" context="{'context_display':'partner'}"/>
                     <field name="picking_id" invisible="True"/>
-                    <field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned'])]" name="move_ids" select="1"/><newline/>
+                    <field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('partner_id','=',address_id)]" name="move_ids" select="1"/><newline/>
                     <group colspan="4">
                         <button special="cancel" string="Cancel"/>
                         <button name="action_move" string="Add" type="object"/>
@@ -1298,10 +1298,11 @@
             <field name="view_mode">tree</field>
             <field name="domain">[('name','&gt;=',time.strftime('%Y-%m-01'))]</field>
         </record>
+         <menuitem
+            id="next_id_61"
+            name="Reporting"
+            parent="stock.menu_stock_root"/>
+        <menuitem action="action_report_stock_latest_form" id="menu_report_stock_latest" parent="next_id_61"/>
         
-        <menuitem action="action_report_stock_latest_form" id="menu_report_stock_latest" parent="next_id_62"/>
-        
-		
-
     </data>
 </openerp>

From 61d1209619aae53f3b6c9505f7f14a195176ed54 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Tue, 23 Sep 2008 11:19:30 +0530
Subject: [PATCH 05/72] Conflict resolving

bzr revid: ruchakpatel@gmail.com-20080923054930-ovwk0h8puiex3zsf
---
 addons/product/product.py   | 59 ++++++++++++++-------------
 addons/stock/stock.py       | 61 +++++++++++++++++++++-------
 addons/stock/stock_view.xml | 80 ++++++++++++++++++++++++++++---------
 3 files changed, 139 insertions(+), 61 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 7658c29335b..3fca3e6cdb6 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -87,7 +87,8 @@ class product_uom(osv.osv):
 
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'category_id': fields.many2one('product.uom.categ', 'UOM Category', required=True, ondelete='cascade'),
+        'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade',
+            help="Unit of Measure of the same category can be converted between each others."),
         'factor': fields.float('Rate', digits=(12, 6), required=True,
             help='The coefficient for the formula:\n' \
                     '1 (base unit) = coef (this unit)'),
@@ -96,7 +97,8 @@ class product_uom(osv.osv):
             help='The coefficient for the formula:\n' \
                     'coef (base unit) = 1 (this unit)'),
         'factor_inv_data': fields.float('Factor', digits=(12, 6)),
-        'rounding': fields.float('Rounding Precision', digits=(16, 3), required=True),
+        'rounding': fields.float('Rounding Precision', digits=(16, 3), required=True,
+            help="The computed quantity will be a multiple of this value. Use 1.0 for products that can not be splitted."),
         'active': fields.boolean('Active'),
     }
 
@@ -250,20 +252,21 @@ class product_template(osv.osv):
         'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until refurnishing. 'Make to Order': When needed, purchase or produce for the procurement request."),
         'rental': fields.boolean('Rentable product'),
         'categ_id': fields.many2one('product.category','Category', required=True, change_default=True),
-        'list_price': fields.float('Sale Price', digits=(16, int(config['price_accuracy']))),
-        'standard_price': fields.float('Cost Price', required=True, digits=(16, int(config['price_accuracy']))),
+        'list_price': fields.float('Sale Price', digits=(16, int(config['price_accuracy'])), help="Base price for computing the customer price. Sometimes called the catalog price."),
+        'standard_price': fields.float('Cost Price', required=True, digits=(16, int(config['price_accuracy'])), help="The cost of the product for accounting stock valorisation. It can serves as a base price for supplier price."),
         'volume': fields.float('Volume', help="The weight in Kg."),
         'weight': fields.float('Gross weight'),
         'weight_net': fields.float('Net weight'),
-        'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True),
+        'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True,
+            help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."),
         'warranty': fields.float('Warranty (months)'),
         'sale_ok': fields.boolean('Can be sold', help="Determine if the product can be visible in the list of product within a selection from a sale order line."),
         'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
-        'uom_id': fields.many2one('product.uom', 'Default UoM', required=True, help="This is the default Unit of Measure used for all stock operation."),
-        'uom_po_id': fields.many2one('product.uom', 'Purchase UoM', required=True),
+        'uom_id': fields.many2one('product.uom', 'Default UoM', required=True, help="Default Unit of Measure used for all stock operation."),
+        'uom_po_id': fields.many2one('product.uom', 'Purchase UoM', required=True, help="Default Unit of Measure used for purchase orders. It must in the same category than the default unit of measure."),
         'state': fields.selection([('',''),('draft', 'In Development'),('sellable','In Production'),('end','End of Lifecycle'),('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."),
         'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
-            help='Keep empty to use the default UOM'),
+            help='Used by companies that manages two unit of measure: invoicing and stock management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default UOM.'),
         'uos_coeff': fields.float('UOM -> UOS Coeff', digits=(16,4),
             help='Coefficient to convert UOM to UOS\n'
             ' uom = uos * coeff'),
@@ -416,7 +419,7 @@ class product_product(osv.osv):
         'variants': fields.char('Variants', size=64),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True),
         'ean13': fields.char('EAN13', size=13),
-        'packaging' : fields.one2many('product.packaging', 'product_id', 'Palettization', help="Gives the different ways to package the same product. This has no impact on the packing order and is mainly used if you use the EDI module."),
+        'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the packing order and is mainly used if you use the EDI module."),
         'price_extra': fields.float('Variant Price Extra', digits=(16, int(config['price_accuracy']))),
         'price_margin': fields.float('Variant Price Margin', digits=(16, int(config['price_accuracy']))),
     }
@@ -530,28 +533,28 @@ product_product()
 
 class product_packaging(osv.osv):
     _name = "product.packaging"
-    _description = "Conditionnement"
+    _description = "Packaging"
     _rec_name = 'ean'
     _columns = {
         'name' : fields.char('Description', size=64),
-        'qty' : fields.float('Quantity by UL',
-            help="The total number of products you can put by UL."),
-        'ul' : fields.many2one('product.ul', 'Type of UL', required=True),
-        'ul_qty' : fields.integer('UL by layer'),
-        'rows' : fields.integer('Number of layer', required=True,
-            help='The number of layer on palette'),
+        'qty' : fields.float('Quantity by Package',
+            help="The total number of products you can put by palet or box."),
+        'ul' : fields.many2one('product.ul', 'Type of Package', required=True),
+        'ul_qty' : fields.integer('Package by layer'),
+        'rows' : fields.integer('Number of Layer', required=True,
+            help='The number of layer on a palet or box'),
         'product_id' : fields.many2one('product.product', 'Product', select=1, ondelete='cascade', required=True),
         'ean' : fields.char('EAN', size=14,
-            help="The EAN code of the transport unit."),
+            help="The EAN code of the package unit."),
         'code' : fields.char('Code', size=14,
             help="The code of the transport unit."),
-        'weight': fields.float('Palette Weight',
-            help='The weight of the empty palette'),
-        'weight_ul': fields.float('UL Weight',
+        'weight': fields.float('Total Package Weight',
+            help='The weight of a full of products palet or box.'),
+        'weight_ul': fields.float('Empty Package Weight',
             help='The weight of the empty UL'),
-        'height': fields.float('Height', help='The height of the palette'),
-        'width': fields.float('Width', help='The width of the palette'),
-        'length': fields.float('Length', help='The length of the palette'),
+        'height': fields.float('Height', help='The height of the package'),
+        'width': fields.float('Width', help='The width of the package'),
+        'length': fields.float('Length', help='The length of the package'),
     }
 
     def _get_1st_ul(self, cr, uid, context={}):
@@ -579,13 +582,13 @@ class product_supplierinfo(osv.osv):
     _name = "product.supplierinfo"
     _description = "Information about a product supplier"
     _columns = {
-        'name' : fields.many2one('res.partner', 'Partner', required=True, ondelete='cascade'),
-        'product_name': fields.char('Partner product name', size=128),
-        'product_code': fields.char('Partner product reference', size=64),
+        'name' : fields.many2one('res.partner', 'Partner', required=True, ondelete='cascade', help="Supplier of this product"),
+        'product_name': fields.char('Partner Product Name', size=128, help="Name of the product for this partner, will be used when printing a request for quotation. Keep empty to use the internal one."),
+        'product_code': fields.char('Partner Product Code', size=64, help="Code of the product for this partner, will be used when printing a request for quotation. Keep empty to use the internal one."),
         'sequence' : fields.integer('Priority'),
-        'qty' : fields.float('Minimal quantity', required=True),
+        'qty' : fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase for this supplier, expressed in the default unit of measure."),
         'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
-        'delay' : fields.integer('Delivery delay', required=True),
+        'delay' : fields.integer('Delivery Delay', required=True, help="Delay in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."),
         'pricelist_ids': fields.one2many('pricelist.partnerinfo', 'suppinfo_id', 'Supplier Pricelist'),
     }
     _defaults = {
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index d7555ac1b25..4f65a49d89e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -783,6 +783,7 @@ class stock_production_lot(osv.osv):
                 name=name+'/'+record['ref']
             res.append((record['id'], name))
         return res
+    
 
     _name = 'stock.production.lot'
     _description = 'Production lot'
@@ -791,7 +792,7 @@ class stock_production_lot(osv.osv):
         if 'location_id' not in context:
             locations = self.pool.get('stock.location').search(cr, uid, [('usage','=','internal')], context=context)
         else:
-            locations = self.pool.get('stock.location').search(cr, uid, [('location_id','child_of', [context['location_id']])], context=context)
+            locations = [context['location_id']]
         res = {}.fromkeys(ids, 0.0)
         cr.execute('''select
                 prodlot_id,
@@ -811,7 +812,7 @@ class stock_production_lot(osv.osv):
         'name': fields.char('Serial', size=64, required=True),
         'ref': fields.char('Internal Ref.', size=64),
         'product_id': fields.many2one('product.product','Product',required=True),
-        'date': fields.datetime('Date create', required=True),
+        'date': fields.datetime('Created Date', required=True),
         'stock_available': fields.function(_get_stock, method=True, type="float", string="Available", select="2"),
         'revisions': fields.one2many('stock.production.lot.revision','lot_id','Revisions'),
     }
@@ -860,17 +861,23 @@ class stock_move(osv.osv):
     _name = "stock.move"
     _description = "Stock Move"
     
-    def _check_product_tracking(self, cr, uid, ids):
+    def _check_tracking(self, cr, uid, ids):
+         for move in self.browse(cr, uid, ids):             
+             if not move.prodlot_id and \
+                (move.state == 'done' and \
+                ( \
+                    (move.product_id.track_production and move.location_id.usage=='production') or \
+                    (move.product_id.track_production and move.location_dest_id.usage=='production') or \
+                    (move.product_id.track_incoming and move.location_id.usage=='supplier') or \
+                    (move.product_id.track_outgoing and move.location_dest_id.usage=='customer') \
+                )):
+                    return False
+         return True
+
+    def _check_product_lot(self, cr, uid, ids):
          for move in self.browse(cr, uid, ids):
-             if move.state == 'done' and not move.prodlot_id:
-                 if move.product_id.track_production and ((move.location_id.usage=='production') or (move.location_dest_id.usage=='production')):
-                     return False
-                 if move.product_id.track_incoming and ((move.location_id.usage=='supplier') or (move.location_dest_id.usage=='supplier')):
-                     return False
-                 if move.product_id.track_outgoing and ((move.location_id.usage=='track_outgoing') or (move.location_dest_id.usage=='track_outgoing')):
-                     return False
-                 if move.product_id.track_other:
-                     return False
+             if move.prodlot_id and (move.prodlot_id.product_id.id != move.product_id.id):
+                return False                          
          return True
          
     _columns = {
@@ -912,8 +919,11 @@ class stock_move(osv.osv):
     }
     
     _constraints = [
-        (_check_product_tracking,
-            'You must have to set Production Lot',
+        (_check_tracking,
+            'You must assign a production lot for this product',
+            ['prodlot_id']),
+        (_check_product_lot,
+            'You try to assign a lot which is not from the same product',
             ['prodlot_id'])]
     
     def _default_location_destination(self, cr, uid, context={}):
@@ -953,6 +963,20 @@ class stock_move(osv.osv):
                     ON stock_move (location_id, location_dest_id, product_id, state)')
             cursor.commit()
 
+    def onchange_lot_id(self, cr, uid, context, prodlot_id=False,product_qty=False, loc_id=False):
+        print uid, prodlot_id, product_qty, loc_id
+        if not prodlot_id or not loc_id:
+            return {}
+        prodlot = self.pool.get('stock.production.lot').browse(cr, uid, prodlot_id)
+        location=self.pool.get('stock.location').browse(cr,uid,loc_id)
+        warning={}
+        if (location.usage == 'internal') and (product_qty > (prodlot.stock_available or 0.0)):
+            print 'Warning'
+            warning={
+                'title':'Bad Lot Assignation !',
+                'message':'You are moving %.2f products but only %.2f available in this lot.' % (product_qty,prodlot.stock_available or 0.0)
+            }
+        return {'warning':warning}
 
     def onchange_product_id(self, cr, uid, context, prod_id=False, loc_id=False, loc_dest_id=False):
         if not prod_id:
@@ -971,7 +995,14 @@ class stock_move(osv.osv):
     def _chain_compute(self, cr, uid, moves, context={}):
         result = {}
         for m in moves:
-            dest = self.pool.get('stock.location').chained_location_get(cr, uid, m.location_dest_id, m.picking_id and m.picking_id.address_id and m.picking_id.address_id.partner_id, m.product_id, context)
+            dest = self.pool.get('stock.location').chained_location_get(
+                cr, 
+                uid, 
+                m.location_dest_id, 
+                m.picking_id and m.picking_id.address_id and m.picking_id.address_id.partner_id, 
+                m.product_id, 
+                context
+            )
             if dest:
                 if dest[1]=='transparent':
                     self.write(cr, uid, [m.id], {
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 55c68761f72..425b1cffe05 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -511,10 +511,9 @@
                     <group colspan="4" col="6">
                         <field name="address_id" select="2" context="{'context_display':'partner'}"/>
                         <field name="type"/>
-                        <field name="name"/>
+                        <field name="name" readonly="1"/>
                         <field name="date"/>
                         <field name="min_date" select="2"/>
-                        <field name="address_id" select="2"/>
                     </group>
                     <notebook>
                         <page string="General Information">
@@ -533,7 +532,7 @@
                                     <field name="date_planned"/>
                                     <field name="address_id" select="1" context="{'context_display':'partner'}"/>
                                     <field groups="base.group_extended" name="product_packaging"/>
-                                    <field name="prodlot_id" select="2" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=',product_id)]"/>
+                                    <field name="prodlot_id" select="2" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=',product_id)]" on_change="onchange_lot_id(prodlot_id,product_qty, location_id)"/>
                                     <field groups="base.group_extended" name="tracking_id" select="2"/>
                                     <newline/>
                                     <label/>
@@ -603,11 +602,10 @@
             <field name="arch" type="xml">
                 <form string="Packing list">
                     <group col="6" colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="partner_id" select="1"/>
-                        <field name="date" select="1"/>
+                        <field name="address_id" select="1"/>
+                        <field name="name" select="1" readonly="1"/>
                         <field name="min_date" select="1"/>
-                        <field name="backorder_id" select="2"/>
+                        <field name="backorder_id" select="2" readonly="1"/>
                     </group>
                         <notebook colspan="4">
                         <page string="General Information">
@@ -625,7 +623,7 @@
                                     <field invisible="1" name="date"/>
                                     <field name="date_planned"/>
                                     <field groups="base.group_extended" name="product_packaging"/>
-                                    <field name="prodlot_id" select="2" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=',product_id)]"/>
+                                    <field name="prodlot_id" select="2" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=',product_id)]" on_change="onchange_lot_id(prodlot_id,product_qty, location_id)"/>
                                     <field groups="base.group_extended" name="tracking_id" select="1"/>
                                     <separator colspan="4" string="Move State"/>
                                     <field name="state" select="1"/>
@@ -658,6 +656,7 @@
                             <field name="active" select="2"/>
                             <newline/>
                             <field name="move_type"/>
+                            <field name="date" select="1"/>
                         </page>
                     </notebook>
                 </form>
@@ -686,6 +685,11 @@
             <field name="view_id" ref="view_picking_delivery_form"/>
             <field name="act_window_id" ref="action_picking_tree_delivery"/>
         </record>
+        <record id="action_picking_tree_delivery_view2_calendar" model="ir.actions.act_window.view">
+            <field eval="3" name="sequence"/>
+            <field name="view_mode">calendar</field>
+            <field name="act_window_id" ref="action_picking_tree_delivery"/>
+        </record>
 
         <menuitem action="action_picking_tree_delivery" groups="base.group_extended" id="menu_action_picking_tree_delivery" parent="menu_stock_root" sequence="20"/>
 
@@ -710,6 +714,11 @@
             <field name="view_id" ref="view_picking_delivery_form"/>
             <field name="act_window_id" ref="action_picking_tree2_delivery"/>
         </record>
+        <record id="action_picking_tree_delivery_view2_toproc_cal" model="ir.actions.act_window.view">
+            <field eval="3" name="sequence"/>
+            <field name="view_mode">calendar</field>
+            <field name="act_window_id" ref="action_picking_tree2_delivery"/>
+        </record>
         <menuitem action="action_picking_tree2_delivery" id="menu_picking_waiting_delivery" parent="menu_action_picking_tree_delivery"/>
 
         <record id="action_picking_tree3_delivery" model="ir.actions.act_window">
@@ -733,6 +742,11 @@
             <field name="view_id" ref="view_picking_delivery_form"/>
             <field name="act_window_id" ref="action_picking_tree3_delivery"/>
         </record>
+        <record id="action_picking_tree_delivery_view2_waiting_cal" model="ir.actions.act_window.view">
+            <field eval="3" name="sequence"/>
+            <field name="view_mode">calendar</field>
+            <field name="act_window_id" ref="action_picking_tree3_delivery"/>
+        </record>
         <menuitem action="action_picking_tree3_delivery" id="menu_action_picking_tree3_delivery" parent="menu_action_picking_tree_delivery"/>
 
        <record id="action_picking_calendar_delivery" model="ir.actions.act_window">
@@ -772,11 +786,10 @@
             <field name="arch" type="xml">
                 <form string="Packing list">
                     <group col="6" colspan="4">
-                        <field name="name" select="1"/>
                         <field name="address_id" select="2"/>
-                        <field name="backorder_id" select="2"/>
+                        <field name="name" select="1" readonly="1"/>
                         <field name="min_date" select="2"/>
-                        <field name="date" select="2"/>
+                        <field name="backorder_id" select="2" readonly="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -794,7 +807,7 @@
                                     <field invisible="1" name="date"/>
                                     <field name="date_planned"/>
                                     <field groups="base.group_extended" name="product_packaging"/>
-                                    <field name="prodlot_id" select="1" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=',product_id)]"/>
+                                    <field name="prodlot_id" select="1" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=',product_id)]" on_change="onchange_lot_id(prodlot_id,product_qty, location_id)"/>
                                     <field groups="base.group_extended" name="tracking_id" select="1"/>
                                     <separator colspan="4" string="Move State"/>
                                     <field name="state" select="1"/>
@@ -827,6 +840,7 @@
                             <field name="auto_picking"/>
                             <newline/>
                             <field name="move_type"/>
+                            <field name="date" select="2"/>
                         </page>
                     </notebook>
                 </form>
@@ -854,6 +868,11 @@
             <field name="view_id" ref="view_picking_out_form"/>
             <field name="act_window_id" ref="action_picking_tree"/>
         </record>
+        <record id="action_picking_tree_out_view2_waiting_cal" model="ir.actions.act_window.view">
+            <field eval="3" name="sequence"/>
+            <field name="view_mode">calendar</field>
+            <field name="act_window_id" ref="action_picking_tree"/>
+        </record>
         <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_root" sequence="19"/>
 
         <record id="action_picking_tree2" model="ir.actions.act_window">
@@ -877,6 +896,11 @@
             <field name="view_id" ref="view_picking_out_form"/>
             <field name="act_window_id" ref="action_picking_tree2"/>
         </record>
+        <record id="action_picking_tree2_out_view2_cal" model="ir.actions.act_window.view">
+            <field eval="3" name="sequence"/>
+            <field name="view_mode">calendar</field>
+            <field name="act_window_id" ref="action_picking_tree2"/>
+        </record>
         <menuitem action="action_picking_tree2" id="menu_picking_waiting" parent="menu_action_picking_tree"/>
 
         <record id="action_picking_tree3" model="ir.actions.act_window">
@@ -900,6 +924,11 @@
             <field name="view_id" ref="view_picking_out_form"/>
             <field name="act_window_id" ref="action_picking_tree3"/>
         </record>
+        <record id="action_picking_tree3_out_view2_cal" model="ir.actions.act_window.view">
+            <field eval="3" name="sequence"/>
+            <field name="view_mode">calendar</field>
+            <field name="act_window_id" ref="action_picking_tree3"/>
+        </record>
         <menuitem action="action_picking_tree3" id="menu_action_picking_tree3" parent="menu_action_picking_tree"/>
 
         #
@@ -961,7 +990,7 @@
                                     <newline/>
                                     <field groups="base.group_extended" name="product_packaging"/>
                                     <newline/>
-                                    <field name="prodlot_id" select="1" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=',product_id)]"/>
+                                    <field name="prodlot_id" select="1" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=',product_id)]" on_change="onchange_lot_id(prodlot_id,product_qty, location_id)"/>
                                     <field groups="base.group_extended" name="tracking_id" select="1"/>
                                     <newline/>
                                     <label/>
@@ -976,7 +1005,7 @@
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="5"/>
-                                <button name="%(act_stock_picking_move_wizard)d" string="Fill From Unreceived Products" type="action"/>
+                                <button name="%(act_stock_picking_move_wizard)d" string="Unreceived Products" type="action" states="draft,confirmed,assigned"/>
                             </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
@@ -1020,7 +1049,11 @@
             <field name="view_id" ref="view_picking_in_form"/>
             <field name="act_window_id" ref="action_picking_tree4"/>
         </record>
-
+        <record id="action_invoice_tree5_view2_cal" model="ir.actions.act_window.view">
+            <field eval="3" name="sequence"/>
+            <field name="view_mode">calendar</field>
+            <field name="act_window_id" ref="action_picking_tree4"/>
+        </record>
         <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_root" sequence="17"/>
 
         <record id="action_picking_tree5" model="ir.actions.act_window">
@@ -1044,6 +1077,11 @@
             <field name="view_id" ref="view_picking_in_form"/>
             <field name="act_window_id" ref="action_picking_tree5"/>
         </record>
+        <record id="action_invoice_tree6_view2_cal" model="ir.actions.act_window.view">
+            <field eval="3" name="sequence"/>
+            <field name="view_mode">calendar</field>
+            <field name="act_window_id" ref="action_picking_tree5"/>
+        </record>
         <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4"/>
 
         <record id="action_picking_form" model="ir.actions.act_window">
@@ -1051,7 +1089,7 @@
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
+            <field name="view_mode">form,tree,calendar</field>
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="domain">[('type','=','in')]</field>
         </record>
@@ -1067,6 +1105,11 @@
             <field name="view_id" ref="view_picking_in_form"/>
             <field name="act_window_id" ref="action_picking_form"/>
         </record>
+        <record id="action_picking_form_view2_cal" model="ir.actions.act_window.view">
+            <field eval="3" name="sequence"/>
+            <field name="view_mode">calendar</field>
+            <field name="act_window_id" ref="action_picking_form"/>
+        </record>
         <menuitem action="action_picking_form" id="menu_action_picking_form" parent="menu_action_picking_tree4"/>
 
         <record id="action_picking_tree6" model="ir.actions.act_window">
@@ -1163,7 +1206,7 @@
                     <field name="priority"/>
                     <field name="address_id" select="1" context="{'context_display':'partner'}"/>
                     <newline/>
-                    <field name="prodlot_id" select="1" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=',product_id)]"/>
+                    <field name="prodlot_id" select="1" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=',product_id)]" on_change="onchange_lot_id(prodlot_id,product_qty, location_id)"/>
                     <field name="tracking_id" select="1"/>
                     <newline/>
                     <label/>
@@ -1213,7 +1256,7 @@
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,calendar</field>
             <field name="context">{'contact_display': 'partner'}</field>
         </record>
         <menuitem action="action_picking_all" id="menu_action_picking_all" parent="menu_traceability_low"/>
@@ -1274,6 +1317,7 @@
             <field eval="'ir.actions.wizard,%d'%ref('location_product')" name="value"/>
             <field eval="True" name="object"/>			
         </record>   
+
 		
 	      <record id="report_stock_latest_tree" model="ir.ui.view">
             <field name="name">report.inventory.latest.view</field>

From 51fedfff04329f97e7138d00f8de30c30a030b80 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Tue, 23 Sep 2008 14:52:02 +0530
Subject: [PATCH 06/72] Conflicts resolving in process module

bzr revid: ruchakpatel@gmail.com-20080923092202-hb2g2q37d5ikcvxw
---
 addons/process/process.py       |   4 -
 addons/process/process_demo.xml | 158 --------------------------------
 addons/process/process_view.xml | 110 ----------------------
 3 files changed, 272 deletions(-)

diff --git a/addons/process/process.py b/addons/process/process.py
index 89c543f795d..2f3648a86f3 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -246,12 +246,8 @@ class process_transition(osv.osv):
         'target_node_id': fields.many2one('process.node', 'Target Node', required=True, ondelete='cascade'),
         'action_ids': fields.one2many('process.transition.action', 'transition_id', 'Buttons'),
         'transition_ids': fields.many2many('workflow.transition', 'process_transition_ids', 'ptr_id', 'wtr_id', 'Workflow Transitions'),
-<<<<<<< TREE
-        'note': fields.text('Description', translate=True),
-=======
         'role_ids': fields.many2many('res.roles', 'process_transition_roles_rel', 'tid', 'rid', 'Roles'),
         'note': fields.text('Description', translate=True),
->>>>>>> MERGE-SOURCE
     }
 process_transition()
 
diff --git a/addons/process/process_demo.xml b/addons/process/process_demo.xml
index cc603d5b165..2388d60dac2 100644
--- a/addons/process/process_demo.xml
+++ b/addons/process/process_demo.xml
@@ -1,162 +1,5 @@
 <?xml version="1.0" ?>
 <openerp>
-<<<<<<< TREE
-
-
-    <data>
-
-        <record id="sales_workflow" model="process.process">
-            <field name="name">Sales Workflow</field>
-            <field name="note">Sales flow for services companies.</field>
-        </record>
-
-        <!-- Nodes -->
-
-        <record id="node_quotation" model="process.node">
-            <field name="name">Quotation</field>
-            <field name="note">Quotations are sale orders in draft mode</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Sale Order')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'My Quotations')]"></field>
-            <field name="kind">state</field>
-            <field name="model_states">object.state == 'draft'</field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>
-
-        <record id="node_sale_order" model="process.node">
-            <field name="name">Sale Order</field>
-            <field name="note">Manages the delivery in invoicing process</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Sale Order')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'All Sales Order')]"></field>
-            <field name="kind">state</field>
-            <field name="model_states">object.state == 'manual'</field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>
-
-        <record id="node_invoice_on_sale" model="process.node">
-            <field name="name">Invoice</field>
-            <field name="note">In case you invoiced on Sale Order</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Invoice')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Invoices')]"></field>
-            <field name="kind">state</field>
-            <field name="model_states"></field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>
-
-        <record id="node_tasks" model="process.node">
-            <field name="name">Tasks</field>
-            <field name="note">In case you sale services on order</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Task')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'All Tasks')]"></field>
-            <field name="kind">subflow</field>
-            <field name="model_states"></field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>
-
-        <record id="node_packing" model="process.node">
-            <field name="name">Packing List</field>
-            <field name="note">The workers pack the requested items</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Packing list')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Packings to Process')]"></field>
-            <field name="kind">state</field>
-            <field name="model_states"></field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>
-
-        <record id="node_delivery_order" model="process.node">
-            <field name="name">Delivery Order</field>
-            <field name="note">The transporter take the box and deliver it</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Stock Move')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Waiting Delivery Orders')]"></field>
-            <field name="kind">state</field>
-            <field name="model_states"></field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>  
-
-        <record id="node_invoice_on_delivery" model="process.node">
-            <field name="name">Invoice</field>
-            <field name="note">In case you invoice based on deliveries</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Invoice')]"></field>
-            <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Invoices')]"></field>
-            <field name="kind">subflow</field>
-            <field name="model_states"></field>
-            <field name="process_id" ref="sales_workflow"/>
-        </record>  
-
-        <!-- Node conditions (Gray nodes) -->
-
-        <record id="node_condition_invoice_on_order" model="process.condition">
-            <field name="name">Invoice on order</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Sale Order')]"></field>
-            <field name="model_states">object.order_policy != 'postpaid'</field>
-            <field name="node_id" ref="node_invoice_on_sale"/>
-        </record>
-
-        <record id="node_condition_invoice_on_delivery" model="process.condition">
-            <field name="name">Invoice on delivery</field>
-            <field name="model_id" model="ir.model" search="[('name', '=', 'Sale Order')]"></field>
-            <field name="model_states">object.order_policy == 'postpaid'</field>
-            <field name="node_id" ref="node_invoice_on_delivery"/>
-        </record>
-
-        <!-- Transitions -->
-
-        <record id="transition_confirm_quotation" model="process.transition">
-            <field name="name">Confirm Quotation</field>
-            <field name="source_node_id" ref="node_quotation"></field>
-            <field name="target_node_id" ref="node_sale_order"></field>
-        </record>
-
-        <record id="transition_packing" model="process.transition">
-            <field name="name">Packing</field>
-            <field name="source_node_id" ref="node_sale_order"></field>
-            <field name="target_node_id" ref="node_packing"></field>
-        </record>
-
-        <record id="transition_invoce_on_sale" model="process.transition">
-            <field name="name">Invoice on order</field>
-            <field name="source_node_id" ref="node_sale_order"></field>
-            <field name="target_node_id" ref="node_invoice_on_sale"></field>
-        </record>
-
-        <record id="transition_traks" model="process.transition">
-            <field name="name">Create Tasks</field>
-            <field name="source_node_id" ref="node_sale_order"></field>
-            <field name="target_node_id" ref="node_tasks"></field>
-        </record>
-
-        <record id="transition_delivery" model="process.transition">
-            <field name="name">Deliver Goods</field>
-            <field name="source_node_id" ref="node_packing"></field>
-            <field name="target_node_id" ref="node_delivery_order"></field>
-        </record>
-
-        <record id="transition_invoice_on_delivery" model="process.transition">
-            <field name="name">Invoice or delivery</field>
-            <field name="source_node_id" ref="node_delivery_order"></field>
-            <field name="target_node_id" ref="node_invoice_on_delivery"></field>
-        </record>
-
-        <!-- TODO: Transition actions (Buttons) -->
-
-        <record id="action_confirm_quotation" model="process.transition.action">
-            <field name="name">Confirm</field>
-            <field name="state">workflow</field>
-            <field name="action">order_confirm</field>
-            <field name="transition_id" ref="transition_confirm_quotation"/>
-        </record>
-
-        <record id="action_cancel_quotation" model="process.transition.action">
-            <field name="name">Cancel</field>
-            <field name="state">workflow</field>
-            <field name="action">cancel</field>
-            <field name="transition_id" ref="transition_confirm_quotation"/>
-        </record>
-
-        <!-- TODO: Transition roles (workflow transition ids) -->
-
-    </data>
-
-=======
 
 
     <data>
@@ -312,5 +155,4 @@
 
     </data>
 
->>>>>>> MERGE-SOURCE
 </openerp>
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index c4deb35994c..d5ae44a2a55 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -128,115 +128,6 @@
         action="action_process_form"
         parent="menu_process"/>
 
-<<<<<<< TREE
-    <!-- Nodes -->
-    <record model="ir.ui.view" id="view_process_node_tree">
-        <field name="name">process.node.tree</field>
-        <field name="model">process.node</field>
-        <field name="type">tree</field>
-        <field name="arch" type="xml">
-            <tree string="Process Nodes">
-                <field name="name"/>      
-                <field name="process_id" select="1"/>          
-                <field name="model_id" select="1"/>
-                <field name="kind" select="1"/>
-                <field name="flow_start"/>
-            </tree>
-        </field>
-    </record>
-
-    <record model="ir.ui.view" id="view_process_node_form">
-        <field name="name">process.node.form</field>
-        <field name="model">process.node</field>
-        <field name="type">form</field>
-        <field name="arch" type="xml">
-            <form string="Process Node">
-                <group colspan="4" string="Details">
-                    <field name="name" select="1"/>
-                    <field name="flow_start"/>                                    
-                    <field name="process_id"/>
-                    <newline/>                                    
-                    <field name="model_id" select="1"/>
-                    <field name="menu_id" select="2"/>                                    
-                    <newline/>
-                    <field name="kind" select="1"/>
-                    <field name="model_states"/>
-                </group>
-                <notebook colspan="4">
-                    <page string="Outgoing Transitions">
-                        <field name="transition_out" colspan="4" nolabel="1">
-                            <tree string="Transitions">
-                                <field name="name"/>
-                                <field name="target_node_id"/>
-                            </tree>
-                            <form string="Transition">
-                                <group colspan="4" string="Details">
-                                    <field name="name"/>
-                                    <newline/>
-                                    <field name="target_node_id"/>
-                                </group>
-                                <notebook colspan="4">
-                                    <page string="Buttons">
-                                        <field name="action_ids" colspan="4" nolabel="1">
-                                            <tree string="Actions">
-                                                <field name="name"/>
-                                                <field name="state"/>
-                                                <field name="action"/>
-                                            </tree>
-                                            <form string="Actions">
-                                                <field name="name" colspan="4"/>
-                                                <newline/>
-                                                <field name="state"/>
-                                                <field name="action"/>
-                                            </form>               
-                                        </field>
-                                    </page>
-                                    <page string="Roles Required">
-                                        <field name="transition_ids" colspan="4" nolabel="1"/>
-                                    </page>
-                                    <page string="Extra Information">
-                                        <field name="note" colspan="4" nolabel="1"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Conditions">
-                        <field name="condition_ids" nolabel="1" colspan="4">
-                            <tree string="Conditions">
-                                <field name="name"/>
-                                <field name="model_id"/>
-                                <field name="model_states"/>
-                            </tree>
-                            <form string="Condition">
-                                <field name="name"/>
-                                <field name="model_id"/>
-                                <newline/>
-                                <field name="model_states" colspan="4"/>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Extra Information">
-                        <field name="note" nolabel="1" colspan="4"/>
-                    </page>
-                </notebook>
-            </form>                                
-        </field>
-    </record>
-
-    <record model="ir.actions.act_window" id="action_process_node_form">
-        <field name="name">Process Nodes</field>
-        <field name="res_model">process.node</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-    </record>
-
-    <menuitem
-        id="menu_process_node_form"
-        action="action_process_node_form"
-        parent="menu_process"/>
-
-=======
     <!-- Nodes -->
     <record model="ir.ui.view" id="view_process_node_tree">
         <field name="name">process.node.tree</field>
@@ -348,7 +239,6 @@
         action="action_process_node_form"
         parent="menu_process"/>
 
->>>>>>> MERGE-SOURCE
     <!-- Transitions -->
 
     <record model="ir.ui.view" id="view_process_transition_tree">

From 24ea556c0c23cf811d69fc8965edde79b76a0dce Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Wed, 24 Sep 2008 19:05:23 +0530
Subject: [PATCH 07/72] Developed a module: sale_delivery for sales orders that
 are shipped in several times for EO2

bzr revid: ruchakpatel@gmail.com-20080924133523-h18auq8hcqtkn1yx
---
 addons/sale/sale.py                         |   2 -
 addons/sale_delivery/__init__.py            |  34 ++++
 addons/sale_delivery/__terp__.py            |  43 ++++
 addons/sale_delivery/sale_delivery.py       | 206 ++++++++++++++++++++
 addons/sale_delivery/sale_delivery_view.xml |  69 +++++++
 addons/stock/stock.py                       |   3 -
 addons/stock/stock_view.xml                 |   8 +-
 7 files changed, 357 insertions(+), 8 deletions(-)
 create mode 100644 addons/sale_delivery/__init__.py
 create mode 100644 addons/sale_delivery/__terp__.py
 create mode 100644 addons/sale_delivery/sale_delivery.py
 create mode 100644 addons/sale_delivery/sale_delivery_view.xml

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index a949e713068..6f0b2da4a81 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -954,9 +954,7 @@ class sale_config_picking_policy(osv.osv_memory):
         'order_policy': lambda *a: 'picking'
     }
     def set_default(self, cr, uid, ids, context=None):
-        print context
         for o in self.browse(cr, uid, ids, context=context):
-            print o.picking_policy, o.order_policy
             ir_values_obj = self.pool.get('ir.values')
             ir_values_obj.set(cr,uid,'default',False,'picking_policy',['sale.order'],o.picking_policy)
             ir_values_obj = self.pool.get('ir.values')
diff --git a/addons/sale_delivery/__init__.py b/addons/sale_delivery/__init__.py
new file mode 100644
index 00000000000..1d6e7cb3107
--- /dev/null
+++ b/addons/sale_delivery/__init__.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 contract 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.
+#
+##############################################################################
+
+import sale_delivery
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_delivery/__terp__.py b/addons/sale_delivery/__terp__.py
new file mode 100644
index 00000000000..2ec84f19c7a
--- /dev/null
+++ b/addons/sale_delivery/__terp__.py
@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 contract 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.
+###############################################################################
+# -*- encoding: utf-8 -*-
+{
+    "name":"Sale Delivery Planning",
+    "version":"1.0",
+    "author":"Tiny",
+    "category":"Custom",
+    "depends":["sale"],
+    "demo_xml":[],
+    "update_xml":["sale_delivery_view.xml"],
+    "active": False,
+    "installable": True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_delivery/sale_delivery.py b/addons/sale_delivery/sale_delivery.py
new file mode 100644
index 00000000000..3f3a7ea6ecf
--- /dev/null
+++ b/addons/sale_delivery/sale_delivery.py
@@ -0,0 +1,206 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 contract 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.
+#
+##############################################################################
+
+import time
+from osv import fields,osv
+import netsvc
+
+class sale_delivery_line(osv.osv):
+    _name = 'sale.delivery.line'
+    def _check_product_qty(self, cr, uid, ids):
+        for delivery in self.browse(cr, uid, ids):
+            cr.execute('select sum(product_uom_qty) from sale_order_line where order_id = %d and product_id = %d',(delivery.order_id,delivery.product_id))            
+            sale_product_qty = cr.fetchall()[0][0]
+            cr.execute('select sum(product_qty) from sale_delivery_line where order_id = %d and product_id = %d',(delivery.order_id,delivery.product_id))
+            product_qty = cr.fetchall()[0][0]
+            if  sale_product_qty < product_qty:
+                return False
+        return True
+    
+    def _check_products(self, cr, uid, ids):
+        for delivery in self.browse(cr, uid, ids):
+            cr.execute('select id from sale_order_line where order_id = %d and product_id = %d',(delivery.order_id,delivery.product_id))
+            if not len(cr.fetchall()):
+                return False
+        return True
+
+    _columns = {
+        'product_id': fields.many2one('product.product', string='Product', required=True ),
+        'product_qty': fields.float('Product Quantity', digits=(16,2), required=True),
+        'product_uom' : fields.many2one('product.uom', 'Product UoM', required=True),
+        'packaging_id' : fields.many2one('product.packaging', 'Packaging'),
+        'date_planned': fields.datetime('Date Planned', select=True, required=True),
+        'priority': fields.integer('Priority'),
+        'note' : fields.text('Note'),
+        'order_id': fields.many2one('sale.order', 'Order Ref', required=True, ondelete='cascade', select=True),
+    }
+    _constraints = [
+        (_check_products,
+            'You have selected a product which is not in related Sale Order',
+            ['product_id']),
+        (_check_product_qty,
+            'The quanitties plannified in Deliveries must be equals to or less then the quantities in the Sale Order lines',
+            ['product_qty'])]
+    
+sale_delivery_line()
+
+
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+    _columns = {
+        'delivery_line': fields.one2many('sale.delivery.line', 'order_id', 'Delivery Lines', readonly=True, states={'draft':[('readonly',False)]}),
+    }
+    
+    def action_ship_create(self, cr, uid, ids, *args):
+#        picking_id=False
+        picking = {}
+        company = self.pool.get('res.users').browse(cr, uid, uid).company_id
+        for order in self.browse(cr, uid, ids, context={}):
+            output_id = order.shop_id.warehouse_id.lot_output_id.id
+#            picking_id = False
+#            if not order.delivery_line:
+#                return super(sale_order, self).action_ship_create(cr, uid, ids)
+            for line in order.delivery_line:
+                cr.execute('select id from sale_order_line where order_id = %d and product_id = %d',(ids[0],line.product_id.id))
+                sale_line_id = cr.fetchall()[0][0]
+                sale_line = self.pool.get('sale.order.line').browse(cr, uid, sale_line_id)
+                proc_id=False
+                date_planned = line.date_planned
+#                date_planned = (date_planned - DateTime.RelativeDateTime(days=company.security_lead)).strftime('%Y-%m-%d %H:%M:%S')
+#                if line.state == 'done':
+#                    continue
+                if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'):
+                    location_id = order.shop_id.warehouse_id.lot_stock_id.id
+#                    if not picking_id:
+                    if not date_planned in picking:
+                        loc_dest_id = order.partner_id.property_stock_customer.id
+                        picking_id = self.pool.get('stock.picking').create(cr, uid, {
+                            'origin': order.name,
+                            'type': 'out',
+                            'state': 'confirmed',
+                            'move_type': order.picking_policy,
+                            'sale_id': order.id,
+                            'address_id': order.partner_shipping_id.id,
+                            'note': order.note,
+                            'invoice_state': (order.order_policy=='picking' and '2binvoiced') or 'none',
+                        })
+                        picking[date_planned] = picking_id
+                    
+                    else:
+                        picking_id = picking[date_planned]
+                        
+                    move_id = self.pool.get('stock.move').create(cr, uid, {
+                        'name': line.product_id.name[:64],
+                        'picking_id': picking_id,
+                        'product_id': line.product_id.id,
+                        'date_planned': date_planned,
+                        'product_qty': line.product_qty,
+                        'product_uom': line.product_uom.id,
+                        'product_uos_qty': line.product_qty,
+                        'product_uos': line.product_uom.id,
+                        'product_packaging' : line.packaging_id.id,
+                        'address_id' : order.partner_shipping_id.id,
+                        'location_id': location_id,
+                        'location_dest_id': output_id,
+                        'tracking_id': False,
+                        'state': 'waiting',
+                        'note': line.note,
+                    })
+                    proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                        'name': order.name,
+                        'origin': order.name,
+                        'date_planned': date_planned,
+                        'product_id': line.product_id.id,
+                        'product_qty': line.product_qty,
+                        'product_uom': line.product_uom.id,
+                        'product_uos_qty': line.product_qty,
+                        'product_uos': line.product_uom.id,
+                        'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
+                        'procure_method': sale_line.type,
+                        'move_id': move_id,
+                        'property_ids': [(6, 0, [x.id for x in sale_line.property_ids])],
+                    })
+                    wf_service = netsvc.LocalService("workflow")
+                    wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+#                    self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})
+                elif line.product_id and line.product_id.product_tmpl_id.type=='service':
+                    proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                        'name': line.name,
+                        'origin': order.name,
+                        'date_planned': date_planned,
+                        'product_id': line.product_id.id,
+                        'product_qty': line.product_uom_qty,
+                        'product_uom': line.product_uom.id,
+                        'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
+                        'procure_method': line.type,
+                        'property_ids': [(6, 0, [x.id for x in line.property_ids])],
+                    })
+                    wf_service = netsvc.LocalService("workflow")
+                    wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+#                    self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})
+                else:
+                    #
+                    # No procurement because no product in the sale.order.line.
+                    #
+                    pass
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_validate(uid, 'stock.picking', picking['date_planned'], 'button_confirm', cr)
+
+            val = {}
+#            if 'date_planned' in picking and picking['date_planned']:
+#                print 
+                
+            if order.state=='shipping_except':
+                val['state'] = 'progress'
+                if (order.order_policy == 'manual') and order.invoice_ids:
+                    val['state'] = 'manual'
+            self.write(cr, uid, [order.id], val)
+
+        return True
+sale_order()
+
+class sale_order_line(osv.osv):
+    _inherit = 'sale.order.line'
+    
+    def _get_planned_deliveries(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        for val in self.browse(cr, uid, ids):
+            cr.execute('select sum(product_qty) from sale_delivery_line where order_id = %d and product_id = %d',(val.order_id,val.product_id))
+            product_qty = cr.fetchall()[0][0]
+            res[val.id] = product_qty
+        return res
+    
+    _columns = {
+         'deliveries': fields.function(_get_planned_deliveries, method=True, string='Planned Deliveries'),
+    }
+    
+sale_order_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_delivery/sale_delivery_view.xml b/addons/sale_delivery/sale_delivery_view.xml
new file mode 100644
index 00000000000..f5372876dff
--- /dev/null
+++ b/addons/sale_delivery/sale_delivery_view.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+         <record id="view_sale_delivery_form" model="ir.ui.view">
+            <field name="name">sale.delivery.form.inherit</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+                <notebook>
+                    <page string="Deliveries" position="inside">
+                      <field colspan="4" mode="tree,from" name="delivery_line" nolabel="1" widget="one2many_list">
+                                <form string="Delivery Lines">
+	                                <field name="product_id"
+	                                />
+									<field name="product_qty"
+									/>
+									<field name="product_uom"
+									/>
+									<field name="packaging_id"
+									/>
+									<field name="date_planned"/>
+									<field name="priority"/>
+									<separator colspan="4" string="Notes"/>
+									<field name="note" colspan="4" nolabel="1"/>
+                                </form>
+                                <tree string="Delivery Lines">
+	                                <field name="product_id"/>
+									<field name="product_qty"/>
+									<field name="product_uom"/>
+									<field name="packaging_id"/>
+									<field name="date_planned"/>
+									<field name="priority"/>
+									<field name="note"/>
+                                </tree> 
+                            </field>
+                </page>
+                </notebook>
+            </field>
+        </record>
+        
+    <record model="ir.ui.view" id="view_order_line_tree_inherited">
+		<field name="name">sale.order.line.form1</field>
+		<field name="model">sale.order.line</field>
+		<field name="type">tree</field>
+		<field name="inherit_id" ref="sale.view_order_line_tree"/>
+		<field name="arch" type="xml">
+			 <field name="price_subtotal" position="after">
+			 		<field name="deliveries"/>
+			</field>
+		</field>
+	</record>
+	
+	
+	<record id="view_sale_delivery_form1" model="ir.ui.view">
+            <field name="name">sale.delivery.form.inherit1</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+            <field name="price_subtotal" position="after">
+				<field name="deliveries"/>
+            </field>
+            </field>
+        </record>
+       
+    </data>
+</openerp>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index ede9e8e9e99..736daa9333f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -329,9 +329,7 @@ class stock_picking(osv.osv):
 
     def _set_minimum_date(self, cr, uid, ids, name, value, arg, context):
         if not value: return False
-        print  self.browse(cr, uid, [ids], context)
         for pick in self.browse(cr, uid,[ids], context):
-            print value,type(value),pick.min_date
             cr.execute("""update stock_move set
                     date_planned=%s 
                 where
@@ -911,7 +909,6 @@ class stock_move(osv.osv):
             cursor.commit()
 
     def onchange_lot_id(self, cr, uid, context, prodlot_id=False,product_qty=False, loc_id=False):
-        print uid, prodlot_id, product_qty, loc_id
         if not prodlot_id or not loc_id:
             return {}
         prodlot = self.pool.get('stock.production.lot').browse(cr, uid, prodlot_id)
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3759939f5fc..1a75d6a4cdc 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1345,10 +1345,12 @@
             <field name="view_mode">tree</field>
             <field name="domain">[('name','&gt;=',time.strftime('%Y-%m-01'))]</field>
         </record>
+         <menuitem
+            id="next_id_61"
+            name="Reporting"
+            parent="stock.menu_stock_root"/>
+        <menuitem action="action_report_stock_latest_form" id="menu_report_stock_latest" parent="next_id_61"/>
         
-        <menuitem action="action_report_stock_latest_form" id="menu_report_stock_latest" parent="next_id_62"/>
-        
-		
 
     </data>
 </openerp>

From 595d8918ba8e27de070d63200fb3c819b002d72c Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Fri, 3 Oct 2008 12:44:45 +0530
Subject: [PATCH 08/72] created and added new module product_margin

bzr revid: ruchakpatel@gmail.com-20081003071445-v8amnq6ccpeu2ce9
---
 addons/product_margin/__init__.py             |  34 ++++
 addons/product_margin/__terp__.py             |  14 ++
 addons/product_margin/product_margin.py       | 172 ++++++++++++++++++
 addons/product_margin/product_margin_view.xml |  50 +++++
 addons/product_margin/wizard/__init__.py      |  33 ++++
 .../wizard/wizard_product_margin.py           |  76 ++++++++
 6 files changed, 379 insertions(+)
 create mode 100644 addons/product_margin/__init__.py
 create mode 100644 addons/product_margin/__terp__.py
 create mode 100644 addons/product_margin/product_margin.py
 create mode 100644 addons/product_margin/product_margin_view.xml
 create mode 100644 addons/product_margin/wizard/__init__.py
 create mode 100644 addons/product_margin/wizard/wizard_product_margin.py

diff --git a/addons/product_margin/__init__.py b/addons/product_margin/__init__.py
new file mode 100644
index 00000000000..5c3a1b13af2
--- /dev/null
+++ b/addons/product_margin/__init__.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#                    Fabien Pinckaers <fp@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 contract 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.
+#
+##############################################################################
+
+import wizard
+import product_margin
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/product_margin/__terp__.py b/addons/product_margin/__terp__.py
new file mode 100644
index 00000000000..5aac7a747fd
--- /dev/null
+++ b/addons/product_margin/__terp__.py
@@ -0,0 +1,14 @@
+# -*- encoding: utf-8 -*-
+{
+    "name":"Margins in Product",
+    "version":"1.0",
+    "author":"Tiny",
+    "category":"Custom",
+    "depends":["product"],
+    "demo_xml":[],
+    "update_xml":["product_margin_view.xml"],
+    "active": False,
+    "installable": True,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
new file mode 100644
index 00000000000..fd3d1b74622
--- /dev/null
+++ b/addons/product_margin/product_margin.py
@@ -0,0 +1,172 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: partner.py 1007 2005-07-25 13:18:09Z kayhman $
+#
+# 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 contract 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.
+#
+##############################################################################
+
+from osv import fields,osv
+import pooler
+from tools import config
+import time
+
+class product_product(osv.osv):
+    _inherit = "product.product"
+    
+#    def _get_date(self, cr, uid, ids, field_names, arg, context):
+#        res = {}
+#        for val in self.browse(cr, uid, ids):
+#            res[val.id] = {}
+#            res[val.id][field_names[0]] = time.strftime('%Y-%m-%d')
+#        return res
+    def _get_date(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        mapping = {
+                   'date_start' : '%Y-01-01',
+                   'date_stop' : '%Y-12-31',
+                   }
+        for val in self.browse(cr, uid, ids):
+            res[val.id] = {}
+            fmt = ' , '.join(map(lambda x: mapping[x], field_names))
+            date = context.get(field_names[0],time.strftime(fmt))
+            res[val.id][field_names[0]] = date
+        return res
+
+
+#===============================================================================
+    def _get_invoice_state(self, cr, uid,context ):
+#        res = {}
+#        for val in self.browse(cr, uid, ids):
+#            res[val.id] = context.get('invoice_state', 'open')
+        return res
+#===============================================================================
+
+    def get_avg_price_margin(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        mapping = {
+                   'sale_avg_price' : 'out_invoice',
+                   'purchase_avg_price' : 'in_invoice',
+                   }
+        for val in self.browse(cr, uid, ids):
+            res[val.id] = {}
+            map_val = ' , '.join(map(lambda x: mapping[x], field_names))
+            avg=0.0
+            cr.execute("select avg(l.price_unit) from account_invoice_line l left join account_invoice i on (l.invoice_id = i.id) where l.product_id = %s AND i.type= %s" , (val.id,map_val,))
+            avg = cr.fetchall()[0][0]
+            if not avg:
+                avg=0.0
+            res[val.id][field_names[0]] = avg
+        return res
+    
+    def _get_num_invoiced(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        mapping = {
+                   'sale_num_invoiced' : 'out_invoice',
+                   'purchase_num_invoiced' : 'in_invoice',
+                   }
+        for val in self.browse(cr, uid, ids):
+            res[val.id] = {}
+            map_val = ' , '.join(map(lambda x: mapping[x], field_names))
+            avg=0.0
+            cr.execute("select sum(l.quantity) from account_invoice_line l left join account_invoice i on (l.invoice_id = i.id) where l.product_id = %s AND i.type= %s" , (val.id,map_val,))
+            avg = cr.fetchall()[0][0]
+            res[val.id][field_names[0]] = avg
+        return res
+    
+    def _get_expected(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        mapping = {
+                   'sale_expected' : 'sale_order_line',
+                   'normal_cost' : 'purchase_order_line',
+                   }
+        mapping1 = {
+                   'sale_expected' : 'product_uom_qty',
+                   'normal_cost' : 'product_qty',
+                   }
+        for val in self.browse(cr, uid, ids):
+            res[val.id] = {}
+            map_val = ' , '.join(map(lambda x: mapping1[x], field_names))
+            cr.execute("select sum(l."+map_val +" * l.price_unit) from " +\
+            ' , '.join(map(lambda x: mapping[x], field_names)) + " l where l.product_id = %s " , (val.id,))
+            ret = cr.fetchall()[0][0]
+            if not ret:
+                ret=0.0
+            res[val.id][field_names[0]] = ret
+        return res
+    
+    
+    def _get_turnover(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        mapping = {
+                   'turnover' : 'out_invoice',
+                   'total_cost' : 'in_invoice',
+                   }
+        for val in self.browse(cr, uid, ids):
+            res[val.id] = {}
+            map_val = ' , '.join(map(lambda x: mapping[x], field_names))
+            cr.execute("select sum(l.quantity * l.price_unit) from account_invoice_line l left join account_invoice i on (l.invoice_id = i.id) where l.product_id = %s AND i.type= %s " , (val.id,map_val))
+            turnover = cr.fetchall()[0][0]
+            res[val.id][field_names[0]]= turnover
+        return res
+    
+    def _get_gap(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        for val in self.browse(cr, uid, ids):
+            res[val.id] = {}
+            if field_names[0] == 'sales_gap' :
+                res[val.id][field_names[0]] = val.sale_expected - val.turnover
+            elif field_names[0] == 'purchase_gap' :
+                res[val.id][field_names[0]] = val.normal_cost - val.total_cost
+        return res
+    
+    _columns = {
+        'date_start': fields.function(_get_date, method=True, type='date', string='Start Date', multi='date_start'),
+        'date_stop': fields.function(_get_date, method=True, type='date', string='Stop Date', multi='date_stop'),
+#        'invoice_state': fields.selection(_get_invoice_state, string= 'Invoice State'),# readonly=True),
+        'invoice_state': fields.selection([('paid','Paid'),('all_open','All Open'),('draft_open','Draft and Open')], 'Invoice State',readonly=True),
+        'sale_avg_price' : fields.function(get_avg_price_margin, method=True, type='float', string='Avg. Unit Price', multi='sale_avg_price'),
+        'purchase_avg_price' : fields.function(get_avg_price_margin, method=True, type='float', string='Avg. Unit Price', multi='purchase_avg_price'),
+        'sale_num_invoiced' : fields.function(_get_num_invoiced, method=True, type='float', string='# Invoiced', multi='sale_num_invoiced'),
+        'purchase_num_invoiced' : fields.function(_get_num_invoiced, method=True, type='float', string='# Invoiced', multi='purchase_num_invoiced'),
+        'sales_gap' : fields.function(_get_gap, method=True, type='float', string='Sales Gap', multi='sales_gap'),
+        'purchase_gap' : fields.function(_get_gap, method=True, type='float', string='Purchase Gap', multi='purchase_gap'),
+        'turnover' : fields.function(_get_turnover, method=True, type='float', string='Turnover' ,multi='turnover'),
+        'total_cost'  : fields.function(_get_turnover, method=True, type='float', string='Total Cost', multi='total_cost'),
+        'sale_expected' :  fields.function(_get_expected, method=True, type='float', string='Expected Sale', multi='sale_expected'),
+        'normal_cost'  : fields.function(_get_expected, method=True, type='float', string='Normal Cost', multi='normal_cost'),
+        
+    }
+    
+    _defaults = {
+                 
+        'invoice_state': lambda *a: 'all_open',
+                 }
+    
+product_product()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
new file mode 100644
index 00000000000..a6c7cf016a5
--- /dev/null
+++ b/addons/product_margin/product_margin_view.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+	<wizard id="action_open_margin" menu="False" model="product.product" name="product.margin" string="Product Margin"/>	
+        
+    <menuitem id="menu_product_reporting" name="Reporting" parent ="product.menu_main_product" />
+        
+    <menuitem icon="STOCK_JUSTIFY_FILL" action="action_open_margin" id="menu_action_product_margin" type="wizard" sequence="5" parent="menu_product_reporting" />
+	
+	 <record id="view_product_margin_form" model="ir.ui.view">
+            <field name="name">product.margin.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="priority">10</field>
+            <field name="arch" type="xml">
+                <page string="Prices" position="after">
+                	<page string="Margin">
+	                	<separator string="Analysis Criteria" colspan="4"/>
+	                    <field name="date_start"/>
+	                    <field name="date_stop"/>
+	                    <newline/>
+	                    <field name="invoice_state" />
+	                    
+	                    <separator string="Sales" colspan="4"/>
+	                    <field name="sale_avg_price"/>
+	                    <field name="list_price" string="Catalog Price" readonly="1"/>
+	                    <field name="sale_num_invoiced" />
+	     				 <field name="sales_gap" /> 
+	                    <field name="turnover" />
+	                    <field name="sale_expected" />
+	                    
+	                    <separator string="Purchases" colspan="4"/>
+	                    <field name="purchase_avg_price"/>
+	                    <field name="standard_price" string="Standard Price" readonly="1"/>
+	                    <field name="purchase_num_invoiced" />
+	                   <field name="purchase_gap" />
+	                   <field name="total_cost" />
+	                   <field name="normal_cost" />
+	                    
+                </page>
+                </page>
+            </field>
+        </record>
+	
+	
+	
+</data>
+</openerp>
diff --git a/addons/product_margin/wizard/__init__.py b/addons/product_margin/wizard/__init__.py
new file mode 100644
index 00000000000..ed4ac23f486
--- /dev/null
+++ b/addons/product_margin/wizard/__init__.py
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#                    Fabien Pinckaers <fp@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 contract 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.
+#
+##############################################################################
+
+import wizard_product_margin
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/product_margin/wizard/wizard_product_margin.py b/addons/product_margin/wizard/wizard_product_margin.py
new file mode 100644
index 00000000000..a183149569a
--- /dev/null
+++ b/addons/product_margin/wizard/wizard_product_margin.py
@@ -0,0 +1,76 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 contract 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.
+#
+##############################################################################
+
+import wizard
+import pooler
+import time
+
+def _action_open_window(self, cr, uid, data, context):      
+    return {
+    }
+
+
+class product_margin(wizard.interface):
+    form1 = '''<?xml version="1.0"?>
+    <form string="View Stock of Products">
+        <separator string="Select " colspan="4"/>
+        <field name="from_date"/>
+        <field name="to_date"/>
+        <field name="invoice_state"/>
+    </form>'''
+    form1_fields = {
+             'from_date': {
+                'string': 'From',
+                'type': 'date',
+        },
+             'to_date': {
+                'string': 'To',
+                'type': 'date',
+        },
+         'invoice_state': {
+                'string': 'Invoice State',
+                'type': 'selection',
+                'selection': [('paid','Paid'),('all_open','All Open'),('draft_open','Draft and Open')],
+                'required': True,
+                'default': lambda *a:"all_open",
+        },
+    }
+
+    states = {
+      'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel','gtk-cancel'),('open', 'Open Margin','gtk-ok')]}
+        },
+    'open': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
+        }
+    }
+product_margin('product.margin')

From 6d992a60abc3ad39961817defb6f96f1302a9e44 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Fri, 3 Oct 2008 13:02:47 +0530
Subject: [PATCH 09/72] Created tree view for margin and called from wizard,
 Added new function fields in product_margin module

bzr revid: ruchakpatel@gmail.com-20081003073247-s0ma26plv8ytua2a
---
 addons/product_margin/product_margin.py       | 61 +++++++++++++------
 addons/product_margin/product_margin_view.xml | 29 ++++++++-
 .../wizard/wizard_product_margin.py           | 17 ++++--
 3 files changed, 82 insertions(+), 25 deletions(-)

diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index fd3d1b74622..d54d231f79b 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -36,12 +36,6 @@ import time
 class product_product(osv.osv):
     _inherit = "product.product"
     
-#    def _get_date(self, cr, uid, ids, field_names, arg, context):
-#        res = {}
-#        for val in self.browse(cr, uid, ids):
-#            res[val.id] = {}
-#            res[val.id][field_names[0]] = time.strftime('%Y-%m-%d')
-#        return res
     def _get_date(self, cr, uid, ids, field_names, arg, context):
         res = {}
         mapping = {
@@ -56,13 +50,12 @@ class product_product(osv.osv):
         return res
 
 
-#===============================================================================
     def _get_invoice_state(self, cr, uid,context ):
-#        res = {}
-#        for val in self.browse(cr, uid, ids):
-#            res[val.id] = context.get('invoice_state', 'open')
-        return res
-#===============================================================================
+        state=  context.get('invoice_state', False)
+        print 'rrrrrrrrrrrrr',state
+        if not state:
+            state = 'open'
+        return [(state,state)]
 
     def get_avg_price_margin(self, cr, uid, ids, field_names, arg, context):
         res = {}
@@ -91,7 +84,7 @@ class product_product(osv.osv):
             res[val.id] = {}
             map_val = ' , '.join(map(lambda x: mapping[x], field_names))
             avg=0.0
-            cr.execute("select sum(l.quantity) from account_invoice_line l left join account_invoice i on (l.invoice_id = i.id) where l.product_id = %s AND i.type= %s" , (val.id,map_val,))
+            cr.execute("select sum(l.quantity) from account_invoice_line l left join account_invoice i on (l.invoice_id = i.id) where l.product_id = %s AND i.state not in ('draft','cancel') AND i.type= %s" , (val.id,map_val,))
             avg = cr.fetchall()[0][0]
             res[val.id][field_names[0]] = avg
         return res
@@ -106,6 +99,7 @@ class product_product(osv.osv):
                    'sale_expected' : 'product_uom_qty',
                    'normal_cost' : 'product_qty',
                    }
+        
         for val in self.browse(cr, uid, ids):
             res[val.id] = {}
             map_val = ' , '.join(map(lambda x: mapping1[x], field_names))
@@ -127,7 +121,7 @@ class product_product(osv.osv):
         for val in self.browse(cr, uid, ids):
             res[val.id] = {}
             map_val = ' , '.join(map(lambda x: mapping[x], field_names))
-            cr.execute("select sum(l.quantity * l.price_unit) from account_invoice_line l left join account_invoice i on (l.invoice_id = i.id) where l.product_id = %s AND i.type= %s " , (val.id,map_val))
+            cr.execute("select sum(l.quantity * l.price_unit) from account_invoice_line l left join account_invoice i on (l.invoice_id = i.id) where l.product_id = %s AND i.state not in ('draft','cancel') AND i.type= %s " , (val.id,map_val))
             turnover = cr.fetchall()[0][0]
             res[val.id][field_names[0]]= turnover
         return res
@@ -142,11 +136,38 @@ class product_product(osv.osv):
                 res[val.id][field_names[0]] = val.normal_cost - val.total_cost
         return res
     
+    
+    def _get_total_margin(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        for val in self.browse(cr, uid, ids):
+            mapping = {
+                   'total_margin' : val.turnover - val.total_cost,
+                   'expected_margin' : val.sale_expected - val.normal_cost,
+                   }
+            res[val.id] = {}
+            res[val.id][field_names[0]] = mapping[field_names[0]]
+        return res
+    
+    def _get_total_margin_rate(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        for val in self.browse(cr, uid, ids):
+            if not val.turnover:
+                val.turnover = 1
+            if not val.sale_expected: 
+                val.sale_expected=1
+            mapping = {
+                   'total_margin_rate' : (val.total_margin * 100 ) / val.turnover ,
+                   'expected_margin_rate' : (val.expected_margin * 100 ) / val.sale_expected,
+                   }
+            res[val.id] = {}
+            res[val.id][field_names[0]] = mapping[field_names[0]]
+        return res
+    
     _columns = {
         'date_start': fields.function(_get_date, method=True, type='date', string='Start Date', multi='date_start'),
         'date_stop': fields.function(_get_date, method=True, type='date', string='Stop Date', multi='date_stop'),
-#        'invoice_state': fields.selection(_get_invoice_state, string= 'Invoice State'),# readonly=True),
-        'invoice_state': fields.selection([('paid','Paid'),('all_open','All Open'),('draft_open','Draft and Open')], 'Invoice State',readonly=True),
+        'invoice_state': fields.selection(_get_invoice_state, string= 'Invoice State'),# readonly=True),
+#        'invoice_state': fields.selection([('paid','Paid'),('all_open','All Open'),('draft_open','Draft and Open')], 'Invoice State',readonly=True),
         'sale_avg_price' : fields.function(get_avg_price_margin, method=True, type='float', string='Avg. Unit Price', multi='sale_avg_price'),
         'purchase_avg_price' : fields.function(get_avg_price_margin, method=True, type='float', string='Avg. Unit Price', multi='purchase_avg_price'),
         'sale_num_invoiced' : fields.function(_get_num_invoiced, method=True, type='float', string='# Invoiced', multi='sale_num_invoiced'),
@@ -157,12 +178,14 @@ class product_product(osv.osv):
         'total_cost'  : fields.function(_get_turnover, method=True, type='float', string='Total Cost', multi='total_cost'),
         'sale_expected' :  fields.function(_get_expected, method=True, type='float', string='Expected Sale', multi='sale_expected'),
         'normal_cost'  : fields.function(_get_expected, method=True, type='float', string='Normal Cost', multi='normal_cost'),
-        
+        'total_margin' : fields.function(_get_total_margin, method=True, type='float', string='Total Margin', multi='total_margin'),
+        'expected_margin' : fields.function(_get_total_margin, method=True, type='float', string='Expected Margin', multi='expected_margin'),
+        'total_margin_rate' : fields.function(_get_total_margin_rate, method=True, type='float', string='Total Margin (%)', multi='total_margin_rate'),
+        'expected_margin_rate' : fields.function(_get_total_margin_rate, method=True, type='float', string='Expected Margin (%)', multi='expected_margin_rate'),
     }
     
     _defaults = {
-                 
-        'invoice_state': lambda *a: 'all_open',
+                 'invoice_state' : _get_invoice_state
                  }
     
 product_product()
diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml
index a6c7cf016a5..2adeb303748 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -39,12 +39,37 @@
 	                   <field name="total_cost" />
 	                   <field name="normal_cost" />
 	                    
+	                    <separator string="Margins" colspan="4"/>
+	                    <field name="total_margin"/>
+	                    <field name="expected_margin"/>
+	                   <field name="total_margin_rate" widget="progressbar"/>
+	                    <field name="expected_margin_rate" widget="progressbar"/>
+	                   
                 </page>
                 </page>
             </field>
         </record>
-	
-	
+		
+		<record id="view_product_margin_tree" model="ir.ui.view">
+            <field name="name">product.margin.tree</field>
+            <field name="model">product.product</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Product Margin">
+                    <field name="name" select="1"/>
+                    <field name="default_code" select="1"/>
+                    <field name="sale_avg_price"/>
+                    <field name="sale_num_invoiced"/>
+                    <field name="turnover"/>
+                    <field name="sales_gap"/>
+                    <field name="total_cost"/>
+                    <field name="purchase_num_invoiced" string="#Purchased"/>
+                    <field name="total_margin"/>
+                    <field name="expected_margin"/>
+                    <field name="total_margin_rate"  widget="progressbar"/>
+            </tree>
+            </field>
+        </record>
 	
 </data>
 </openerp>
diff --git a/addons/product_margin/wizard/wizard_product_margin.py b/addons/product_margin/wizard/wizard_product_margin.py
index a183149569a..3d37f972643 100644
--- a/addons/product_margin/wizard/wizard_product_margin.py
+++ b/addons/product_margin/wizard/wizard_product_margin.py
@@ -32,11 +32,20 @@ import wizard
 import pooler
 import time
 
-def _action_open_window(self, cr, uid, data, context):      
+def _action_open_window(self, cr, uid, data, context):
+    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.tree', 'tree'))
+    view_res = cr.fetchone()
     return {
-    }
-
-
+        'name': 'Product Margin',
+         'context':{'from_date':data['form']['from_date'],'to_date':data['form']['to_date'],'invoice_state' : data['form']['invoice_state']},
+        'view_type': 'form',
+        "view_mode": 'tree,form',
+        'res_model':'product.product',
+        'type': 'ir.actions.act_window',
+        'view_id': view_res,
+        }
+    
+    
 class product_margin(wizard.interface):
     form1 = '''<?xml version="1.0"?>
     <form string="View Stock of Products">

From ab0d530987361129af876b33418780f3ae41faa9 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Fri, 3 Oct 2008 14:58:12 +0530
Subject: [PATCH 10/72] Changes in function for Invoice State and Start & End
 Dates

bzr revid: ruchakpatel@gmail.com-20081003092812-iuv81r8umostfrch
---
 addons/product_margin/product_margin.py       | 20 ++++++++-----------
 .../wizard/wizard_product_margin.py           |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index d54d231f79b..9419dbef140 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -50,12 +50,12 @@ class product_product(osv.osv):
         return res
 
 
-    def _get_invoice_state(self, cr, uid,context ):
-        state=  context.get('invoice_state', False)
-        print 'rrrrrrrrrrrrr',state
-        if not state:
-            state = 'open'
-        return [(state,state)]
+    def _get_invoice_state(self, cr, uid, ids, field_names, arg, context):
+        res = {}
+        state=  context.get('invoice_state', 'open')
+        for val in self.browse(cr, uid, ids):
+            res[val.id] = state
+        return res
 
     def get_avg_price_margin(self, cr, uid, ids, field_names, arg, context):
         res = {}
@@ -166,8 +166,8 @@ class product_product(osv.osv):
     _columns = {
         'date_start': fields.function(_get_date, method=True, type='date', string='Start Date', multi='date_start'),
         'date_stop': fields.function(_get_date, method=True, type='date', string='Stop Date', multi='date_stop'),
-        'invoice_state': fields.selection(_get_invoice_state, string= 'Invoice State'),# readonly=True),
-#        'invoice_state': fields.selection([('paid','Paid'),('all_open','All Open'),('draft_open','Draft and Open')], 'Invoice State',readonly=True),
+        'invoice_state': fields.function(_get_invoice_state, method=True, type='char', string='Invoice State'),
+#        'invoice_state': fields.selection(_get_invoice_state, string= 'Invoice State'),# readonly=True),
         'sale_avg_price' : fields.function(get_avg_price_margin, method=True, type='float', string='Avg. Unit Price', multi='sale_avg_price'),
         'purchase_avg_price' : fields.function(get_avg_price_margin, method=True, type='float', string='Avg. Unit Price', multi='purchase_avg_price'),
         'sale_num_invoiced' : fields.function(_get_num_invoiced, method=True, type='float', string='# Invoiced', multi='sale_num_invoiced'),
@@ -184,10 +184,6 @@ class product_product(osv.osv):
         'expected_margin_rate' : fields.function(_get_total_margin_rate, method=True, type='float', string='Expected Margin (%)', multi='expected_margin_rate'),
     }
     
-    _defaults = {
-                 'invoice_state' : _get_invoice_state
-                 }
-    
 product_product()
 
 
diff --git a/addons/product_margin/wizard/wizard_product_margin.py b/addons/product_margin/wizard/wizard_product_margin.py
index 3d37f972643..07bdcc1f261 100644
--- a/addons/product_margin/wizard/wizard_product_margin.py
+++ b/addons/product_margin/wizard/wizard_product_margin.py
@@ -37,7 +37,7 @@ def _action_open_window(self, cr, uid, data, context):
     view_res = cr.fetchone()
     return {
         'name': 'Product Margin',
-         'context':{'from_date':data['form']['from_date'],'to_date':data['form']['to_date'],'invoice_state' : data['form']['invoice_state']},
+        'context':{'date_start':data['form']['from_date'],'date_stop':data['form']['to_date'],'invoice_state' : data['form']['invoice_state']},
         'view_type': 'form',
         "view_mode": 'tree,form',
         'res_model':'product.product',

From 7c60542fc475db31ea39f5c1ac63c2308385eb7c Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Fri, 3 Oct 2008 19:03:53 +0530
Subject: [PATCH 11/72] Created new wizard for analytic Lines according to Date

bzr revid: ruchakpatel@gmail.com-20081003133353-1bgnw8vgv6410hh8
---
 addons/account/project/project.py             | 32 ++++++-
 addons/account/project/project_view.xml       |  5 +
 addons/account/project/wizard/__init__.py     |  1 +
 .../wizard/wizard_account_analytic_line1.py   | 91 +++++++++++++++++++
 4 files changed, 125 insertions(+), 4 deletions(-)
 create mode 100644 addons/account/project/wizard/wizard_account_analytic_line1.py

diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index b4cc3468e5f..9810fa8a365 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -43,17 +43,32 @@ class account_analytic_account(osv.osv):
     _description = 'Analytic Accounts'
 
     def _credit_calc(self, cr, uid, ids, name, arg, context={}):
+        if 'date_start' in context and context['date_start']:
+            date_start = context['date_start']
+        else:
+            date_start = time.strftime('%Y-01-01')
+        if 'date_stop' in context and context['date_stop']:
+            date_stop = context['date_stop']
+        else:
+            date_stop = time.strftime('%Y-%m-%d')
         acc_set = ",".join(map(str, ids))
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE l.amount<0 and a.id IN (%s) GROUP BY a.id" % acc_set)
+        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE l.amount<0 and a.id IN (%s) AND (l.date BETWEEN %s and %s) GROUP BY a.id" % (acc_set,date_start,date_stop))
         r= dict(cr.fetchall())
         for i in ids:
             r.setdefault(i,0.0)
         return r
 
     def _debit_calc(self, cr, uid, ids, name, arg, context={}):
-
+        if 'date_start' in context and context['date_start']:
+            date_start = context['date_start']
+        else:
+            date_start = time.strftime('%Y-01-01')
+        if 'date_stop' in context and context['date_stop']:
+            date_stop = context['date_stop']
+        else:
+            date_stop = time.strftime('%Y-%m-%d')
         acc_set = ",".join(map(str, ids))
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE l.amount>0 and a.id IN (%s) GROUP BY a.id" % acc_set)
+        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE l.amount>0 and a.id IN (%s)  AND (l.date BETWEEN %s and %s) GROUP BY a.id" % (acc_set,date_start,date_stop))
         r= dict(cr.fetchall())
         for i in ids:
             r.setdefault(i,0.0)
@@ -62,9 +77,17 @@ class account_analytic_account(osv.osv):
 
 
     def _balance_calc(self, cr, uid, ids, name, arg, context={}):
+        if 'date_start' in context and context['date_start']:
+            date_start = context['date_start']
+        else:
+            date_start = time.strftime('%Y-01-01')
+        if 'date_stop' in context and context['date_stop']:
+            date_stop = context['date_stop']
+        else:
+            date_stop = time.strftime('%Y-%m-%d')
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         acc_set = ",".join(map(str, ids2))
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE a.id IN (%s) GROUP BY a.id" % acc_set)
+        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE a.id IN (%s)  AND (l.date BETWEEN %s and %s) GROUP BY a.id" % (acc_set,date_start,date_stop))
         res = {}
         for account_id, sum in cr.fetchall():
             res[account_id] = sum
@@ -109,6 +132,7 @@ class account_analytic_account(osv.osv):
                     res[id] += res.get(child, 0.0)
         return dict([(i, res[i]) for i in ids])
 
+
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
             return []
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 45a4307a6c9..82ba671265f 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -86,12 +86,17 @@
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
         </record>
+        
         <menuitem
             action="action_account_analytic_account_tree2"
             id="account_analytic_def_chart"
             parent="account.account_analytic_def_account"/>
         <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>
 
+	<wizard id="analytic_account_menu_action" menu="False" model="account.analytic.account" name="account.analytic.line1" string="Analytic Account Entries"/>
+        
+		<menuitem type="wizard" action="analytic_account_menu_action" id="analytic_account_menu" parent="account.menu_finance_charts" name="Analytic Account lines"/>
+        
 		<record id="analytic_account_form" model="ir.actions.act_window">
             <field name="name">New Analytic Account</field>
             <field name="res_model">account.analytic.account</field>
diff --git a/addons/account/project/wizard/__init__.py b/addons/account/project/wizard/__init__.py
index 477e5262a00..66cce97becb 100644
--- a/addons/account/project/wizard/__init__.py
+++ b/addons/account/project/wizard/__init__.py
@@ -35,6 +35,7 @@ import wizard_account_analytic_cost_ledger_report
 import wizard_account_analytic_cost_ledger_for_journal_report
 import wizard_account_analytic_analytic_check
 import wizard_account_analytic_line
+import wizard_account_analytic_line1
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/project/wizard/wizard_account_analytic_line1.py b/addons/account/project/wizard/wizard_account_analytic_line1.py
new file mode 100644
index 00000000000..5f1f7b85c83
--- /dev/null
+++ b/addons/account/project/wizard/wizard_account_analytic_line1.py
@@ -0,0 +1,91 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 contract 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.
+#
+##############################################################################
+
+import wizard
+import pooler
+import time
+
+def _action_open_window(self, cr, uid, data, context): 
+    domain=[]
+    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('account.analytic.account.tree', 'tree'))
+    view_res = cr.fetchone()
+    from_date= data['form']['from_date']
+    to_date=data['form']['to_date']
+    if from_date and to_date:
+        domain=[('date','>=',from_date),('date','<=',to_date)]
+    elif from_date:
+        domain=[('date','>=',from_date)]
+    elif to_date:
+        domain=[('date','<=',to_date)]
+    return {
+        'name': 'Analytic Entries',
+        'view_type': 'tree',
+        "view_mode": 'tree,form',
+        'res_model': 'account.analytic.account',
+        'type': 'ir.actions.act_window',
+        'view_id' : view_res,
+        'domain' :domain+[('parent_id','=',False)],
+        'context':{'date_start':data['form']['from_date'],'date_stop':data['form']['to_date']},
+        }
+
+
+class account_analytic_line1(wizard.interface):
+    form1 = '''<?xml version="1.0"?>
+    <form string="View Account Analytic Lines">
+        <separator string="Account Analytic Lines Analysis" colspan="4"/>
+        <field name="from_date"/>
+        <newline/>
+        <field name="to_date"/>
+        <newline/>
+        <label string=""/>
+        <label string="(Keep empty to open the current situation)" align="0.0" colspan="3"/>
+    </form>'''
+    form1_fields = {
+             'from_date': {
+                'string': 'From',
+                'type': 'date',
+        },
+             'to_date': {
+                'string': 'To',
+                'type': 'date',
+        },
+    }
+
+    states = {
+      'init': {
+            'actions': [],
+            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel','gtk-cancel'),('open', 'Open Entries','gtk-ok')]}
+        },
+    'open': {
+            'actions': [],
+            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
+        }
+    }
+account_analytic_line1('account.analytic.line1')

From 76e2db3bcca515ed31d2e57bcaf4b66dd5a7c860 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Mon, 6 Oct 2008 14:58:00 +0530
Subject: [PATCH 12/72] Changes in account/project.py and other for Analytic
 Chart of Accounts according to selected dates

bzr revid: ruchakpatel@gmail.com-20081006092800-84af8krgwswd2gbf
---
 addons/account/project/project.py             | 24 +++++++++++++------
 .../wizard/wizard_account_analytic_line1.py   | 10 +-------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index 9810fa8a365..60a1704bb2d 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -52,7 +52,7 @@ class account_analytic_account(osv.osv):
         else:
             date_stop = time.strftime('%Y-%m-%d')
         acc_set = ",".join(map(str, ids))
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE l.amount<0 and a.id IN (%s) AND (l.date BETWEEN %s and %s) GROUP BY a.id" % (acc_set,date_start,date_stop))
+        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE l.amount<0 and a.id IN (%s) AND (l.date BETWEEN '%s' and '%s') GROUP BY a.id" % (acc_set,date_start,date_stop))
         r= dict(cr.fetchall())
         for i in ids:
             r.setdefault(i,0.0)
@@ -68,7 +68,7 @@ class account_analytic_account(osv.osv):
         else:
             date_stop = time.strftime('%Y-%m-%d')
         acc_set = ",".join(map(str, ids))
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE l.amount>0 and a.id IN (%s)  AND (l.date BETWEEN %s and %s) GROUP BY a.id" % (acc_set,date_start,date_stop))
+        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE l.amount>0 and a.id IN (%s)  AND (l.date BETWEEN '%s' and '%s') GROUP BY a.id" % (acc_set,date_start,date_stop))
         r= dict(cr.fetchall())
         for i in ids:
             r.setdefault(i,0.0)
@@ -87,7 +87,8 @@ class account_analytic_account(osv.osv):
             date_stop = time.strftime('%Y-%m-%d')
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         acc_set = ",".join(map(str, ids2))
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE a.id IN (%s)  AND (l.date BETWEEN %s and %s) GROUP BY a.id" % (acc_set,date_start,date_stop))
+        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE a.id IN (%s)  AND (l.date BETWEEN '%s' and '%s') GROUP BY a.id" % (acc_set,date_start,date_stop))
+#        cr.execute("select a.id, COALESCE(SUM(l.amount),0) from account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) where (l.date BETWEEN '2008-10-01' AND '2008-10-03') GROUP BY a.id")
         res = {}
         for account_id, sum in cr.fetchall():
             res[account_id] = sum
@@ -114,13 +115,21 @@ class account_analytic_account(osv.osv):
         return dict([(i, res[i]) for i in ids ])
 
     def _quantity_calc(self, cr, uid, ids, name, arg, context={}):
-        #XXX must convert into one uom
+#        XXX must convert into one uom
+        if 'date_start' in context and context['date_start']:
+            date_start = context['date_start']
+        else:
+            date_start = time.strftime('%Y-01-01')
+        if 'date_stop' in context and context['date_stop']:
+            date_stop = context['date_stop']
+        else:
+            date_stop = time.strftime('%Y-%m-%d')
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         acc_set = ",".join(map(str, ids2))
-        cr.execute('SELECT a.id, COALESCE(SUM(l.unit_amount), 0) \
+        cr.execute("SELECT a.id, COALESCE(SUM(l.unit_amount), 0) \
                 FROM account_analytic_account a \
                     LEFT JOIN account_analytic_line l ON (a.id = l.account_id) \
-                WHERE a.id IN ('+acc_set+') GROUP BY a.id')
+                WHERE a.id IN (%s) AND (l.date BETWEEN '%s' and '%s') GROUP BY a.id" % (acc_set,date_start,date_stop))
         res = {}
         for account_id, sum in cr.fetchall():
             res[account_id] = sum
@@ -130,9 +139,10 @@ class account_analytic_account(osv.osv):
                 if child <> id:
                     res.setdefault(id, 0.0)
                     res[id] += res.get(child, 0.0)
+            if not id in res:
+                res.setdefault(id, 0.0)
         return dict([(i, res[i]) for i in ids])
 
-
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
             return []
diff --git a/addons/account/project/wizard/wizard_account_analytic_line1.py b/addons/account/project/wizard/wizard_account_analytic_line1.py
index 5f1f7b85c83..c8e0d3952e6 100644
--- a/addons/account/project/wizard/wizard_account_analytic_line1.py
+++ b/addons/account/project/wizard/wizard_account_analytic_line1.py
@@ -36,14 +36,6 @@ def _action_open_window(self, cr, uid, data, context):
     domain=[]
     cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('account.analytic.account.tree', 'tree'))
     view_res = cr.fetchone()
-    from_date= data['form']['from_date']
-    to_date=data['form']['to_date']
-    if from_date and to_date:
-        domain=[('date','>=',from_date),('date','<=',to_date)]
-    elif from_date:
-        domain=[('date','>=',from_date)]
-    elif to_date:
-        domain=[('date','<=',to_date)]
     return {
         'name': 'Analytic Entries',
         'view_type': 'tree',
@@ -51,7 +43,7 @@ def _action_open_window(self, cr, uid, data, context):
         'res_model': 'account.analytic.account',
         'type': 'ir.actions.act_window',
         'view_id' : view_res,
-        'domain' :domain+[('parent_id','=',False)],
+        'domain' :[('parent_id','=',False)],
         'context':{'date_start':data['form']['from_date'],'date_stop':data['form']['to_date']},
         }
 

From 7a375e05cdf546d367270c7a9119de9cb809a69b Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Mon, 6 Oct 2008 15:37:41 +0530
Subject: [PATCH 13/72] Changes in Menu for Analytic Charts of account

bzr revid: ruchakpatel@gmail.com-20081006100741-qvt2dsmudr0gtqt5
---
 addons/account/project/project_view.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 82ba671265f..53e86942587 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -91,11 +91,15 @@
             action="action_account_analytic_account_tree2"
             id="account_analytic_def_chart"
             parent="account.account_analytic_def_account"/>
-        <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>
-
-	<wizard id="analytic_account_menu_action" menu="False" model="account.analytic.account" name="account.analytic.line1" string="Analytic Account Entries"/>
         
-		<menuitem type="wizard" action="analytic_account_menu_action" id="analytic_account_menu" parent="account.menu_finance_charts" name="Analytic Account lines"/>
+      <!--
+      	OVERRIDDEN BY NEW WIZARD
+        <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>
+        -->
+
+		<wizard id="action_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.line1" string="Analytic Chart of Accounts"/>
+        
+		<menuitem type="wizard" icon="STOCK_INDENT" action="action_analytic_account_chart" id="account_analytic_chart" parent="account.menu_finance_charts" name="Analytic Account lines"/>
         
 		<record id="analytic_account_form" model="ir.actions.act_window">
             <field name="name">New Analytic Account</field>

From cff93674bbd3a3fabc31fb1e6cb1abd0ed9e7f49 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Mon, 6 Oct 2008 16:26:20 +0530
Subject: [PATCH 14/72] Override Unlink function to delete only Draft
 Procurement,Stock Moves,Stock Picking,Purchase Order

bzr revid: ruchakpatel@gmail.com-20081006105620-6jjkeb92qy1vwio4
---
 addons/mrp/mrp.py           | 12 ++++++++++++
 addons/purchase/purchase.py | 13 ++++++++++++-
 addons/stock/stock.py       | 23 ++++++++++++++++++++++-
 3 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 11aad76fc40..a5b0f0fa24e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -727,6 +727,18 @@ class mrp_procurement(osv.osv):
         'close_move': lambda *a: 0,
         'procure_method': lambda *a: 'make_to_order',
     }
+    
+    def unlink(self, cr, uid, ids):
+        procurements = self.read(cr, uid, ids, ['state'])
+        unlink_ids = []
+        for s in procurements:
+            if s['state'] in ['draft','cancel']:
+                unlink_ids.append(s['id'])
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state']))
+        osv.osv.unlink(self, cr, uid, unlink_ids)
+        return True
+    
     def check_product(self, cr, uid, ids):
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_id.type in ('product', 'consu'):
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index d0f2951de54..9227c989913 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -206,7 +206,18 @@ class purchase_order(osv.osv):
     _name = "purchase.order"
     _description = "Purchase order"
     _order = "name desc"
-
+    
+    def unlink(self, cr, uid, ids):
+        purchase_orders = self.read(cr, uid, ids, ['state'])
+        unlink_ids = []
+        for s in purchase_orders:
+            if s['state'] in ['draft','cancel']:
+                unlink_ids.append(s['id'])
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!' % s['state']))
+        osv.osv.unlink(self, cr, uid, unlink_ids)
+        return True
+    
     def button_dummy(self, cr, uid, ids, context={}):
         return True
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e3decf04c8f..90ead58b451 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -406,7 +406,17 @@ class stock_picking(osv.osv):
     #def copy(self, cr, uid, id, data=None, context={}):
     #    data = data or {}
     #    return super(stock_picking, self).copy(cr, uid, id, data, context)
-
+    def unlink(self, cr, uid, ids):
+        pickings = self.read(cr, uid, ids, ['state'])
+        unlink_ids = []
+        for s in pickings:
+            if s['state'] in ['draft','cancel']:
+                unlink_ids.append(s['id'])
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Picking(s) which are in %s State!' % s['state']))
+        osv.osv.unlink(self, cr, uid, unlink_ids)
+        return True
+    
     def onchange_partner_in(self, cr, uid, context, partner_id=None):
         sid = self.pool.get('res.partner.address').browse(cr, uid, partner_id, context).partner_id.property_stock_supplier.id
         return { }
@@ -874,6 +884,17 @@ class stock_move(osv.osv):
             'You try to assign a lot which is not from the same product',
             ['prodlot_id'])]
     
+#    def unlink(self, cr, uid, ids):
+#        moves = self.read(cr, uid, ids, ['state'])
+#        unlink_ids = []
+#        for s in moves:
+#            if s['state'] in ['draft','cancel']:
+#                unlink_ids.append(s['id'])
+#            else:
+#                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Stock Move(s) which are in %s State!' % s['state']))
+#        osv.osv.unlink(self, cr, uid, unlink_ids)
+#        return True
+    
     def _default_location_destination(self, cr, uid, context={}):
         if context.get('move_line', []):
             return context['move_line'][0][2]['location_dest_id']

From 574bfc9db4e8ff1b94c023687169a91af793313a Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Mon, 13 Oct 2008 19:01:56 +0530
Subject: [PATCH 15/72] Added new module repair_module to manage all products
 repairs

bzr revid: ruchakpatel@gmail.com-20081013133156-frp4xzt60diwywds
---
 addons/repair_module/__init__.py            | 34 ++++++++
 addons/repair_module/__terp__.py            | 61 ++++++++++++++
 addons/repair_module/repair_module.py       | 93 +++++++++++++++++++++
 addons/repair_module/repair_module_view.xml | 86 +++++++++++++++++++
 addons/stock/stock.py                       | 36 +-------
 5 files changed, 277 insertions(+), 33 deletions(-)
 create mode 100644 addons/repair_module/__init__.py
 create mode 100644 addons/repair_module/__terp__.py
 create mode 100644 addons/repair_module/repair_module.py
 create mode 100644 addons/repair_module/repair_module_view.xml

diff --git a/addons/repair_module/__init__.py b/addons/repair_module/__init__.py
new file mode 100644
index 00000000000..4fdb4e50e62
--- /dev/null
+++ b/addons/repair_module/__init__.py
@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 contract 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.
+#
+##############################################################################
+
+import repair_module
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/repair_module/__terp__.py b/addons/repair_module/__terp__.py
new file mode 100644
index 00000000000..b37fee49ac7
--- /dev/null
+++ b/addons/repair_module/__terp__.py
@@ -0,0 +1,61 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 contract 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.
+###############################################################################
+# -*- encoding: utf-8 -*-
+{
+    "name":"Products Repairs Module",
+    "version":"1.0",
+    "author":"Tiny",
+    "description": """
+            The aim is to have a complete module to manage all products repairs. The following topics 
+        should be covered by this module:
+           Add/remove products in the reparation
+
+           Impact for stocks
+
+           Invoicing (products and/or services)
+
+           Warrenty concept
+
+           Repair quotation report
+
+           Notes for the technician and for the final customer
+
+           (Link to Cases) (option)
+""",    
+    
+    "category":"Custom",
+    "depends":["sale","account"],
+    "demo_xml":[],
+    "update_xml":["repair_module_view.xml"],
+    "active": False,
+    "installable": True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/repair_module/repair_module.py b/addons/repair_module/repair_module.py
new file mode 100644
index 00000000000..65b82051e8a
--- /dev/null
+++ b/addons/repair_module/repair_module.py
@@ -0,0 +1,93 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 contract 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.
+#
+##############################################################################
+
+import time
+from osv import fields,osv
+import netsvc
+
+class mrp_repair(osv.osv):
+    _name = 'mrp.repair'
+    
+    _columns = {
+        'product_id': fields.many2one('product.product', string='Product to Repair', required=True ,domain=[('sale_ok','=',True)]),
+        'partner_id' : fields.many2one('res.partner', 'Partner', select=True),
+        'address_id': fields.many2one('res.partner.address', 'Delivery Address', domain="[('partner_id','=',partner_id)]"),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, domain="[('product_id','=',product_id)]"),
+        'state': fields.selection([
+            ('draft','Quotation'),
+            ('confirmed','Confirmed'),
+            ('2binvoiced','To be Invoiced'),
+            ('done','Done'),
+            ('cancel','Cancel')
+            ], 'State', readonly=True, help="Gives the state of the Repairs Order"),
+        'location_id': fields.many2one('stock.location', 'Current Location', required=True, select=True),
+        'location_dest_id': fields.many2one('stock.location', 'Delivery Location'),
+        'move_id': fields.many2one('stock.move', 'Move',required=True,domain="[('product_id','=',product_id)]"),#,('prodlot_id','=',prodlot_id)
+        'limit': fields.date('Guarantee limit',  readonly=True),
+        'operations' : fields.one2many('repair.operation', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
+        'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
+        'partner_invoice_id':fields.many2one('res.partner.address', 'Invoice to', readonly=True, states={'draft':[('readonly',False)]}),
+        'invoice_method':fields.selection([
+            ("none","No Invoice"),
+            ("b4repair","Before Repair"),
+            ("after_repair","After Repair")
+           ], "Invoice Method", 
+            select=True),
+        'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
+        'fees_lines' : fields.one2many('sale.order.line', 'order_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}),
+        'internal_notes' : fields.text('Internal Notes'),
+        'quotation_notes' : fields.text('Quotation Notes'),
+    }
+    
+    _defaults = {
+        'state': lambda *a: 'draft',
+    }
+    
+mrp_repair()
+
+
+class repair_operation(osv.osv):
+     _name = 'repair.operation'
+     _description = 'Repair Operation'
+     _columns = {
+        'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref', required=True, ondelete='cascade', select=True),
+        'name': fields.selection([('add','Add'),('remove','Remove')],'Type',  required=True),
+        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok','=',True)]),
+        'invoice': fields.boolean('Invoice', readonly=True),
+        'price_unit': fields.float('Price', required=True),
+        'product_qty': fields.float('Quantity', digits=(16,2), required=True),
+        'product_uom': fields.many2one('product.uom', 'UoM', required=True),
+         'location_id': fields.many2one('stock.location', 'Source Location', select=True),
+        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', select=True),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Lot Nb.', select=True),
+    }
+
+repair_operation()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/repair_module/repair_module_view.xml b/addons/repair_module/repair_module_view.xml
new file mode 100644
index 00000000000..2203fbd88aa
--- /dev/null
+++ b/addons/repair_module/repair_module_view.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+    <record id="view_repair_order_form" model="ir.ui.view">
+            <field name="name">mrp.repair.form</field>
+            <field name="model">mrp.repair</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Sales order">
+                    <group col="4" colspan="4">
+                        <field name="product_id" select="1" />
+                        <field name="prodlot_id" select="2"/>
+                        <field name="partner_id" select="2"/>
+                        <field name="address_id"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Products">
+                            <field name="location_id"/>
+                            <field name="move_id"/>
+                            <field name="location_dest_id"/>
+                            <field name="limit"/>
+                            <newline/>
+                            <separator colspan="4" string="Operations"/>
+                            <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
+                                <form string="Operations">
+                                     <field name="name"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty" string="Qty"/>
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="price_unit"/>
+                                    <field name="prodlot_id"/>
+                                    <field name="location_id"/>
+                                    <field name="invoice"/>
+                                </form>
+                                <tree string="Operations lines">
+                                    <field name="name"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty" string="Qty"/>
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="price_unit"/>
+                                    <field name="prodlot_id"/>
+                                    <field name="location_id"/>
+                                    <field name="invoice"/>
+                                </tree>
+                            </field>
+                            <newline/>
+                            <group col="13" colspan="4">
+                                <field name="state" select="2"/>
+                                <!--<button name="repair_confirm" states="draft" string="Confirm Repair"/>
+                                <button name="cancel" states="confirmed" string="Repair Done"/>
+                                <button name="cancel" states="draft,confirmed,2binvoiced" string="Cancel Repair"/>
+                                <button name="cancel" states="2binvoiced" string="Make Invoice"/> -->
+                            </group>
+                        </page>
+                        <page string="Invoicing">
+                            <field name="pricelist_id"/>
+                            <field name="partner_invoice_id"/>
+                            <field name="invoice_method"/>
+                            <field name="invoice_id"/>
+                            <separator colspan="4" string="Fees"/>
+                            <field colspan="4" name="fees_lines" nolabel="1"/>
+                        </page>
+                        <page string="Quality">
+                            <separator colspan="4" string="Internal Notes"/>
+                            <field colspan="4" name="internal_notes" nolabel="1"/>
+                            <separator colspan="4" string="Quotation Notes"/>
+                            <field colspan="4" name="quotation_notes" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+        
+        <record id="action_repair_order_form" model="ir.actions.act_window">
+            <field name="name">Repair Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.repair</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+        </record>
+        
+        <menuitem action="action_repair_order_form" id="menu_repair_order" parent="mrp.menu_mrp_root"/>
+    
+    </data>
+</openerp>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 8f23a0d27fd..f0c71c1199f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -320,34 +320,26 @@ class stock_picking(osv.osv):
     _description = "Packing list"
     def _set_maximum_date(self, cr, uid, ids, name, value, arg, context):
         if not value: return False
-<<<<<<< TREE
-        for pick in self.browse(cr, uid, [ids], context):
-=======
         if isinstance(ids, (int, long)):
             ids=[ids]
         for pick in self.browse(cr, uid, ids, context):
->>>>>>> MERGE-SOURCE
             cr.execute("""update stock_move set
                     date_planned=%s 
                 where
                     picking_id=%d and 
-                    (date_planned>%s)""", (value,pick.id,value))
+                    (date_planned=%s or date_planned>%s)""", (value,pick.id,pick.max_date,value))
         return True
 
     def _set_minimum_date(self, cr, uid, ids, name, value, arg, context):
         if not value: return False
-<<<<<<< TREE
-        for pick in self.browse(cr, uid,[ids], context):
-=======
         if isinstance(ids, (int, long)):
             ids=[ids]
         for pick in self.browse(cr, uid, ids, context):
->>>>>>> MERGE-SOURCE
             cr.execute("""update stock_move set
                     date_planned=%s 
                 where
                     picking_id=%d and 
-                    (date_planned<%s)""", (value,pick.id,value))
+                    (date_planned=%s or date_planned<%s)""", (value,pick.id,pick.min_date,value))
         return True
 
     def get_min_max_date(self, cr, uid, ids, field_name, arg, context={}):
@@ -418,17 +410,7 @@ class stock_picking(osv.osv):
     #def copy(self, cr, uid, id, data=None, context={}):
     #    data = data or {}
     #    return super(stock_picking, self).copy(cr, uid, id, data, context)
-    def unlink(self, cr, uid, ids):
-        pickings = self.read(cr, uid, ids, ['state'])
-        unlink_ids = []
-        for s in pickings:
-            if s['state'] in ['draft','cancel']:
-                unlink_ids.append(s['id'])
-            else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Picking(s) which are in %s State!' % s['state']))
-        osv.osv.unlink(self, cr, uid, unlink_ids)
-        return True
-    
+
     def onchange_partner_in(self, cr, uid, context, partner_id=None):
         sid = self.pool.get('res.partner.address').browse(cr, uid, partner_id, context).partner_id.property_stock_supplier.id
         return { }
@@ -890,7 +872,6 @@ class stock_move(osv.osv):
         'state': fields.selection([('draft','Draft'),('waiting','Waiting'),('confirmed','Confirmed'),('assigned','Assigned'),('done','Done'),('cancel','cancel')], 'Status', readonly=True, select=True),
         'price_unit': fields.float('Unit Price',
             digits=(16, int(config['price_accuracy']))),
-        'partner_id':fields.related('picking_id','address_id',type='many2one',relation='res.partner.address', string='Partner'),
     }
     
     _constraints = [
@@ -901,17 +882,6 @@ class stock_move(osv.osv):
             'You try to assign a lot which is not from the same product',
             ['prodlot_id'])]
     
-#    def unlink(self, cr, uid, ids):
-#        moves = self.read(cr, uid, ids, ['state'])
-#        unlink_ids = []
-#        for s in moves:
-#            if s['state'] in ['draft','cancel']:
-#                unlink_ids.append(s['id'])
-#            else:
-#                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Stock Move(s) which are in %s State!' % s['state']))
-#        osv.osv.unlink(self, cr, uid, unlink_ids)
-#        return True
-    
     def _default_location_destination(self, cr, uid, context={}):
         if context.get('move_line', []):
             return context['move_line'][0][2]['location_dest_id']

From a00409ffc65480c594c06b45a0a60b20c028d85f Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Tue, 14 Oct 2008 14:54:44 +0530
Subject: [PATCH 16/72] Renamed repair_module to mrp_repair : Created Workflow,
 Added functions for onchange, Added new views and Created Menu Items

bzr revid: ruchakpatel@gmail.com-20081014092444-eks872uko5dovwka
---
 addons/mrp_repair/__init__.py                 |  35 +++
 .../{repair_module => mrp_repair}/__terp__.py |   2 +-
 .../mrp_repair.py}                            |  85 ++++++-
 addons/mrp_repair/mrp_repair_report.xml       |  12 +
 addons/mrp_repair/mrp_repair_view.xml         | 150 +++++++++++
 addons/mrp_repair/mrp_repair_workflow.xml     |  96 +++++++
 .../report}/__init__.py                       |   2 +-
 addons/mrp_repair/report/order.py             |  44 ++++
 addons/mrp_repair/report/order.rml            | 236 ++++++++++++++++++
 addons/repair_module/repair_module_view.xml   |  86 -------
 10 files changed, 652 insertions(+), 96 deletions(-)
 create mode 100644 addons/mrp_repair/__init__.py
 rename addons/{repair_module => mrp_repair}/__terp__.py (95%)
 rename addons/{repair_module/repair_module.py => mrp_repair/mrp_repair.py} (51%)
 create mode 100644 addons/mrp_repair/mrp_repair_report.xml
 create mode 100644 addons/mrp_repair/mrp_repair_view.xml
 create mode 100644 addons/mrp_repair/mrp_repair_workflow.xml
 rename addons/{repair_module => mrp_repair/report}/__init__.py (98%)
 create mode 100644 addons/mrp_repair/report/order.py
 create mode 100644 addons/mrp_repair/report/order.rml
 delete mode 100644 addons/repair_module/repair_module_view.xml

diff --git a/addons/mrp_repair/__init__.py b/addons/mrp_repair/__init__.py
new file mode 100644
index 00000000000..ff312dd85a4
--- /dev/null
+++ b/addons/mrp_repair/__init__.py
@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 contract 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.
+#
+##############################################################################
+
+import mrp_repair
+import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/repair_module/__terp__.py b/addons/mrp_repair/__terp__.py
similarity index 95%
rename from addons/repair_module/__terp__.py
rename to addons/mrp_repair/__terp__.py
index b37fee49ac7..8ea80e42eb4 100644
--- a/addons/repair_module/__terp__.py
+++ b/addons/mrp_repair/__terp__.py
@@ -52,7 +52,7 @@
     "category":"Custom",
     "depends":["sale","account"],
     "demo_xml":[],
-    "update_xml":["repair_module_view.xml"],
+    "update_xml":["mrp_repair_view.xml", "mrp_repair_workflow.xml", "mrp_repair_report.xml"],
     "active": False,
     "installable": True,
 }
diff --git a/addons/repair_module/repair_module.py b/addons/mrp_repair/mrp_repair.py
similarity index 51%
rename from addons/repair_module/repair_module.py
rename to addons/mrp_repair/mrp_repair.py
index 65b82051e8a..fd6607093a6 100644
--- a/addons/repair_module/repair_module.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -31,6 +31,8 @@
 import time
 from osv import fields,osv
 import netsvc
+import mx.DateTime
+from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 
 class mrp_repair(osv.osv):
     _name = 'mrp.repair'
@@ -49,8 +51,8 @@ class mrp_repair(osv.osv):
             ], 'State', readonly=True, help="Gives the state of the Repairs Order"),
         'location_id': fields.many2one('stock.location', 'Current Location', required=True, select=True),
         'location_dest_id': fields.many2one('stock.location', 'Delivery Location'),
-        'move_id': fields.many2one('stock.move', 'Move',required=True,domain="[('product_id','=',product_id)]"),#,('prodlot_id','=',prodlot_id)
-        'limit': fields.date('Guarantee limit',  readonly=True),
+        'move_id': fields.many2one('stock.move', 'Move',required=True,domain="[('product_id','=',product_id),('location_dest_id','=',location_id)]"),#,('prodlot_id','=',prodlot_id)
+        'guarantee_limit': fields.date('Guarantee limit'),
         'operations' : fields.one2many('repair.operation', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
         'partner_invoice_id':fields.many2one('res.partner.address', 'Invoice to', readonly=True, states={'draft':[('readonly',False)]}),
@@ -61,7 +63,7 @@ class mrp_repair(osv.osv):
            ], "Invoice Method", 
             select=True),
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
-        'fees_lines' : fields.one2many('sale.order.line', 'order_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}),
+#        'fees_lines' : fields.one2many('sale.order.line', 'order_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'internal_notes' : fields.text('Internal Notes'),
         'quotation_notes' : fields.text('Quotation Notes'),
     }
@@ -70,6 +72,37 @@ class mrp_repair(osv.osv):
         'state': lambda *a: 'draft',
     }
     
+    def onchange_product_id(self, cr, uid, ids, prod_id=False):
+        if not prod_id:
+            return  {'value':{'prodlot_id': False , 'move_id': False, 'location_id' :  False}}
+        product = self.pool.get('product.product').browse(cr, uid, [prod_id])[0]
+        current_date = time.strftime('%Y-%m-%d')
+        limit = mx.DateTime.strptime(current_date, '%Y-%m-%d') + RelativeDateTime(months=product.warranty, days=-1)
+        result = {
+            'guarantee_limit': limit.strftime('%Y-%m-%d'),
+        }
+        return { 'value' : result }
+    
+    def onchange_partner_id(self, cr, uid, ids, part):
+        if not part:
+            return {'value':{'address_id': False , 'pricelist_id': False }}
+        addr = self.pool.get('res.partner').address_get(cr, uid, [part])
+        pricelist = self.pool.get('res.partner').property_get(cr, uid,
+                        part,property_pref=['property_product_pricelist']).get('property_product_pricelist',False)
+        return {'value':{'address_id': addr['default'],  'pricelist_id': pricelist}}
+
+    
+    def onchange_lot_id(self, cr, uid, ids, lot ):
+        if not lot:
+            return {'value':{'location_id': False , 'move_id' :  False}}
+        lot_info = self.pool.get('stock.production.lot').browse(cr, uid, [lot])[0]
+        move_id = self.pool.get('stock.move').search(cr, uid,[('prodlot_id','=',lot)] )
+        if move_id: 
+            move = self.pool.get('stock.move').browse(cr, uid, move_id )[0]
+            return {'value':{'location_id': move.location_dest_id.id ,  'move_id': move.id }}
+        else:
+            return {'value':{'location_id': False , 'move_id' :  False}}
+
 mrp_repair()
 
 
@@ -78,16 +111,52 @@ class repair_operation(osv.osv):
      _description = 'Repair Operation'
      _columns = {
         'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref', required=True, ondelete='cascade', select=True),
-        'name': fields.selection([('add','Add'),('remove','Remove')],'Type',  required=True),
+        'name': fields.selection([('add','Add'),('remove','Remove')],'Type'),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok','=',True)]),
-        'invoice': fields.boolean('Invoice', readonly=True),
-        'price_unit': fields.float('Price', required=True),
-        'product_qty': fields.float('Quantity', digits=(16,2), required=True),
-        'product_uom': fields.many2one('product.uom', 'UoM', required=True),
+        'invoice': fields.boolean('Invoice'),
+        'price_unit': fields.float('Price'),
+        'product_qty': fields.float('Quantity', digits=(16,2)),
+        'product_uom': fields.many2one('product.uom', 'UoM'),
          'location_id': fields.many2one('stock.location', 'Source Location', select=True),
         'location_dest_id': fields.many2one('stock.location', 'Dest. Location', select=True),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Nb.', select=True),
     }
+     
+     
+     def product_id_change(self, cr, uid, ids, pricelist, product, uom=False, product_qty = 0,partner_id=False ):
+        if not product:
+            return {'value': {'product_qty' : 0.0, 'product_uom': False},'domain': {'product_uom': []}}
 
+        product_obj =  self.pool.get('product.product').browse(cr, uid, product)
+        result = {}
+        if not uom:
+            result['product_uom'] = product_obj.uom_id.id
+            domain = {'product_uom':
+                        [('category_id', '=', product_obj.uom_id.category_id.id)],}
+            
+        if not pricelist:
+            warning={
+                'title':'No Pricelist !',
+                'message':
+                    'You have to select a pricelist in the sale form !\n'
+                    'Please set one before choosing a product.'
+                }
+        else:
+            price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist],
+                    product, product_qty or 1.0, partner_id, {
+                        'uom': uom,
+                        })[pricelist]
+            if price is False:
+                 warning={
+                    'title':'No valid pricelist line found !',
+                    'message':
+                        "Couldn't find a pricelist line matching this product and quantity.\n"
+                        "You have to change either the product, the quantity or the pricelist."
+                    }
+            else:
+                result.update({'price_unit': price})
+                
+        return {'value': result , 'domain' :domain, 'warning':warning}
+    
 repair_operation()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/mrp_repair_report.xml b/addons/mrp_repair/mrp_repair_report.xml
new file mode 100644
index 00000000000..e90f0d3ca40
--- /dev/null
+++ b/addons/mrp_repair/mrp_repair_report.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	<report
+		id="report_mrp_repair"
+		string="Repair Quotation"
+		model="mrp.repair"
+		name="repair.order"
+		rml="mrp_repair/report/order.rml"
+		auto="False"/>
+    </data>
+</openerp>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
new file mode 100644
index 00000000000..73f9d13b7f6
--- /dev/null
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+    <record id="view_repair_order_form" model="ir.ui.view">
+            <field name="name">mrp.repair.form</field>
+            <field name="model">mrp.repair</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Repairs order">
+                    <group col="4" colspan="4">
+                        <field name="product_id" select="1"  on_change="onchange_product_id(product_id)"/>
+                        <field name="prodlot_id" select="2" on_change="onchange_lot_id(prodlot_id)"/>
+                        <field name="partner_id" select="2" on_change="onchange_partner_id(partner_id)" />
+                        <field name="address_id"/>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Products">
+                            <field name="location_id"/>
+                            <field name="move_id"/>
+                            <field name="location_dest_id"/>
+                            <field name="guarantee_limit"/>
+                            <newline/>
+                            <separator colspan="4" string="Operations"/>
+                            <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
+                                <form string="Operations">
+                                     <field name="name"/>
+                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_qty, parent.partner_id)"/>
+                                    <field name="product_qty" string="Qty"/>
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="price_unit"/>
+                                    <field name="prodlot_id"/>
+                                    <field name="location_id"/>
+                                    <field name="location_dest_id"/>
+                                    <field name="invoice"/>
+                                </form>
+                                <tree string="Operations lines">
+                                    <field name="name"/>
+                                    <field name="product_id"/>
+                                    <field name="product_qty" string="Qty"/>
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="price_unit"/>
+                                    <field name="prodlot_id"/>
+                                    <field name="location_id"/>
+                                    <field name="location_dest_id"/>
+                                    <field name="invoice"/>
+                                </tree>
+                            </field>
+                            <newline/>
+                            <group col="13" colspan="4">
+                                <field name="state" select="2"/>
+                                <button name="repair_confirm" states="draft" string="Confirm Repair"/>
+                                <button name="repair_done" states="confirmed" string="Repair Done"/>
+                                <button name="cancel" states="draft,confirmed,2binvoiced" string="Cancel Repair"/>
+                                <button name="make_invoice" states="2binvoiced" string="Make Invoice"/>
+                            </group>
+                        </page>
+                        <page string="Invoicing">
+                            <field name="pricelist_id"/>
+                            <field name="partner_invoice_id"/>
+                            <field name="invoice_method"/>
+                            <field name="invoice_id"/>
+                            <separator colspan="4" string="Fees"/>
+                          <!--  <field colspan="4" name="fees_lines" nolabel="1"/>-->
+                        </page>
+                        <page string="Quality">
+                            <separator colspan="4" string="Internal Notes"/>
+                            <field colspan="4" name="internal_notes" nolabel="1"/>
+                            <separator colspan="4" string="Quotation Notes"/>
+                            <field colspan="4" name="quotation_notes" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
+        
+        <record id="view_repair_order_tree" model="ir.ui.view">
+            <field name="name">mrp.repair.tree</field>
+            <field name="model">mrp.repair</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Repairs order">
+                        <field name="product_id" select="1" />
+                        <field name="prodlot_id" select="2"/>
+                        <field name="partner_id" select="2"/>
+                        <field name="address_id"/>
+                            <field name="location_id"/>
+                            <field name="move_id"/>
+                            <field name="location_dest_id"/>
+                            <field name="guarantee_limit"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="action_repair_order_form" model="ir.actions.act_window">
+            <field name="name">New Repair</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.repair</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+        </record>
+        
+         <record id="action_repair_order_tree" model="ir.actions.act_window">
+            <field name="name">Repair Orders</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.repair</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        
+         <record id="action_repair_quotation_tree" model="ir.actions.act_window">
+            <field name="name">Repairs in quotation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.repair</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','draft')]</field>
+        </record>
+        
+        <record id="action_repair_progress_tree" model="ir.actions.act_window">
+            <field name="name">Repairs in progress</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.repair</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','confirmed')]</field>
+        </record>
+        
+        <record id="action_repair_2binvoiced_tree" model="ir.actions.act_window">
+            <field name="name">Repairs to be invoiced</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">mrp.repair</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('state','=','2binvoiced')]</field>
+        </record>
+        
+        <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_root" name="Repairs"/>
+        
+        <menuitem action="action_repair_quotation_tree" id="menu_repair_quotation" parent="menu_repair_order"/>
+        
+        <menuitem action="action_repair_progress_tree" id="menu_repair_progress" parent="menu_repair_order"/>
+    	
+    	<menuitem action="action_repair_2binvoiced_tree" id="menu_repair_2binvoiced" parent="menu_repair_order"/>
+    	
+    	<menuitem action="action_repair_order_form" id="menu_repair_form" parent="menu_repair_order" sequence = "50"/>
+    	
+    	
+    </data>
+</openerp>
diff --git a/addons/mrp_repair/mrp_repair_workflow.xml b/addons/mrp_repair/mrp_repair_workflow.xml
new file mode 100644
index 00000000000..51c89581e94
--- /dev/null
+++ b/addons/mrp_repair/mrp_repair_workflow.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="wkf_repair" model="workflow">
+            <field name="name">mrp.repair.basic</field>
+            <field name="osv">mrp.repair</field>
+            <field name="on_create">True</field>
+        </record>
+        
+        <!-- Activity -->
+        <record id="act_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="flow_start">True</field>
+            <field name="name">draft</field>
+        </record>
+        <record id="act_draft" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="flow_start">True</field>
+            <field name="name">draft</field>
+            <field name="split_mode">OR</field>
+        </record>
+        <record id="act_confirmed" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">confirmed</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'confirmed'})</field>
+        </record>
+        
+        <record id="act_2binvoiced" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">2binvoiced</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'2binvoiced'})</field>
+        </record>
+        
+        <record id="act_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">done</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'done'})</field>
+        </record>
+        
+        <record id="act_done" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">done</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'done'})</field>
+        </record>
+        
+        <record id="act_cancel" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">cancel</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'cancel'})</field>
+        </record>
+        
+        <!-- Transistion -->
+        
+        <record id="trans_draft_confirmed" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_confirmed"/>
+            <field name="signal">repair_confirm</field>
+        </record>
+        
+        <record id="trans_draft_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel</field>
+        </record>
+        
+        <record id="trans_confirmed_done" model="workflow.transition">
+            <field name="act_from" ref="act_confirmed"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="signal">repair_done</field>
+        </record>
+        
+        <record id="trans_confirmed_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_confirmed"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel</field>
+        </record>
+        
+         <record id="trans_2binvoiced_done" model="workflow.transition">
+            <field name="act_from" ref="act_2binvoiced"/>
+            <field name="act_to" ref="act_done"/>
+            <field name="signal">make_invoice</field>
+        </record>
+        
+        <record id="trans_2binvoiced_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_2binvoiced"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/repair_module/__init__.py b/addons/mrp_repair/report/__init__.py
similarity index 98%
rename from addons/repair_module/__init__.py
rename to addons/mrp_repair/report/__init__.py
index 4fdb4e50e62..b78b753a323 100644
--- a/addons/repair_module/__init__.py
+++ b/addons/mrp_repair/report/__init__.py
@@ -28,7 +28,7 @@
 #
 ##############################################################################
 
-import repair_module
+import order
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/mrp_repair/report/order.py b/addons/mrp_repair/report/order.py
new file mode 100644
index 00000000000..664b86c3825
--- /dev/null
+++ b/addons/mrp_repair/report/order.py
@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 contract 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.
+#
+##############################################################################
+
+import time
+from report import report_sxw
+from osv import osv
+
+class order(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(order, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'time': time,
+        })
+report_sxw.report_sxw('report.repair.order','mrp.repair','addons/mrp_repair/report/order.rml',parser=order)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
new file mode 100644
index 00000000000..bf833e99c43
--- /dev/null
+++ b/addons/mrp_repair/report/order.rml
@@ -0,0 +1,236 @@
+<?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="34.0" y1="42.0" width="527" height="758"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Times-Roman" fontSize="9.0" leading="11"/>
+    <paraStyle name="P2" fontName="Times-Roman"/>
+    <paraStyle name="P3" fontName="Times-Roman" alignment="LEFT"/>
+    <paraStyle name="P4" fontName="Times-Roman" alignment="LEFT"/>
+    <paraStyle name="P5" fontName="Times-Bold" fontSize="9.0" leading="11"/>
+    <paraStyle name="P6" fontName="Times-Bold" fontSize="9.0" leading="11"/>
+    <paraStyle name="P7" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="P8" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P9" fontName="Times-BoldItalic" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P10" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="P11" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="P12" fontName="Times-Bold" fontSize="9.0" leading="11"/>
+    <paraStyle name="P13" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="P14" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="P15" fontName="Times-Roman" fontSize="4.0" leading="5"/>
+    <paraStyle name="P16" fontName="Times-Roman" fontSize="11.0" leading="14"/>
+    <paraStyle name="P17" fontName="Times-Roman" fontSize="16.0" leading="20"/>
+    <paraStyle name="P18" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="P19" fontName="Times-Roman" fontSize="7.0" leading="9"/>
+    <paraStyle name="P20" fontName="Times-BoldItalic" fontSize="11.0" leading="14"/>
+    <paraStyle name="P21" fontName="Times-BoldItalic" fontSize="11.0" leading="14" alignment="CENTER"/>
+    <paraStyle name="P22" fontName="Times-Roman" fontSize="11.0" leading="14"/>
+    <paraStyle name="P23" fontName="Times-Roman" fontSize="7.0" leading="9"/>
+    <paraStyle name="P24" fontName="Times-Bold" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="P1">[[ repeatIn(objects,'o') ]] <font face="Times-Roman">[[ setLang(o.partner_id.lang) ]]</font></para>
+    <blockTable colWidths="257.0,50.0,220.0" style="Tableau1">
+      <tr>
+        <td>
+          <para style="P5">Shipping address :</para>
+          <para style="P13">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="P13">[[ o.address_id.title or '' ]] [[ o.address_id.name ]]</para>
+          <para style="P13">[[ o.address_id.street ]]</para>
+          <para style="P13">[[ o.address_id.street2 or '' ]]</para>
+          <para style="P14"><font face="Times-Roman">[[ o.address_id.zip or '' ]]</font> [[ o.address_id.city or '' ]]</para>
+          <para style="P14">[[ o.address_id.state_id and o.address_id.state_id.name or '' ]]</para>
+          <para style="P14">[[ o.address_id.country_id and o.address_id.country_id.name or '' ]]</para>
+          <para style="P15">
+            <font color="white"> </font>
+          </para>
+          <para style="P6">Invoice address :</para>
+          <para style="P14">[[ o.address_id.street ]][[ o.address_id.street2 and (', %s' % o.address_id.street2 or '') ]]</para>
+          <para style="P14">[[ o.address_id.zip or '' ]] [[ o.address_id.city or '' ]] [[ o.address_id.country_id and (', %s' % (o.address_id.country_id and o.address_id.country_id.name or '')) ]]</para>
+        </td>
+        <td>
+          <para style="P16">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P13">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <para style="P17">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Quotation N° : [[ o.name ]]</para>
+    <para style="P17">[[ o.state=='draft' and removeParentNode('para') ]] Order N° : [[ o.name ]]</para>
+    <para style="P17">
+      <font color="white"> </font>
+    </para>
+    <para style="P22">Your order reference : [[ o.client_order_ref or '' ]]</para>
+    <para style="P22">Date ordered : [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]</para>
+    <para style="P22">Our salesman : [[ o.user_id.name ]]</para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="279.0,79.0,87.0,82.0" repeatRows="1" style="Tableau2">
+      <tr>
+        <td>
+          <para style="P20">Product</para>
+        </td>
+        <td>
+          <para style="P21">Quantity</para>
+        </td>
+        <td>
+          <para style="P21">Unit Price</para>
+        </td>
+        <td>
+          <para style="P21">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="P18">[[ repeatIn(o.operations,'line') ]]</para>
+      <blockTable colWidths="279.0,79.0,87.0,82.0" style="Tableau3">
+        <tr>
+          <td>
+            <para style="Table Contents">[[ line.product_id.name ]] </para>
+          </td>
+          <td>
+            <para style="Table Contents">[[ line.product_qty ]] [[ line.product_uom.name ]]</para>
+          </td>
+          <td>
+            <para style="Table Contents">[[ line.price_unit ]]</para>
+          </td>
+          <td>
+            <para style="Table Contents">[[ line.price_unit ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="348.0,69.0,110.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="P23">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P24">Net Total :</para>
+        </td>
+        <td>
+          <para style="P24">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P23">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P24">Taxes :</para>
+        </td>
+        <td>
+          <para style="P24">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P19">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P11">TOTAL :</para>
+        </td>
+        <td>
+          <para style="P11">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P12">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="527.0" style="Tableau4">
+      <tr>
+        <td>
+          <para style="P3">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P3">[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term[1]) or '') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/repair_module/repair_module_view.xml b/addons/repair_module/repair_module_view.xml
deleted file mode 100644
index 2203fbd88aa..00000000000
--- a/addons/repair_module/repair_module_view.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-    <record id="view_repair_order_form" model="ir.ui.view">
-            <field name="name">mrp.repair.form</field>
-            <field name="model">mrp.repair</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Sales order">
-                    <group col="4" colspan="4">
-                        <field name="product_id" select="1" />
-                        <field name="prodlot_id" select="2"/>
-                        <field name="partner_id" select="2"/>
-                        <field name="address_id"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Products">
-                            <field name="location_id"/>
-                            <field name="move_id"/>
-                            <field name="location_dest_id"/>
-                            <field name="limit"/>
-                            <newline/>
-                            <separator colspan="4" string="Operations"/>
-                            <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
-                                <form string="Operations">
-                                     <field name="name"/>
-                                    <field name="product_id"/>
-                                    <field name="product_qty" string="Qty"/>
-                                    <field name="product_uom" string="UoM"/>
-                                    <field name="price_unit"/>
-                                    <field name="prodlot_id"/>
-                                    <field name="location_id"/>
-                                    <field name="invoice"/>
-                                </form>
-                                <tree string="Operations lines">
-                                    <field name="name"/>
-                                    <field name="product_id"/>
-                                    <field name="product_qty" string="Qty"/>
-                                    <field name="product_uom" string="UoM"/>
-                                    <field name="price_unit"/>
-                                    <field name="prodlot_id"/>
-                                    <field name="location_id"/>
-                                    <field name="invoice"/>
-                                </tree>
-                            </field>
-                            <newline/>
-                            <group col="13" colspan="4">
-                                <field name="state" select="2"/>
-                                <!--<button name="repair_confirm" states="draft" string="Confirm Repair"/>
-                                <button name="cancel" states="confirmed" string="Repair Done"/>
-                                <button name="cancel" states="draft,confirmed,2binvoiced" string="Cancel Repair"/>
-                                <button name="cancel" states="2binvoiced" string="Make Invoice"/> -->
-                            </group>
-                        </page>
-                        <page string="Invoicing">
-                            <field name="pricelist_id"/>
-                            <field name="partner_invoice_id"/>
-                            <field name="invoice_method"/>
-                            <field name="invoice_id"/>
-                            <separator colspan="4" string="Fees"/>
-                            <field colspan="4" name="fees_lines" nolabel="1"/>
-                        </page>
-                        <page string="Quality">
-                            <separator colspan="4" string="Internal Notes"/>
-                            <field colspan="4" name="internal_notes" nolabel="1"/>
-                            <separator colspan="4" string="Quotation Notes"/>
-                            <field colspan="4" name="quotation_notes" nolabel="1"/>
-                        </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-        
-        <record id="action_repair_order_form" model="ir.actions.act_window">
-            <field name="name">Repair Orders</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">mrp.repair</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-        </record>
-        
-        <menuitem action="action_repair_order_form" id="menu_repair_order" parent="mrp.menu_mrp_root"/>
-    
-    </data>
-</openerp>

From ee5fc4053bc45cef3fa65821f8765c933a358f02 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Wed, 15 Oct 2008 16:11:08 +0530
Subject: [PATCH 17/72] Changes in functions , workflow ; Created wizard to
 cancel Repair

bzr revid: ruchakpatel@gmail.com-20081015104108-nzgakcmoe60j3xbl
---
 addons/mrp_repair/__init__.py         |  1 +
 addons/mrp_repair/mrp_repair.py       | 98 ++++++++++++++++++++-------
 addons/mrp_repair/mrp_repair_view.xml | 24 +++++--
 3 files changed, 90 insertions(+), 33 deletions(-)

diff --git a/addons/mrp_repair/__init__.py b/addons/mrp_repair/__init__.py
index ff312dd85a4..7f796d28b62 100644
--- a/addons/mrp_repair/__init__.py
+++ b/addons/mrp_repair/__init__.py
@@ -29,6 +29,7 @@
 ##############################################################################
 
 import mrp_repair
+import wizard
 import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index fd6607093a6..c3c310a35e8 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -51,11 +51,11 @@ class mrp_repair(osv.osv):
             ], 'State', readonly=True, help="Gives the state of the Repairs Order"),
         'location_id': fields.many2one('stock.location', 'Current Location', required=True, select=True),
         'location_dest_id': fields.many2one('stock.location', 'Delivery Location'),
-        'move_id': fields.many2one('stock.move', 'Move',required=True,domain="[('product_id','=',product_id),('location_dest_id','=',location_id)]"),#,('prodlot_id','=',prodlot_id)
+        'move_id': fields.many2one('stock.move', 'Move',required=True,domain="[('product_id','=',product_id)]"),#,('location_dest_id','=',location_id),('prodlot_id','=',prodlot_id)
         'guarantee_limit': fields.date('Guarantee limit'),
         'operations' : fields.one2many('repair.operation', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
-        'partner_invoice_id':fields.many2one('res.partner.address', 'Invoice to', readonly=True, states={'draft':[('readonly',False)]}),
+        'partner_invoice_id':fields.many2one('res.partner.address', 'Invoice to', readonly=True, states={'draft':[('readonly',False)]}, domain="[('partner_id','=',partner_id)]"),
         'invoice_method':fields.selection([
             ("none","No Invoice"),
             ("b4repair","Before Repair"),
@@ -72,24 +72,27 @@ class mrp_repair(osv.osv):
         'state': lambda *a: 'draft',
     }
     
-    def onchange_product_id(self, cr, uid, ids, prod_id=False):
+    def onchange_product_id(self, cr, uid, ids, prod_id=False, move_id=False ):
         if not prod_id:
             return  {'value':{'prodlot_id': False , 'move_id': False, 'location_id' :  False}}
-        product = self.pool.get('product.product').browse(cr, uid, [prod_id])[0]
-        current_date = time.strftime('%Y-%m-%d')
-        limit = mx.DateTime.strptime(current_date, '%Y-%m-%d') + RelativeDateTime(months=product.warranty, days=-1)
-        result = {
-            'guarantee_limit': limit.strftime('%Y-%m-%d'),
-        }
-        return { 'value' : result }
+        if move_id:
+            move =  self.pool.get('stock.move').browse(cr, uid, move_id)
+            product = self.pool.get('product.product').browse(cr, uid, [prod_id])[0]
+            date = move.date_planned#time.strftime('%Y-%m-%d')
+            limit = mx.DateTime.strptime(date, '%Y-%m-%d %H:%M:%S') + RelativeDateTime(months=product.warranty, days=-1)
+            result = {
+                'guarantee_limit': limit.strftime('%Y-%m-%d'),
+            }
+            return { 'value' : result }
+        return {}
     
     def onchange_partner_id(self, cr, uid, ids, part):
         if not part:
-            return {'value':{'address_id': False , 'pricelist_id': False }}
-        addr = self.pool.get('res.partner').address_get(cr, uid, [part])
+            return {'value':{'address_id': False , 'pricelist_id': False ,'partner_invoice_id' : False }}
+        addr = self.pool.get('res.partner').address_get(cr, uid, [part],  ['delivery','invoice','default'])
         pricelist = self.pool.get('res.partner').property_get(cr, uid,
                         part,property_pref=['property_product_pricelist']).get('property_product_pricelist',False)
-        return {'value':{'address_id': addr['default'],  'pricelist_id': pricelist}}
+        return {'value':{'address_id': addr['delivery'], 'partner_invoice_id' :  addr['invoice'] ,  'pricelist_id': pricelist}}
 
     
     def onchange_lot_id(self, cr, uid, ids, lot ):
@@ -102,43 +105,71 @@ class mrp_repair(osv.osv):
             return {'value':{'location_id': move.location_dest_id.id ,  'move_id': move.id }}
         else:
             return {'value':{'location_id': False , 'move_id' :  False}}
+        
+    def action_cancel_draft(self, cr, uid, ids, *args):
+        if not len(ids):
+            return False
+        self.write(cr, uid, ids, {'state':'draft'})
+        wf_service = netsvc.LocalService("workflow")
+        for id in ids:
+            wf_service.trg_create(uid, 'mrp.repair', id, cr)
+        return True
 
 mrp_repair()
 
 
 class repair_operation(osv.osv):
+     _inherit = 'stock.move'
      _name = 'repair.operation'
-     _description = 'Repair Operation'
+     _description = 'Repair Operations'
+     
+     def _get_price(self, cr, uid, ids, name, arg, context={}):
+        res = {}
+        for val in self.browse(cr, uid, ids):
+            current_date = time.strftime('%Y-%m-%d')
+            if current_date < val.repair_id.guarantee_limit:
+                res[val.id] = 0.0
+            if current_date >= val.repair_id.guarantee_limit:
+                price = 0.0
+                pricelist = val.repair_id.pricelist_id.id
+                if pricelist:
+                    price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist], val.product_id.id , 1.0, val.repair_id.partner_id.id)[pricelist]
+                if price is False:
+                     warning={
+                        'title':'No valid pricelist line found !',
+                        'message':
+                            "Couldn't find a pricelist line matching this product and quantity.\n"
+                            "You have to change either the product, the quantity or the pricelist."
+                        }
+                else:
+                    res[val.id] = price
+        return res
+    
+    
      _columns = {
         'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref', required=True, ondelete='cascade', select=True),
-        'name': fields.selection([('add','Add'),('remove','Remove')],'Type'),
-        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok','=',True)]),
+        'type': fields.selection([('add','Add'),('remove','Remove')],'Type'),
         'invoice': fields.boolean('Invoice'),
-        'price_unit': fields.float('Price'),
-        'product_qty': fields.float('Quantity', digits=(16,2)),
-        'product_uom': fields.many2one('product.uom', 'UoM'),
-         'location_id': fields.many2one('stock.location', 'Source Location', select=True),
-        'location_dest_id': fields.many2one('stock.location', 'Dest. Location', select=True),
-        'prodlot_id': fields.many2one('stock.production.lot', 'Lot Nb.', select=True),
+        'price_unit': fields.function(_get_price,  method=True, store= True, type='float', string='Price'),
     }
      
      
      def product_id_change(self, cr, uid, ids, pricelist, product, uom=False, product_qty = 0,partner_id=False ):
         if not product:
             return {'value': {'product_qty' : 0.0, 'product_uom': False},'domain': {'product_uom': []}}
-
         product_obj =  self.pool.get('product.product').browse(cr, uid, product)
         result = {}
+        warning = {}
         if not uom:
             result['product_uom'] = product_obj.uom_id.id
             domain = {'product_uom':
                         [('category_id', '=', product_obj.uom_id.category_id.id)],}
-            
+        
         if not pricelist:
             warning={
                 'title':'No Pricelist !',
                 'message':
-                    'You have to select a pricelist in the sale form !\n'
+                    'You have to select a pricelist in the Repair form !\n'
                     'Please set one before choosing a product.'
                 }
         else:
@@ -157,6 +188,21 @@ class repair_operation(osv.osv):
                 result.update({'price_unit': price})
                 
         return {'value': result , 'domain' :domain, 'warning':warning}
-    
+     
+     
+     def onchange_operation_type(self, cr, uid, ids, type ):
+        if not type:
+            return {'value':{'location_id': False , 'location_dest_id' :  False}}
+        stock_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
+        produc_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Default Production')])[0]
+        if type == 'add':
+            return {'value':{'location_id': stock_id , 'location_dest_id' : produc_id}}
+        if type == 'remove':
+            return {'value':{'location_id': produc_id , 'location_dest_id' : stock_id}}
+        
+     _defaults = {
+                 'name' : lambda *a: 'Repair Operation',
+                 }
 repair_operation()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 73f9d13b7f6..b19796711f3 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -2,6 +2,15 @@
 <openerp>
     <data>
     
+    <wizard 
+            id="action_cancel_repair" 
+            model="mrp.repair" 
+            name="mrp.repair.cancel"
+            string="Cancel Repair"
+            menu = "False"
+            multi = "True"
+            />
+            
     <record id="view_repair_order_form" model="ir.ui.view">
             <field name="name">mrp.repair.form</field>
             <field name="model">mrp.repair</field>
@@ -9,7 +18,7 @@
             <field name="arch" type="xml">
                 <form string="Repairs order">
                     <group col="4" colspan="4">
-                        <field name="product_id" select="1"  on_change="onchange_product_id(product_id)"/>
+                        <field name="product_id" select="1"  on_change="onchange_product_id(product_id, move_id)"/>
                         <field name="prodlot_id" select="2" on_change="onchange_lot_id(prodlot_id)"/>
                         <field name="partner_id" select="2" on_change="onchange_partner_id(partner_id)" />
                         <field name="address_id"/>
@@ -17,14 +26,14 @@
                     <notebook colspan="4">
                         <page string="Products">
                             <field name="location_id"/>
-                            <field name="move_id"/>
+                            <field name="move_id"   on_change="onchange_product_id(product_id, move_id)"/>
                             <field name="location_dest_id"/>
-                            <field name="guarantee_limit"/>
+                            <field name="guarantee_limit" />
                             <newline/>
                             <separator colspan="4" string="Operations"/>
                             <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
                                 <form string="Operations">
-                                     <field name="name"/>
+                                     <field name="type"  on_change="onchange_operation_type(type)"/>
                                     <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_qty, parent.partner_id)"/>
                                     <field name="product_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
@@ -34,8 +43,8 @@
                                     <field name="location_dest_id"/>
                                     <field name="invoice"/>
                                 </form>
-                                <tree string="Operations lines">
-                                    <field name="name"/>
+                                <tree string="Operations lines"> <!-- editable="bottom"> -->
+                                    <field name="type" on_change="onchange_operation_type(type)"/>
                                     <field name="product_id"/>
                                     <field name="product_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
@@ -51,8 +60,9 @@
                                 <field name="state" select="2"/>
                                 <button name="repair_confirm" states="draft" string="Confirm Repair"/>
                                 <button name="repair_done" states="confirmed" string="Repair Done"/>
-                                <button name="cancel" states="draft,confirmed,2binvoiced" string="Cancel Repair"/>
+                                <button name="%(action_cancel_repair)d" states="draft,confirmed,2binvoiced" string="Cancel Repair" type="action"/>
                                 <button name="make_invoice" states="2binvoiced" string="Make Invoice"/>
+                                <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                             </group>
                         </page>
                         <page string="Invoicing">

From baf452482329568d6388e7a3f073a3082eda40a3 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Wed, 15 Oct 2008 19:00:36 +0530
Subject: [PATCH 18/72] Changes in Workflow ; Added new states and changes in
 Function

bzr revid: ruchakpatel@gmail.com-20081015133036-umnayifs275p6byl
---
 addons/mrp_repair/mrp_repair.py           | 109 +++++++++++++++++++++-
 addons/mrp_repair/mrp_repair_view.xml     |  21 ++++-
 addons/mrp_repair/mrp_repair_workflow.xml |  29 +++++-
 3 files changed, 146 insertions(+), 13 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index c3c310a35e8..5d9877569dc 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -36,7 +36,7 @@ from mx.DateTime import RelativeDateTime, now, DateTime, localtime
 
 class mrp_repair(osv.osv):
     _name = 'mrp.repair'
-    
+    _description = 'Repairs Order'
     _columns = {
         'product_id': fields.many2one('product.product', string='Product to Repair', required=True ,domain=[('sale_ok','=',True)]),
         'partner_id' : fields.many2one('res.partner', 'Partner', select=True),
@@ -53,7 +53,7 @@ class mrp_repair(osv.osv):
         'location_dest_id': fields.many2one('stock.location', 'Delivery Location'),
         'move_id': fields.many2one('stock.move', 'Move',required=True,domain="[('product_id','=',product_id)]"),#,('location_dest_id','=',location_id),('prodlot_id','=',prodlot_id)
         'guarantee_limit': fields.date('Guarantee limit'),
-        'operations' : fields.one2many('repair.operation', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
+        'operations' : fields.one2many('stock.move', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
         'partner_invoice_id':fields.many2one('res.partner.address', 'Invoice to', readonly=True, states={'draft':[('readonly',False)]}, domain="[('partner_id','=',partner_id)]"),
         'invoice_method':fields.selection([
@@ -63,13 +63,14 @@ class mrp_repair(osv.osv):
            ], "Invoice Method", 
             select=True),
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
-#        'fees_lines' : fields.one2many('sale.order.line', 'order_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}),
+        'fees_lines' : fields.one2many('mrp.repair.fee', 'repair_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'internal_notes' : fields.text('Internal Notes'),
         'quotation_notes' : fields.text('Quotation Notes'),
     }
     
     _defaults = {
         'state': lambda *a: 'draft',
+        'pricelist_id': lambda self, cr, uid,context : self.pool.get('product.pricelist').search(cr,uid,[('type','=','sale')])[0]
     }
     
     def onchange_product_id(self, cr, uid, ids, prod_id=False, move_id=False ):
@@ -88,7 +89,7 @@ class mrp_repair(osv.osv):
     
     def onchange_partner_id(self, cr, uid, ids, part):
         if not part:
-            return {'value':{'address_id': False , 'pricelist_id': False ,'partner_invoice_id' : False }}
+            return {'value':{'address_id': False ,'partner_invoice_id' : False }}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part],  ['delivery','invoice','default'])
         pricelist = self.pool.get('res.partner').property_get(cr, uid,
                         part,property_pref=['property_product_pricelist']).get('property_product_pricelist',False)
@@ -102,6 +103,7 @@ class mrp_repair(osv.osv):
         move_id = self.pool.get('stock.move').search(cr, uid,[('prodlot_id','=',lot)] )
         if move_id: 
             move = self.pool.get('stock.move').browse(cr, uid, move_id )[0]
+#            self.onchange_product_id(cr, uid, ids, prod_id, move_id)
             return {'value':{'location_id': move.location_dest_id.id ,  'move_id': move.id }}
         else:
             return {'value':{'location_id': False , 'move_id' :  False}}
@@ -115,12 +117,83 @@ class mrp_repair(osv.osv):
             wf_service.trg_create(uid, 'mrp.repair', id, cr)
         return True
 
+    def action_wait(self, cr, uid, ids, *args):
+        for o in self.browse(cr, uid, ids):
+            if (o.invoice_method == 'none'):
+                self.write(cr, uid, [o.id], {'state': 'confirmed'})
+            elif (o.invoice_method == 'b4repair'):
+                self.write(cr, uid, [o.id], {'state': '2binvoiced'})
+        return True
+
+    def action_confirm(self, cr, uid, ids, *args):
+        picking_id=False
+        company = self.pool.get('res.users').browse(cr, uid, uid).company_id
+        for repair in self.browse(cr, uid, ids, context={}):
+            if repair.location_dest_id:
+                output_id = repair.location_dest_id
+                for line in repair.operations:
+                    proc_id=False
+                    date_planned = time.strftime('%Y-%m-%d %H:%M:%S')
+                    if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'):
+                        location_id = line.location_id
+                        if not picking_id:
+                            picking_id = self.pool.get('stock.picking').create(cr, uid, {
+                                'origin': repair.product_id.code, # + (repair.partner_id and  repair.partner_id.name) or ' ',
+                                'type': 'out',
+                                'state': 'auto',
+                                'move_type': 'one',
+                                'address_id': repair.address_id.id,
+                                'note': repair.internal_notes,
+                                'invoice_state': 'none',
+                            })
+                            operation = self.pool.get('stock.move')
+                            operation.write(cr, uid, line.id,{'picking_id' : picking_id} )
+                            proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                                'name': repair.name or 'Repair',
+                                'origin': repair.name,
+                                'date_planned': date_planned,
+                                'product_id': line.product_id.id,
+                                'product_qty': line.product_qty,
+                                'product_uom': line.product_uom.id,
+                                'location_id': repair.location_id.id,
+                                'procure_method': 'make_to_stock' ,# NEEDS TO BE CHANGED
+                                'move_id': line.id,
+                            })
+                            wf_service = netsvc.LocalService("workflow")
+                            wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+                          
+                    elif line.product_id and line.product_id.product_tmpl_id.type=='service':
+                        proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                            'name': line.name or 'Repair',
+                            'origin': repair.name,
+                            'date_planned': date_planned,
+                            'product_id': line.product_id.id,
+                            'product_qty': line.product_qty,
+                            'product_uom': line.product_uom.id,
+                            'location_id': repair.location_id.id,
+                            'procure_method': 'make_to_stock' ,# NEEDS TO BE CHANGED
+                        })
+                        wf_service = netsvc.LocalService("workflow")
+                        wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+
+                    else:
+                        #
+                        # No procurement because no product in the sale.order.line.
+                        #
+                        pass
+    
+                val = {}
+                if picking_id:
+                    wf_service = netsvc.LocalService("workflow")
+                    wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+                self.write(cr, uid, [repair.id], val)
+        return True
 mrp_repair()
 
 
 class repair_operation(osv.osv):
      _inherit = 'stock.move'
-     _name = 'repair.operation'
+#     _name = 'repair.operation'
      _description = 'Repair Operations'
      
      def _get_price(self, cr, uid, ids, name, arg, context={}):
@@ -205,4 +278,30 @@ class repair_operation(osv.osv):
                  }
 repair_operation()
 
+class mrp_repair_fee(osv.osv):
+    _name = 'mrp.repair.fee'
+    _description = 'Repair Fees line'
+    _columns = {
+        'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref', required=True, ondelete='cascade', select=True),
+        'name': fields.char('Description', size=8, required=True, select=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'product_qty': fields.float('Quantity', digits=(16,2), required=True),
+        'price_unit': fields.float('Unit Price', required=True),
+        'product_uom': fields.many2one('product.uom', 'Product UoM', required=True),
+    }
+    
+    def product_id_change(self, cr, uid, ids, product, uom=False):
+        if not product:
+            return {'value': {'product_qty' : 0.0, 'product_uom': False},'domain': {'product_uom': []}}
+        
+        product_obj =  self.pool.get('product.product').browse(cr, uid, product)
+        result = {}
+        if not uom:
+            result['product_uom'] = product_obj.uom_id.id
+        domain = {'product_uom':
+                    [('category_id', '=', product_obj.uom_id.category_id.id)],}
+        return {'value': result ,'domain': domain}
+    
+mrp_repair_fee()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index b19796711f3..f699bfaaa54 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -33,7 +33,7 @@
                             <separator colspan="4" string="Operations"/>
                             <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
                                 <form string="Operations">
-                                     <field name="type"  on_change="onchange_operation_type(type)"/>
+                                    <field name="type"  on_change="onchange_operation_type(type)"/>
                                     <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_qty, parent.partner_id)"/>
                                     <field name="product_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
@@ -60,18 +60,31 @@
                                 <field name="state" select="2"/>
                                 <button name="repair_confirm" states="draft" string="Confirm Repair"/>
                                 <button name="repair_done" states="confirmed" string="Repair Done"/>
-                                <button name="%(action_cancel_repair)d" states="draft,confirmed,2binvoiced" string="Cancel Repair" type="action"/>
                                 <button name="make_invoice" states="2binvoiced" string="Make Invoice"/>
+                                <button name="%(action_cancel_repair)d" states="draft,confirmed,2binvoiced" string="Cancel Repair" type="action"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                             </group>
                         </page>
                         <page string="Invoicing">
-                            <field name="pricelist_id"/>
+                            <field name="pricelist_id" context="product_id=product_id"/>
                             <field name="partner_invoice_id"/>
                             <field name="invoice_method"/>
                             <field name="invoice_id"/>
                             <separator colspan="4" string="Fees"/>
-                          <!--  <field colspan="4" name="fees_lines" nolabel="1"/>-->
+                            <field colspan="4" mode="tree,form" name="fees_lines" nolabel="1" widget="one2many_list">
+                            <form string="Fees Line">
+                                    <field name="product_id" on_change="product_id_change(product_id,product_uom)" />
+                                    <field name="product_qty" string="Qty"/>
+                                    <field name="product_uom" string="UoM" /> <!--on_change="product_id_change(product_id,product_uom)" /> -->
+                                    <field name="price_unit"/>
+                                </form>
+                                <tree string="Fees lines"> <!-- editable="bottom"> -->
+                                    <field name="product_id"/>
+                                    <field name="product_qty" string="Qty"/>
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="price_unit"/>
+                                </tree>
+                                </field>
                         </page>
                         <page string="Quality">
                             <separator colspan="4" string="Internal Notes"/>
diff --git a/addons/mrp_repair/mrp_repair_workflow.xml b/addons/mrp_repair/mrp_repair_workflow.xml
index 51c89581e94..5ae588c2146 100644
--- a/addons/mrp_repair/mrp_repair_workflow.xml
+++ b/addons/mrp_repair/mrp_repair_workflow.xml
@@ -13,6 +13,13 @@
             <field name="flow_start">True</field>
             <field name="name">draft</field>
         </record>
+        <record id="act_router" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">router</field>
+            <field name="kind">function</field>
+            <field name="action">action_wait()</field>
+            <field name="split_mode">OR</field>
+        </record>
         <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf_repair"/>
             <field name="flow_start">True</field>
@@ -23,7 +30,8 @@
             <field name="wkf_id" ref="wkf_repair"/>
             <field name="name">confirmed</field>
             <field name="kind">function</field>
-            <field name="action">write({'state':'confirmed'})</field>
+            <field name="action">action_confirm()
+write({'state':'confirmed'})</field>
         </record>
         
         <record id="act_2binvoiced" model="workflow.activity">
@@ -50,18 +58,31 @@
         <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_repair"/>
             <field name="name">cancel</field>
-            <field name="kind">function</field>
             <field name="action">write({'state':'cancel'})</field>
+            <field name="flow_stop">True</field>
+            <field name="kind">stopall</field>
         </record>
         
         <!-- Transistion -->
         
-        <record id="trans_draft_confirmed" model="workflow.transition">
+        <record id="trans_draft_router" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_confirmed"/>
+            <field name="act_to" ref="act_router"/>
             <field name="signal">repair_confirm</field>
         </record>
         
+        <record id="trans_router_confirmed" model="workflow.transition">
+            <field name="act_from" ref="act_router"/>
+            <field name="act_to" ref="act_confirmed"/>
+            <field name="condition">(invoice_method=='none')</field>
+        </record>
+        
+        <record id="trans_router_2binvoiced" model="workflow.transition">
+            <field name="act_from" ref="act_router"/>
+            <field name="act_to" ref="act_2binvoiced"/>
+            <field name="condition">(invoice_method=='b4repair')</field>
+        </record>
+        
         <record id="trans_draft_cancel" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>

From 0f9f2aa5872e0b68a5c2303a23decdc0950ec656 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Thu, 16 Oct 2008 14:07:32 +0530
Subject: [PATCH 19/72] Minor changes in mrp_repair

bzr revid: ruchakpatel@gmail.com-20081016083732-fq30642bm3s43rek
---
 addons/mrp_repair/mrp_repair.py           | 1 +
 addons/mrp_repair/mrp_repair_workflow.xml | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 5d9877569dc..69a3ac24f1f 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -70,6 +70,7 @@ class mrp_repair(osv.osv):
     
     _defaults = {
         'state': lambda *a: 'draft',
+        'invoice_method': lambda *a: 'none',
         'pricelist_id': lambda self, cr, uid,context : self.pool.get('product.pricelist').search(cr,uid,[('type','=','sale')])[0]
     }
     
diff --git a/addons/mrp_repair/mrp_repair_workflow.xml b/addons/mrp_repair/mrp_repair_workflow.xml
index 5ae588c2146..899f0bee1f4 100644
--- a/addons/mrp_repair/mrp_repair_workflow.xml
+++ b/addons/mrp_repair/mrp_repair_workflow.xml
@@ -83,6 +83,12 @@ write({'state':'confirmed'})</field>
             <field name="condition">(invoice_method=='b4repair')</field>
         </record>
         
+        <record id="trans_confirm_2binvoiced" model="workflow.transition">
+            <field name="act_from" ref="act_confirmed"/>
+            <field name="act_to" ref="act_2binvoiced"/>
+            <field name="condition">(invoice_method=='after_repair')</field>
+        </record>
+        
         <record id="trans_draft_cancel" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>

From 006798c5ef131e95b8cb9237fe11f8f7f20c27c4 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Mon, 20 Oct 2008 12:21:04 +0530
Subject: [PATCH 20/72] Some bugfixing in mrp_repair

bzr revid: ruchakpatel@gmail.com-20081020065104-a2nwdexfilpbg42q
---
 addons/mrp_repair/mrp_repair.py       | 41 ++++++++++++++-------------
 addons/mrp_repair/mrp_repair_view.xml |  4 +--
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 69a3ac24f1f..458c630e305 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -200,31 +200,32 @@ class repair_operation(osv.osv):
      def _get_price(self, cr, uid, ids, name, arg, context={}):
         res = {}
         for val in self.browse(cr, uid, ids):
-            current_date = time.strftime('%Y-%m-%d')
-            if current_date < val.repair_id.guarantee_limit:
-                res[val.id] = 0.0
-            if current_date >= val.repair_id.guarantee_limit:
-                price = 0.0
-                pricelist = val.repair_id.pricelist_id.id
-                if pricelist:
-                    price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist], val.product_id.id , 1.0, val.repair_id.partner_id.id)[pricelist]
-                if price is False:
-                     warning={
-                        'title':'No valid pricelist line found !',
-                        'message':
-                            "Couldn't find a pricelist line matching this product and quantity.\n"
-                            "You have to change either the product, the quantity or the pricelist."
-                        }
-                else:
-                    res[val.id] = price
+            if val.repair_id:
+                current_date = time.strftime('%Y-%m-%d')
+                if current_date < val.repair_id.guarantee_limit:
+                    res[val.id] = 0.0
+                if current_date >= val.repair_id.guarantee_limit:
+                    price = 0.0
+                    pricelist = val.repair_id.pricelist_id.id
+                    if pricelist:
+                        price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist], val.product_id.id , 1.0, val.repair_id.partner_id.id)[pricelist]
+                    if price is False:
+                         warning={
+                            'title':'No valid pricelist line found !',
+                            'message':
+                                "Couldn't find a pricelist line matching this product and quantity.\n"
+                                "You have to change either the product, the quantity or the pricelist."
+                            }
+                    else:
+                        res[val.id] = price
         return res
     
     
      _columns = {
-        'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref', required=True, ondelete='cascade', select=True),
+        'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref',ondelete='cascade', select=True),
         'type': fields.selection([('add','Add'),('remove','Remove')],'Type'),
         'invoice': fields.boolean('Invoice'),
-        'price_unit': fields.function(_get_price,  method=True, store= True, type='float', string='Price'),
+        'repair_price': fields.function(_get_price,  method=True, store= True, type='float', string='Price'),
     }
      
      
@@ -259,7 +260,7 @@ class repair_operation(osv.osv):
                         "You have to change either the product, the quantity or the pricelist."
                     }
             else:
-                result.update({'price_unit': price})
+                result.update({'repair_price': price})
                 
         return {'value': result , 'domain' :domain, 'warning':warning}
      
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index f699bfaaa54..a9d24c98d5d 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -37,7 +37,7 @@
                                     <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_qty, parent.partner_id)"/>
                                     <field name="product_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
-                                    <field name="price_unit"/>
+                                    <field name="repair_price"/>
                                     <field name="prodlot_id"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
@@ -48,7 +48,7 @@
                                     <field name="product_id"/>
                                     <field name="product_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
-                                    <field name="price_unit"/>
+                                    <field name="repair_price"/>
                                     <field name="prodlot_id"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>

From 1eb74a0bb8d4aef55a0142b160c7cb387a4e0a84 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Mon, 20 Oct 2008 15:02:40 +0530
Subject: [PATCH 21/72] Changed model of Operations in mrp_repair, inherited
 stock.move, changes in view

bzr revid: ruchakpatel@gmail.com-20081020093240-mspqx7pwi9b5eojl
---
 addons/mrp_repair/mrp_repair.py       | 137 +++++++++++++++++++-------
 addons/mrp_repair/mrp_repair_view.xml |  32 +++---
 2 files changed, 118 insertions(+), 51 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 458c630e305..4409374d42f 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -38,6 +38,7 @@ class mrp_repair(osv.osv):
     _name = 'mrp.repair'
     _description = 'Repairs Order'
     _columns = {
+        'name' : fields.char('Name',size=24),
         'product_id': fields.many2one('product.product', string='Product to Repair', required=True ,domain=[('sale_ok','=',True)]),
         'partner_id' : fields.many2one('res.partner', 'Partner', select=True),
         'address_id': fields.many2one('res.partner.address', 'Delivery Address', domain="[('partner_id','=',partner_id)]"),
@@ -53,7 +54,7 @@ class mrp_repair(osv.osv):
         'location_dest_id': fields.many2one('stock.location', 'Delivery Location'),
         'move_id': fields.many2one('stock.move', 'Move',required=True,domain="[('product_id','=',product_id)]"),#,('location_dest_id','=',location_id),('prodlot_id','=',prodlot_id)
         'guarantee_limit': fields.date('Guarantee limit'),
-        'operations' : fields.one2many('stock.move', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
+        'operations' : fields.one2many('mrp.repair.lines', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
         'partner_invoice_id':fields.many2one('res.partner.address', 'Invoice to', readonly=True, states={'draft':[('readonly',False)]}, domain="[('partner_id','=',partner_id)]"),
         'invoice_method':fields.selection([
@@ -131,12 +132,12 @@ class mrp_repair(osv.osv):
         company = self.pool.get('res.users').browse(cr, uid, uid).company_id
         for repair in self.browse(cr, uid, ids, context={}):
             if repair.location_dest_id:
-                output_id = repair.location_dest_id
+                output_id = repair.location_dest_id.id
                 for line in repair.operations:
                     proc_id=False
                     date_planned = time.strftime('%Y-%m-%d %H:%M:%S')
                     if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'):
-                        location_id = line.location_id
+                        location_id = line.location_id.id
                         if not picking_id:
                             picking_id = self.pool.get('stock.picking').create(cr, uid, {
                                 'origin': repair.product_id.code, # + (repair.partner_id and  repair.partner_id.name) or ' ',
@@ -147,21 +148,40 @@ class mrp_repair(osv.osv):
                                 'note': repair.internal_notes,
                                 'invoice_state': 'none',
                             })
-                            operation = self.pool.get('stock.move')
-                            operation.write(cr, uid, line.id,{'picking_id' : picking_id} )
-                            proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
-                                'name': repair.name or 'Repair',
-                                'origin': repair.name,
-                                'date_planned': date_planned,
-                                'product_id': line.product_id.id,
-                                'product_qty': line.product_qty,
-                                'product_uom': line.product_uom.id,
-                                'location_id': repair.location_id.id,
-                                'procure_method': 'make_to_stock' ,# NEEDS TO BE CHANGED
-                                'move_id': line.id,
-                            })
-                            wf_service = netsvc.LocalService("workflow")
-                            wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
+#                            operation = self.pool.get('stock.move')
+#                            operation.write(cr, uid, line.id,{'picking_id' : picking_id} )
+                        vals = {
+                            'name': line.product_id.name[:64],
+                            'picking_id': picking_id,
+                            'product_id': line.product_id.id,
+                            'date_planned': date_planned,
+                            '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': repair.address_id.id,
+                            'location_id': location_id,
+                            'location_dest_id': output_id,
+                            'tracking_id': False,
+                            'state': 'draft',
+                            'note': line.notes,
+                        }
+                        move_id = self.pool.get('stock.move').create(cr, uid, vals)
+                        proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
+                            'name': repair.name or 'Repair',
+                            'origin': repair.name,
+                            'date_planned': date_planned,
+                            'product_id': line.product_id.id,
+                            'product_qty': line.product_uom_qty,
+                            'product_uom': line.product_uom.id,
+                            'location_id': repair.location_id.id,
+                            'procure_method': 'make_to_stock' ,# NEEDS TO BE CHANGED
+                            'move_id': line.id,
+                        })
+                        wf_service = netsvc.LocalService("workflow")
+                        wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
                           
                     elif line.product_id and line.product_id.product_tmpl_id.type=='service':
                         proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
@@ -169,7 +189,7 @@ class mrp_repair(osv.osv):
                             'origin': repair.name,
                             'date_planned': date_planned,
                             'product_id': line.product_id.id,
-                            'product_qty': line.product_qty,
+                            'product_qty': line.product_uom_qty,
                             'product_uom': line.product_uom.id,
                             'location_id': repair.location_id.id,
                             'procure_method': 'make_to_stock' ,# NEEDS TO BE CHANGED
@@ -193,11 +213,10 @@ mrp_repair()
 
 
 class repair_operation(osv.osv):
-     _inherit = 'stock.move'
-#     _name = 'repair.operation'
-     _description = 'Repair Operations'
+    _name = 'mrp.repair.lines'
+    _description = 'Repair Operations'
      
-     def _get_price(self, cr, uid, ids, name, arg, context={}):
+    def _get_price(self, cr, uid, ids, name, arg, context={}):
         res = {}
         for val in self.browse(cr, uid, ids):
             if val.repair_id:
@@ -220,18 +239,53 @@ class repair_operation(osv.osv):
                         res[val.id] = price
         return res
     
-    
-     _columns = {
-        'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref',ondelete='cascade', select=True),
-        'type': fields.selection([('add','Add'),('remove','Remove')],'Type'),
-        'invoice': fields.boolean('Invoice'),
-        'repair_price': fields.function(_get_price,  method=True, store= True, type='float', string='Price'),
+    def _amount_line_net(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        for line in self.browse(cr, uid, ids):
+            res[line.id] = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
+        return res
+
+    def _amount_line(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        cur_obj=self.pool.get('res.currency')
+        for line in self.browse(cr, uid, ids):
+            res[line.id] = line.price_unit * line.product_uom_qty * (1 - (line.discount or 0.0) / 100.0)
+            cur = line.repair_id.pricelist_id.currency_id
+            res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
+        return res
+    _columns = {
+                'name' : fields.char('Name',size=24),
+                'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref',ondelete='cascade', select=True),
+                'type': fields.selection([('add','Add'),('remove','Remove')],'Type'),
+                'invoice': fields.boolean('Invoice'),
+                'delay': fields.float('Delivery Delay', required=True),
+                'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok','=',True)],  required=True),
+                'invoiced': fields.boolean('Invoiced'),
+                'procurement_id': fields.many2one('mrp.procurement', 'Procurement'),
+                'price_unit': fields.function(_get_price,  method=True, store= True, type='float', string='Price'),
+                'price_net': fields.function(_amount_line_net, method=True, string='Net Price'),
+                'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal'),
+                'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes'),
+                'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties'),
+                'address_allotment_id' : fields.many2one('res.partner.address', 'Allotment Partner'),
+                'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2), required=True),
+                'product_uom': fields.many2one('product.uom', 'Product UoM', required=True),
+                'product_uos_qty': fields.float('Quantity (UOS)'),
+                'product_uos': fields.many2one('product.uom', 'Product UOS'),
+                'product_packaging': fields.many2one('product.packaging', 'Packaging'),
+                'move_ids': fields.one2many('stock.move', 'sale_line_id', 'Inventory Moves', readonly=True),
+                'discount': fields.float('Discount (%)', digits=(16,2)),
+                'notes': fields.text('Notes'),
+                'th_weight' : fields.float('Weight'),
+                'location_id': fields.many2one('stock.location', 'Source Location', required=True, select=True),
+                'location_dest_id': fields.many2one('stock.location', 'Dest. Location', required=True, select=True),
+                'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('done','Done'),('cancel','Canceled')], 'Status', required=True, readonly=True),
     }
      
      
-     def product_id_change(self, cr, uid, ids, pricelist, product, uom=False, product_qty = 0,partner_id=False ):
+    def product_id_change(self, cr, uid, ids, pricelist, product, uom=False, product_uom_qty = 0,partner_id=False ):
         if not product:
-            return {'value': {'product_qty' : 0.0, 'product_uom': False},'domain': {'product_uom': []}}
+            return {'value': {'product_uom_qty' : 0.0, 'product_uom': False},'domain': {'product_uom': []}}
         product_obj =  self.pool.get('product.product').browse(cr, uid, product)
         result = {}
         warning = {}
@@ -249,7 +303,7 @@ class repair_operation(osv.osv):
                 }
         else:
             price = self.pool.get('product.pricelist').price_get(cr, uid, [pricelist],
-                    product, product_qty or 1.0, partner_id, {
+                    product, product_uom_qty or 1.0, partner_id, {
                         'uom': uom,
                         })[pricelist]
             if price is False:
@@ -260,12 +314,12 @@ class repair_operation(osv.osv):
                         "You have to change either the product, the quantity or the pricelist."
                     }
             else:
-                result.update({'repair_price': price})
+                result.update({'price_unit': price})
                 
         return {'value': result , 'domain' :domain, 'warning':warning}
      
      
-     def onchange_operation_type(self, cr, uid, ids, type ):
+    def onchange_operation_type(self, cr, uid, ids, type ):
         if not type:
             return {'value':{'location_id': False , 'location_dest_id' :  False}}
         stock_id = self.pool.get('stock.location').search(cr, uid, [('name','=','Stock')])[0]
@@ -275,9 +329,11 @@ class repair_operation(osv.osv):
         if type == 'remove':
             return {'value':{'location_id': produc_id , 'location_dest_id' : stock_id}}
         
-     _defaults = {
+    _defaults = {
                  'name' : lambda *a: 'Repair Operation',
+                 'state': lambda *a: 'draft',
                  }
+    
 repair_operation()
 
 class mrp_repair_fee(osv.osv):
@@ -287,14 +343,14 @@ class mrp_repair_fee(osv.osv):
         'repair_id': fields.many2one('mrp.repair', 'Repair Order Ref', required=True, ondelete='cascade', select=True),
         'name': fields.char('Description', size=8, required=True, select=True),
         'product_id': fields.many2one('product.product', 'Product', required=True),
-        'product_qty': fields.float('Quantity', digits=(16,2), required=True),
+        'product_uom_qty': fields.float('Quantity', digits=(16,2), required=True),
         'price_unit': fields.float('Unit Price', required=True),
         'product_uom': fields.many2one('product.uom', 'Product UoM', required=True),
     }
     
     def product_id_change(self, cr, uid, ids, product, uom=False):
         if not product:
-            return {'value': {'product_qty' : 0.0, 'product_uom': False},'domain': {'product_uom': []}}
+            return {'value': {'product_uom_qty' : 0.0, 'product_uom': False},'domain': {'product_uom': []}}
         
         product_obj =  self.pool.get('product.product').browse(cr, uid, product)
         result = {}
@@ -306,4 +362,11 @@ class mrp_repair_fee(osv.osv):
     
 mrp_repair_fee()
 
+
+class stock_move(osv.osv):
+    _inherit = "stock.move"
+    _columns = {
+                'state': fields.selection([('draft','Draft'),('waiting','Waiting'),('confirmed','Confirmed'),('assigned','Assigned'),('done','Done'),('cancel','cancel'),('in_repair','In Repair')], 'Status',),# readonly=True, select=True),
+                'repair_ids' : fields.one2many('mrp.repair', 'move_id', 'Repairs'),
+            }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index a9d24c98d5d..1abd19da4fd 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -18,6 +18,8 @@
             <field name="arch" type="xml">
                 <form string="Repairs order">
                     <group col="4" colspan="4">
+                    	<field name="name"/>
+                    	<newline/>
                         <field name="product_id" select="1"  on_change="onchange_product_id(product_id, move_id)"/>
                         <field name="prodlot_id" select="2" on_change="onchange_lot_id(prodlot_id)"/>
                         <field name="partner_id" select="2" on_change="onchange_partner_id(partner_id)" />
@@ -34,24 +36,26 @@
                             <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
                                 <form string="Operations">
                                     <field name="type"  on_change="onchange_operation_type(type)"/>
-                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_qty, parent.partner_id)"/>
-                                    <field name="product_qty" string="Qty"/>
+                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
+                                    <field name="product_uom_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
-                                    <field name="repair_price"/>
-                                    <field name="prodlot_id"/>
+                                    <field name="price_unit"/>
+                                    <field name="discount"/>
+                                    <field name="price_subtotal"/>
+                                    <field name="delay"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
-                                    <field name="invoice"/>
+                                    <field name="state"/>
                                 </form>
                                 <tree string="Operations lines"> <!-- editable="bottom"> -->
-                                    <field name="type" on_change="onchange_operation_type(type)"/>
-                                    <field name="product_id"/>
-                                    <field name="product_qty" string="Qty"/>
+                                    <field name="type"  on_change="onchange_operation_type(type)"/>
+                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
+                                    <field name="product_uom_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
-                                    <field name="repair_price"/>
-                                    <field name="prodlot_id"/>
-                                    <field name="location_id"/>
-                                    <field name="location_dest_id"/>
+                                    <field name="discount"/>
+                                    <field name="price_unit"/>
+                                    <field name="price_net"/>
+                                    <field name="price_subtotal"/>
                                     <field name="invoice"/>
                                 </tree>
                             </field>
@@ -74,13 +78,13 @@
                             <field colspan="4" mode="tree,form" name="fees_lines" nolabel="1" widget="one2many_list">
                             <form string="Fees Line">
                                     <field name="product_id" on_change="product_id_change(product_id,product_uom)" />
-                                    <field name="product_qty" string="Qty"/>
+                                    <field name="product_uom_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM" /> <!--on_change="product_id_change(product_id,product_uom)" /> -->
                                     <field name="price_unit"/>
                                 </form>
                                 <tree string="Fees lines"> <!-- editable="bottom"> -->
                                     <field name="product_id"/>
-                                    <field name="product_qty" string="Qty"/>
+                                    <field name="product_uom_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
                                     <field name="price_unit"/>
                                 </tree>

From 3d62f2b9dad681e67ec7bedbeb32321e52ac3a4f Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Tue, 21 Oct 2008 14:45:08 +0530
Subject: [PATCH 22/72] Changes in workflow and created related functions in
 mrp_repair

bzr revid: ruchakpatel@gmail.com-20081021091508-pqt7k19aqpik4hyc
---
 addons/mrp_repair/mrp_repair.py           |  91 +++++++-
 addons/mrp_repair/mrp_repair_workflow.xml | 242 ++++++++++++++++------
 2 files changed, 272 insertions(+), 61 deletions(-)

diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 4409374d42f..033bbd8a4d9 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -125,9 +125,46 @@ class mrp_repair(osv.osv):
                 self.write(cr, uid, [o.id], {'state': 'confirmed'})
             elif (o.invoice_method == 'b4repair'):
                 self.write(cr, uid, [o.id], {'state': '2binvoiced'})
+            elif (o.invoice_method == 'after_repair'):
+                self.write(cr, uid, [o.id], {'state': 'confirmed'})
+        self.pool.get('mrp.repair.lines').write(cr, uid, ids, {'state':'confirmed'})
         return True
+    
+    def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed','done']):
+        res = False
+        invoices = {}
+        invoice_ids = []
 
-    def action_confirm(self, cr, uid, ids, *args):
+        for o in self.browse(cr,uid,ids):
+            lines = []
+            for line in o.operations:
+                if (line.state in states) and not line.invoiced:
+                    lines.append(line.id)
+#            created_lines = self.pool.get('sale.order.line').invoice_line_create(cr, uid, lines)
+#            if created_lines:
+#                invoices.setdefault(o.partner_id.id, []).append((o, created_lines))
+
+        picking_obj=self.pool.get('stock.picking')
+        for val in invoices.values():
+            if grouped:
+                res = self._make_invoice(cr, uid, val[0][0], reduce(lambda x,y: x + y, [l for o,l in val], []))
+                for o,l in val:
+                    self.write(cr, uid, [o.id], {'state' : 'progress'})
+                    if o.order_policy=='picking':
+                        picking_obj.write(cr,uid,map(lambda x:x.id,o.picking_ids),{'invoice_state':'invoiced'})
+                    cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%d,%d)', (o.id, res))
+            else:
+                for order, il in val:
+                    res = self._make_invoice(cr, uid, order, il)
+                    invoice_ids.append(res)
+                    self.write(cr, uid, [order.id], {'state' : 'progress'})
+                    if order.order_policy=='picking':
+                        picking_obj.write(cr,uid,map(lambda x:x.id,order.picking_ids),{'invoice_state':'invoiced'})
+                    cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%d,%d)', (order.id, res))
+        return res
+
+
+    def action_ship_create(self, cr, uid, ids, *args):
         picking_id=False
         company = self.pool.get('res.users').browse(cr, uid, uid).company_id
         for repair in self.browse(cr, uid, ids, context={}):
@@ -182,7 +219,7 @@ class mrp_repair(osv.osv):
                         })
                         wf_service = netsvc.LocalService("workflow")
                         wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
-                          
+                        self.pool.get('mrp.repair.lines').write(cr, uid, [line.id], {'procurement_id': proc_id})
                     elif line.product_id and line.product_id.product_tmpl_id.type=='service':
                         proc_id = self.pool.get('mrp.procurement').create(cr, uid, {
                             'name': line.name or 'Repair',
@@ -196,7 +233,7 @@ class mrp_repair(osv.osv):
                         })
                         wf_service = netsvc.LocalService("workflow")
                         wf_service.trg_validate(uid, 'mrp.procurement', proc_id, 'button_confirm', cr)
-
+                        self.pool.get('mrp.repair.lines').write(cr, uid, [line.id], {'procurement_id': proc_id})
                     else:
                         #
                         # No procurement because no product in the sale.order.line.
@@ -208,6 +245,54 @@ class mrp_repair(osv.osv):
                     wf_service = netsvc.LocalService("workflow")
                     wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
                 self.write(cr, uid, [repair.id], val)
+                
+        return True
+
+    def procurement_lines_get(self, cr, uid, ids, *args):
+        res = []
+        for order in self.browse(cr, uid, ids, context={}):
+            for line in order.operations:
+                if line.procurement_id:
+                    res.append(line.procurement_id.id)
+        return res
+    
+    def test_state(self, cr, uid, ids, mode, *args):
+        assert mode in ('finished', 'canceled'), _("invalid mode for test_state")
+        finished = True
+        canceled = False
+        write_done_ids = []
+        write_cancel_ids = []
+        for order in self.browse(cr, uid, ids, context={}):
+            for line in order.operations:
+                if line.procurement_id and (line.procurement_id.state != 'done') and (line.state!='done'):
+                    finished = False
+                if line.procurement_id and line.procurement_id.state == 'cancel':
+                    canceled = True
+                # if a line is finished (ie its procuremnt is done or it has not procuremernt and it
+                # is not already marked as done, mark it as being so...
+                if ((not line.procurement_id) or line.procurement_id.state == 'done') and line.state != 'done':
+                    write_done_ids.append(line.id)
+                # ... same for canceled lines
+                if line.procurement_id and line.procurement_id.state == 'cancel' and line.state != 'cancel':
+                    write_cancel_ids.append(line.id)
+        if write_done_ids:
+            self.pool.get('mrp.repair.lines').write(cr, uid, write_done_ids, {'state': 'done'})
+        if write_cancel_ids:
+            self.pool.get('mrp.repair.liness').write(cr, uid, write_cancel_ids, {'state': 'cancel'})
+
+        if mode=='finished':
+            return finished
+        elif mode=='canceled':
+            return canceled
+        
+    def action_ship_end(self, cr, uid, ids, context={}):
+        for order in self.browse(cr, uid, ids):
+            val = {}
+            if (order.invoice_method=='after_repair'):
+                val['state'] = '2binvoiced'
+            else:
+                val['state'] = 'confirmed'
+            self.write(cr, uid, [order.id], val)
         return True
 mrp_repair()
 
diff --git a/addons/mrp_repair/mrp_repair_workflow.xml b/addons/mrp_repair/mrp_repair_workflow.xml
index 899f0bee1f4..fb272a6797d 100644
--- a/addons/mrp_repair/mrp_repair_workflow.xml
+++ b/addons/mrp_repair/mrp_repair_workflow.xml
@@ -20,103 +20,229 @@
             <field name="action">action_wait()</field>
             <field name="split_mode">OR</field>
         </record>
-        <record id="act_draft" model="workflow.activity">
+        <record id="act_wait_invoice" model="workflow.activity">
             <field name="wkf_id" ref="wkf_repair"/>
-            <field name="flow_start">True</field>
-            <field name="name">draft</field>
-            <field name="split_mode">OR</field>
+            <field name="name">wait_invoice</field>
         </record>
-        <record id="act_confirmed" model="workflow.activity">
+        <record id="act_wait_ship" model="workflow.activity">
             <field name="wkf_id" ref="wkf_repair"/>
-            <field name="name">confirmed</field>
-            <field name="kind">function</field>
-            <field name="action">action_confirm()
-write({'state':'confirmed'})</field>
-        </record>
-        
-        <record id="act_2binvoiced" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_repair"/>
-            <field name="name">2binvoiced</field>
-            <field name="kind">function</field>
-            <field name="action">write({'state':'2binvoiced'})</field>
+            <field name="name">wait_ship</field>
         </record>
         
         <record id="act_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_repair"/>
             <field name="name">done</field>
+            <field name="flow_stop">True</field>
             <field name="kind">function</field>
             <field name="action">write({'state':'done'})</field>
+            <field name="join_mode">AND</field>
         </record>
-        
-        <record id="act_done" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_repair"/>
-            <field name="name">done</field>
-            <field name="kind">function</field>
-            <field name="action">write({'state':'done'})</field>
-        </record>
-        
         <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_repair"/>
             <field name="name">cancel</field>
-            <field name="action">write({'state':'cancel'})</field>
             <field name="flow_stop">True</field>
             <field name="kind">stopall</field>
+            <field name="action">action_cancel()</field>
+        </record>
+        <record id="act_cancel2" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">cancel2</field>
+            <field name="flow_stop">True</field>
+            <field name="kind">stopall</field>
+            <field name="action">action_cancel()</field>
+        </record>
+        <record id="act_cancel3" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">cancel3</field>
+            <field name="flow_stop">True</field>
+            <field name="kind">stopall</field>
+            <field name="action">action_cancel()</field>
+        </record>
+        
+        <record id="act_invoice" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">invoice</field>
+            <field name="kind">subflow</field>
+            <field name="subflow_id" search="[('name','=','account.invoice.basic')]"/>
+            <field name="action">action_invoice_create()</field>
+        </record>
+        <record id="act_invoice_except" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">invoice_except</field>
+            <field name="kind">function</field>
+            <field name="action">action_invoice_cancel()</field>
+        </record>
+        <record id="act_invoice_end" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">invoice_end</field>
+            <field name="kind">dummy</field>
+        </record>
+        <record id="act_invoice_cancel" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">invoice_cancel</field>
+            <field name="flow_stop">True</field>
+            <field name="kind">stopall</field>
+            <field name="action">action_cancel()</field>
+        </record>
+        
+        <record id="act_ship" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">ship</field>
+            <field name="kind">function</field>
+            <field name="action">action_ship_create()</field>
+        </record>
+        
+        <record id="act_ship_except" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">ship_except</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'shipping_except'})</field>
+        </record>
+        <record id="act_ship_end" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">ship_end</field>
+            <field name="kind">function</field>
+            <field name="action">action_ship_end()</field>
+        </record>
+        <record id="act_ship_cancel" model="workflow.activity">
+            <field name="wkf_id" ref="wkf_repair"/>
+            <field name="name">ship_cancel</field>
+            <field name="flow_stop">True</field>
+            <field name="kind">stopall</field>
+            <field name="action">action_cancel()</field>
         </record>
         
         <!-- Transistion -->
         
+        <record id="trans_invoice_end_done" model="workflow.transition">
+            <field name="act_from" ref="act_invoice_end"/>
+            <field name="act_to" ref="act_done"/>
+        </record>
+        
         <record id="trans_draft_router" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_router"/>
             <field name="signal">repair_confirm</field>
         </record>
         
-        <record id="trans_router_confirmed" model="workflow.transition">
-            <field name="act_from" ref="act_router"/>
-            <field name="act_to" ref="act_confirmed"/>
-            <field name="condition">(invoice_method=='none')</field>
-        </record>
-        
-        <record id="trans_router_2binvoiced" model="workflow.transition">
-            <field name="act_from" ref="act_router"/>
-            <field name="act_to" ref="act_2binvoiced"/>
-            <field name="condition">(invoice_method=='b4repair')</field>
-        </record>
-        
-        <record id="trans_confirm_2binvoiced" model="workflow.transition">
-            <field name="act_from" ref="act_confirmed"/>
-            <field name="act_to" ref="act_2binvoiced"/>
-            <field name="condition">(invoice_method=='after_repair')</field>
-        </record>
-        
         <record id="trans_draft_cancel" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel</field>
         </record>
         
-        <record id="trans_confirmed_done" model="workflow.transition">
-            <field name="act_from" ref="act_confirmed"/>
-            <field name="act_to" ref="act_done"/>
-            <field name="signal">repair_done</field>
+        <record id="trans_wait_invoice_all_lines_invoiced" model="workflow.transition">
+            <field name="act_from" ref="act_wait_invoice"/>
+            <field name="act_to" ref="act_invoice_end"/>
+            <field name="signal">all_lines</field>
         </record>
         
-        <record id="trans_confirmed_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_confirmed"/>
-            <field name="act_to" ref="act_cancel"/>
+        <record id="trans_router_wait_invoice_shipping" model="workflow.transition">
+            <field name="act_from" ref="act_wait_invoice"/>
+            <field name="act_to" ref="act_invoice_end"/>
+            <field name="condition">True</field>
+        </record>
+        
+        <record id="trans_router_wait_invoice" model="workflow.transition">
+            <field name="act_from" ref="act_router"/>
+            <field name="act_to" ref="act_wait_invoice"/>
+        </record>
+        
+        <record id="trans_router_wait_ship" model="workflow.transition">
+            <field name="act_from" ref="act_router"/>
+            <field name="act_to" ref="act_wait_ship"/>
+        </record>
+        
+        <record id="trans_wait_invoice_cancel2" model="workflow.transition">
+            <field name="act_from" ref="act_wait_invoice"/>
+            <field name="act_to" ref="act_cancel2"/>
             <field name="signal">cancel</field>
         </record>
         
-         <record id="trans_2binvoiced_done" model="workflow.transition">
-            <field name="act_from" ref="act_2binvoiced"/>
-            <field name="act_to" ref="act_done"/>
-            <field name="signal">make_invoice</field>
+        <record id="trans_wait_ship_cancel3" model="workflow.transition">
+            <field name="act_from" ref="act_wait_ship"/>
+            <field name="act_to" ref="act_cancel3"/>
+            <field name="signal">cancel</field>
         </record>
         
-        <record id="trans_2binvoiced_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_2binvoiced"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel</field>
+        <record id="trans_wait_ship_ship" model="workflow.transition">
+            <field name="act_from" ref="act_wait_ship"/>
+            <field name="act_to" ref="act_ship"/>
+            <field name="condition">(invoice_method=='after_repair' or invoice_method=='none')</field>
+        </record>
+        
+        <record id="trans_wait_invoice_invoice" model="workflow.transition">
+            <field name="act_from" ref="act_wait_invoice"/>
+            <field name="act_to" ref="act_invoice"/>
+            <field name="condition">(invoice_method=='b4repair')</field>
+        </record>
+        
+        <record id="trans_wait_invoice_invoice_manual" model="workflow.transition">
+            <field name="act_from" ref="act_wait_invoice"/>
+            <field name="act_to" ref="act_invoice"/>
+            <field name="signal">manual_invoice</field>
+        </record>
+        
+        <record id="trans_invoice_invoice_end" model="workflow.transition">
+            <field name="act_from" ref="act_invoice"/>
+            <field name="act_to" ref="act_invoice_end"/>
+            <field name="signal">subflow.paid</field>
+        </record>
+        <record id="trans_invoice_invoice_except" model="workflow.transition">
+            <field name="act_from" ref="act_invoice"/>
+            <field name="act_to" ref="act_invoice_except"/>
+            <field name="signal">subflow.cancel</field>
+        </record>
+        <record id="trans_invoice_except_invoice" model="workflow.transition">
+            <field name="act_from" ref="act_invoice_except"/>
+            <field name="act_to" ref="act_invoice"/>
+            <field name="signal">invoice_recreate</field>
+        </record>
+        <record id="trans_invoice_except_invoice_end" model="workflow.transition">
+            <field name="act_from" ref="act_invoice_except"/>
+            <field name="act_to" ref="act_invoice_end"/>
+            <field name="signal">invoice_corrected</field>
+        </record>
+        <record id="trans_invoice_except_invoice_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_invoice_except"/>
+            <field name="act_to" ref="act_invoice_cancel"/>
+            <field name="signal">invoice_cancel</field>
+        </record>
+        <record id="trans_ship_end_done" model="workflow.transition">
+            <field name="act_from" ref="act_ship_end"/>
+            <field name="act_to" ref="act_done"/>
+        </record>
+        
+        <record id="trans_ship_ship_end" model="workflow.transition">
+            <field name="act_from" ref="act_ship"/>
+            <field name="act_to" ref="act_ship_end"/>
+            <field name="trigger_model">mrp.procurement</field>
+            <field name="trigger_expr_id">procurement_lines_get()</field>
+            <field name="condition">test_state('finished')</field>
+        </record>
+        <record id="trans_ship_ship_except" model="workflow.transition">
+            <field name="act_from" ref="act_ship"/>
+            <field name="act_to" ref="act_ship_except"/>
+            <!--
+			<field name="trigger_model">mrp.procurement</field>
+			<field name="trigger_expr_id">procurement_lines_get()</field>
+			-->
+            <field name="condition">test_state('canceled')</field>
+        </record>
+        <record id="trans_ship_except_ship" model="workflow.transition">
+            <field name="act_from" ref="act_ship_except"/>
+            <field name="act_to" ref="act_ship"/>
+            <field name="signal">ship_recreate</field>
+        </record>
+        <record id="trans_ship_except_ship_end" model="workflow.transition">
+            <field name="act_from" ref="act_ship_except"/>
+            <field name="act_to" ref="act_ship_end"/>
+            <field name="signal">ship_corrected</field>
+        </record>
+        <record id="trans_ship_except_ship_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_ship_except"/>
+            <field name="act_to" ref="act_ship_cancel"/>
+            <field name="signal">ship_cancel</field>
         </record>
         
     </data>

From 70792a1ddd24da503f70063e5973a1c730044ab2 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Wed, 22 Oct 2008 10:12:47 +0530
Subject: [PATCH 23/72] Changes in workflow of mrp_repair, some other changes

bzr revid: ruchakpatel@gmail.com-20081022044247-68tpgadty5gx7z1n
---
 addons/mrp_repair/__terp__.py                 |  2 +-
 addons/mrp_repair/mrp_repair_view.xml         | 26 +++---
 addons/mrp_repair/mrp_repair_wizard.xml       | 22 +++++
 addons/mrp_repair/mrp_repair_workflow.xml     |  2 +-
 addons/mrp_repair/wizard/__init__.py          | 33 +++++++
 .../mrp_repair/wizard/wizard_cancel_repair.py | 86 +++++++++++++++++++
 6 files changed, 159 insertions(+), 12 deletions(-)
 create mode 100644 addons/mrp_repair/mrp_repair_wizard.xml
 create mode 100644 addons/mrp_repair/wizard/__init__.py
 create mode 100644 addons/mrp_repair/wizard/wizard_cancel_repair.py

diff --git a/addons/mrp_repair/__terp__.py b/addons/mrp_repair/__terp__.py
index 8ea80e42eb4..0ee81388f5a 100644
--- a/addons/mrp_repair/__terp__.py
+++ b/addons/mrp_repair/__terp__.py
@@ -52,7 +52,7 @@
     "category":"Custom",
     "depends":["sale","account"],
     "demo_xml":[],
-    "update_xml":["mrp_repair_view.xml", "mrp_repair_workflow.xml", "mrp_repair_report.xml"],
+    "update_xml":["mrp_repair_view.xml", "mrp_repair_workflow.xml", "mrp_repair_wizard.xml","mrp_repair_report.xml"],
     "active": False,
     "installable": True,
 }
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 1abd19da4fd..580bc683f55 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -2,15 +2,6 @@
 <openerp>
     <data>
     
-    <wizard 
-            id="action_cancel_repair" 
-            model="mrp.repair" 
-            name="mrp.repair.cancel"
-            string="Cancel Repair"
-            menu = "False"
-            multi = "True"
-            />
-            
     <record id="view_repair_order_form" model="ir.ui.view">
             <field name="name">mrp.repair.form</field>
             <field name="model">mrp.repair</field>
@@ -36,6 +27,7 @@
                             <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
                                 <form string="Operations">
                                     <field name="type"  on_change="onchange_operation_type(type)"/>
+                                    <field name="invoice"/>
                                     <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)"/>
                                     <field name="product_uom_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
@@ -45,6 +37,7 @@
                                     <field name="delay"/>
                                     <field name="location_id"/>
                                     <field name="location_dest_id"/>
+                                    <newline/>
                                     <field name="state"/>
                                 </form>
                                 <tree string="Operations lines"> <!-- editable="bottom"> -->
@@ -62,9 +55,22 @@
                             <newline/>
                             <group col="13" colspan="4">
                                 <field name="state" select="2"/>
+                                
+                                <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                                <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object"/>
+                                <button name="cancel" states="draft" string="Cancel Order"/>
+                                <button name="invoice_cancel" states="invoice_except" string="Cancel Order"/>
+                                
+                                
                                 <button name="repair_confirm" states="draft" string="Confirm Repair"/>
-                                <button name="repair_done" states="confirmed" string="Repair Done"/>
+                                <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
+                                <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
+                                <button name="ship_recreate" states="shipping_except" string="Recreate Procurement"/>
+                                <button name="ship_corrected" states="shipping_except" string="Procurement Corrected"/>
                                 <button name="make_invoice" states="2binvoiced" string="Make Invoice"/>
+                                <button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
+                                <button name="repair_done" states="confirmed" string="Repair Done"/>
+                                
                                 <button name="%(action_cancel_repair)d" states="draft,confirmed,2binvoiced" string="Cancel Repair" type="action"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                             </group>
diff --git a/addons/mrp_repair/mrp_repair_wizard.xml b/addons/mrp_repair/mrp_repair_wizard.xml
new file mode 100644
index 00000000000..1847740da08
--- /dev/null
+++ b/addons/mrp_repair/mrp_repair_wizard.xml
@@ -0,0 +1,22 @@
+ <?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+	    <wizard 
+	            id="action_cancel_repair" 
+	            model="mrp.repair" 
+	            name="mrp.repair.cancel"
+	            string="Cancel Repair"
+	            menu = "False"
+	            multi = "True"
+	            />
+		 <wizard
+				id="wizard_mrp_repair_make_invoice"
+				keyword="client_action_multi"
+				model="mrp.repair"
+				name="mrp.repair.make_invoice"
+				multi="True"
+				string="Make invoices"/>
+					
+    </data>
+</openerp>
+		
\ No newline at end of file
diff --git a/addons/mrp_repair/mrp_repair_workflow.xml b/addons/mrp_repair/mrp_repair_workflow.xml
index fb272a6797d..08e8ef6be36 100644
--- a/addons/mrp_repair/mrp_repair_workflow.xml
+++ b/addons/mrp_repair/mrp_repair_workflow.xml
@@ -180,7 +180,7 @@
         <record id="trans_wait_invoice_invoice_manual" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_invoice"/>
-            <field name="signal">manual_invoice</field>
+            <field name="signal">make_invoice</field>
         </record>
         
         <record id="trans_invoice_invoice_end" model="workflow.transition">
diff --git a/addons/mrp_repair/wizard/__init__.py b/addons/mrp_repair/wizard/__init__.py
new file mode 100644
index 00000000000..4f4d4d74876
--- /dev/null
+++ b/addons/mrp_repair/wizard/__init__.py
@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 contract 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.
+#
+##############################################################################
+
+import wizard_cancel_repair
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mrp_repair/wizard/wizard_cancel_repair.py b/addons/mrp_repair/wizard/wizard_cancel_repair.py
new file mode 100644
index 00000000000..0790baa0f8c
--- /dev/null
+++ b/addons/mrp_repair/wizard/wizard_cancel_repair.py
@@ -0,0 +1,86 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id$
+#
+# 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 contract 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.
+#
+##############################################################################
+
+import wizard
+import netsvc
+import pooler
+
+cancel_form = """<?xml version="1.0"?>
+<form string="Cancel Repair...??">
+    <label colspan="4" string="This operation  will  cancel the  Repair process, but  not the  Invoice  or Packing generated.\nDo you want to continue?" />
+</form>
+"""
+
+cancel_fields = {}
+
+def check_state(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    repair_obj = pool.get('mrp.repair').browse(cr, uid, data['ids'])[0]
+    if repair_obj.state == 'draft':
+        pool.get('mrp.repair').write(cr,uid,data['ids'],{'state':'cancel'})
+        return 'end'
+    else:
+        return 'display'
+        
+def _cancel_repair(self, cr, uid, data, context):
+    pool = pooler.get_pool(cr.dbname)
+    repair_obj = pool.get('mrp.repair').browse(cr, uid, data['ids'])[0]
+    pool.get('mrp.repair').write(cr,uid,data['ids'],{'state':'cancel'})
+    return {}
+
+class repair_cancel(wizard.interface):
+    states = {
+       'init' : {
+            'actions' : [],
+            'result' : {'type' : 'choice', 'next_state' : check_state}
+        },
+
+        'display' : {
+            'actions' : [],
+            'result' : {'type' : 'form',
+                    'arch' : cancel_form,
+                    'fields' : cancel_fields,
+                    'state' : [('end', 'No'),('yes', 'Yes') ]}
+        },
+        'yes' : {
+            'actions' : [],
+            'result' : {'type' : 'action',
+                    'action' : _cancel_repair,
+                    'state' : 'end'}
+        },
+         'end' : {
+            'actions' : [],
+            'result': {'type': 'state', 'state': 'end'},
+        },
+    }
+repair_cancel("mrp.repair.cancel")
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

From fe59ee430bd9ed8532b43a300661634c19f4ce86 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Mon, 27 Oct 2008 11:29:28 +0530
Subject: [PATCH 24/72] Some Changes in warning module

bzr revid: ruchakpatel@gmail.com-20081027055928-samavuvg9c36gxqm
---
 addons/account/project/project.py             | 48 ++---------
 addons/account/project/project_view.xml       | 13 ---
 addons/account/project/wizard/__init__.py     |  1 -
 .../wizard/wizard_account_analytic_line1.py   | 83 -------------------
 addons/warning/warning.py                     | 18 ++--
 5 files changed, 17 insertions(+), 146 deletions(-)
 delete mode 100644 addons/account/project/wizard/wizard_account_analytic_line1.py

diff --git a/addons/account/project/project.py b/addons/account/project/project.py
index 60a1704bb2d..b4cc3468e5f 100644
--- a/addons/account/project/project.py
+++ b/addons/account/project/project.py
@@ -43,32 +43,17 @@ class account_analytic_account(osv.osv):
     _description = 'Analytic Accounts'
 
     def _credit_calc(self, cr, uid, ids, name, arg, context={}):
-        if 'date_start' in context and context['date_start']:
-            date_start = context['date_start']
-        else:
-            date_start = time.strftime('%Y-01-01')
-        if 'date_stop' in context and context['date_stop']:
-            date_stop = context['date_stop']
-        else:
-            date_stop = time.strftime('%Y-%m-%d')
         acc_set = ",".join(map(str, ids))
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE l.amount<0 and a.id IN (%s) AND (l.date BETWEEN '%s' and '%s') GROUP BY a.id" % (acc_set,date_start,date_stop))
+        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE l.amount<0 and a.id IN (%s) GROUP BY a.id" % acc_set)
         r= dict(cr.fetchall())
         for i in ids:
             r.setdefault(i,0.0)
         return r
 
     def _debit_calc(self, cr, uid, ids, name, arg, context={}):
-        if 'date_start' in context and context['date_start']:
-            date_start = context['date_start']
-        else:
-            date_start = time.strftime('%Y-01-01')
-        if 'date_stop' in context and context['date_stop']:
-            date_stop = context['date_stop']
-        else:
-            date_stop = time.strftime('%Y-%m-%d')
+
         acc_set = ",".join(map(str, ids))
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE l.amount>0 and a.id IN (%s)  AND (l.date BETWEEN '%s' and '%s') GROUP BY a.id" % (acc_set,date_start,date_stop))
+        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE l.amount>0 and a.id IN (%s) GROUP BY a.id" % acc_set)
         r= dict(cr.fetchall())
         for i in ids:
             r.setdefault(i,0.0)
@@ -77,18 +62,9 @@ class account_analytic_account(osv.osv):
 
 
     def _balance_calc(self, cr, uid, ids, name, arg, context={}):
-        if 'date_start' in context and context['date_start']:
-            date_start = context['date_start']
-        else:
-            date_start = time.strftime('%Y-01-01')
-        if 'date_stop' in context and context['date_stop']:
-            date_stop = context['date_stop']
-        else:
-            date_stop = time.strftime('%Y-%m-%d')
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         acc_set = ",".join(map(str, ids2))
-        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE a.id IN (%s)  AND (l.date BETWEEN '%s' and '%s') GROUP BY a.id" % (acc_set,date_start,date_stop))
-#        cr.execute("select a.id, COALESCE(SUM(l.amount),0) from account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) where (l.date BETWEEN '2008-10-01' AND '2008-10-03') GROUP BY a.id")
+        cr.execute("SELECT a.id, COALESCE(SUM(l.amount),0) FROM account_analytic_account a LEFT JOIN account_analytic_line l ON (a.id=l.account_id) WHERE a.id IN (%s) GROUP BY a.id" % acc_set)
         res = {}
         for account_id, sum in cr.fetchall():
             res[account_id] = sum
@@ -115,21 +91,13 @@ class account_analytic_account(osv.osv):
         return dict([(i, res[i]) for i in ids ])
 
     def _quantity_calc(self, cr, uid, ids, name, arg, context={}):
-#        XXX must convert into one uom
-        if 'date_start' in context and context['date_start']:
-            date_start = context['date_start']
-        else:
-            date_start = time.strftime('%Y-01-01')
-        if 'date_stop' in context and context['date_stop']:
-            date_stop = context['date_stop']
-        else:
-            date_stop = time.strftime('%Y-%m-%d')
+        #XXX must convert into one uom
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         acc_set = ",".join(map(str, ids2))
-        cr.execute("SELECT a.id, COALESCE(SUM(l.unit_amount), 0) \
+        cr.execute('SELECT a.id, COALESCE(SUM(l.unit_amount), 0) \
                 FROM account_analytic_account a \
                     LEFT JOIN account_analytic_line l ON (a.id = l.account_id) \
-                WHERE a.id IN (%s) AND (l.date BETWEEN '%s' and '%s') GROUP BY a.id" % (acc_set,date_start,date_stop))
+                WHERE a.id IN ('+acc_set+') GROUP BY a.id')
         res = {}
         for account_id, sum in cr.fetchall():
             res[account_id] = sum
@@ -139,8 +107,6 @@ class account_analytic_account(osv.osv):
                 if child <> id:
                     res.setdefault(id, 0.0)
                     res[id] += res.get(child, 0.0)
-            if not id in res:
-                res.setdefault(id, 0.0)
         return dict([(i, res[i]) for i in ids])
 
     def name_get(self, cr, uid, ids, context={}):
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 11975d9a6b8..74ce6a354e9 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -88,25 +88,12 @@
              <field name="view_mode">form,graph</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
         </record>
-        
         <menuitem
             action="action_account_analytic_account_tree2"
             id="account_analytic_def_chart"
-<<<<<<< TREE
-            parent="account.account_analytic_def_account"/>
-        
-      <!--
-      	OVERRIDDEN BY NEW WIZARD
-=======
             parent="account_analytic_def_account"/>
->>>>>>> MERGE-SOURCE
         <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>
-        -->
 
-		<wizard id="action_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.line1" string="Analytic Chart of Accounts"/>
-        
-		<menuitem type="wizard" icon="STOCK_INDENT" action="action_analytic_account_chart" id="account_analytic_chart" parent="account.menu_finance_charts" name="Analytic Account lines"/>
-        
 		<record id="analytic_account_form" model="ir.actions.act_window">
             <field name="name">New Analytic Account</field>
             <field name="res_model">account.analytic.account</field>
diff --git a/addons/account/project/wizard/__init__.py b/addons/account/project/wizard/__init__.py
index 66cce97becb..477e5262a00 100644
--- a/addons/account/project/wizard/__init__.py
+++ b/addons/account/project/wizard/__init__.py
@@ -35,7 +35,6 @@ import wizard_account_analytic_cost_ledger_report
 import wizard_account_analytic_cost_ledger_for_journal_report
 import wizard_account_analytic_analytic_check
 import wizard_account_analytic_line
-import wizard_account_analytic_line1
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account/project/wizard/wizard_account_analytic_line1.py b/addons/account/project/wizard/wizard_account_analytic_line1.py
deleted file mode 100644
index c8e0d3952e6..00000000000
--- a/addons/account/project/wizard/wizard_account_analytic_line1.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#
-# $Id$
-#
-# 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 contract 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.
-#
-##############################################################################
-
-import wizard
-import pooler
-import time
-
-def _action_open_window(self, cr, uid, data, context): 
-    domain=[]
-    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('account.analytic.account.tree', 'tree'))
-    view_res = cr.fetchone()
-    return {
-        'name': 'Analytic Entries',
-        'view_type': 'tree',
-        "view_mode": 'tree,form',
-        'res_model': 'account.analytic.account',
-        'type': 'ir.actions.act_window',
-        'view_id' : view_res,
-        'domain' :[('parent_id','=',False)],
-        'context':{'date_start':data['form']['from_date'],'date_stop':data['form']['to_date']},
-        }
-
-
-class account_analytic_line1(wizard.interface):
-    form1 = '''<?xml version="1.0"?>
-    <form string="View Account Analytic Lines">
-        <separator string="Account Analytic Lines Analysis" colspan="4"/>
-        <field name="from_date"/>
-        <newline/>
-        <field name="to_date"/>
-        <newline/>
-        <label string=""/>
-        <label string="(Keep empty to open the current situation)" align="0.0" colspan="3"/>
-    </form>'''
-    form1_fields = {
-             'from_date': {
-                'string': 'From',
-                'type': 'date',
-        },
-             'to_date': {
-                'string': 'To',
-                'type': 'date',
-        },
-    }
-
-    states = {
-      'init': {
-            'actions': [],
-            'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, 'state': [('end', 'Cancel','gtk-cancel'),('open', 'Open Entries','gtk-ok')]}
-        },
-    'open': {
-            'actions': [],
-            'result': {'type': 'action', 'action': _action_open_window, 'state':'end'}
-        }
-    }
-account_analytic_line1('account.analytic.line1')
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index be2c3f74ca1..d9da837198f 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -35,13 +35,13 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
         'sale_warn' : fields.boolean('Sale Order'),
-        'sale_warn_msg' : fields.char('Message for Sale Order', size=64),
+        'sale_warn_msg' : fields.text('Message for Sale Order'),
         'purchase_warn' : fields.boolean('Purchase Order'),
-        'purchase_warn_msg' : fields.char('Message for Purchase Order', size=64),
+        'purchase_warn_msg' : fields.text('Message for Purchase Order'),
         'picking_warn' : fields.boolean('Stock Picking'),
-        'picking_warn_msg' : fields.char('Message for Stock Picking', size=64),
+        'picking_warn_msg' : fields.text('Message for Stock Picking'),
         'invoice_warn' : fields.boolean('Invoice'),
-        'invoice_warn_msg' : fields.char('Message for Invoice', size=64),
+        'invoice_warn_msg' : fields.text('Message for Invoice'),
     }
 res_partner()
 
@@ -56,8 +56,10 @@ class sale_order(osv.osv):
         message=False
         partner = self.pool.get('res.partner').browse(cr, uid, part)
         if partner.sale_warn:
-            title= "Message",
-            message=partner.sale_warn_msg
+           warning={
+                'title': "Message",
+                'message': partner.sale_warn_msg
+                }
              
         result =  super(sale_order, self).onchange_partner_id(cr, uid, ids, part)['value']
         if result.get('warning',False):
@@ -132,9 +134,9 @@ class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
                  'sale_line_warn' : fields.boolean('Sale Order Line'),
-                 'sale_line_warn_msg' : fields.char('Message for Sale Order Line', size=64),
+                 'sale_line_warn_msg' : fields.text('Message for Sale Order Line'),
                  'purchase_line_warn' : fields.boolean('Purchase Order Line'),
-                 'purchase_line_warn_msg' : fields.char('Message for Purchase Order Line', size=64),
+                 'purchase_line_warn_msg' : fields.text('Message for Purchase Order Line'),
                  }
 product_product()
 

From 4fa91c87fc7fb51faad8659b30ac6b43259a2e57 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Mon, 27 Oct 2008 12:53:37 +0530
Subject: [PATCH 25/72] Minor changes for conflict resolving

bzr revid: ruchakpatel@gmail.com-20081027072337-pyoysalztysqui3u
---
 addons/account/account_invoice_view.xml            |  5 +----
 addons/account/invoice.py                          |  5 ++---
 .../wizard/wizard_account_balance_report.py        |  4 ++--
 addons/product/product.py                          |  4 ----
 addons/product/product_view.xml                    | 14 ++------------
 5 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index f005cc7aac4..1c4ef5546c7 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -53,10 +53,7 @@
                     <notebook>
                         <page string="Line">
                             <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id)" select="1"/>
-                            <field name="uos_id"
-                            context="product_id=product_id"
-                            on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id)"          
-                            />
+                            <field name="uos_id"/>
                             <field name="quantity" select="1"/>
                             <field name="price_unit" select="1"/>
                             <field name="discount"/>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 882be5e587e..8e236c6879c 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -850,7 +850,7 @@ class account_invoice_line(osv.osv):
             if type in ('in_invoice', 'in_refund'):
                 return {'domain':{'product_uom':[]}}
             else:
-                return {'value': {'price_unit': 0.0 }, 'domain':{'uos_id': []}}
+                return {'value': {'price_unit': 0.0}, 'domain':{'product_uom':[]}}
         lang=False
         context.update({'lang': lang})
         res = self.pool.get('product.product').browse(cr, uid, product, context=context)
@@ -884,12 +884,11 @@ class account_invoice_line(osv.osv):
             result['account_id'] = a
 
         domain = {}
-        result['uos_id'] = res.uom_id.id or uom or False
+        result['uos_id'] = uom or res.uom_id.id or False
         if result['uos_id']:
             res2 = res.uom_id.category_id.id
             if res2 :
                 domain = {'uos_id':[('category_id','=',res2 )]}
-                result
         return {'value':result, 'domain':domain}
 
     def move_line_get(self, cr, uid, invoice_id, context={}):
diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py
index d02907f72cc..8e3b2a142c9 100644
--- a/addons/account/wizard/wizard_account_balance_report.py
+++ b/addons/account/wizard/wizard_account_balance_report.py
@@ -69,8 +69,8 @@ period_fields = {
         'help':'Keep empty for all open fiscal year'
     },
     'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty'},
-    'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With Movements'),('bal_solde','With Balance != 0'),('bal_all','All')]},
-    'date_from': {'string':"          Start date",'type':'date','required':True ,'default': lambda *a: time.strftime('%Y-01-01')},
+    'display_account':{'string':"Display accounts ",'type':'selection','selection':[('bal_mouvement','With movements'),('bal_all','All'),('bal_solde','With balance is not equal to 0')]},
+    'date_from': {'string':"Start date",'type':'date','required':True ,'default': lambda *a: time.strftime('%Y-01-01')},
     'date_to': {'string':"End date",'type':'date','required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
 }
 
diff --git a/addons/product/product.py b/addons/product/product.py
index 757abb2df8a..3b1b78b7241 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -271,10 +271,6 @@ class product_template(osv.osv):
             help='Coefficient to convert UOM to UOS\n'
             ' uom = uos * coeff'),
         'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True),
-        'track_production' : fields.boolean('Track Production Lots' , help="Force to use a Production Lot number during Production"),
-        'track_incoming' : fields.boolean('Track Incomming Lots', help="Force to use a Production Lot number during Purchase"),
-        'track_outgoing' : fields.boolean('Track Outging Lots', help="Force to use a Production Lot number during Sale"),
-        'track_other' : fields.boolean('Track Lots', help="Force to use a Production Lot number during stock operations for traceability."),
         'seller_delay': fields.function(_calc_seller_delay, method=True, type='integer', string='Supplier Lead Time', help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
         'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
         'loc_rack': fields.char('Rack', size=16),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a81fe9c3476..30b07fe8f74 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -67,20 +67,10 @@
                                 <field groups="base.group_extended" name="product_manager" select="2"/>
                             </group>
 
-                            <group colspan="2" col="2" name="lot">
-                                <separator string="Lots" colspan="2"/>
-                                <group colspan="2" col="2" name="uom">
+                            <group colspan="2" col="2" name="uom">
+                                <separator string="UOM" colspan="2"/>
                                 <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
                                 <field name="uom_po_id"/>
-                                </group>
-                                <group colspan="1" col="2" name="tracking1">
-                                <field name="track_production"/>
-                                <field name="track_incoming"/>
-                                </group>
-                                <group colspan="1" col="2" name="tracking2">
-                                <field name="track_outgoing"/>
-                                <field name="track_other"/>
-                                </group>
                             </group>
 
                             <group colspan="2" col="2" name="uos" groups="product.group_uos">

From 3d192a9e28e9567e029b182e0fbcc4f160328499 Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Wed, 5 Nov 2008 12:54:30 +0530
Subject: [PATCH 26/72] Changes according to addons resolving conflicts

bzr revid: ruchakpatel@gmail.com-20081105072430-wp3rr261q1ar8yck
---
 addons/account_voucher/__init__.py            |  24 ++++-
 addons/account_voucher/__terp__.py            |  21 ++++
 addons/account_voucher/report/__init__.py     |  21 ++++
 .../account_voucher/report/report_voucher.py  |  33 +++---
 .../report/report_voucher_amount.py           |  33 +++---
 addons/account_voucher/voucher.py             |  51 ++++++---
 addons/account_voucher/voucher_account.py     |  21 ++++
 addons/account_voucher/voucher_view.xml       |   7 +-
 addons/account_voucher/wizard/__init__.py     |  23 +++-
 addons/account_voucher/wizard/open_voucher.py |  34 +++---
 addons/mrp/mrp.py                             |  62 ++++++++---
 addons/stock/stock_view.xml                   | 100 ++++++++----------
 12 files changed, 283 insertions(+), 147 deletions(-)

diff --git a/addons/account_voucher/__init__.py b/addons/account_voucher/__init__.py
index 71118c9f783..a5eeb4d4b27 100755
--- a/addons/account_voucher/__init__.py
+++ b/addons/account_voucher/__init__.py
@@ -1,3 +1,25 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
 import voucher
 import voucher_account
-import report
\ No newline at end of file
+import report
diff --git a/addons/account_voucher/__terp__.py b/addons/account_voucher/__terp__.py
index 97105b77379..8b63b59102a 100755
--- a/addons/account_voucher/__terp__.py
+++ b/addons/account_voucher/__terp__.py
@@ -1,3 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
 {
     "name" : "India Accounting",
     "version" : "1.0",
diff --git a/addons/account_voucher/report/__init__.py b/addons/account_voucher/report/__init__.py
index c55dad59fef..e308e24d3f8 100755
--- a/addons/account_voucher/report/__init__.py
+++ b/addons/account_voucher/report/__init__.py
@@ -1,2 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
 import report_voucher
 import report_voucher_amount
\ No newline at end of file
diff --git a/addons/account_voucher/report/report_voucher.py b/addons/account_voucher/report/report_voucher.py
index b3e3c686f58..d46489aab4a 100755
--- a/addons/account_voucher/report/report_voucher.py
+++ b/addons/account_voucher/report/report_voucher.py
@@ -1,27 +1,22 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
-# 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 contract 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 3 of the License, or
+#    (at your option) any later version.
 #
-# 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.
 #
-# 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.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/account_voucher/report/report_voucher_amount.py b/addons/account_voucher/report/report_voucher_amount.py
index 3b67ff7a9ac..98a409acb04 100755
--- a/addons/account_voucher/report/report_voucher_amount.py
+++ b/addons/account_voucher/report/report_voucher_amount.py
@@ -1,27 +1,22 @@
+# -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
-# 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 contract 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 3 of the License, or
+#    (at your option) any later version.
 #
-# 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.
 #
-# 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.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index d3b3343395c..9903f13ffa9 100755
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -1,3 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
 import time
 import netsvc
 from osv import fields, osv
@@ -8,7 +29,6 @@ from mx.DateTime import RelativeDateTime
 
 from tools import config
 
-
 class account_voucher(osv.osv):
     def _get_period(self, cr, uid, context):
         periods = self.pool.get('account.period').find(cr, uid)
@@ -24,10 +44,8 @@ class account_voucher(osv.osv):
     def _get_reference_type(self, cursor, user, context=None):
         return [('none', 'Free Reference')]
     
-    
-    
     def _get_journal(self, cr, uid, context):
-        type_inv = context.get('type', 'rec_voucher')
+        type_inv = context #.get('type', 'rec_voucher')
         type2journal = {'rec_voucher': 'cash', 'bank_rec_voucher': 'cash','pay_voucher': 'cash','bank_pay_voucher': 'cash', 'cont_voucher': 'cash','journal_sale_voucher': 'sale','journal_pur_voucher': 'purchase' }
         journal_obj = self.pool.get('account.journal')
         res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'cash'))], limit=1)
@@ -72,8 +90,7 @@ class account_voucher(osv.osv):
                      ('cancel','Cancel')
                     ], 'State', 
                     readonly=True),
-        'amount':fields.float('Amount', readonly=True),
-#        , states={'draft':[('readonly',False)]}
+        'amount':fields.float('Amount'),
         'number':fields.char('Number', size=32, readonly=True),
         'reference': fields.char('Voucher Reference', size=64),
         'reference_type': fields.selection(_get_reference_type, 'Reference Type',
@@ -147,11 +164,13 @@ class account_voucher(osv.osv):
         self.write(cr,uid,ids,{'amount':total})
         self.write(cr, uid, ids, {'state':'proforma'})
         return True
+    
     def proforma_voucher(self, cr, uid, ids, context={}):
         self.action_move_line_create(cr, uid, ids)
         self.action_number(cr, uid, ids)
         self.write(cr, uid, ids, {'state':'posted'})
         return True
+    
     def cancel_voucher(self,cr,uid,ids,context={}):
         self.action_cancel(cr, uid, ids)
         self.write(cr, uid, ids, {'state':'cancel'})
@@ -192,12 +211,13 @@ class account_voucher(osv.osv):
                     ref = inv.reference
                 else:
                     ref = self._convert_ref(cr, uid, inv.number)
+                
                 il['analytic_lines'] = [(0,0, {
                     'name': il['name'],
                     'date': inv['date'],
                     'account_id': il['account_analytic_id'],
                     'amount': inv['amount'] * sign,
-                    'partner_id': il['partner_id'] or False,
+                    #'partner_id': il['partner_id'] or False,
                     'general_account_id': il['account_id'] or False,
                     'journal_id': self._get_journal(cr, uid, inv.type),
                     'ref': ref,
@@ -206,10 +226,14 @@ class account_voucher(osv.osv):
         return iml
     
     def action_move_line_create(self, cr, uid, ids, *args):
+        
         for inv in self.browse(cr, uid, ids):
+            
             if inv.move_id:
                 continue
+            
             company_currency = inv.company_id.currency_id.id
+            
             # create the analytical lines
             line_ids = self.read(cr, uid, [inv.id], ['payment_ids'])[0]['payment_ids']
             ils = self.pool.get('account.voucher.line').read(cr, uid, line_ids)
@@ -256,13 +280,12 @@ class account_voucher(osv.osv):
                 'currency_id': diff_currency_p \
                         and inv.currency_id.id or False,
                 'ref': ref
-                })
+            })
 
             date = inv.date
             inv.amount=total
 
-
-            line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x,date, context={})) ,iml)
+            line = map(lambda x:(0, 0, self.line_get_convert(cr, uid, x,date, context={})), iml)
 
             journal_id = inv.journal_id.id #self._get_journal(cr, uid, {'type': inv['type']})
             journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
@@ -270,6 +293,7 @@ class account_voucher(osv.osv):
                 name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
 
             move = {'name': name, 'line_id': line, 'journal_id': journal_id}
+            
             if inv.period_id:
                 move['period_id'] = inv.period_id.id
                 for i in line:
@@ -280,12 +304,9 @@ class account_voucher(osv.osv):
             obj=self.pool.get('account.move').browse(cr,uid,move_id)
             for line in obj.line_id :
                 cr.execute('insert into voucher_id (account_id,rel_account_move) values (%d, %d)',(int(ids[0]),int(line.id)))
-#            self.pool.get('account.move').post(cr, uid, [move_id])
-#        self._log_event(cr, uid, ids)
-        return True
-            
 
-    
+        return True
+
     def line_get_convert(self, cr, uid, x, date, context={}):
         return {
             'date':date,
diff --git a/addons/account_voucher/voucher_account.py b/addons/account_voucher/voucher_account.py
index 928a546145d..ce08380ad36 100644
--- a/addons/account_voucher/voucher_account.py
+++ b/addons/account_voucher/voucher_account.py
@@ -1,3 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
 import time
 import netsvc
 from osv import fields, osv
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 5b625f1c267..a1f6907c701 100755
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -30,13 +30,14 @@
 							<field name="name" select="1"/>
 							<field name="journal_id" select="1" on_change="onchange_journal(journal_id,type)"/>
 							<field name="account_id" select="2" on_change="onchange_account(account_id)"/>
-							<field name="amount" select="1" required="1"/>
+							<field name="amount" select="1"/>
 							<newline/>
 							<field name="payment_ids" colspan="4" nolabel="1">
 								<tree string="Voucher Lines" editable="top">
+									<field name="account_analytic_id"/>
 									<field name="partner_id" on_change="onchange_partner(partner_id,type,parent.type)"/>
-									<field name="account_id" groups="base.group_system"/>
-									<field name="name" groups="base.group_system"/>
+									<field name="account_id"/>
+									<field name="name"/>
 									<field name="ref"/>
 									<field name="amount"/>
 									<field name="type"/>
diff --git a/addons/account_voucher/wizard/__init__.py b/addons/account_voucher/wizard/__init__.py
index e347d6dc636..6feb2189437 100644
--- a/addons/account_voucher/wizard/__init__.py
+++ b/addons/account_voucher/wizard/__init__.py
@@ -1 +1,22 @@
-import open_voucher
\ No newline at end of file
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import open_voucher
diff --git a/addons/account_voucher/wizard/open_voucher.py b/addons/account_voucher/wizard/open_voucher.py
index e0c592fe2e7..31d6e7bb24e 100644
--- a/addons/account_voucher/wizard/open_voucher.py
+++ b/addons/account_voucher/wizard/open_voucher.py
@@ -1,30 +1,22 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
 #
-# $Id$
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
 #
-# 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 contract a Free Software
-# Service Company
+#    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.
 #
-# 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.
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index e1b9bfe96d2..3cd4a73ec39 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -133,7 +133,8 @@ class mrp_routing_workcenter(osv.osv):
         'workcenter_id': fields.many2one('mrp.workcenter', 'Workcenter', required=True),
         'name': fields.char('Name', size=64, required=True),
         'sequence': fields.integer('Sequence'),
-        'cycle_nbr': fields.float('Number of Cycle', required=True),
+        'cycle_nbr': fields.float('Number of Cycle', required=True,
+            help="A cycle is defined in the workcenter definition."),
         'hour_nbr': fields.float('Number of Hours', required=True),
         'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True),
         'note': fields.text('Description')
@@ -176,10 +177,14 @@ class mrp_bom(osv.osv):
         'name': fields.char('Name', size=64, required=True),
         'code': fields.char('Code', size=16),
         'active': fields.boolean('Active'),
-        'type': fields.selection([('normal','Normal BoM'),('phantom','Sets / Phantom')], 'BoM Type', required=True, help="Use a phantom bill of material in lines that have a sub-bom and that have to be automatically computed in one line, without having two production orders."),
-
+        'type': fields.selection([('normal','Normal BoM'),('phantom','Sets / Phantom')], 'BoM Type', required=True, help=
+            "Use a phantom bill of material in raw materials lines that have to be " \
+            "automatically computed in on eproduction order and not one per level." \
+            "If you put \"Phantom/Set\" at the root level of a bill of material " \
+            "it is considered as a set or pack: the products are replaced by the components " \
+            "between the sale order to the picking without going through the production order." \
+            "The normal BoM will generate one production order per BoM level."),
         'method': fields.function(_compute_type, string='Method', method=True, type='selection', selection=[('',''),('stock','On Stock'),('order','On Order'),('set','Set / Pack')]),
-
         'date_start': fields.date('Valid From', help="Validity of this BoM or component. Keep empty if it's always valid."),
         'date_stop': fields.date('Valid Until', help="Validity of this BoM or component. Keep empty if it's always valid."),
         'sequence': fields.integer('Sequence'),
@@ -189,8 +194,8 @@ class mrp_bom(osv.osv):
         'product_uos': fields.many2one('product.uom', 'Product UOS'),
         'product_qty': fields.float('Product Qty', required=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
-        'product_rounding': fields.float('Product Rounding'),
-        'product_efficiency': fields.float('Product Efficiency', required=True),
+        'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity. For integer only values, put 1.0"),
+        'product_efficiency': fields.float('Product Efficiency', required=True, help="Efficiency on the production. A factor of 0.9 means a loss of 10% in the production."),
         'bom_lines': fields.one2many('mrp.bom', 'bom_id', 'BoM Lines'),
         'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True),
         'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of workcenters) to produce the finnished product. The routing is mainly used to compute workcenter costs during operations and to plan futur loads on workcenters based on production plannification."),
@@ -209,7 +214,8 @@ class mrp_bom(osv.osv):
     }
     _order = "sequence"
     _sql_constraints = [
-        ('bom_qty_zero', 'CHECK (product_qty>0)',  'All product quantities must be greater than 0 !'),
+        ('bom_qty_zero', 'CHECK (product_qty>0)',  'All product quantities must be greater than 0.\n' \
+            'You should install the mrp_subproduct module if you want to manage extra products on BoMs !'),
     ]
 
     def _check_recursion(self, cr, uid, ids):
@@ -380,8 +386,10 @@ class mrp_production(osv.osv):
         'product_uos_qty': fields.float('Product Qty'),
         'product_uos': fields.many2one('product.uom', 'Product UOM'),
 
-        'location_src_id': fields.many2one('stock.location', 'Raw Products Location', required=True),
-        'location_dest_id': fields.many2one('stock.location', 'Finnished Products Location', required=True),
+        'location_src_id': fields.many2one('stock.location', 'Raw Products Location', required=True,
+            help="Location where the system will look for products used in raw materials."),
+        'location_dest_id': fields.many2one('stock.location', 'Finnished Products Location', required=True,
+            help="Location where the system will stock the finnished products."),
 
         'date_planned': fields.datetime('Scheduled date', required=True, select=1),
         'date_start': fields.datetime('Start Date'),
@@ -389,7 +397,8 @@ class mrp_production(osv.osv):
 
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
 
-        'picking_id': fields.many2one('stock.picking', 'Packing list', readonly=True),
+        'picking_id': fields.many2one('stock.picking', 'Packing list', readonly=True,
+            help="This is the internal picking list take bring the raw materials to the production plan."),
         'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
         'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products Consummed'),
 
@@ -734,7 +743,9 @@ class mrp_procurement(osv.osv):
     _description = "Procurement"
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'origin': fields.char('Origin', size=64),
+        'origin': fields.char('Origin', size=64,
+            help="Reference of the document that created this procurement.\n"
+            "This is automatically completed by Open ERP."),
         'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True),
         'date_planned': fields.datetime('Scheduled date', required=True),
         'date_close': fields.datetime('Date Closed'),
@@ -749,7 +760,9 @@ class mrp_procurement(osv.osv):
 
         'close_move': fields.boolean('Close Move at end', required=True),
         'location_id': fields.many2one('stock.location', 'Location', required=True),
-        'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]}, readonly=True, required=True),
+        'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
+            readonly=True, required=True, help="If you encode manually a procurement, you probably want to use" \
+            " a make to order method."),
 
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
         'purchase_line_id': fields.many2one('purchase.order.line', 'Purchase Order Line'),
@@ -766,6 +779,15 @@ class mrp_procurement(osv.osv):
         'close_move': lambda *a: 0,
         'procure_method': lambda *a: 'make_to_order',
     }
+    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+        if product_id:
+            w=self.pool.get('product.product').browse(cr,uid,product_id, context)
+            v = {
+                'product_uom':w.uom_id.id,
+                'product_uos':w.uos_id and w.uos_id.id or w.uom_id.id
+            }
+            return {'value': v}
+        return {}
     
     def unlink(self, cr, uid, ids):
         procurements = self.read(cr, uid, ids, ['state'])
@@ -1088,9 +1110,14 @@ class stock_warehouse_orderpoint(osv.osv):
         'location_id': fields.many2one('stock.location', 'Location', required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','=','product')]),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
-        'product_min_qty': fields.float('Min Quantity', required=True),
-        'product_max_qty': fields.float('Max Quantity', required=True),
-        'qty_multiple': fields.integer('Qty Multiple', required=True),
+        'product_min_qty': fields.float('Min Quantity', required=True,
+            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+            "a procurement to bring the virtual stock to the Max Quantity."),
+        'product_max_qty': fields.float('Max Quantity', required=True,
+            help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
+            "a procurement to bring the virtual stock to the Max Quantity."),
+        'qty_multiple': fields.integer('Qty Multiple', required=True,
+            help="The procurement quantity will by rounded up to this multiple."),
         'procurement_id': fields.many2one('mrp.procurement', 'Purchase Order')
     }
     _defaults = {
@@ -1120,6 +1147,11 @@ class StockMove(osv.osv):
     _columns = {
         'procurements': fields.one2many('mrp.procurement', 'move_id', 'Procurements'),
     }
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = default or {}
+        default['procurements'] = []
+        return super(StockMove, self).copy(cr, uid, id, default, context)
+
     def _action_explode(self, cr, uid, move, context={}):
         if move.product_id.supply_method=='produce' and move.product_id.procure_method=='make_to_order':
             bis = self.pool.get('mrp.bom').search(cr, uid, [
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 59225c0e361..d4fbbfbe9d6 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -264,15 +264,15 @@
             </field>
         </record>
 
-        <wizard 
-            id="action_lot2" 
-            model="stock.production.lot" 
-            name="stock.traceability.lot.amont" 
+        <wizard
+            id="action_lot2"
+            model="stock.production.lot"
+            name="stock.traceability.lot.amont"
             string="Downstream traceability"/>
-        <wizard 
-            id="action_lot4" 
-            model="stock.production.lot" 
-            name="stock.traceability.lot.aval" 
+        <wizard
+            id="action_lot4"
+            model="stock.production.lot"
+            name="stock.traceability.lot.aval"
             string="Upstream traceability"/>
 
         <wizard id="action2" model="stock.tracking" name="stock.traceability.amont" string="Upstream traceability"/>
@@ -448,7 +448,7 @@
                 <form string="Move Lines">
                     <field name="address_id" invisible="True" context="{'context_display':'partner'}"/>
                     <field name="picking_id" invisible="True"/>
-                    <field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned'])]" name="move_ids" select="1"/><newline/>
+                    <field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1"/><newline/>
                     <group colspan="4">
                         <button special="cancel" string="Cancel"/>
                         <button name="action_move" string="Add" type="object"/>
@@ -608,6 +608,7 @@
                         <field name="name" select="1" readonly="1"/>
                         <field name="min_date" select="1"/>
                         <field name="backorder_id" select="2" readonly="1"/>
+                        <field name="origin" select="2"/>
                     </group>
                         <notebook colspan="4">
                         <page string="General Information">
@@ -794,8 +795,9 @@
                         <field name="address_id" select="2"/>
                         <field name="name" select="1" readonly="1"/>
                         <field name="min_date" select="2"/>
-						<field name="invoice_state"/>
+                        <field name="invoice_state"/>
                         <field name="backorder_id" select="2" readonly="1"/>
+                        <field name="origin" select="2" readonly="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -855,7 +857,7 @@
         </record>
 
         <record id="action_picking_tree" model="ir.actions.act_window">
-            <field name="name">Sending Products</field>
+            <field name="name">Outgoing Products</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1036,7 +1038,7 @@
 
 
         <record id="action_picking_tree4" model="ir.actions.act_window">
-            <field name="name">Getting Products</field>
+            <field name="name">Incoming Products</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1120,7 +1122,7 @@
         <menuitem action="action_picking_form" id="menu_action_picking_form" parent="menu_action_picking_tree4"/>
 
         <record id="action_picking_tree6" model="ir.actions.act_window">
-            <field name="name">Internal Packings</field>
+            <field name="name">Internal Moves</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1302,59 +1304,51 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_stock_configuration"/>		
+        <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_stock_configuration"/>
 
-        <act_window context="{'location': active_id}" domain="[('type','&lt;&gt;','service')]" id="act_product_location_open" name="Products" res_model="product.product" src_model="stock.location"/>
+        <act_window
+            context="{'location': active_id}"
+            domain="[('type','&lt;&gt;','service')]"
+            id="act_product_location_open"
+            name="Products"
+            res_model="product.product"
+            src_model="stock.location"/>
 
-        <act_window context="{'location': active_id}" domain="[('product_id','=',active_id)]" id="act_product_stock_move_open" name="Stock Moves" res_model="stock.move" src_model="product.product"/>
-  
-		<record id="ir_act_product_location_open" model="ir.values">
+        <act_window
+            context="{'location': active_id}"
+            domain="[('product_id','=',active_id)]"
+            id="act_product_stock_move_open"
+            name="All Stock Moves"
+            res_model="stock.move" 
+            src_model="product.product"/>
+
+        <act_window
+            context="{'location': active_id}"
+            domain="[('product_id','=',active_id),('state','in',('waiting','confirmed','assigned'))]"
+            id="act_product_stock_move_futur_open"
+            name="Futur Stock Moves"
+            res_model="stock.move" 
+            src_model="product.product"/>
+
+        <record id="ir_act_product_location_open" model="ir.values">
             <field name="key2">tree_but_open</field>
             <field name="model">stock.location</field>
             <field name="name">Products</field>
             <field eval="'ir.actions.act_window,%d'%act_product_location_open" name="value"/>
             <field eval="True" name="object"/>
-        </record>     
+        </record>    
 
-		
-		<record id="ir_act_product_location_open" model="ir.values">
+
+        <record id="ir_act_product_location_open" model="ir.values">
             <field name="key2">tree_but_open</field>
             <field name="model">stock.location</field>
             <field name="name">Open Products</field>
             <field eval="'ir.actions.wizard,%d'%ref('location_product')" name="value"/>
-            <field eval="True" name="object"/>			
-        </record>   
+            <field eval="True" name="object"/>
+        </record>  
+
+         
 
-		
-	      <record id="report_stock_latest_tree" model="ir.ui.view">
-            <field name="name">report.inventory.latest.view</field>
-            <field name="model">report.inventory.latest</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Latest inventories by product">
-                    <field name="product" select="1"/>
-                    <field name="qty" select="1"/>
-                    <field name="uom"/>
-                    <field name="inventory"/>
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record id="action_report_stock_latest_form" model="ir.actions.act_window">
-            <field name="name">Latest Inventories by product</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">report.inventory.latest</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-            <field name="domain">[('name','&gt;=',time.strftime('%Y-%m-01'))]</field>
-        </record>
-         <menuitem
-            id="next_id_61"
-            name="Reporting"
-            parent="stock.menu_stock_root"/>
-        <menuitem action="action_report_stock_latest_form" id="menu_report_stock_latest" parent="next_id_61"/>
-        
 
     </data>
 </openerp>

From 12b84d1dcd68bf3d091bb551a66338ffe9ae2dec Mon Sep 17 00:00:00 2001
From: Rucha Patel <ruchakpatel@gmail.com>
Date: Wed, 5 Nov 2008 14:05:51 +0530
Subject: [PATCH 27/72] My Changes(warning.py,mrp.py) that are left to be
 included in Merge

bzr revid: ruchakpatel@gmail.com-20081105083551-q7b1zpvnothdszr1
---
 addons/mrp/mrp.py         | 12 ++++++++++++
 addons/warning/warning.py |  8 +++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 28faa765a8c..b5f16ab3270 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -771,6 +771,18 @@ class mrp_procurement(osv.osv):
         'close_move': lambda *a: 0,
         'procure_method': lambda *a: 'make_to_order',
     }
+     
+    def unlink(self, cr, uid, ids):
+        procurements = self.read(cr, uid, ids, ['state'])
+        unlink_ids = []
+        for s in procurements:
+            if s['state'] in ['draft','cancel']:
+                unlink_ids.append(s['id'])
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state']))
+        osv.osv.unlink(self, cr, uid, unlink_ids)
+        return True
+    
     def onchange_product_id(self, cr, uid, ids, product_id, context={}):
         if product_id:
             w=self.pool.get('product.product').browse(cr,uid,product_id, context)
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index 6eac261b0dc..adc68a4c964 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -48,8 +48,10 @@ class sale_order(osv.osv):
         message=False
         partner = self.pool.get('res.partner').browse(cr, uid, part)
         if partner.sale_warn:
-            title= "Message",
-            message=partner.sale_warn_msg
+           warning={
+                'title': "Message",
+                'message': partner.sale_warn_msg
+                }
              
         result =  super(sale_order, self).onchange_partner_id(cr, uid, ids, part)['value']
         if result.get('warning',False):
@@ -127,7 +129,7 @@ class product_product(osv.osv):
          'sale_line_warn_msg' : fields.text('Message for Sale Order Line'),
          'purchase_line_warn' : fields.boolean('Purchase Order Line'),
          'purchase_line_warn_msg' : fields.text('Message for Purchase Order Line'),
-    }
+     }
 product_product()
 
 class sale_order_line(osv.osv):

From 9000f7939651a07267570ba461eaa548dcd24d5c Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Wed, 5 Nov 2008 14:48:50 +0530
Subject: [PATCH 28/72] Both General ledger completed

bzr revid: patelamit2003@gmail.com-20081105091850-944ly91s4zlfrapb
---
 addons/account/report/account_balance.py      |  8 +-
 addons/account/report/general_ledger.py       |  8 +-
 addons/account/report/general_ledger.rml      | 76 +++++++++++--------
 .../report/general_ledger_landscape.py        |  2 +-
 4 files changed, 59 insertions(+), 35 deletions(-)

diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index d39599409a4..a183758b094 100755
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -142,6 +142,7 @@ class account_balance(report_sxw.rml_parse):
                 return cmp(x.code, y.code)
             accounts.sort(cmp_code)
             for account in accounts:
+               
                 if account.id in done:
                     continue
                 done[account.id] = 1
@@ -169,9 +170,11 @@ class account_balance(report_sxw.rml_parse):
                 self.sum_credit += account.credit
                 if not (res['credit'] or res['debit']) and not account.child_id:
                     continue
+               
                 if account.child_id:
                     def _check_rec(account):
                         if not account.child_id:
+                            print"(account.credit or account.debit)",bool(account.credit or account.debit)
                             return bool(account.credit or account.debit)
                         for c in account.child_id:
                             if _check_rec(c):
@@ -187,6 +190,7 @@ class account_balance(report_sxw.rml_parse):
                         result_acc.append(res)
                 else:
                     result_acc.append(res)
+                print"account.id",account.id
                 res1 = self.moveline(form, account.id,res['level'])
                 if res1:
                     for r in res1:
@@ -197,10 +201,12 @@ class account_balance(report_sxw.rml_parse):
                     ids2 = [(x.code,x.id) for x in account.child_id]
                     ids2.sort()
                     result_acc += self.lines(form, [x[1] for x in ids2], done, level+1)
+           
             return result_acc
 
         def moveline(self,form,ids,level):
             res={}
+            print"str(ids)",str(ids)
             self.date_lst_string = '\'' + '\',\''.join(map(str,self.date_lst)) + '\''
             self.cr.execute(
                     "SELECT l.id as lid,l.date,j.code as jname, l.ref, l.name as lname, l.debit as debit1, l.credit as credit1 " \
@@ -227,7 +233,7 @@ class account_balance(report_sxw.rml_parse):
                 r['credit']=''
                 r['balance']=''
                 r['leef']=''
-                if sum > 0.0:
+                if sum >= 0.0:
                     r['bal_type']=" Dr."
                 else:
                     r['bal_type']=" Cr."
diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index e00a594f95f..a2b5f729e67 100755
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -118,6 +118,7 @@ class general_ledger(rml_parse.rml_parse):
 		
 		self.child_ids = self.pool.get('account.account').search(self.cr, self.uid,
 			[('parent_id', 'child_of', self.ids)])
+		
 		res = []
 		ctx = self.context.copy()
 		## We will make the test for period or date
@@ -140,6 +141,7 @@ class general_ledger(rml_parse.rml_parse):
 			child_account = self.pool.get('account.account').browse(self.cr, self.uid, child_id)
 			
 			sold_account = self._sum_solde_account(child_account,form)
+			
 			self.sold_accounts[child_account.id] = sold_account
 			
 			if form['display_account'] == 'bal_mouvement':
@@ -159,7 +161,7 @@ class general_ledger(rml_parse.rml_parse):
 			else:		
 				if child_account.type != 'view' \
 				and len(self.pool.get('account.move.line').search(self.cr, self.uid,
-					[('account_id','=',child_account.id)],
+					[('account_id','>=',child_account.id)],
 					context=ctx)) <> 0 :
 					res.append(child_account)
 		
@@ -167,6 +169,7 @@ class general_ledger(rml_parse.rml_parse):
 	
 		
 		## We will now compute solde initiaux
+		
 		if not len(res):
 			return[account]
 		else:
@@ -270,7 +273,6 @@ class general_ledger(rml_parse.rml_parse):
 	
 	
 	def lines(self, account, form):
-		
 		inv_types = {
 				'out_invoice': 'CI: ',
 				'in_invoice': 'SI: ',
@@ -313,7 +315,7 @@ class general_ledger(rml_parse.rml_parse):
 				l['partner'] = line.partner_id.name
 			else :
 				l['partner'] = ''
-			sum += l['debit'] - l ['credit']
+			sum = l['debit'] - l ['credit']
 			c = time.strptime(l['date'],"%Y-%m-%d")
 			l['date'] = time.strftime("%d-%m-%Y",c)
 			l['progress'] = sum
diff --git a/addons/account/report/general_ledger.rml b/addons/account/report/general_ledger.rml
index 83589f5f497..a18e1777617 100755
--- a/addons/account/report/general_ledger.rml
+++ b/addons/account/report/general_ledger.rml
@@ -35,13 +35,13 @@
 
     <blockTableStyle id="tbl_header">
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-	  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
+	 
       <blockValign value="TOP"/>
     </blockTableStyle>
 
     <blockTableStyle id="tbl_content">
 
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
       <blockValign value="TOP"/>
       
     </blockTableStyle>
@@ -91,9 +91,9 @@
   </stylesheet>
   <story>
     
-  	 <blockTable colWidths="54.0,135.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+  	 <blockTable colWidths="66.0,124.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         <tr>
-          <td><para style="P3">Date</para></td>
+          <td><para style="date">Date</para></td>
           <td><para style="P3">Partner</para></td>
           <td><para style="P3">Ref</para></td>
           <td><para style="P3">Mvt</para></td>
@@ -102,9 +102,10 @@
           <td><para style="P4">Crebit</para></td>
           <td><para style="P9">Balance</para></td>
         </tr>
-        <para>[[ repeatIn(objects, 'a') ]]</para>
-        <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
+       
          <tr>
+         	 <para>[[ repeatIn(objects, 'a') ]]</para>
+        	<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
           <td>
 	        <blockTable colWidths="280.0,100.0,52.5,52.5,52.5" style="Table5">
 			<tr>
@@ -114,25 +115,32 @@
 			  <td alignment="right"><para style="P9b"><u>[[sum_credit_account(o, data['form']) or '0.0' ]]</u></para></td>
 			  <td><para style="P9b"><u>[[sum_solde_account(o, data['form']) or '0.0' ]]</u></para></td>
 			</tr>
+			<tr>
+				<td>[[ repeatIn(lines(o, data['form']), 'line') ]]
+					 <blockTable colWidths="54.0,123.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_content">
+					 <tr>
+			          <td><para style="P3">[[ line['date']  or ''  ]]</para></td>
+			          <td><para style="P3">[[ line['partner'] or '']]</para></td>
+			          <td><para style="P3">[[ line['ref'] or '']]</para></td>
+			          <td><para style="P3">[[ line['move'] or '']]</para></td>
+			          <td><para style="P3">[[ line['name'] or '' ]]</para></td>
+			          <td><para style="P4">[[ line['debit']  or '0.0' ]]</para></td>
+			          <td><para style="P4">[[ line['credit']  or '0.0' ]]</para></td>
+			          <td><para style="P4">[[ line['progress']  or '0.0' ]]</para></td>
+			        </tr>
+					  </blockTable>
+				</td>
+			</tr>
             </blockTable>
            </td>
          </tr>
-         <tr>[[ repeatIn(lines(o, data['form']), 'line') ]]
-          <td><para style="P3">[[ line['date']  or ''  ]]</para></td>
-          <td><para style="P3">[[ line['partner'] or '']]</para></td>
-          <td><para style="P3">[[ line['ref'] or '']]</para></td>
-          <td><para style="P3">[[ line['move'] or '']]</para></td>
-          <td><para style="P3">[[ line['name'] or '' ]]</para></td>
-          <td><para style="P4">[[ line['debit']  or '0.0' ]]</para></td>
-          <td><para style="P4">[[ line['credit']  or '0.0' ]]</para></td>
-          <td><para style="P4">[[ line['progress']  or '0.0' ]]</para></td>
-        </tr>
+         
      </blockTable>
 
 
-     <blockTable colWidths="59.0,105.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+     <blockTable colWidths="72.0,93.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
         <tr>
-          <td><para style="P3">Date</para></td>
+          <td><para style="date">Date</para></td>
           <td><para style="P3">Partner</para></td>
           <td><para style="P3">Ref</para></td>
           <td><para style="P3">Mvt</para></td>
@@ -142,9 +150,10 @@
           <td><para style="P4">Balance</para></td>
           <td><para style="P4">Currency</para></td>
         </tr>
+        
+        <tr>
         <para>[[ repeatIn(objects, 'a') ]]</para>
      	<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
-        <tr>
           <td>
 	      	<blockTable colWidths="264.00,100.0,50.0,50.0,49.0,40.00" style="Table5">
 			<tr>
@@ -155,20 +164,27 @@
 			  <td><para style="P9b"><u>[[sum_solde_account(o, data['form']) or '0.0' ]]</u></para></td>
 			  <td><para style="P9b"><u> [[ sum_currency_amount_account(a, data['form']) or '0.0' ]]</u></para></td>
 			</tr>
+			<tr>
+				<td>[[ repeatIn(lines(o, data['form']), 'line') ]]
+					<blockTable colWidths="59.0,93.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_content">
+						<tr>
+				          <td><para style="P3">[[ line['date'] or '' ]]</para></td>
+				          <td><para style="P3">[[ line['partner'] or '' ]]</para></td>
+				          <td><para style="P3">[[ line['ref'] or '']]</para></td>
+				          <td><para style="P3">[[ line['move'] or '' ]]</para></td>
+				          <td><para style="P3">[[ line['name'] or '' ]]</para></td>
+				          <td><para style="P4">[[ line['debit'] and line['debit'] or '0.0' ]]</para></td>
+				          <td><para style="P4">[[ line['credit'] and line['credit'] or '0.0' ]]</para></td>
+				          <td><para style="P4">[[ line['progress'] and line['progress'] or '0.0' ]]</para></td>
+				          <td><para style="P4">[[ line['amount_currency'] or  '0.0' ]] [[ line['currency_code'] or '']]</para></td>
+				        </tr>
+					</blockTable>
+				</td>
+			</tr>
 	      	</blockTable>
 	      </td>
         </tr>
-      	<tr>[[ repeatIn(lines(o, data['form']), 'line') ]]
-          <td><para style="P3">[[ line['date'] or '' ]]</para></td>
-          <td><para style="P3">[[ line['partner'] or '' ]]</para></td>
-          <td><para style="P3">[[ line['ref'] or '']]</para></td>
-          <td><para style="P3">[[ line['move'] or '' ]]</para></td>
-          <td><para style="P3">[[ line['name'] or '' ]]</para></td>
-          <td><para style="P4">[[ line['debit'] and line['debit'] or '0.0' ]]</para></td>
-          <td><para style="P4">[[ line['credit'] and line['credit'] or '0.0' ]]</para></td>
-          <td><para style="P4">[[ line['progress'] and line['progress'] or '0.0' ]]</para></td>
-          <td><para style="P4">[[ line['amount_currency'] or  '0.0' ]] [[ line['currency_code'] or '']]</para></td>
-        </tr>
+      	
      </blockTable>
 
   </story>
diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py
index 78d6e5bce4e..93c7766073e 100755
--- a/addons/account/report/general_ledger_landscape.py
+++ b/addons/account/report/general_ledger_landscape.py
@@ -220,7 +220,7 @@ class general_ledger_landscape(rml_parse.rml_parse):
 			else:
 				if child_account.type != 'view' \
 				and len(self.pool.get('account.move.line').search(self.cr, self.uid,
-					[('account_id','=',child_account.id)],
+					[('account_id','>=',child_account.id)],
 					context=ctx)) <> 0 :
 					res.append(child_account)
 		##

From 78cd1bc85024651312374483706ae8ff164e25ce Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Wed, 5 Nov 2008 14:52:57 +0530
Subject: [PATCH 29/72] remove print

bzr revid: patelamit2003@gmail.com-20081105092257-nfal73jmcwk85txf
---
 addons/account/report/account_balance.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index a183758b094..98901a7780f 100755
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -174,7 +174,7 @@ class account_balance(report_sxw.rml_parse):
                 if account.child_id:
                     def _check_rec(account):
                         if not account.child_id:
-                            print"(account.credit or account.debit)",bool(account.credit or account.debit)
+                            
                             return bool(account.credit or account.debit)
                         for c in account.child_id:
                             if _check_rec(c):
@@ -190,7 +190,7 @@ class account_balance(report_sxw.rml_parse):
                         result_acc.append(res)
                 else:
                     result_acc.append(res)
-                print"account.id",account.id
+                
                 res1 = self.moveline(form, account.id,res['level'])
                 if res1:
                     for r in res1:
@@ -206,7 +206,7 @@ class account_balance(report_sxw.rml_parse):
 
         def moveline(self,form,ids,level):
             res={}
-            print"str(ids)",str(ids)
+            
             self.date_lst_string = '\'' + '\',\''.join(map(str,self.date_lst)) + '\''
             self.cr.execute(
                     "SELECT l.id as lid,l.date,j.code as jname, l.ref, l.name as lname, l.debit as debit1, l.credit as credit1 " \

From 74f4f831dd8deafc9cc4c17cdafa7a1022ed534f Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Wed, 5 Nov 2008 14:55:04 +0530
Subject: [PATCH 30/72] bug fix on stock

bzr revid: mra@tinyerp.com-20081105092504-jezr3lb9bx4ii9xe
---
 addons/stock/stock.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b4ad96196ec..ed4ce5692ea 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -428,7 +428,7 @@ class stock_picking(osv.osv):
         for picking in self.browse(cr, uid, ids):
             for r in picking.move_lines:
                 if r.state=='draft':
-                    todo.append(r)
+                    todo.append(r.id)
         todo = self.action_explode(cr, uid, todo, context)
         if len(todo):
             self.pool.get('stock.move').action_confirm(cr, uid, todo, context)
@@ -985,8 +985,9 @@ class stock_move(osv.osv):
                     result[m.picking_id].append( (m, dest) )
         return result
 
-    def action_confirm(self, cr, uid, moves, context={}):
-        ids = map(lambda m: m.id, moves)
+    def action_confirm(self, cr, uid, ids, context={}):
+#        ids = map(lambda m: m.id, moves)
+        moves = self.browse(cr, uid, ids)
         self.write(cr, uid, ids, {'state':'confirmed'})
         for picking, todo in self._chain_compute(cr, uid, moves, context).items():
             ptype = self.pool.get('stock.location').picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])

From b6e17178c6ce2f8b3bec356754ac7cb154a9adee Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Wed, 5 Nov 2008 16:36:32 +0530
Subject: [PATCH 31/72] small changes in age trial balance wizard

bzr revid: patelamit2003@gmail.com-20081105110632-5ehzv5ki1z8qtfb8
---
 addons/account/report/account_balance.py           | 4 ++--
 addons/account/wizard/wizard_aged_trial_balance.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 98901a7780f..209c665031b 100755
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -174,7 +174,7 @@ class account_balance(report_sxw.rml_parse):
                 if account.child_id:
                     def _check_rec(account):
                         if not account.child_id:
-                            
+                            print"(account.credit or account.debit)",bool(account.credit or account.debit)
                             return bool(account.credit or account.debit)
                         for c in account.child_id:
                             if _check_rec(c):
@@ -206,7 +206,7 @@ class account_balance(report_sxw.rml_parse):
 
         def moveline(self,form,ids,level):
             res={}
-            
+            print"str(ids)",str(ids)
             self.date_lst_string = '\'' + '\',\''.join(map(str,self.date_lst)) + '\''
             self.cr.execute(
                     "SELECT l.id as lid,l.date,j.code as jname, l.ref, l.name as lname, l.debit as debit1, l.credit as credit1 " \
diff --git a/addons/account/wizard/wizard_aged_trial_balance.py b/addons/account/wizard/wizard_aged_trial_balance.py
index a1b42a59348..51c7994f9df 100755
--- a/addons/account/wizard/wizard_aged_trial_balance.py
+++ b/addons/account/wizard/wizard_aged_trial_balance.py
@@ -46,7 +46,7 @@ _aged_trial_fields = {
     'result_selection':{
         'string':"Filter on Partners",
         'type':'selection',
-        'selection':[('customer','Customer'),('supplier','Supplier'),('all','All')],
+        'selection':[('customer','Receivable'),('supplier','Payable'),('all','Receivable and Payable')],
         'required':True,
         'default': lambda *a: 'customer',
     },

From 5cd9b7f5b4dc04d8928bba426deb983ce6b1dcb9 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Wed, 5 Nov 2008 17:15:50 +0530
Subject: [PATCH 32/72] fix

bzr revid: mra@tinyerp.com-20081105114550-rk3c81o1bspi6yf8
---
 addons/mrp/mrp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 6518fb6783b..612f2461a7c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -1211,7 +1211,7 @@ class StockPicking(osv.osv):
     # Explode picking by replacing phantom BoMs
     #
     def action_explode(self, cr, uid, picks, *args):
-        for move in picks:
+        for move in self.pool.get('stock.move').browse(cr, uid, picks):
             self.pool.get('stock.move')._action_explode(cr, uid, move)
         return picks
 

From 17e08f125aa1edf8189e0e2ec20cb1cd0b89bb9d Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Wed, 5 Nov 2008 18:47:24 +0530
Subject: [PATCH 33/72] third_party_ledger prob solved

bzr revid: patelamit2003@gmail.com-20081105131724-28u739cy016fz1rq
---
 addons/account/report/third_party_ledger.py   |  11 +++++++++--
 .../wizard/wizard_third_party_ledger.py       |   8 ++++----
 addons/l10n_fr/wizard/fpdftemp.fdf            | Bin 14046 -> 14096 bytes
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py
index 0b0d181f37e..050d33be1aa 100755
--- a/addons/account/report/third_party_ledger.py
+++ b/addons/account/report/third_party_ledger.py
@@ -184,19 +184,22 @@ class third_party_ledger(rml_parse.rml_parse):
 		partner_to_use = []
 
 		if data['form']['soldeinit'] :
+			
 			self.cr.execute(
 				"SELECT DISTINCT line.partner_id " \
 				"FROM account_move_line AS line, account_account AS account " \
 				"WHERE line.partner_id IS NOT NULL " \
 					"AND line.account_id = account.id " \
+					"AND line.date >= %s " \
 					"AND line.date <= %s " \
 					"AND line.reconcile_id IS NULL " \
 					"AND line.account_id IN (" + self.account_ids + ") " \
 					" " + PARTNER_REQUEST + " " \
 					"AND account.company_id = %d " \
 					"AND account.active " ,
-				(self.date_lst[len(self.date_lst)-1],data['form']['company_id']))
+				(self.date_lst[0],self.date_lst[len(self.date_lst)-1],data['form']['company_id']))
 		else:
+			
 			self.cr.execute(
 				"SELECT DISTINCT line.partner_id " \
 				"FROM account_move_line AS line, account_account AS account " \
@@ -214,6 +217,7 @@ class third_party_ledger(rml_parse.rml_parse):
 		for res_line in res:
 			    partner_to_use.append(res_line['partner_id'])
 		new_ids = partner_to_use
+		
 		self.partner_ids = ','.join(map(str, new_ids))
 		objects = self.pool.get('res.partner').browse(self.cr, self.uid, new_ids)
 		super(third_party_ledger, self).preprocess(objects, data, new_ids)
@@ -226,6 +230,7 @@ class third_party_ledger(rml_parse.rml_parse):
 		else:
 			RECONCILE_TAG = "AND l.reconcile_id IS NULL"
 		if data['form']['soldeinit'] :
+			
 			self.cr.execute(
 					"SELECT l.id,l.date,j.code, l.ref, l.name, l.debit, l.credit " \
 					"FROM account_move_line l " \
@@ -233,11 +238,12 @@ class third_party_ledger(rml_parse.rml_parse):
 						"ON (l.journal_id = j.id) " \
 					"WHERE l.partner_id = %d " \
 						"AND l.account_id IN (" + self.account_ids + ") " \
-						"AND l.date < %s " \
+						"AND l.date <= %s " \
 						"AND l.reconcile_id IS NULL "
 					"ORDER BY l.id",
 					(partner.id, self.date_lst[0]))
 			res = self.cr.dictfetchall()
+			
 			sum = 0.0
 			for r in res:
 				sum = r['debit'] - r['credit']
@@ -256,6 +262,7 @@ class third_party_ledger(rml_parse.rml_parse):
 					"ORDER BY l.id",
 					(partner.id,))
 		res = self.cr.dictfetchall()
+		
 		sum = 0.0
 		for r in res:
 			sum = r['debit'] - r['credit']
diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py
index 99f661f653c..72aece90c41 100755
--- a/addons/account/wizard/wizard_third_party_ledger.py
+++ b/addons/account/wizard/wizard_third_party_ledger.py
@@ -119,11 +119,11 @@ class wizard_report(wizard.interface):
 	
 	
 	def _check_state(self, cr, uid, data, context):
-		if data['form']['state'] == 'byperiod':
-		   data['form']['fiscalyear'] = True
-		else :
-		   self._check_date(cr, uid, data, context)
+		if data['form']['state'] == 'bydate' or data['form']['state'] == 'all':
 		   data['form']['fiscalyear'] = False
+		else :
+		   data['form']['fiscalyear'] = True
+		   self._check_date(cr, uid, data, context)
 		return data['form']
 
 
diff --git a/addons/l10n_fr/wizard/fpdftemp.fdf b/addons/l10n_fr/wizard/fpdftemp.fdf
index 140a9e5f69c93bb37d56508d81274c329fb09810..649917fce871d706c31a066e3ed756d3cd8ef064 100755
GIT binary patch
delta 460
zcmcbYJ0WjE1B;=FnepU_>f#e;U1!rUH8C*IoZQGEHo1e5pH0Kq($Esb71_LoaVsN}
zk;UXhS&7Nj%x28yrUoEQlg}`lv6`Bg8kvB2n`K!H8Cf)-a+_0GKeDiB7?~P_bZyS%
zVr81_ASSxGhvz;c+}6#le9cUg8`$_KKj7t<tRiT}3{^k5RIqWfJ`+S-NT_|X12>qx
zd8<$%BOAz6Q_abSTq2vTMGiA@Xy_Um8-Se7C?zskSlj~WCaAY2r-_@gX@F(H4&Eew
z9%1=xi6SP5(#?X>A_!MawwGx_GUAR5iV+&JAU{LR-&`rXmJROb$+jx|aL(pr6)k4C
z$~Th@xI{Nk*KlWK1%(jM@f;$PU6>Rm8wjy&medMh0jh+AqvYl`Jx8D)jm-=}%9O-5
a-_w7~#0vC;5hOAm81W&@6`#y$b`=0F+<u?{

delta 417
zcmbP`cQ1EB1GAZ>>106`$%%8XPIfR5o!rAHI5~kybn|w`t&Gg3Mqs(g9n2;y#xTwe
zAjbr#YqKDW2jk=q0{oLFuyAZHVg1Mg<_HLJZEogbW@6JYG&48VoSeubv3WkvZAPd?
z;+v=PH8U}57+Op&RFRylFK7lcS$uMXU?VG77tlfClO=@OSv8=xif`T~RLD5lfnRWP
z02j;TE%HhrdULwST&Bqf%mgP%u}oGFw*Wf}thYqmbaJkQ<m40LXW{m4kSJne1vy-E
zvY)iXWC!WrV5vq~$;lBi4G_H`&Nmt3$+1BD-DJ%m{%n*z!Zx{IQ+#rQ3jgH!LgJgd
zRJ528c3n`v3iPXmsR78ZBAa(<xHC?^%O*P6L5pRxoK_JFT;=99dd@&U7)WmBHF(Vg
b4y*)SHlSw|CQo4H+-zn1lnLPqTeHgm`?Gjk


From 3fb1d0cb13422b2fab5118e766313b50af2f1e43 Mon Sep 17 00:00:00 2001
From: Stephane Wirtel <stephane@tinyerp.com>
Date: Wed, 5 Nov 2008 14:35:25 +0100
Subject: [PATCH 34/72] Bug fix from Xavier ALT (AJM)

lp bug: https://launchpad.net/bugs/291146 fixed

bzr revid: stephane@tinyerp.com-20081105133525-zv39jfj7gxhvxysx
---
 bin/osv/orm.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 374829a4152..0ccc022a925 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -2360,6 +2360,12 @@ class orm(orm_template):
         if 'active' in self._columns and (active_test and context.get('active_test', True)):
             if args:
                 args.insert(0, ('active', '=', 1))
+                active_in_args = False
+                for a in args:
+                    if a[0] == 'active':
+                        active_in_args = True
+                if not active_in_args:
+                   args.insert(0, ('active', '=', 1))
             else:
                 args = [('active', '=', 1)]
 

From 612074da96440b44db391b1ad7b2e50f52067e2f Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Wed, 5 Nov 2008 19:06:30 +0530
Subject: [PATCH 35/72] account balance prob solved

bzr revid: patelamit2003@gmail.com-20081105133630-0bavqlimhmwks4n4
---
 addons/account/report/account_balance.py  | 51 ++++++++++++-----------
 addons/account/report/account_balance.rml | 41 +++++++++---------
 2 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 209c665031b..7cb47e3e198 100755
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -142,19 +142,19 @@ class account_balance(report_sxw.rml_parse):
                 return cmp(x.code, y.code)
             accounts.sort(cmp_code)
             for account in accounts:
-               
+
                 if account.id in done:
                     continue
                 done[account.id] = 1
                 res = {
-                        'lid' :'',
-                        'date':'',
-                        'jname':'',
-                        'ref':'',
-                        'lname':'',
-                        'debit1':'',
-                        'credit1':'',
-                        'balance1' :'',
+#                        'lid' :'',
+#                        'date':'',
+#                        'jname':'',
+#                        'ref':'',
+#                        'lname':'',
+#                        'debit1':'',
+#                        'credit1':'',
+#                        'balance1' :'',
                         'id' : account.id,
                         'type' : account.type,
                         'code': account.code,
@@ -168,45 +168,48 @@ class account_balance(report_sxw.rml_parse):
                     }
                 self.sum_debit += account.debit
                 self.sum_credit += account.credit
-                if not (res['credit'] or res['debit']) and not account.child_id:
-                    continue
-               
+#                if not (res['credit'] or res['debit']) and not account.child_id:
+#                    continue
+
                 if account.child_id:
                     def _check_rec(account):
                         if not account.child_id:
-                            print"(account.credit or account.debit)",bool(account.credit or account.debit)
                             return bool(account.credit or account.debit)
                         for c in account.child_id:
-                            if _check_rec(c):
+                            if not _check_rec(c):
                                 return True
                         return False
-                    if not _check_rec(account):
+                    if not _check_rec(account) :
                         continue
+
+
                 if form['display_account'] == 'bal_mouvement':
-                    if res['credit'] <> 0 or res['debit'] <> 0 or res['balance'] <> 0:
+                    if res['credit'] >= 0 or res['debit'] >= 0 or res['balance'] >= 0 :
                         result_acc.append(res)
                 elif form['display_account'] == 'bal_solde':
-                    if  res['balance'] <> 0:
+                    if  res['balance'] >= 0:
                         result_acc.append(res)
                 else:
                     result_acc.append(res)
-                
+
+
+
                 res1 = self.moveline(form, account.id,res['level'])
                 if res1:
                     for r in res1:
                         result_acc.append(r)
-                if account.code=='0':
-                    result_acc.pop(-1)
+#                if account.code=='0':
+#                    result_acc.pop(-1)
                 if account.child_id:
                     ids2 = [(x.code,x.id) for x in account.child_id]
                     ids2.sort()
                     result_acc += self.lines(form, [x[1] for x in ids2], done, level+1)
-           
+
             return result_acc
 
         def moveline(self,form,ids,level):
             res={}
-            print"str(ids)",str(ids)
+
             self.date_lst_string = '\'' + '\',\''.join(map(str,self.date_lst)) + '\''
             self.cr.execute(
                     "SELECT l.id as lid,l.date,j.code as jname, l.ref, l.name as lname, l.debit as debit1, l.credit as credit1 " \
@@ -277,4 +280,4 @@ class account_balance(report_sxw.rml_parse):
         def _sum_debit(self):
             return self.sum_debit
 
-report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=False)
+report_sxw.report_sxw('report.account.account.balance', 'account.account', 'addons/account/report/account_balance.rml', parser=account_balance, header=False)
\ No newline at end of file
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 05c258ba5ed..4e77667416f 100755
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
 	  <pageGraphics>
 			<setFont name="Helvetica-Bold" size="9"/>
 
@@ -15,11 +15,11 @@
 				<setFont name="Helvetica" size="9"/>
 				<drawString x="1.0cm" y="1cm"> [[ time.strftime("%m-%d-%y %H:%M", time.localtime()) ]]</drawString>
 				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
-				
+
 			    <lineMode width="0.7"/>
 				<lines>1cm 27.7cm 20cm 27.7cm</lines>
 				<setFont name="Helvetica" size="8"/>
-	  
+
 	</pageGraphics>
 
     </pageTemplate>
@@ -126,25 +126,29 @@
     </blockTableStyle>
 
     <paraStyle
-		name="Level5" 
+		name="Level6"
 		fontName="Helvetica"
 		fontSize="8.0" />
     <paraStyle
-		name="Level4" 
-		fontName="Helvetica" 
+		name="Level5"
+		fontName="Helvetica"
 		fontSize="8.0" />
     <paraStyle
-		name="Level3" 
-		fontName="Helvetica" 
+		name="Level4"
+		fontName="Helvetica"
 		fontSize="8.0" />
     <paraStyle
-		name="Level2" 
+		name="Level3"
+		fontName="Helvetica"
+		fontSize="8.0" />
+    <paraStyle
+		name="Level2"
 		firstLineIndent="-0.03cm"
-		fontName="Helvetica-Bold" 
+		fontName="Helvetica-Bold"
 		fontSize="8.0" />
     <paraStyle name="Level1"
 		fontSize="8.0"
-		fontName="Helvetica-Bold" 
+		fontName="Helvetica-Bold"
 		/>
     <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
@@ -170,7 +174,7 @@
 <font color="white"> </font>
 </para>
     <blockTable colWidths="46,278.0,73.0,72.0,82.0" style="Table2" repeatRows="1">
-      <tr>
+      <tr noRowsplits="1">
         <td>
           <para style="P12a">Code</para>
         </td>
@@ -195,19 +199,18 @@
           [[ a['name'] ]]</para>
         </td>
         <td>
-		<para style="P3"><font>[[ a['type']=='view' and removeParentNode('font') ]][[ a['debit'] and formatLang(a['debit']) or '0.00' ]]</font> 
-			<font><u>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[a['debit'] and formatLang(a['debit']) or '0.00' ]]</u></font></para>  
+		<para style="P3"><font>[[ a['type']=='view' and removeParentNode('font') ]][[ a['debit'] and formatLang(a['debit']) or '0.00' ]]</font>
+			<font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[a['debit'] and formatLang(a['debit']) or '0.00' ]]</font></para>
         </td>
         <td>
-		<para style="P3"><font>[[ a['type']=='view' and removeParentNode('font') ]][[ a['credit'] and formatLang(a['credit']) or '0.00' ]]</font> 
-			<font><u>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[a['credit'] and formatLang(a['credit']) or '0.00' ]]</u></font></para>  
+		<para style="P3"><font>[[ a['type']=='view' and removeParentNode('font') ]][[ a['credit'] and formatLang(a['credit']) or '0.00' ]]</font>
+			<font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[a['credit'] and formatLang(a['credit']) or '0.00' ]]</font></para>
         </td>
         <td>
-		<para style="P3"><font>[[ a['type']=='view' and removeParentNode('font') ]][[ a['balance'] and formatLang(a['balance']) or '0.00' ]]</font> 
-			<font><u>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[a['balance'] and formatLang(a['balance']) or '0.00' ]]</u></font></para>  
+		<para style="P3"><font>[[ a['type']=='view' and removeParentNode('font') ]][[ a['balance'] and formatLang(a['balance']) or '0.00' ]]</font>
+			<font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[a['balance'] and formatLang(a['balance']) or '0.00' ]]</font></para>
         </td>
       </tr>
     </blockTable>
   </story>
 </document>
-

From cffb0ec16877a079b7df2a0c09c11982ccab4ae2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 5 Nov 2008 14:47:14 +0100
Subject: [PATCH 36/72] improve

bzr revid: fp@tinyerp.com-20081105134714-16t6g6r5m9jfvzie
---
 addons/delivery/i18n/fr_FR.po                         |  2 +-
 addons/document/ftpserver/abstracted_fs.py            |  1 +
 addons/document/ftpserver/ftpserver.py                |  2 ++
 addons/product/i18n/fr_FR.po                          |  2 +-
 addons/product_margin/i18n/fr_FR.po                   |  4 ++--
 addons/product_margin/product_margin.py               |  4 +---
 addons/product_margin/wizard/wizard_product_margin.py | 11 ++++++++---
 addons/purchase/i18n/fr_FR.po                         |  2 +-
 8 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/addons/delivery/i18n/fr_FR.po b/addons/delivery/i18n/fr_FR.po
index 75b4623f6b1..c8df3800918 100644
--- a/addons/delivery/i18n/fr_FR.po
+++ b/addons/delivery/i18n/fr_FR.po
@@ -318,7 +318,7 @@ msgstr "Complétez ce champ si vous planifiez de facturer la livraison sur base
 #. module: delivery
 #: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
 msgid "Delivery Costs"
-msgstr ""
+msgstr "Frais de livraison"
 
 #. module: delivery
 #: view:delivery.grid.line:0
diff --git a/addons/document/ftpserver/abstracted_fs.py b/addons/document/ftpserver/abstracted_fs.py
index 9bdd38b72bd..fe624da7de4 100644
--- a/addons/document/ftpserver/abstracted_fs.py
+++ b/addons/document/ftpserver/abstracted_fs.py
@@ -344,6 +344,7 @@ class abstracted_fs:
             for db in self.db_list():
                 result.append(false_node(db))
             return result
+        print path.children()
         return path.children()
 
     # Ok
diff --git a/addons/document/ftpserver/ftpserver.py b/addons/document/ftpserver/ftpserver.py
index 99b1c43abb3..814b6820d3c 100644
--- a/addons/document/ftpserver/ftpserver.py
+++ b/addons/document/ftpserver/ftpserver.py
@@ -1754,6 +1754,7 @@ class FTPHandler(asynchat.async_chat):
          - (file) file: the file[-like] object to send (if any).
         """
         if self.data_channel:
+            print 'DATA', data
             self.respond("125 Data connection already open. Transfer starting.")
             if file:
                 self.data_channel.file_obj = file
@@ -2077,6 +2078,7 @@ class FTPHandler(asynchat.async_chat):
                 print listing
                 listing.sort()
                 data = '\r\n'.join(listing) + '\r\n'
+            print data
             self.log('OK NLST "%s". Transfer starting.' %line)
             self.push_dtp_data(data)
 
diff --git a/addons/product/i18n/fr_FR.po b/addons/product/i18n/fr_FR.po
index 3523eac32ba..348c2870ca6 100644
--- a/addons/product/i18n/fr_FR.po
+++ b/addons/product/i18n/fr_FR.po
@@ -777,7 +777,7 @@ msgstr "Informations sur le fournisseur"
 #: view:product.product:0
 #: view:product.packaging:0
 msgid "Packaging"
-msgstr "Unité logistique"
+msgstr "Packaging"
 
 #. module: product
 #: field:product.pricelist,currency_id:0
diff --git a/addons/product_margin/i18n/fr_FR.po b/addons/product_margin/i18n/fr_FR.po
index 828dc6d715c..a09bf4309b5 100644
--- a/addons/product_margin/i18n/fr_FR.po
+++ b/addons/product_margin/i18n/fr_FR.po
@@ -204,7 +204,7 @@ msgstr "Marge Totale * 100 / Chiffre d'Affaires"
 #. module: product_margin
 #: wizard_button:product.margins,init,open:0
 msgid "Open Margins"
-msgstr "Marges Ouvertes"
+msgstr "Ouvrir les marges"
 
 #. module: product_margin
 #: wizard_view:product.margins,init:0
@@ -226,7 +226,7 @@ msgstr "Ventes"
 #: model:ir.ui.menu,name:product_margin.menu_action_product_margin
 #: view:product.product:0
 msgid "Product Margins"
-msgstr "Marges des Produits"
+msgstr "Marges par produits"
 
 #. module: product_margin
 #: field:product.product,purchase_gap:0
diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index e7376aae47b..638d10ee92f 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -115,9 +115,7 @@ class product_product(osv.osv):
         'expected_margin' : fields.function(_product_margin, method=True, type='float', string='Expected Margin', multi='total',help="Excepted Sale - Normal Cost"),
         'total_margin_rate' : fields.function(_product_margin, method=True, type='float', string='Total Margin (%)', multi='margin',help="Total margin * 100 / Turnover"),
         'expected_margin_rate' : fields.function(_product_margin, method=True, type='float', string='Expected Margin (%)', multi='margin',help="Expected margin * 100 / Expected Sale"),
-    }   
-    
-    
+    }
 product_product()
 
 
diff --git a/addons/product_margin/wizard/wizard_product_margin.py b/addons/product_margin/wizard/wizard_product_margin.py
index bccc12a7813..fec60501960 100644
--- a/addons/product_margin/wizard/wizard_product_margin.py
+++ b/addons/product_margin/wizard/wizard_product_margin.py
@@ -25,16 +25,21 @@ import pooler
 import time
 
 def _action_open_window(self, cr, uid, data, context):
+    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.graph', 'graph'))
+    view_res3 = cr.fetchone()[0]
+    cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.form.inherit', 'form'))
+    view_res2 = cr.fetchone()[0]
     cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.tree', 'tree'))
-    view_res = cr.fetchone()
+    view_res = cr.fetchone()[0]
     return {
         'name': 'Product Margins',
-         'context':{'date_from':data['form']['from_date'],'date_to':data['form']['to_date'],'invoice_state' : data['form']['invoice_state']},
+        'context':{'date_from':data['form']['from_date'],'date_to':data['form']['to_date'],'invoice_state' : data['form']['invoice_state']},
         'view_type': 'form',
         "view_mode": 'tree,form,graph',
         'res_model':'product.product',
         'type': 'ir.actions.act_window',
-        'view_id': view_res,
+        'views': [(view_res,'tree'), (view_res2,'form'), (view_res3,'graph')],
+        'view_id': False
     }
 
 
diff --git a/addons/purchase/i18n/fr_FR.po b/addons/purchase/i18n/fr_FR.po
index aeac6c4e8ab..89974e5693d 100644
--- a/addons/purchase/i18n/fr_FR.po
+++ b/addons/purchase/i18n/fr_FR.po
@@ -767,7 +767,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,invoice_method:0
 msgid "Invoicing Control"
-msgstr "Méthode de facturation"
+msgstr "Contrôle de facturation"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinglist0

From dcb4a7d4ff6b6b085af90750b407abfec563dfd4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 5 Nov 2008 16:07:44 +0100
Subject: [PATCH 37/72] imrpove

bzr revid: fp@tinyerp.com-20081105150744-dt5fxq3ydeyc325z
---
 addons/crm_configuration/crm_jobs_menu.xml | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/crm_configuration/crm_jobs_menu.xml b/addons/crm_configuration/crm_jobs_menu.xml
index 4ad83b0e2b2..83ef45b370b 100644
--- a/addons/crm_configuration/crm_jobs_menu.xml
+++ b/addons/crm_configuration/crm_jobs_menu.xml
@@ -48,7 +48,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view1">
         <field name="sequence" eval="1"/>
@@ -81,7 +81,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">form,tree</field>
         <field name="view_id" ref="crm_case_form_view11"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my3">
         <field name="sequence" eval="2"/>
@@ -106,7 +106,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'in\',(\'pending\',\'open\',\'draft\')),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'in\',(\'pending\',\'open\',\'draft\')),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my3">
         <field name="sequence" eval="1"/>
@@ -139,7 +139,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'draft\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my2">
         <field name="sequence" eval="1"/>
@@ -176,7 +176,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'pending\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my1">
         <field name="sequence" eval="1"/>
@@ -211,7 +211,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="domain" eval="'[(\'user_id\',\'=\',uid),(\'state\',\'=\',\'open\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_my0">
         <field name="sequence" eval="1"/>
@@ -246,7 +246,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">calendar,tree,form,graph</field>
         <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="domain" eval="'[(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="domain" eval="'[(\'state\',\'=\',\'done\'),(\'user_id\',\'=\',uid),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_myjobs">
         <field name="sequence" eval="1"/>
@@ -285,7 +285,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'state\',\'&lt;&gt;\',\'done\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="domain" eval="'[(\'state\',\'&lt;&gt;\',\'done\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all3">
         <field name="sequence" eval="1"/>
@@ -318,7 +318,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'state\',\'=\',\'draft\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="domain" eval="'[(\'state\',\'=\',\'draft\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all2">
         <field name="sequence" eval="1"/>
@@ -351,7 +351,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'state\',\'=\',\'pending\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="domain" eval="'[(\'state\',\'=\',\'pending\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all1">
         <field name="sequence" eval="1"/>
@@ -384,7 +384,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">tree,calendar,form,graph</field>
         <field name="view_id" ref="crm_case_tree_view11"/>
-        <field name="domain" eval="'[(\'state\',\'=\',\'open\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="domain" eval="'[(\'state\',\'=\',\'open\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_tree_view_all0">
         <field name="sequence" eval="1"/>
@@ -417,7 +417,7 @@
         <field name="res_model">crm.case</field>
         <field name="view_mode">calendar,tree,form,graph</field>
         <field name="view_id" ref="crm_case_calendar_view11"/>
-        <field name="domain" eval="'[(\'state\',\'=\',\'done\'),(\'section_id\',\'=\','+str(section_support2)+')]'"/>
+        <field name="domain" eval="'[(\'state\',\'=\',\'done\'),(\'section_id\',\'=\','+str(section_support0)+')]'"/>
     </record>
     <record model="ir.actions.act_window.view" id="action_crm_sec_calendar_view_alljobs">
         <field name="sequence" eval="1"/>

From 670589a750958b57ee4be1ff789d42e411aec2c4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 5 Nov 2008 17:36:08 +0100
Subject: [PATCH 38/72] bugfix

bzr revid: fp@tinyerp.com-20081105163608-zpga9iab2tsafze3
---
 addons/document/document_view.xml | 45 ++++++++++++++++++++++---------
 addons/sale/stock.py              |  5 ++++
 addons/stock/stock.py             |  6 +++++
 3 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 434e00aa7d8..5fbca104f57 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -108,27 +108,46 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Files">
-                <notebook>
-                <page string="Definition">
-                    <field name="name" select="1" colspan="4"/>
-                    <field name="title" select="1"  colspan="4"/>
-                    <newline/>
-                    <field name="datas"/>
-                    <field name="file_size"/>
-                    <newline/>
-                    <field name="parent_id"/>
-                    <newline/>
+                <group colspan="4" col="6">
+                    <field name="name" select="1" />
+                    <field name="create_uid" select="1"/>
+                    <field name="create_date" select="1"/>
+                    <field name="title" select="1"/>
                     <field name="user_id"/>
                     <field name="partner_id"/>
-                    <newline/>
-                    <field name="create_date"/>
-                    <field name="create_uid"/>
                     <field name="write_date"/>
                     <field name="write_uid"/>
+                </group>
+                <notebook colspan="4">
+                <page string="Attachment">
+                    <group col="2" colspan="2">
+                        <separator string="Data" colspan="2"/>
+                        <field name="datas" filename="datas_fname"/>
+                        <field name="datas_fname" select="1"/>
+                        <field name="file_size"/>
+                    </group>
+                    <group col="2" colspan="2">
+                        <separator string="Attached To" colspan="2"/>
+                        <field name="res_model" select="1"/>
+                        <field name="res_id"/>
+                        <field name="parent_id"/>
+                    </group>
+                    <separator string="Preview" colspan="4"/>
+                    <field
+                        name="preview"
+                        widget="image" 
+                        readonly="1" 
+                        nolabel="1" 
+                        colspan="4" 
+                        img_height="400" 
+                        img_width="800"/>
+
                 </page><page string="Indexed Content">
                     <field name="index_content" nolabel="1" colspan="4" select="1"/>
                 </page><page string="Security">
                     <field name="group_ids" colspan="4" nolabel="1"/>
+                <page string="Notes">
+                    <field colspan="4" name="description" nolabel="1"/>
                 </page>
                 </notebook>
             </form>
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 6cee8e55af6..29d03e216cb 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -41,6 +41,11 @@ class stock_picking(osv.osv):
         'sale_id': lambda *a: False
     }
 
+    def get_currency_id(self, cursor, user, picking):
+        if picking.sale_id:
+            return picking.sale_id.pricelist_id.currency_id.id
+        return False
+
     def _get_address_invoice(self, cursor, user, picking):
         res = {}
         if picking.sale_id:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index ed4ce5692ea..043319f54da 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -539,6 +539,9 @@ class stock_picking(osv.osv):
                         context=context)
         return True
 
+    def get_currency_id(self, cursor, user, picking):
+        return False
+
     def _get_address_invoice(self, cursor, user, picking):
         '''Return {'contact': address, 'invoice': address} for invoice'''
         partner_obj = self.pool.get('res.partner')
@@ -635,6 +638,9 @@ class stock_picking(osv.osv):
                     'comment': comment,
                     'payment_term': payment_term_id,
                     }
+                cur_id = self.get_currency_id(cursor, user, picking)
+                if cur_id:
+                    invoice_vals['currency_id'] = cur_id
                 if journal_id:
                     invoice_vals['journal_id'] = journal_id
                 invoice_id = invoice_obj.create(cursor, user, invoice_vals,

From feea52d16e4e00cc7d6b631cc9522ff842c6b859 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 5 Nov 2008 17:39:55 +0100
Subject: [PATCH 39/72] improve

bzr revid: fp@tinyerp.com-20081105163955-ywy22g6k4tn6995q
---
 addons/stock/stock_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d4fbbfbe9d6..7dcfc03c9e5 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -234,11 +234,12 @@
                     <field name="product_id" select="1"/>
                     <field name="product_qty" select="1"/>
                     <field name="product_uom" select="1" string="UOM"/>
+                    <field name="prodlot_id" select="1"/>
                     <field name="product_packaging"/>
                     <field name="location_id" select="1"/>
                     <field name="location_dest_id" select="1"/>
                     <field name="date" select="1"/>
-                    <field name="date_planned" select="1"/>
+                    <field name="date_planned" select="1" string="Date"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -254,11 +255,12 @@
                     <field name="product_id" select="1"/>
                     <field name="product_qty" select="1"/>
                     <field name="product_uom" select="1" string="UOM"/>
+                    <field name="prodlot_id" select="1"/>
                     <field name="product_packaging"/>
                     <field name="location_id" select="1"/>
                     <field name="location_dest_id" select="1"/>
                     <field name="date" select="1"/>
-                    <field name="date_planned" select="1"/>
+                    <field name="date_planned" select="1" string="Date"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -275,8 +277,8 @@
             name="stock.traceability.lot.aval"
             string="Upstream traceability"/>
 
-        <wizard id="action2" model="stock.tracking" name="stock.traceability.amont" string="Upstream traceability"/>
-        <wizard id="action4" model="stock.tracking" name="stock.traceability.aval" string="Downstream traceability"/>
+        <wizard id="action4" model="stock.tracking" name="stock.traceability.amont" string="Upstream traceability"/>
+        <wizard id="action2" model="stock.tracking" name="stock.traceability.aval" string="Downstream traceability"/>
 
         <record id="action3" model="ir.actions.act_window">
             <field name="name">Downstream traceability</field>

From a9dbcbb93af14a0d39d6e0e6f8e047d75d47cb6d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 5 Nov 2008 17:49:52 +0100
Subject: [PATCH 40/72] improved

bzr revid: fp@tinyerp.com-20081105164952-xmnzm2bs2gg5j3k8
---
 addons/document/document_view.xml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 5fbca104f57..f8d80ee12a2 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -110,11 +110,11 @@
             <form string="Files">
                 <group colspan="4" col="6">
                     <field name="name" select="1" />
+                    <field name="title" select="1"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
                     <field name="create_uid" select="1"/>
                     <field name="create_date" select="1"/>
-                    <field name="title" select="1"/>
-                    <field name="user_id"/>
-                    <field name="partner_id"/>
                     <field name="write_date"/>
                     <field name="write_uid"/>
                 </group>
@@ -124,13 +124,13 @@
                         <separator string="Data" colspan="2"/>
                         <field name="datas" filename="datas_fname"/>
                         <field name="datas_fname" select="1"/>
-                        <field name="file_size"/>
+                        <field name="file_size" readonly="1"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Attached To" colspan="2"/>
-                        <field name="res_model" select="1"/>
-                        <field name="res_id"/>
-                        <field name="parent_id"/>
+                        <field name="res_model" select="1" readonly="1"/>
+                        <field name="res_id" readonly="1"/>
+                        <field name="parent_id" readonly="1"/>
                     </group>
                     <separator string="Preview" colspan="4"/>
                     <field
@@ -146,7 +146,7 @@
                     <field name="index_content" nolabel="1" colspan="4" select="1"/>
                 </page><page string="Security">
                     <field name="group_ids" colspan="4" nolabel="1"/>
-                <page string="Notes">
+                </page><page string="Notes">
                     <field colspan="4" name="description" nolabel="1"/>
                 </page>
                 </notebook>
@@ -163,8 +163,9 @@
                 <field name="name"/>
                 <field name="title" />
                 <field name="partner_id"/>
-                <field name="file_size"/>
+                <field name="datas_fname"/>
                 <field name="user_id"/>
+                <field name="create_date"/>
                 <field name="write_date"/>
             </tree>
         </field>

From 18c1258ec36ac329218f4049bf6c474b30e41ef9 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 5 Nov 2008 18:02:27 +0100
Subject: [PATCH 41/72] improved_view

bzr revid: fp@tinyerp.com-20081105170227-mqcq75vl1lny3hei
---
 addons/document/document_view.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index f8d80ee12a2..4a722b5294f 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -115,8 +115,6 @@
                     <field name="user_id"/>
                     <field name="create_uid" select="1"/>
                     <field name="create_date" select="1"/>
-                    <field name="write_date"/>
-                    <field name="write_uid"/>
                 </group>
                 <notebook colspan="4">
                 <page string="Attachment">
@@ -124,13 +122,11 @@
                         <separator string="Data" colspan="2"/>
                         <field name="datas" filename="datas_fname"/>
                         <field name="datas_fname" select="1"/>
-                        <field name="file_size" readonly="1"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Attached To" colspan="2"/>
                         <field name="res_model" select="1" readonly="1"/>
                         <field name="res_id" readonly="1"/>
-                        <field name="parent_id" readonly="1"/>
                     </group>
                     <separator string="Preview" colspan="4"/>
                     <field
@@ -146,6 +142,17 @@
                     <field name="index_content" nolabel="1" colspan="4" select="1"/>
                 </page><page string="Security">
                     <field name="group_ids" colspan="4" nolabel="1"/>
+                </page><page string="Others Info">
+                    <group colspan="2" col="2">
+                        <separator string="History" colspan="2"/>
+                        <field name="write_date"/>
+                        <field name="write_uid"/>
+                    </group>
+                    <group colspan="2" col="2">
+                        <separator string="File Information" colspan="2"/>
+                        <field name="file_size" readonly="1"/>
+                        <field name="parent_id" readonly="1"/>
+                    </group>
                 </page><page string="Notes">
                     <field colspan="4" name="description" nolabel="1"/>
                 </page>

From 78a71cc808b8af23fa575ce740dd5530259dba4f Mon Sep 17 00:00:00 2001
From: Christophe Simonis <christophe@tinyerp.com>
Date: Wed, 5 Nov 2008 21:19:49 +0100
Subject: [PATCH 42/72] fields_view_get return also the fields specified in the
 attributes of the <calendar> tag

bzr revid: christophe@tinyerp.com-20081105201949-vdej2c2a8uwqqila
---
 bin/osv/orm.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 0ccc022a925..7b7d9867240 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -792,6 +792,12 @@ class orm_template(object):
             result = self.view_header_get(cr, user, False, node.localName, context)
             if result:
                 node.setAttribute('string', result.decode('utf-8'))
+
+        elif node.nodeType==node.ELEMENT_NODE and node.localName == 'calendar':
+            for additional_field in ('date_start', 'date_delay', 'date_stop', 'color'):
+                if node.hasAttribute(additional_field) and node.getAttribute(additional_field):
+                    fields[node.getAttribute(additional_field)] = {}
+
         if node.nodeType == node.ELEMENT_NODE and node.hasAttribute('groups'):
             if node.getAttribute('groups'):
                 groups = node.getAttribute('groups').split(',')

From 8e41226a73df28cb6412e5c7588c243cf094dfb2 Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Thu, 6 Nov 2008 11:22:18 +0530
Subject: [PATCH 43/72] Small changes in account balance

bzr revid: patelamit2003@gmail.com-20081106055218-pib4z3u65pco2y1t
---
 addons/account/report/account_balance.rml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 4e77667416f..e4bb97a6602 100755
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -98,6 +98,12 @@
     <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
 
 
+    <blockTableStyle id="TrLevel8">
+      <blockLeftPadding length="100" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="TrLevel7">
+      <blockLeftPadding length="80" start="1,0" stop="1,0"/>
+    </blockTableStyle>
     <blockTableStyle id="TrLevel6">
       <blockLeftPadding length="60" start="1,0" stop="1,0"/>
     </blockTableStyle>
@@ -125,6 +131,15 @@
 	  <blockFont name="Times-Bold" start="0,0" stop="-1,-1"/>
     </blockTableStyle>
 
+
+    <paraStyle
+		name="Level8"
+		fontName="Helvetica"
+		fontSize="8.0" />
+    <paraStyle
+		name="Level7"
+		fontName="Helvetica"
+		fontSize="8.0" />
     <paraStyle
 		name="Level6"
 		fontName="Helvetica"

From 4acaf9b1629ac4cf7d87107c39768345aaaf87ba Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 6 Nov 2008 12:59:50 +0530
Subject: [PATCH 44/72] Added merging invoice entries functionality

bzr revid: jvo@tinyerp.com-20081106072950-u1flmnk52gg1hfd0
---
 addons/account/account.py           |  6 +++--
 addons/account/account_move_line.py |  6 ++---
 addons/account/account_view.xml     | 15 ++++++-----
 addons/account/invoice.py           | 41 +++++++++++++++++++++++++++--
 4 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 90d7e2c0d95..837edaae195 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -282,7 +282,9 @@ class account_account(osv.osv):
             required=True),
         'check_history': fields.boolean('Display History',
             help="Check this box if you want to print all entries when printing the General Ledger, "\
-            "otherwise it will only print its balance.")
+            "otherwise it will only print its balance."),
+         'merge_invoice': fields.boolean('Merge Invoice Entries',help="Check this box if you want that all lines of "\
+            "a customer or supplier invoice using this account are created in one line only"),
     }
 
     def _default_company(self, cr, uid, context={}):
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 64b19713e5b..2b0a8aee54d 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -176,7 +176,7 @@ class account_move_line(osv.osv):
             if s>0:
                 acc = acc1
             v = self.pool.get('res.currency').compute(cr, uid,
-                account.company_id.currency_id.id, 
+                account.company_id.currency_id.id,
                 data['currency_id'],
                 s, account=acc, account_invert=True)
             data['amount_currency'] = v
@@ -277,7 +277,7 @@ class account_move_line(osv.osv):
 
     _columns = {
         'name': fields.char('Name', size=64, required=True),
-        'quantity': fields.float('Quantity', digits=(16,2), help="The optionnal quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very usefull for some reports."),
+        'quantity': fields.float('Quantity', digits=(16,2), help="The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very usefull for some reports."),
         'debit': fields.float('Debit', digits=(16,2)),
         'credit': fields.float('Credit', digits=(16,2)),
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4e51b8c99b9..e26f3870516 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -130,6 +130,7 @@
                             <field name="reconcile"/>
                             <field name="active" select="2"/>
                             <field name="check_history"/>
+                            <field name="merge_invoice" select="2"/>
                             <newline/>
                             <newline/>
                             <field colspan="4" name="tax_ids" domain="[('parent_id','=',False)]"/>
@@ -988,17 +989,17 @@
 
         <act_window
             domain="[('account_id', '=', active_id)]"
-            id="act_account_acount_move_line_open" 
-            name="" 
+            id="act_account_acount_move_line_open"
+            name=""
             context="{'account_id': active_id}"
-            res_model="account.move.line" 
+            res_model="account.move.line"
             src_model="account.account"/>
 
         <act_window
-            domain="[('account_id', '=', active_id),('reconcile_id','=',False)]" 
-            id="act_account_acount_move_line_open_unreconciled" 
-            name="Unreconciled entries" 
-            res_model="account.move.line" 
+            domain="[('account_id', '=', active_id),('reconcile_id','=',False)]"
+            id="act_account_acount_move_line_open_unreconciled"
+            name="Unreconciled entries"
+            res_model="account.move.line"
             context="{'account_id': active_id}"
             src_model="account.account"/>
 
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 5690102c8df..5c887064f1e 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -414,6 +414,7 @@ class account_invoice(osv.osv):
     def action_move_create(self, cr, uid, ids, *args):
         ait_obj = self.pool.get('account.invoice.tax')
         cur_obj = self.pool.get('res.currency')
+        acc_obj = self.pool.get('account.account')
         for inv in self.browse(cr, uid, ids):
             if inv.move_id:
                 continue
@@ -460,7 +461,11 @@ class account_invoice(osv.osv):
             # create one move line for the total and possibly adjust the other lines amount
             total = 0
             total_currency = 0
+            key_line=[]
             for i in iml:
+                if i.has_key('account_id') and i.has_key('taxes'):
+                    if not (i['account_id'],i['taxes']) in key_line:
+                        key_line.append((i['account_id'],i['taxes']))
                 if inv.currency_id.id != company_currency:
                     i['currency_id'] = inv.currency_id.id
                     i['amount_currency'] = i['price']
@@ -481,6 +486,36 @@ class account_invoice(osv.osv):
             acc_id = inv.account_id.id
 
             name = inv['name'] or '/'
+            iml_temp=[]
+            move_list=[]
+
+            for item in key_line:
+                move_temp={}
+                if acc_obj.browse(cr,uid,item[0]).merge_invoice:
+                    repeat=False
+                    for move_line in iml:
+                        if (move_line.has_key('account_id') and move_line['account_id']==item[0]) and (move_line.has_key('taxes') and move_line['taxes']==item[1]):
+                            move_list.append(move_line)
+                            if repeat:
+                                for key in move_line:
+                                    if key in ['name','amount_currency','price_unit','price','quantity']:
+                                        if key=='name':
+                                            move_temp[key]=move_temp[key] + "," +move_line[key]
+                                        else:
+                                            move_temp[key] +=move_line[key]
+                            else:
+                                for key in move_line:
+                                    move_temp[key]=move_line[key]
+                                repeat=True
+                if move_temp:
+                    iml_temp.append(move_temp)
+
+            if len(iml_temp)<len(move_list):
+                for old_elem in move_list:
+                    iml.remove(old_elem)
+                for new_elem in iml_temp:
+                    iml.append(new_elem)
+
             totlines = False
             if inv.payment_term:
                 totlines = self.pool.get('account.payment.term').compute(cr,
@@ -570,7 +605,8 @@ class account_invoice(osv.osv):
             'currency_id':x.get('currency_id', False),
             'tax_code_id': x.get('tax_code_id', False),
             'tax_amount': x.get('tax_amount', False),
-            'ref':x.get('ref',False)
+            'ref':x.get('ref',False),
+            'quantity':x.get('quantity',1.00),
         }
 
     def action_number(self, cr, uid, ids, *args):
@@ -934,6 +970,7 @@ class account_invoice_line(osv.osv):
             'product_id':line.product_id.id,
             'uos_id':line.uos_id.id,
             'account_analytic_id':line.account_analytic_id.id,
+            'taxes':line.invoice_line_tax_id,
         }
     #
     # Set the tax field according to the account and the partner

From 0d9dbc1df5a65438bfa4b2dae24d1ee9db5f8c21 Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Thu, 6 Nov 2008 13:07:54 +0530
Subject: [PATCH 45/72] bug fix in third party ledger

bzr revid: patelamit2003@gmail.com-20081106073754-htbzyzvqcjvm05o2
---
 addons/account/report/third_party_ledger.py   | 73 ++++++++++---------
 .../wizard/wizard_third_party_ledger.py       |  2 +-
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py
index 050d33be1aa..d2839027fb2 100755
--- a/addons/account/report/third_party_ledger.py
+++ b/addons/account/report/third_party_ledger.py
@@ -184,7 +184,8 @@ class third_party_ledger(rml_parse.rml_parse):
 		partner_to_use = []
 
 		if data['form']['soldeinit'] :
-			
+			print"self.date_lst[0]",self.date_lst[0]
+			print"self.date_lst[len(self.date_lst)-1]",self.date_lst[len(self.date_lst)-1]
 			self.cr.execute(
 				"SELECT DISTINCT line.partner_id " \
 				"FROM account_move_line AS line, account_account AS account " \
@@ -198,22 +199,22 @@ class third_party_ledger(rml_parse.rml_parse):
 					"AND account.company_id = %d " \
 					"AND account.active " ,
 				(self.date_lst[0],self.date_lst[len(self.date_lst)-1],data['form']['company_id']))
-		else:
-			
-			self.cr.execute(
-				"SELECT DISTINCT line.partner_id " \
-				"FROM account_move_line AS line, account_account AS account " \
-				"WHERE line.partner_id IS NOT NULL " \
-					"AND line.account_id = account.id " \
-					"AND line.date IN (" + self.date_lst_string + ") " \
-					"AND line.account_id IN (" + self.account_ids + ") " \
-					" " + PARTNER_REQUEST + " " \
-					"AND account.company_id = %d " \
-					"AND account.active " ,
-				(data['form']['company_id']))
+#		else:
+#			
+#			self.cr.execute(
+#				"SELECT DISTINCT line.partner_id " \
+#				"FROM account_move_line AS line, account_account AS account " \
+#				"WHERE line.partner_id IS NOT NULL " \
+#					"AND line.account_id = account.id " \
+#					"AND line.date IN (" + self.date_lst_string + ") " \
+#					"AND line.account_id IN (" + self.account_ids + ") " \
+#					" " + PARTNER_REQUEST + " " \
+#					"AND account.company_id = %d " \
+#					"AND account.active " ,
+#				(data['form']['company_id']))
 		
 		res = self.cr.dictfetchall()
-		
+		print"=====res====",res
 		for res_line in res:
 			    partner_to_use.append(res_line['partner_id'])
 		new_ids = partner_to_use
@@ -229,26 +230,26 @@ class third_party_ledger(rml_parse.rml_parse):
 			RECONCILE_TAG = " "
 		else:
 			RECONCILE_TAG = "AND l.reconcile_id IS NULL"
-		if data['form']['soldeinit'] :
-			
-			self.cr.execute(
-					"SELECT l.id,l.date,j.code, l.ref, l.name, l.debit, l.credit " \
-					"FROM account_move_line l " \
-					"LEFT JOIN account_journal j " \
-						"ON (l.journal_id = j.id) " \
-					"WHERE l.partner_id = %d " \
-						"AND l.account_id IN (" + self.account_ids + ") " \
-						"AND l.date <= %s " \
-						"AND l.reconcile_id IS NULL "
-					"ORDER BY l.id",
-					(partner.id, self.date_lst[0]))
-			res = self.cr.dictfetchall()
-			
-			sum = 0.0
-			for r in res:
-				sum = r['debit'] - r['credit']
-				r['progress'] = sum
-				full_account.append(r)
+#		if data['form']['soldeinit'] :
+#			
+#			self.cr.execute(
+#					"SELECT l.id,l.date,j.code, l.ref, l.name, l.debit, l.credit " \
+#					"FROM account_move_line l " \
+#					"LEFT JOIN account_journal j " \
+#						"ON (l.journal_id = j.id) " \
+#					"WHERE l.partner_id = %d " \
+#						"AND l.account_id IN (" + self.account_ids + ") " \
+#						"AND l.date <= %s " \
+#						"AND l.reconcile_id IS NULL "
+#					"ORDER BY l.id",
+#					(partner.id, self.date_lst[0]))
+#			res = self.cr.dictfetchall()
+#			print"----res----",res
+#			sum = 0.0
+#			for r in res:
+#				sum = r['debit'] - r['credit']
+#				r['progress'] = sum
+#				full_account.append(r)
 
 		self.cr.execute(
 				"SELECT l.id,l.date,j.code, l.ref, l.name, l.debit, l.credit " \
@@ -262,7 +263,7 @@ class third_party_ledger(rml_parse.rml_parse):
 					"ORDER BY l.id",
 					(partner.id,))
 		res = self.cr.dictfetchall()
-		
+		print":::::res::::::",res
 		sum = 0.0
 		for r in res:
 			sum = r['debit'] - r['credit']
diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py
index 72aece90c41..6497958fee6 100755
--- a/addons/account/wizard/wizard_third_party_ledger.py
+++ b/addons/account/wizard/wizard_third_party_ledger.py
@@ -119,7 +119,7 @@ class wizard_report(wizard.interface):
 	
 	
 	def _check_state(self, cr, uid, data, context):
-		if data['form']['state'] == 'bydate' or data['form']['state'] == 'all':
+		if data['form']['state'] == 'bydate' or data['form']['state'] == 'all' or data['form']['state'] == 'none':
 		   data['form']['fiscalyear'] = False
 		else :
 		   data['form']['fiscalyear'] = True

From d2c3be7c9dfda086975e6c96e17eff16bfa3829f Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Thu, 6 Nov 2008 13:12:11 +0530
Subject: [PATCH 46/72] remove print

bzr revid: patelamit2003@gmail.com-20081106074211-f28x67fpnmmrglxv
---
 addons/account/report/third_party_ledger.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/account/report/third_party_ledger.py b/addons/account/report/third_party_ledger.py
index d2839027fb2..5c8132082d9 100755
--- a/addons/account/report/third_party_ledger.py
+++ b/addons/account/report/third_party_ledger.py
@@ -184,8 +184,7 @@ class third_party_ledger(rml_parse.rml_parse):
 		partner_to_use = []
 
 		if data['form']['soldeinit'] :
-			print"self.date_lst[0]",self.date_lst[0]
-			print"self.date_lst[len(self.date_lst)-1]",self.date_lst[len(self.date_lst)-1]
+			
 			self.cr.execute(
 				"SELECT DISTINCT line.partner_id " \
 				"FROM account_move_line AS line, account_account AS account " \
@@ -214,7 +213,7 @@ class third_party_ledger(rml_parse.rml_parse):
 #				(data['form']['company_id']))
 		
 		res = self.cr.dictfetchall()
-		print"=====res====",res
+		
 		for res_line in res:
 			    partner_to_use.append(res_line['partner_id'])
 		new_ids = partner_to_use
@@ -263,7 +262,7 @@ class third_party_ledger(rml_parse.rml_parse):
 					"ORDER BY l.id",
 					(partner.id,))
 		res = self.cr.dictfetchall()
-		print":::::res::::::",res
+		
 		sum = 0.0
 		for r in res:
 			sum = r['debit'] - r['credit']

From 4a8167ad866b51b8ca10b87ed28c351b3d4cbf79 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Nov 2008 10:07:59 +0100
Subject: [PATCH 47/72] bugfixes

bzr revid: fp@tinyerp.com-20081106090759-usbd3uq3wxywsoee
---
 addons/account/i18n/fr_FR.po            | 6 +++---
 addons/account_payment/payment_view.xml | 4 ++--
 addons/project/wizard/task_delegate.py  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/account/i18n/fr_FR.po b/addons/account/i18n/fr_FR.po
index 33ff6b81759..b50eb74671e 100644
--- a/addons/account/i18n/fr_FR.po
+++ b/addons/account/i18n/fr_FR.po
@@ -1604,7 +1604,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,address_invoice_id:0
 msgid "Invoice Address"
-msgstr "Adresse de facturation"
+msgstr "Adresse"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
@@ -2090,7 +2090,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree8
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree8
 msgid "Draft Supplier Invoices"
-msgstr "Facture fournisseur brouillon"
+msgstr "Facture fournisseur en attente"
 
 #. module: account
 #: rml:account.overdue:0
@@ -2174,7 +2174,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,date_invoice:0
 msgid "Date Invoiced"
-msgstr "Date de facturation"
+msgstr "Date facture"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability
diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index bba56a6d7ca..e127d592693 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -150,8 +150,8 @@
                     <field name="state" readonly="1" select="1"/>
                     <group col="4" colspan="2">
                         <button name="cancel" states="draft,open" string="Cancel"/>
-                        <button name="open" states="draft" string="Open"/>
-                        <button name="%(wizard_pay_payment)d" states="open" string="Make Payment" type="action"/>
+                        <button name="open" states="draft" string="Confirm Payments"/>
+                        <button name="%(wizard_pay_payment)d" states="open" string="Make Payments" type="action"/>
                         <button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
                     </group>
                 </form>
diff --git a/addons/project/wizard/task_delegate.py b/addons/project/wizard/task_delegate.py
index 07fa278a460..8a81e9d7044 100644
--- a/addons/project/wizard/task_delegate.py
+++ b/addons/project/wizard/task_delegate.py
@@ -28,11 +28,11 @@ ask_form = """<?xml version="1.0" ?>
 <form string="Delegate this task to a user">
     <separator string="Delegated Task" colspan="4"/>
     <field name="user_id" colspan="4"/>
-    <field name="planned_hours" colspan="4"/>
+    <field name="planned_hours" colspan="4" widget="float_time"/>
     <field name="name" colspan="4"/>
     <field name="include_info"/>
     <separator string="Validation Task" colspan="4"/>
-    <field name="planned_hours_me" colspan="4"/>
+    <field name="planned_hours_me" colspan="4" widget="float_time"/>
     <field name="prefix" colspan="4"/>
     <field name="state" colspan="4"/>
 </form>"""

From b0300acfc68ae0048a65758383723ceffbde41ea Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Nov 2008 10:22:26 +0100
Subject: [PATCH 48/72] improvement

bzr revid: fp@tinyerp.com-20081106092226-y8wtu22333tnpvwt
---
 addons/account_payment/payment_view.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/addons/account_payment/payment_view.xml b/addons/account_payment/payment_view.xml
index e127d592693..1f112c58c03 100644
--- a/addons/account_payment/payment_view.xml
+++ b/addons/account_payment/payment_view.xml
@@ -180,7 +180,7 @@
             <field name="name">Payment order</field>
             <field name="res_model">payment.order</field>
             <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
+            <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="action_payment_order_tree" id="menu_action_payment_order_form" parent="account_payment.menu_main" sequence="3"/>
 
@@ -202,6 +202,15 @@
         </record>
         <menuitem action="action_payment_order_open" id="menu_action_payment_order_open" parent="account_payment.menu_action_payment_order_form" sequence="2"/>
 
+        <record id="action_payment_order_tree_new" model="ir.actions.act_window">
+            <field name="name">New Payment Order</field>
+            <field name="res_model">payment.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form,tree</field>
+        </record>
+        <menuitem action="action_payment_order_tree_new" id="menu_action_payment_order_form_new" parent="menu_action_payment_order_form.menu_main" sequence="3"/>
+
+
         <record id="view_payment_line_form" model="ir.ui.view">
             <field name="name">Payment Line</field>
             <field name="model">payment.line</field>

From caf929146e3735faa27a2436c863df349bed11e3 Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 6 Nov 2008 15:47:28 +0530
Subject: [PATCH 49/72] l10n_lu:Bugfix for opening PDF

bzr revid: jvo@tinyerp.com-20081106101728-pl9k3yim1aucv2bn
---
 addons/l10n_lu/wizard/print_vat.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/l10n_lu/wizard/print_vat.py b/addons/l10n_lu/wizard/print_vat.py
index 0a9e09a3215..2d0832667de 100644
--- a/addons/l10n_lu/wizard/print_vat.py
+++ b/addons/l10n_lu/wizard/print_vat.py
@@ -12,7 +12,7 @@ import pooler
 import sys
 from mx.DateTime import *
 import tools
-from report.render import render 
+from report.render import render
 from report.interface import report_int
 import os
 import pdf_ext
@@ -49,7 +49,6 @@ class external_pdf(render):
 
 class report_custom(report_int):
     def create(self, cr, uid, ids, datas, context={}):
-        print datas, ids, uid
 
         pool = pooler.get_pool(cr.dbname)
 
@@ -70,7 +69,7 @@ class report_custom(report_int):
             result['info_address'] = partner.address[0].street
             result['info_address2'] = str(partner.address[0].zip) + ' ' + str(partner.address[0].city)
 
-        pdf_ext.fill_pdf('addons/l10n_lu/wizard/2008_DECL_F_M10.pdf', '/tmp/output.pdf', result)
+        pdf_ext.fill_pdf(tools.config['addons_path']+'/l10n_lu/wizard/2008_DECL_F_M10.pdf', '/tmp/output.pdf', result)
         self.obj = external_pdf(file('/tmp/output.pdf').read())
         self.obj.render()
         return (self.obj.pdf, 'pdf')

From 97a4241d2676573506cd046b17852a2cd7078ef8 Mon Sep 17 00:00:00 2001
From: Najlaa <nel@silver>
Date: Thu, 6 Nov 2008 12:22:44 +0100
Subject: [PATCH 50/72] small changes in labels

bzr revid: nel@silver-20081106112244-hsj10lwq1wxe8fag
---
 addons/account/report/partner_balance.py      |   9 +-
 addons/account/report/partner_balance.rml     |   2 +-
 .../wizard/wizard_account_balance_report.py   |   3 +-
 .../wizard/wizard_aged_trial_balance.py       |   2 +-
 .../wizard/wizard_general_ledger_report.py    |   3 +-
 .../wizard/wizard_partner_balance_report.py   |   4 +-
 .../wizard/wizard_third_party_ledger.py       | 135 +++++++++---------
 7 files changed, 81 insertions(+), 77 deletions(-)

diff --git a/addons/account/report/partner_balance.py b/addons/account/report/partner_balance.py
index 22cb2479c87..0e286d61805 100644
--- a/addons/account/report/partner_balance.py
+++ b/addons/account/report/partner_balance.py
@@ -345,8 +345,6 @@ class partner_balance(report_sxw.rml_parse):
                     tot_scredit = r['scredit']
                     tot_sdebit = r['sdebit']
                     tot_enlitige = (r['enlitige'] or 0.0)
-
-                    
                     #
                     ##
                     new_header = {}
@@ -362,7 +360,7 @@ class partner_balance(report_sxw.rml_parse):
                     new_header['type'] = 3
                     ##
                     ##
-                   
+
                     completearray.append(new_header)
                     ##
                     #
@@ -371,7 +369,7 @@ class partner_balance(report_sxw.rml_parse):
                     r['balance'] = float(r['sdebit']) - float(r['scredit'])
 
                     #
-                    
+                    print "=========r",r
                     completearray.append(r)
 
                 if cleanarray[i]['account_id'] == cleanarray[i-1]['account_id']:
@@ -403,6 +401,7 @@ class partner_balance(report_sxw.rml_parse):
                     #
                     r['balance'] = float(r['sdebit']) - float(r['scredit'])
                     #
+
                     completearray.append(r)
 
             i = i + 1
@@ -604,4 +603,4 @@ class partner_balance(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.account.partner.balance', 'res.partner',
     'account/report/partner_balance.rml',parser=partner_balance,
-    header=False)
\ No newline at end of file
+    header=False)
diff --git a/addons/account/report/partner_balance.rml b/addons/account/report/partner_balance.rml
index 32cea05fc3a..1548831e22a 100644
--- a/addons/account/report/partner_balance.rml
+++ b/addons/account/report/partner_balance.rml
@@ -381,4 +381,4 @@
       </tr>
     </blockTable>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account/wizard/wizard_account_balance_report.py b/addons/account/wizard/wizard_account_balance_report.py
index c730ec53685..5037b4c23c2 100644
--- a/addons/account/wizard/wizard_account_balance_report.py
+++ b/addons/account/wizard/wizard_account_balance_report.py
@@ -54,7 +54,7 @@ period_fields = {
         'string':"Date/Period Filter",
         'type':'selection',
         'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
-        'default': lambda *a:'bydate'
+        'default': lambda *a:'none'
     },
     'fiscalyear': {
         'string':'Fiscal year',
@@ -89,6 +89,7 @@ class wizard_report(wizard.interface):
         periods_obj=pooler.get_pool(cr.dbname).get('account.period')
         data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
         data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
+        data['form']['fiscalyear'] = False
         data['form']['display_account']='bal_all'
         return data['form']
 
diff --git a/addons/account/wizard/wizard_aged_trial_balance.py b/addons/account/wizard/wizard_aged_trial_balance.py
index 51c7994f9df..3de86d2653e 100755
--- a/addons/account/wizard/wizard_aged_trial_balance.py
+++ b/addons/account/wizard/wizard_aged_trial_balance.py
@@ -48,7 +48,7 @@ _aged_trial_fields = {
         'type':'selection',
         'selection':[('customer','Receivable'),('supplier','Payable'),('all','Receivable and Payable')],
         'required':True,
-        'default': lambda *a: 'customer',
+        'default': lambda *a: 'all',
     },
     'direction_selection':{
         'string':"Analysis Direction",
diff --git a/addons/account/wizard/wizard_general_ledger_report.py b/addons/account/wizard/wizard_general_ledger_report.py
index 0f5c92fa9f4..1d5896204db 100644
--- a/addons/account/wizard/wizard_general_ledger_report.py
+++ b/addons/account/wizard/wizard_general_ledger_report.py
@@ -100,7 +100,7 @@ period_fields = {
         'string':"Date/Period Filter",
         'type':'selection',
         'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
-        'default': lambda *a:'bydate'
+        'default': lambda *a:'none'
     },
     'fiscalyear': {'string': 'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
         'help': 'Keep empty for all open fiscal year'},
@@ -168,6 +168,7 @@ class wizard_report(wizard.interface):
         data['form']['sortbydate'] = 'sort_date'
         data['form']['display_account']='bal_all'
         data['form']['landscape']=True
+        data['form']['fiscalyear'] = False
         data['form']['amount_currency'] = True
         return data['form']
 
diff --git a/addons/account/wizard/wizard_partner_balance_report.py b/addons/account/wizard/wizard_partner_balance_report.py
index 500e1dbb224..697b08fd16b 100644
--- a/addons/account/wizard/wizard_partner_balance_report.py
+++ b/addons/account/wizard/wizard_partner_balance_report.py
@@ -54,10 +54,11 @@ period_fields = {
         'string':"Date/Period Filter",
         'type':'selection',
         'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
-        'default': lambda *a:'bydate'
+        'default': lambda *a:'none'
     },
     'fiscalyear': {
         'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
+        'default': lambda *a:False,
         'help': 'Keep empty for all open fiscal year'
     },
     'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty','states':{'none':[('readonly',True)],'bydate':[('readonly',True)]}},
@@ -87,6 +88,7 @@ class wizard_report(wizard.interface):
         data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
         data['form']['company_id'] = company_id
         data['form']['soldeinit'] = True
+        data['form']['fiscalyear'] = False
         data['form']['result_selection'] = 'all'
         return data['form']
     
diff --git a/addons/account/wizard/wizard_third_party_ledger.py b/addons/account/wizard/wizard_third_party_ledger.py
index 6497958fee6..80827378e0f 100755
--- a/addons/account/wizard/wizard_third_party_ledger.py
+++ b/addons/account/wizard/wizard_third_party_ledger.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution    
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -27,16 +27,16 @@ import pooler
 
 period_form = '''<?xml version="1.0"?>
 <form string="Select Date-Period">
-	
-	<field name="company_id"/>
+    
+    <field name="company_id"/>
     <field name="result_selection"/>
     <newline/>
     <field name="fiscalyear"/>
     <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
     <group colspan = "4" >
-	<field name="reconcil"/>
-	<field name="page_split"/>
-	</group>
+    <field name="reconcil"/>
+    <field name="page_split"/>
+    </group>
     <newline/>
     <separator string="Filters" colspan="4"/>
     <field name="state" required="True"/>
@@ -55,16 +55,17 @@ period_form = '''<?xml version="1.0"?>
 </form>'''
 
 period_fields = {
-	'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
+    'company_id': {'string': 'Company', 'type': 'many2one', 'relation': 'res.company', 'required': True},
     'state':{
         'string':"Date/Period Filter",
         'type':'selection',
         'selection':[('bydate','By Date'),('byperiod','By Period'),('all','By Date and Period'),('none','No Filter')],
-        'default': lambda *a:'bydate'
+        'default': lambda *a:'none'
     },
     'fiscalyear': {
         'string':'Fiscal year', 'type': 'many2one', 'relation': 'account.fiscalyear',
-        'help': 'Keep empty for all open fiscal year'
+        'help': 'Keep empty for all open fiscal year',
+        'default': lambda *a:False,
     },
     'periods': {'string': 'Periods', 'type': 'many2many', 'relation': 'account.period', 'help': 'All periods if empty','states':{'none':[('readonly',True)],'bydate':[('readonly',True)]}},
     'result_selection':{
@@ -73,70 +74,70 @@ period_fields = {
         'selection':[('customer','Receivable Accounts'),('supplier','Payable Accounts'),('all','Receivable and Payable Accounts')],
         'required':True
     },
-	'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
-	'reconcil':{'string':"	   Include Reconciled Entries",'type':'boolean'},
-	'page_split':{'string':"One Partner Per Page",'type':'boolean'},
-	'date1': {'string':'  	  Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
-	'date2': {'string':'End date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
+    'soldeinit':{'string':"Inclure les soldes initiaux",'type':'boolean'},
+    'reconcil':{'string':"       Include Reconciled Entries",'type':'boolean'},
+    'page_split':{'string':"One Partner Per Page",'type':'boolean'},
+    'date1': {'string':'        Start date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
+    'date2': {'string':'End date', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
 }
 
 
 class wizard_report(wizard.interface):
-	
-	def _get_defaults(self, cr, uid, data, context):
-		fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
-		data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
-		data['form']['display_account']='bal_all'
-		
-		data['form']['result_selection'] = 'all'
-		user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
-		if user.company_id:
-			company_id = user.company_id.id
-		else:
-			company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
-		data['form']['company_id'] = company_id
-		periods_obj=pooler.get_pool(cr.dbname).get('account.period')
-		data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
-		data['form']['page_split'] = False
-		data['form']['reconcil'] = False
-		data['form']['soldeinit'] = True
-		return data['form']
-	
-	def _check_date(self, cr, uid, data, context):
-		
-		sql = """
-			SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f  Where '%s' between f.date_start and f.date_stop """%(data['form']['date1'])
-		cr.execute(sql)
-		res = cr.dictfetchall()
-		if res:
-			if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']):
-				raise  wizard.except_wizard('UserError','Date to must be set between ' + res[0]['date_start'] + " and " + res[0]['date_stop'])
-			else:
-				return 'report'
-			
-		else:
-			raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
-	
-	
-	def _check_state(self, cr, uid, data, context):
-		if data['form']['state'] == 'bydate' or data['form']['state'] == 'all' or data['form']['state'] == 'none':
-		   data['form']['fiscalyear'] = False
-		else :
-		   data['form']['fiscalyear'] = True
-		   self._check_date(cr, uid, data, context)
-		return data['form']
+    
+    def _get_defaults(self, cr, uid, data, context):
+        fiscalyear_obj = pooler.get_pool(cr.dbname).get('account.fiscalyear')
+        data['form']['fiscalyear'] = fiscalyear_obj.find(cr, uid)
+        data['form']['display_account']='bal_all'
+        data['form']['result_selection'] = 'all'
+        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
+        if user.company_id:
+            company_id = user.company_id.id
+        else:
+            company_id = pooler.get_pool(cr.dbname).get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+        data['form']['company_id'] = company_id
+        periods_obj=pooler.get_pool(cr.dbname).get('account.period')
+        data['form']['periods'] =periods_obj.search(cr, uid, [('fiscalyear_id','=',data['form']['fiscalyear'])])
+        data['form']['fiscalyear'] =False
+        data['form']['page_split'] = False
+        data['form']['reconcil'] = False
+        data['form']['soldeinit'] = True
+        return data['form']
+    
+    def _check_date(self, cr, uid, data, context):
+        
+        sql = """
+            SELECT f.id, f.date_start, f.date_stop FROM account_fiscalyear f  Where '%s' between f.date_start and f.date_stop """%(data['form']['date1'])
+        cr.execute(sql)
+        res = cr.dictfetchall()
+        if res:
+            if (data['form']['date2'] > res[0]['date_stop'] or data['form']['date2'] < res[0]['date_start']):
+                raise  wizard.except_wizard('UserError','Date to must be set between ' + res[0]['date_start'] + " and " + res[0]['date_stop'])
+            else:
+                return 'report'
+            
+        else:
+            raise wizard.except_wizard('UserError','Date not in a defined fiscal year')
+    
+    
+    def _check_state(self, cr, uid, data, context):
+        if data['form']['state'] == 'bydate' or data['form']['state'] == 'all':
+           data['form']['fiscalyear'] = False
+        else :
+           data['form']['fiscalyear'] = True
+           self._check_date(cr, uid, data, context)
+        return data['form']
 
 
-	states = {
-		'init': {
-			'actions': [_get_defaults],
-			'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
-		},
-		'report': {
-			'actions': [_check_state],
-			'result': {'type':'print', 'report':'account.third_party_ledger', 'state':'end'}
-		}
-	}
+    states = {
+        'init': {
+            'actions': [_get_defaults],
+            'result': {'type':'form', 'arch':period_form, 'fields':period_fields, 'state':[('end','Cancel','gtk-cancel'),('report','Print','gtk-print')]}
+        },
+        'report': {
+            'actions': [_check_state],
+            'result': {'type':'print', 'report':'account.third_party_ledger', 'state':'end'}
+        }
+    }
 wizard_report('account.third_party_ledger.report')
 
 

From d41712b3fcb6de5f6e9221267e6a0e746a85d113 Mon Sep 17 00:00:00 2001
From: Mustufa Rangwala <mra@tinyerp.com>
Date: Thu, 6 Nov 2008 17:32:36 +0530
Subject: [PATCH 51/72] add default value for analytic journal in distribution

bzr revid: mra@tinyerp.com-20081106120236-j86zmofukpfl9b9k
---
 .../account_analytic_plans/account_analytic_plans.py   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index d69c7fd49d1..4b6ab06e827 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -102,8 +102,16 @@ class account_analytic_plan_instance(osv.osv):
                 'account4_ids':False, 'account5_ids':False, 'account6_ids':False})
         return super(account_analytic_plan_instance, self).copy(cr, uid, id, default, context)
 
+    def _default_journal(self, cr, uid, context={}):
+        if context.has_key('journal_id') and context['journal_id']:
+            journal = self.pool.get('account.journal').browse(cr, uid, context['journal_id'])
+            if journal.analytic_journal_id:
+                return journal.analytic_journal_id.id
+        return False
+
     _defaults = {
         'plan_id': lambda *args: False,
+        'journal_id': _default_journal,
     }
     def name_get(self, cr, uid, ids, context={}):
         res = []

From 397fde0dfce131a3e8d3e260b03cb772f6c0618e Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Thu, 6 Nov 2008 17:49:51 +0530
Subject: [PATCH 52/72] account balance prob solved

bzr revid: patelamit2003@gmail.com-20081106121951-p3783sxnjrls4tyw
---
 addons/account/report/account_balance.py | 71 +++---------------------
 1 file changed, 8 insertions(+), 63 deletions(-)

diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 7cb47e3e198..56949c53090 100755
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -39,7 +39,6 @@ class account_balance(report_sxw.rml_parse):
             self.localcontext.update({
                 'time': time,
                 'lines': self.lines,
-                'moveline':self.moveline,
                 'sum_debit': self._sum_debit,
                 'sum_credit': self._sum_credit,
                 'get_fiscalyear':self.get_fiscalyear,
@@ -134,27 +133,16 @@ class account_balance(report_sxw.rml_parse):
                 self.transform_both_into_date_array(form)
             elif form['state'] == 'none' :
                 self.transform_none_into_date_array(form)
-#                ctx['date_from'] = form['date_from']
-#                ctx['date_to'] = form['date_to']
 
             accounts = self.pool.get('account.account').browse(self.cr, self.uid, ids, ctx)
             def cmp_code(x, y):
                 return cmp(x.code, y.code)
             accounts.sort(cmp_code)
             for account in accounts:
-
                 if account.id in done:
                     continue
                 done[account.id] = 1
                 res = {
-#                        'lid' :'',
-#                        'date':'',
-#                        'jname':'',
-#                        'ref':'',
-#                        'lname':'',
-#                        'debit1':'',
-#                        'credit1':'',
-#                        'balance1' :'',
                         'id' : account.id,
                         'type' : account.type,
                         'code': account.code,
@@ -168,9 +156,6 @@ class account_balance(report_sxw.rml_parse):
                     }
                 self.sum_debit += account.debit
                 self.sum_credit += account.credit
-#                if not (res['credit'] or res['debit']) and not account.child_id:
-#                    continue
-
                 if account.child_id:
                     def _check_rec(account):
                         if not account.child_id:
@@ -191,57 +176,17 @@ class account_balance(report_sxw.rml_parse):
                         result_acc.append(res)
                 else:
                     result_acc.append(res)
-
-
-
-                res1 = self.moveline(form, account.id,res['level'])
-                if res1:
-                    for r in res1:
-                        result_acc.append(r)
-#                if account.code=='0':
-#                    result_acc.pop(-1)
                 if account.child_id:
-                    ids2 = [(x.code,x.id) for x in account.child_id]
-                    ids2.sort()
-                    result_acc += self.lines(form, [x[1] for x in ids2], done, level+1)
-
+                    acc_id = [acc.id for acc in account.child_id]
+                    lst_string = ''
+                    lst_string = '\'' + '\',\''.join(map(str,acc_id)) + '\''
+                    self.cr.execute("select code,id from account_account where id IN (%s)"%(lst_string))
+                    a_id = self.cr.fetchall()                   
+                    a_id.sort()
+                    ids2 = [x[1] for x in a_id]
+                    result_acc += self.lines(form, ids2, done, level+1)
             return result_acc
 
-        def moveline(self,form,ids,level):
-            res={}
-
-            self.date_lst_string = '\'' + '\',\''.join(map(str,self.date_lst)) + '\''
-            self.cr.execute(
-                    "SELECT l.id as lid,l.date,j.code as jname, l.ref, l.name as lname, l.debit as debit1, l.credit as credit1 " \
-                    "FROM account_move_line l " \
-                    "LEFT JOIN account_journal j " \
-                        "ON (l.journal_id = j.id) " \
-                    "WHERE l.account_id = '"+str(ids)+"' " \
-                    "AND l.date >= '"+self.date_lst[0]+"'   " \
-                     "AND l.date <= '"+self.date_lst[-1]+"'  " \
-                        "ORDER BY l.id")
-
-            res = self.cr.dictfetchall()
-
-            sum = 0.0
-            for r in res:
-                sum = r['debit1'] - r['credit1']
-                r['balance1'] = sum
-                r['type']= ''
-                r['id'] =''
-                r['code']= ''
-                r['name']=''
-                r['level']=level
-                r['debit']=''
-                r['credit']=''
-                r['balance']=''
-                r['leef']=''
-                if sum >= 0.0:
-                    r['bal_type']=" Dr."
-                else:
-                    r['bal_type']=" Cr."
-            return res or ''
-
         def date_range(self,start,end):
             start = datetime.date.fromtimestamp(time.mktime(time.strptime(start,"%Y-%m-%d")))
             end = datetime.date.fromtimestamp(time.mktime(time.strptime(end,"%Y-%m-%d")))

From 71b9dedbbe6a43e87dfde15f0d6f34bed75b6cff Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 6 Nov 2008 18:31:35 +0530
Subject: [PATCH 53/72] add new field `type` in account move also add the same
 on view

bzr revid: mga@tinyerp.com-20081106130135-rxxue1o1o00ka5xr
---
 addons/account/account.py       | 11 +++++++++++
 addons/account/account_view.xml |  1 +
 2 files changed, 12 insertions(+)

diff --git a/addons/account/account.py b/addons/account/account.py
index 837edaae195..cbab98b01ea 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -680,10 +680,21 @@ class account_move(osv.osv):
         'to_check': fields.boolean('To Be Verified'),
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
         'amount': fields.function(_amount_compute, method=True, string='Amount', digits=(16,2), store=True),
+        'type': fields.selection([
+            ('pay_voucher','Cash Payment'),
+            ('bank_pay_voucher','Bank Payment'),
+            ('rec_voucher','Cash Receipt'),
+            ('bank_rec_voucher','Bank Receipt'),
+            ('cont_voucher','Contra'),
+            ('journal_sale_vou','Journal Sale'),
+            ('journal_pur_voucher','Journal Purchase'),
+            ('journal_voucher','Journal Voucher'),
+        ],'Type', readonly=True, select=True, states={'draft':[('readonly',False)]}),
     }
     _defaults = {
         'state': lambda *a: 'draft',
         'period_id': _get_period,
+        'type' : lambda *a : 'journal_voucher',
     }
 
     def _check_centralisation(self, cursor, user, ids):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e26f3870516..6de5754e9b8 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -819,6 +819,7 @@
                     <field name="amount" select="2"/>
                     <field name="ref" select="1" groups="base.group_extended"/>
                     <field name="to_check" select="2" groups="base.group_extended"/>
+                    <field name="type" select="1" groups="base.group_extended"/>
                     </group>
 
                     <separator colspan="4" string="Entry Lines"/>

From 560cf4336ee1eff7a5cb15c8545d125a27cccd6d Mon Sep 17 00:00:00 2001
From: Jay Vora <jvo@tinyerp.com>
Date: Thu, 6 Nov 2008 19:01:46 +0530
Subject: [PATCH 54/72] Generic development for inserting values into PDF

bzr revid: jvo@tinyerp.com-20081106133146-0gqj1wd1yq9ey3t6
---
 bin/tools/__init__.py  |   3 +-
 bin/tools/pdf_utils.py | 112 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 bin/tools/pdf_utils.py

diff --git a/bin/tools/__init__.py b/bin/tools/__init__.py
index 59428bcf710..b84026572a7 100644
--- a/bin/tools/__init__.py
+++ b/bin/tools/__init__.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -26,6 +26,7 @@ from translate import *
 from graph import graph
 from amount_to_text import *
 from amount_to_text_en import *
+from pdf_utils import *
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/bin/tools/pdf_utils.py b/bin/tools/pdf_utils.py
new file mode 100644
index 00000000000..7699177a1d6
--- /dev/null
+++ b/bin/tools/pdf_utils.py
@@ -0,0 +1,112 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+""" Copyright (c) 2003-2007 LOGILAB S.A. (Paris, FRANCE).
+ http://www.logilab.fr/ -- mailto:contact@logilab.fr
+
+manipulate pdf and fdf files. pdftk recommended.
+
+Notes regarding pdftk, pdf forms and fdf files (form definition file)
+fields names can be extracted with:
+    pdftk orig.pdf generate_fdf output truc.fdf
+to merge fdf and pdf:
+    pdftk orig.pdf fill_form test.fdf output result.pdf [flatten]
+without flatten, one could further edit the resulting form.
+with flatten, everything is turned into text.
+"""
+
+import os
+import netsvc,logging
+
+
+HEAD="""%FDF-1.2
+%\xE2\xE3\xCF\xD3
+1 0 obj
+<<
+/FDF
+<<
+/Fields [
+"""
+
+TAIL="""]
+>>
+>>
+endobj
+trailer
+
+<<
+/Root 1 0 R
+>>
+%%EOF
+"""
+
+def output_field( f ):
+    return "\xfe\xff" + "".join( [ "\x00"+c for c in f ] )
+
+def extract_keys(lines):
+    keys = []
+    for line in lines:
+        if line.startswith('/V'):
+            pass #print 'value',line
+        elif line.startswith('/T'):
+            key = line[7:-2]
+            key = ''.join(key.split('\x00'))
+            keys.append( key )
+    return keys
+
+def write_field(out, key, value):
+    out.write("<<\n")
+    if value:
+        out.write("/V (%s)\n" %value)
+    else:
+        out.write("/V /\n")
+    out.write("/T (%s)\n" % output_field(key) )
+    out.write(">> \n")
+
+def write_fields(out, fields):
+    out.write(HEAD)
+    for key in fields:
+        value = fields[key]
+        write_field(out, key, value)
+#        write_field(out, key+"a", value) # pour copie-carbone sur autres pages
+    out.write(TAIL)
+
+def extract_keys_from_pdf(filename):
+    # what about using 'pdftk filename dump_data_fields' and parsing the output ?
+    os.system('pdftk %s generate_fdf output /tmp/toto.fdf' % filename)
+    lines = file('/tmp/toto.fdf').readlines()
+    return extract_keys(lines)
+
+
+def fill_pdf(infile, outfile, fields):
+    write_fields(file('/tmp/toto.fdf', 'w'), fields)
+    os.system('pdftk %s fill_form /tmp/toto.fdf output %s flatten' % (infile, outfile))
+
+def testfill_pdf(infile, outfile):
+    keys = extract_keys_from_pdf(infile)
+    fields = []
+    for key in keys:
+        fields.append( (key, key, '') )
+    fill_pdf(infile, outfile, fields)
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

From 376569e8b60008419229de0fdf76d007216e5441 Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Thu, 6 Nov 2008 19:10:56 +0530
Subject: [PATCH 55/72] bag fix---account balance report

bzr revid: patelamit2003@gmail.com-20081106134056-acycnqfehfcgtxe1
---
 addons/account/report/account_balance.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 56949c53090..d26c116a9e6 100755
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -161,7 +161,7 @@ class account_balance(report_sxw.rml_parse):
                         if not account.child_id:
                             return bool(account.credit or account.debit)
                         for c in account.child_id:
-                            if not _check_rec(c):
+                            if not _check_rec(c) or _check_rec(c):
                                 return True
                         return False
                     if not _check_rec(account) :
@@ -184,6 +184,7 @@ class account_balance(report_sxw.rml_parse):
                     a_id = self.cr.fetchall()                   
                     a_id.sort()
                     ids2 = [x[1] for x in a_id]
+                    
                     result_acc += self.lines(form, ids2, done, level+1)
             return result_acc
 

From c8d95cfa9547849f1c251de22e3d0b5dcd2ea869 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Thu, 6 Nov 2008 15:29:10 +0100
Subject: [PATCH 56/72] *chnaed bahavior of numbering on account_move. The
 account_move now gets a number only once it is posted, in the meanwhile the
 name_get display now '*'+str(account_move.id) *added an overwriting of the
 function copy on account_move object (to reset state and account move number)
 *modified views of encoding by move *modified invoice accordingly to latest
 change of account_move numbering. Cancelling an invoice will keep the account
 move number it had and will force it the next time it gets validated.

bzr revid: qdp@tinyerp.com-20081106142910-8dhs242gi277rt1k
---
 addons/account/account.py       | 29 +++++++++++++++++++++--------
 addons/account/account_view.xml | 11 +++++------
 addons/account/invoice.py       | 10 +++++++---
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index cbab98b01ea..6512a9c1c1a 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -648,7 +648,7 @@ class account_move(osv.osv):
         data_move = self.pool.get('account.move').browse(cursor,user,ids)
         for move in data_move:
             if move.state=='draft':
-                name = '*' + move.name
+                name = '*' + str(move.id)
             else:
                 name = move.name
             res.append((move.id, name))
@@ -671,7 +671,7 @@ class account_move(osv.osv):
         return result
 
     _columns = {
-        'name': fields.char('Entry Name', size=64, required=True),
+        'name': fields.char('Entry Number', size=64, required=True),
         'ref': fields.char('Ref', size=64),
         'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
@@ -692,6 +692,7 @@ class account_move(osv.osv):
         ],'Type', readonly=True, select=True, states={'draft':[('readonly',False)]}),
     }
     _defaults = {
+        'name': lambda *a: '/',
         'state': lambda *a: 'draft',
         'period_id': _get_period,
         'type' : lambda *a : 'journal_voucher',
@@ -727,6 +728,17 @@ class account_move(osv.osv):
     ]
     def post(self, cr, uid, ids, context=None):
         if self.validate(cr, uid, ids, context) and len(ids):
+            for move in self.browse(cr, uid, ids):
+                if move.name =='/':
+                    new_name = False
+                    journal = move.journal_id
+                    if journal.sequence_id:
+                        new_name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
+                    else:
+                        raise osv.except_osv(_('Error'), _('No sequence defined in the journal !'))
+                    if new_name:
+                        self.write(cr, uid, [move.id], {'name':new_name})
+
             cr.execute('update account_move set state=%s where id in ('+','.join(map(str,ids))+')', ('posted',))
         else:
             raise osv.except_osv(_('Integrity Error !'), _('You can not validate a non balanced entry !'))
@@ -772,12 +784,6 @@ class account_move(osv.osv):
                         l[2]['period_id'] = default_period
                 context['period_id'] = default_period
 
-        if not 'name' in vals:
-            journal = self.pool.get('account.journal').browse(cr, uid, context.get('journal_id', vals.get('journal_id', False)))
-            if journal.sequence_id:
-                vals['name'] = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
-            else:
-                raise osv.except_osv(_('Error'), _('No sequence defined in the journal !'))
         accnt_journal = self.pool.get('account.journal').browse(cr, uid, vals['journal_id'])
         if 'line_id' in vals:
             c = context.copy()
@@ -788,6 +794,13 @@ class account_move(osv.osv):
             result = super(account_move, self).create(cr, uid, vals, context)
         return result
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default.update({'state':'draft', 'name':'/',})
+        return super(account_move, self).copy(cr, uid, id, default, context)
+
     def unlink(self, cr, uid, ids, context={}, check=True):
         toremove = []
         for move in self.browse(cr, uid, ids, context):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 6de5754e9b8..5eb03163c51 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -797,7 +797,8 @@
                     <field name="name"/>
                     <field name="period_id"/>
                     <field name="journal_id"/>
-
+                    <field name="partner_id"/>
+                    <field name="amount"/>
                     <field name="line_id"/>
                     <field name="state"/>
                 </tree>
@@ -812,11 +813,9 @@
                 <form string="Account Entry">
                     <separator colspan="4" string="General Information"/>
                     <group colspan="4" col="6">
-                    <field name="name" select="1"/>
+                    <field name="name" select="1" readonly="True"/>
                     <field name="period_id" select="2"/>
                     <field name="journal_id" select="1"/>
-                    <field name="partner_id" select="2"/>
-                    <field name="amount" select="2"/>
                     <field name="ref" select="1" groups="base.group_extended"/>
                     <field name="to_check" select="2" groups="base.group_extended"/>
                     <field name="type" select="1" groups="base.group_extended"/>
@@ -855,8 +854,8 @@
                             <field name="account_id"/>
                             <field name="date_maturity"/>
                             <field name="ref"/>
-                            <field name="debit"/>
-                            <field name="credit"/>
+                            <field name="debit" sum="Total Debit"/>
+                            <field name="credit" sum="Total Credit"/>
                             <field name="state"/>
                         </tree>
                     </field>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 5c887064f1e..23544989049 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -191,6 +191,7 @@ class account_invoice(osv.osv):
         'move_lines':fields.function(_get_lines , method=True,type='many2many' , relation='account.move.line',string='Move Lines'),
         'residual': fields.function(_amount_residual, method=True, digits=(16,2),string='Residual', store=True, help="Remaining amount due."),
         'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
+        'move_name': fields.char('Account Move', size=64),
     }
     _defaults = {
         'type': _get_type,
@@ -323,7 +324,7 @@ class account_invoice(osv.osv):
         if default is None:
             default = {}
         default = default.copy()
-        default.update({'state':'draft', 'number':False, 'move_id':False})
+        default.update({'state':'draft', 'number':False, 'move_id':False, 'move_name':False,})
         if 'date_invoice' not in default:
             default['date_invoice'] = False
         if 'date_due' not in default:
@@ -568,8 +569,10 @@ class account_invoice(osv.osv):
 
             journal_id = inv.journal_id.id #self._get_journal(cr, uid, {'type': inv['type']})
             journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
-            if journal.sequence_id:
+            if journal.sequence_id and not inv.move_name:
                 name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
+            else:
+                name = inv.move_name
             if journal.centralisation:
                 raise osv.except_osv(_('UserError'),
                         _('Can not create invoice move on centralized journal'))
@@ -585,8 +588,9 @@ class account_invoice(osv.osv):
                 for i in line:
                     i[2]['period_id'] = period_id
             move_id = self.pool.get('account.move').create(cr, uid, move)
+            new_move_name = self.pool.get('account.move').browse(cr, uid, move_id).name
             # make the invoice point to that move
-            self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id})
+            self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name})
             self.pool.get('account.move').post(cr, uid, [move_id])
         self._log_event(cr, uid, ids)
         return True

From 19b5efde0d94324493f35524cd3165deea0837c9 Mon Sep 17 00:00:00 2001
From: Harshad Modi <hmo@tinyerp.com>
Date: Thu, 6 Nov 2008 21:09:11 +0530
Subject: [PATCH 57/72] improve

bzr revid: hmo@tinyerp.com-20081106153911-eug0498q1bvu4uc5
---
 addons/mrp/mrp.py           | 12 ++++++++++--
 addons/purchase/purchase.py |  3 +--
 addons/sale/sale.py         |  3 +--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index c4c850045e4..1c16da52918 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -410,6 +410,15 @@ class mrp_production(osv.osv):
         'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'mrp.production') or '/',
     }
     _order = 'date_planned asc, priority desc';
+    def unlink(self, cr, uid, ids):
+        productions = self.read(cr, uid, ids, ['state'])
+        unlink_ids = []
+        for s in productions:
+            if s['state'] in ['draft','cancel']:
+                unlink_ids.append(s['id'])
+            else:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Production Order(s) which are in %s State!' % s['state']))
+        return osv.osv.unlink(self, cr, uid, unlink_ids)
 
     def location_id_change(self, cr, uid, ids, src, dest, context={}):
         if dest:
@@ -780,8 +789,7 @@ class mrp_procurement(osv.osv):
                 unlink_ids.append(s['id'])
             else:
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state']))
-        osv.osv.unlink(self, cr, uid, unlink_ids)
-        return True
+        return osv.osv.unlink(self, cr, uid, unlink_ids)        
     
     def onchange_product_id(self, cr, uid, ids, product_id, context={}):
         if product_id:
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index f71973bca5b..bc4283d3943 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -207,8 +207,7 @@ class purchase_order(osv.osv):
                 unlink_ids.append(s['id'])
             else:
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!' % s['state']))
-        osv.osv.unlink(self, cr, uid, unlink_ids)
-        return True
+        return osv.osv.unlink(self, cr, uid, unlink_ids)        
     
     def button_dummy(self, cr, uid, ids, context={}):
         return True
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 1e25459e1ff..c120ed706db 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -261,8 +261,7 @@ class sale_order(osv.osv):
                 unlink_ids.append(s['id'])
             else:
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sale Order(s) which are already confirmed !'))
-        osv.osv.unlink(self, cr, uid, unlink_ids)
-        return True
+        return osv.osv.unlink(self, cr, uid, unlink_ids)        
     
     def onchange_shop_id(self, cr, uid, ids, shop_id):
         v={}

From 45f3ff056076d772c91b316d7fc6380818ef4719 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Nov 2008 17:55:00 +0100
Subject: [PATCH 58/72] merge

bzr revid: fp@tinyerp.com-20081106165500-tae7w4hwt85fzuhh
---
 addons/account/account_view.xml       |  2 +-
 addons/mrp/mrp.py                     |  4 ++--
 addons/purchase/purchase_view.xml     |  6 +++---
 addons/purchase/purchase_workflow.xml |  1 +
 addons/stock/stock.py                 | 20 +++++++++++---------
 addons/stock/stock_view.xml           |  4 ++--
 6 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e26f3870516..697d961e17e 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -812,9 +812,9 @@
                 <form string="Account Entry">
                     <separator colspan="4" string="General Information"/>
                     <group colspan="4" col="6">
-                    <field name="name" select="1"/>
                     <field name="period_id" select="2"/>
                     <field name="journal_id" select="1"/>
+                    <field name="name" select="1"/>
                     <field name="partner_id" select="2"/>
                     <field name="amount" select="2"/>
                     <field name="ref" select="1" groups="base.group_extended"/>
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 612f2461a7c..85d393636f9 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1034,10 +1034,10 @@ class mrp_procurement(osv.osv):
     def action_cancel(self, cr, uid, ids):
         todo = []
         for proc in self.browse(cr, uid, ids):
-            if proc.move_id:
+            if proc.move_id and proc.move_id.state=='waiting':
                 todo.append(proc.move_id.id)
         if len(todo):
-            self.pool.get('stock.move').action_cancel(cr, uid, [proc.move_id.id])
+            self.pool.get('stock.move').write(cr, uid, todo, {'state':'assigned'})
         self.write(cr, uid, ids, {'state':'cancel'})
 
         wf_service = netsvc.LocalService("workflow")
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 69f677fa15e..f75ee28ff19 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -64,11 +64,11 @@
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier"/>
                                 <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order"/>
-								<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                                <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                                 <button name="action_cancel" states="approved" string="Cancel Purchase Order" type="object"/>
 
-                                <button name="shipping_ok" states="except_shipping" string="Shipping Done"/>
-                                <button name="invoice_ok" states="except_invoice" string="Invoice Done"/>
+                                <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
+                                <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
                             </group>
                         </page>
                         <page string="Delivery &amp; Invoices">
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 466d0f3e156..fa0ab0e6979 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -23,6 +23,7 @@
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">cancel</field>
             <field name="kind">function</field>
+            <field name="flow_stop">True</field>
             <field name="action">write({'state':'cancel'})</field>
         </record>
         <record id="act_except_invoice" model="workflow.activity">
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 043319f54da..9ba8a1bc8a4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1090,20 +1090,22 @@ class stock_move(osv.osv):
             if move.state in ('confirmed','waiting','assigned','draft'):
                 if move.picking_id:
                     pickings[move.picking_id.id] = True
-        self.write(cr, uid, ids, {'state':'cancel'})
+        if move.move_dest_id and move.move_dest_id.state=='waiting':
+            self.write(cr, uid, [move.move_dest_id.id], {'state':'confirmed'})
+        self.write(cr, uid, ids, {'state':'cancel', 'move_dest_id': False})
 
-        for pick_id in pickings:
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'stock.picking', pick_id, 'button_cancel', cr)
-        ids2 = []
-        for res in self.read(cr, uid, ids, ['move_dest_id']):
-            if res['move_dest_id']:
-                ids2.append(res['move_dest_id'][0])
+        #for pick_id in pickings:
+        #    wf_service = netsvc.LocalService("workflow")
+        #    wf_service.trg_validate(uid, 'stock.picking', pick_id, 'button_cancel', cr)
+        #ids2 = []
+        #for res in self.read(cr, uid, ids, ['move_dest_id']):
+        #    if res['move_dest_id']:
+        #        ids2.append(res['move_dest_id'][0])
 
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_trigger(uid, 'stock.move', id, cr)
-        self.action_cancel(cr,uid, ids2, context)
+        #self.action_cancel(cr,uid, ids2, context)
         return True
 
     def action_done(self, cr, uid, ids, context=None):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 7dcfc03c9e5..a375850ed71 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1023,8 +1023,8 @@
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object"/>
                                 <button name="action_assign" states="confirmed" string="Assign" type="object"/>
-                                <button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
-                                <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
+                                <button name="force_assign" states="confirmed" string="Force Assignation" type="object" groups="base.group_extended"/>
+                                <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object" groups="base.group_extended"/>
                                 <button name="%(partial_picking)d" states="assigned" string="Validate" type="action"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
                             </group>

From 8794a1233af4edaf09360030fea7e0f8498258f2 Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Thu, 6 Nov 2008 17:58:28 +0100
Subject: [PATCH 59/72] *improvement of import: 	*added try-except 
 *bugfixed the import partial

bzr revid: qdp@tinyerp.com-20081106165828-xldwvciacbp5u2zd
---
 bin/tools/convert.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bin/tools/convert.py b/bin/tools/convert.py
index 06e49135d10..fe8afcc3594 100644
--- a/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@ -784,7 +784,6 @@ def convert_csv_import(cr, module, fname, csvcontent, idref=None, mode='init',
     input = StringIO.StringIO(csvcontent)
     reader = csv.reader(input, quotechar='"', delimiter=',')
     fields = reader.next()
-
     fname_partial = ""
     if config.get('import_partial'):
         fname_partial = module + '/'+ fname
@@ -807,13 +806,16 @@ def convert_csv_import(cr, module, fname, csvcontent, idref=None, mode='init',
     for line in reader:
         if (not line) or not reduce(lambda x,y: x or y, line) :
             continue
-        datas.append( map(lambda x:x.decode('utf8').encode('utf8'), line))
+        try:
+            datas.append( map(lambda x:x.decode('utf8').encode('utf8'), line))
+        except:
+            print "ERROR while importing the line: ", line
     pool.get(model).import_data(cr, uid, fields, datas,mode, module,noupdate,filename=fname_partial)
-
     if config.get('import_partial'):
         data = pickle.load(file(config.get('import_partial')))
         data[fname_partial] = 0
         pickle.dump(data, file(config.get('import_partial'),'wb'))
+        cr.commit()
 
 #
 # xml import/export

From a5093384049827d695532a8426b7999a6c7aa4de Mon Sep 17 00:00:00 2001
From: qdp <qdp@tinyerp.com>
Date: Thu, 6 Nov 2008 18:04:56 +0100
Subject: [PATCH 60/72] *added 2 sequencies for purchase and sales journal
 *modified demo data accordingly

bzr revid: qdp@tinyerp.com-20081106170456-tx4pnxw767uxorza
---
 addons/account/data/account_data2.xml   | 10 ++++++++++
 addons/account/demo/account_minimal.xml |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index 7fcd61cb62d..ba606287d6a 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -286,6 +286,16 @@
             <field name="code">account.journal</field>
             <field name="prefix"/>
         </record>
+        <record id="sequence_sale_journal" model="ir.sequence">
+            <field name="name">Sale Journal</field>
+            <field name="code">account.journal</field>
+            <field name="prefix"/>
+        </record>
+        <record id="sequence_purchase_journal" model="ir.sequence">
+            <field name="name">Purchase Journal</field>
+            <field name="code">account.journal</field>
+            <field name="prefix"/>
+        </record>
 
         <!--
 		Account Statement Sequences
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 34b06e30f20..d36d10b374f 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -166,7 +166,7 @@ your own chart of account.
             <field name="code">SAJ</field>
             <field name="type">sale</field>
             <field name="view_id" ref="account_journal_view"/>
-            <field name="sequence_id" ref="sequence_journal"/>
+            <field name="sequence_id" ref="sequence_sale_journal"/>
             <field model="account.account" name="default_credit_account_id" search="[('type','=','receivable')]"/>
             <field model="account.account" name="default_debit_account_id" search="[('type','=','receivable')]"/>
             <field name="user_id" ref="base.user_root"/>
@@ -176,7 +176,7 @@ your own chart of account.
             <field name="code">EXJ</field>
             <field name="type">purchase</field>
             <field name="view_id" ref="account_journal_view"/>
-            <field name="sequence_id" ref="sequence_journal"/>
+            <field name="sequence_id" ref="sequence_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" search="[('type','=','payable')]"/>
             <field model="account.account" name="default_credit_account_id" search="[('type','=','payable')]"/>
             <field name="user_id" ref="base.user_root"/>

From ab9b5b96dc82bd01370e395eb9c96cae7a548294 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Nov 2008 22:24:51 +0100
Subject: [PATCH 61/72] bugfixes_stock

bzr revid: fp@tinyerp.com-20081106212451-1zy2cvxif6fta9qi
---
 addons/mrp/mrp.py           | 2 +-
 addons/sale/sale.py         | 1 -
 addons/stock/stock.py       | 8 +++++---
 addons/stock/stock_view.xml | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index de236bb5d99..906ac653b3e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -475,7 +475,7 @@ class mrp_production(osv.osv):
             if production.move_created_ids:
                 self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in production.move_created_ids])
             self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in production.move_lines])
-        self.write(cr, uid, ids, {'state':'cancel','move_lines':[(6,0,[])]})
+        self.write(cr, uid, ids, {'state':'cancel'}) #,'move_lines':[(6,0,[])]})
         return True
 
     #XXX: may be a bug here; lot_lines are unreserved for a few seconds;
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c120ed706db..39ea34ed5bf 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -904,7 +904,6 @@ class sale_order_line(osv.osv):
                     }
             else:
                 result.update({'price_unit': price})
-        print result
         return {'value': result, 'domain': domain,'warning':warning}
 
     def product_uom_change(self, cursor, user, ids, pricelist, product, qty=0,
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9ba8a1bc8a4..157aa9642e4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -595,7 +595,6 @@ class stock_picking(osv.osv):
 
     def action_invoice_create(self, cursor, user, ids, journal_id=False,
             group=False, type='out_invoice', context=None):
-        print "WW"*12,context
         '''Return ids of created invoices for the pickings'''
         invoice_obj = self.pool.get('account.invoice')
         invoice_line_obj = self.pool.get('account.invoice.line')
@@ -894,7 +893,7 @@ class stock_move(osv.osv):
 
         'note': fields.text('Notes'),
 
-        'state': fields.selection([('draft','Draft'),('waiting','Waiting'),('confirmed','Confirmed'),('assigned','Assigned'),('done','Done'),('cancel','cancel')], 'Status', readonly=True, select=True),
+        'state': fields.selection([('draft','Draft'),('waiting','Waiting'),('confirmed','Confirmed'),('assigned','Assigned'),('done','Done'),('cancel','Canceled')], 'Status', readonly=True, select=True),
         'price_unit': fields.float('Unit Price',
             digits=(16, int(config['price_accuracy']))),
     }
@@ -1091,7 +1090,10 @@ class stock_move(osv.osv):
                 if move.picking_id:
                     pickings[move.picking_id.id] = True
         if move.move_dest_id and move.move_dest_id.state=='waiting':
-            self.write(cr, uid, [move.move_dest_id.id], {'state':'confirmed'})
+            self.write(cr, uid, [move.move_dest_id.id], {'state':'assigned'})
+            if move.move_dest_id.picking_id:
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr)
         self.write(cr, uid, ids, {'state':'cancel', 'move_dest_id': False})
 
         #for pick_id in pickings:
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index a375850ed71..843daf2cee7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -517,7 +517,7 @@
                         <field name="date"/>
                         <field name="min_date" select="2"/>
                     </group>
-                    <notebook>
+                    <notebook colspan="4">
                         <page string="General Information">
                             <field colspan="4" name="move_lines" nolabel="1" widget="one2many_list" default_get="{'move_line':move_lines, 'address_out_id': address_id}">
                                 <form string="Stock Moves">

From 2728e807e934f440839ba70d76c07e839c9dc66e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Nov 2008 22:32:25 +0100
Subject: [PATCH 62/72] better_views

bzr revid: fp@tinyerp.com-20081106213225-n8494z2kbigrl4ka
---
 addons/stock/stock.py       |  4 ++--
 addons/stock/stock_view.xml | 40 +++++++++++++++++--------------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 157aa9642e4..dd7fd36cd17 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -382,7 +382,7 @@ class stock_picking(osv.osv):
             ('draft','Draft'),
             ('auto','Waiting'),
             ('confirmed','Confirmed'),
-            ('assigned','Assigned'),
+            ('assigned','Available'),
             ('done','Done'),
             ('cancel','Cancel'),
             ], 'Status', readonly=True, select=True),
@@ -893,7 +893,7 @@ class stock_move(osv.osv):
 
         'note': fields.text('Notes'),
 
-        'state': fields.selection([('draft','Draft'),('waiting','Waiting'),('confirmed','Confirmed'),('assigned','Assigned'),('done','Done'),('cancel','Canceled')], 'Status', readonly=True, select=True),
+        'state': fields.selection([('draft','Draft'),('waiting','Waiting'),('confirmed','Confirmed'),('assigned','Available'),('done','Done'),('cancel','Canceled')], 'Status', readonly=True, select=True),
         'price_unit': fields.float('Unit Price',
             digits=(16, int(config['price_accuracy']))),
     }
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 843daf2cee7..60f43c1fc4d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -542,8 +542,8 @@
                                     <separator colspan="4" string="Move State"/>
                                     <field name="state" select="1"/>
                                     <group>
-                                        <button name="force_assign" states="confirmed" string="Force assignation" type="object"/>
-                                        <button name="cancel_assign" states="assigned" string="Cancel assignation" type="object"/>
+                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
                                     </group>
                                 </form>
                             </field>
@@ -555,9 +555,8 @@
                                 <field name="state" readonly="1"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object"/>
-                                <button name="action_assign" states="confirmed" string="Assign" type="object"/>
-                                <button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
-                                <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
+                                <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
+                                <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
                                 <button name="%(partial_picking)d" states="assigned" string="Validate" type="action"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
                             </group>
@@ -646,10 +645,9 @@
                                 <field name="state" readonly="1"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object"/>
-                                <button name="action_assign" states="confirmed" string="Assign" type="object"/>
-                                <button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
-                                <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Validate" type="action"/>
+                                <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
+                                <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                                <button name="%(partial_picking)d" states="assigned" string="Products Sent" type="action"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
                             </group>
                         </page>
@@ -822,8 +820,8 @@
                                     <separator colspan="4" string="Move State"/>
                                     <field name="state" select="1"/>
                                     <group>
-                                        <button name="force_assign" states="confirmed" string="Force assignation" type="object"/>
-                                        <button name="cancel_assign" states="assigned" string="Cancel assignation" type="object"/>
+                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
                                     </group>
                                 </form>
                             </field>
@@ -835,10 +833,9 @@
                                 <field name="state" readonly="1"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object"/>
-                                <button name="action_assign" states="confirmed" string="Assign" type="object"/>
-                                <button name="force_assign" states="confirmed" string="Force Assignation" type="object"/>
-                                <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Validate" type="action"/>
+                                <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended"/>
+                                <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                                <button name="%(partial_picking)d" states="assigned" string="Packing Done" type="action"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
                             </group>
                         </page>
@@ -1009,8 +1006,8 @@
                                     <separator colspan="4" string="Move State"/>
                                     <field name="state" select="1"/>
                                     <group>
-                                        <button name="force_assign" states="confirmed" string="Force assignation" type="object"/>
-                                        <button name="cancel_assign" states="assigned" string="Cancel assignation" type="object"/>
+                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
                                     </group>
                                 </form>
                             </field>
@@ -1022,10 +1019,9 @@
                                 <field name="state" readonly="1"/>
                                 <button name="draft_force_assign" states="draft" string="Process Later" type="object"/>
                                 <button name="draft_validate" states="draft" string="Process Now" type="object"/>
-                                <button name="action_assign" states="confirmed" string="Assign" type="object"/>
-                                <button name="force_assign" states="confirmed" string="Force Assignation" type="object" groups="base.group_extended"/>
-                                <button name="cancel_assign" states="assigned" string="Cancel Assignation" type="object" groups="base.group_extended"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Validate" type="action"/>
+                                <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
+                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended"/>
+                                <button name="%(partial_picking)d" states="assigned" string="Products Received" type="action"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel"/>
                             </group>
                         </page>
@@ -1226,7 +1222,7 @@
                     <field name="state" select="1"/>
                     <group col="4" colspan="2">
                         <button name="action_confirm" states="draft" string="Confirm" type="object"/>
-                        <button name="action_assign" states="confirmed" string="Assign" type="object"/>
+                        <button name="action_assign" states="confirmed" string="Set Available" type="object"/>
                         <button name="action_cancel" states="assigned" string="Cancel" type="object"/>
                         <button name="action_done" states="assigned" string="Make Parcel" type="object"/>
                     </group>

From fed9b3e8328b4638aeea721b08bcf7877b649c96 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Nov 2008 22:35:16 +0100
Subject: [PATCH 63/72] improved_views

bzr revid: fp@tinyerp.com-20081106213516-lsadmf3jofslb3g0
---
 addons/stock/stock_view.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 60f43c1fc4d..1f034b32f09 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -632,8 +632,8 @@
                                     <separator colspan="4" string="Move State"/>
                                     <field name="state" select="1"/>
                                     <group>
-                                        <button name="force_assign" states="confirmed" string="Force assignation" type="object"/>
-                                        <button name="cancel_assign" states="assigned" string="Cancel assignation" type="object"/>
+                                        <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"/>
                                     </group>
                                 </form>
                             </field>
@@ -726,7 +726,7 @@
         <menuitem action="action_picking_tree2_delivery" id="menu_picking_waiting_delivery" parent="menu_action_picking_tree_delivery"/>
 
         <record id="action_picking_tree3_delivery" model="ir.actions.act_window">
-            <field name="name">Waiting Delivery Orders</field>
+            <field name="name">Futur Delivery Orders</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -884,7 +884,7 @@
         <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_root" sequence="19"/>
 
         <record id="action_picking_tree2" model="ir.actions.act_window">
-            <field name="name">Assigned Packings</field>
+            <field name="name">Available Packings</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -912,7 +912,7 @@
         <menuitem action="action_picking_tree2" id="menu_picking_waiting" parent="menu_action_picking_tree"/>
 
         <record id="action_picking_tree3" model="ir.actions.act_window">
-            <field name="name">Confirmed Packings Waiting Assignation</field>
+            <field name="name">Confirmed Packings Waiting Availability</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1132,7 +1132,7 @@
 
 
         <record id="action_picking_tree7" model="ir.actions.act_window">
-            <field name="name">Assigned Packings</field>
+            <field name="name">Available Packings</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1143,7 +1143,7 @@
         <menuitem action="action_picking_tree7" id="menu_action_picking_tree7" parent="menu_action_picking_tree6"/>
 
         <record id="action_picking_tree8" model="ir.actions.act_window">
-            <field name="name">Confirmed Packings Waiting Assignation</field>
+            <field name="name">Confirmed Packings Waiting Availability</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1249,7 +1249,7 @@
         <menuitem action="action_move_form3" id="menu_action_move_form3" parent="menu_action_move_form2"/>
 
         <record id="action_move_form4" model="ir.actions.act_window">
-            <field name="name">Assigned Moves</field>
+            <field name="name">Available Moves</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>

From a9b2720017e4317b9583711e0d9660cdcabb4aab Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Nov 2008 22:44:09 +0100
Subject: [PATCH 64/72] improved_sale_workflow_for_advances

bzr revid: fp@tinyerp.com-20081106214409-okz2mj0zwu6ael3k
---
 addons/sale/sale.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 39ea34ed5bf..be573f70422 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -220,7 +220,7 @@ class sale_order(osv.osv):
   - The 'Invoice after delivery' choice will generate the draft invoice after the packing list have been finished.
   - The 'Invoice from the packings' choice is used to create an invoice during the packing process."""),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'project_id':fields.many2one('account.analytic.account', 'Analytic account', readonly=True, states={'draft':[('readonly', False)]}),
+        'project_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft':[('readonly', False)]}),
 
         'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoice', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
@@ -431,7 +431,7 @@ class sale_order(osv.osv):
                         'user_id': (o.user_id and o.user_id.id) or uid,\
                         'partner_type': 'customer', 'probability': 1.0,\
                         'planned_revenue': o.amount_untaxed})
-            if (o.order_policy == 'manual') and (not o.invoice_ids):
+            if (o.order_policy == 'manual'):
                 self.write(cr, uid, [o.id], {'state': 'manual'})
             else:
                 self.write(cr, uid, [o.id], {'state': 'progress'})

From ab7590e61fe8009b929ec52af468c55a3d484cc2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Nov 2008 23:15:58 +0100
Subject: [PATCH 65/72] bugfixes

bzr revid: fp@tinyerp.com-20081106221558-snvf235y50y44ci5
---
 addons/document_ics/document.py |  1 -
 addons/sale/stock.py            | 77 +++++++++++++++++++++++++++++++++
 addons/stock/stock.py           | 55 +++--------------------
 3 files changed, 84 insertions(+), 49 deletions(-)

diff --git a/addons/document_ics/document.py b/addons/document_ics/document.py
index f447a0eb660..627edc48cd0 100644
--- a/addons/document_ics/document.py
+++ b/addons/document_ics/document.py
@@ -120,7 +120,6 @@ class document_directory_content(osv.osv):
                     if type(value)==type(obj):
                         value=value.name
                     value = value or ''
-                    print value
                     event.add(field.name).value = value and value.decode('utf8') or ''
                 elif ICS_TAGS[field.name]=='date':
                     dt = value or time.strftime('%Y-%m-%d %H:%M:%S')
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 29d03e216cb..79cd9a22e51 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -46,6 +46,13 @@ class stock_picking(osv.osv):
             return picking.sale_id.pricelist_id.currency_id.id
         return False
 
+    def _get_payment_term(self, cursor, user, picking):
+        res = {}
+        if picking.sale_id and picking.sale_id.payment_term:
+            return picking.sale_id.payment_term.id
+        return super(stock_picking, self)._get_payment_term(cursor,
+                user, picking)
+
     def _get_address_invoice(self, cursor, user, picking):
         res = {}
         if picking.sale_id:
@@ -106,6 +113,76 @@ class stock_picking(osv.osv):
         return super(stock_picking, self)._invoice_hook(cursor, user,
                 picking, invoice_id)
 
+    def action_invoice_create(self, cursor, user, ids, journal_id=False,
+            group=False, type='out_invoice', context=None):
+        invoice_obj = self.pool.get('account.invoice')
+        picking_obj = self.pool.get('stock.picking')
+        invoice_line_obj = self.pool.get('account.invoice.line')
+
+        result = super(stock_picking, self).action_invoice_create(cursor, user,
+                ids, journal_id=journal_id, group=group, type=type,
+                context=context)
+
+        picking_ids = result.keys()
+        invoice_ids = result.values()
+
+        invoices = {}
+        for invoice in invoice_obj.browse(cursor, user, invoice_ids,
+                context=context):
+            invoices[invoice.id] = invoice
+
+        for picking in picking_obj.browse(cursor, user, picking_ids,
+                context=context):
+
+            if not picking.sale_id:
+                continue
+            sale_lines = picking.sale_id.order_line
+            for sale_line in sale_lines:
+                if sale_line.product_id.type == 'service' and sale_line.invoiced == False:
+                    if group:
+                        name = picking.name + '-' + sale_line.name
+                    else:
+                        name = sale_line.name
+                    if type in ('out_invoice', 'out_refund'):
+                        account_id = sale_line.product_id.product_tmpl_id.\
+                                property_account_income.id
+                        if not account_id:
+                            account_id = sale_line.product_id.categ_id.\
+                                    property_account_income_categ.id
+                    else:
+                        account_id = sale_line.product_id.product_tmpl_id.\
+                                property_account_expense.id
+                        if not account_id:
+                            account_id = sale_line.product_id.categ_id.\
+                                    property_account_expense_categ.id
+                    price_unit = sale_line.price_unit
+                    discount = sale_line.discount
+                    tax_ids = sale_line.tax_id
+
+                    account_analytic_id = self._get_account_analytic_invoice(cursor,
+                            user, picking, sale_line)
+
+                    account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, picking.sale_id.partner_id, account_id)
+                    invoice = invoices[result[picking.id]]
+                    invoice_line_id = invoice_line_obj.create(cursor, user, {
+                        'name': name,
+                        'invoice_id': invoice.id,
+                        'uos_id': sale_line.product_uos.id or sale_line.product_uom.id,
+                        'product_id': sale_line.product_id.id,
+                        'account_id': account_id,
+                        'price_unit': price_unit,
+                        'discount': discount,
+                        'quantity': sale_line.product_uos_qty,
+                        'invoice_line_tax_id': [(6, 0, tax_ids)],
+                        'account_analytic_id': account_analytic_id,
+                        }, context=context)
+                    self.pool.get('sale.order.line').write(cursor, user, [sale_line.id], {'invoiced':True,
+                        'invoice_lines': [(6, 0, [invoice_line_id])],
+                        })
+
+        return result
+
+
 stock_picking()
 
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index dd7fd36cd17..af90192f326 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -542,6 +542,12 @@ class stock_picking(osv.osv):
     def get_currency_id(self, cursor, user, picking):
         return False
 
+    def _get_payment_term(self, cursor, user, picking):
+        '''Return {'contact': address, 'invoice': address} for invoice'''
+        partner_obj = self.pool.get('res.partner')
+        partner = picking.address_id.partner_id
+        return partner.property_payment_term and partner.property_payment_term.id or False
+
     def _get_address_invoice(self, cursor, user, picking):
         '''Return {'contact': address, 'invoice': address} for invoice'''
         partner_obj = self.pool.get('res.partner')
@@ -600,7 +606,6 @@ class stock_picking(osv.osv):
         invoice_line_obj = self.pool.get('account.invoice.line')
         invoices_group = {}
         res = {}
-        sale_line_obj = self.pool.get('sale.order.line')
 
         for picking in self.browse(cursor, user, ids, context=context):
             if picking.invoice_state != '2binvoiced':
@@ -613,8 +618,7 @@ class stock_picking(osv.osv):
 
             if type in ('out_invoice', 'out_refund'):
                 account_id = partner.property_account_receivable.id
-                if picking.sale_id and picking.sale_id.payment_term:
-                    payment_term_id= picking.sale_id.payment_term.id
+                payment_term_id=self._get_payment_term(cursor, user, picking)
             else:
                 account_id = partner.property_account_payable.id
 
@@ -646,51 +650,6 @@ class stock_picking(osv.osv):
                         context=context)
                 invoices_group[partner.id] = invoice_id
             res[picking.id] = invoice_id
-            sale_line_ids = sale_line_obj.search(cursor, user, [('order_id','=',picking.sale_id.id)])
-            sale_lines = sale_line_obj.browse(cursor, user, sale_line_ids, context=context)
-            for sale_line in sale_lines:
-                if sale_line.product_id.type == 'service' and sale_line.invoiced == False:
-                    if group:
-                        name = picking.name + '-' + sale_line.name
-                    else:
-                        name = sale_line.name
-                    if type in ('out_invoice', 'out_refund'):
-                        account_id = sale_line.product_id.product_tmpl_id.\
-                                property_account_income.id
-                        if not account_id:
-                            account_id = sale_line.product_id.categ_id.\
-                                    property_account_income_categ.id
-                    else:
-                        account_id = sale_line.product_id.product_tmpl_id.\
-                                property_account_expense.id
-                        if not account_id:
-                            account_id = sale_line.product_id.categ_id.\
-                                    property_account_expense_categ.id
-                    price_unit = self._get_price_unit_invoice(cursor, user,
-                            sale_line, type)
-                    discount = self._get_discount_invoice(cursor, user, sale_line)
-                    tax_ids = self._get_taxes_invoice(cursor, user, sale_line, type)
-
-                    account_analytic_id = self._get_account_analytic_invoice(cursor,
-                            user, picking, sale_line)
-
-                    account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner, account_id)
-                    invoice_line_id = invoice_line_obj.create(cursor, user, {
-                        'name': name,
-                        'invoice_id': invoice_id,
-                        'uos_id': sale_line.product_uos.id or sale_line.product_uom.id,
-                        'product_id': sale_line.product_id.id,
-                        'account_id': account_id,
-                        'price_unit': price_unit,
-                        'discount': discount,
-                        'quantity': sale_line.product_uos_qty,
-                        'invoice_line_tax_id': [(6, 0, tax_ids)],
-                        'account_analytic_id': account_analytic_id,
-                        }, context=context)
-                    sale_line_obj.write(cursor, user, [sale_line.id], {'invoiced':True,
-                        'invoice_lines': [(6, 0, [invoice_line_id])],
-                        })
-
             for move_line in picking.move_lines:
                 if group:
                     name = picking.name + '-' + move_line.name

From 0b6c01122e6a300470d025e98b4d824716aa33f7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Nov 2008 23:30:56 +0100
Subject: [PATCH 66/72] improvement

bzr revid: fp@tinyerp.com-20081106223056-dr56p2ev3aqapxa8
---
 addons/sale/wizard/make_invoice_advance.py | 35 ++++++++++++++++------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/addons/sale/wizard/make_invoice_advance.py b/addons/sale/wizard/make_invoice_advance.py
index 99fbc54cf02..fad1f83087e 100644
--- a/addons/sale/wizard/make_invoice_advance.py
+++ b/addons/sale/wizard/make_invoice_advance.py
@@ -63,15 +63,15 @@ def _createInvoices(self, cr, uid, data, context={}):
                 _('You cannot make an advance on a sale order that is defined as \'Automatic Invoice after delivery\'.'))
         val = obj_lines.product_id_change(cr, uid, [], data['form']['product_id'],uom = False, partner_id = sale.partner_id.id)
         line_id =obj_lines.create(cr, uid, {
-        'name': val['value']['name'],
-        'account_id':val['value']['account_id'],
-        'price_unit': data['form']['amount'],
-        'quantity': data['form']['qtty'],
-        'discount': False,
-        'uos_id': val['value']['uos_id'],
-        'product_id':data['form']['product_id'],
-        'invoice_line_tax_id': [(6,0,val['value']['invoice_line_tax_id'])],
-        'note':'',
+            'name': val['value']['name'],
+            'account_id':val['value']['account_id'],
+            'price_unit': data['form']['amount'],
+            'quantity': data['form']['qtty'],
+            'discount': False,
+            'uos_id': val['value']['uos_id'],
+            'product_id':data['form']['product_id'],
+            'invoice_line_tax_id': [(6,0,val['value']['invoice_line_tax_id'])],
+            'note':'',
         })
         create_ids.append(line_id)
         inv = {
@@ -96,6 +96,23 @@ def _createInvoices(self, cr, uid, data, context={}):
         ids_inv.append(inv_id)
         obj_sale.write(cr,uid,sale.id,{'invoice_ids':[(6,0,ids_inv)]})
         list_inv.append(inv_id)
+#
+# If invoice on picking: add the cost on the SO
+# If not, the advance will be deduced when generating the final invoice
+#
+        if sale.order_policy=='picking':
+            pool_obj.get('sale.order.line').create(cr, uid, {
+                'order_id': sale.id,
+                'name': val['value']['name'],
+                'price_unit': -data['form']['amount'],
+                'product_uom_qty': data['form']['qtty'],
+                'product_uos_qty': data['form']['qtty'],
+                'product_uos': val['value']['uos_id'],
+                'product_uom': val['value']['uos_id'],
+                'product_id':data['form']['product_id'],
+                'discount': False,
+                'tax_id': [(6,0,val['value']['invoice_line_tax_id'])],
+            }, context)
     return {'invoice_ids':list_inv}
 
 class sale_advance_payment(wizard.interface):

From fce301c235edfed82215e01ed572e4997969bb27 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Nov 2008 23:33:53 +0100
Subject: [PATCH 67/72] improved_view

bzr revid: fp@tinyerp.com-20081106223353-65f99b8clm4hxsjf
---
 addons/purchase/purchase_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index f75ee28ff19..bd4ad4bc1eb 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -58,7 +58,7 @@
                                 <field name="amount_total" sum="Total amount"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object"/>
                             </group>
-                            <group col="9" colspan="4">
+                            <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
                                 <button name="purchase_confirm" states="draft" string="Confirm Purchase Order"/>
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase"/>

From 7a71b55ef51fe1125d0ec52a1c1b629e78c7999f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Nov 2008 23:51:39 +0100
Subject: [PATCH 68/72] improve

bzr revid: fp@tinyerp.com-20081106225139-fqjz7snd80zaryg3
---
 addons/purchase/purchase.py           | 24 +++++++++++-------------
 addons/purchase/purchase_view.xml     |  4 ++--
 addons/purchase/purchase_workflow.xml |  4 ++--
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index bc4283d3943..4d9e31836ce 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -338,19 +338,17 @@ class purchase_order(osv.osv):
                     raise osv.except_osv(
                         _('Could not cancel purchase order !'),
                         _('You must first cancel all packings attached to this purchase order.'))
-            for r in self.read(cr,uid,ids,['picking_ids']):
-                for pick in r['picking_ids']:
-                    wf_service = netsvc.LocalService("workflow")
-                    wf_service.trg_validate(uid, 'stock.picking', pick, 'button_cancel', cr)
-            for inv in purchase.invoice_ids:
-                if inv.state not in ('draft','cancel'):
-                    raise osv.except_osv(
-                        _('Could not cancel this purchase order !'),
-                        _('You must first cancel all invoices attached to this purchase order.'))
-            for r in self.read(cr,uid,ids,['invoice_ids']):
-                for inv in r['invoice_ids']:
-                    wf_service = netsvc.LocalService("workflow")
-                    wf_service.trg_validate(uid, 'account.invoice', inv, 'invoice_cancel', cr)
+            for pick in purchase.picking_ids:
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
+            inv = purchase.invoice_id
+            if inv and inv.state not in ('cancel','draft'):
+                raise osv.except_osv(
+                    _('Could not cancel this purchase order !'),
+                    _('You must first cancel all invoices attached to this purchase order.'))
+            if inv:
+                wf_service = netsvc.LocalService("workflow")
+                wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
         self.write(cr,uid,ids,{'state':'cancel'})
         return True
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index bd4ad4bc1eb..015335ee887 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -58,14 +58,14 @@
                                 <field name="amount_total" sum="Total amount"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object"/>
                             </group>
-                            <group col="10" colspan="4">
+                            <group col="11" colspan="4">
                                 <field name="state" readonly="1"/>
                                 <button name="purchase_confirm" states="draft" string="Confirm Purchase Order"/>
                                 <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase"/>
                                 <button name="purchase_approve" states="confirmed" string="Approved by Supplier"/>
                                 <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel Purchase Order"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
-                                <button name="action_cancel" states="approved" string="Cancel Purchase Order" type="object"/>
+                                <button name="action_cancel" states="approved,except_picking,except_invoice" string="Cancel Purchase Order" type="object"/>
 
                                 <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
                                 <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index fa0ab0e6979..2a3884739ed 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -55,7 +55,7 @@
         <record id="act_invoice_done" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">invoice_done</field>
-            <field name="action">write({'invoiced':1})</field>
+            <field name="action">write({'invoiced':1,'state':'approved'})</field>
             <field name="kind">function</field>
         </record>
         <record id="act_invoice_end" model="workflow.activity">
@@ -72,7 +72,7 @@
         <record id="act_picking_done" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">picking_done</field>
-            <field name="action">write({'shipped':1})</field>
+            <field name="action">write({'shipped':1,'state':'approved'})</field>
             <field name="kind">function</field>
             <field name="signal_send">subflow.delivery_done</field>
         </record>

From cb53a7eb70646a52f426104946877aee7e0ece82 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 6 Nov 2008 23:54:51 +0100
Subject: [PATCH 69/72] improvement

bzr revid: fp@tinyerp.com-20081106225451-j0xvhyu0h78eo3r8
---
 addons/delivery/wizard/delivery_sale_order.py | 2 +-
 addons/sale/wizard/make_invoice_advance.py    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index 4f3c6cea61b..532bf940ac9 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -84,7 +84,7 @@ class make_delivery(wizard.interface):
     states = {
         'init' : {
             'actions' : [_delivery_default],
-            'result' : {'type' : 'form', 'arch' : delivery_form, 'fields' : delivery_fields, 'state' : [('end', 'Cancel'),('delivery', 'Create delivery line') ]}
+            'result' : {'type' : 'form', 'arch' : delivery_form, 'fields' : delivery_fields, 'state' : [('end', 'Cancel', 'gtk-cancel'),('delivery', 'Add Delivery Costs', 'gtk-ok') ]}
         },
         'delivery' : {
             'actions' : [_delivery_set],
diff --git a/addons/sale/wizard/make_invoice_advance.py b/addons/sale/wizard/make_invoice_advance.py
index fad1f83087e..58238ebcabd 100644
--- a/addons/sale/wizard/make_invoice_advance.py
+++ b/addons/sale/wizard/make_invoice_advance.py
@@ -41,7 +41,7 @@ fields = {
 
 form_msg = """<?xml version="1.0"?>
 <form string="Invoices">
-   <label string="Invoice Created"/>
+   <label string="You invoice has been successfully created !"/>
 </form>
 """
 fields_msg = {}
@@ -134,11 +134,11 @@ class sale_advance_payment(wizard.interface):
     states = {
         'init' : {
             'actions' : [],
-            'result' : {'type' : 'form' ,   'arch' : form,'fields' : fields,'state' : [('end','Cancel'),('create','Make Invoice')]}
+            'result' : {'type' : 'form' ,   'arch' : form,'fields' : fields,'state' : [('end','Cancel','gtk-cancel'),('create','Create Advance Invoice','gtk-ok')]}
         },
         'create': {
             'actions': [_createInvoices],
-            'result': {'type' : 'form' ,'arch' : form_msg,'fields' : fields_msg, 'state':[('end','Ok'),('open','Open Invoice')]}
+            'result': {'type' : 'form' ,'arch' : form_msg,'fields' : fields_msg, 'state':[('end','Close','gtk-close'),('open','Open Advance Invoice','gtk-open')]}
         },
         'open': {
             'actions': [],

From a823139159949cce15fc42b8e2a6bb0aa4cf35c4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 7 Nov 2008 01:01:52 +0100
Subject: [PATCH 70/72] improvement

bzr revid: fp@tinyerp.com-20081107000152-oc2zzx08fswf2dn8
---
 addons/crm/crm.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index f6661b4651a..a9feff678b2 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -347,8 +347,8 @@ class crm_case(osv.osv):
         'date_closed': fields.datetime('Closed', readonly=True),
         'canal_id': fields.many2one('res.partner.canal', 'Channel'),
         'user_id': fields.many2one('res.users', 'Responsible'),
-        'history_line': fields.one2many('crm.case.history', 'case_id', 'Communication'),
-        'log_ids': fields.one2many('crm.case.log', 'case_id', 'Logs History'),
+        'history_line': fields.one2many('crm.case.history', 'case_id', 'Communication', readonly=1),
+        'log_ids': fields.one2many('crm.case.log', 'case_id', 'Logs History', readonly=1),
         'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'ref' : fields.reference('Reference', selection=_links_get, size=128),
         'ref2' : fields.reference('Reference 2', selection=_links_get, size=128),

From d0a6e7f4e14335b0fd620d520000cf99603feb05 Mon Sep 17 00:00:00 2001
From: apa-tiny <patelamit2003@gmail.com>
Date: Fri, 7 Nov 2008 10:38:10 +0530
Subject: [PATCH 71/72] but the filter  we have "With Balance != 0" or "With
 Movements", is still returning the same result in the printed pdf==Solved

bzr revid: patelamit2003@gmail.com-20081107050810-5t45a7cz3xvy3x5h
---
 addons/account/report/account_balance.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index d26c116a9e6..a0aef896250 100755
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -169,10 +169,10 @@ class account_balance(report_sxw.rml_parse):
 
 
                 if form['display_account'] == 'bal_mouvement':
-                    if res['credit'] >= 0 or res['debit'] >= 0 or res['balance'] >= 0 :
+                    if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0 :
                         result_acc.append(res)
                 elif form['display_account'] == 'bal_solde':
-                    if  res['balance'] >= 0:
+                    if  res['balance'] > 0:
                         result_acc.append(res)
                 else:
                     result_acc.append(res)

From db54aa529009f505283fc4c714cac6760b0fe6c0 Mon Sep 17 00:00:00 2001
From: "hda@tinyerp.com" <>
Date: Fri, 7 Nov 2008 11:25:29 +0530
Subject: [PATCH 72/72] bugfix for process

bzr revid: hda@tinyerp.com-20081107055529-ezzxxshuve42bh21
---
 .../process/hr_timesheet_project_process.xml  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml
index edcb92038d5..0a94f6a2b5d 100644
--- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml
+++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-    
-        <!-- 
+
+        <!--
             Process Node
-        -->        
-        
+        -->
+
         <record id="process_node_timesheettask0" model="process.node">
             <field name="menu_id" ref="hr_timesheet.menu_act_hr_timesheet_line_evry1_today_form"/>
             <field name="model_id" ref="hr.model_hr_timesheet"/>
@@ -16,7 +16,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_workontask0" model="process.node">
             <field name="menu_id" ref="project.menu_action_view_task"/>
             <field name="model_id" ref="project.model_project_task"/>
@@ -27,9 +27,9 @@
             <field eval="&quot;&quot;&quot;object.state in ('open', pending', 'done', 'cancelled')&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_taskwork0" model="process.node">
-            <field name="menu_id" ref="project.menu_action_view_task6"/>
+            <field name="menu_id" ref="project.menu_action_view_task6_prog"/>
             <field name="model_id" ref="project.model_project_task_work"/>
             <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
             <field eval="&quot;&quot;&quot;Task Work&quot;&quot;&quot;" name="name"/>
@@ -38,11 +38,11 @@
             <field eval="&quot;&quot;&quot;object.state=='open'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-        
-        <!-- 
+
+        <!--
             Process Transition
         -->
-        
+
         <record id="process_transition_filltimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -51,7 +51,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_timesheettask0"/>
             <field model="process.node" name="source_node_id" ref="project.process_node_opentask0"/>
         </record>
-        
+
         <record id="process_transition_taskencoding0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -60,7 +60,7 @@
             <field model="process.node" name="target_node_id" ref="hr_timesheet_sheet.process_node_timesheetline0"/>
             <field model="process.node" name="source_node_id" ref="process_node_taskwork0"/>
         </record>
-        
+
         <record id="process_transition_tasktimesheet0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -69,7 +69,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_timesheettask0"/>
             <field model="process.node" name="source_node_id" ref="process_node_workontask0"/>
         </record>
-        
+
     </data>
 </openerp>
-    
+