merged

bzr revid: apa@tinyerp.com-20100302051049-fzug22vl8vwa05e6

6 files changed, 60 insertions, 48 deletions

diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 6873f875b69..4f61dd1ddfc 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1285,6 +1285,18 @@
             <field eval="time.strftime('%Y-01-01')" name="name"/>
         </record>
         
+        <record id="UAH" model="res.currency">
+            <field name="name">UAH</field>
+            <field name="code">UAH</field>
+            <field name="rounding">0.01</field>
+            <field name="accuracy">4</field>
+            <field name="company_id" ref="main_company"/>
+        </record>
+        <record id="rateUAH" model="res.currency.rate">
+            <field name="rate">10.8266</field>
+            <field name="currency_id" ref="UAH"/>
+            <field eval="time.strftime('%Y-01-01')" name="name"/>
+        </record>
 
     </data>
 </openerp>
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index a033724b3d3..2f20199a4d8 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -121,7 +121,7 @@
                         <page string="Roles">
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
-                        <page string="Accepted Companies">
+                        <page string="Companies">
                             <field colspan="4" nolabel="1" name="company_ids" select="1"/>
                         </page>
                     </notebook>
diff --git a/bin/addons/base/i18n/hr.po b/bin/addons/base/i18n/hr.po
index 456d9c01496..c22c24df042 100644
--- a/bin/addons/base/i18n/hr.po
+++ b/bin/addons/base/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-25 06:18+0000\n"
+"PO-Revision-Date: 2010-03-01 06:21+0000\n"
 "Last-Translator: goranc <goranc@gmail.com>\n"
 "Language-Team: openerp-translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-26 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-02 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
diff --git a/bin/addons/base/i18n/ja.po b/bin/addons/base/i18n/ja.po
index 98297b49132..caafbdf2a71 100644
--- a/bin/addons/base/i18n/ja.po
+++ b/bin/addons/base/i18n/ja.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-server\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-02-25 06:23+0000\n"
+"PO-Revision-Date: 2010-03-01 06:18+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-26 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-03-02 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 73fa7fc1953..3eb53ff2aa7 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -94,30 +94,30 @@
             <field eval="8" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Address">
-                	<field name="partner_id" select="1"  colspan="2"/>
-                    <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="2"/>
-                    <newline/>
                     <group colspan="4" col="6">
-						<field name="name" select="2"/>
-						<field domain="[('domain', '=', 'contact')]" name="title"/>
-						<field name="function"/>
-					</group>
+                        <field name="partner_id" colspan="2"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection" colspan="2"/>
+                        <newline/>
+                        <field name="name"/>
+                        <field domain="[('domain', '=', 'contact')]" name="title"/>
+                        <field name="function"/>
+                    </group>
                       <group colspan="2" col="2">
-                      	<separator string="Postal Address" colspan="4" col="4"/>
-                        <field name="street" select="2"/>
+                        <separator string="Postal Address" colspan="4" col="4"/>
+                        <field name="street"/>
                         <field name="street2"/>
-                        <field name="zip" select="2"/>
-                        <field name="city" select="2"/>
-                        <field name="country_id" select="2" completion="1"/>
-                        <field name="state_id" select="2"/>
+                        <field name="zip"/>
+                        <field name="city"/>
+                        <field name="country_id"/>
+                        <field name="state_id"/>
                       </group>
                       <group colspan="2" col="2">
-                      	<separator string="Communication" colspan="4" col="4"/>
-                        <field name="type" select="2" />
+                        <separator string="Communication" colspan="4" col="4"/>
+                        <field name="type"/>
                         <field name="phone"/>
                         <field name="fax"/>
-                        <field name="mobile" select="2"/>
-                        <field name="email"  select="2" widget="email"/>
+                        <field name="mobile"/>
+                        <field name="email" widget="email"/>
                      </group>
                 </form>
             </field>
@@ -158,15 +158,15 @@
                     <field domain="[('domain', '=', 'contact')]" name="title"/>
                     <field name="street"/>
                     <field name="street2"/>
-                    <field name="type" select="2"/>
+                    <field name="type"/>
                     <field name="function"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <newline/>
-                    <field name="zip" select="2"/>
-                    <field name="city" select="2"/>
+                    <field name="zip"/>
+                    <field name="city"/>
                     <newline/>
                     <field completion="1" name="country_id" select="1"/>
-                    <field name="state_id" select="2"/>
+                    <field name="state_id"/>
                     <newline/>
                     <field name="phone"/>
                     <field name="fax"/>
@@ -238,8 +238,8 @@
                     <field name="name"/>
                     <field name="title"/>
                     <field name="ref"/>
-                    <field name="city" select="2"/>
-                    <field name="country" select="2"/>
+                    <field name="city"/>
+                    <field name="country"/>
                     <field name="lang"/>
                 </tree>
             </field>
@@ -256,11 +256,11 @@
                             <field name="name" select="1" colspan="6"/>
                             <field name="ref" select="1"/>
                             <field domain="[('domain', '=', 'partner')]" name="title"/>
-                            <field name="lang" select="2"/>
+                            <field name="lang"/>
                         </group>
                         <group colspan="1" col="2">
                             <field name="customer" select="1"/>
-                            <field name="supplier" select="2"/>
+                            <field name="supplier"/>
                         </group>
                     </group>
                     <notebook colspan="4">
@@ -268,27 +268,27 @@
                             <field colspan="4" mode="form,tree" name="address" nolabel="1" select="1" height="260">
                                 <form string="Partner Contacts">
                                     <group colspan="4" col="6">
-                                        <field name="name" select="2"/>
+                                        <field name="name"/>
                                         <field domain="[('domain', '=', 'contact')]" name="title" size="0"/>
                                         <field name="function"/>
                                     </group>
                                     <newline/>
                                       <group colspan="2" col="4">
                                         <separator string="Postal Address" colspan="4" col="4" />
-                                        <field name="street" select="2" colspan="4"/>
+                                        <field name="street" colspan="4"/>
                                         <field name="street2" colspan="4"/>
-                                        <field name="zip" select="2"/>
-                                        <field name="city" select="2"/>
-                                        <field name="country_id" select="2" completion="1"/>
-                                        <field name="state_id" select="2"/>
+                                        <field name="zip"/>
+                                        <field name="city"/>
+                                        <field name="country_id" completion="1"/>
+                                        <field name="state_id"/>
                                      </group>
                                      <group colspan="2" col="2">
                                         <separator string="Communication" colspan="2" col="2" />
-                                        <field name="type" select="2" string="Type" />
+                                        <field name="type" string="Type" />
                                         <field name="phone"/>
                                         <field name="mobile"/>
                                         <field name="fax"/>
-                                        <field name="email" select="2" widget="email"/>
+                                        <field name="email" widget="email"/>
                                      </group>
                                 </form>
                                 <tree string="Partner Contacts">
@@ -301,14 +301,14 @@
                                 </tree>
                             </field>
                             <separator colspan="4" string="Categories"/>
-                            <field colspan="4" name="category_id" nolabel="1" select="2" height="90"/>
+                            <field colspan="4" name="category_id" nolabel="1" height="90"/>
                         </page>
                         <page string="Sales &amp; Purchases">
                             <separator string="General Information" colspan="4"/>
-                            <field name="user_id" select="2"/>
-                            <field name="active" select="2"/>
+                            <field name="user_id"/>
+                            <field name="active"/>
                             <field name="website" widget="url"/>
-                            <field name="date" select="2"/>
+                            <field name="date"/>
                             <field name="parent_id"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <newline/>
@@ -457,7 +457,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bank account">
-                    <field name="state" select="2"/>
+                    <field name="state"/>
                     <field name="partner_id" select="1"/>
                     <newline/>
                     <field name="acc_number" select="1"/>
@@ -467,12 +467,12 @@
                     <field name="sequence"/>
                     <field colspan="4" name="name"/>
                     <separator colspan="4" string="Bank Account Owner"/>
-                    <field colspan="4" name="owner_name" select="2"/>
+                    <field colspan="4" name="owner_name"/>
                     <field colspan="4" name="street"/>
                     <field name="city"/>
                     <field name="zip"/>
-                    <field completion="1" name="country_id" select="2"/>
-                    <field name="state_id" select="2"/>
+                    <field completion="1" name="country_id"/>
+                    <field name="state_id"/>
                 </form>
             </field>
         </record>
@@ -539,7 +539,7 @@
                     <field name="active" select="1"/>
                     <field name="parent_id"/>
                     <separator colspan="4" string="Partners"/>
-                    <field colspan="4" name="partner_ids" nolabel="1" select="2"/>
+                    <field colspan="4" name="partner_ids" nolabel="1"/>
                 </form>
             </field>
         </record>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index eb4ca575391..ff61b9ec6fa 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -188,7 +188,7 @@ class users(osv.osv):
         'rules_id': fields.many2many('ir.rule.group', 'user_rule_group_rel', 'user_id', 'rule_group_id', 'Rules'),
         'company_id': fields.many2one('res.company', 'Company', required=True,
             help="The company this user is currently working for."),
-        'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Accepted Companies'),
+        'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Companies'),
         'context_lang': fields.selection(_lang_get, 'Language', required=True,
             help="Sets the language for the user's user interface, when UI "
                  "translations are available"),