Merge with addons

bzr revid: ruchakpatel@gmail.com-20081013065847-ffnjkovsr3zuxif1

diff --cc addons/account/account_invoice_view.xml
Simple merge

diff --cc addons/account/invoice.py
Simple merge

diff --cc addons/account/project/project_view.xml
index 53e8694,ccc8fb4..1def5a2
--- 1/addons/account/project/project_view.xml
--- 2/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@@ -84,9 -85,9 +85,10 @@@
              <field name="res_model">account.analytic.account</field>
              <field name="domain">[('parent_id','=',False)]</field>
              <field name="view_type">tree</field>
+              <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"

diff --cc addons/mrp/mrp.py
Simple merge

diff --cc addons/purchase/purchase.py
Simple merge

diff --cc addons/stock/stock.py
index 90ead58,f0c71c1..8f23a0d
--- 1/addons/stock/stock.py
--- 2/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -320,7 -320,9 +320,13 @@@ 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
@@@ -330,7 -332,9 +336,13 @@@
  
      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