diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 2122c879fbb..1db17ed16cf 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -512,15 +512,15 @@
src_model="account.journal"/>
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index 6d966fdddde..8e2da0697f9 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 15:02+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-09-29 11:28+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 5dc497060d9..90192211bac 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 18:03+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-09-29 10:00+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 2019f3d87aa..b4235511f89 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-16 18:41+0000\n"
+"PO-Revision-Date: 2010-09-29 09:07+0000\n"
"Last-Translator: Fabien (Open ERP) \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-09-29 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 433b729e3fb..13de37367d7 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 11:28+0000\n"
+"PO-Revision-Date: 2010-09-29 09:27+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.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-09-29 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index b53555e4721..91a504f70e2 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-18 18:38+0000\n"
-"Last-Translator: Robin Alexander Schmidt \n"
+"PO-Revision-Date: 2010-09-29 11:06+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Danish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 4b20827b8d2..c31fc1b5cf8 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-29 10:43+0000\n"
-"Last-Translator: Ferdinand-chricar \n"
+"PO-Revision-Date: 2010-09-29 10:39+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 74188da9bf9..8d34f821433 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 18:21+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-09-29 09:26+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Greek \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index b98705ea4a3..8c6efd7491e 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 18:23+0000\n"
+"PO-Revision-Date: 2010-09-29 09:09+0000\n"
"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.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-09-29 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index a0fe685f1c4..9fdd1e7f264 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-28 08:23+0000\n"
+"PO-Revision-Date: 2010-09-29 10:03+0000\n"
"Last-Translator: OpenERP Administrators \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-09-29 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index 5ddf8ed3eef..d85b703aa05 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 19:40+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-09-29 11:46+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Finnish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index a5ddfbc2855..351dfbd7a6e 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-03 08:02+0000\n"
+"PO-Revision-Date: 2010-09-29 11:09+0000\n"
"Last-Translator: Quentin THEURET \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-09-29 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 465f811b13d..120fe3d1535 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 19:47+0000\n"
+"PO-Revision-Date: 2010-09-29 09:34+0000\n"
"Last-Translator: Borja López Soilán (Pexego) \n"
"Language-Team: Galician \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index d730ade30a9..ac5de3c9c51 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-20 11:46+0000\n"
+"PO-Revision-Date: 2010-09-29 10:55+0000\n"
"Last-Translator: Goran Kliska (Aplikacija d.o.o.) \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-09-29 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index 2c08da3369e..d04ab413a05 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 19:51+0000\n"
+"PO-Revision-Date: 2010-09-29 10:36+0000\n"
"Last-Translator: opix \n"
"Language-Team: Indonesian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index bbff0c2d005..361cf8e91ae 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-17 22:10+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-09-29 11:28+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index 23c76aa8f5f..2c4db8f0b43 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-02 12:58+0000\n"
+"PO-Revision-Date: 2010-09-29 10:25+0000\n"
"Last-Translator: yugurten \n"
"Language-Team: Kabyle \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 3daf4a62c9d..b930090b981 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:09+0000\n"
+"PO-Revision-Date: 2010-09-29 09:43+0000\n"
"Last-Translator: Giedrius Slavinskas \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-09-29 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index b6ac09919b4..880fc0d05de 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 19:59+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-09-29 11:19+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Latvian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 52d62c3611c..8103e44a07c 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-27 10:37+0000\n"
-"Last-Translator: sugi \n"
+"PO-Revision-Date: 2010-09-29 08:55+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index d92c8d4027a..b6aa1acd5f3 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 20:04+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-09-29 10:28+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -632,7 +632,7 @@ msgstr "(laat leeg om de huidige situatie te behouden)"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Accounts Fiscal Mapping"
-msgstr ""
+msgstr "Fiscale toewijzing grootboekrekeningen"
#. module: account
#: field:account.analytic.account,contact_id:0
@@ -1031,7 +1031,7 @@ msgstr "Netto totaal"
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Mapping"
-msgstr ""
+msgstr "Fiscale toewijzing"
#. module: account
#: field:account.analytic.line,product_uom_id:0
@@ -1053,7 +1053,7 @@ msgstr "Kinderen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Toewijzing belastingen"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1142,7 +1142,7 @@ msgstr "Nieuwe kostenplaats"
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Mapping Templates"
-msgstr ""
+msgstr "Sjablonen fiscale toewijzing"
#. module: account
#: rml:account.invoice:0
@@ -1174,7 +1174,7 @@ msgstr "Het bedrag uitgedrukt in een optionele andere valuta."
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Mapping Template"
-msgstr ""
+msgstr "Sjabloon fiscale toewijzing"
#. module: account
#: field:account.payment.term,line_ids:0
@@ -1245,7 +1245,7 @@ msgstr "Bedrijfsvaluta"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
msgid "Template Account Fiscal Mapping"
-msgstr ""
+msgstr "Sjabloon fiscale toewijzing grootboekrekening"
#. module: account
#: field:account.analytic.account,parent_id:0
@@ -1830,6 +1830,8 @@ msgid ""
"The fiscal mapping will determine taxes and the accounts used for the "
"partner."
msgstr ""
+"De fiscale toewijzing bepaalt de gebruikte belastingen en "
+"grootboekrekeningen voor de relatie."
#. module: account
#: rml:account.analytic.account.cost_ledger:0
@@ -2104,7 +2106,7 @@ msgstr "Verkoopfactuur proces"
#. module: account
#: rml:account.invoice:0
msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Fiscale toewijzing opmerking:"
#. module: account
#: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3710,7 +3712,7 @@ msgstr "Reeks"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Mapping"
-msgstr ""
+msgstr "Sjabloon voor fiscale toewijzing"
#. module: account
#: view:account.bank.statement:0
@@ -3817,7 +3819,7 @@ msgstr "Concept-facturen"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Mapping"
-msgstr ""
+msgstr "Sjabloon fiscale toewijzing belasting"
#. module: account
#: rml:account.invoice:0
@@ -6017,7 +6019,7 @@ msgstr "Betalingsconditie"
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Mappings"
-msgstr ""
+msgstr "Fiscale toewijzingen"
#. module: account
#: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index 28221abc45d..be8f7bc753d 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 20:06+0000\n"
+"PO-Revision-Date: 2010-09-29 09:52+0000\n"
"Last-Translator: Cédric VALMARY (Tot en òc) \n"
"Language-Team: Occitan (post 1500) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index efec2e90d28..741901b4c0c 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-26 21:40+0000\n"
-"Last-Translator: Filip Stepien \n"
+"PO-Revision-Date: 2010-09-29 11:22+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index dc17579ceb3..fa6083fb060 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 20:09+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-09-29 10:11+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 244c3db3de8..892ec1c7256 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-01 06:55+0000\n"
+"PO-Revision-Date: 2010-09-29 10:30+0000\n"
"Last-Translator: OpenERP Administrators \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-09-29 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 1681d845300..b213daacaa4 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-16 13:14+0000\n"
-"Last-Translator: Iulian Marius \n"
+"PO-Revision-Date: 2010-09-29 09:51+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 2b65f6e78b5..e1f446f64f4 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-26 20:38+0000\n"
+"PO-Revision-Date: 2010-09-29 08:13+0000\n"
"Last-Translator: Chertykov Denis \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-09-29 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 772d286e9ea..d5861ffe8ca 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-20 08:35+0000\n"
+"PO-Revision-Date: 2010-09-29 11:40+0000\n"
"Last-Translator: Radoslav Sloboda \n"
"Language-Team: Slovak \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index c3497700427..bbf785fa5fb 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 11:07+0000\n"
+"PO-Revision-Date: 2010-09-29 10:34+0000\n"
"Last-Translator: OpenERP Administrators \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-09-29 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index 4c72efbc09a..2cfb405b84d 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: ASTRIT BOKSHI \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:11+0000\n"
+"PO-Revision-Date: 2010-09-29 11:14+0000\n"
"Last-Translator: bokshas \n"
"Language-Team: Albanian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index 6a0efe6b1b8..a2514f02d24 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-04 13:59+0000\n"
-"Last-Translator: Данило Шеган \n"
+"PO-Revision-Date: 2010-09-29 11:37+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Serbian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:41+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index 3ffeaedf8d7..2b306d2a109 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:08+0000\n"
+"PO-Revision-Date: 2010-09-29 10:16+0000\n"
"Last-Translator: OpenERP Administrators \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-09-29 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index 20335f64cc3..b07fcc27a99 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-10-01 07:46+0000\n"
+"PO-Revision-Date: 2010-09-29 11:38+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: Telugu \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 2eb1233d723..ffc6f3c06dd 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:07+0000\n"
+"PO-Revision-Date: 2010-09-29 09:15+0000\n"
"Last-Translator: Omer Barlas \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-09-29 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 58b0f2c5994..b072eccf624 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:53+0000\n"
+"PO-Revision-Date: 2010-09-29 09:24+0000\n"
"Last-Translator: Eugene Babiy \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-09-29 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index 5ca0cf419f4..61fe176ea0c 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-20 16:13+0000\n"
-"Last-Translator: Phong Nguyen \n"
+"PO-Revision-Date: 2010-09-29 08:58+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Vietnamese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 737473c0703..d69a9ca005b 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-20 07:32+0000\n"
+"PO-Revision-Date: 2010-09-29 09:08+0000\n"
"Last-Translator: solar.xie@gmail.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-09-29 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:42+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 362d0adb414..1136300f065 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -20,9 +20,8 @@
##############################################################################
import time
-import datetime
-import mx.DateTime
-
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
import pooler
import tools
from osv import fields,osv
@@ -128,13 +127,13 @@ class report_aged_receivable(osv.osv):
LIST_RANGES = []
if fy_id:
fy_start_date = pool_obj_fy.read(cr, uid, fy_id, ['date_start'])['date_start']
- fy_start_date = mx.DateTime.strptime(fy_start_date, '%Y-%m-%d')
- last_month_date = mx.DateTime.strptime(today, '%Y-%m-%d') - mx.DateTime.RelativeDateTime(months=1)
+ fy_start_date = datetime.strptime(fy_start_date, '%Y-%m-%d')
+ last_month_date = datetime.strptime(today, '%Y-%m-%d') - relativedelta(months=1)
while (last_month_date > fy_start_date):
LIST_RANGES.append(today + " to " + last_month_date.strftime('%Y-%m-%d'))
- today = (last_month_date- 1).strftime('%Y-%m-%d')
- last_month_date = mx.DateTime.strptime(today, '%Y-%m-%d') - mx.DateTime.RelativeDateTime(months=1)
+ today = (last_month_date- relativedelta(days=1)).strftime('%Y-%m-%d')
+ last_month_date = datetime.strptime(today, '%Y-%m-%d') - relativedelta(months=1)
LIST_RANGES.append(today +" to " + fy_start_date.strftime('%Y-%m-%d'))
cr.execute('delete from temp_range')
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index 99983654c82..10548095131 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -20,8 +20,8 @@
##############################################################################
import time
-import datetime
-from mx.DateTime import *
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
from lxml import etree
from osv import osv, fields
@@ -69,26 +69,26 @@ class account_aged_trial_balance(osv.osv_memory):
if not data['form']['date_from']:
raise osv.except_osv(_('UserError'), _('Enter a Start date !'))
- start = datetime.date.fromtimestamp(time.mktime(time.strptime(data['form']['date_from'], "%Y-%m-%d")))
- start = DateTime(int(start.year), int(start.month), int(start.day))
+ start = datetime.strptime(data['form']['date_from'], "%Y-%m-%d")
+
if data['form']['direction_selection'] == 'past':
for i in range(5)[::-1]:
- stop = start - RelativeDateTime(days=period_length)
+ stop = start - relativedelta(days=period_length)
res[str(i)] = {
'name': (i!=0 and (str((5-(i+1)) * period_length) + '-' + str((5-i) * period_length)) or ('+'+str(4 * period_length))),
'stop': start.strftime('%Y-%m-%d'),
'start': (i!=0 and stop.strftime('%Y-%m-%d') or False),
}
- start = stop - RelativeDateTime(days=1)
+ start = stop - relativedelta(days=1)
else:
for i in range(5):
- stop = start + RelativeDateTime(days=period_length)
+ stop = start + relativedelta(days=period_length)
res[str(5-(i+1))] = {
'name' : (i!=4 and str((i) * period_length)+'-' + str((i+1) * period_length) or ('+'+str(4 * period_length))),
'start': start.strftime('%Y-%m-%d'),
'stop': (i!=4 and stop.strftime('%Y-%m-%d') or False),
}
- start = stop + RelativeDateTime(days=1)
+ start = stop + relativedelta(days=1)
data['form'].update(res)
return {
diff --git a/addons/account_analytic_analysis/i18n/ko.po b/addons/account_analytic_analysis/i18n/ko.po
index 3007e11a54a..032c33417b3 100644
--- a/addons/account_analytic_analysis/i18n/ko.po
+++ b/addons/account_analytic_analysis/i18n/ko.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 11:34+0000\n"
+"PO-Revision-Date: 2010-09-29 11:23+0000\n"
"Last-Translator: sunygu \n"
"Language-Team: Korean \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po
index 3233bbb192b..f6863d2518c 100644
--- a/addons/account_analytic_analysis/i18n/ru.po
+++ b/addons/account_analytic_analysis/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-27 10:51+0000\n"
+"PO-Revision-Date: 2010-09-29 10:05+0000\n"
"Last-Translator: Chertykov Denis \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-09-29 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/vi.po b/addons/account_analytic_analysis/i18n/vi.po
index 1a517c89712..e1d10d14c9c 100644
--- a/addons/account_analytic_analysis/i18n/vi.po
+++ b/addons/account_analytic_analysis/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-25 04:17+0000\n"
-"Last-Translator: Vinagento \n"
+"PO-Revision-Date: 2010-09-29 10:54+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Vietnamese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index 2513d1229b6..95a39eb11e6 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -66,14 +66,16 @@
id="act_account_acount_move_line_open"
res_model="account.move.line"
src_model="account.account"
- domain="[('account_id', '=', active_id)]"/>
+ context="{'search_default_account_id': [active_id]}"
+ />
+
diff --git a/addons/account_analytic_default/i18n/sk.po b/addons/account_analytic_default/i18n/sk.po
index adc2fc64842..caa85a687ec 100644
--- a/addons/account_analytic_default/i18n/sk.po
+++ b/addons/account_analytic_default/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-20 08:38+0000\n"
+"PO-Revision-Date: 2010-09-29 10:18+0000\n"
"Last-Translator: Radoslav Sloboda \n"
"Language-Team: Slovak \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index 65a7cd0997f..5e15a3c4260 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 20:48+0000\n"
+"PO-Revision-Date: 2010-09-29 09:13+0000\n"
"Last-Translator: Black Jack \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-09-29 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index 09eae766149..feedfb8d5c0 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 20:56+0000\n"
+"PO-Revision-Date: 2010-09-29 10:06+0000\n"
"Last-Translator: Black Jack \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-09-29 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 7a4883ec61d..99083d097b6 100644
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -260,7 +260,7 @@
diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po
index 28ae8f3323b..07938f06357 100644
--- a/addons/account_budget/i18n/it.po
+++ b/addons/account_budget/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-20 10:16+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-09-29 10:12+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index 552fdce4cf0..ed5a3a4368d 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:12+0000\n"
+"PO-Revision-Date: 2010-09-29 08:58+0000\n"
"Last-Translator: Black Jack \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-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_cancel/i18n/bs.po b/addons/account_cancel/i18n/bs.po
index 51a0607bca2..aae7a8160be 100644
--- a/addons/account_cancel/i18n/bs.po
+++ b/addons/account_cancel/i18n/bs.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-19 12:03+0000\n"
-"PO-Revision-Date: 2010-09-11 07:55+0000\n"
-"Last-Translator: Bojan Markovic \n"
+"PO-Revision-Date: 2010-09-29 11:28+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Bosnian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_cancel
diff --git a/addons/account_cancel/i18n/nl.po b/addons/account_cancel/i18n/nl.po
index 462679f4b4b..fcf9c1f9aa9 100644
--- a/addons/account_cancel/i18n/nl.po
+++ b/addons/account_cancel/i18n/nl.po
@@ -8,19 +8,19 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-19 12:03+0000\n"
-"PO-Revision-Date: 2010-09-15 18:17+0000\n"
-"Last-Translator: FULL NAME \n"
+"PO-Revision-Date: 2010-09-29 10:33+0000\n"
+"Last-Translator: Douwe Wullink (Dypalio) \n"
"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_cancel
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ongeldige XML voor weergave opbouw!"
#. module: account_cancel
#: model:ir.module.module,description:account_cancel.module_meta_information
@@ -30,8 +30,13 @@ msgid ""
"journal. If set to true it allows user to cancel entries & invoices.\n"
" "
msgstr ""
+"\n"
+" Module voegt 'Boekingen annuleren toestaan' veld op formulier weergave "
+"van dagboek toe. Als aangezet kunnen boekingen en facturen worden "
+"geannuleerd.\n"
+" "
#. module: account_cancel
#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
msgid "Account Cancel"
-msgstr ""
+msgstr "Boekingen annuleren"
diff --git a/addons/account_cancel/i18n/ru.po b/addons/account_cancel/i18n/ru.po
index e9358c4bb2c..07727db8b7d 100644
--- a/addons/account_cancel/i18n/ru.po
+++ b/addons/account_cancel/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-19 12:03+0000\n"
-"PO-Revision-Date: 2010-09-27 10:45+0000\n"
+"PO-Revision-Date: 2010-09-29 09:47+0000\n"
"Last-Translator: Chertykov Denis \n"
"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_cancel
diff --git a/addons/account_chart/i18n/it.po b/addons/account_chart/i18n/it.po
index 5c25d642821..333cb352c91 100644
--- a/addons/account_chart/i18n/it.po
+++ b/addons/account_chart/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-29 07:09+0000\n"
-"Last-Translator: Stefano Prenna \n"
+"PO-Revision-Date: 2010-09-29 11:07+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_coda/i18n/hr.po b/addons/account_coda/i18n/hr.po
index 8d34dc1e36d..a9dbb78f1f5 100644
--- a/addons/account_coda/i18n/hr.po
+++ b/addons/account_coda/i18n/hr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-09-09 15:37+0000\n"
-"Last-Translator: Jasna Cuic (Aplikacija d.o.o) \n"
+"PO-Revision-Date: 2010-09-29 11:13+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Croatian
\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_coda
diff --git a/addons/account_coda/i18n/it.po b/addons/account_coda/i18n/it.po
index c58980d7d1c..1a01121c4e0 100644
--- a/addons/account_coda/i18n/it.po
+++ b/addons/account_coda/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-09-19 11:45+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-09-29 11:21+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_coda
diff --git a/addons/account_followup/i18n/it.po b/addons/account_followup/i18n/it.po
index 8edea564fbe..f848f82578e 100644
--- a/addons/account_followup/i18n/it.po
+++ b/addons/account_followup/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-20 23:01+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-09-29 10:54+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po
index 24df8dbfc7f..180c9940118 100644
--- a/addons/account_followup/i18n/zh_CN.po
+++ b/addons/account_followup/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:39+0000\n"
+"PO-Revision-Date: 2010-09-29 10:27+0000\n"
"Last-Translator: Black Jack \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-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_invoice_layout/i18n/zh_CN.po b/addons/account_invoice_layout/i18n/zh_CN.po
index f131ebfe284..d4f094af383 100644
--- a/addons/account_invoice_layout/i18n/zh_CN.po
+++ b/addons/account_invoice_layout/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 22:04+0000\n"
+"PO-Revision-Date: 2010-09-29 11:14+0000\n"
"Last-Translator: Black Jack \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-09-29 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_payment/i18n/it.po b/addons/account_payment/i18n/it.po
index 639fc98eee0..91442dd1f20 100644
--- a/addons/account_payment/i18n/it.po
+++ b/addons/account_payment/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-26 20:08+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-09-29 09:44+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/mn.po b/addons/account_payment/i18n/mn.po
index 3280312684d..fe5de359e29 100644
--- a/addons/account_payment/i18n/mn.po
+++ b/addons/account_payment/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 08:06+0000\n"
-"Last-Translator: Jacara \n"
+"PO-Revision-Date: 2010-09-29 10:42+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po
index a2d2ac954fd..a77dfcf2567 100644
--- a/addons/account_payment/i18n/ru.po
+++ b/addons/account_payment/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-17 08:16+0000\n"
+"PO-Revision-Date: 2010-09-29 10:53+0000\n"
"Last-Translator: Chertykov Denis \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-09-29 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 8edaf5c5b86..491c5873b7b 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 22:09+0000\n"
+"PO-Revision-Date: 2010-09-29 09:01+0000\n"
"Last-Translator: Black Jack \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-09-29 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_report/account.py b/addons/account_report/account.py
index 5dffc0c6a78..6e5fbc94026 100644
--- a/addons/account_report/account.py
+++ b/addons/account_report/account.py
@@ -26,9 +26,6 @@ import pooler
from tools.misc import currency
from tools.translate import _
-import mx.DateTime
-from mx.DateTime import RelativeDateTime, now, DateTime, localtime
-
class account_report(osv.osv):
_name = "account.report.report"
diff --git a/addons/account_report/i18n/it.po b/addons/account_report/i18n/it.po
index 8c85b7714b0..6be272f1b4b 100644
--- a/addons/account_report/i18n/it.po
+++ b/addons/account_report/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-18 11:56+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-09-29 08:36+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/zh_CN.po b/addons/account_report/i18n/zh_CN.po
index 120619a47d9..46003a51292 100644
--- a/addons/account_report/i18n/zh_CN.po
+++ b/addons/account_report/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 22:13+0000\n"
+"PO-Revision-Date: 2010-09-29 08:34+0000\n"
"Last-Translator: Black Jack \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-09-29 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:38+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/wizard/account_report_print_indicators_with_pdf.py b/addons/account_report/wizard/account_report_print_indicators_with_pdf.py
index 9e71d3e88c9..2ae373e58f0 100644
--- a/addons/account_report/wizard/account_report_print_indicators_with_pdf.py
+++ b/addons/account_report/wizard/account_report_print_indicators_with_pdf.py
@@ -19,7 +19,6 @@
#
##############################################################################
import time
-from mx.DateTime import *
import os
import base64
import StringIO
diff --git a/addons/account_reporting/account.py b/addons/account_reporting/account.py
index c1c68f04d9b..7fc08401496 100644
--- a/addons/account_reporting/account.py
+++ b/addons/account_reporting/account.py
@@ -24,9 +24,6 @@ from osv import fields, osv
from tools.misc import currency
-import mx.DateTime
-from mx.DateTime import RelativeDateTime, now, DateTime, localtime
-
class color_rml(osv.osv):
_name = "color.rml"
diff --git a/addons/account_reporting/i18n/it.po b/addons/account_reporting/i18n/it.po
index d1e61de8ff2..f4903e4b712 100644
--- a/addons/account_reporting/i18n/it.po
+++ b/addons/account_reporting/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-18 11:58+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-09-29 11:18+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/pl.po b/addons/account_reporting/i18n/pl.po
index 8e3fc905788..707fc19fbf1 100644
--- a/addons/account_reporting/i18n/pl.po
+++ b/addons/account_reporting/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-17 15:54+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"PO-Revision-Date: 2010-09-29 08:55+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index 36fe1ad1bad..effcbadfd66 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-22 00:59+0000\n"
+"PO-Revision-Date: 2010-09-29 09:59+0000\n"
"Last-Translator: Marcelo Sa - www.jambu.com.br \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-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index d1354cf0f2e..5851fd188f3 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 00:09+0000\n"
+"PO-Revision-Date: 2010-09-29 11:37+0000\n"
"Last-Translator: Black Jack \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-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/test/sales_receipt.yml b/addons/account_voucher/test/sales_receipt.yml
index af10d614730..628d1795bc8 100644
--- a/addons/account_voucher/test/sales_receipt.yml
+++ b/addons/account_voucher/test/sales_receipt.yml
@@ -42,11 +42,7 @@
if l.reconcile_id:
reconciled = True
break
- if not reconciled:
- print "Info: Voucher is not paid"
- else:
- print "Info: Voucher is paid"
-
+ assert (not reconciled), "Found reconciled move lines, should not be"
-
I create and post a voucher payment of amount 30000.0 for the partner Seagate
-
@@ -74,8 +70,6 @@
assert (voucher_id.state=='draft'), "Voucher is not in draft state"
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'account.voucher', voucher_id.id, 'proforma_voucher', cr)
-
-
-
I check that move lines are reconciled meaning voucher is paid
-
@@ -85,7 +79,4 @@
if l.reconcile_id:
reconciled = True
break
- if not reconciled:
- print "Info: Voucher is not paid"
- else:
- print "Info: Voucher is paid"
\ No newline at end of file
+ assert reconciled, "Found unreconciled move lines/unpaid voucher"
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index d007d20acab..972850e0114 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -161,10 +161,10 @@
diff --git a/addons/analytic/i18n/bs.po b/addons/analytic/i18n/bs.po
index 8b10319e794..e57528a25e6 100644
--- a/addons/analytic/i18n/bs.po
+++ b/addons/analytic/i18n/bs.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-06-18 10:59+0000\n"
-"PO-Revision-Date: 2010-09-11 08:15+0000\n"
-"Last-Translator: Bojan Markovic \n"
+"PO-Revision-Date: 2010-09-29 10:36+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Bosnian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic
diff --git a/addons/analytic/i18n/mn.po b/addons/analytic/i18n/mn.po
index cdd1f2d4667..86f666efa6b 100644
--- a/addons/analytic/i18n/mn.po
+++ b/addons/analytic/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-06-18 10:59+0000\n"
-"PO-Revision-Date: 2010-09-13 03:55+0000\n"
-"Last-Translator: sugi \n"
+"PO-Revision-Date: 2010-09-29 09:38+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic
diff --git a/addons/analytic_journal_billing_rate/i18n/nl.po b/addons/analytic_journal_billing_rate/i18n/nl.po
index 2296cc4e83f..b622578e4fc 100644
--- a/addons/analytic_journal_billing_rate/i18n/nl.po
+++ b/addons/analytic_journal_billing_rate/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 10:51+0000\n"
+"PO-Revision-Date: 2010-09-29 11:18+0000\n"
"Last-Translator: Marcel van der Boom (HS-Development BV) \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-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index 81d11d84d9a..b8e440ec754 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-14 03:52+0000\n"
+"PO-Revision-Date: 2010-09-29 09:18+0000\n"
"Last-Translator: Black Jack \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-09-29 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index d149fc89f1c..c3068753a6e 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -765,7 +765,7 @@
diff --git a/addons/auction/i18n/it.po b/addons/auction/i18n/it.po
index ededa53ccbe..e29b5139b5c 100644
--- a/addons/auction/i18n/it.po
+++ b/addons/auction/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-27 12:51+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-09-29 08:54+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/pl.po b/addons/auction/i18n/pl.po
index a5cf4dc6b25..39473a12bc0 100644
--- a/addons/auction/i18n/pl.po
+++ b/addons/auction/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-26 21:44+0000\n"
-"Last-Translator: Filip Stepien \n"
+"PO-Revision-Date: 2010-09-29 11:07+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/audittrail/i18n/mn.po b/addons/audittrail/i18n/mn.po
index 43467087460..f1761fbbc58 100644
--- a/addons/audittrail/i18n/mn.po
+++ b/addons/audittrail/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-13 10:38+0000\n"
+"PO-Revision-Date: 2010-09-29 09:37+0000\n"
"Last-Translator: ub121 \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/vi.po b/addons/audittrail/i18n/vi.po
index ff3ccd50726..f56d42ac96e 100644
--- a/addons/audittrail/i18n/vi.po
+++ b/addons/audittrail/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-23 10:18+0000\n"
-"Last-Translator: Phong Nguyen \n"
+"PO-Revision-Date: 2010-09-29 11:23+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Vietnamese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index f31f10c4060..9a2d720cc1a 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -113,6 +113,8 @@ the rule to mark CC(mail to any other person defined in actions)."),
'filter_id':fields.many2one('ir.filters', 'Filter', required=False),
'act_email_from' : fields.char('Email From', size=64, required=False,
help="Use a python expression to specify the right field on which one than we will use for the 'From' field of the header"),
+ 'act_email_to' : fields.char('Email To', size=64, required=False,
+ help="Use a python expression to specify the right field on which one than we will use for the 'To' field of the header"),
}
_defaults = {
@@ -356,13 +358,20 @@ the rule to mark CC(mail to any other person defined in actions)."),
emails += (action.act_email_cc or '').split(',')
if action.act_mail_to_email:
emails += (action.act_mail_to_email or '').split(',')
+
+ locals_for_emails = {
+ 'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
+ 'obj' : obj,
+ }
+
+ if action.act_email_to:
+ emails.append(safe_eval(action.act_email_to, {}, locals_for_emails))
+
emails = filter(None, emails)
if len(emails) and action.act_mail_body:
emails = list(set(emails))
- email_from = safe_eval(action.act_email_from, {}, {
- 'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
- 'obj' : obj,
- })
+ email_from = safe_eval(action.act_email_from, {}, locals_for_emails)
+
def to_email(text):
return re.findall(r'([^ ,<@]+@[^> ,]+)', text or '')
emails = to_email(','.join(filter(None, emails)))
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 755f6680d34..01951b3c9b8 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -65,12 +65,13 @@
-
+
-
-
-
-
+
+
+
+
+
diff --git a/addons/base_action_rule/i18n/bs.po b/addons/base_action_rule/i18n/bs.po
index 5437647fdab..532d5d6ad8c 100644
--- a/addons/base_action_rule/i18n/bs.po
+++ b/addons/base_action_rule/i18n/bs.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-19 12:20+0000\n"
-"PO-Revision-Date: 2010-09-12 11:11+0000\n"
-"Last-Translator: Bojan Markovic \n"
+"PO-Revision-Date: 2010-09-29 09:07+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Bosnian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/it.po b/addons/base_action_rule/i18n/it.po
index bd53fda4687..cbb144813bf 100644
--- a/addons/base_action_rule/i18n/it.po
+++ b/addons/base_action_rule/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-19 12:20+0000\n"
-"PO-Revision-Date: 2010-09-26 20:04+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-09-29 10:07+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/mn.po b/addons/base_action_rule/i18n/mn.po
index 8e5e5c3c529..86fbab1e414 100644
--- a/addons/base_action_rule/i18n/mn.po
+++ b/addons/base_action_rule/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-19 12:20+0000\n"
-"PO-Revision-Date: 2010-09-16 01:22+0000\n"
-"Last-Translator: sugi \n"
+"PO-Revision-Date: 2010-09-29 11:46+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_action_rule
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index c3292452298..2a0ed14080f 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -122,7 +122,7 @@
separator="1" help="Delegated Invitations" />
-
+
diff --git a/addons/base_calendar/i18n/bs.po b/addons/base_calendar/i18n/bs.po
index fb87429dd84..3bd87223d25 100644
--- a/addons/base_calendar/i18n/bs.po
+++ b/addons/base_calendar/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-08-19 12:50+0000\n"
-"PO-Revision-Date: 2010-09-12 14:45+0000\n"
-"Last-Translator: Bojan Markovic \n"
+"PO-Revision-Date: 2010-09-29 09:49+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Poedit-Country: BOSNIA AND HERZEGOVINA\n"
"Language: hr\n"
diff --git a/addons/base_calendar/i18n/it.po b/addons/base_calendar/i18n/it.po
index 3deeda97ebf..b62195e2ea3 100644
--- a/addons/base_calendar/i18n/it.po
+++ b/addons/base_calendar/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-19 12:50+0000\n"
-"PO-Revision-Date: 2010-09-26 09:12+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-09-29 09:37+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_calendar
diff --git a/addons/base_calendar/i18n/mn.po b/addons/base_calendar/i18n/mn.po
index 0498ecd1a3b..2ce8c530bec 100644
--- a/addons/base_calendar/i18n/mn.po
+++ b/addons/base_calendar/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-19 12:50+0000\n"
-"PO-Revision-Date: 2010-09-13 05:55+0000\n"
-"Last-Translator: sugi \n"
+"PO-Revision-Date: 2010-09-29 09:16+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_calendar
diff --git a/addons/base_calendar/i18n/pl.po b/addons/base_calendar/i18n/pl.po
index fea2750ac8f..d01bc54209b 100644
--- a/addons/base_calendar/i18n/pl.po
+++ b/addons/base_calendar/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-19 12:50+0000\n"
-"PO-Revision-Date: 2010-09-12 19:48+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) \n"
+"PO-Revision-Date: 2010-09-29 10:19+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Polish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_calendar
diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule.py b/addons/base_calendar/wizard/base_calendar_set_exrule.py
index ab458c8f7f5..995d2a98dcc 100644
--- a/addons/base_calendar/wizard/base_calendar_set_exrule.py
+++ b/addons/base_calendar/wizard/base_calendar_set_exrule.py
@@ -23,7 +23,6 @@ from base_calendar import base_calendar
from osv import fields, osv
from tools.translate import _
import tools
-import mx.DateTime
import re
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 8e3a4ded7eb..0c10862bd05 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -26,7 +26,7 @@ class res_partner_contact(osv.osv):
_name = "res.partner.contact"
_description = "Contact"
-
+
def _main_job(self, cr, uid, ids, fields, arg, context=None):
"""
@param self: The object pointer
@@ -36,12 +36,16 @@ class res_partner_contact(osv.osv):
@fields: Get Fields
@param context: A standard dictionary for contextual values
@param arg: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...]. """
-
-
res = dict.fromkeys(ids, False)
+
+ res_partner_job_obj = self.pool.get('res.partner.job')
+ all_job_ids = res_partner_job_obj.search(cr, uid, [])
+ all_job_names = dict(zip(all_job_ids, res_partner_job_obj.name_get(cr, uid, all_job_ids, context=context)))
+
for contact in self.browse(cr, uid, ids, context):
if contact.job_ids:
- res[contact.id] = contact.job_ids[0].name_get()[0]
+ res[contact.id] = all_job_names.get(contact.job_ids[0].id, False)
+
return res
_columns = {
@@ -61,7 +65,7 @@ class res_partner_contact(osv.osv):
'function': fields.related('job_ids', 'function', type='char', \
string='Main Function'),
'job_id': fields.function(_main_job, method=True, type='many2one',\
- relation='res.partner.job', string='Main Job', store=True),
+ relation='res.partner.job', string='Main Job'),
'email': fields.char('E-Mail', size=240),
'comment': fields.text('Notes', translate=True),
'photo': fields.binary('Image'),
@@ -97,7 +101,18 @@ class res_partner_contact(osv.osv):
_contact += contact.first_name or ""
res.append((contact.id, _contact))
return res
-
+
+ def name_search(self, cr, uid, name='', args=None, operator='ilike', context=None, limit=None):
+ if not args:
+ args = []
+ if context is None:
+ context = {}
+ if name:
+ ids = self.search(cr, uid, ['|',('name', operator, name),('first_name', operator, name)] + args, limit=limit, context=context)
+ else:
+ ids = self.search(cr, uid, args, limit=limit, context=context)
+ return self.name_get(cr, uid, ids, context=context)
+
res_partner_contact()
@@ -138,8 +153,7 @@ class res_partner_address(osv.osv):
res_partner_address()
class res_partner_job(osv.osv):
-
- def name_get(self, cr, uid, ids, context={}):
+ def name_get(self, cr, uid, ids, context=None):
"""
@param self: The object pointer
@param cr: the current row, from the database cursor,
@@ -147,12 +161,15 @@ class res_partner_job(osv.osv):
@param ids: List of partner address’s IDs
@param context: A standard dictionary for contextual values
"""
+ if context is None:
+ context = {}
- if not len(ids):
+ if not ids:
return []
res = []
jobs = self.browse(cr, uid, ids)
+
contact_ids = [rec.contact_id.id for rec in jobs]
contact_names = dict(self.pool.get('res.partner.contact').name_get(cr, uid, contact_ids, context=context))
@@ -160,40 +177,6 @@ class res_partner_job(osv.osv):
function_name = r.function
funct = function_name and (", " + function_name) or ""
res.append((r.id, contact_names.get(r.contact_id.id, '') + funct))
- return res
-
- def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
- """ search parnter job
- @param self: The object pointer
- @param cr: the current row, from the database cursor,
- @param user: the current user
- @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
- @param offset: The Number of Results to Pass
- @param limit: The Number of Results to Return
- @param context: A standard dictionary for contextual values
- """
-
- job_ids = []
- for arg in args:
- if arg[0] == 'address_id':
- self._order = 'sequence_partner'
- elif arg[0] == 'contact_id':
- self._order = 'sequence_contact'
-
- contact_obj = self.pool.get('res.partner.contact')
- if arg[2] and not count:
- search_arg = ['|', ('first_name', 'ilike', arg[2]), ('name', 'ilike', arg[2])]
- contact_ids = contact_obj.search(cr, user, search_arg, offset=offset, limit=limit, order=order, context=context, count=count)
- if not contact_ids:
- continue
- contacts = contact_obj.browse(cr, user, contact_ids, context=context)
- for contact in contacts:
- job_ids.extend([item.id for item in contact.job_ids])
-
- res = super(res_partner_job,self).search(cr, user, args, offset=offset,\
- limit=limit, order=order, context=context, count=count)
- if job_ids:
- res = list(set(res + job_ids))
return res
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 1f22b550bdc..59894ab55d0 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -408,8 +408,9 @@
diff --git a/addons/base_contact/i18n/mn.po b/addons/base_contact/i18n/mn.po
index 05d2e2f676e..1d6c7e0c9f7 100644
--- a/addons/base_contact/i18n/mn.po
+++ b/addons/base_contact/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-10 03:53+0000\n"
+"PO-Revision-Date: 2010-09-29 09:24+0000\n"
"Last-Translator: ub121 \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po
index 07b2f9ba94c..7d9c14ffa43 100644
--- a/addons/base_contact/i18n/ru.po
+++ b/addons/base_contact/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-17 05:44+0000\n"
+"PO-Revision-Date: 2010-09-29 08:45+0000\n"
"Last-Translator: Chertykov Denis \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-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
diff --git a/addons/base_module_quality/i18n/bs.po b/addons/base_module_quality/i18n/bs.po
index 6481f376e8a..88a4716f6b7 100644
--- a/addons/base_module_quality/i18n/bs.po
+++ b/addons/base_module_quality/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-11 10:24+0000\n"
-"Last-Translator: Bojan Markovic \n"
+"PO-Revision-Date: 2010-09-29 09:53+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ca.po b/addons/base_module_quality/i18n/ca.po
index 2e31b23308c..ae75538a9f2 100644
--- a/addons/base_module_quality/i18n/ca.po
+++ b/addons/base_module_quality/i18n/ca.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-30 08:22+0000\n"
+"PO-Revision-Date: 2010-09-29 09:27+0000\n"
"Last-Translator: Raimon Esteve (Zikzakmedia) \n"
"Language-Team: Catalan \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 4b984e31ed1..6f151909339 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-27 10:06+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2010-09-29 11:04+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/mn.po b/addons/base_module_quality/i18n/mn.po
index e38d0681bce..a730bd6c745 100644
--- a/addons/base_module_quality/i18n/mn.po
+++ b/addons/base_module_quality/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-13 06:37+0000\n"
+"PO-Revision-Date: 2010-09-29 10:02+0000\n"
"Last-Translator: ub121 \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/ru.po b/addons/base_module_quality/i18n/ru.po
index 450c132d0fa..ccb11d8e881 100644
--- a/addons/base_module_quality/i18n/ru.po
+++ b/addons/base_module_quality/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-28 15:50+0000\n"
-"Last-Translator: Igor Butvin \n"
+"PO-Revision-Date: 2010-09-29 08:37+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
diff --git a/addons/base_module_record/i18n/ru.po b/addons/base_module_record/i18n/ru.po
index 5bb296dd503..6461f7d234a 100644
--- a/addons/base_module_record/i18n/ru.po
+++ b/addons/base_module_record/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 02:17+0000\n"
+"PO-Revision-Date: 2010-09-29 10:52+0000\n"
"Last-Translator: Nikolay Chesnokov \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-09-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_record
diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po
index 89b6ca16e18..44b26d929b8 100644
--- a/addons/base_setup/i18n/bs.po
+++ b/addons/base_setup/i18n/bs.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-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-12 21:18+0000\n"
-"Last-Translator: Bojan Markovic \n"
+"PO-Revision-Date: 2010-09-29 09:28+0000\n"
+"Last-Translator: OpenERP Administrators \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-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po
index 5e639972de4..63fb69a8e12 100644
--- a/addons/base_setup/i18n/mn.po
+++ b/addons/base_setup/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-23 19:42+0000\n"
-"Last-Translator: Bat-Orgil Battogtokh \n"
+"PO-Revision-Date: 2010-09-29 11:30+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
diff --git a/addons/base_synchro/__openerp__.py b/addons/base_synchro/__openerp__.py
index 69fcb839715..bd285821e2b 100644
--- a/addons/base_synchro/__openerp__.py
+++ b/addons/base_synchro/__openerp__.py
@@ -24,9 +24,12 @@
"version":"0.1",
"author":"Tiny",
"category":"Generic Modules/Base",
+ "description": """Synchronization with all objects.""",
"depends":["base"],
"demo_xml":[],
- "update_xml":["base_synchro_wizard.xml","base_synchro_view.xml"],
+ "update_xml":[ "wizard/base_synchro_view.xml",
+ "base_synchro_view.xml",
+ "security/ir.model.access.csv",],
"active":False,
"installable":True,
}
diff --git a/addons/base_synchro/base_synchro_obj.py b/addons/base_synchro/base_synchro_obj.py
index 5093c8f787e..64fad4cd687 100755
--- a/addons/base_synchro/base_synchro_obj.py
+++ b/addons/base_synchro/base_synchro_obj.py
@@ -42,7 +42,7 @@ class base_synchro_server(osv.osv):
base_synchro_server()
class base_synchro_obj(osv.osv):
- '''Class to store the operations done by wizart'''
+ '''Class to store the operations done by wizard'''
_name = "base.synchro.obj"
_description = "Register Class"
_columns = {
@@ -66,6 +66,10 @@ class base_synchro_obj(osv.osv):
#
# Return a list of changes: [ (date, id) ]
#
+
+ def get_ids(self, cr, uid, object, dt, domain=[], context={}):
+ return self._get_ids(cr, uid, object, dt, domain, context)
+
def _get_ids(self, cr, uid, object, dt, domain=[], context={}):
result = []
if dt:
diff --git a/addons/base_synchro/base_synchro_view.xml b/addons/base_synchro/base_synchro_view.xml
index 97995106070..b78aa1326c5 100755
--- a/addons/base_synchro/base_synchro_view.xml
+++ b/addons/base_synchro/base_synchro_view.xml
@@ -30,6 +30,37 @@
+
+ base.synchro.obj.line.form
+ base.synchro.obj.line
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Filters
+ ir.actions.act_window
+ base.synchro.obj.line
+ form
+
+
+
+
Synchronized instances
@@ -56,7 +87,7 @@
-
+
@@ -81,6 +112,37 @@
+
+ base.synchro.obj.line.form
+ base.synchro.obj
+ search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Filters
+ ir.actions.act_window
+ base.synchro.obj
+ form
+
+
+
+
Synchronized objects
ir.actions.act_window
@@ -123,7 +185,7 @@
-
+
diff --git a/addons/base_synchro/base_synchro_wizard.xml b/addons/base_synchro/base_synchro_wizard.xml
deleted file mode 100644
index b26b3bbae2b..00000000000
--- a/addons/base_synchro/base_synchro_wizard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/addons/base_synchro/security/ir.model.access.csv b/addons/base_synchro/security/ir.model.access.csv
new file mode 100644
index 00000000000..fa0f00e8ccd
--- /dev/null
+++ b/addons/base_synchro/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"base_synchro_server","base.synchro.server","model_base_synchro_server","base.group_system",1,1,1,1
+" base_synchro_obj"," base.synchro.obj","model_base_synchro_obj","base.group_system",1,1,1,1
+"base_synchro_obj_avoid","base.synchro.obj.avoid","model_base_synchro_obj_avoid","base.group_system",1,1,1,1
+"base_synchro_obj_line","base.synchro.obj.line","model_base_synchro_obj_line","base.group_system",1,1,1,1
diff --git a/addons/base_synchro/wizard/__init__.py b/addons/base_synchro/wizard/__init__.py
index 7ff450acd76..3deff83f9e3 100644
--- a/addons/base_synchro/wizard/__init__.py
+++ b/addons/base_synchro/wizard/__init__.py
@@ -19,4 +19,5 @@
#
##############################################################################
import base_synchro
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_synchro/wizard/base_synchro.py b/addons/base_synchro/wizard/base_synchro.py
index 3a394d4ba3b..66c1b7b4e7a 100644
--- a/addons/base_synchro/wizard/base_synchro.py
+++ b/addons/base_synchro/wizard/base_synchro.py
@@ -2,23 +2,23 @@
##############################################################################
#
# OpenERP, Open Source Management Solution
-# Copyright (C) 2004-2010 Tiny SPRL ().
+# Copyright (C) 2004-2010 Tiny SPRL (). All Rights Reserved
+# $Id$
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU Affero General Public License
+# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
#
##############################################################################
-import wizard
import osv
from datetime import date
import time
@@ -27,26 +27,7 @@ import xmlrpclib
import re
import tools
import threading
-
-acc_synchro_form = '''
-'''
-
-acc_synchro_fields = {
- 'server_url': {'string':'Server URL', 'type':'many2one', 'relation':'base.synchro.server','required':True},
- 'user_id': {'string':'Send Result To', 'type':'many2one', 'relation':'res.users', 'default': lambda uid,data,state: uid},
-}
-
-finish_form ='''
-
-'''
+from osv import osv, fields
class RPCProxyOne(object):
def __init__(self, server, ressource):
@@ -66,13 +47,26 @@ class RPCProxy(object):
def get(self, ressource):
return RPCProxyOne(self.server, ressource)
-class wizard_cost_account_synchro(wizard.interface):
+class base_synchro(osv.osv_memory):
+ """Base Synchronization """
+ _name = 'base.synchro'
+
+ _columns = {
+ 'server_url': fields.many2one('base.synchro.server', "Server URL", required=True),
+ 'user_id': fields.many2one('res.users', "Send Result To",),
+ }
+
+ _defaults = {
+ 'user_id': lambda self,cr,uid,context: uid,
+ }
+
start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
report = []
report_total = 0
report_create = 0
report_write = 0
- def _synchronize(self, cr, uid, server, object, context):
+
+ def synchronize(self, cr, uid, server, object, context):
pool = pooler.get_pool(cr.dbname)
self.meta = {}
ids = []
@@ -80,14 +74,14 @@ class wizard_cost_account_synchro(wizard.interface):
pool2 = pool
#try:
if object.action in ('d','b'):
- ids = pool1.get('base.synchro.obj')._get_ids(cr, uid,
+ ids = pool1.get('base.synchro.obj').get_ids(cr, uid,
object.model_id.model,
object.synchronize_date,
eval(object.domain),
{'action':'d'}
)
if object.action in ('u','b'):
- ids += pool2.get('base.synchro.obj')._get_ids(cr, uid,
+ ids += pool2.get('base.synchro.obj').get_ids(cr, uid,
object.model_id.model,
object.synchronize_date,
eval(object.domain),
@@ -109,7 +103,7 @@ class wizard_cost_account_synchro(wizard.interface):
if object.model_id.model=='crm.case.history':
fields = ['email','description','log_id']
value = pool_src.get(object.model_id.model).read(cr, uid, [id], fields)[0]
- value = self._data_transform(cr, uid, pool_src, pool_dest, object.model_id.model, value, action)
+ value = self.data_transform(cr, uid, pool_src, pool_dest, object.model_id.model, value, action)
id2 = self.get_id(cr, uid, object.id, id, action, context)
#
# Transform value
@@ -133,7 +127,7 @@ class wizard_cost_account_synchro(wizard.interface):
else:
print value
idnew = pool_dest.get(object.model_id.model).create(cr, uid, value)
- synid = pool.get('base.synchro.obj.line').create(cr, uid, {
+ synid = self.pool.get('base.synchro.obj.line').create(cr, uid, {
'obj_id': object.id,
'local_id': (action=='u') and id or idnew,
'remote_id': (action=='d') and id or idnew
@@ -141,25 +135,20 @@ class wizard_cost_account_synchro(wizard.interface):
self.report_total+=1
self.report_create+=1
self.meta = {}
- return 'finish'
+ return True
- #
- # IN: object and ID
- # OUT: ID of the remote object computed:
- # If object is synchronised, read the sync database
- # Otherwise, use the name_search method
- #
def get_id(self, cr, uid, object_id, id, action, context={}):
pool = pooler.get_pool(cr.dbname)
+ line_pool = pool.get('base.synchro.obj.line')
field_src = (action=='u') and 'local_id' or 'remote_id'
field_dest = (action=='d') and 'local_id' or 'remote_id'
- rid = pool.get('base.synchro.obj.line').search(cr, uid, [('obj_id','=',object_id), (field_src,'=',id)], context=context)
+ rid = line_pool.search(cr, uid, [('obj_id','=',object_id), (field_src,'=',id)], context=context)
result = False
if rid:
- result = pool.get('base.synchro.obj.line').read(cr, uid, rid, [field_dest], context=context)[0][field_dest]
+ result = line_pool.read(cr, uid, rid, [field_dest], context=context)[0][field_dest]
return result
- def _relation_transform(self, cr, uid, pool_src, pool_dest, object, id, action, context={}):
+ def relation_transform(self, cr, uid, pool_src, pool_dest, object, id, action, context={}):
if not id:
return False
pool = pooler.get_pool(cr.dbname)
@@ -186,7 +175,14 @@ class wizard_cost_account_synchro(wizard.interface):
print self.report.append('WARNING: Record "%s" on relation %s not found, set to null.' % (names,object))
return result
- def _data_transform(self, cr, uid, pool_src, pool_dest, object, data, action='u', context={}):
+ #
+ # IN: object and ID
+ # OUT: ID of the remote object computed:
+ # If object is synchronised, read the sync database
+ # Otherwise, use the name_search method
+ #
+
+ def data_transform(self, cr, uid, pool_src, pool_dest, object, data, action='u', context={}):
self.meta.setdefault(pool_src, {})
if not object in self.meta[pool_src]:
self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid, context)
@@ -201,12 +197,12 @@ class wizard_cost_account_synchro(wizard.interface):
del data[f]
elif ftype == 'many2one':
if data[f]:
- df = self._relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], data[f][0], action, context)
+ df = self.relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], data[f][0], action, context)
data[f] = df
if not data[f]:
del data[f]
elif ftype == 'many2many':
- res = map(lambda x: self._relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], x, action, context), data[f])
+ res = map(lambda x: self.relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], x, action, context), data[f])
data[f] = [(6, 0, res)]
del data['id']
return data
@@ -215,21 +211,22 @@ class wizard_cost_account_synchro(wizard.interface):
# Find all objects that are created or modified after the synchronize_date
# Synchronize these obejcts
#
- def _upload_download(self, db_name, uid, data, context):
- cr = pooler.get_db(db_name).cursor()
+
+
+ def upload_download(self, cr, uid, ids, context):
start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
+ syn_obj = self.browse(cr, uid, ids)[0]
pool = pooler.get_pool(cr.dbname)
- server = pool.get('base.synchro.server').browse(cr, uid, data['form']['server_url'], context)
+ server = pool.get('base.synchro.server').browse(cr, uid, ids, context)[0]
for object in server.obj_ids:
dt = time.strftime('%Y-%m-%d %H:%M:%S')
- self._synchronize(cr, uid, server, object, context)
+ self.synchronize(cr, uid, server, object, context)
if object.action=='b':
time.sleep(1)
dt = time.strftime('%Y-%m-%d %H:%M:%S')
- pool.get('base.synchro.obj').write(cr, uid, [object.id], {'synchronize_date': dt})
- cr.commit()
+ self.pool.get('base.synchro.obj').write(cr, uid, [object.id], {'synchronize_date': dt})
end_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
- if 'user_id' in data['form'] and data['form']['user_id']:
+ if 'user_id' in syn_obj.user_id:
request = pooler.get_pool(cr.dbname).get('res.request')
if not self.report:
self.report.append('No exception.')
@@ -248,32 +245,26 @@ Exceptions:
request.create(cr, uid, {
'name' : "Synchronization report",
'act_from' : uid,
- 'act_to' : data['form']['user_id'],
+ 'act_to' : syn_obj.user_id,
'body': summary,
})
- cr.commit()
- cr.close()
- return 'finish'
+ return True
- def _upload_download_multi_thread(self, cr, uid, data, context):
- threaded_synchronization = threading.Thread(target=self._upload_download, args=(cr.dbname, uid, data, context))
- threaded_synchronization.start()
- return 'finish'
-
- states = {
- 'init': {
- 'actions': [],
- 'result': {'type':'form', 'arch':acc_synchro_form, 'fields':acc_synchro_fields, 'state':[('end','Cancel'),('upload_download','Synchronize')]}
- },
- 'upload_download': {
- 'actions': [],
- 'result':{'type':'choice', 'next_state': _upload_download_multi_thread}
- },
- 'finish': {
- 'actions': [],
- 'result':{'type':'form', 'arch':finish_form,'fields':{},'state':[('end','Ok')]}
- },
- }
-wizard_cost_account_synchro('account.analytic.account.transfer')
+ def upload_download_multi_thread(self, cr, uid, data, context):
+ threaded_synchronization = threading.Thread(target=self.upload_download, args=(cr, uid, data, context))
+ threaded_synchronization.run()
+ data_obj = self.pool.get('ir.model.data')
+ id2 = data_obj._get_id(cr, uid, 'base_synchro', 'view_base_synchro_finish')
+ if id2:
+ id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+ return {
+ 'view_type': 'form',
+ 'view_mode': 'form',
+ 'res_model': 'base.synchro',
+ 'views': [(id2, 'form')],
+ 'view_id': False,
+ 'type': 'ir.actions.act_window',
+ 'target': 'new',
+ }
+base_synchro()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_synchro/wizard/base_synchro_view.xml b/addons/base_synchro/wizard/base_synchro_view.xml
new file mode 100644
index 00000000000..08aaeff9c32
--- /dev/null
+++ b/addons/base_synchro/wizard/base_synchro_view.xml
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+ Base Synchronization
+ base.synchro
+ form
+
+
+
+
+
+
+ Base Synchronization
+ ir.actions.act_window
+ base.synchro
+ form
+ form
+ new
+
+
+
+
+ Base Synchronization
+ base.synchro
+ form
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/base_vat/i18n/nb.po b/addons/base_vat/i18n/nb.po
index bc079d52f52..cd01e5c6f95 100644
--- a/addons/base_vat/i18n/nb.po
+++ b/addons/base_vat/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 03:16+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-09-29 10:56+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Norwegian Bokmal \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:39+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_vat
diff --git a/addons/board/i18n/mn.po b/addons/board/i18n/mn.po
index 7f4fd38c088..c1ecad3512f 100644
--- a/addons/board/i18n/mn.po
+++ b/addons/board/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-13 07:50+0000\n"
-"Last-Translator: sugi \n"
+"PO-Revision-Date: 2010-09-29 11:05+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board
diff --git a/addons/claim_from_delivery/i18n/ru.po b/addons/claim_from_delivery/i18n/ru.po
new file mode 100644
index 00000000000..2d5b27ce972
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/ru.po
@@ -0,0 +1,61 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-08-20 12:02+0000\n"
+"PO-Revision-Date: 2010-09-29 13:45+0000\n"
+"Last-Translator: Chertykov Denis \n"
+"Language-Team: Russian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "Претензия"
+
+#. module: claim_from_delivery
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
+
+#. module: claim_from_delivery
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_ и не должно содержать специальных "
+"символов !"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,description:claim_from_delivery.module_meta_information
+msgid "Create Claim from delivery order:\n"
+msgstr "Создать претензию из заказа на доставку:\n"
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr "Претензия из доставки"
+
+#. module: claim_from_delivery
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Недопустимое имя модели в определении действия."
+
+#. module: claim_from_delivery
+#: model:ir.model,name:claim_from_delivery.model_stock_picking
+msgid "Picking List"
+msgstr "Отборочный лист"
+
+#. module: claim_from_delivery
+#: field:stock.picking,partner_id:0
+msgid "Partner"
+msgstr "Партнер"
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index ee778401e4a..263339c7121 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -23,7 +23,6 @@ from osv import fields, osv
from datetime import datetime
import crm
import time
-import mx.DateTime
from tools.translate import _
from crm import crm_case
import binascii
@@ -84,12 +83,12 @@ class crm_lead(crm_case, osv.osv):
new_dates = cal_obj.interval_get(cr,
uid,
lead.section_id.resource_calendar_id and lead.section_id.resource_calendar_id.id or False,
- mx.DateTime.strptime(lead.create_date, '%Y-%m-%d %H:%M:%S'),
+ datetime.strptime(lead.create_date, '%Y-%m-%d %H:%M:%S'),
duration,
resource=resource_id
)
no_days = []
- date_until = mx.DateTime.strptime(date_until, '%Y-%m-%d %H:%M:%S')
+ date_until = datetime.strptime(date_until, '%Y-%m-%d %H:%M:%S')
for in_time, out_time in new_dates:
if in_time.date not in no_days:
no_days.append(in_time.date)
@@ -127,8 +126,8 @@ class crm_lead(crm_case, osv.osv):
'contact_name': fields.char('Contact Name', size=64),
'partner_name': fields.char("Partner Name", size=64),
- 'optin': fields.boolean('Opt-In'),
- 'optout': fields.boolean('Opt-Out'),
+ 'optin': fields.boolean('Opt-In', help="If opt-in is checked, this contact has accepted to receive emails."),
+ 'optout': fields.boolean('Opt-Out', help="If opt-out is checked, this contact has refused to receive emails or unsubscribed to a campaign."),
'type':fields.selection([
('lead','Lead'),
('opportunity','Opportunity'),
@@ -186,14 +185,16 @@ class crm_lead(crm_case, osv.osv):
@param *args: Give Tuple Value
"""
old_state = self.read(cr, uid, ids, ['state'])[0]['state']
+ old_stage_id = self.read(cr, uid, ids, ['stage_id'])[0]['stage_id']
res = super(crm_lead, self).case_open(cr, uid, ids, *args)
if old_state == 'draft':
- stage_id = super(crm_lead, self).stage_next(cr, uid, ids, *args)
- if stage_id:
- value = self.onchange_stage_id(cr, uid, ids, stage_id, context={})['value']
- else:
- value = {}
- value.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S'), 'stage_id': stage_id})
+ value = {}
+ if not old_stage_id:
+ stage_id = super(crm_lead, self).stage_next(cr, uid, ids, *args)
+ if stage_id:
+ value.update({'stage_id': stage_id})
+ value.update(self.onchange_stage_id(cr, uid, ids, stage_id, context={})['value'])
+ value.update({'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
self.write(cr, uid, ids, value)
for (id, name) in self.name_get(cr, uid, ids):
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 65daf5d79d5..b98d26a0e6e 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -8,9 +8,8 @@
tree,form
['|', ('type','=','lead'), ('type','=',False)]
- {"search_default_user_id":uid,'search_default_current':1}
- {'search_default_current':1, 'default_type': 'lead', 'search_default_section_id':section_id}
+ {'search_default_current':1, 'default_type': 'lead', 'search_default_section_id': section_id}
A lead is a first, unqualified, contact with a new prospect. Use leads when you import a database of prospects or integrate your website's contact form with OpenERP. After having been qualified, the lead can be converted to a partner and a business opportunity for a further detailed tracking of the related activities.
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 40317a4b188..25765c21dc3 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -111,7 +111,7 @@
-