From 53cdf7a26bce521bb337e749cb26554edef0face Mon Sep 17 00:00:00 2001
From: "qdp-launchpad@tinyerp.com" <>
Date: Mon, 8 Nov 2010 14:04:35 +0100
Subject: [PATCH] [FIX] purchase, sale, subscription: usability issues

bzr revid: qdp-launchpad@tinyerp.com-20101108130435-y9kj7bhu8ttida5c
---
 addons/purchase/purchase_view.xml    | 2 +-
 addons/sale/process/sale_process.xml | 2 +-
 addons/subscription/subscription.py  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index fbb05024c29..ce8923ed5cd 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -150,7 +150,7 @@
                                 <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
                             </group>
                         </page>
-                        <page string="Delivery &amp; Invoices" groups="base.group_extended">
+                        <page string="Delivery &amp; Invoicing" groups="base.group_extended">
                             <group colspan="2" col="2">
                                 <separator string="Delivery" colspan="2"/>
                                 <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 83d80381c09..eb4386304ac 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -194,7 +194,7 @@
         <record id="process_transition_saleinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;From a sale order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;A sale order generates an invoice, as soon as it is confirmed by the salesman. Depending on the Invoicing control of the sale order, the invoice is based on delivered or on ordered quantities.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Depending on the Invoicing control of the sale order, the invoice can be based on delivered or on ordered quantities. Thus, a sale order can generates an invoice or a delivery order as soon as it is confirmed by the salesman.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="account.process_node_draftinvoices0"/>
             <field model="process.node" name="source_node_id" ref="process_node_order0"/>
         </record>
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index ef959a5fd67..358d1134362 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -31,7 +31,7 @@ class subscription_document(osv.osv):
     _description = "Subscription Document"
     _columns = {
         'name': fields.char('Name', size=60, required=True),
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the subscription document without removing it."),
+        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the subscription document without removing it."),
         'model': fields.many2one('ir.model', 'Object', required=True),
         'field_ids': fields.one2many('subscription.document.fields', 'document_id', 'Fields')
     }