[MERGE] Merged with main branch

bzr revid: pso@tinyerp.com-20120820113418-60k501hs6y0lpaxz

openerp/addons/base/base_data.xml

@@ -1060,11 +1060,10 @@
             <field name="company_id" eval="None"/>
             <field name="customer" eval="False"/>
             <field name="is_company" eval="True"/>
-            <field name="street">45, Rue du Palais</field>
-            <field name="city">Paris</field>
-            <field name="zip">75016</field>
-            <field ref="base.fr" name="country_id"/>
-            <field name="phone">+33 1 49 51 23 94</field>
+            <field name="street"></field>
+            <field name="city"></field>
+            <field name="zip"></field>
+            <field name="phone"></field>
             <field name="email">info@yourcompany.com</field>
             <field name="website">www.yourcompany.com</field>
         </record>

openerp/addons/base/ir/workflow/workflow_view.xml

@@ -52,6 +52,7 @@
             <field name="act_to"/>
             <field name="signal"/>
           </arrow>
+          <label string="When customizing a workflow, be sure you do not modify an existing node or arrow, but rather add new nodes or arrows. If you absolutly need to modify a node or arrow, you can only change fields that are empty or set to the default value. If you don't do that, your customization will be overwrited at the next update or upgrade to a future version of OpenERP."/>
         </diagram>
       </field>
     </record>

openerp/addons/base/res/res_company.py

@@ -142,7 +142,7 @@ class res_company(osv.osv):
         if phone: val.append(_('Phone: ')+phone)
         if fax: val.append(_('Fax: ')+fax)
         if website: val.append(_('Website: ')+website)
-        if vat: val.append(_('VAT: ')+vat)
+        if vat: val.append(_('TIN: ')+vat)
         if reg: val.append(_('Reg: ')+reg)
         return {'value': {'rml_footer1':' | '.join(val)}}
 

openerp/addons/base/res/res_partner.py

@@ -162,7 +162,7 @@ class res_partner(osv.osv):
                  "It is important to set a value for this field. You should use the same timezone "
                  "that is otherwise used to pick and render date and time values: your computer's timezone."),
         'user_id': fields.many2one('res.users', 'Salesperson', help='The internal user that is in charge of communicating with this partner if any.'),
-        'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."),
+        'vat': fields.char('TIN',size=32 ,help="Tax Identification Number. Check the box if the partner is subjected to taxes. Used by the some of the legal statements."),
         'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'),
         'website': fields.char('Website',size=64, help="Website of Partner or Company"),
         'comment': fields.text('Notes'),

openerp/addons/base/rng/view.rng

@@ -181,9 +181,12 @@
 
     <rng:define name="diagram">
         <rng:element name="diagram">
-            <rng:optional><rng:attribute name="string"/></rng:optional>
+            <rng:optional><rng:attribute name="string"/></rng:optional>                                    
             <rng:ref name="node"/>
-            <rng:ref name="arrow"/>
+            <rng:ref name="arrow"/>            
+            <rng:zeroOrMore>
+                <rng:ref name="label"/>
+            </rng:zeroOrMore>
         </rng:element>
     </rng:define>