[MERGE] removed a few warnings.

bzr revid: vmt@openerp.com-20121106150431-rem9us13kevan8y0

addons/account/data/account_data.xml

@@ -127,7 +127,6 @@
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="name">Status</field>
             <field name="field">state</field>
-            <field eval="True" name="invisible"/>
             <field eval="19" name="sequence"/>
         </record>
         <record id="bank_col20" model="account.journal.column">
@@ -215,7 +214,6 @@
             <field name="view_id" ref="account_journal_bank_view_multi"/>
             <field name="name">Status</field>
             <field name="field">state</field>
-            <field eval="True" name="invisible"/>
             <field eval="19" name="sequence"/>
         </record>
         <record id="bank_col20_multi" model="account.journal.column">
@@ -291,7 +289,6 @@
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Status</field>
             <field name="field">state</field>
-            <field eval="True" name="invisible"/>
             <field eval="19" name="sequence"/>
         </record>
 
@@ -373,7 +370,6 @@
             <field name="view_id" ref="account_sp_journal_view"/>
             <field name="name">Status</field>
             <field name="field">state</field>
-            <field eval="True" name="invisible"/>
             <field eval="19" name="sequence"/>
         </record>
         <record id="sp_journal_col20" model="account.journal.column">
@@ -460,7 +456,6 @@
             <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="name">Status</field>
             <field name="field">state</field>
-            <field eval="True" name="invisible"/>
             <field eval="19" name="sequence"/>
         </record>
         <record id="sp_refund_journal_col20" model="account.journal.column">

addons/base_action_rule/base_action_rule.py

@@ -300,7 +300,7 @@ trigger date, like sending a reminder 15 minutes before a meeting."),
             write['date_action_last'] = time.strftime('%Y-%m-%d %H:%M:%S')
         if hasattr(obj, 'state') and action.act_state:
             write['state'] = action.act_state
-        
+
         model_obj.write(cr, uid, [obj.id], write, context)
         if hasattr(obj, 'state') and hasattr(obj, 'message_post') and action.act_state:
             model_obj.message_post(cr, uid, [obj], _(action.act_state), context=context)

addons/base_import/security/ir.model.access.csv

@@ -0,0 +1,15 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_base_import_tests_models_char,base.import.tests.models.char,model_base_import_tests_models_char,base.group_user,1,1,1,1
+access_base_import_tests_models_char_required,base.import.tests.models.char.required,model_base_import_tests_models_char_required,base.group_user,1,1,1,1
+access_base_import_tests_models_char_readonly,base.import.tests.models.char.readonly,model_base_import_tests_models_char_readonly,base.group_user,1,1,1,1
+access_base_import_tests_models_char_states,base.import.tests.models.char.states,model_base_import_tests_models_char_states,base.group_user,1,1,1,1
+access_base_import_tests_models_char_noreadonly,base.import.tests.models.char.noreadonly,model_base_import_tests_models_char_noreadonly,base.group_user,1,1,1,1
+access_base_import_tests_models_char_stillreadonly,base.import.tests.models.char.stillreadonly,model_base_import_tests_models_char_stillreadonly,base.group_user,1,1,1,1
+access_base_import_tests_models_m2o,base.import.tests.models.m2o,model_base_import_tests_models_m2o,base.group_user,1,1,1,1
+access_base_import_tests_models_m2o_related,base.import.tests.models.m2o.related,model_base_import_tests_models_m2o_related,base.group_user,1,1,1,1
+access_base_import_tests_models_m2o_required,base.import.tests.models.m2o.required,model_base_import_tests_models_m2o_required,base.group_user,1,1,1,1
+access_base_import_tests_models_m2o_required_related,base.import.tests.models.m2o.required.related,model_base_import_tests_models_m2o_required_related,base.group_user,1,1,1,1
+access_base_import_tests_models_o2m,base.import.tests.models.o2m,model_base_import_tests_models_o2m,base.group_user,1,1,1,1
+access_base_import_tests_models_o2m_child,base.import.tests.models.o2m.child,model_base_import_tests_models_o2m_child,base.group_user,1,1,1,1
+access_base_import_tests_models_preview,base.import.tests.models.preview,model_base_import_tests_models_preview,base.group_user,1,1,1,1
+

addons/delivery/delivery_view.xml

@@ -322,7 +322,6 @@
         
         <record id="view_picking_withcarrier_in_form" model="ir.ui.view">
             <field name="name">delivery.stock.picking_withcarrier.in.form.view</field>
-            <field name="type">form</field>
             <field name="model">stock.picking.in</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">

addons/hr_payroll/hr_payroll.py

@@ -312,12 +312,7 @@ class hr_payslip(osv.osv):
         company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         default.update({
             'line_ids': [],
-            'move_ids': [],
-            'move_line_ids': [],
             'company_id': company_id,
-            'period_id': False,
-            'basic_before_leaves': 0.0,
-            'basic_amount': 0.0,
             'number': '',
             'payslip_run_id': False,
             'paid': False,

addons/hr_recruitment/test/recruitment_process.yml

@@ -15,7 +15,7 @@
     applicant_ids = self.search(cr, uid, [('email_from','=', 'Mr. Richard Anderson <Richard_Anderson@yahoo.com>')])
     assert applicant_ids, "Applicant is not created after getting the mail"
     applicant = self.browse(cr, uid, applicant_ids[0], context=context)
-    resume_ids = self.pool.get('ir.attachment').search(cr, uid, [('datas_fname','=','resume.doc'),('res_model','=',self._name),('res_id','=',applicant.id)])
+    resume_ids = self.pool.get('ir.attachment').search(cr, uid, [('datas_fname','=','resume.pdf'),('res_model','=',self._name),('res_id','=',applicant.id)])
     assert applicant.name == "Application for the post of Jr.application Programmer.", "Applicant name does not match."
     assert applicant.stage_id.id == ref('hr_recruitment.stage_job1'), "Stage should be 'Initial qualification' and is '%s'." % (applicant.stage_id.name)
     assert applicant.state == "draft", "Applicant state should be 'draft'."

addons/mail/mail_followers_view.xml

@@ -19,7 +19,6 @@
         <record model="ir.ui.view" id="view_mail_subscription_form">
             <field name="name">mail.followers.form</field>
             <field name="model">mail.followers</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Followers Form" version="7.0">
                     <sheet>

addons/mail/security/ir.model.access.csv

@@ -15,4 +15,4 @@ access_mail_alias_user,mail.alias,model_mail_alias,base.group_user,1,1,1,0
 access_mail_alias_system,mail.alias,model_mail_alias,base.group_system,1,1,1,1
 access_mail_message_subtype_all,mail.message.subtype.all,model_mail_message_subtype,,1,0,0,0
 access_mail_vote_all,mail.vote.all,model_mail_vote,,1,1,1,1
-access_mail_favorite_all,mail.favorite.all,model_mail_favorite,,1,1,1,1
+access_mail_favorite_all,mail.favorite.all,model_mail_favorite,,1,1,1,1

addons/mail/tests/test_mail.py

@@ -547,7 +547,7 @@ class test_mail(TestMailMockups):
 
         # 1. mass_mail on pigs and bird
         compose_id = mail_compose.create(cr, uid,
-            {'subject': _subject, 'body': '${object.description}', 'content_subtype': 'html'},
+            {'subject': _subject, 'body': '${object.description}'},
             {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group', 'default_res_id': False,
                 'active_ids': [self.group_pigs_id, group_bird_id]})
         compose = mail_compose.browse(cr, uid, compose_id)

addons/procurement/schedulers.py

@@ -197,6 +197,12 @@ class procurement_order(osv.osv):
                 'location_id': orderpoint.location_id.id,
                 'procure_method': 'make_to_order',
                 'origin': orderpoint.name}
+        
+    def _product_virtual_get(self, cr, uid, order_point):
+        location_obj = self.pool.get('stock.location')
+        return location_obj._product_virtual_get(cr, uid,
+                order_point.location_id.id, [order_point.product_id.id],
+                {'uom': order_point.product_uom.id})[order_point.product_id.id]
 
     def _procure_orderpoint_confirm(self, cr, uid, automatic=False,\
             use_new_cursor=False, context=None, user_id=False):
@@ -217,7 +223,7 @@ class procurement_order(osv.osv):
         if use_new_cursor:
             cr = pooler.get_db(use_new_cursor).cursor()
         orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
-        location_obj = self.pool.get('stock.location')
+        
         procurement_obj = self.pool.get('procurement.order')
         wf_service = netsvc.LocalService("workflow")
         offset = 0
@@ -227,14 +233,9 @@ class procurement_order(osv.osv):
         while ids:
             ids = orderpoint_obj.search(cr, uid, [], offset=offset, limit=100)
             for op in orderpoint_obj.browse(cr, uid, ids, context=context):
-                if op.procurement_id.state != 'exception':
-                    if op.procurement_id and hasattr(op.procurement_id, 'purchase_id'):
-                        if op.procurement_id.purchase_id.state in ('draft', 'confirmed'):
-                            continue
-                prods = location_obj._product_virtual_get(cr, uid,
-                        op.location_id.id, [op.product_id.id],
-                        {'uom': op.product_uom.id})[op.product_id.id]
-
+                prods = self._product_virtual_get(cr, uid, op)
+                if prods is None:
+                    continue
                 if prods < op.product_min_qty:
                     qty = max(op.product_min_qty, op.product_max_qty)-prods
 

addons/product/product_demo.xml

@@ -96,7 +96,6 @@
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">4.0</field>
             <field name="description_sale">17" LCD Monitor
 Processor AMD 8-Core
 512MB RAM
@@ -113,7 +112,6 @@ HDD SH-1</field>
 
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">4.0</field>
             <field name="description_sale">19" LCD Monitor
 Processor Core i5 2.70 Ghz
 2GB RAM
@@ -129,7 +127,6 @@ HDD SH-1</field>
             <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">7.0</field>
             <field name="description">Custom computer assembled on order based on customer's requirement.</field>
         </record>
 

addons/purchase/purchase.py

@@ -1105,6 +1105,12 @@ class procurement_order(osv.osv):
             self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': res[procurement.id]})
         self.purchase_order_create_note(cr, uid, ids, context=context)
         return res
+    
+    def _product_virtual_get(self, cr, uid, order_point):
+        procurement = order_point.procurement_id
+        if procurement and procurement.state != 'exception' and procurement.purchase_id and procurement.purchase_id.state in ('draft', 'confirmed'):
+            return None
+        return super(procurement_order, self)._product_virtual_get(cr, uid, order_point)
 
     def purchase_order_create_note(self, cr, uid, ids, context=None):
         for procurement in self.browse(cr, uid, ids, context=context):

addons/purchase/test/ui/duplicate_order.yml

@@ -4,5 +4,4 @@
   I duplicate order.
 -
   !python {model: purchase.order}: |
-    context.update({'active_id':ref('purchase_order_1')})
     self.copy(cr, uid, ref('purchase_order_1'), context)

addons/sale_stock/report/sale_report_view.xml

@@ -5,7 +5,6 @@
              <field name="name">sale.report.tree.sale.stock</field>
              <field name="model">sale.report</field>
              <field name="inherit_id" ref="sale.view_order_product_tree"/>
-             <field name="type">tree</field>
              <field name="arch" type="xml">
                  <field name="product_uom_qty" position="after">
                      <field name="shipped_qty_1" sum="Shipped"/>

addons/sale_stock/res_config_view.xml

@@ -5,7 +5,6 @@
          <record id="view_sales_config_sale_stock" model="ir.ui.view">
              <field name="name">sale settings</field>
              <field name="model">sale.config.settings</field>
-             <field name="type">form</field>
              <field name="inherit_id" ref="sale.view_sales_config"/>
              <field name="arch" type="xml">
                  <data>

addons/sale_stock/sale_stock_view.xml

@@ -18,7 +18,6 @@
              <field name="name">sale.shop.sale.stock</field>
              <field name="model">sale.shop</field>
              <field name="inherit_id" ref="sale.view_shop_tree"/>
-             <field name="type">tree</field>
              <field name="arch" type="xml">
                  <field name="name" position="after">
                      <field name="warehouse_id"/>
@@ -32,7 +31,6 @@
             <field name="name">sale.order.form.sale.stock</field>
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
                    <xpath expr="//button[@name='invoice_corrected']" position="after">

addons/stock/stock.py

@@ -2130,7 +2130,7 @@ class stock_move(osv.osv):
                 new_id = move_obj.copy(cr, uid, move.id, {
                     'location_id': move.location_dest_id.id,
                     'location_dest_id': loc.id,
-                    'date_moved': time.strftime('%Y-%m-%d'),
+                    'date': time.strftime('%Y-%m-%d'),
                     'picking_id': pickid,
                     'state': 'waiting',
                     'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context=context)  ,