Minor changes for conflict resolving

bzr revid: ruchakpatel@gmail.com-20081027072337-pyoysalztysqui3u

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"/>

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={}):

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')},
 }
 

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),

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">