[MERGE] merge from trunk addons

bzr revid: mra@mra-laptop-20100923131716-fl198yu7ts850z7d

addons/account/test/account_change_currency.yml

@@ -23,15 +23,6 @@
 -
   !assert {model: account.invoice, id: account_invoice_currency, string: Customer Invoice is in Draft state}:
     - state == 'draft'
--
-  I change the state of invoice to proforma2 by clicking PRO-FORMA button
--
-  !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_currency}
--
-  I check that now customer invoice is in the "proforma2" state
--
-  !assert {model: account.invoice, id: account_invoice_currency}:
-    - state == 'proforma2'
 -
   Now I select USD as new currency
 -
@@ -41,17 +32,23 @@
   I clicked on Change Currency button to change the currency
 -
   !python {model: account.change.currency}: |
-    try:
-      self.view_init(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
-        "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
-        [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
-      })
-      self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
-        "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
-        [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
-      })
-    except:
-      print "Error: You can change currency only for Draft Invoice !"
+    self.view_init(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
+      "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
+      [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
+    })
+    self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
+      "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
+      [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
+    })
+-
+  I change the state of invoice to proforma2 by clicking PRO-FORMA button
+-
+  !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_currency}
+-
+  I check that now customer invoice is in the "proforma2" state
+-
+  !assert {model: account.invoice, id: account_invoice_currency}:
+    - state == 'proforma2'
 -
   I can't change the currency of invoice when it is not in draft state so i change the state to cancel
 -

addons/account_reporting/report/account_report_bs.rml

@@ -155,7 +155,7 @@
           <para style="terp_default_Centre_8">[[ company.currency_id.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8"><font>[[ setTag('font','font',{'face':o.font_style,'color':o.color_font.name,'backColor':o.color_back.name}) ]] [[o.name]]</font></para>
+          <para style="terp_default_Centre_8"><font>[[ setTag('font','font',{'face':o.font_style or "Helvetica",'color':o.color_font.name or "black",'backColor':o.color_back.name or "white"}) ]] [[o.name]]</font></para>
         </td>
       </tr>
     </blockTable>

addons/mrp/mrp_demo.xml

@@ -14,7 +14,12 @@
             <field name="name">Repairs workshop</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
-
+      <!--
+    Resource: res.company
+    -->
+		<record id="stock.res_company_tinyshop0" model="res.company">
+			<field eval="1.0" name="manufacturing_lead"/>
+		</record>
         <!--
     Resource: mrp.property.group
     -->

addons/purchase/purchase_demo.xml

@@ -41,9 +41,6 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">450</field>
             <field name="product_qty">2</field>
-            <field name="product_uom_qty">3</field>
-            <field name="product_uos_qty">3</field>
-            <field name="type">make_to_stock</field>
         </record>
         
         <record id="line3_purchase" model="purchase.order.line">
@@ -54,7 +51,6 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">900</field>
             <field name="product_qty">1</field>
-            <field name="type">make_to_stock</field>
         </record>
         
         <workflow action="purchase_confirm" model="purchase.order" ref="order_purchase2"/>

addons/stock/stock_demo.xml

@@ -217,7 +217,6 @@
             <field name="currency_id" ref="base.EUR"/>
             <field eval="1.0" name="po_lead"/>
             <field name="partner_id" ref="res_partner_tinyshop1"/>
-            <field eval="1.0" name="manufacturing_lead"/>
             <field name="parent_id" ref="base.main_company"/>
             <field eval="80.0" name="schedule_range"/>
             <field eval="&quot;&quot;&quot;Shop 2&quot;&quot;&quot;" name="name"/>