merge

bzr revid: fp@tinyerp.com-20100616113852-cj3dwha1w74l5q3w

addons/idea/test/test_idea.yml

@@ -19,13 +19,13 @@
     user_id: base.user_root
     
 - |
-  I check that idea on draft state.
+  I check that the idea is in draft state.
 -
   !assert {model: idea.idea, id: idea_idea_0}:
     - state == 'draft'  
     
 - |
-  I open this idea by click on "Open" button.
+  I open this idea by clicking on the "Open" button.
 - 
   !workflow {model: idea.idea, action: idea_open, ref: idea_idea_0}
   

addons/purchase/purchase_view.xml

@@ -91,8 +91,7 @@
                                     <field name="product_qty"/>
                                     <field name="product_uom"/>
                                     <field name="price_unit"/>
-                                     <field name="price_subtotal" groups="base.group_extended"/>
-                                    <field name="invoiced"/>
+                                    <field name="price_subtotal" groups="base.group_extended"/>
                                 </tree>
                                 <!-- default form view -->
                             </field>

addons/sale_order_dates/__openerp__.py

@@ -21,11 +21,13 @@
 
 
 {
-    'name': 'Customer & Sales',
+    'name': 'Sale Order Dates',
     'version': '1.0',
     'category': 'Generic Modules/CRM & SRM',
-    'description': """Sale Orders Dates""",
-    'author': 'Tiny',
+    'description': """
+Add commitment, requested and effective dates on the sale order.
+""",
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ["sale"],
     'init_xml': [

addons/sale_order_dates/sale_view.xml

@@ -2,22 +2,20 @@
 <openerp>
     <data>
 
-   <record id="view_sale_orderfor" model="ir.ui.view">
+        <record id="view_sale_orderfor" model="ir.ui.view">
             <field name="name">sale.order.form.inherit5</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="date_confirm" position="after">
-                    <separator string="Dates" colspan="4"/>
+                <field name="date_confirm" position="after">
                     <field name="commitment_date"/>
-                    <newline/>
                     <field name="effective_date"/>
                     <field name="requested_date"/>
-              </field>
+                </field>
             </field>
-                </record>
+        </record>
 
 
-     </data>
+    </data>
 </openerp>

addons/stock/stock.py

@@ -2251,7 +2251,7 @@ class stock_inventory(osv.osv):
                         'prodlot_id': lot_id,
                         'date': inv.date,
                         'date_planned': inv.date,
-                        'state': 'assigned'
+                        'state': 'done'
                     }
                     if change > 0:
                         value.update( {
@@ -2271,9 +2271,6 @@ class stock_inventory(osv.osv):
                             'product_qty': line.product_qty
                         })
                     move_ids.append(self._inventory_line_hook(cr, uid, line, value))
-            if len(move_ids):
-                self.pool.get('stock.move').action_done(cr, uid, move_ids,
-                        context=context)
             self.write(cr, uid, [inv.id], {'state': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S'), 'move_ids': [(6, 0, move_ids)]})
         return True