improvmenet

bzr revid: fp@tinyerp.com-20081029174749-7vuxl7j4yikbwq14

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 7d4019b..a8b8e26 100644 (file)
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -208,7 +208,7 @@
                     </notebook>
                     <label string="" colspan="2"/>
                     <group col="2" colspan="2">
-                        <button icon='gtk-cancel' special="cancel" name="action_next" type='object' string='Close'/>
+                        <button icon='gtk-cancel' special="cancel" name="action_next" type='object' string='Skip'/>
                         <button name='action_new' icon='gtk-ok' type='object' string='Add User'/>
                     </group>
                 </form>

diff --git a/bin/addons/base/ir/workflow/workflow.py b/bin/addons/base/ir/workflow/workflow.py
index faafab6..ff71f57 100644 (file)
--- a/bin/addons/base/ir/workflow/workflow.py
+++ b/bin/addons/base/ir/workflow/workflow.py
@@ -132,10 +132,10 @@ class wkf_transition(osv.osv):
     _table = "wkf_transition"
     _name = "workflow.transition"
     _log_access = False
-    _rec_name = 'signal' #TODO: pas top mais bon...
+    _rec_name = 'signal'
     _columns = {
-        'trigger_model': fields.char('Trigger Type', size=128),
-        'trigger_expr_id': fields.char('Trigger Expr ID', size=128),
+        'trigger_model': fields.char('Trigger Object', size=128),
+        'trigger_expr_id': fields.char('Trigger Expression', size=128),
         'signal': fields.char('Signal (button Name)', size=64),
         'role_id': fields.many2one('res.roles', 'Role Required'),
         'condition': fields.char('Condition', required=True, size=128),

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index f9ab153..d3a8092 100644 (file)
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -278,7 +278,7 @@ class res_partner_address(osv.osv):
     _name = 'res.partner.address'
     _order = 'id'
     _columns = {
-        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=True),
+        'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade', select=True, help="Keep empty for a private address, not related to partner."),
         'type': fields.selection( [ ('default','Default'),('invoice','Invoice'), ('delivery','Delivery'), ('contact','Contact'), ('other','Other') ],'Address Type', help="Used to select automatically the right address according to the context in sales and purchases documents."),
         'function': fields.many2one('res.partner.function', 'Function'),
         'title': fields.selection(_contact_title_get, 'Title', size=32),

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index f07eba1..9bcb933 100644 (file)
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -504,7 +504,7 @@
             <field name="view_id" ref="view_partner_category_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-        <menuitem action="action_partner_category" id="menu_partner_category_main" parent="base.menu_base_partner" sequence="1"/>
+        <menuitem action="action_partner_category" id="menu_partner_category_main" parent="base.menu_partner_form" sequence="1"/>
 
         <record id="action_partner_by_category" model="ir.actions.act_window">
             <field name="name" eval="False"/>