[MERGE]: merging from same branch

bzr revid: mga@tinyerp.com-20100417211126-dec7ohi43p72c1fr
This commit is contained in:
Mantavya Gajjar
2010-04-18 02:41:26 +05:30
78 changed files with 142 additions and 139 deletions
+5 -5
View File
@@ -1000,7 +1000,7 @@
</record>
<record id="main_partner" model="res.partner">
<field name="name">Tiny sprl</field>
<field name="name">OpenERP S.A.</field>
<!-- Company ID will be set later -->
<field name="company_id" eval="None"/>
</record>
@@ -1034,17 +1034,17 @@
<!-- Basic Company -->
<record id="main_company" model="res.company">
<field name="name">Tiny sprl</field>
<field name="name">OpenERP S.A.</field>
<field name="partner_id" ref="main_partner"/>
<field name="rml_header1">Free Business Solutions</field>
<field name="rml_footer1">Web: http://tiny.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
<field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
<field name="rml_footer1">Web: http://www.openerp.com - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
<field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: CPHBBE75 - VAT: BE0477.472.701</field>
<field name="currency_id" ref="base.EUR"/>
</record>
<assert id="main_company" model="res.company">
<test expr="currency_id.code == 'eur'.upper()"/>
<test expr="name">Tiny sprl</test>
<test expr="name">OpenERP S.A.</test>
</assert>
<record id="user_admin" model="res.users">
<field name="company_id" ref="main_company"/>
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-10 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-02 03:41+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-08 04:44+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-08 04:44+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-08 04:44+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-20 04:42+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-12 03:52+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-Language: Persian\n"
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-26 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-22 04:34+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-08 07:18+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+2 -2
View File
@@ -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-04-14 04:19+0000\n"
"PO-Revision-Date: 2010-04-16 04:25+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-04-15 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-31 04:51+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-01 03:40+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+2 -2
View File
@@ -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-04-14 04:26+0000\n"
"PO-Revision-Date: 2010-04-16 04:27+0000\n"
"Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\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-04-15 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-12 04:50+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-20 04:42+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-14 03:49+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-09 05:10+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-26 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-18 04:34+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-10 04:43+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-12 04:50+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:47+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-04-14 04:23+0000\n"
"PO-Revision-Date: 2010-04-16 04:48+0000\n"
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\n"
"Language-Team: <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-08 04:45+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+2 -2
View File
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-04-14 04:22+0000\n"
"PO-Revision-Date: 2010-04-16 04:24+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+2 -2
View File
@@ -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-04-14 04:23+0000\n"
"PO-Revision-Date: 2010-04-16 05:56+0000\n"
"Last-Translator: OpenERP Administrators <Unknown>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-15 03:58+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-25 04:50+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
+3 -2
View File
@@ -68,8 +68,9 @@ class ir_ui_menu(osv.osv):
if context is None:
context = {}
ids = osv.orm.orm.search(self, cr, uid, args, offset, limit, order, context=context, count=(count and uid==1))
if uid==1:
return ids
#if uid==1:
# return ids
if not ids:
if count:
-17
View File
@@ -76,23 +76,6 @@ class view(osv.osv):
(_check_xml, 'Invalid XML for View Architecture!', ['arch'])
]
def create(self, cr, uid, vals, context={}):
if 'inherit_id' in vals and vals['inherit_id']:
obj=self.browse(cr,uid,vals['inherit_id'])
child=self.pool.get(vals['model'])
error="Inherited view model [%s] and \
\n\n base view model [%s] do not match \
\n\n It should be same as base view model " \
%(vals['model'],obj.model)
try:
if obj.model==child._inherit:
pass
except:
if not obj.model==vals['model']:
raise Exception(error)
return super(view,self).create(cr, uid, vals, context={})
def read(self, cr, uid, ids, fields=None, context={}, load='_classic_read'):
if not isinstance(ids, (list, tuple)):
+4 -3
View File
@@ -267,7 +267,7 @@
<group colspan="5" col="6">
<field name="name" select="1"/>
<field name="ref"/>
<field domain="[('domain', '=', 'partner')]" name="title"/>
<field domain="[('domain', '=', 'partner')]" name="title" groups="base.group_extended"/>
<field name="lang"/>
</group>
<group colspan="1" col="2">
@@ -321,7 +321,7 @@
<field name="active"/>
<field name="website" widget="url"/>
<field name="date"/>
<field name="parent_id"/>
<field name="parent_id" groups="base.group_extended"/>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
<newline/>
</page>
@@ -588,7 +588,8 @@
<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_address_book" sequence="1"/>
<menuitem action="action_partner_category" id="menu_partner_category_main" parent="base.menu_address_book" sequence="1"
groups="base.group_extended"/>
<record id="action_partner_by_category" model="ir.actions.act_window">
<field name="name">Partner Categories</field>
+51 -33
View File
@@ -1955,9 +1955,6 @@ class orm(orm_template):
* if user tries to bypass access rules for read on the requested object
"""
groupby_list = groupby
if isinstance(groupby, list):
groupby = groupby[0]
context = context or {}
self.pool.get('ir.model.access').check(cr, uid, self._name, 'read', context=context)
if not fields:
@@ -1972,7 +1969,13 @@ class orm(orm_template):
tables.append(t)
# Take care of adding join(s) if groupby is an '_inherits'ed field
tables, where_clause = self._inherits_join_calc(groupby,tables,where_clause)
groupby_list = groupby
if groupby:
if groupby and isinstance(groupby, list):
groupby = groupby[0]
tables, where_clause = self._inherits_join_calc(groupby,tables,where_clause)
else:
where_clause = ''
if len(where_clause):
where_clause = ' where '+string.join(where_clause, ' and ')
@@ -1985,12 +1988,15 @@ class orm(orm_template):
float_int_fields = filter(lambda x: fget[x]['type'] in ('float','integer'), fields)
sum = {}
flist = ''
group_by = groupby
if fget.get(groupby,False) and fget[groupby]['type'] in ('date','datetime'):
flist = "to_char(%s,'yyyy-mm') as %s "%(groupby,groupby)
groupby = "to_char(%s,'yyyy-mm')"%(groupby)
else:
flist = groupby
if groupby:
if fget.get(groupby,False) and fget[groupby]['type'] in ('date','datetime'):
flist = "to_char(%s,'yyyy-mm') as %s "%(groupby,groupby)
groupby = "to_char(%s,'yyyy-mm')"%(groupby)
else:
flist = groupby
fields_pre = [f for f in float_int_fields if
f == self.CONCURRENCY_CHECK_FIELD
@@ -1998,9 +2004,15 @@ class orm(orm_template):
for f in fields_pre:
if f not in ['id','sequence']:
operator = fget[f].get('group_operator','sum')
flist += ','+operator+'('+f+') as '+f
if flist:
flist += ','
flist += operator+'('+f+') as '+f
cr.execute('select min(%s.id) as id,' % self._table + flist + ' from ' + ','.join(tables) + where_clause + ' group by '+ groupby + limit_str + offset_str, where_params)
if groupby:
gb = ' group by '+groupby
else:
gb = ''
cr.execute('select min(%s.id) as id,' % self._table + flist + ' from ' + ','.join(tables) + where_clause + gb + limit_str + offset_str, where_params)
alldata = {}
groupby = group_by
for r in cr.dictfetchall():
@@ -2008,14 +2020,15 @@ class orm(orm_template):
if val == None:r[fld] = False
alldata[r['id']] = r
del r['id']
data = self.read(cr, uid, alldata.keys(), [groupby], context=context)
data = self.read(cr, uid, alldata.keys(), groupby and [groupby] or [], context=context)
today = datetime.date.today()
for d in data:
d['__domain'] = [(groupby,'=',alldata[d['id']][groupby] or False)] + domain
if not isinstance(groupby_list,(str, unicode)):
d['__context'] = {'group_by':groupby_list[1:]}
if fget.has_key(groupby):
if groupby:
d['__domain'] = [(groupby,'=',alldata[d['id']][groupby] or False)] + domain
if not isinstance(groupby_list,(str, unicode)):
if not context.get('group_by_no_leaf', False):
d['__context'] = {'group_by':groupby_list[1:]}
if groupby and fget.has_key(groupby):
if d[groupby] and fget[groupby]['type'] in ('date','datetime'):
dt = datetime.datetime.strptime(alldata[d['id']][groupby][:7],'%Y-%m')
days = calendar.monthrange(dt.year, dt.month)[1]
@@ -2026,7 +2039,7 @@ class orm(orm_template):
elif fget[groupby]['type'] == 'many2one':
d[groupby] = d[groupby] and ((type(d[groupby])==type(1)) and d[groupby] or d[groupby][1]) or ''
del alldata[d['id']][groupby]
del alldata[d['id']][groupby]
d.update(alldata[d['id']])
del d['id']
return data
@@ -2638,24 +2651,29 @@ class orm(orm_template):
select = ids
select = map(lambda x: isinstance(x,dict) and x['id'] or x, select)
result = self._read_flat(cr, user, select, fields, context, load)
for r in result:
for key, v in r.items():
if v == None:
r[key] = False
if key in self._columns.keys():
type = self._columns[key]._type
elif key in self._inherit_fields.keys():
type = self._inherit_fields[key][2]._type
if key in self._columns:
column = self._columns[key]
elif key in self._inherit_fields:
column = self._inherit_fields[key][2]
else:
continue
if type == 'reference' and v:
model,ref_id = v.split(',')
table = self.pool.get(model)._table
cr.execute('select id from "%s" where id=%s' % (table,ref_id))
id_exist = cr.fetchone()
if not id_exist:
cr.execute('update "'+self._table+'" set "'+key+'"=NULL where "%s"=%s' %(key,''.join("'"+str(v)+"'")))
r[key] = ''
if v and column._type == 'reference':
model_name, ref_id = v.split(',', 1)
model = self.pool.get(model_name)
if not model:
reset = True
else:
cr.execute('SELECT count(1) FROM "%s" WHERE id=%%s' % (model._table,), (ref_id,))
reset = not cr.fetchone()[0]
if reset:
if column._classic_write:
query = 'UPDATE "%s" SET "%s"=NULL WHERE id=%%s' % (self._table, key)
cr.execute(query, (r['id'],))
r[key] = False
if isinstance(ids, (int, long, dict)):
return result and result[0] or False
return result
@@ -2719,7 +2737,7 @@ class orm(orm_template):
for table in self._inherits:
col = self._inherits[table]
cols = intersect(self._inherit_fields.keys(), fields_to_read)
cols = intersect(self._inherit_fields.keys(), set(fields_to_read) - set(self._columns.keys()))
if not cols:
continue
res2 = self.pool.get(table).read(cr, user, [x[col] for x in res], cols, context, load)
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -15,7 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -15,7 +15,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-04-12 03:53+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-03 04:46+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-02-17 04:54+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-17 04:39+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+2 -2
View File
@@ -9,12 +9,12 @@ msgstr ""
"Report-Msgid-Bugs-To: openerp-server@packages.debian.org\n"
"POT-Creation-Date: 2009-08-24 22:41+0300\n"
"PO-Revision-Date: 2009-11-26 07:45+0000\n"
"Last-Translator: Yuri Kozlov <Unknown>\n"
"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.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-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-03-12 04:51+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Poedit-Language: Swedish\n"
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-30 04:39+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string
+1 -1
View File
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-01-14 04:48+0000\n"
"X-Launchpad-Export-Date: 2010-04-17 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. Type: string