From 4dd0244aff71a81ef29aed7906c3057addc2b923 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Mon, 25 Jan 2010 04:48:58 +0000
Subject: [PATCH 01/34] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100124045044-cd6qa2bqojh2b4lg
bzr revid: codehost@crowberry-20100125044858-0dhq0ot3a9j4dfxh
---
 addons/account/i18n/hu.po      |  2 +-
 addons/auction/i18n/pt_BR.po   |  2 +-
 addons/base_contact/i18n/tr.po | 18 ++++----
 addons/base_setup/i18n/tr.po   |  8 ++--
 addons/crm/i18n/pt.po          |  2 +-
 addons/crm/i18n/pt_BR.po       | 18 ++++----
 addons/product/i18n/fr.po      | 12 +++---
 addons/product/i18n/hu.po      |  2 +-
 addons/sale_crm/i18n/tr.po     | 78 +++++++++++++++++-----------------
 9 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index ec574925a9d..629d46d10c3 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-23 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-01-24 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index 5d7c1dfe6bb..9cd95c4bc2e 100644
--- a/addons/auction/i18n/pt_BR.po
+++ b/addons/auction/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-23 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-01-24 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index a20c496d34c..670d6329fbd 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/i18n/tr.po
@@ -7,30 +7,30 @@ 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: 2009-02-03 17:44+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-24 18:48+0000\n"
+"Last-Translator: Oktay Altunergil <oktaya@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: 2009-12-16 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-01-25 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr ""
+msgstr "Bağlantı Sırası"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
 msgid "res.partner.contact"
-msgstr ""
+msgstr "res.partner.contact"
 
 #. module: base_contact
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Nesne adı x_ ile başlamalı ve özel karakterler içermemelidir!"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
@@ -45,7 +45,7 @@ msgstr ""
 #: view:res.partner.address:0
 #: field:res.partner.address,job_ids:0
 msgid "Contacts"
-msgstr "Kişiler"
+msgstr "Bağlantılar"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
@@ -55,7 +55,7 @@ msgstr ""
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr ""
+msgstr "Güncel"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
@@ -70,7 +70,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.job,other:0
 msgid "Other"
-msgstr ""
+msgstr "Diğer"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 9b148f60e86..b1c018e705a 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.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: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-01-24 18:52+0000\n"
+"Last-Translator: Oktay Altunergil <oktaya@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: 2009-12-16 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-01-25 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -84,7 +84,7 @@ msgstr ""
 #: wizard_field:base_setup.base_setup,init,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
 msgid "State"
-msgstr ""
+msgstr "Eyalet"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index cd47945a175..0382786e3b6 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-23 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-01-24 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 097de0ff95d..7f9365e1f6d 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-01-22 16:14+0000\n"
+"PO-Revision-Date: 2010-01-23 18:58+0000\n"
 "Last-Translator: pedrobom <pedrobomlimeira@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-01-23 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-01-24 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -1051,13 +1051,13 @@ msgstr ""
 #. module: crm
 #: wizard_field:crm.new.send.mail,init,state:0
 msgid "Set State to"
-msgstr ""
+msgstr "Define Estado para"
 
 #. module: crm
 #: code:addons/crm/wizard/wizard_crm_send_email.py:0
 #, python-format
 msgid "There is no mail to reply!"
-msgstr ""
+msgstr "Não há email para resposta!"
 
 #. module: crm
 #: wizard_button:crm.job.partner_create,init,confirm:0
@@ -1082,7 +1082,7 @@ msgstr "%(case_description)s = Descrição de Caso"
 #. module: crm
 #: view:crm.fundraising:0
 msgid "My Funds"
-msgstr ""
+msgstr "Meus Fundos"
 
 #. module: crm
 #: field:crm.case,partner_mobile:0
@@ -1108,12 +1108,12 @@ msgstr "Processo Histórico"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_job2
 msgid "Junior Developer"
-msgstr ""
+msgstr "Desenvolvedor júnior"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Minhas Reuniões"
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1123,7 +1123,7 @@ msgstr "Nome da Categoria do Case"
 #. module: crm
 #: model:crm.case.category2,name:crm.category_claim2
 msgid "Preventive"
-msgstr ""
+msgstr "Preventivo"
 
 #. module: crm
 #: field:crm.case.rule,act_email_cc:0
@@ -1161,7 +1161,7 @@ msgstr ""
 #: view:crm.meeting:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "Reuniões"
 
 #. module: crm
 #: view:crm.case.rule:0
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index aaa1dcef76f..4803a5a1d7e 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 11:11+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-23 16:46+0000\n"
+"Last-Translator: Sebastien LANGE - http://www.Syleam.fr <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-01-24 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -105,11 +105,11 @@ msgstr "Intervention senior sur site"
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid ""
-"The minimal quantity to purchase for this supplier, expressed in the purchase "
+"The minimal quantity to purchase for this supplier, expressed in the default "
 "unit of measure."
 msgstr ""
 "La quantité minimum d'achat pour ce fournisseur, exprimée dans l'unité de "
-"mesure d'achat"
+"mesure par défaut"
 
 #. module: product
 #: field:product.template,weight_net:0
@@ -213,7 +213,7 @@ msgstr "Société"
 #. module: product
 #: field:product.template,rental:0
 msgid "Rentable Product"
-msgstr "Produit Rentable"
+msgstr "Peut être loué"
 
 #. module: product
 #: field:product.product,lst_price:0
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index b8b1d128f5b..00d25a8f20d 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-23 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-01-24 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/sale_crm/i18n/tr.po b/addons/sale_crm/i18n/tr.po
index 2fbea4c132f..b852191caf6 100644
--- a/addons/sale_crm/i18n/tr.po
+++ b/addons/sale_crm/i18n/tr.po
@@ -7,39 +7,39 @@ 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: 2009-02-03 20:54+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-01-24 18:09+0000\n"
+"Last-Translator: Oktay Altunergil <oktaya@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: 2009-12-16 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-01-25 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_crmopportunityquotation
 msgid "Crm opportunity quotation"
-msgstr ""
+msgstr "CRM Fırsat Teklifi"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityanalytic0
 msgid "Opportunity Analytic"
-msgstr ""
+msgstr "Fırsat Analitiği"
 
 #. module: sale_crm
 #: help:crm.case.make_order,init,partner_id:0
 msgid "Use this partner if there is no partner on the case"
-msgstr ""
+msgstr "Olaya bağlı ortak yoksa bu ortağı kullan"
 
 #. module: sale_crm
 #: wizard_button:sale_crm.make_case,init,create:0
 msgid "Create"
-msgstr ""
+msgstr "Oluştur"
 
 #. module: sale_crm
 #: selection:crm.case.make_order,init,picking_policy:0
 msgid "All at once"
-msgstr ""
+msgstr "Hepsi birden"
 
 #. module: sale_crm
 #: constraint:ir.ui.view:0
@@ -49,158 +49,158 @@ msgstr "Görüntüleme mimarisi için Geçersiz XML"
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_crmopportunityquotation
 msgid "Opportunity goes into the quotation"
-msgstr ""
+msgstr "Fırsat teklife gider"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractanalytic0
 msgid "Analytic account"
-msgstr ""
+msgstr "Analitik Hesap"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmquotation0
 msgid "Convert opportunity to quotation"
-msgstr ""
+msgstr "Fırsatı teklife dönüştür"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,description:0
 msgid "Your action"
-msgstr ""
+msgstr "Eyleminiz"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,picking_policy:0
 msgid "Packing Policy"
-msgstr ""
+msgstr "Picking Policy"
 
 #. module: sale_crm
 #: wizard_button:crm.case.make_order,init,order:0
 msgid "Create Quote"
-msgstr ""
+msgstr "Teklif Oluştur"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractpricelist0
 msgid "Contract Volume (pricelist)"
-msgstr ""
+msgstr "Sözleşme Miktarı (fiyat listesi)"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmopportunity0
 msgid "CRM Opportunity"
-msgstr ""
+msgstr "CRM Fırsatı"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Sale CRM Stuff"
-msgstr ""
+msgstr "Sale CRM Stuff"
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity convert into quotation"
-msgstr ""
+msgstr "Fırsatı teklife çevir"
 
 #. module: sale_crm
 #: selection:crm.case.make_order,init,picking_policy:0
 msgid "Direct Delivery"
-msgstr ""
+msgstr "Direk Teslim"
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity Quotation"
-msgstr ""
+msgstr "Fırsat Teklifi"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmquotation0
 msgid "Quotation"
-msgstr ""
+msgstr "Teklif"
 
 #. module: sale_crm
 #: view:crm.case:0
 #: wizard_view:crm.case.make_order,init:0
 msgid "Convert to Quote"
-msgstr ""
+msgstr "Teklife Dönüştür"
 
 #. module: sale_crm
 #: help:crm.case.make_order,init,close:0
 msgid "Check this to close the case after having created the sale order."
-msgstr ""
+msgstr "Satış emrini oluşturduktan sonra olayı kapatmak için seçiniz."
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Müşteri"
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunitypricelist0
 msgid "Opporunity convert to the Pricelist"
-msgstr ""
+msgstr "Fırsatı Fiyat Listesine çevir"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,user:0
 msgid "User Responsible"
-msgstr ""
+msgstr "Sorumlu Kullanıcı"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractanalytic0
 msgid "Reflect the contract made with customer"
-msgstr ""
+msgstr "Müşteri ile yapılan sözleşmeye göre göster"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,products:0
 msgid "Products"
-msgstr ""
+msgstr "Ürünler"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,close:0
 msgid "Close Case"
-msgstr ""
+msgstr "Olay Kapat"
 
 #. module: sale_crm
 #: model:ir.actions.wizard,name:sale_crm.sale_crm_make_case_wizard
 #: wizard_view:sale_crm.make_case,init:0
 msgid "Make Case"
-msgstr ""
+msgstr "Olay Yap"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,shop_id:0
 msgid "Shop"
-msgstr ""
+msgstr "Mağaza"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmopportunity0
 msgid "The CRM Opportunity can lead to a quotation."
-msgstr ""
+msgstr "CRM Fırsatı teklifle sonuçlanabilir."
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunitypricelist0
 msgid "Opportunity Pricelist"
-msgstr ""
+msgstr "Fırsat Teklifi"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractpricelist0
 msgid "Contract Pricelist"
-msgstr ""
+msgstr "Sözleşme Fiyat Listesi"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,name:0
 msgid "Case Description"
-msgstr ""
+msgstr "Olay Tanımı"
 
 #. module: sale_crm
 #: wizard_field:crm.case.make_order,init,analytic_account:0
 #: model:process.transition,note:sale_crm.process_transition_opportunityanalytic0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analitik Hesap"
 
 #. module: sale_crm
 #: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard
 msgid "Make Quotation"
-msgstr ""
+msgstr "Teklif Ver"
 
 #. module: sale_crm
 #: wizard_button:crm.case.make_order,init,end:0
 #: wizard_button:sale_crm.make_case,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Vazgeç"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,section:0
 msgid "Case Section"
-msgstr ""
+msgstr "Olay Bölümü"

From ca6bb60ec9c9fb00fb5b2d93aa09887b0f47282a Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 25 Jan 2010 10:52:23 +0530
Subject: [PATCH 02/34] document_change: Add the field in directory_id and
 templated id in document_change view

bzr revid: sbh@tinyerp.com-20100125052223-kssplh9a5ldxqe86
---
 addons/document_change/document_change.py       | 1 +
 addons/document_change/document_change_view.xml | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index 33aa7c73878..990380ea296 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -36,6 +36,7 @@ class document_change_type(osv.osv):
     _columns = {
         'name': fields.char("Document Change Type", size=64,required=True),
         'phase_type_ids': fields.many2many('document.change.process.phase.type','document_type_phase_type_rel','document_type_id','phase_type_id','Phase Type'),
+        'directory_id' :fields.many2one('document.directory','Directory'),        
         'template_document_id':fields.many2one('ir.attachment','Document')
     }
 document_change_type()
diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index 9d66714035d..8d1c825a8c8 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -74,6 +74,8 @@
         <field name="arch" type="xml">
             <form string="Document Types">
                 <field name="name" select="1"/>
+                <field name="directory_id"/>      
+				<field name ="template_document_id"/>                    
                 <separator string="Associated Phase Types" colspan="4"/>
                 <field name="phase_type_ids" colspan="4" nolabel="1"/>  
             </form>
@@ -86,7 +88,9 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Document Types">
-                <field name="name"/>                              
+                <field name="name"/>      
+                <field name="directory_id"/>      
+				<field name ="template_document_id"/>                                            
             </tree>
         </field>
     </record>

From 27044ea0a75b677ecbdbd88f6b4911feef4b9752 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 25 Jan 2010 11:16:13 +0530
Subject: [PATCH 03/34] [IMP]: Caldav: Improvement in export/import ics mapping

bzr revid: rpa@openerp.co.in-20100125054613-owvxxvorfkegl3l2
---
 addons/base_calendar/base_calendar.py             |  5 +++++
 addons/caldav/caldav_data.xml                     |  9 +--------
 addons/crm/crm_meeting_data.xml                   |  6 ++++++
 addons/project_calendar/project_calendar_data.xml | 10 ++++++++--
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 51b761250c5..a370ce9b64b 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -23,6 +23,7 @@ from datetime import datetime, timedelta
 from dateutil import parser
 from dateutil.rrule import *
 from osv import osv, fields
+from tools.translate import _
 import base64
 import pooler
 import re
@@ -177,6 +178,10 @@ class CalDAV(object):
         return vals
 
     def create_ics(self, cr, uid, datas, name, ical, context=None):
+        if not datas:
+            model = context.get('model', None)
+            war_str = "No data available" + (model and " for " + model) or "" 
+            raise osv.except_osv(_('Warning !'), _(war_str))
         for data in datas:
             vevent = ical.add(name)
             for field in self.__attribute__.keys():
diff --git a/addons/caldav/caldav_data.xml b/addons/caldav/caldav_data.xml
index fb464ab95d7..b909bf1dc82 100644
--- a/addons/caldav/caldav_data.xml
+++ b/addons/caldav/caldav_data.xml
@@ -340,13 +340,6 @@
     <field name="fn">field</field>
 </record>
 
-<record model="basic.calendar.fields" id="map_todo_10">
-    <field name="name" ref="base_calendar.field_todo_due"/>
-    <field name="type_id" ref="caldav.calendar_lines_todo" />
-	<field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
-</record>
-
 <record model="basic.calendar.fields" id="map_todo_11">
     <field name="name" ref="base_calendar.field_todo_summary"/>
     <field name="type_id" ref="caldav.calendar_lines_todo" />
@@ -379,7 +372,7 @@
     <field name="name" ref="base_calendar.field_todo_duration"/>
     <field name="type_id" ref="caldav.calendar_lines_todo" />
 	<field name="field_id" search="[('name','=','planned_hours'),('model_id.model','=','calendar.todo')]" />
-    <field name="fn">field</field>
+    <field name="fn">hours</field>
 </record>
 
 <record model="basic.calendar.fields" id="map_todo_16">
diff --git a/addons/crm/crm_meeting_data.xml b/addons/crm/crm_meeting_data.xml
index 035a5c30175..e13346aed8a 100644
--- a/addons/crm/crm_meeting_data.xml
+++ b/addons/crm/crm_meeting_data.xml
@@ -27,6 +27,12 @@
 	        <field name="object">crm.meeting</field>
 	    </record>
 
+		<record model="basic.calendar.lines" id="caldav.calendar_lines_event">
+			<field name="name">vevent</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','crm.meeting')]" />
+		</record>
+		
 
 <!--		Event Attribute mapping-->
 
diff --git a/addons/project_calendar/project_calendar_data.xml b/addons/project_calendar/project_calendar_data.xml
index b78931381b3..176feddd76f 100644
--- a/addons/project_calendar/project_calendar_data.xml
+++ b/addons/project_calendar/project_calendar_data.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
 	<data noupdate="1">
-
+		
+		<record model="basic.calendar.lines" id="caldav.calendar_lines_todo">
+			<field name="name">vtodo</field>
+			<field name="calendar_id" ref="base_calendar.basic_calendar1" />
+			<field name="object_id" search="[('model','=','project.task')]" />
+		</record>
+		
 		<record model="basic.calendar.fields" id="caldav.map_todo_1">
 			<field name="name" ref="base_calendar.field_todo_status" />
 			<field name="type_id" ref="caldav.calendar_lines_todo" />
@@ -35,7 +41,7 @@
 		    <field name="name" ref="base_calendar.field_todo_duration"/>
 		    <field name="type_id" ref="caldav.calendar_lines_todo" />
 			<field name="field_id" search="[('name','=','planned_hours'),('model_id.model','=','project.task')]" />
-			<field name="fn">field</field>
+			<field name="fn">hours</field>
 		</record>
 		
 	</data>

From f81dc986d70b3465626ecbd06b9bbae969fb72e3 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 25 Jan 2010 11:20:29 +0530
Subject: [PATCH 04/34] [ADD]: Added Data file for document_change.

bzr revid: uco@tinyerp.co.in-20100125055029-esvb7lll31b4vuoa
---
 addons/document_change/__terp__.py            |   2 +-
 .../document_change/document_change_data.xml  | 151 ++++++++++++++++++
 2 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100644 addons/document_change/document_change_data.xml

diff --git a/addons/document_change/__terp__.py b/addons/document_change/__terp__.py
index ae230e0bdef..f18fe0edbd1 100644
--- a/addons/document_change/__terp__.py
+++ b/addons/document_change/__terp__.py
@@ -31,7 +31,7 @@
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'document_ftp','mail_gateway'],
-    'init_xml': [],
+    'init_xml': ['document_change_data.xml'],
     'update_xml': ['document_change_view.xml',
                    'document_change_sequence.xml',
                    'document_change_workflow.xml',
diff --git a/addons/document_change/document_change_data.xml b/addons/document_change/document_change_data.xml
new file mode 100644
index 00000000000..0cc2f2ef3c3
--- /dev/null
+++ b/addons/document_change/document_change_data.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0"?>
+<openerp>
+<data noupdate="1">
+	
+	<!-- Structure Data -->
+	<record model="document.directory" id="dir_root">
+        <field name="name">Gosselies</field>
+    </record>
+    <record model="document.directory" id="dir_bat_e">
+        <field name="name">Bat E</field>
+    	<field name="parent_id" ref="dir_root"/>
+    </record>
+    <record model="document.directory" id="dir_bat_z">
+        <field name="name">Bat Z</field>
+    	<field name="parent_id" ref="dir_root"/>
+    </record>
+    
+    <record model="document.directory" id="dir_mq_section">
+        <field name="name">MQ Section</field>
+        <field name="parent_id" ref="dir_bat_e"/>
+    </record>
+    
+    <record model="document.directory" id="dir_section_x">
+        <field name="name">Section X</field>
+        <field name="parent_id" ref="dir_mq_section"/>
+    </record>
+    <record model="document.directory" id="dir_section_y">
+        <field name="name">Section Y</field>
+        <field name="parent_id" ref="dir_mq_section"/>
+    </record>
+    
+    <record model="document.directory" id="dir_ws_1bc">
+        <field name="name">Work Station 1BC</field>
+        <field name="parent_id" ref="dir_section_x"/>
+    </record>
+    <record model="document.directory" id="dir_ws_2bc">
+        <field name="name">Work Station 2BC</field>
+        <field name="parent_id" ref="dir_section_x"/>
+    </record>
+    <record model="document.directory" id="dir_ws_3bc">
+        <field name="name">Work Station 3BC</field>
+        <field name="parent_id" ref="dir_section_y"/>
+    </record>
+    
+    <record model="document.directory" id="dir_family1">
+        <field name="name">Family 1</field>
+        <field name="parent_id" ref="dir_ws_1bc"/>
+    </record>
+    <record model="document.directory" id="dir_family2">
+        <field name="name">Family 2</field>
+        <field name="parent_id" ref="dir_ws_1bc"/>
+    </record>
+    <record model="document.directory" id="dir_family3">
+        <field name="name">Family 3</field>
+        <field name="parent_id" ref="dir_ws_2bc"/>
+    </record>
+    <record model="document.directory" id="dir_family4">
+        <field name="name">Family 4</field>
+        <field name="parent_id" ref="dir_ws_3bc"/>
+    </record>
+    
+    <record model="document.directory" id="dir_vsm">
+        <field name="name">VSM</field>
+        <field name="parent_id" ref="dir_bat_z"/>
+    </record>
+    <record model="document.directory" id="dir_takt_time">
+        <field name="name">Takt Time</field>
+        <field name="parent_id" ref="dir_bat_z"/>
+    </record>
+
+	<!-- Documents -->
+	<record model="ir.attachment" id="doc_FIE_05466_001">
+        <field name="name">FIE_05466_001</field>
+        <field name="datas_fname">FIE_05466_001.xls</field>
+        <field name="parent_id" ref="dir_root"/>
+    </record>
+    <record model="ir.attachment" id="doc_SFMEA_0581_001">
+        <field name="name">SFMEA_0581_001</field>
+        <field name="datas_fname">SFMEA_0581_001.xls</field>
+        <field name="parent_id" ref="dir_root"/>
+    </record>
+    <record model="ir.attachment" id="doc_SFMEA_0581_002">
+        <field name="name">SFMEA_0581_002</field>
+        <field name="datas_fname">SFMEA_0581_002.xls</field>
+        <field name="parent_id" ref="dir_root"/>
+    </record>
+    <record model="ir.attachment" id="doc_TaktTime_0549">
+        <field name="name">TaktTime_0549</field>
+        <field name="datas_fname">TaktTime_0549.xls</field>
+        <field name="parent_id" ref="dir_takt_time"/>
+    </record>
+	
+	<!-- Document Change Types -->
+	<record model="document.change.type" id="type_project_charter">
+        <field name="name">Project Charter</field>
+    </record>
+    <record model="document.change.type" id="type_vsm">
+        <field name="name">VSM</field>
+    </record>
+	<record model="document.change.type" id="type_takt_time">
+        <field name="name">Takt Time</field>
+    </record>
+    <record model="document.change.type" id="type_FIE">
+        <field name="name">FIE</field>
+    </record>
+    <record model="document.change.type" id="type_SFMEA">
+        <field name="name">SFMEA</field>
+    </record>
+
+	<!-- Phase Types -->
+	<record model="document.change.process.phase.type" id="phase_type_concept">
+        <field name="name">Concept</field>
+        <field name="sequence">1</field>
+        <field name="document_type_ids" eval="[(6, 0, [ref('type_project_charter'),ref('type_vsm'),ref('type_takt_time')])]"/>
+    </record>
+    <record model="document.change.process.phase.type" id="phase_type_development">
+        <field name="name">Development</field>
+        <field name="sequence">2</field>
+        <field name="document_type_ids" eval="[(6, 0, [ref('type_FIE'),ref('type_SFMEA')])]"/>
+    </record>
+    <record model="document.change.process.phase.type" id="phase_type_validation">
+        <field name="name">Validation</field>
+        <field name="sequence">3</field>
+        <field name="document_type_ids" eval="[(6, 0, [ref('type_FIE'),ref('type_SFMEA')])]"/>
+    </record>
+
+	<!-- Change of Models Data -->
+	<record model="document.change.process.model" id="model_NPI">
+        <field name="name">NPI</field>
+        <field name="phase_type_ids" eval="[(6, 0, [ref('phase_type_concept'),ref('phase_type_development'),ref('phase_type_validation')])]"/>
+    </record>
+    <record model="document.change.process.model" id="model_minor_change">
+        <field name="name">Minor_change</field>
+        <field name="phase_type_ids" eval="[(6, 0, [ref('phase_type_concept'),ref('phase_type_development'),ref('phase_type_validation')])]"/>
+    </record>
+    
+	<!-- Process Types -->
+    <record model="document.change.process.type" id="process_quality_alert">
+    	<field name="name">Quality Alert</field>
+    </record>
+    <record model="document.change.process.type" id="process_new_product">
+    	<field name="name">New Product</field>
+    </record>
+    <record model="document.change.process.type" id="process_red_risk">
+    	<field name="name">Red Risk</field>
+    </record>
+    <record model="document.change.process.type" id="process_ci_card">
+    	<field name="name">CI Card</field>
+    </record>
+</data>
+</openerp>

From d5f77f8ec2781afef3a8d1d4466f05688068e1cb Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 25 Jan 2010 11:58:44 +0530
Subject: [PATCH 05/34] document_change:modfiy the reanme the field and modify
 the field of target_document

bzr revid: sbh@tinyerp.com-20100125062844-y88fsqok6s80vumk
---
 addons/document_change/document_change.py       | 6 +++---
 addons/document_change/document_change_view.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index 990380ea296..1711a7153c3 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -36,7 +36,7 @@ class document_change_type(osv.osv):
     _columns = {
         'name': fields.char("Document Change Type", size=64,required=True),
         'phase_type_ids': fields.many2many('document.change.process.phase.type','document_type_phase_type_rel','document_type_id','phase_type_id','Phase Type'),
-        'directory_id' :fields.many2one('document.directory','Directory'),        
+        'directory_id' :fields.many2one('document.directory','Pending Directory'),        
         'template_document_id':fields.many2one('ir.attachment','Document')
     }
 document_change_type()
@@ -213,8 +213,8 @@ class document_file(osv.osv):
     _columns = {
         'change_type_id':fields.many2one('document.change.type','Document Type'),
         'state': fields.selection([('in_production', 'In Production'), ('change_request', 'Change Request'),('change_propose', 'Change Proposed'), ('to_update', 'To Update'), ('cancel', 'Cancel')], 'State'),
-        'target_directory_id': fields.many2one('document.directory', 'Target Document'),
-        'target_document_id':fields.binary('Target'),
+        'target_document_id': fields.many2one('ir.attachment', 'Target Document'),
+        'target':fields.binary('Target'),
         'process_phase_id' :fields.many2one('document.change.process.phase','Process Phase'),
         'progress': fields.float('Progress'), #TODO : functio field: calculate progress
         'change_process_id': fields.related('process_phase_id', 'process_id', type='many2one', relation='document.change.process', string='Change Process'),
diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index 8d1c825a8c8..1d1811ee01a 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -248,8 +248,8 @@
 					<button name="button_cancel" states="change_request,change_propose" string="Cancel"  icon="gtk-cancel"/>
                 </group>
                 <newline/>
-                <field name="target_directory_id"/>
-                <field name="target_document_id"/>                
+                <field name="target_document_id"/>    
+				<field name="target"/>                            
                 <newline/>
                 <separator string="Change Note" colspan="4"/>
                 <field colspan="4" name="description" nolabel="1"/>

From e353b953365a8fa71989b9fb2a54d508a6ad1afc Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 25 Jan 2010 12:17:57 +0530
Subject: [PATCH 06/34] [IMP, ADD] document_change: Improved generate phases
 function. Added remaining data in data file.

bzr revid: uco@tinyerp.co.in-20100125064757-1puyniqyuat7j824
---
 addons/document_change/document_change.py     | 11 +++---
 .../document_change/document_change_data.xml  | 34 ++++++++++++++++---
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index 1711a7153c3..cafa5b8cb51 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -51,6 +51,9 @@ class doucment_change_process_phase_type(osv.osv):
         'active': fields.boolean('Active'),
         'document_type_ids': fields.many2many('document.change.type','phase_type_document_type_rel','phase_type_id','document_type_id','Document Type'),
     }
+    _defaults = {      
+                 'active': lambda *a:1,
+    }
 doucment_change_process_phase_type()
 
 class doucment_change_process(osv.osv):    
@@ -186,14 +189,14 @@ class doucment_change_process(osv.osv):
         for process in self.browse(cr, uid, ids):
             if process.process_model_id:
                 for phase_type_id in process.process_model_id.phase_type_ids:
-                    phase_type = phase_type_obj.browse(cr, uid, phase_type_id)
+                    phase_type = phase_type_obj.browse(cr, uid, phase_type_id.id)
                     phase_value = {
-                        'name' : '%s-%s' %(phase_type, process.name),
-                        'phase_type_id': phase_type_id,
+                        'name' : '%s-%s' %(phase_type.name, process.name),
+                        'phase_type_id': phase_type_id.id,
                         'process_id': process.id   
                         }            
                     phase_id = phase_obj.create(cr, uid, phase_value)
-                    cr.execute('select document_type_id from document_type_phase_type_rel where phase_type_id = %s' ,phase_type_id)
+                    cr.execute('select document_type_id from document_type_phase_type_rel where phase_type_id = %s' %phase_type_id.id)
                     document_type_ids = map(lambda x: x[0], cr.fetchall())
                     document_ids = document_obj.search(cr, uid, [
                             ('parent_id','=',process.structure_id and process.structure_id.id),
diff --git a/addons/document_change/document_change_data.xml b/addons/document_change/document_change_data.xml
index 0cc2f2ef3c3..1ed75b34042 100644
--- a/addons/document_change/document_change_data.xml
+++ b/addons/document_change/document_change_data.xml
@@ -69,6 +69,26 @@
     </record>
 
 	<!-- Documents -->
+	<record model="ir.attachment" id="doc_FIE_template">
+        <field name="name">FIE_template</field>
+        <field name="datas_fname">FIE_template.xls</field>
+        <field name="parent_id" ref="dir_root"/>
+    </record>
+    <record model="ir.attachment" id="doc_SFMEA_template">
+        <field name="name">SFMEA_template</field>
+        <field name="datas_fname">SFMEA_template.xls</field>
+        <field name="parent_id" ref="dir_root"/>
+    </record>
+    <record model="ir.attachment" id="doc_ProjectCharter_Template">
+        <field name="name">ProjectCharter_Template</field>
+        <field name="datas_fname">ProjectCharter_Template.ppt</field>
+        <field name="parent_id" ref="dir_root"/>
+    </record>
+    <record model="ir.attachment" id="doc_TaktTime_template">
+        <field name="name">TaktTime_template</field>
+        <field name="datas_fname">TaktTime_template.xls</field>
+        <field name="parent_id" ref="dir_takt_time"/>
+    </record>
 	<record model="ir.attachment" id="doc_FIE_05466_001">
         <field name="name">FIE_05466_001</field>
         <field name="datas_fname">FIE_05466_001.xls</field>
@@ -93,45 +113,49 @@
 	<!-- Document Change Types -->
 	<record model="document.change.type" id="type_project_charter">
         <field name="name">Project Charter</field>
+        <field name="template_document_id" ref="doc_ProjectCharter_Template"/>
     </record>
     <record model="document.change.type" id="type_vsm">
         <field name="name">VSM</field>
     </record>
 	<record model="document.change.type" id="type_takt_time">
         <field name="name">Takt Time</field>
+        <field name="template_document_id" ref="doc_TaktTime_template"/>
     </record>
     <record model="document.change.type" id="type_FIE">
         <field name="name">FIE</field>
+        <field name="template_document_id" ref="doc_FIE_template"/>
     </record>
     <record model="document.change.type" id="type_SFMEA">
         <field name="name">SFMEA</field>
+        <field name="template_document_id" ref="doc_SFMEA_template"/>
     </record>
 
 	<!-- Phase Types -->
 	<record model="document.change.process.phase.type" id="phase_type_concept">
         <field name="name">Concept</field>
         <field name="sequence">1</field>
-        <field name="document_type_ids" eval="[(6, 0, [ref('type_project_charter'),ref('type_vsm'),ref('type_takt_time')])]"/>
+        <field eval="[(6, 0, [ref('type_project_charter'),ref('type_vsm'),ref('type_takt_time')])]" name="document_type_ids"/>
     </record>
     <record model="document.change.process.phase.type" id="phase_type_development">
         <field name="name">Development</field>
         <field name="sequence">2</field>
-        <field name="document_type_ids" eval="[(6, 0, [ref('type_FIE'),ref('type_SFMEA')])]"/>
+        <field eval="[(6, 0, [ref('type_FIE'),ref('type_SFMEA')])]" name="document_type_ids"/>
     </record>
     <record model="document.change.process.phase.type" id="phase_type_validation">
         <field name="name">Validation</field>
         <field name="sequence">3</field>
-        <field name="document_type_ids" eval="[(6, 0, [ref('type_FIE'),ref('type_SFMEA')])]"/>
+        <field eval="[(6, 0, [ref('type_FIE'),ref('type_SFMEA')])]" name="document_type_ids"/>
     </record>
 
 	<!-- Change of Models Data -->
 	<record model="document.change.process.model" id="model_NPI">
         <field name="name">NPI</field>
-        <field name="phase_type_ids" eval="[(6, 0, [ref('phase_type_concept'),ref('phase_type_development'),ref('phase_type_validation')])]"/>
+        <field eval="[(6, 0, [ref('phase_type_concept'),ref('phase_type_development'),ref('phase_type_validation')])]" name="phase_type_ids"/>
     </record>
     <record model="document.change.process.model" id="model_minor_change">
         <field name="name">Minor_change</field>
-        <field name="phase_type_ids" eval="[(6, 0, [ref('phase_type_concept'),ref('phase_type_development'),ref('phase_type_validation')])]"/>
+        <field eval="[(6, 0, [ref('phase_type_development')])]" name="phase_type_ids"/>
     </record>
     
 	<!-- Process Types -->

From 5523a8ffce4b11a5f59a101b5f3b61eea1bee082 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 25 Jan 2010 12:28:32 +0530
Subject: [PATCH 07/34] [FIX] document_change: fixed domain problem in control
 menus

bzr revid: hmo@tinyerp.com-20100125065832-540s277g3qku8nq6
---
 addons/document_change/document_change_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index b5e2413aafa..591b84c5ce9 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -325,7 +325,7 @@
 	            <group expand="1" string="Group By..." col="20" colspan="4">
 	            	<filter domain="[]" string="By Owner" icon="terp-hr" context="{'group_by':'create_uid'}" help="Documents by owner"/>
 	            	<filter domain="[]" string="By Directory" icon="terp-hr" context="{'group_by':'parent_id'}" help="Documents by directory"/>
-	            	<filter domain="[]" string="By Type of Documents" icon="terp-hr" context="{'group_by':'type_id'}" help="Documents by type"/>
+	            	<filter domain="[]" string="By Type of Documents" icon="terp-hr" context="{'group_by':'change_type_id'}" help="Documents by type"/>
 	            </group>
             </search>
         </field>
@@ -367,7 +367,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_document_tree"/>
-        <field name="domain">[('type_id','=',',False)]</field>
+        <field name="domain">[('change_type_id','=',',False)]</field>
     </record>
     <menuitem action="action_document_without_type_form" id="menu_documents_without_type_form" parent="menu_change_control"/>
     
@@ -441,11 +441,11 @@
         <field name="name">Phases to Validate</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','draft')]</field>
+        <field name="domain">[('state','=','to_validate')]</field>
     </record>	
 	<menuitem action="action_process_phase_form_validate" id="menu_phases_to_validate_form" parent="menu_change_control"/>
 	
-	<act_window domain="[('type_id', '=', active_id)]" 
+	<act_window domain="[('change_type_id', '=', active_id)]" 
 		id="act_documents_phases" 
 		name="Documents" 
 		res_model="ir.attachment" 
@@ -591,7 +591,7 @@
         <field name="name">Process Changes to Validate</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('state','=','draft')]</field>
+        <field name="domain">[('state','=','to_validate')]</field>
     </record>	
 	<menuitem action="action_process_change_form_validate" id="menu_process_to_validate_form" parent="menu_change_control"/>
 	
@@ -601,7 +601,7 @@
 		res_model="document.change.process.phase" 
 		src_model="document.change.process"/>
 	
-	<act_window domain="[('type_id', '=', active_id)]" 
+	<act_window domain="[('change_type_id', '=', active_id)]" 
 		id="act_documents_change_process" 
 		name="Documents" 
 		res_model="ir.attachment" 

From 09b4e880766977c168707e1e39a62920966ad894 Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 25 Jan 2010 12:49:49 +0530
Subject: [PATCH 08/34] [IMP]:survey,crm_hr *Improved the demo data in crm_hr
 *improved the date format in survey browse report.

bzr revid: apa@tinyerp.com-20100125071949-de0xrrcyuhi8kv11
---
 addons/crm_hr/crm_hr_data.xml                  | 3 ++-
 addons/survey/report/survey_browse_response.py | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/crm_hr/crm_hr_data.xml b/addons/crm_hr/crm_hr_data.xml
index 8d8f6c2ee94..337e9f3af24 100644
--- a/addons/crm_hr/crm_hr_data.xml
+++ b/addons/crm_hr/crm_hr_data.xml
@@ -80,6 +80,7 @@
 		<record id="survey_job_0" model="survey">
 			<field name="title">Job Survey</field>
 			<field name="state">draft</field>
+			<field name="max_response_limit">20</field>
 			<field eval="[(6,0,[])]" name="users"/>
 		</record>
 	</data>
@@ -92,7 +93,7 @@
 	</data>
 	<data>
 		<record id="survey_page_job_1" model="survey.page">
-			<field name="title">Education &amp;amp; Activities</field>
+			<field name="title">Education &amp; Activities</field>
 			<field name="survey_id" ref="survey_job_0"/>
 			<field eval="2" name="sequence"/>
 		</record>
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 2d1d94c4b4e..93b9ec011f6 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -24,6 +24,7 @@ import pooler
 from report.interface import report_rml
 from tools import to_xml
 import tools
+import time
 
 class survey_browse_response(report_rml):
     def create(self, cr, uid, ids, datas, context):
@@ -162,7 +163,7 @@ class survey_browse_response(report_rml):
                                   <para style="terp_default_Centre_8">""" + to_xml(tools.ustr(survey.title)) + """</para>
                                 </td>
                                 <td>
-                                  <para style="terp_default_Centre_8">""" + to_xml(response.date_create) + """</para>
+                                  <para style="terp_default_Centre_8">""" + to_xml(time.strftime('%d-%m-%Y %I:%M:%S %p', time.strptime(response.date_create.split('.')[0], '%Y-%m-%d %H:%M:%S'))) + """</para>
                                 </td>
                                 <td>
                                   <para style="terp_default_Centre_8">""" + to_xml(response.user_id.name) + """</para>

From d73a262a17dea205d35f2570fbd376106bf0cef8 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 25 Jan 2010 12:53:15 +0530
Subject: [PATCH 09/34] [Fix] Problem related menus in
 auction,report_crm,report_sale,report_mrp

bzr revid: vir@tinyerp.com-20100125072315-6rq7ndxpzj1z8brn
---
 addons/auction/auction_wizard.xml          |   2 +-
 addons/crm_lp/Readme.txt                   |  18 +
 addons/crm_lp/__init__.py                  |  26 ++
 addons/crm_lp/__terp__.py                  |  45 ++
 addons/crm_lp/crm_lp.py                    | 462 +++++++++++++++++++++
 addons/crm_lp/crm_lp.xml                   | 136 ++++++
 addons/crm_lp/crm_lp_data.xml              |  16 +
 addons/crm_lp/crm_lp_wizard.xml            |  10 +
 addons/crm_lp/wizard/__init__.py           |  23 +
 addons/crm_lp/wizard/wizard_crm_lp_sync.py |  57 +++
 addons/report_crm/report_crm_view.xml      |   4 +-
 addons/report_mrp/report_mrp_view.xml      |  28 +-
 addons/report_sale/report_sale_graph.xml   |  20 +-
 addons/report_sale/report_sale_view.xml    |   9 +-
 14 files changed, 825 insertions(+), 31 deletions(-)
 create mode 100644 addons/crm_lp/Readme.txt
 create mode 100644 addons/crm_lp/__init__.py
 create mode 100644 addons/crm_lp/__terp__.py
 create mode 100644 addons/crm_lp/crm_lp.py
 create mode 100644 addons/crm_lp/crm_lp.xml
 create mode 100644 addons/crm_lp/crm_lp_data.xml
 create mode 100644 addons/crm_lp/crm_lp_wizard.xml
 create mode 100644 addons/crm_lp/wizard/__init__.py
 create mode 100644 addons/crm_lp/wizard/wizard_crm_lp_sync.py

diff --git a/addons/auction/auction_wizard.xml b/addons/auction/auction_wizard.xml
index 95c2ca16858..0a93799cc20 100644
--- a/addons/auction/auction_wizard.xml
+++ b/addons/auction/auction_wizard.xml
@@ -44,7 +44,7 @@
 
 	<menuitem name="Tools Bar Codes"
 		id="auction_outils_menu"
-		parent="auction_menu_root" sequence="6"
+		parent="auction_menu_root" sequence="5"
 		/>
 
 	<menuitem name="Deliveries Management"
diff --git a/addons/crm_lp/Readme.txt b/addons/crm_lp/Readme.txt
new file mode 100644
index 00000000000..aac47bc7ddd
--- /dev/null
+++ b/addons/crm_lp/Readme.txt
@@ -0,0 +1,18 @@
+Use:
+This module provide  synchronize  between lp bugs with openobject cases:
+- If First check the project name 
+	e.g "openobject-client"
+-Serach name in Launchpad and stored the bugs detail in CRM Bug Traking. 
+- Scheduler will call and update the bugs detail. 
+
+
+
+Installtion :
+
+python-launchpadlib must be installed
+
+Used the following link
+
+https://help.launchpad.net/API/launchpadlib#Installation
+
+ Linux :  sudo apt-get install python-launchpadlib
diff --git a/addons/crm_lp/__init__.py b/addons/crm_lp/__init__.py
new file mode 100644
index 00000000000..e8899620816
--- /dev/null
+++ b/addons/crm_lp/__init__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import crm_lp
+import wizard
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_lp/__terp__.py b/addons/crm_lp/__terp__.py
new file mode 100644
index 00000000000..2c016f00c3e
--- /dev/null
+++ b/addons/crm_lp/__terp__.py
@@ -0,0 +1,45 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+{
+    'name': 'Customer Relationship Management',
+    'version': '1.0',
+    'category': 'Generic Modules/CRM & SRM',
+    'description': """
+        This module provide  synchronize  between lp bugs with openobject cases
+    """,
+    'author': 'Tiny',
+    'website': 'http://www.openerp.com',
+    'depends': [ 'crm','project'],
+    'init_xml': [
+        #'crm_lp_data.xml',
+    ],
+    'update_xml': [
+        'crm_lp.xml',
+        'crm_lp_wizard.xml'],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+    'certificate': '',
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_lp/crm_lp.py b/addons/crm_lp/crm_lp.py
new file mode 100644
index 00000000000..161dde30bcb
--- /dev/null
+++ b/addons/crm_lp/crm_lp.py
@@ -0,0 +1,462 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import time
+import tools
+from osv import fields,osv,orm
+import pooler
+
+import mx.DateTime
+import base64
+from tools.translate import _
+from SimpleXMLRPCServer import SimpleXMLRPCServer
+from SimpleXMLRPCServer import SimpleXMLRPCRequestHandler
+import os
+import threading
+import pickle
+import time
+import sys
+import datetime
+
+try:
+    from launchpadlib.launchpad import Launchpad, EDGE_SERVICE_ROOT
+    from launchpadlib.credentials import Credentials
+except:
+    raise osv.except_osv('Warning!','Please install launchpadlib direction package from https://help.launchpad.net/API/launchpadlib#Installation ')
+
+class lpServer(threading.Thread):
+    launchpad = False
+
+    def __init__(self):
+        super(lpServer, self).__init__()
+        self.launchpad = self.get_lp()
+
+    def get_lp(self):
+        launchpad = False
+        cachedir = os.path.expanduser('~/.launchpadlib/cache')
+        if not os.path.exists(cachedir):
+                os.makedirs(cachedir,0700)
+        credfile = os.path.expanduser('~/.launchpadlib/credentials')
+        try:
+                credentials = Credentials()
+                credentials.load(open(credfile))
+                launchpad = Launchpad(credentials, EDGE_SERVICE_ROOT, cachedir)
+        except:
+                launchpad = Launchpad.get_token_and_login(sys.argv[0], EDGE_SERVICE_ROOT, cachedir)
+        return launchpad
+
+
+    def get_lp_bugs(self, projects):
+        launchpad = self.launchpad
+        res = {}
+        if not launchpad:
+            return res
+        if not isinstance(projects,list):
+            projects = [projects]
+
+        bug_status=[]
+        for project in projects:
+            result = {}
+            r = {}
+            lp_project = self.launchpad.projects[str(project)]
+            result['non-series'] = lp_project.searchTasks(status=bug_status)
+            if 'series' in lp_project.lp_collections:
+                for series in lp_project.series:
+                    result[series.name] = series.searchTasks()
+                bug_list=[]
+                for name, bugs in result.items():
+                    for bug in bugs:
+                        bug_list.append(bug)
+                res[project]=bug_list
+        return  res
+
+    def getProject(self, project):
+        try:
+            project = self.launchpad.projects[project]
+        except:
+            return None
+        return project
+
+    def getSeries(self, project):
+        lp_project = self.launchpad.projects[project]
+        if 'series' in lp_project.lp_collections:
+                return lp_project.series.entries
+        else:
+            return None
+
+    def getMilestones(self, project, ml):
+        lp_project =self.launchpad.projects[project]
+        if 'all_milestones' in lp_project.lp_collections:
+                temp = lp_project.all_milestones.entries
+                res = [item for item in temp if item['series_target_link'] == ml]
+                return res
+        else:
+            return None
+
+class project_project(osv.osv):
+    _inherit = "project.project"
+    _columns = {
+                'series_ids' : fields.one2many('project.series', 'project_id', 'LP Series'),
+                'milestone_ids' : fields.one2many('project.milestone', 'project_id', 'LP Milestone'),
+                'bugs_target': fields.char('Bugs Target', size=300),
+                'flag':fields.boolean('Synchronize Lp'),
+                }
+    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+        if vals.get('name' , False):
+            vals['bugs_target'] = "https://api.edge.launchpad.net/beta/" + vals['name']
+        return  super(osv.osv, self).write(cr, uid, ids, vals, context)
+
+project_project()
+
+class project_series(osv.osv):
+    _name="project.series"
+    _description="Project Series"
+    _columns={
+              'name':fields.char("Series Name",size=200, required=True, help="The name of the series"),
+              'status': fields.char("Status", size=100),
+              'summary': fields.char("Summary", size=1000, help="The summary should be a single short paragraph."),
+              'project_id': fields.many2one('project.project', 'LP Project', ondelete='cascade'),
+               'milestone_ids' : fields.one2many('project.milestone', 'series_id', 'LP Milestone'),
+              }
+project_series()
+
+class project_milestone(osv.osv):
+    _name="project.milestone"
+    _description= "Project milestone"
+    _columns={
+        'name':fields.char('Version', size=100,required=True),
+        'series_id':fields.many2one('project.series', 'Series', readonly=True,ondelete='cascade'),
+        'project_id': fields.many2one('project.project', 'Project', readonly=True),
+        'expect_date': fields.datetime('Expected Date', readonly=True),
+        }
+
+project_milestone()
+
+class crm_case(osv.osv):
+    _inherit = "crm.case"
+
+    _columns = {
+                'project_id': fields.many2one('project.project', 'Project'),
+                'bug_id': fields.integer('Bug ID',readonly=True),
+                'milestone_id': fields.many2one('project.milestone', 'Milestone'),
+                'bug_owner_id': fields.many2one('res.users', 'Bug Owner'),                
+                }
+
+    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+        attrs = ['stage_id', 'priority']
+        for attr in attrs:
+            if attr in vals:
+                vals['date_action_last'] = time.strftime('%Y-%m-%d %H:%M:%S')
+        result = super(osv.osv, self).write(cr, uid, ids, vals, context)
+        return result
+
+    def _check_bug(self, cr, uid, ids=False, context={}):
+        '''
+        Function called by the scheduler to process cases for date actions
+        Only works on not done and cancelled cases
+        '''
+        val={}
+        pool=pooler.get_pool(cr.dbname)
+        sec_obj = pool.get('crm.case.section')
+        section_id = sec_obj.search(cr, uid, [('code', '=', 'BugSup')])
+        if section_id:
+            lp_server = lpServer()
+            self._create_bug(cr, uid, section_id,lp_server, context)
+            self._find_project_bug(cr,uid,section_id,lp_server)
+        return True
+
+    def _create_bug(self, cr, uid, section_id,lp_server=None,context={}):
+        pool=pooler.get_pool(cr.dbname)
+        case_stage= pool.get('crm.case.stage')
+        
+        crm_case_obj = pool.get('crm.case')
+        for sec_id in section_id:
+            crm_ids=crm_case_obj.search(cr,uid,[('bug_id','=',False),('section_id','=',sec_id),('project_id','!=',False)])
+            launchpad = lp_server.launchpad
+            if crm_ids:
+                for case in crm_case_obj.browse(cr,uid, crm_ids):
+                    title = case.name
+                    target = case.project_id.bugs_target
+                    if not target:
+                        target = "https://api.edge.launchpad.net/beta/" + case.project_id.name
+                    description=case.description
+                    b=launchpad.bugs.createBug(title=title, target=target, description=description)
+                    if b:
+                        bool = self.write(cr,uid,case.id,{'bug_id' : b.id},context=None)
+                        status='New'
+                        imp ='Undecided'
+                        if case.stage_id.name == 'Future' and case.priority == '5':
+                            imp = 'Wishlist'
+                        elif case.priority == '1':
+                            imp = 'High'
+                        elif case.priority == '3':
+                            imp = 'Medium'
+                        if case.stage_id.name == 'Fixed':
+                            status = 'Fix Released'
+                        if case.stage_id.id == 'Invalid':
+                            status = 'invalid'
+                        t=b.bug_tasks[0]
+                        t.status = status
+                        t.importance = imp
+                        t.lp_save()
+            return True
+            
+
+    def _find_project_bug(self, cr, uid,section_id,lp_server=None,context={}):
+
+        pool=pooler.get_pool(cr.dbname)
+        case_stage= pool.get('crm.case.stage')
+        for sec_id in section_id:
+            categ_fix_id=case_stage.search(cr, uid, [('section_id','=',sec_id),('name','=','Fixed')])[0]
+            categ_inv_id=case_stage.search(cr, uid, [('section_id','=',sec_id),('name','=','Invalid')])[0]
+            categ_future_id=case_stage.search(cr, uid, [('section_id','=',sec_id), ('name','=','Future')])[0]
+            categ_wfix_id=case_stage.search(cr, uid, [('section_id','=',sec_id),('name','=',"Won't fix")])[0]
+            val={}
+            res={}
+            series_ids=[]
+            prj = self.pool.get('project.project')
+            project_id=prj.search(cr,uid,[])
+            for prj_id in prj.browse(cr,uid, project_id):
+                project_name=str(prj_id.name)
+                lp_project = lp_server.getProject(project_name)
+                if lp_project and prj_id.flag:
+                    prjs=lp_server.get_lp_bugs(project_name)
+                    self._get_project_series( cr, uid,lp_project,prj_id.id,lp_server)
+                    for key, bugs in prjs.items():
+                            for bug in bugs:
+                                b_id = self.search(cr,uid,[('bug_id','=',bug.bug.id)])
+                                val['project_id']=prj_id.id
+                                val['description']=bug.bug.description                                
+                                val['bug_id']=bug.bug.id
+                                val['name']=bug.bug.title
+                                val['section_id']=sec_id
+                                owner = bug.owner
+                                parnter_rec=self.pool.get('res.partner')
+                                user_rec=self.pool.get('res.users')                                  
+                                partner_id = parnter_rec.search(cr,uid,[('name', '=',owner.display_name)])
+                                user_id = user_rec.search(cr,uid,[('login', '=',owner.name)])
+                                if not partner_id and not user_id :
+                                    res={} 
+                                    res['name']=owner.display_name
+                                    res['login']=owner.name
+                                    res['password']=owner.name
+                                    res['lp_login']=owner.name                                    
+                                    user_id = user_rec.create(cr,uid,res,context=context)                                    
+                                    partner_id = parnter_rec.create(cr, uid, {'name': owner.display_name,'user_id':user_id})
+                                else:
+                                    partner_id=  partner_id[0]
+                                    user_id=user_id[0] 
+                                if bug.assignee:
+                                    assing_id = user_rec.search(cr,uid,[('login', '=', bug.assignee.name)])
+                                    if assing_id:
+                                         val['user_id']=assing_id[0]
+                                    else: 
+                                        res={}
+                                        res['name']=bug.assignee.name
+                                        res['login']=bug.assignee.name
+                                        res['password']=bug.assignee.name
+                                        res['lp_login']=bug.assignee.name                                                             
+                                        assing_id = user_rec.create(cr,uid,res,context=context)
+                                        val['user_id']=assing_id                                          
+                                val['partner_id'] =partner_id                                           
+                                val['bug_owner_id']= user_id  
+                                if bug.importance == 'Wishlist':
+                                    val['stage_id']=categ_future_id
+                                    val['priority']='5'
+                                elif bug.importance == 'Critical':
+                                    val['priority']='1'
+                                    val['state']='open'                                    
+                                elif bug.importance=='High':
+                                    val['priority']='2'
+                                    val['state']='open'                                    
+                                elif bug.importance=='Medium':
+                                    val['priority']='3'
+                                    val['state']='open'                                    
+                                if bug.status =='Fix Released':
+                                    val['stage_id']=categ_fix_id
+                                    val['state']='done'
+                                if bug.status =='invaild':
+                                    val['stage_id']= val['stage_id']=categ_inv_id
+                                    val['state']='cancel'     
+                                if bug.status=='Confirmed':
+                                    val['state']='open'   
+                                if bug.milestone_link:
+                                    val['milestone_url']=bug.milestone_link
+                                    ml = bug.milestone_link.rsplit('/',1)[0]
+                                    ml_ids = self.pool.get('project.milestone').search(cr, uid, [('project_id','=',prj_id.id),('name','=', ml)])                          
+                                if not b_id:
+                                    bug_id=self.create(cr, uid, val,context=context)
+                                    self._check_state(cr, uid,[bug_id],val)     
+                                    self._store_bug_history(cr, uid , bug_id,bug,val['bug_owner_id'])                               
+                                if b_id:
+                                    crm_case = self.browse(cr,uid, b_id[0])
+                                    lp_last_up_time = str(bug.bug.date_last_updated).split('.')[0]
+                                    lp_last_up_timestamp = time.mktime(time.strptime(lp_last_up_time,"%Y-%m-%dT%H:%M:%S"))+ time.timezone
+                                    if not crm_case.date_action_last:
+                                        local_last_up_time=0
+                                        local_last_up_timestamp = 0
+                                        local_last_up_timestamp1=0
+                                    else:
+                                        local_last_up_time = str(crm_case.date_action_last).split('.')[0]
+                                        local_last_up_timestamp = time.mktime(time.strptime(local_last_up_time,"%Y-%m-%dT%H:%M:%S")) + time.timezone
+                                        local_last_up_timestamp1 = time.mktime(time.strptime(local_last_up_time,'%Y-%m-%dT%H:%M:%S'))
+    
+                                    args = (cr, uid, context, [sec_id], crm_case, bug, val)
+                                    if lp_last_up_timestamp >= local_last_up_timestamp:
+                                        self._update_local_record(*args)
+                                    elif lp_last_up_timestamp < local_last_up_timestamp:
+                                        self._update_lp_record(*args)
+                                cr.commit()
+        return True
+
+    def _get_project_series(self, cr, uid,lp_project,lp_project_id,lp_server=None,context={}):
+        pool=pooler.get_pool(cr.dbname)
+        all_series = lp_server.getSeries(lp_project)
+        if all_series:
+            prj_milestone_ids=[]
+            lp_series = pool.get('project.series')
+            for series in all_series:
+                res={}
+                ids = self.pool.get('project.series').search(cr, uid, [('project_id','=',lp_project_id),('name','=', series['name'])])
+                if not ids:                
+                    res['name'] = series['name']
+                    res['status'] = series['status']
+                    res['summary'] = series['summary']
+                    res['project_id'] = lp_project_id
+                    lp_series_id=lp_series.create(cr, uid, res,context=context)
+                    ml = series['all_milestones_collection_link'].rsplit('/',1)[0]
+                    cr.commit()
+                    self._get_project_milestone(cr, uid, lp_series_id,ml,lp_project,lp_project_id, lp_server)
+        return True
+
+    def _get_project_milestone(self, cr, uid,lp_series_id,milestone,lp_project,lp_project_id,lp_server=None,context={}):
+        pool=pooler.get_pool(cr.dbname)
+        res={}
+        all_milestones = lp_server.getMilestones(lp_project, milestone)
+        if all_milestones:
+            milestone_ids=[]
+            lp_milestones = pool.get('project.milestone')
+            for ms in all_milestones:
+                ids = self.pool.get('project.milestone').search(cr, uid, [('project_id','=',lp_project_id),('series_id','=',lp_series_id),('name','=', ms['name'])])
+                if not ids:
+                    res['name'] = ms['name']
+                    res['series_id'] = lp_series_id
+                    res['project_id'] = lp_project_id
+                    if ms['date_targeted']:
+                        res['expect_date'] = ms['date_targeted']
+                    lp_milestones_id=lp_milestones.create(cr, uid, res,context=context)
+                    cr.commit()
+        return True
+
+    def _update_local_record(self, cr, uid, context, sec_id, crm_bug, lp_bug, val):
+        pool=pooler.get_pool(cr.dbname)
+        case= pool.get('crm.case')
+        b=case.write(cr,uid,crm_bug.id,val,context=context)
+        if b:
+            case._check_state(cr, uid,[crm_bug.id],val)
+        return True
+
+    def _update_lp_record(self, cr, uid, context, sec_id, crm_bug, lp_bug, val):
+        pool=pooler.get_pool(cr.dbname)
+        case_stage= pool.get('crm.case.stage')
+
+        status='New'
+        imp ='Undecided'
+        if crm_bug.stage_id.name == 'Future' and crm_bug.priority == '5':
+            imp = 'Wishlist'
+        elif crm_bug.priority == '1':
+            imp = 'Critical'
+        elif crm_bug.priority == '2':
+            imp = 'High'
+        elif crm_bug.priority == '3':
+            imp = 'Medium'
+        if crm_bug.stage_id.name == 'Fixed':
+            status = 'Fix Released'
+        if crm_bug.stage_id.name == 'Invalid':
+            status = 'Invalid'
+        t=lp_bug.bug.bug_tasks[0]
+        t.status = status
+        t.importance = imp
+        t.lp_save()
+        return True
+    
+    def _check_state(self, cr, uid,bug_id,vals={}):
+        partner = self.pool.get('res.users').browse(cr, uid, uid).address_id.partner_id.id
+        if not vals['partner_id']:
+            vals['partner_id']=partner
+        if vals['state']=='open': 
+            self.case_open(cr,uid,bug_id) 
+        if vals['state']=='cancel': 
+            self.case_cancel(cr,uid,bug_id)   
+        if vals['state']=='done': 
+            self.case_close(cr,uid,bug_id)
+        return True 
+    
+    def _store_bug_history(self, cr, uid,bug_id,bug,user_id,context={}):
+        obj = self.pool.get('crm.case.history')
+        for key in bug.bug.messages.entries:        
+            if key['self_link'].rsplit('/',1)[1]!=0:
+                if bug.bug.attachments:
+                    attachment = bug.bug.attachments[0]  
+                    attachment_data = attachment.data
+                    attachment_fd = attachment_data.open() 
+                    attach_id=self.pool.get('ir.attachment').create(cr, uid, {
+                                        'name': attachment_fd.filename.split('.')[0],
+                                        'datas': base64.encodestring(attachment_fd.read()),
+                                        'datas_fname':attachment_fd.filename,
+                                        'res_model': 'crm.case',
+                                        'res_id': bug_id,
+                                        }, context=context  )     
+                                  
+                    data = {
+                    'name': bug.status,
+                    'user_id': uid,
+                    'case_id': bug_id,
+                    'description':key['content'],
+                    'bug_owner_id':user_id,
+                    'filename':attach_id}        
+                else:
+                    data = {
+                    'name': bug.status,
+                    'user_id': uid,
+                    'case_id': bug_id,
+                    'description':key['content'],
+                    'bug_owner_id':user_id}                    
+                obj.create(cr, uid, data, context)
+                cr.commit()
+        return True      
+crm_case()
+
+class res_users(osv.osv):
+    _inherit = 'res.users'
+    _columns = {
+        'lp_login': fields.char('Launchpad Login', size=100),
+        }
+res_users()
+class crm_case_history(osv.osv):
+    _inherit = 'crm.case.history'
+    _columns = {    
+        'bug_owner_id': fields.many2one('res.users', 'Bug Owner'),
+        'filename':fields.many2one('ir.attachment','File'),        
+    }
+crm_case_history()    
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_lp/crm_lp.xml b/addons/crm_lp/crm_lp.xml
new file mode 100644
index 00000000000..0b97099ba09
--- /dev/null
+++ b/addons/crm_lp/crm_lp.xml
@@ -0,0 +1,136 @@
+<openerp>
+<data>
+    <record model="ir.ui.view" id="lp_project_milestone_form">
+            <field name="name">project.milestone.form</field>
+            <field name="model">project.milestone</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Milestone">
+                    <field name="name"/>
+                    <field name="series_id" />
+                    <field name="project_id" />
+                    <field name="expect_date" />
+                </form>
+            </field>
+        </record>
+        <record model="ir.ui.view" id="lp_project_milestone_tree">
+            <field name="name">project.milsetone.tree</field>
+            <field name="model">project.milestone</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Milestone">
+                    <field name="name"/>
+                     <field name="series_id" />
+                    <field name="project_id" />
+                    <field name="expect_date" />
+                </tree>
+            </field>
+        </record>
+
+      <record model="ir.actions.act_window" id="action_lp_milestone">
+        <field name="name">LP Milestones</field>
+        <field name="res_model">project.milestone</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="lp_project_milestone_tree"/>
+      </record>
+
+    <record model="ir.ui.view" id="form_lp_series">
+        <field name="name">lp.series</field>
+        <field name="model">lp.series</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Project Series ">
+               <field name="name"/>
+               <field name="status"/>
+               <field name="summary"/>
+               <field name="project_id"/>
+				<separator string="Milestone Information" colspan="4" />
+               	<field name="milestone_ids" colspan="4" nolabel="1" />
+               </form>
+       </field>
+    </record>
+
+    <record model="ir.ui.view" id="tree_lp_series">
+        <field name="name">project.series</field>
+        <field name="model">project.series</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+	 <tree string="Project Series ">
+               <field name="name"/>
+               <field name="status"/>
+               <field name="project_id"/>
+               </tree>
+       </field>
+    </record>
+
+
+     <record model="ir.actions.act_window" id="action_lp_series">
+        <field name="name">Project Series</field>
+        <field name="res_model">project.series</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="tree_lp_series"/>
+     </record>
+
+    <record model="ir.ui.view" id="view_lp_project_form">
+        <field name="name">project.project.form</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project"/>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+			<notebook position="inside">
+				<page string="LP Project Information">
+					<field name="flag"/>
+					<field name="bugs_target" colspan="4" />
+					<field name="series_ids" colspan="4"  nolabel="1" />
+                 </page>
+              </notebook>
+       </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_crm_lp_form">
+        <field name="name">crm.case</field>
+        <field name="model">crm.case</field>
+        <field name="inherit_id" ref="crm.crm_case-view"/>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <field name="id" position="after">
+                <field name="project_id"/>
+                <field name="bug_id"/>
+				<field name="milestone_id"/>
+				<field name="bug_owner_id"/>
+            </field>
+       </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_crm_lp_users_form">
+        <field name="name">res.users.lp.form</field>
+        <field name="model">res.users</field>
+        <field name="inherit_id" ref="base.view_users_form"/>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <field name="password" position="after">
+                <field name="lp_login"/>
+            </field>
+       </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_crm_bug_history_form">
+        <field name="name">crm.case.lp.history</field>
+        <field name="model">crm.case.history</field>
+        <field name="inherit_id" ref="crm.crm_case_history-view"/>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <field name="user_id" position="after">
+                <field name="bug_owner_id"/>
+                <field name="filename"/>
+            </field>
+       </field>
+    </record>
+<menuitem id="base.menu_pm_planning" name="Planning" parent="project.menu_main" sequence="3"/>
+<!--<menuitem name="Project Series" id="menu_lp_series"  parent="base.menu_pm_planning" action="action_lp_series"/>-->
+<menuitem name="Project Milestones" id="menu_lp_milestones"  parent="base.menu_pm_planning" action="action_lp_milestone" sequence="1"/>
+</data>
+
+</openerp>
diff --git a/addons/crm_lp/crm_lp_data.xml b/addons/crm_lp/crm_lp_data.xml
new file mode 100644
index 00000000000..282e03fd613
--- /dev/null
+++ b/addons/crm_lp/crm_lp_data.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="ir_cron_crm_action" model="ir.cron">
+            <field name="name">Check Bug</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">hours</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+            <field eval="'crm.case'" name="model"/>
+            <field eval="'_check_bug'" name="function"/>
+            <field eval="'()'" name="args"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/crm_lp/crm_lp_wizard.xml b/addons/crm_lp/crm_lp_wizard.xml
new file mode 100644
index 00000000000..d622b778530
--- /dev/null
+++ b/addons/crm_lp/crm_lp_wizard.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<openerp>
+	<data>
+			<wizard
+				string="LP Synchronization"
+				model="crm.case"
+				name="lp_sync"
+				id="wizard_lp_sync"/>        
+	</data>
+</openerp>
diff --git a/addons/crm_lp/wizard/__init__.py b/addons/crm_lp/wizard/__init__.py
new file mode 100644
index 00000000000..84c775dfe1a
--- /dev/null
+++ b/addons/crm_lp/wizard/__init__.py
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import wizard_crm_lp_sync
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_lp/wizard/wizard_crm_lp_sync.py b/addons/crm_lp/wizard/wizard_crm_lp_sync.py
new file mode 100644
index 00000000000..a8310557d2e
--- /dev/null
+++ b/addons/crm_lp/wizard/wizard_crm_lp_sync.py
@@ -0,0 +1,57 @@
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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.
+#
+#    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.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import pooler
+from osv import osv
+import time
+import sys
+
+form = '''<?xml version="1.0"?>
+<form string="Launchpad Bugs Synchronization">
+    <label string="Click OK to continue synchronization with launchpad"/>
+</form>'''
+
+fields = {
+}
+
+class makeSync(wizard.interface):
+
+    def make_sync(self, cr, uid, data, context):
+        state = pooler.get_pool(cr.dbname).get('crm.case')._check_bug(cr, uid)
+        if not state:
+            raise osv.except_osv(_('Error'), _('Some problem occurred while making synchronization'))
+        return {}
+
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type':'form', 'arch':form, 'fields':fields, 'state':[('end','Cancel'),('ok','OK')]}
+        },
+        'ok': {
+            'actions': [make_sync],
+            'result': {'type':'state', 'state':'end'}
+        }
+    }
+makeSync('lp_sync')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/report_crm/report_crm_view.xml b/addons/report_crm/report_crm_view.xml
index afddfee6e07..2787eb638c9 100644
--- a/addons/report_crm/report_crm_view.xml
+++ b/addons/report_crm/report_crm_view.xml
@@ -70,8 +70,8 @@
             </field>
         </record>
 
-        <menuitem id="crm.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="50"/>
-        <menuitem id="crm.next_id_52" name="Cases" parent="crm.next_id_64" sequence="0"/>
+	    <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
+        <menuitem id="crm.next_id_52" name="Cases" parent="base.next_id_64" sequence="0"/>
 
         <record id="action_report_crm_case_user_tree" model="ir.actions.act_window">
             <field name="name">Cases by User and Section</field>
diff --git a/addons/report_mrp/report_mrp_view.xml b/addons/report_mrp/report_mrp_view.xml
index 33e11f19150..90eba6c667a 100644
--- a/addons/report_mrp/report_mrp_view.xml
+++ b/addons/report_mrp/report_mrp_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <record id="view_workcenter_load_tree" model="ir.ui.view">
             <field name="name">report.workcenter.load.tree</field>
             <field name="model">report.workcenter.load</field>
@@ -15,7 +15,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_workcenter_load_graph" model="ir.ui.view">
             <field name="name">report.workcenter.load.graph</field>
             <field name="model">report.workcenter.load</field>
@@ -29,8 +29,8 @@
                 </graph>
             </field>
         </record>
-        
-        
+
+
         <record id="view_workcenter_load_form" model="ir.ui.view">
             <field name="name">report.workcenter.load.form</field>
             <field name="model">report.workcenter.load</field>
@@ -50,11 +50,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
         </record>
-        <menuitem id="next_id_77" name="Reporting" parent="mrp.menu_mrp_root" sequence="100"/>
+        <menuitem id="next_id_77" name="Reporting" parent="mrp.menu_mrp_root" sequence="49"/>
         <menuitem action="action_report_workcenter_load_tree" id="menu_report_workcenter_load" parent="next_id_77"/>
-        
+
         <!-- stock.move compared to internal location src/dest -->
-        
+
         <record id="view_report_in_out_picking_tree" model="ir.ui.view">
             <field name="name">report.mrp.inout.tree</field>
             <field name="model">report.mrp.inout</field>
@@ -66,7 +66,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_report_in_out_picking_form" model="ir.ui.view">
             <field name="name">report.mrp.inout.form</field>
             <field name="model">report.mrp.inout</field>
@@ -78,8 +78,8 @@
                 </form>
             </field>
         </record>
-        
-        
+
+
         <record id="view_report_in_out_picking_graph" model="ir.ui.view">
             <field name="name">report.mrp.inout.graph</field>
             <field name="model">report.mrp.inout</field>
@@ -91,7 +91,7 @@
                 </graph>
             </field>
         </record>
-        
+
         <record id="action_report_in_out_picking_tree" model="ir.actions.act_window">
             <field name="name">Weekly Stock Value Variation</field>
             <field name="res_model">report.mrp.inout</field>
@@ -99,8 +99,8 @@
             <field name="view_mode">graph,tree</field>
         </record>
         <menuitem action="action_report_in_out_picking_tree" id="menu_report_in_out_picking" parent="report_mrp.next_id_77"/>
-        
-        
-        
+
+
+
     </data>
 </openerp>
diff --git a/addons/report_sale/report_sale_graph.xml b/addons/report_sale/report_sale_graph.xml
index 28f8ed4f74a..72c6f7ac578 100644
--- a/addons/report_sale/report_sale_graph.xml
+++ b/addons/report_sale/report_sale_graph.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
-        <menuitem id="next_id_83" name="Graphs" parent="report_sale.next_id_80"/><menuitem icon="STOCK_PRINT" id="ir_ui_menu1" name="Monthly Sales Turnover Over One Year" parent="next_id_83"/>
+
+        <menuitem id="next_id_83" name="Graphs" parent="base.next_id_64"/><menuitem icon="STOCK_PRINT" id="ir_ui_menu1" name="Monthly Sales Turnover Over One Year" parent="next_id_83" sequence="1"/>
         <menuitem icon="STOCK_PRINT" id="ir_ui_menu2" name="Daily Sales Turnover Over One Year" parent="report_sale.next_id_83"/>
         <menuitem icon="STOCK_PRINT" id="ir_ui_menu3" name="Monthly Cumulated Sales Turnover Over One Year" parent="report_sale.next_id_83"/>
-        
+
         <!-- reports -->
         <record id="ir_report_custom_4" model="ir.report.custom">
             <field model="ir.model" name="model_id" search="[('model','=','sale.order')]"/>
@@ -15,7 +15,7 @@
             <field name="type">bar</field>
             <field name="menu_id" ref="ir_ui_menu1"/>
         </record>
-        
+
         <record id="ir_report_custom_5" model="ir.report.custom">
             <field model="ir.model" name="model_id" search="[('model','=','sale.order')]"/>
             <field name="title">Daily sales turnover over one year</field>
@@ -24,7 +24,7 @@
             <field name="type">bar</field>
             <field name="menu_id" ref="ir_ui_menu2"/>
         </record>
-        
+
         <record id="ir_report_custom_6" model="ir.report.custom">
             <field model="ir.model" name="model_id" search="[('model','=','sale.order')]"/>
             <field name="title">Monthly cumulated sales turnover over one year</field>
@@ -33,7 +33,7 @@
             <field name="type">bar</field>
             <field name="menu_id" ref="ir_ui_menu3"/>
         </record>
-        
+
         <!-- fields -->
         <record id="ir_report_custom_fields_0" model="ir.report.custom.fields">
             <field model="ir.model.fields" name="field_child0" search="[('name','=','date_order'), ('model','=','sale.order')]"/>
@@ -51,7 +51,7 @@
             <field name="report_id" ref="ir_report_custom_4"/>
             <field name="name">sales</field>
         </record>
-        
+
         <record id="ir_report_custom_fields_2" model="ir.report.custom.fields">
             <field model="ir.model.fields" name="field_child0" search="[('name','=','date_order'), ('model','=','sale.order')]"/>
             <field name="sequence">1</field>
@@ -69,7 +69,7 @@
             <field name="report_id" ref="ir_report_custom_5"/>
             <field name="name">sale</field>
         </record>
-        
+
         <record id="ir_report_custom_fields_1" model="ir.report.custom.fields">
             <field model="ir.model.fields" name="field_child0" search="[('name','=','date_order'), ('model','=','sale.order')]"/>
             <field name="sequence">1</field>
@@ -87,10 +87,10 @@
             <field name="report_id" ref="ir_report_custom_6"/>
             <field name="name">sales</field>
         </record>
-        
+
         <function eval="[[ir_report_custom_4]]" model="ir.report.custom" name="subscribe"/>
         <function eval="[[ir_report_custom_5]]" model="ir.report.custom" name="subscribe"/>
         <function eval="[[ir_report_custom_6]]" model="ir.report.custom" name="subscribe"/>
-        
+
     </data>
 </openerp>
diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index 485f0740e72..476cb5ac11b 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -77,8 +77,9 @@
             <field name="search_view_id" ref="view_order_product_search"/>
         </record>
 
-        <menuitem id="next_id_80" name="Reporting" parent="base.menu_base_partner" sequence="7"/>
-        <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="next_id_80"/>
+		<menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="8"/>
+<!--        <menuitem id="base.next_id_80" name="Reporting" parent="base.menu_base_partner" sequence="7"/>-->
+        <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all" parent="base.next_id_64" sequence="3"/>
 
         <!-- Sales by category by month -->
 
@@ -156,7 +157,7 @@
             <field name="view_mode">graph,tree</field>
             <field name="search_view_id" ref="view_order_category_search"/>
         </record>
-        <menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="report_sale.next_id_80"/>
+        <menuitem action="action_order_category_tree_all" id="menu_report_order_category_all" parent="base.next_id_64" sequence="4"/>
 
         <!-- Sales of the month -->
         <record id="view_order_graph" model="ir.ui.view">
@@ -177,7 +178,7 @@
             <field name="view_mode">graph,tree,form</field>
             <field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
         </record>
-        <menuitem action="action_order_sale_list" id="menu_report_order_sale_list" parent="report_sale.next_id_80"/>
+        <menuitem action="action_order_sale_list" id="menu_report_order_sale_list" parent="base.next_id_64" sequence="5"/>
 
 		<record id="view_so_pipeline_graph" model="ir.ui.view">
              <field name="name">sale.order.dashboard.graph</field>

From 8a82b70482d0c0a5901b291fcde92913861da268 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 25 Jan 2010 12:55:33 +0530
Subject: [PATCH 10/34] [IMP] document_change: Improved data file.

bzr revid: uco@tinyerp.co.in-20100125072533-zgcq7w6khr0q3ogr
---
 addons/document_change/document_change.py     |  2 +-
 .../document_change/document_change_data.xml  | 48 +++++++++++--------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index 1a2b253c7be..e96887d5282 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -196,7 +196,7 @@ class doucment_change_process(osv.osv):
                         'process_id': process.id   
                         }            
                     phase_id = phase_obj.create(cr, uid, phase_value)
-                    cr.execute('select document_type_id from document_type_phase_type_rel where phase_type_id = %s' , phase_type_id.id)
+                    cr.execute('select document_type_id from document_type_phase_type_rel where phase_type_id = %s' % phase_type_id.id)
                     document_type_ids = map(lambda x: x[0], cr.fetchall())
                     document_ids = document_obj.search(cr, uid, [
                             ('parent_id','=',process.structure_id and process.structure_id.id),
diff --git a/addons/document_change/document_change_data.xml b/addons/document_change/document_change_data.xml
index 1ed75b34042..f43b36a7361 100644
--- a/addons/document_change/document_change_data.xml
+++ b/addons/document_change/document_change_data.xml
@@ -68,7 +68,7 @@
         <field name="parent_id" ref="dir_bat_z"/>
     </record>
 
-	<!-- Documents -->
+	<!-- Document Templates -->
 	<record model="ir.attachment" id="doc_FIE_template">
         <field name="name">FIE_template</field>
         <field name="datas_fname">FIE_template.xls</field>
@@ -89,26 +89,6 @@
         <field name="datas_fname">TaktTime_template.xls</field>
         <field name="parent_id" ref="dir_takt_time"/>
     </record>
-	<record model="ir.attachment" id="doc_FIE_05466_001">
-        <field name="name">FIE_05466_001</field>
-        <field name="datas_fname">FIE_05466_001.xls</field>
-        <field name="parent_id" ref="dir_root"/>
-    </record>
-    <record model="ir.attachment" id="doc_SFMEA_0581_001">
-        <field name="name">SFMEA_0581_001</field>
-        <field name="datas_fname">SFMEA_0581_001.xls</field>
-        <field name="parent_id" ref="dir_root"/>
-    </record>
-    <record model="ir.attachment" id="doc_SFMEA_0581_002">
-        <field name="name">SFMEA_0581_002</field>
-        <field name="datas_fname">SFMEA_0581_002.xls</field>
-        <field name="parent_id" ref="dir_root"/>
-    </record>
-    <record model="ir.attachment" id="doc_TaktTime_0549">
-        <field name="name">TaktTime_0549</field>
-        <field name="datas_fname">TaktTime_0549.xls</field>
-        <field name="parent_id" ref="dir_takt_time"/>
-    </record>
 	
 	<!-- Document Change Types -->
 	<record model="document.change.type" id="type_project_charter">
@@ -131,6 +111,32 @@
         <field name="template_document_id" ref="doc_SFMEA_template"/>
     </record>
 
+	<!-- Documents -->
+	<record model="ir.attachment" id="doc_FIE_05466_001">
+        <field name="name">FIE_05466_001</field>
+        <field name="datas_fname">FIE_05466_001.xls</field>
+        <field name="parent_id" ref="dir_family1"/>
+        <field name="change_type_id" ref="type_FIE"/>
+    </record>
+    <record model="ir.attachment" id="doc_SFMEA_0581_001">
+        <field name="name">SFMEA_0581_001</field>
+        <field name="datas_fname">SFMEA_0581_001.xls</field>
+        <field name="parent_id" ref="dir_family1"/>
+        <field name="change_type_id" ref="type_SFMEA"/>
+    </record>
+    <record model="ir.attachment" id="doc_SFMEA_0581_002">
+        <field name="name">SFMEA_0581_002</field>
+        <field name="datas_fname">SFMEA_0581_002.xls</field>
+        <field name="parent_id" ref="dir_family2"/>
+        <field name="change_type_id" ref="type_SFMEA"/>
+    </record>
+    <record model="ir.attachment" id="doc_TaktTime_0549">
+        <field name="name">TaktTime_0549</field>
+        <field name="datas_fname">TaktTime_0549.xls</field>
+        <field name="parent_id" ref="dir_takt_time"/>
+        <field name="change_type_id" ref="type_takt_time"/>
+    </record>
+    
 	<!-- Phase Types -->
 	<record model="document.change.process.phase.type" id="phase_type_concept">
         <field name="name">Concept</field>

From e9a32be19f74c97beb7338a642581bc30dd03914 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 25 Jan 2010 13:28:35 +0530
Subject: [PATCH 11/34] document_change: add the code for copy in pending
 directory and validate the document

bzr revid: sbh@tinyerp.com-20100125075835-8hj3d0p3lkkgo9ci
---
 addons/document_change/document_change.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index e96887d5282..0654e1f03e9 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -230,11 +230,19 @@ class document_file(osv.osv):
         return True
 
     def do_change_propose(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'change_propose'},context=context)                
+        attach_obj = self.pool.get('ir.attachment')
+        for attach in attach_obj.browse(cr, uid, ids, context=context):
+            if attach.target_document_id:
+                if attach.change_type_id.directory_id.id:
+                    self.copy(cr, uid, attach.id,{'parent_id':attach.change_type_id.directory_id.id}, context=context)
+        self.write(cr, uid, ids, {'state':'change_propose'},context=context)      
         return True             
     
     def do_to_update(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state':'to_update'},context=context)
+        for attach in self.browse(cr, uid, ids, context=context):
+            attach_ids = self.pool.get('ir.attachment').search(cr,uid, [('id', '=',attach.target_document_id.id)])
+            self.write(cr, uid, attach_ids, {'state':'to_update','datas':attach.datas,'datas_fname':attach.datas_fname},context=context)
+        self.write(cr, uid, ids, {'state':'to_update'},context=context)            
         return True   
 
     def do_production(self, cr, uid, ids, context={}):

From 5391493107e2054d1d4596349ef3541fbdc95652 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 25 Jan 2010 14:26:00 +0530
Subject: [PATCH 12/34] document_change: modify the view process change

bzr revid: sbh@tinyerp.com-20100125085600-evx5ojowc5kshbh1
---
 addons/document_change/document_change_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index 591b84c5ce9..3b02512af91 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -513,8 +513,7 @@
                 		</field>
                 	</page>     
                     <page string="Documents">
-                		<field name="process_document_ids">                			            			
-                		</field>
+                		<field name="process_document_ids" nolabel="1"/>                			            			
                 	</page>
                            	                	
                 </notebook>

From f5fc231ae0dfd9b61d4767ce35c34f44a6215558 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 25 Jan 2010 14:46:03 +0530
Subject: [PATCH 13/34] document_change: add the security and set the role in
 workflow

bzr revid: sbh@tinyerp.com-20100125091603-4z1ywdjkiaf7f69j
---
 addons/document_change/__terp__.py                        | 5 ++++-
 addons/document_change/document_phase_workflow.xml        | 1 +
 .../security/document_process_security.xml                | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 addons/document_change/security/document_process_security.xml

diff --git a/addons/document_change/__terp__.py b/addons/document_change/__terp__.py
index f18fe0edbd1..f79d5d99fea 100644
--- a/addons/document_change/__terp__.py
+++ b/addons/document_change/__terp__.py
@@ -32,11 +32,14 @@
     'website': 'http://www.openerp.com',
     'depends': ['base', 'document_ftp','mail_gateway'],
     'init_xml': ['document_change_data.xml'],
-    'update_xml': ['document_change_view.xml',
+    'update_xml': [   
+                   'security/crm_project_security.xml',
+                   'document_change_view.xml',
                    'document_change_sequence.xml',
                    'document_change_workflow.xml',
                    'document_phase_workflow.xml',
                    'document_process_workflow.xml',
+                
     ],
     'demo_xml': [ ],
     'installable': True,
diff --git a/addons/document_change/document_phase_workflow.xml b/addons/document_change/document_phase_workflow.xml
index 4ce39670837..bae3791971a 100644
--- a/addons/document_change/document_phase_workflow.xml
+++ b/addons/document_change/document_phase_workflow.xml
@@ -46,6 +46,7 @@
         <record id="tran_phase_confirm_to_end" model="workflow.transition">
             <field name="act_from" ref="act_phase_confirm"/>
             <field name="act_to" ref="act_phase_end"/>
+             <field name="role_id" ref="role_NPPI" />
             <field name="signal">button_end</field>
         </record>
     </data>
diff --git a/addons/document_change/security/document_process_security.xml b/addons/document_change/security/document_process_security.xml
new file mode 100644
index 00000000000..a418d1a90cf
--- /dev/null
+++ b/addons/document_change/security/document_process_security.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+        <record model="res.roles" id="role_NPPI">
+            <field name="name">Document Change/ Phase Manager</field>
+        </record>
+    </data>
+</openerp>

From 9fa04d3e245dd2e5121807104a8de5ae6e9cbde6 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 25 Jan 2010 14:48:18 +0530
Subject: [PATCH 14/34] document_change: Fix the file name of security

bzr revid: sbh@tinyerp.com-20100125091818-1332qf56rb026rug
---
 addons/document_change/__terp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document_change/__terp__.py b/addons/document_change/__terp__.py
index f79d5d99fea..3e6107367f8 100644
--- a/addons/document_change/__terp__.py
+++ b/addons/document_change/__terp__.py
@@ -33,7 +33,7 @@
     'depends': ['base', 'document_ftp','mail_gateway'],
     'init_xml': ['document_change_data.xml'],
     'update_xml': [   
-                   'security/crm_project_security.xml',
+                   'security/document_process_security.xml',
                    'document_change_view.xml',
                    'document_change_sequence.xml',
                    'document_change_workflow.xml',

From c1aa3918fa433a80f9cfdf02bbdc8e4177e3c2dc Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 25 Jan 2010 14:51:28 +0530
Subject: [PATCH 15/34] [FIX] document_change: correct domain in relate button
 link

bzr revid: hmo@tinyerp.com-20100125092128-q6x20weryvpm6jql
---
 addons/document_change/document_change_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index 8bac532111a..8ad39632ce1 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -445,7 +445,7 @@
     </record>	
 	<menuitem action="action_process_phase_form_validate" id="menu_phases_to_validate_form" parent="menu_change_control"/>
 	
-	<act_window domain="[('change_type_id', '=', active_id)]" 
+	<act_window domain="[('process_phase_id', '=', active_id)]" 
 		id="act_documents_phases" 
 		name="Documents" 
 		res_model="ir.attachment" 
@@ -462,13 +462,13 @@
             <form string="Process Change">
             	<group colspan="4">
 	                <field name="name"/>	                
-	                <field name="structure_id" select="1"/>
-                    <field name="description" colspan="4"/>	                
+	                <field name="structure_id" select="1"/>                                    
                     <group colspan="4" col="7">
                         <field name="process_type_id" widget="selection"/>	                
     	                <field name="process_model_id" widget="selection"/>
                         <button name="generate_phases" string="Generate Phases" type="object" icon="gtk-convert"/>                        
                     </group>	                
+                    <field name="description" colspan="4"/>	
 	            </group>
                 <notebook colspan="4">
                 	<page string="Process Definition">
@@ -593,13 +593,13 @@
     </record>	
 	<menuitem action="action_process_change_form_validate" id="menu_process_to_validate_form" parent="menu_change_control"/>
 	
-	<act_window domain="[('phase_ids', '=', active_id)]" 
+	<act_window domain="[('process_id', '=', active_id)]" 
 		id="act_phase_change_process" 
 		name="Phases" 
 		res_model="document.change.process.phase" 
 		src_model="document.change.process"/>
 	
-	<act_window domain="[('change_type_id', '=', active_id)]" 
+	<act_window domain="[('change_process_id', '=', active_id)]" 
 		id="act_documents_change_process" 
 		name="Documents" 
 		res_model="ir.attachment" 

From 18739c17fb5b4f58e96a09fda172520d8e6eab3b Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 25 Jan 2010 15:10:26 +0530
Subject: [PATCH 16/34] document_change: add the role and fix the problem of
 doument workflow

bzr revid: sbh@tinyerp.com-20100125094026-cab52aizr4nzgb1a
---
 addons/document_change/document_change.py           | 4 ++++
 addons/document_change/document_change_workflow.xml | 3 ++-
 addons/document_change/document_phase_workflow.xml  | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index 0654e1f03e9..5621ce4d2a0 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -240,6 +240,7 @@ class document_file(osv.osv):
     
     def do_to_update(self, cr, uid, ids, context={}):
         for attach in self.browse(cr, uid, ids, context=context):
+            
             attach_ids = self.pool.get('ir.attachment').search(cr,uid, [('id', '=',attach.target_document_id.id)])
             self.write(cr, uid, attach_ids, {'state':'to_update','datas':attach.datas,'datas_fname':attach.datas_fname},context=context)
         self.write(cr, uid, ids, {'state':'to_update'},context=context)            
@@ -251,5 +252,8 @@ class document_file(osv.osv):
              
     def do_cancel(self, cr, uid, ids, context={}):
         return self.write(cr, uid, ids, {'state':'cancel'},context=context)        
+    
+    def test_change_request(self, cr, uid, ids, context=None):
+        return all(bool(attch.target_document_id) != False for attch in self.browse(cr, uid, ids, context=context))
         
 document_file()
diff --git a/addons/document_change/document_change_workflow.xml b/addons/document_change/document_change_workflow.xml
index 7a3793248c7..61bfd946280 100644
--- a/addons/document_change/document_change_workflow.xml
+++ b/addons/document_change/document_change_workflow.xml
@@ -49,8 +49,9 @@
         <record id="tran_document_request_to_propose" model="workflow.transition">
             <field name="act_from" ref="act_document_request"/>
             <field name="act_to" ref="act_document_propose"/>
+            <field name="condition">test_change_request()</field>
             <field name="signal">button_propose</field>
-            <field name="condition">(target_document_id != False)</field>
+            
         </record>
         <record id="tran_document_request_to_cancel" model="workflow.transition">
             <field name="act_from" ref="act_document_request"/>
diff --git a/addons/document_change/document_phase_workflow.xml b/addons/document_change/document_phase_workflow.xml
index bae3791971a..02f2cc1679b 100644
--- a/addons/document_change/document_phase_workflow.xml
+++ b/addons/document_change/document_phase_workflow.xml
@@ -41,12 +41,13 @@
         <record id="tran_phase_start_to_confirm" model="workflow.transition">
             <field name="act_from" ref="act_phase_start"/>
             <field name="act_to" ref="act_phase_confirm"/>
+            <field name="role_id" ref="role_NPPI" />
             <field name="signal">button_confirm</field>
         </record>
         <record id="tran_phase_confirm_to_end" model="workflow.transition">
             <field name="act_from" ref="act_phase_confirm"/>
             <field name="act_to" ref="act_phase_end"/>
-             <field name="role_id" ref="role_NPPI" />
+            <field name="role_id" ref="role_NPPI" />
             <field name="signal">button_end</field>
         </record>
     </data>

From 587692bb5a8fc51528ca0b8ae45f94db5ab3d592 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 25 Jan 2010 15:43:41 +0530
Subject: [PATCH 17/34] [MOD] Modification in menus, set menus in Idea module

bzr revid: vir@tinyerp.com-20100125101341-9trzcq779zh8bbko
---
 addons/idea/idea_view.xml              | 28 +++++++++++++++-----------
 addons/idea/security/idea_security.xml | 14 ++++++-------
 addons/lunch/lunch_view.xml            | 16 +++++++--------
 addons/survey/survey_view.xml          |  8 ++++----
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 64401748e62..fb705f820ca 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    <menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES" />
+    <menuitem name="Tools" id="base.menu_tools" icon="STOCK_PREFERENCES" />
         <record model="ir.ui.view" id="view_idea_category_form">
             <field name="name">idea.category.form</field>
             <field name="model">idea.category</field>
@@ -32,8 +32,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-    <menuitem name="Configuration" parent="menu_tools" id="menu_config"/>
-    <menuitem name="Ideas" parent="menu_config" id="menu_ideas"/>
+    <menuitem name="Configuration" parent="base.menu_tools"
+         id="base.menu_lunch_survey_root" sequence="6"/>
+<!--    <menuitem name="Configuration" parent="menu_tools" id="menu_config"/>-->
+    <menuitem name="Ideas" parent="base.menu_lunch_survey_root" id="menu_ideas"/>
     <menuitem name="Categories" parent="menu_ideas" id="menu_idea_category" action="action_idea_category"/>
 
     <record model="ir.actions.act_window" id="action_idea_category_tree">
@@ -42,10 +44,10 @@
         <field name="view_type">tree</field>
         <field name="domain">[('parent_id','=',False)]</field>
     </record>
-    <menuitem name="Ideas" parent="menu_tools" id="menu_ideas1"/>
-    <menuitem 
-        name="Ideas by Categories" parent="menu_ideas1" 
-        id="menu_idea_category_tree" 
+    <menuitem name="Ideas" parent="base.menu_tools" id="menu_ideas1" sequence="4"/>
+    <menuitem
+        name="Ideas by Categories" parent="menu_ideas1"
+        id="menu_idea_category_tree"
         action="action_idea_category_tree"/>
 
 
@@ -158,7 +160,7 @@
         <field name="arch" type="xml">
         <tree string="All Ideas">
             <field name="category_id" />
-            <field name="create_date"/> 
+            <field name="create_date"/>
             <field name="user_id" />
             <field name="title"/>
             <field name="vote_avg" />
@@ -168,7 +170,7 @@
         </tree>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="view_idea_idea_search">
         <field name="name">idea.idea.search</field>
         <field name="model">idea.idea</field>
@@ -216,7 +218,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state','=','open')]</field>
-        <field name="filter" eval="True"/>        
+        <field name="filter" eval="True"/>
     </record>
 
         <record model="ir.ui.view" id="view_idea_vote_stat_graph">
@@ -262,8 +264,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
     </record>
-    <menuitem name="Reporting" parent="menu_ideas1" id="menu_reporting"/>
-    <menuitem name="Vote Statistics" parent="menu_reporting" id="menu_idea_vote_stat" action="action_idea_vote_stat"/>
+	<menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
+<!--    <menuitem name="Reporting" parent="menu_ideas1" id="menu_reporting"/>-->
+	<menuitem name="Idea" parent="base.menu_lunch_reporting" id="menu_idea_reporting"/>
+    <menuitem name="Vote Statistics" parent="menu_idea_reporting" id="menu_idea_vote_stat" action="action_idea_vote_stat"/>
 
 
     <record model="ir.actions.act_window" id="action_idea_vote">
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 522560a0bb5..6fd4b290086 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-		<record id="idea.menu_config" model="ir.ui.menu">
-			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
-		</record>
-
-		<record id="idea.menu_reporting" model="ir.ui.menu">
-			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
-		</record>
+<!--		<record id="idea.menu_config" model="ir.ui.menu">-->
+<!--			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>-->
+<!--		</record>-->
+<!---->
+<!--		<record id="idea.menu_reporting" model="ir.ui.menu">-->
+<!--			<field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>-->
+<!--		</record>-->
 	</data>
 </openerp>
 
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index fa6bf02c4dd..61844e099cb 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -6,16 +6,16 @@
         <menuitem name="Lunch Order" parent="menu_tools" id="menu_lunch" sequence="1"/>
         <menuitem name="Reporting" parent="menu_tools" id="menu_lunch_reporting" sequence="4"/>
         <menuitem name="Lunch Orders" parent="menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
-        <menuitem name="Configuration" parent="menu_tools" id="menu_lunch_category_root" sequence="5"/>-->
+        <menuitem name="Configuration" parent="menu_tools" id="menu_lunch_category_root" sequence="5"/>
        <menuitem name="Tools" id="menu_tools" icon="STOCK_PREFERENCES"/>-->
 
         <menuitem name="Lunch Order" parent="base.menu_tools" id="menu_lunch" sequence="1"/>
-        <menuitem name="Reporting" parent="base.menu_tools" id="menu_lunch_reporting" sequence="4"/>
-        <menuitem name="Lunch Orders" parent="menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
-        <menuitem name="Configuration" parent="base.menu_tools" id="base.menu_lunch_survey_root" sequence="5"/>
+        <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="5"/>
+        <menuitem name="Lunch Orders" parent="base.menu_lunch_reporting" id="menu_lunch_reporting_order" sequence="1"/>
+        <menuitem name="Configuration" parent="base.menu_tools" id="base.menu_lunch_survey_root" sequence="6"/>
 
 
-       <menuitem name="Lunch" parent="base.menu_lunch_survey_root" id="menu_lunch_category_root_configuration" sequence="5"/>
+       <menuitem name="Lunch" parent="base.menu_lunch_survey_root" id="menu_lunch_category_root_configuration" sequence="1"/>
         <record model="ir.ui.view" id="view_lunch_order_form">
             <field name="name">Order</field>
             <field name="model">lunch.order</field>
@@ -54,11 +54,11 @@
 
 
         <record model="ir.actions.act_window" id="action_lunch_order_form">
-                <field name="name">Orders</field>
+                <field name="name">Lunch Orders</field>
                 <field name="res_model">lunch.order</field>
-                <field name="view_mode">form,tree</field>
+                <field name="view_mode">tree,form</field>
         </record>
-        <menuitem name="Order" parent="menu_lunch" id="menu_lunch_order_form" action="action_lunch_order_form"/>
+        <menuitem name="Lunch Order" parent="menu_lunch" id="menu_lunch_order_form" action="action_lunch_order_form"/>
 
 <!--        <record model="ir.actions.act_window" id="action_lunch_order_day_form">-->
 <!--                <field name="name"> Order of the day</field>-->
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index c69e75c895d..40d8b695136 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -7,14 +7,14 @@
             groups="group_survey_manager,group_survey_user"/>-->
     <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools"/>
 	<menuitem name="Survey" id="main_menu_survey"
-            icon="terp-crm" sequence="1"
-            groups="group_survey_manager,group_survey_user" parent="base.menu_tools"/>
+            icon="terp-crm" sequence="3"
+            groups="group_survey_manager,group_survey_user" parent="base.menu_tools" />
 <!--        <menuitem name="Configuration" id="menu_survey_config"
             parent="main_menu_survey" groups="group_survey_manager"/>-->
 	<menuitem name="Configuration" parent="base.menu_tools"
-         id="base.menu_lunch_survey_root" groups="group_survey_manager" sequence="5"/>
+         id="base.menu_lunch_survey_root" groups="group_survey_manager" sequence="6"/>
     <menuitem name="survey" id="menu_survey_config"
-        parent="base.menu_lunch_survey_root" groups="group_survey_manager"/>
+        parent="base.menu_lunch_survey_root" groups="group_survey_manager" sequence="2"/>
         <!--
             Survey
         -->

From 0aa3823dea0c1d54d12a13d6a62996fefa8cd827 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 25 Jan 2010 15:44:42 +0530
Subject: [PATCH 18/34] [IMP] document_change: add pending_dir n process

bzr revid: hmo@tinyerp.com-20100125101442-0dxxo7msj4m94d5u
---
 addons/document_change/document_change.py     |  3 ++-
 .../document_change/document_change_view.xml  | 26 +++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index 4968b0a124d..09f7017ea2c 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -144,7 +144,7 @@ class doucment_change_process(osv.osv):
         'process_type_id' :fields.many2one('document.change.process.type','Type Change'),
         'description': fields.char("Small Description", size=64),
         'change_description':fields.text('Changed Description'),
-        'structure_id' :fields.many2one('document.directory','Structure ID'),
+        'structure_id' :fields.many2one('document.directory','Structure Directory'),
         'process_model_id':fields.many2one('document.change.process.model','Process Model'),
         'user_id':fields.many2one('res.users','Change Owner'),
         'create_date':fields.datetime('Creation',readonly=True),
@@ -156,6 +156,7 @@ class doucment_change_process(osv.osv):
         'progress': fields.float('Progress'), #TODO : functio field: calculate progress
         'current_phase_id': fields.many2one('document.change.process.phase','Current Phase'), # TODO: function field. find out in process phase 
         'process_document_ids': fields.many2many('ir.attachment','document_changed_process_rel','process_id','change_id','Document To Change'),
+        'pending_directory_id' :fields.many2one('document.directory','Pending Directory'),
     }
     _defaults = {      
       'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'document.change.process'),
diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index 8ad39632ce1..a1f184c88d9 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -459,17 +459,21 @@
         <field name="model">document.change.process</field>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <form string="Process Change">
-            	<group colspan="4">
-	                <field name="name"/>	                
-	                <field name="structure_id" select="1"/>                                    
-                    <group colspan="4" col="7">
-                        <field name="process_type_id" widget="selection"/>	                
-    	                <field name="process_model_id" widget="selection"/>
-                        <button name="generate_phases" string="Generate Phases" type="object" icon="gtk-convert"/>                        
-                    </group>	                
-                    <field name="description" colspan="4"/>	
-	            </group>
+            <form string="Process Change">            	
+                <group colspan="4" col="6">
+                    <field name="name"/>	                
+                    <field name="structure_id"/> 
+                    <field name="pending_directory_id"/>    
+                </group>                              
+                <group colspan="4" col="5">
+                    <field name="process_type_id" widget="selection"/>	                
+                    <field name="process_model_id" widget="selection"/>
+                    <button name="generate_phases" string="Generate Phases" type="object" icon="gtk-convert"/>                        
+                </group>
+                <group colspan="4">                                    
+                    <field name="description" colspan="4"/>
+                </group>
+
                 <notebook colspan="4">
                 	<page string="Process Definition">
                 		<group col="2" colspan="2">

From d80778dc8c0f7b873a212339776f8fc372dd9543 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 25 Jan 2010 15:46:38 +0530
Subject: [PATCH 19/34] [Fix] Solved problem of reporting menu

bzr revid: vir@tinyerp.com-20100125101638-6ypdsfz0c1n8qru5
---
 .../document_change/document_change_view.xml  | 154 +++++++++---------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index 591b84c5ce9..737a9c1da83 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -3,13 +3,13 @@
 <data>
 
 	<menuitem name="Process Changes" icon="terp-stock" id="menu_process_changes"/>
-	
+
 	<menuitem name="Process Changes" id="menu_document_process_changes" parent="menu_process_changes"/>
 	<menuitem name="Change Control" id="menu_change_control" parent="menu_process_changes"/>
-	<menuitem name="Reporting" id="menu_reporting" parent="menu_process_changes"/>
+<!--	<menuitem name="Reporting" id="menu_reporting" parent="menu_process_changes"/>-->
 	<menuitem name="Configuration" id="menu_configuration" parent="menu_process_changes"/>
-	
-	<!--    
+
+	<!--
 		Structure
 	-->
     <record model="ir.ui.view" id="view_document_structure_form">
@@ -23,7 +23,7 @@
         	</form>
         </field>
     </record>
-    
+
     <record model="ir.ui.view" id="view_document_structure_tree">
         <field name="name">document.directory</field>
         <field name="model">document.directory</field>
@@ -35,7 +35,7 @@
 	        </tree>
         </field>
     </record>
-    
+
     <record model="ir.actions.act_window" id="action_document_structure_form">
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">document.directory</field>
@@ -57,15 +57,15 @@
     </record>
     <menuitem name="Structure" id="menu_document_structure_config" parent="menu_configuration"/>
     <menuitem action="action_document_structure_form" id="menu_structure_form" parent="menu_document_structure_config"/>
-	
-	<act_window domain="[('structure_id', '=', active_id)]" 
-		id="act_structure_process_changes" 
-		name="Process Changes" 
-		res_model="document.change.process" 
+
+	<act_window domain="[('structure_id', '=', active_id)]"
+		id="act_structure_process_changes"
+		name="Process Changes"
+		res_model="document.change.process"
 		src_model="document.directory"/>
-	
-	<!-- 
-		Document Types 
+
+	<!--
+		Document Types
 	-->
 	<record model="ir.ui.view" id="view_document_type_form">
         <field name="name">document.change.type.form</field>
@@ -74,10 +74,10 @@
         <field name="arch" type="xml">
             <form string="Document Types">
                 <field name="name" select="1"/>
-                <field name="directory_id"/>      
-				<field name ="template_document_id"/>                    
+                <field name="directory_id"/>
+				<field name ="template_document_id"/>
                 <separator string="Associated Phase Types" colspan="4"/>
-                <field name="phase_type_ids" colspan="4" nolabel="1"/>  
+                <field name="phase_type_ids" colspan="4" nolabel="1"/>
             </form>
         </field>
     </record>
@@ -88,9 +88,9 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Document Types">
-                <field name="name"/>      
-                <field name="directory_id"/>      
-				<field name ="template_document_id"/>                                            
+                <field name="name"/>
+                <field name="directory_id"/>
+				<field name ="template_document_id"/>
             </tree>
         </field>
     </record>
@@ -104,9 +104,9 @@
     </record>
     <menuitem name="Documents" id="menu_document_type_config" parent="menu_configuration"/>
     <menuitem action="action_document_type_form" id="menu_document_type_form" parent="menu_document_type_config"/>
-	    
-    <!-- 
-    	Phase Types 
+
+    <!--
+    	Phase Types
     -->
     <record model="ir.ui.view" id="view_process_phase_type_form">
         <field name="name">document.change.process.phase.type.form</field>
@@ -145,10 +145,10 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-    
+
     <menuitem name="Process Changes" id="menu_process_changes_config" parent="menu_configuration"/>
     <menuitem action="action_process_phase_type_form" id="menu_phase_type_form" parent="menu_process_changes_config"/>
-    
+
     <!-- Document Change Process Type -->
        <record model="ir.ui.view" id="view_change_process_type_form">
         <field name="name">document.change.process.type.form</field>
@@ -179,11 +179,11 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
     </record>
-    
+
     <menuitem action="action_change_process_type_form" id="menu_change_process_type_form" parent="menu_process_changes_config"/>
-    
-    <!-- 
-    	Model of Changes 
+
+    <!--
+    	Model of Changes
     -->
     <record model="ir.ui.view" id="view_model_change_form">
         <field name="name">document.change.process.model.form</field>
@@ -193,7 +193,7 @@
             <form string="Model of Changes">
                 <field name="name" select="1"/>
                 <field name="sequence"/>
-                <separator string="Phase Type" colspan="4"/>        
+                <separator string="Phase Type" colspan="4"/>
                 <field name="phase_type_ids" colspan="4" nolabel="1"/>
             </form>
         </field>
@@ -204,9 +204,9 @@
         <field name="model">document.change.process.model</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Model of Changes">                
+            <tree string="Model of Changes">
                 <field name="sequence"/>
-                <field name="name"/>                
+                <field name="name"/>
             </tree>
         </field>
     </record>
@@ -219,9 +219,9 @@
         <field name="view_mode">tree,form</field>
     </record>
     <menuitem action="action_model_change_form" id="menu_model_change_form" parent="menu_process_changes_config"/>
-    
-	<!-- 
-		Documents 
+
+	<!--
+		Documents
 	-->
     <record model="ir.ui.view" id="view_document_form">
         <field name="name">ir.attachment.form</field>
@@ -242,14 +242,14 @@
                 <group col="7" colspan="4">
 	                <field name="state" readonly="1"/>
 					<button name="button_propose" states="change_request" string="Propose Change" icon="gtk-apply"/>
-					<button name="button_confirm" states="change_propose" string="To Validate" icon="gtk-apply"/>					
+					<button name="button_confirm" states="change_propose" string="To Validate" icon="gtk-apply"/>
                     <button name="button_validate" states="to_update" string="In Production" icon="gtk-apply"/>
 					<button name="button_request" states="cancel,in_production" string="Request Change" icon="gtk-media-play"/>
 					<button name="button_cancel" states="change_request,change_propose" string="Cancel"  icon="gtk-cancel"/>
                 </group>
                 <newline/>
-                <field name="target_document_id"/>    
-				<field name="target"/>                            
+                <field name="target_document_id"/>
+				<field name="target"/>
                 <newline/>
                 <separator string="Change Note" colspan="4"/>
                 <field colspan="4" name="description" nolabel="1"/>
@@ -263,7 +263,7 @@
                     <field name="write_date" readonly="1"/>
                     <field name="write_uid" readonly="1"/>
                 </group>
-                
+
         		<field name="email_notification_ids" colspan="4" mode="tree, form" readonly="1" widget="one2many_list" nolabel="1">
         			<tree string="Notifications">
         				<field name="email"/>
@@ -272,12 +272,12 @@
         			<form string="Notifications">
         				<field name="email"/>
         				<field name="create_date"/>
-                        <field name="name" string="Subject" colspan="4"/> 
-                        <separator string="Description" colspan="4"/>               			
+                        <field name="name" string="Subject" colspan="4"/>
+                        <separator string="Description" colspan="4"/>
                         <field colspan="4" name="description" nolabel="1"/>
         			</form>
         		</field>
-                
+
             </form>
         </field>
     </record>
@@ -339,7 +339,7 @@
         <field name="view_mode">tree,form</field>
         <field name="search_view_id" ref="view_document_search"/>
     </record>
-    
+
     <record id="action_document_tree_view" model="ir.actions.act_window.view">
         <field eval="1" name="sequence"/>
         <field name="view_mode">tree</field>
@@ -359,7 +359,7 @@
         <field name="act_window_id" ref="action_document_form"/>
     </record>
     <menuitem action="action_document_form" id="menu_documents_form" parent="menu_document_process_changes"/>
-    
+
     <record model="ir.actions.act_window" id="action_document_without_type_form">
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">ir.attachment</field>
@@ -370,7 +370,7 @@
         <field name="domain">[('change_type_id','=',',False)]</field>
     </record>
     <menuitem action="action_document_without_type_form" id="menu_documents_without_type_form" parent="menu_change_control"/>
-    
+
     <record model="ir.actions.act_window" id="action_document_to_update_form">
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">ir.attachment</field>
@@ -378,12 +378,12 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_document_tree"/>
-        <field name="domain">[('state','=','to_update')]</field>    
+        <field name="domain">[('state','=','to_update')]</field>
         </record>
     <menuitem action="action_document_to_update_form" id="menu_documents_to_update_form" parent="menu_change_control"/>
-	
-	<!-- 
-		Phases 
+
+	<!--
+		Phases
 	-->
 	<record model="ir.ui.view" id="view_process_phase_form">
         <field name="name">document.change.process.phase.form</field>
@@ -391,7 +391,7 @@
         <field name="type">form</field>
         <field name="arch" type="xml">
             <form string="Phases">
-				<group colspan="4" col="6">            
+				<group colspan="4" col="6">
 	                <field name="name" select="1"/>
 	                <field name="process_id" string="Process Change"/>
 	                <field name="sequence"/>
@@ -408,7 +408,7 @@
 	                <field name="state"/>
 	                <button name="button_start" states="draft" string="Start" icon="gtk-go-forward"/>
 	                <button name="button_confirm" states="in_process" string="To Validate" icon="gtk-execute"/>
- 					<button name="button_end" states="to_validate" string="Done" icon="gtk-jump-to"/>	                
+ 					<button name="button_end" states="to_validate" string="Done" icon="gtk-jump-to"/>
             	</group>
             </form>
         </field>
@@ -442,15 +442,15 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state','=','to_validate')]</field>
-    </record>	
+    </record>
 	<menuitem action="action_process_phase_form_validate" id="menu_phases_to_validate_form" parent="menu_change_control"/>
-	
-	<act_window domain="[('change_type_id', '=', active_id)]" 
-		id="act_documents_phases" 
-		name="Documents" 
-		res_model="ir.attachment" 
+
+	<act_window domain="[('change_type_id', '=', active_id)]"
+		id="act_documents_phases"
+		name="Documents"
+		res_model="ir.attachment"
 		src_model="document.change.process.phase"/>
-	
+
 	<!--
 	Process Change
 	-->
@@ -511,12 +511,12 @@
                 				<field name="state"/>
                 			</form>
                 		</field>
-                	</page>     
+                	</page>
                     <page string="Documents">
-                		<field name="process_document_ids">                			            			
+                		<field name="process_document_ids">
                 		</field>
                 	</page>
-                           	                	
+
                 </notebook>
             </form>
         </field>
@@ -535,7 +535,7 @@
                 <field name="current_phase_id" string="Current Phase"/>
                 <field name="date_control" string="Date Control Point"/>
                 <field name="process_model_id"/>
-                <field name="progress" string="Progress"/>                
+                <field name="progress" string="Progress"/>
                 <field name="process_document_ids" string="# Documents"/>
             </tree>
         </field>
@@ -550,7 +550,7 @@
 	            <field name="process_document_ids" operator="+"/>
 	        </graph>
 	    </field>
-    </record> 
+    </record>
 	<record model="ir.ui.view" id="view_process_serach">
         <field name="name">document.change.process.search</field>
         <field name="model">document.change.process</field>
@@ -574,7 +574,7 @@
             </search>
         </field>
     </record>
-	  
+
     <record model="ir.actions.act_window" id="action_process_form">
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">document.change.process</field>
@@ -584,7 +584,7 @@
         <field name="search_view_id" ref="view_process_serach"/>
     </record>
     <menuitem action="action_process_form" id="menu_process_changes_form" parent="menu_document_process_changes"/>
-    
+
     <record model="ir.actions.act_window" id="action_process_change_form_validate">
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">document.change.process</field>
@@ -592,20 +592,20 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="domain">[('state','=','to_validate')]</field>
-    </record>	
+    </record>
 	<menuitem action="action_process_change_form_validate" id="menu_process_to_validate_form" parent="menu_change_control"/>
-	
-	<act_window domain="[('phase_ids', '=', active_id)]" 
-		id="act_phase_change_process" 
-		name="Phases" 
-		res_model="document.change.process.phase" 
+
+	<act_window domain="[('phase_ids', '=', active_id)]"
+		id="act_phase_change_process"
+		name="Phases"
+		res_model="document.change.process.phase"
 		src_model="document.change.process"/>
-	
-	<act_window domain="[('change_type_id', '=', active_id)]" 
-		id="act_documents_change_process" 
-		name="Documents" 
-		res_model="ir.attachment" 
+
+	<act_window domain="[('change_type_id', '=', active_id)]"
+		id="act_documents_change_process"
+		name="Documents"
+		res_model="ir.attachment"
 		src_model="document.change.process"/>
-	
+
 </data>
 </openerp>

From a272076fb45bda8a0e9957349ecc0c5a1e8a94bf Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 25 Jan 2010 16:08:00 +0530
Subject: [PATCH 20/34] [Fix] Problem of menus in report_intraset module is
 solved

bzr revid: vir@tinyerp.com-20100125103800-irnzgq5zboku80q3
---
 addons/report_intrastat/report_intrastat_view.xml | 2 +-
 addons/sale/sale_view.xml                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 2242d37545b..c021962ed09 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -67,7 +67,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="product.menu_config_product"/>
+        <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" parent="base.menu_product"/>
 
 
         <record id="view_report_intrastat_tree" model="ir.ui.view">
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 49ba125a0a0..6a3d7af6423 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -5,8 +5,8 @@
 <!--            groups="group_sale_user"/>-->
 		<menuitem id="base.menu_sales" name="Sales" parent="base.menu_base_partner" sequence="1"/>
 
-		<menuitem id="menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
-		<menuitem action="product.product_normal_action" id="product.menu_products" parent="menu_product" sequence="1"/>
+		<menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="4"/>
+		<menuitem action="product.product_normal_action" id="product.menu_products" parent="base.menu_product" sequence="1"/>
 
         <record id="view_shop_form" model="ir.ui.view">
             <field name="name">sale.shop</field>

From 53cfdc65205bc621c121661d6400cec91ebb6044 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 25 Jan 2010 16:37:49 +0530
Subject: [PATCH 21/34] document_change: modify the do_to_update function for
 store the old filename

bzr revid: sbh@tinyerp.com-20100125110749-2g0h5nviwv3ww6wc
---
 addons/document_change/document_change.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index 1673b7fb4f3..f86ae49bfe1 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -24,6 +24,7 @@ import os
 import pooler
 import netsvc
 from tools.translate import _
+import datetime
 
 class doucment_change_process_phase_type(osv.osv):
     _name = "document.change.process.phase.type"
@@ -230,19 +231,25 @@ class document_file(osv.osv):
         return True
 
     def do_change_propose(self, cr, uid, ids, context={}):
-        attach_obj = self.pool.get('ir.attachment')
-        for attach in attach_obj.browse(cr, uid, ids, context=context):
-            if attach.target_document_id:
-                if attach.change_type_id.directory_id.id:
-                    self.copy(cr, uid, attach.id,{'parent_id':attach.change_type_id.directory_id.id}, context=context)
         self.write(cr, uid, ids, {'state':'change_propose'},context=context)      
         return True             
     
     def do_to_update(self, cr, uid, ids, context={}):
         for attach in self.browse(cr, uid, ids, context=context):
-            
-            attach_ids = self.pool.get('ir.attachment').search(cr,uid, [('id', '=',attach.target_document_id.id)])
-            self.write(cr, uid, attach_ids, {'state':'to_update','datas':attach.datas,'datas_fname':attach.datas_fname},context=context)
+            if attach.change_type_id.directory_id.id:
+                attach_ids = self.pool.get('ir.attachment').search(cr,uid, [('id', '=',attach.target_document_id.id)])
+                read_data=self.read(cr,uid, attach_ids,['datas','datas_fname'])
+                self.write(cr, uid, attach_ids, {'state':'to_update','datas':attach.datas,'datas_fname':attach.datas_fname},context=context)
+                res={}
+                for data in read_data:
+                    t=datetime.datetime.now()
+                    file_name=data['datas_fname'].split('.')
+                    new_name=str(file_name[0]+'.old'+str(t.year)+str(t.month)+str(t.day)+'.'+file_name[1])
+                    res['name']=attach.name
+                    res['datas']=data['datas'] 
+                    res['datas_fname']=new_name
+                    res['parent_id']=attach.change_type_id.directory_id.id
+                    old_id = self.create(cr, uid, res)
         self.write(cr, uid, ids, {'state':'to_update'},context=context)            
         return True   
 

From bbeb226478e6afb8eaa9ca115434095fe4887b39 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 25 Jan 2010 16:55:26 +0530
Subject: [PATCH 22/34] document_change: modify the workflow check add the role
 based on type

bzr revid: sbh@tinyerp.com-20100125112526-e3aq6mc3lhpkbq33
---
 addons/document_change/document_change.py          |  5 +++++
 addons/document_change/document_phase_workflow.xml | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index f86ae49bfe1..f964725ce58 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -96,6 +96,11 @@ class doucment_change_process_phase(osv.osv):
     def do_done(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {'state':'done'})
         return True 
+    def test_control_request(self, cr, uid, ids, context=None):
+        return all(bool(process.type) =='control_required' for process in self.browse(cr, uid, ids, context=context))
+
+    def test_nocontrol_request(self, cr, uid, ids, context=None):
+        return all(bool(process.type) =='no_control' for process in self.browse(cr, uid, ids, context=context))
 
 doucment_change_process_phase()
 
diff --git a/addons/document_change/document_phase_workflow.xml b/addons/document_change/document_phase_workflow.xml
index 02f2cc1679b..ea59fc2abe4 100644
--- a/addons/document_change/document_phase_workflow.xml
+++ b/addons/document_change/document_phase_workflow.xml
@@ -38,12 +38,20 @@
             <field name="act_to" ref="act_phase_start"/>
             <field name="signal">button_start</field>
         </record>
-        <record id="tran_phase_start_to_confirm" model="workflow.transition">
+        <record id="tran_phase_start_to_confirm_control" model="workflow.transition">
             <field name="act_from" ref="act_phase_start"/>
             <field name="act_to" ref="act_phase_confirm"/>
             <field name="role_id" ref="role_NPPI" />
+    		<field name="condition">test_control_request()</field>            
             <field name="signal">button_confirm</field>
         </record>
+        <record id="tran_phase_start_to_confirm_not_control" model="workflow.transition">
+            <field name="act_from" ref="act_phase_start"/>
+            <field name="act_to" ref="act_phase_confirm"/>
+    		<field name="condition">test_nocontrol_request()</field>            
+            <field name="signal">button_confirm</field>
+        </record>
+        
         <record id="tran_phase_confirm_to_end" model="workflow.transition">
             <field name="act_from" ref="act_phase_confirm"/>
             <field name="act_to" ref="act_phase_end"/>

From 0f2cb4802279b70e34fd2825e1779d14b5c542f9 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 25 Jan 2010 17:57:14 +0530
Subject: [PATCH 23/34] [IMP]: Improved generate phases function.

bzr revid: uco@tinyerp.co.in-20100125122714-4khg4wdhjkynm9qw
---
 addons/document_change/document_change.py     | 50 +++++++++++++++----
 .../document_change/document_change_view.xml  |  8 ++-
 2 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index f964725ce58..d14c8b605c3 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -50,7 +50,7 @@ class doucment_change_process_phase_type(osv.osv):
         'name': fields.char("Document Changed Process Type", size=64),
         'sequence': fields.integer('Sequence'),
         'active': fields.boolean('Active'),
-        'document_type_ids': fields.many2many('document.change.type','phase_type_document_type_rel','phase_type_id','document_type_id','Document Type'),
+        'document_type_ids': fields.many2many('document.change.type','document_type_phase_type_rel','phase_type_id','document_type_id','Document Type'),
     }
     _defaults = {      
                  'active': lambda *a:1,
@@ -188,16 +188,19 @@ class doucment_change_process(osv.osv):
         return self.write(cr, uid, ids, {'state':'cancel'},context=context) 
 
     def generate_phases(self, cr, uid, ids, *args):
+        import random
         phase_obj = self.pool.get('document.change.process.phase')
         phase_type_obj = self.pool.get('document.change.process.phase.type')  
-        document_type_obj = self.pool.get('document.change.type') 
-        document_obj = self.pool.get('ir.attachment')     
+        document_type_obj = self.pool.get('document.change.type')
+        directory_obj = self.pool.get('document.directory') 
+        document_obj = self.pool.get('ir.attachment')
+        new_doc_ids = []     
         for process in self.browse(cr, uid, ids):
             if process.process_model_id:
+                directory_ids = directory_obj.search(cr, uid, [('parent_id','child_of',process.structure_id and process.structure_id.id)])
                 for phase_type_id in process.process_model_id.phase_type_ids:
-                    phase_type = phase_type_obj.browse(cr, uid, phase_type_id.id)
                     phase_value = {
-                        'name' : '%s-%s' %(phase_type.name, process.name),
+                        'name' : '%s-%s' %(phase_type_id.name, process.name),
                         'phase_type_id': phase_type_id.id,
                         'process_id': process.id   
                         }            
@@ -205,14 +208,15 @@ class doucment_change_process(osv.osv):
                     cr.execute('select document_type_id from document_type_phase_type_rel where phase_type_id = %s' % phase_type_id.id)
                     document_type_ids = map(lambda x: x[0], cr.fetchall())
                     document_ids = document_obj.search(cr, uid, [
-                            ('parent_id','=',process.structure_id and process.structure_id.id),
-                            ('change_type_id','in',document_type_ids)])
+                                            ('parent_id','in',directory_ids),
+                                            ('change_type_id','in',document_type_ids)])
                     for document_id in document_ids:
-                        vals = {'process_phase_id':phase_id}
+                        vals = {'process_phase_id': phase_id}
                         if process.pending_directory_id:
                             vals.update({'parent_id':process.pending_directory_id.id})
-                        document_obj.copy(cr, uid, document_id, vals)
-                     
+                        new_doc_ids.append(document_obj.copy(cr, uid, document_id, vals))
+                    phase_obj.write(cr, uid, [phase_id], {'phase_document_ids': [(6,0,document_ids)]})
+                    self.write(cr, uid, [process.id],{'process_document_ids': [(6,0,new_doc_ids)]})
     
 doucment_change_process()
 
@@ -231,6 +235,32 @@ class document_file(osv.osv):
     _defaults = {      
         'state': lambda *a: 'in_production',
      }    
+    
+    def _check_duplication(self, cr, uid,vals,ids=[],op='create'):
+        name=vals.get('name',False)
+        parent_id=vals.get('parent_id',False)
+        res_model=vals.get('res_model',False)
+        res_id=vals.get('res_id',0)
+        type_id=vals.get('change_type_id',False)
+        if op=='write':
+            for file in self.browse(cr,uid,ids):
+                if not name:
+                    name=file.name
+                if not parent_id:
+                    parent_id=file.parent_id and file.parent_id.id or False
+                if not res_model:
+                    res_model=file.res_model and file.res_model or False
+                if not res_id:
+                    res_id=file.res_id and file.res_id or 0
+                res=self.search(cr,uid,[('id','<>',file.id),('name','=',name),('parent_id','=',parent_id),('res_model','=',res_model),('res_id','=',res_id),('change_type_id','=',type_id)])
+                if len(res):
+                    return False
+        if op=='create':
+            res=self.search(cr,uid,[('name','=',name),('parent_id','=',parent_id),('res_id','=',res_id),('res_model','=',res_model),('change_type_id','=',type_id)])
+            if len(res):
+                return False
+        return True
+    
     def do_change_request(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state':'change_request'},context=context)              
         return True
diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index d9e58c9357b..044c325a633 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -515,7 +515,13 @@
                 		</field>
                 	</page>     
                     <page string="Documents">
-                		<field name="process_document_ids" nolabel="1"/>                			            			
+                		<field name="process_document_ids" mode="tree,form" widget="many2many" nolabel="1">
+                			<tree string="Documents">
+		                		<field name="process_phase_id"/>
+		                		<field name="name" string="Document"/>
+		                		<field name="state"/>
+		                	</tree>
+		                </field>			            			
                 	</page>
                            	                	
                 </notebook>

From 9717e52f54fa2dede9924d2c408818d74d912290 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 25 Jan 2010 18:16:46 +0530
Subject: [PATCH 24/34] [IMP] document_change: modify the patten of old file
 name

bzr revid: sbh@tinyerp.com-20100125124646-5gk7a8vhpvj259i7
---
 addons/document_change/document_change.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index d14c8b605c3..3b60160ffe3 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -24,7 +24,7 @@ import os
 import pooler
 import netsvc
 from tools.translate import _
-import datetime
+import time
 
 class doucment_change_process_phase_type(osv.osv):
     _name = "document.change.process.phase.type"
@@ -279,7 +279,7 @@ class document_file(osv.osv):
                 for data in read_data:
                     t=datetime.datetime.now()
                     file_name=data['datas_fname'].split('.')
-                    new_name=str(file_name[0]+'.old'+str(t.year)+str(t.month)+str(t.day)+'.'+file_name[1])
+                    new_name=str(file_name[0]+'.old'+time.strftime("%y%m%d")+'.'+file_name[1])
                     res['name']=attach.name
                     res['datas']=data['datas'] 
                     res['datas_fname']=new_name

From 87e6d7ca8632fb972ee21e37622804d6db811835 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 25 Jan 2010 18:19:27 +0530
Subject: [PATCH 25/34] [IMP] document_change: import the datetime

bzr revid: sbh@tinyerp.com-20100125124927-l5g2ic4zzzjc16p3
---
 addons/document_change/document_change.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index 3b60160ffe3..864c94001d3 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -25,7 +25,7 @@ import pooler
 import netsvc
 from tools.translate import _
 import time
-
+import datetime
 class doucment_change_process_phase_type(osv.osv):
     _name = "document.change.process.phase.type"
 doucment_change_process_phase_type()

From 0803c04e6eeb17ea9ba8fde72ac15689e976e444 Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@openerp.co.in>
Date: Mon, 25 Jan 2010 18:27:21 +0530
Subject: [PATCH 26/34] [IMP]: caldav, project_calendar: Provided better error
 handling in import/export of ics, fixed some minor problems for generic
 attributes mapping

bzr revid: rpa@openerp.co.in-20100125125721-tsk4c2rfyt5qg6gq
---
 addons/base_calendar/base_calendar.py         | 99 ++++++++++++++-----
 .../base_calendar/wizard/wizard_cal_export.py |  5 +-
 .../base_calendar/wizard/wizard_cal_import.py |  4 +-
 addons/caldav/caldav.py                       | 14 +--
 4 files changed, 85 insertions(+), 37 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index a370ce9b64b..84d9a744fe8 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -62,9 +62,13 @@ def openobjectid2uid(cr, uidval, oomodel):
     return value
 
 def get_attribute_mapping(cr, uid, calname, context={}):
+        if not context:
+            context = {}
         pool = pooler.get_pool(cr.dbname)
         field_obj = pool.get('basic.calendar.fields')
-        fids = field_obj.search(cr, uid, [('type_id', '=', calname)])
+        type_obj = pool.get('basic.calendar.lines')
+        type_id = type_obj.search(cr, uid, [('object_id.model', '=', context.get('model'))])
+        fids = field_obj.search(cr, uid, [('type_id', '=', type_id[0])])
         res = {}
         for field in field_obj.browse(cr, uid, fids):
             attr = field.name.name
@@ -77,6 +81,10 @@ def get_attribute_mapping(cr, uid, calname, context={}):
                 res[attr]['object'] = field.field_id.relation
             elif res[attr]['type'] in ('selection') and field.mapping:
                 res[attr]['mapping'] = eval(field.mapping)
+        if not res.get('uid', None):
+            res['uid'] = {}
+            res['uid']['field'] = 'id'
+            res[attr]['type'] = "integer"
         return res
 
 def map_data(cr, uid, obj):
@@ -116,6 +124,9 @@ def map_data(cr, uid, obj):
                 id = modobj.create(cr, uid, map_val)
                 vals[field] = id
                 continue
+            if field_type == 'timedelta':
+                if map_val:
+                    vals[field] = (map_val.seconds/float(86400) + map_val.days)
             if map_val:
                 vals[field] = map_val
     return vals
@@ -180,7 +191,7 @@ class CalDAV(object):
     def create_ics(self, cr, uid, datas, name, ical, context=None):
         if not datas:
             model = context.get('model', None)
-            war_str = "No data available" + (model and " for " + model) or "" 
+            war_str = "No data available" + (model and " for " + model) or ""
             raise osv.except_osv(_('Warning !'), _(war_str))
         for data in datas:
             vevent = ical.add(name)
@@ -194,9 +205,11 @@ class CalDAV(object):
                             continue
                         uidval = openobjectid2uid(cr, data[map_field], model)
                         model_obj = self.pool.get(model)
-                        cr.execute('select id from %s  where recurrent_uid=%s' 
-                                       % (model_obj._table, data[map_field]))
-                        r_ids = map(lambda x: x[0], cr.fetchall())
+                        r_ids = []
+                        if model_obj._columns.get('recurrent_uid', None):
+                            cr.execute('select id from %s  where recurrent_uid=%s' 
+                                           % (model_obj._table, data[map_field]))
+                            r_ids = map(lambda x: x[0], cr.fetchall())
                         if r_ids: 
                             rdata = self.pool.get(model).read(cr, uid, r_ids)
                             rcal = self.export_cal(cr, uid, rdata, context=context)
@@ -218,7 +231,7 @@ class CalDAV(object):
                     elif data[map_field]:
                         if map_type in ("char", "text"):
                             vevent.add(field).value = str(data[map_field])
-                        elif map_type == 'datetime' and data[map_field]:
+                        elif map_type in ('datetime', 'date') and data[map_field]:
                             if field in ('exdate'):
                                 vevent.add(field).value = [parser.parse(data[map_field])]
                             else:
@@ -226,7 +239,7 @@ class CalDAV(object):
                         elif map_type == "timedelta":
                             vevent.add(field).value = timedelta(hours=data[map_field])
                         elif map_type == "many2one":
-                            vevent.add(field).value = [data.get(map_field)[1]]
+                            vevent.add(field).value = data.get(map_field)[1]
                         elif map_type in ("float", "integer"):
                             vevent.add(field).value = str(data.get(map_field))
                         elif map_type == "selection":
@@ -237,16 +250,42 @@ class CalDAV(object):
                                     if val1 == data[map_field]:
                                         vevent.add(field).value = key1
         return vevent
+    
+    def check_import(self, cr, uid, vals, context={}):
+        ids = []
+        model_obj = self.pool.get(context.get('model'))
+        try:
+            for val in vals:
+                exists, r_id = uid2openobjectid(cr, val['id'], context.get('model'), \
+                                                                 val.get('recurrent_id'))
+                if val.has_key('create_date'): val.pop('create_date')
+                val.pop('id')
+                if exists and r_id:
+                    val.update({'recurrent_uid': exists})
+                    model_obj.write(cr, uid, [r_id], val)
+                    ids.append(r_id)
+                elif exists:
+                    model_obj.write(cr, uid, [exists], val)
+                    ids.append(exists)
+                else:
+                    event_id = model_obj.create(cr, uid, val)
+                    ids.append(event_id)
+        except Exception, e:
+            raise osv.except_osv(('Error !'), (str(e)))
+        return ids
 
     def export_cal(self, cr, uid, datas, vobj=None, context={}):
-        self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
-        ical = vobject.iCalendar()
-        self.create_ics(cr, uid, datas, vobj, ical, context=context)
-        return ical
+        try:
+            self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
+            ical = vobject.iCalendar()
+            self.create_ics(cr, uid, datas, vobj, ical, context=context)
+            return ical
+        except Exception, e:
+            raise osv.except_osv(('Error !'), (str(e)))
 
     def import_cal(self, cr, uid, content, data_id=None, context=None):
         ical_data = base64.decodestring(content)
-        self.__attribute__ = get_attribute_mapping(cr, uid, self._calname)
+        self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
         parsedCal = vobject.readOne(ical_data)
         att_data = []
         res = []
@@ -290,19 +329,22 @@ class Calendar(CalDAV, osv.osv):
                  }
 
     def export_cal(self, cr, uid, datas, vobj='vevent', context={}):
-        cal = self.browse(cr, uid, datas[0])
-        ical = vobject.iCalendar()
-        for line in cal.line_ids:
-            if line.name in ('alarm', 'attendee'):
-                continue
-            mod_obj = self.pool.get(line.object_id.model)
-            data_ids = mod_obj.search(cr, uid, eval(line.domain), context=context)
-            datas = mod_obj.read(cr, uid, data_ids, context=context)
-            context.update({'model': line.object_id.model})
-            self.__attribute__ = get_attribute_mapping(cr, uid, line.name, context)
-            self.create_ics(cr, uid, datas, line.name, ical, context=context)
-        return ical.serialize()
-    
+        try:
+            cal = self.browse(cr, uid, datas[0])
+            ical = vobject.iCalendar()
+            for line in cal.line_ids:
+                if line.name in ('alarm', 'attendee'):
+                    continue
+                mod_obj = self.pool.get(line.object_id.model)
+                data_ids = mod_obj.search(cr, uid, eval(line.domain), context=context)
+                datas = mod_obj.read(cr, uid, data_ids, context=context)
+                context.update({'model': line.object_id.model})
+                self.__attribute__ = get_attribute_mapping(cr, uid, line.name, context)
+                self.create_ics(cr, uid, datas, line.name, ical, context=context)
+            return ical.serialize()
+        except Exception, e:
+            raise osv.except_osv(('Error !'), (str(e)))
+
     def import_cal(self, cr, uid, content, data_id=None, context=None):
         ical_data = base64.decodestring(content)
         parsedCal = vobject.readOne(ical_data)
@@ -315,11 +357,14 @@ class Calendar(CalDAV, osv.osv):
             cal_children[line.name] = line.object_id.model
         for child in parsedCal.getChildren():
             if child.name.lower() in cal_children:
-                self.__attribute__ = get_attribute_mapping(cr, uid, child.name.lower())
+                context.update({'model': cal_children[child.name.lower()]})
+                self.__attribute__ = get_attribute_mapping(cr, uid, child.name.lower(), context=context)
                 val = self.parse_ics(cr, uid, child)
                 obj = self.pool.get(cal_children[child.name.lower()])
                 if hasattr(obj, 'check_import'):
-                    obj.check_import(cr, uid, [val], context={})
+                    obj.check_import(cr, uid, [val], context=context)
+                else:
+                    self.check_import(cr, uid, [val], context=context)
         return {}
 
 Calendar()
diff --git a/addons/base_calendar/wizard/wizard_cal_export.py b/addons/base_calendar/wizard/wizard_cal_export.py
index f0504b3a6b6..f7896c738d7 100644
--- a/addons/base_calendar/wizard/wizard_cal_export.py
+++ b/addons/base_calendar/wizard/wizard_cal_export.py
@@ -51,14 +51,13 @@ class cal_event_export_wizard(wizard.interface):
         model_obj = pooler.get_pool(cr.dbname).get(model)
         calendar = model_obj.export_cal(cr, uid, data['ids'], context)
         return {'file_path': base64.encodestring(calendar), \
-                        'name': 'OpenERP %s.ics' % (model_obj._description)}
+                            'name': 'OpenERP %s.ics' % (model_obj._description)}
 
     states = {
         'init': {
             'actions': [_process_export_ics], 
             'result': {'type': 'form', 'arch':form1, 'fields':form1_fields, \
-                       'state': [('end', '_Cancel', 'gtk-cancel'), \
-                            ('end', 'Ok', 'gtk-ok')]}}, 
+                       'state': [('end', '_Cancel', 'gtk-cancel')]}}, 
     }
     
 cal_event_export_wizard('calendar.event.export')
diff --git a/addons/base_calendar/wizard/wizard_cal_import.py b/addons/base_calendar/wizard/wizard_cal_import.py
index fac1eaeab4d..a5670f545fa 100644
--- a/addons/base_calendar/wizard/wizard_cal_import.py
+++ b/addons/base_calendar/wizard/wizard_cal_import.py
@@ -54,6 +54,7 @@ class cal_event_import_wizard(wizard.interface):
     def _process_imp_ics(self, cr, uid, data, context=None):
         model = data.get('model')
         model_obj = pooler.get_pool(cr.dbname).get(model)
+        context.update({'model': model})
         vals = model_obj.import_cal(cr, uid, data['form']['file_path'], data['id'], context)
         global cnt
         cnt = 0
@@ -62,7 +63,8 @@ class cal_event_import_wizard(wizard.interface):
         return {}
     
     def _result_set(self, cr, uid, data, context=None):
-        return {'msg': 'Imported %s Event(s)' % cnt}
+        msg = (cnt and "Imported %s components" % cnt) or 'Import Sucessful' 
+        return {'msg': msg}
     
     states = {
         'init': {
diff --git a/addons/caldav/caldav.py b/addons/caldav/caldav.py
index 0e8c1164289..34cc3fcf74f 100644
--- a/addons/caldav/caldav.py
+++ b/addons/caldav/caldav.py
@@ -489,7 +489,7 @@ rule or repeating pattern for anexception to a recurrence set"),
 
     def import_cal(self, cr, uid, data, data_id=None, context={}):
         event_obj = self.pool.get('basic.calendar.event')
-        vals = event_obj.import_cal(cr, uid, data)
+        vals = event_obj.import_cal(cr, uid, data, context=context)
         return self.check_import(cr, uid, vals, context=context)
     
     def check_import(self, cr, uid, vals, context={}):
@@ -731,7 +731,7 @@ class calendar_todo(osv.osv):
     
     def import_cal(self, cr, uid, data, data_id=None,  context={}):
         todo_obj = self.pool.get('basic.calendar.todo')
-        vals = todo_obj.import_cal(cr, uid, data)
+        vals = todo_obj.import_cal(cr, uid, data, context=context)
         return self.check_import(cr, uid, vals, context=context)
     
     def check_import(self, cr, uid, vals, context={}):
@@ -740,10 +740,12 @@ class calendar_todo(osv.osv):
             obj_tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
             if not val.has_key('planned_hours'):
                 # 'Computes duration' in days
-                start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S')
-                end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S')
-                diff = end - start
-                plan = (diff.seconds/float(86400) + diff.days) * obj_tm.factor
+                plan = 0.0
+                if val.get('date') and  val.get('date_deadline'):
+                    start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S')
+                    end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S')
+                    diff = end - start
+                    plan = (diff.seconds/float(86400) + diff.days) * obj_tm.factor
                 val['planned_hours'] = plan
             else:
                 # Converts timedelta into hours

From 082129fda8e28aaaf251842ac9a1facfe8807085 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Mon, 25 Jan 2010 18:34:46 +0530
Subject: [PATCH 27/34] [Fix] : Problem of parent class report.crm.case.user
 does not exist in module crm_project is solved

bzr revid: vir@tinyerp.com-20100125130446-312x9e3ga3yne7e1
---
 addons/crm_project/__terp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_project/__terp__.py b/addons/crm_project/__terp__.py
index 79cd0179f48..2e05fcc0bae 100644
--- a/addons/crm_project/__terp__.py
+++ b/addons/crm_project/__terp__.py
@@ -30,7 +30,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['crm','project'],
+    'depends': ['crm','project','report_crm'],
     'init_xml': [
         'crm_bugs_data.xml'
     ],

From f301ad46664f84d0f385abaf6c8bffa51fdbdfe4 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 25 Jan 2010 18:50:47 +0530
Subject: [PATCH 28/34] [REF] document_change: Changed progress field (Process
 Change) from float to function.

bzr revid: uco@tinyerp.co.in-20100125132047-kllb0v9updnj5yhv
---
 addons/document_change/document_change.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index 864c94001d3..1d10c3c3ed8 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -145,6 +145,17 @@ class doucment_change_process(osv.osv):
         #TODOto calculate latest modified date from all related documents
         return res
     
+    def _get_progress(self, cr, uid, ids, field_name, arg, context={}):
+        result = {}
+        update_docs = []
+        for proc_change in self.browse(cr, uid, ids):
+            for doc in proc_change.process_document_ids:
+                if doc.state in ('to_update', 'change_propose'):
+                    update_docs.append(doc)
+            progress = len(update_docs)/len(proc_change.process_document_ids)
+            result[proc_change.id] = progress
+        return result
+    
     _columns = {
         'name': fields.char("Process Change", size=64, required=True, select=True),
         'process_type_id' :fields.many2one('document.change.process.type','Type Change'),
@@ -159,7 +170,7 @@ class doucment_change_process(osv.osv):
         'state':fields.selection([('draft', 'Draft'),('in_progress', 'In Progress'),('to_validate', 'To Validate'), ('pending', 'Pending'), ('done', 'Done'),('cancel','Cancelled')], 'state', readonly=True),
         'process_phase_ids':fields.one2many('document.change.process.phase','process_id','Phase'),                
         'date_control': fields.date('Control Date'), #TODO: make relate field with current_phase_id.date_control
-        'progress': fields.float('Progress'), #TODO : functio field: calculate progress
+        'progress': fields.function(_get_progress, method=True, type='float', string='Progress'),
         'current_phase_id': fields.many2one('document.change.process.phase','Current Phase'), # TODO: function field. find out in process phase 
         'process_document_ids': fields.many2many('ir.attachment','document_changed_process_rel','process_id','change_id','Document To Change'),
         'pending_directory_id' :fields.many2one('document.directory','Pending Directory'),
@@ -236,7 +247,7 @@ class document_file(osv.osv):
         'state': lambda *a: 'in_production',
      }    
     
-    def _check_duplication(self, cr, uid,vals,ids=[],op='create'):
+    def _check_duplication(self, cr, uid, vals, ids=[], op='create'):
         name=vals.get('name',False)
         parent_id=vals.get('parent_id',False)
         res_model=vals.get('res_model',False)

From adc7ead3129a777d96ed0e7e201e3519e14927d3 Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 25 Jan 2010 18:57:37 +0530
Subject: [PATCH 29/34] [FIX]: Removed unnecessary import.

bzr revid: uco@tinyerp.co.in-20100125132737-pqdynh71sfx6fr9o
---
 addons/document_change/document_change.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index 1d10c3c3ed8..33e57961dcc 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -199,7 +199,6 @@ class doucment_change_process(osv.osv):
         return self.write(cr, uid, ids, {'state':'cancel'},context=context) 
 
     def generate_phases(self, cr, uid, ids, *args):
-        import random
         phase_obj = self.pool.get('document.change.process.phase')
         phase_type_obj = self.pool.get('document.change.process.phase.type')  
         document_type_obj = self.pool.get('document.change.type')

From 267cd84032e2ebe45d3c64a8cdac5fcff88dd6ba Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 25 Jan 2010 19:03:04 +0530
Subject: [PATCH 30/34] [FIX] document_change: Removed unnecessary code. Fixed
 progress field function.

bzr revid: uco@tinyerp.co.in-20100125133304-unjd2tqg0qruavi2
---
 addons/document_change/document_change.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index 33e57961dcc..e7d478256e4 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -148,11 +148,13 @@ class doucment_change_process(osv.osv):
     def _get_progress(self, cr, uid, ids, field_name, arg, context={}):
         result = {}
         update_docs = []
+        progress = 0.0
         for proc_change in self.browse(cr, uid, ids):
             for doc in proc_change.process_document_ids:
                 if doc.state in ('to_update', 'change_propose'):
                     update_docs.append(doc)
-            progress = len(update_docs)/len(proc_change.process_document_ids)
+            if proc_change.process_document_ids:
+                progress = len(update_docs)/len(proc_change.process_document_ids)
             result[proc_change.id] = progress
         return result
     
@@ -200,8 +202,6 @@ class doucment_change_process(osv.osv):
 
     def generate_phases(self, cr, uid, ids, *args):
         phase_obj = self.pool.get('document.change.process.phase')
-        phase_type_obj = self.pool.get('document.change.process.phase.type')  
-        document_type_obj = self.pool.get('document.change.type')
         directory_obj = self.pool.get('document.directory') 
         document_obj = self.pool.get('ir.attachment')
         new_doc_ids = []     

From 51264adc75fbc6a1d7793cb5dbd487bf60b9b018 Mon Sep 17 00:00:00 2001
From: "Harry (Open ERP)" <hmo@tinyerp.com>
Date: Mon, 25 Jan 2010 20:27:30 +0530
Subject: [PATCH 31/34] [FIX] document_change: fixed small bug

bzr revid: hmo@tinyerp.com-20100125145730-ju65vh25vynq370l
---
 addons/document_change/document_change_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index 044c325a633..8594cb8947c 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -367,7 +367,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
         <field name="view_id" ref="view_document_tree"/>
-        <field name="domain">[('change_type_id','=',',False)]</field>
+        <field name="domain">[('change_type_id','=',False)]</field>
     </record>
     <menuitem action="action_document_without_type_form" id="menu_documents_without_type_form" parent="menu_change_control"/>
     

From 9e74b140f4ed7005c157af270e3980f163373f6b Mon Sep 17 00:00:00 2001
From: "uco (OpenERP)" <uco@tinyerp.co.in>
Date: Mon, 25 Jan 2010 20:36:57 +0530
Subject: [PATCH 32/34] [REF] document_change: Improved fields. Converted to
 function field.

bzr revid: uco@tinyerp.co.in-20100125150657-kvntw50cldmfkew9
---
 addons/document_change/document_change.py     | 25 +++++++++++++------
 .../document_change/document_change_view.xml  |  2 ++
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index e7d478256e4..25954f3c84f 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -147,17 +147,26 @@ class doucment_change_process(osv.osv):
     
     def _get_progress(self, cr, uid, ids, field_name, arg, context={}):
         result = {}
-        update_docs = []
         progress = 0.0
         for proc_change in self.browse(cr, uid, ids):
+            update_docs = []
+            result[proc_change.id] = 0.0
             for doc in proc_change.process_document_ids:
                 if doc.state in ('to_update', 'change_propose'):
                     update_docs.append(doc)
-            if proc_change.process_document_ids:
-                progress = len(update_docs)/len(proc_change.process_document_ids)
-            result[proc_change.id] = progress
+                progress = (float(len(update_docs))/float(len(proc_change.process_document_ids)))*100
+                result[proc_change.id] = progress
         return result
     
+    def _get_current_phase(self, cr, uid, ids, field_name, arg, context={}):
+        result = {}
+        for proc in self.browse(cr, uid, ids):
+            result[proc.id] = False
+            for phase in proc.process_phase_ids:
+                if phase.state in ('in_process','to_validate'):
+                    result[proc.id] = phase.id
+        return result 
+    
     _columns = {
         'name': fields.char("Process Change", size=64, required=True, select=True),
         'process_type_id' :fields.many2one('document.change.process.type','Type Change'),
@@ -167,13 +176,13 @@ class doucment_change_process(osv.osv):
         'process_model_id':fields.many2one('document.change.process.model','Process Model'),
         'user_id':fields.many2one('res.users','Change Owner'),
         'create_date':fields.datetime('Creation',readonly=True),
-        'latest_modified_date':fields.function(_latestmodification, method=True, type='date', string="Lastest Modification"), #TODO no year!
+        'latest_modified_date':fields.function(_latestmodification, method=True, type='datetime', string="Lastest Modification"), #TODO no year!
         'date_expected':fields.datetime('Expected Production'), 
         'state':fields.selection([('draft', 'Draft'),('in_progress', 'In Progress'),('to_validate', 'To Validate'), ('pending', 'Pending'), ('done', 'Done'),('cancel','Cancelled')], 'state', readonly=True),
         'process_phase_ids':fields.one2many('document.change.process.phase','process_id','Phase'),                
-        'date_control': fields.date('Control Date'), #TODO: make relate field with current_phase_id.date_control
+        'current_phase_id': fields.function(_get_current_phase, method=True, type='many2one', relation='document.change.process.phase', string='Current Phase'),
+        'date_control': fields.related('current_phase_id','date_control', type='date', string='Control Date'), 
         'progress': fields.function(_get_progress, method=True, type='float', string='Progress'),
-        'current_phase_id': fields.many2one('document.change.process.phase','Current Phase'), # TODO: function field. find out in process phase 
         'process_document_ids': fields.many2many('ir.attachment','document_changed_process_rel','process_id','change_id','Document To Change'),
         'pending_directory_id' :fields.many2one('document.directory','Pending Directory'),
     }
@@ -223,7 +232,7 @@ class doucment_change_process(osv.osv):
                     for document_id in document_ids:
                         vals = {'process_phase_id': phase_id}
                         if process.pending_directory_id:
-                            vals.update({'parent_id':process.pending_directory_id.id})
+                            vals.update({'parent_id': process.pending_directory_id.id})
                         new_doc_ids.append(document_obj.copy(cr, uid, document_id, vals))
                     phase_obj.write(cr, uid, [phase_id], {'phase_document_ids': [(6,0,document_ids)]})
                     self.write(cr, uid, [process.id],{'process_document_ids': [(6,0,new_doc_ids)]})
diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index 044c325a633..28c6127b68f 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -501,6 +501,7 @@
                 	<page string="Phases">
                 		<field name="process_phase_ids" mode="tree,form" widget="one2many_list" nolabel="1">
                 			<tree string="Process Phases" editable="True">
+                				<field name="sequence"/>
                 				<field name="name"/>
                 				<field name="type"/>
                 				<field name="phase_document_ids"/>
@@ -508,6 +509,7 @@
                 			</tree>
                 			<form string="Process Phases">
                 				<field name="name"/>
+                				<field name="sequence"/>
                 				<field name="type"/>
                 				<field name="phase_document_ids" colspan="4"/>
                 				<field name="state"/>

From b9c71f207817a2c7f778367b4f36b5d3b8fb3e39 Mon Sep 17 00:00:00 2001
From: "sbh (Open ERP)" <sbh@tinyerp.com>
Date: Mon, 25 Jan 2010 20:46:18 +0530
Subject: [PATCH 33/34] [IMP] document_change: add the from view and modify the
 _get_progress function

bzr revid: sbh@tinyerp.com-20100125151618-r04y7esxo6uexitk
---
 addons/document_change/document_change.py     | 48 ++++++++++++-------
 .../document_change/document_change_view.xml  |  9 +++-
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/addons/document_change/document_change.py b/addons/document_change/document_change.py
index 25954f3c84f..8be097bed4f 100644
--- a/addons/document_change/document_change.py
+++ b/addons/document_change/document_change.py
@@ -74,7 +74,7 @@ class doucment_change_process_phase(osv.osv):
         'date_control': fields.date('Control Date', select=True),        
         'phase_type_id':fields.many2one('document.change.process.phase.type','Phase Type'),
         'state': fields.selection([('draft', 'Draft'),('in_process', 'Started'),('to_validate', 'To Validate'),('done', 'Done')], 'State',readonly=True),
-        'phase_document_ids':fields.many2many('ir.attachment','phase_document_rel','phase_id','document_id','Document'),
+        'phase_document_ids':fields.one2many('ir.attachment','process_phase_id','Documents'),
     }
     _defaults = {      
      'state': lambda *a: 'draft',
@@ -144,6 +144,19 @@ class doucment_change_process(osv.osv):
         res = {}
         #TODOto calculate latest modified date from all related documents
         return res
+    def _get_document(self, cr, uid, ids, context={}, *arg):
+        if not ids:
+            return {}
+        res = {}
+        attach = self.pool.get('ir.attachment') 
+        directory_obj = self.pool.get('document.directory') 
+        for process_change in self.browse(cr, uid, ids):
+            res1 = []            
+            for phase_id in  process_change.process_phase_ids:
+                res1 += map(lambda x:x.id, phase_id.phase_document_ids or [])    
+            res[process_change.id] = res1       
+        return res
+
     
     def _get_progress(self, cr, uid, ids, field_name, arg, context={}):
         result = {}
@@ -218,25 +231,26 @@ class doucment_change_process(osv.osv):
             if process.process_model_id:
                 directory_ids = directory_obj.search(cr, uid, [('parent_id','child_of',process.structure_id and process.structure_id.id)])
                 for phase_type_id in process.process_model_id.phase_type_ids:
+                    for document_type_id in phase_type_id.document_type_ids:
+                        document_ids = document_obj.search(cr, uid, [
+                                                ('parent_id','in',directory_ids),
+                                                ('change_type_id','=',document_type_id.id)])
+                        new_doc_ids = []                        
+                        for document_id in document_ids: 
+                            vals = {}                           
+                            if process.pending_directory_id:
+                                vals.update({'parent_id':process.pending_directory_id.id})
+                            new_doc_ids.append(document_obj.copy(cr, uid, document_id, vals))                            
                     phase_value = {
                         'name' : '%s-%s' %(phase_type_id.name, process.name),
                         'phase_type_id': phase_type_id.id,
-                        'process_id': process.id   
-                        }            
-                    phase_id = phase_obj.create(cr, uid, phase_value)
-                    cr.execute('select document_type_id from document_type_phase_type_rel where phase_type_id = %s' % phase_type_id.id)
-                    document_type_ids = map(lambda x: x[0], cr.fetchall())
-                    document_ids = document_obj.search(cr, uid, [
-                                            ('parent_id','in',directory_ids),
-                                            ('change_type_id','in',document_type_ids)])
-                    for document_id in document_ids:
-                        vals = {'process_phase_id': phase_id}
-                        if process.pending_directory_id:
-                            vals.update({'parent_id': process.pending_directory_id.id})
-                        new_doc_ids.append(document_obj.copy(cr, uid, document_id, vals))
-                    phase_obj.write(cr, uid, [phase_id], {'phase_document_ids': [(6,0,document_ids)]})
-                    self.write(cr, uid, [process.id],{'process_document_ids': [(6,0,new_doc_ids)]})
-    
+                        'process_id': process.id,
+                        'phase_document_ids': [(6,0,new_doc_ids)]   
+                    }            
+                    phase_obj.create(cr, uid, phase_value)   
+                                     
+        return True
+
 doucment_change_process()
 
 class document_file(osv.osv):
diff --git a/addons/document_change/document_change_view.xml b/addons/document_change/document_change_view.xml
index 28c6127b68f..56d8bbefc7d 100644
--- a/addons/document_change/document_change_view.xml
+++ b/addons/document_change/document_change_view.xml
@@ -468,7 +468,7 @@
                 <group colspan="4" col="5">
                     <field name="process_type_id" widget="selection"/>	                
                     <field name="process_model_id" widget="selection"/>
-                    <button name="generate_phases" string="Generate Phases" type="object" icon="gtk-convert"/>                        
+                    <button name="generate_phases" string="Generate Phases" type="object" icon="gtk-convert" />  
                 </group>
                 <group colspan="4">                                    
                     <field name="description" colspan="4"/>
@@ -517,12 +517,17 @@
                 		</field>
                 	</page>     
                     <page string="Documents">
-                		<field name="process_document_ids" mode="tree,form" widget="many2many" nolabel="1">
+                		<field name="process_document_ids" mode="tree,form"  widget="one2many_list" nolabel="1">
                 			<tree string="Documents">
 		                		<field name="process_phase_id"/>
 		                		<field name="name" string="Document"/>
 		                		<field name="state"/>
 		                	</tree>
+                			<form string="Documents">
+		                		<field name="process_phase_id"/>
+		                		<field name="name" string="Document"/>
+		                		<field name="state"/>
+		                	</form>		                	
 		                </field>			            			
                 	</page>
                            	                	

From f87793290ae44f8c115e9e075c7271b5f87f246e Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting <codehost@crowberry>
Date: Tue, 26 Jan 2010 04:51:45 +0000
Subject: [PATCH 34/34] Launchpad automatic translations update.

bzr revid: codehost@crowberry-20100126045145-ukq1gzzn3l91z733
---
 bin/addons/base/i18n/ru.po | 408 +++++++++++++++++++++----------------
 bin/addons/base/i18n/tr.po |   4 +-
 bin/addons/base/i18n/uk.po |   4 +-
 3 files changed, 235 insertions(+), 181 deletions(-)

diff --git a/bin/addons/base/i18n/ru.po b/bin/addons/base/i18n/ru.po
index ccfa79983e2..feb5a521158 100644
--- a/bin/addons/base/i18n/ru.po
+++ b/bin/addons/base/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-01-23 05:36+0000\n"
+"PO-Revision-Date: 2010-01-25 16:05+0000\n"
 "Last-Translator: Paul Korotkov <korotkov.paul@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-01-24 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-01-26 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
 #: model:res.country,name:base.sh
 msgid "Saint Helena"
-msgstr ""
+msgstr "Сент-Хелен"
 
 #. module: base
 #: wizard_view:res.partner.sms_send,init:0
@@ -29,7 +29,7 @@ msgstr "Шлюз SMS: clickatell"
 #. module: base
 #: view:res.lang:0
 msgid "%j - Day of the year as a decimal number [001,366]."
-msgstr ""
+msgstr "%j - Порядковый номер дня в году в виде десятичного числа [001,366]."
 
 #. module: base
 #: field:ir.values,meta_unpickle:0
@@ -63,7 +63,7 @@ msgstr "Рабочий процесс"
 #. module: base
 #: view:wizard.module.lang.export:0
 msgid "To browse official translations, you can visit this link: "
-msgstr ""
+msgstr "Для просмотра официальных переводов пройдите по этой ссылке: "
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
@@ -78,12 +78,12 @@ msgstr "Рабочий процесс включен"
 #. module: base
 #: view:ir.module.module:0
 msgid "Created Views"
-msgstr ""
+msgstr "Созданные виды"
 
 #. module: base
 #: view:workflow.activity:0
 msgid "Outgoing transitions"
-msgstr ""
+msgstr "Исходящие переходы"
 
 #. module: base
 #: selection:ir.report.custom,frequency:0
@@ -93,7 +93,7 @@ msgstr "Ежегодно"
 #. module: base
 #: field:ir.actions.act_window,target:0
 msgid "Target Window"
-msgstr ""
+msgstr "Окно назначения"
 
 #. module: base
 #: model:ir.actions.todo,note:base.config_wizard_simple_view
@@ -175,7 +175,7 @@ msgstr "ir.report.custom.fields"
 #. module: base
 #: view:res.partner:0
 msgid "Search Partner"
-msgstr ""
+msgstr "Искать партнера"
 
 #. module: base
 #: code:addons/base/module/wizard/wizard_export_lang.py:0
@@ -216,6 +216,8 @@ msgid ""
 "Save this document to a %s file and edit it with a specific software or a "
 "text editor. The file encoding is UTF-8."
 msgstr ""
+"Сохраните данный документ в файл %s и измените его при помощи специального "
+"ПО или текстового редактора. Кодовая таблица UTF-8."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -226,13 +228,14 @@ msgstr "STOCK_DELETE"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Password mismatch !"
-msgstr ""
+msgstr "Несоответствие пароля !"
 
 #. module: base
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "This url '%s' must provide an html file with links to zip modules"
 msgstr ""
+"По этому адресу '%s' должен располагаться файл html со ссылками на модули zip"
 
 #. module: base
 #: selection:res.request,state:0
@@ -242,12 +245,12 @@ msgstr "активен"
 #. module: base
 #: field:ir.actions.wizard,wiz_name:0
 msgid "Wizard Name"
-msgstr ""
+msgstr "Название мастера"
 
 #. module: base
 #: view:res.lang:0
 msgid "%y - Year without century as a decimal number [00,99]."
-msgstr ""
+msgstr "%y - Год без указания века как десятичное число [00, 99]."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -319,17 +322,17 @@ msgstr ""
 #: wizard_view:server.action.create,init:0
 #: wizard_field:server.action.create,init,type:0
 msgid "Select Action Type"
-msgstr ""
+msgstr "Выберите тип действия"
 
 #. module: base
 #: selection:ir.actions.todo,type:0
 msgid "Configure"
-msgstr ""
+msgstr "Настроить"
 
 #. module: base
 #: model:res.country,name:base.tv
 msgid "Tuvalu"
-msgstr ""
+msgstr "Тувалу"
 
 #. module: base
 #: selection:ir.model,state:0
@@ -340,7 +343,7 @@ msgstr "Пользовательский объект"
 #. module: base
 #: field:res.lang,date_format:0
 msgid "Date Format"
-msgstr ""
+msgstr "Формат даты"
 
 #. module: base
 #: field:res.bank,email:0
@@ -351,7 +354,7 @@ msgstr "Эл. почта"
 #. module: base
 #: model:res.country,name:base.an
 msgid "Netherlands Antilles"
-msgstr ""
+msgstr "Нидерландские Антиллы"
 
 #. module: base
 #: code:addons/base/res/res_user.py:0
@@ -360,6 +363,8 @@ msgid ""
 "You can not remove the admin user as it is used internally for resources "
 "created by OpenERP (updates, module installation, ...)"
 msgstr ""
+"Вы не можете удалить учетную запись admin, так как она используется для "
+"объектов, созданных OpenERP (обновления, установка модулей, и т.п.)"
 
 #. module: base
 #: model:res.country,name:base.gf
@@ -369,12 +374,12 @@ msgstr ""
 #. module: base
 #: field:ir.ui.view.custom,ref_id:0
 msgid "Original View"
-msgstr ""
+msgstr "Исходный вид"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Bosnian / bosanski jezik"
-msgstr ""
+msgstr "Боснийский / bosanski jezik"
 
 #. module: base
 #: help:ir.actions.report.xml,attachment_use:0
@@ -382,11 +387,13 @@ msgid ""
 "If you check this, then the second time the user prints with same attachment "
 "name, it returns the previous report."
 msgstr ""
+"Если Вы поставите здесь отметку, в следующий раз, когда пользователь введёт "
+"точно такое же название вложения, появится предыдущий отчёт."
 
 #. module: base
 #: help:res.lang,iso_code:0
 msgid "This ISO code is the name of po files to use for translations"
-msgstr ""
+msgstr "Этот код ISO является именем файлов перевода в формате po"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -406,7 +413,7 @@ msgstr "Название страны"
 #. module: base
 #: model:res.country,name:base.coreturn
 msgid "Colombia"
-msgstr ""
+msgstr "Колумбия"
 
 #. module: base
 #: view:ir.module.module:0
@@ -454,7 +461,7 @@ msgstr "STOCK_CUT"
 #: view:ir.actions.wizard:0
 #: model:ir.ui.menu,name:base.menu_ir_action_wizard
 msgid "Wizards"
-msgstr ""
+msgstr "Мастера"
 
 #. module: base
 #: selection:res.config.view,view:0
@@ -465,12 +472,12 @@ msgstr "Расширенный интерфейс"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Custom fields must have a name that starts with 'x_' !"
-msgstr ""
+msgstr "Названия пользовательских полей должны начинаться с 'x_'  !"
 
 #. module: base
 #: help:ir.actions.server,action_id:0
 msgid "Select the Action Window, Report, Wizard to be executed."
-msgstr ""
+msgstr "Выберите Действие, Отчёт или Мастер для выполнения."
 
 #. module: base
 #: view:wizard.module.lang.export:0
@@ -485,23 +492,23 @@ msgstr "Описание модели"
 #. module: base
 #: field:workflow.transition,trigger_expr_id:0
 msgid "Trigger Expression"
-msgstr ""
+msgstr "Выражение триггера"
 
 #. module: base
 #: model:res.country,name:base.jo
 msgid "Jordan"
-msgstr ""
+msgstr "Иордания"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not remove the model '%s' !"
-msgstr ""
+msgstr "Вы не можете удалить модель'%s' !"
 
 #. module: base
 #: model:res.country,name:base.er
 msgid "Eritrea"
-msgstr ""
+msgstr "Эритрия"
 
 #. module: base
 #: view:res.config.view:0
@@ -511,7 +518,7 @@ msgstr "Настройка простого вида"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Bulgarian / български"
-msgstr ""
+msgstr "Болгарский / български"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_actions_actions
@@ -542,7 +549,7 @@ msgstr "STOCK_INDEX"
 #. module: base
 #: model:res.country,name:base.rs
 msgid "Serbia"
-msgstr ""
+msgstr "Сербия"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -552,7 +559,7 @@ msgstr "Мастер вида"
 #. module: base
 #: model:res.country,name:base.kh
 msgid "Cambodia, Kingdom of"
-msgstr ""
+msgstr "Королевство Камбоджа"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -570,12 +577,12 @@ msgstr "STOCK_DIALOG_QUESTION"
 #. module: base
 #: model:res.country,name:base.pg
 msgid "Papua New Guinea"
-msgstr ""
+msgstr "Папуа Новая Гвинея"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_4
 msgid "Basic Partner"
-msgstr ""
+msgstr "Обычный партнёр"
 
 #. module: base
 #: rml:ir.module.reference:0
@@ -585,12 +592,12 @@ msgstr ","
 #. module: base
 #: view:res.partner:0
 msgid "My Partners"
-msgstr ""
+msgstr "Мои партнеры"
 
 #. module: base
 #: model:res.country,name:base.es
 msgid "Spain"
-msgstr ""
+msgstr "Испания"
 
 #. module: base
 #: wizard_view:module.upgrade,end:0
@@ -606,7 +613,7 @@ msgstr "Моб. тел."
 #. module: base
 #: model:res.country,name:base.om
 msgid "Oman"
-msgstr ""
+msgstr "Оман"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_payterm_form
@@ -617,7 +624,7 @@ msgstr "Условия платежа"
 #. module: base
 #: model:res.country,name:base.nu
 msgid "Niue"
-msgstr ""
+msgstr "Ниуэ"
 
 #. module: base
 #: selection:ir.cron,interval_type:0
@@ -628,6 +635,8 @@ msgstr "Рабочие дни"
 #: help:ir.values,action_id:0
 msgid "This field is not used, it only helps you to select the right action."
 msgstr ""
+"Это поле не используется, оно только помогает Вам выбрать правильное "
+"действие."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_menu_create
@@ -638,12 +647,12 @@ msgstr "Создать меню"
 #. module: base
 #: model:res.country,name:base.in
 msgid "India"
-msgstr ""
+msgstr "Индия"
 
 #. module: base
 #: model:ir.model,name:base.model_maintenance_contract_module
 msgid "maintenance contract modules"
-msgstr ""
+msgstr "модули по договору поддержки"
 
 #. module: base
 #: view:ir.values:0
@@ -653,13 +662,13 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.ad
 msgid "Andorra, Principality of"
-msgstr ""
+msgstr "Княжество Андорра"
 
 #. module: base
 #: field:ir.module.category,child_ids:0
 #: field:res.partner.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Подчиненные категории"
 
 #. module: base
 #: selection:wizard.module.lang.export,format:0
@@ -674,7 +683,7 @@ msgstr "Множитель"
 #. module: base
 #: view:res.lang:0
 msgid "%B - Full month name."
-msgstr ""
+msgstr "%B - Полное название месяца."
 
 #. module: base
 #: field:ir.actions.report.xml,report_type:0
@@ -725,18 +734,18 @@ msgstr "Неправильный XML для просмотра архитект
 #. module: base
 #: model:res.country,name:base.ky
 msgid "Cayman Islands"
-msgstr ""
+msgstr "Каймановы острова"
 
 #. module: base
 #: model:res.country,name:base.ir
 msgid "Iran"
-msgstr ""
+msgstr "Иран"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_request-act
 #: model:ir.ui.menu,name:base.menu_res_request_act
 msgid "My Requests"
-msgstr ""
+msgstr "Мои запросы"
 
 #. module: base
 #: field:ir.sequence,name:0
@@ -747,27 +756,27 @@ msgstr "Название последовательности"
 #. module: base
 #: model:res.country,name:base.td
 msgid "Chad"
-msgstr ""
+msgstr "Чад"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Spanish (AR) / Español (AR)"
-msgstr ""
+msgstr "Испанский (Аргентина) / Español (AR)"
 
 #. module: base
 #: model:res.country,name:base.ug
 msgid "Uganda"
-msgstr ""
+msgstr "Уганда"
 
 #. module: base
 #: model:res.country,name:base.ne
 msgid "Niger"
-msgstr ""
+msgstr "Нигер"
 
 #. module: base
 #: model:res.country,name:base.ba
 msgid "Bosnia-Herzegovina"
-msgstr ""
+msgstr "Босния и Герцеговина"
 
 #. module: base
 #: field:ir.report.custom.fields,alignment:0
@@ -786,6 +795,9 @@ msgid ""
 "decimal number [00,53]. All days in a new year preceding the first Monday "
 "are considered to be in week 0."
 msgstr ""
+"%W - Порядковый номер недели в году (первый день недели - понедельник) как "
+"десятичное число [00, 53]. Все дни нового года, идущие перед первым "
+"понедельником года входят в неделю номер 0."
 
 #. module: base
 #: field:res.partner.event,planned_cost:0
@@ -816,12 +828,12 @@ msgstr "Хранилище"
 #. module: base
 #: model:res.country,name:base.gs
 msgid "S. Georgia & S. Sandwich Isls."
-msgstr ""
+msgstr "Южная Джорджия и Южные Сандвичевы Острова"
 
 #. module: base
 #: field:ir.actions.url,url:0
 msgid "Action URL"
-msgstr ""
+msgstr "Перейти по адресу"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -831,12 +843,12 @@ msgstr "STOCK_JUSTIFY_FILL"
 #. module: base
 #: model:res.country,name:base.mh
 msgid "Marshall Islands"
-msgstr ""
+msgstr "Маршалловы Острова"
 
 #. module: base
 #: model:res.country,name:base.ht
 msgid "Haiti"
-msgstr ""
+msgstr "Гаити"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -846,13 +858,13 @@ msgstr "RML"
 #. module: base
 #: selection:ir.ui.view,type:0
 msgid "Search"
-msgstr ""
+msgstr "Найти"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Pie charts need exactly two fields"
-msgstr ""
+msgstr "Для радиальной диаграммы требуется ровно два поля"
 
 #. module: base
 #: help:wizard.module.lang.export,lang:0
@@ -862,12 +874,12 @@ msgstr "Для экспорта нового языка, не выбирайте
 #. module: base
 #: model:res.country,name:base.md
 msgid "Moldavia"
-msgstr ""
+msgstr "Молдавия"
 
 #. module: base
 #: view:ir.module.module:0
 msgid "Features"
-msgstr ""
+msgstr "Особенности"
 
 #. module: base
 #: field:ir.report.custom,frequency:0
@@ -900,7 +912,7 @@ msgstr "STOCK_MISSING_IMAGE"
 #. module: base
 #: view:res.users:0
 msgid "Define New Users"
-msgstr ""
+msgstr "Добавить пользователей"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -919,6 +931,8 @@ msgid ""
 "you select the invoice, then `object.invoice_address_id.email` is the field "
 "which gives the correct address"
 msgstr ""
+"Задает поля, используемые для e-mail. Например, когда Вы выбираете счет, "
+"поле `object.invoice_address_id.email` будет содержать соответствующий адрес."
 
 #. module: base
 #: field:res.roles,name:0
@@ -933,12 +947,12 @@ msgstr "Выделенный менеджер продаж"
 #. module: base
 #: rml:ir.module.reference:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: base
 #: field:res.payterm,name:0
 msgid "Payment Term (short name)"
-msgstr ""
+msgstr "Условия оплаты (кратко)"
 
 #. module: base
 #: model:ir.model,name:base.model_res_bank
@@ -950,12 +964,12 @@ msgstr "Банк"
 #. module: base
 #: view:res.lang:0
 msgid "Examples"
-msgstr ""
+msgstr "Примеры"
 
 #. module: base
 #: field:ir.module.module,reports_by_module:0
 msgid "Reports"
-msgstr ""
+msgstr "Отчёты"
 
 #. module: base
 #: field:workflow,on_create:0
@@ -982,7 +996,7 @@ msgstr "Вход"
 #: view:maintenance.contract:0
 #: field:maintenance.contract,module_ids:0
 msgid "Covered Modules"
-msgstr ""
+msgstr "Затронутые модули"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -993,7 +1007,7 @@ msgstr "STOCK_COPY"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "Model %s Does not Exist !"
-msgstr ""
+msgstr "Модель %s не существует !"
 
 #. module: base
 #: code:addons/base/module/module.py:0
@@ -1002,6 +1016,8 @@ msgid ""
 "You try to install the module '%s' that depends on the module:'%s'.\n"
 "But this module is not available in your system."
 msgstr ""
+"Вы пытаетесь установить модуль '%s', зависящий от модуля '%s',\n"
+"но последний отсутствует в вашей системе."
 
 #. module: base
 #: model:ir.model,name:base.model_res_request_link
@@ -1016,7 +1032,7 @@ msgstr "Проверить новые модули"
 #. module: base
 #: model:res.country,name:base.km
 msgid "Comoros"
-msgstr ""
+msgstr "Коморские Острова"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_server_action
@@ -1028,7 +1044,7 @@ msgstr "Действия сервера"
 #. module: base
 #: model:res.country,name:base.tp
 msgid "East Timor"
-msgstr ""
+msgstr "Восточный Тимор"
 
 #. module: base
 #: view:ir.rule:0
@@ -1043,7 +1059,7 @@ msgstr "Валюта расчетов"
 #. module: base
 #: model:res.country,name:base.kg
 msgid "Kyrgyz Republic (Kyrgyzstan)"
-msgstr ""
+msgstr "Киргизия (Кыргызстан)"
 
 #. module: base
 #: model:ir.model,name:base.model_wizard_ir_model_menu_create_line
@@ -1059,7 +1075,7 @@ msgstr "Дней: %(day)"
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not read this document! (%s)"
-msgstr ""
+msgstr "Вы не можете читать данный документ!  (%s)"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1069,12 +1085,12 @@ msgstr "STOCK_FIND_AND_REPLACE"
 #. module: base
 #: model:res.country,name:base.mv
 msgid "Maldives"
-msgstr ""
+msgstr "Мальдивы"
 
 #. module: base
 #: help:ir.values,res_id:0
 msgid "Keep 0 if the action must appear on all resources."
-msgstr ""
+msgstr "Оставьте 0, если действие предназначено для всех ресурсов."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_rule
@@ -1098,6 +1114,9 @@ msgid ""
 "consider the present one as void. Do not hesitate to contact our accounting "
 "department at (+32).81.81.37.00."
 msgstr ""
+"Если вы уже произвели оплату, не обращайте внимание на это письмо. "
+"Пожалуйста, свяжитесь с бухгалтерией по телефону "
+"________________________________."
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1121,12 +1140,12 @@ msgstr "Пользовательский отчет"
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (копия)"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Year without century: %(y)s"
-msgstr ""
+msgstr "Год без указания века: %(y)"
 
 #. module: base
 #: view:res.lang:0
@@ -1136,7 +1155,7 @@ msgstr ""
 #. module: base
 #: help:res.users,company_id:0
 msgid "The company this user is currently working on."
-msgstr ""
+msgstr "Организация, в которой работает пользователь."
 
 #. module: base
 #: help:ir.actions.server,message:0
@@ -1144,6 +1163,8 @@ msgid ""
 "Specify the message. You can use the fields from the object. e.g. `Dear [[ "
 "object.partner_id.name ]]`"
 msgstr ""
+"Укажите сообщение. Вы можете использовать поля из объекта. Например, "
+"`Уважаемый [[ object.partner_id.name ]]`"
 
 #. module: base
 #: field:ir.actions.server,trigger_name:0
@@ -1182,7 +1203,7 @@ msgstr "Формула"
 #: code:addons/base/res/res_user.py:0
 #, python-format
 msgid "Can not remove root user!"
-msgstr ""
+msgstr "Невозможно удалить суперпользователя!"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1192,7 +1213,7 @@ msgstr "STOCK_JUSTIFY_LEFT"
 #. module: base
 #: model:res.country,name:base.mw
 msgid "Malawi"
-msgstr ""
+msgstr "Малави"
 
 #. module: base
 #: field:res.partner.address,type:0
@@ -1202,7 +1223,7 @@ msgstr "Тип адреса"
 #. module: base
 #: selection:ir.actions.todo,start_on:0
 msgid "Auto"
-msgstr ""
+msgstr "Авто"
 
 #. module: base
 #: view:res.request:0
@@ -1221,6 +1242,9 @@ msgid ""
 "decimal number [00,53]. All days in a new year preceding the first Sunday "
 "are considered to be in week 0."
 msgstr ""
+"%U - Порядковый номер недели в году (первый день недели - воскресенье) как "
+"десятичное число [00, 53]. Все дни нового года, предшествующие первому "
+"воскресенью, входят в неделю номер 0."
 
 #. module: base
 #: wizard_view:module.lang.install,init:0
@@ -1233,6 +1257,8 @@ msgid ""
 "If set, sequence will only be used in case this python expression matches, "
 "and will precede other sequences."
 msgstr ""
+"Если задано, последовательность будет использована только при удовлетворении "
+"условия и будет иметь приоритет перед другими последовательностями"
 
 #. module: base
 #: selection:ir.actions.act_window,view_type:0
@@ -1245,7 +1271,7 @@ msgstr "В виде дерева"
 #. module: base
 #: view:maintenance.contract.wizard:0
 msgid "Could you check your contract information ?"
-msgstr ""
+msgstr "Вы не могли бы проверить информацию о вашем договоре?"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1257,6 +1283,8 @@ msgstr "STOCK_CLEAR"
 msgid ""
 "Keep empty if you don't want the user to be able to connect on the system."
 msgstr ""
+"Оставьте пустым, если не хотите, чтобы пользователь мог подключиться к "
+"системе."
 
 #. module: base
 #: field:ir.actions.act_window,view_mode:0
@@ -1267,7 +1295,7 @@ msgstr "Способ представления"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Spanish / Español"
-msgstr ""
+msgstr "Испанский / Español"
 
 #. module: base
 #: field:res.company,logo:0
@@ -1282,7 +1310,7 @@ msgstr "STOCK_PROPERTIES"
 #. module: base
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "Поиск контакта"
 
 #. module: base
 #: view:ir.module.module:0
@@ -1298,7 +1326,7 @@ msgstr "Новое окно"
 #. module: base
 #: model:res.country,name:base.bs
 msgid "Bahamas"
-msgstr ""
+msgstr "Багамские острова"
 
 #. module: base
 #: selection:res.partner.event,partner_type:0
@@ -1311,16 +1339,18 @@ msgstr "Потенциальный клиент"
 msgid ""
 "Couldn't generate the next id because some partners have an alphabetic id !"
 msgstr ""
+"Невозможно сгенерировать следующий идентификатор, так как у некоторых "
+"партнеров буквенные идентификаторы!"
 
 #. module: base
 #: view:ir.attachment:0
 msgid "Attachment"
-msgstr ""
+msgstr "Приложение"
 
 #. module: base
 #: model:res.country,name:base.ie
 msgid "Ireland"
-msgstr ""
+msgstr "Ирландия"
 
 #. module: base
 #: wizard_field:module.module.update,update,update:0
@@ -1346,22 +1376,22 @@ msgstr "Группы"
 #. module: base
 #: constraint:res.users:0
 msgid "This user can not connect using this company !"
-msgstr ""
+msgstr "Данный пользователь не может подключиться от имени этой организации!"
 
 #. module: base
 #: model:res.country,name:base.bz
 msgid "Belize"
-msgstr ""
+msgstr "Белиз"
 
 #. module: base
 #: model:res.country,name:base.ge
 msgid "Georgia"
-msgstr ""
+msgstr "Грузия"
 
 #. module: base
 #: model:res.country,name:base.pl
 msgid "Poland"
-msgstr ""
+msgstr "Польша"
 
 #. module: base
 #: selection:ir.module.module,state:0
@@ -1380,6 +1410,8 @@ msgid ""
 "This wizard will detect new terms in the application so that you can update "
 "them manually."
 msgstr ""
+"Этот мастер определит новые термины в приложении, так что их можно будет "
+"обновить вручную."
 
 #. module: base
 #: help:ir.actions.server,expression:0
@@ -1388,6 +1420,9 @@ msgid ""
 "order in Object, and you can have loop on the sales order line. Expression = "
 "`object.order_line`."
 msgstr ""
+"Введите поле/выражение, которое возвращает список. Например, выберите счёт в "
+"Object, и Вы сможете получить все позиции в счёте на оплату. Выражение = "
+"`object.order_line`."
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -1407,7 +1442,7 @@ msgstr "STOCK_NO"
 #. module: base
 #: model:res.country,name:base.st
 msgid "Saint Tome (Sao Tome) and Principe"
-msgstr ""
+msgstr "Сан-Томе и Принсипи"
 
 #. module: base
 #: selection:res.partner.address,type:0
@@ -1422,12 +1457,12 @@ msgstr "STOCK_REDO"
 #. module: base
 #: model:res.country,name:base.bb
 msgid "Barbados"
-msgstr ""
+msgstr "Барбадос"
 
 #. module: base
 #: model:res.country,name:base.mg
 msgid "Madagascar"
-msgstr ""
+msgstr "Мадагаскар"
 
 #. module: base
 #: constraint:ir.model:0
@@ -1440,7 +1475,7 @@ msgstr ""
 #. module: base
 #: help:ir.rule.group,global:0
 msgid "Make the rule global, otherwise it needs to be put on a group"
-msgstr ""
+msgstr "Задайте правило глобально или для определенной группы"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_menu_admin
@@ -1453,17 +1488,17 @@ msgstr "Меню"
 #. module: base
 #: field:res.currency,rate:0
 msgid "Current Rate"
-msgstr ""
+msgstr "Текущий курс"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Greek / Ελληνικά"
-msgstr ""
+msgstr "Греческий / Ελληνικά"
 
 #. module: base
 #: view:ir.values:0
 msgid "Action To Launch"
-msgstr ""
+msgstr "Действие для запуска"
 
 #. module: base
 #: selection:ir.report.custom.fields,fc0_op:0
@@ -1482,18 +1517,18 @@ msgstr "Цель действия"
 #. module: base
 #: model:res.country,name:base.ai
 msgid "Anguilla"
-msgstr ""
+msgstr "Ангилья"
 
 #. module: base
 #: field:ir.model.config,password_check:0
 msgid "Confirmation"
-msgstr ""
+msgstr "Подтверждение"
 
 #. module: base
 #: code:addons/base/ir/ir_report_custom.py:0
 #, python-format
 msgid "Enter at least one field !"
-msgstr ""
+msgstr "Укажите хотя бы одно поле !"
 
 #. module: base
 #: field:ir.ui.view_sc,name:0
@@ -1511,11 +1546,13 @@ msgid ""
 "Provide the field name that the record id refers to for the write operation. "
 "If it is empty it will refer to the active id of the object."
 msgstr ""
+"Укажите имя поля, где ID записи ссылается на операцию записи. Если это поле "
+"пусто, оно должно ссылаться на активный ID объекта."
 
 #. module: base
 #: model:res.country,name:base.zw
 msgid "Zimbabwe"
-msgstr ""
+msgstr "Зимбабве"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_translation_export
@@ -1536,13 +1573,13 @@ msgstr "Адрес эл. почты"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "French (BE) / Français (BE)"
-msgstr ""
+msgstr "Французский (Бельгия) / Français (BE)"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not write in this document! (%s)"
-msgstr ""
+msgstr "Вы не можете записывать в данный документ! (%s)"
 
 #. module: base
 #: view:ir.actions.server:0
@@ -1553,12 +1590,12 @@ msgstr "Действие сервера"
 #. module: base
 #: model:res.country,name:base.tt
 msgid "Trinidad and Tobago"
-msgstr ""
+msgstr "Тринидад и Тобаго"
 
 #. module: base
 #: model:res.country,name:base.lv
 msgid "Latvia"
-msgstr ""
+msgstr "Латвия"
 
 #. module: base
 #: view:ir.values:0
@@ -1574,7 +1611,7 @@ msgstr "Соответствие полей"
 #: model:ir.actions.act_window,name:base.res_request-closed
 #: model:ir.ui.menu,name:base.next_id_12_close
 msgid "My Closed Requests"
-msgstr ""
+msgstr "Мои закрытые запросы"
 
 #. module: base
 #: model:ir.ui.menu,name:base.menu_custom
@@ -1584,7 +1621,7 @@ msgstr "Настройка системы"
 #. module: base
 #: model:res.country,name:base.py
 msgid "Paraguay"
-msgstr ""
+msgstr "Парагвай"
 
 #. module: base
 #: selection:ir.report.custom.fields,alignment:0
@@ -1604,7 +1641,7 @@ msgstr "Назначение"
 #. module: base
 #: model:res.country,name:base.lt
 msgid "Lithuania"
-msgstr ""
+msgstr "Литва"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1614,7 +1651,7 @@ msgstr "STOCK_PRINT_PREVIEW"
 #. module: base
 #: model:res.country,name:base.si
 msgid "Slovenia"
-msgstr ""
+msgstr "Словения"
 
 #. module: base
 #: view:res.partner.canal:0
@@ -1625,22 +1662,22 @@ msgstr "Канал"
 #. module: base
 #: view:res.lang:0
 msgid "%p - Equivalent of either AM or PM."
-msgstr ""
+msgstr "%p - эквивалент AM или PM."
 
 #. module: base
 #: view:ir.actions.server:0
 msgid "Iteration Actions"
-msgstr ""
+msgstr "Повторяющиеся действия"
 
 #. module: base
 #: field:maintenance.contract,date_stop:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Дата окончания"
 
 #. module: base
 #: model:res.country,name:base.nz
 msgid "New Zealand"
-msgstr ""
+msgstr "Новая Зеландия"
 
 #. module: base
 #: model:res.partner.category,name:base.res_partner_category_7
@@ -1650,7 +1687,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.nf
 msgid "Norfolk Island"
-msgstr ""
+msgstr "Остров Норфолк"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1665,7 +1702,7 @@ msgstr "Оператор"
 #. module: base
 #: wizard_view:module.lang.install,start:0
 msgid "Installation Done"
-msgstr ""
+msgstr "Установка завершена"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1686,7 +1723,7 @@ msgstr "вправо"
 #. module: base
 #: model:res.country,name:base.bd
 msgid "Bangladesh"
-msgstr ""
+msgstr "Бангладеш"
 
 #. module: base
 #: constraint:res.company:0
@@ -1696,13 +1733,13 @@ msgstr "Ошибка! Невозможно создать рекурсивную
 #. module: base
 #: selection:maintenance.contract,state:0
 msgid "Valid"
-msgstr ""
+msgstr "Действительный"
 
 #. module: base
 #: code:addons/base/ir/ir_model.py:0
 #, python-format
 msgid "You can not delete this document! (%s)"
-msgstr ""
+msgstr "Вы не можете удалить данный документ! (%s)"
 
 #. module: base
 #: selection:ir.translation,type:0
@@ -1713,27 +1750,27 @@ msgstr "XSL"
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Can not upgrade module '%s'. It is not installed."
-msgstr ""
+msgstr "Невозможно обновить модуль '%s'. Он не установлен."
 
 #. module: base
 #: model:res.country,name:base.cu
 msgid "Cuba"
-msgstr ""
+msgstr "Куба"
 
 #. module: base
 #: view:res.lang:0
 msgid "%S - Second as a decimal number [00,61]."
-msgstr ""
+msgstr "%S - Секунды как десятичное число [00, 59]."
 
 #. module: base
 #: model:res.country,name:base.am
 msgid "Armenia"
-msgstr ""
+msgstr "Армения"
 
 #. module: base
 #: view:ir.sequence:0
 msgid "Year with century: %(year)s"
-msgstr ""
+msgstr "Год с указанием века: %(year)"
 
 #. module: base
 #: selection:ir.report.custom,frequency:0
@@ -1743,14 +1780,14 @@ msgstr "Ежедневно"
 #. module: base
 #: model:res.country,name:base.se
 msgid "Sweden"
-msgstr ""
+msgstr "Швеция"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
 #: selection:ir.ui.view,type:0
 #: selection:wizard.ir.model.menu.create.line,view_type:0
 msgid "Gantt"
-msgstr ""
+msgstr "Диаграмма Ганта"
 
 #. module: base
 #: view:ir.property:0
@@ -1771,12 +1808,12 @@ msgstr "terp-project"
 #. module: base
 #: view:ir.actions.server:0
 msgid "Iteration Action Configuration"
-msgstr ""
+msgstr "Настройка повторяющегося действия"
 
 #. module: base
 #: model:res.country,name:base.at
 msgid "Austria"
-msgstr ""
+msgstr "Австрия"
 
 #. module: base
 #: selection:ir.actions.act_window.view,view_mode:0
@@ -1788,7 +1825,7 @@ msgstr "Календарь"
 #. module: base
 #: field:workflow.activity,signal_send:0
 msgid "Signal (subflow.*)"
-msgstr ""
+msgstr "Сигнал (subflow.*)"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module_dependency
@@ -1798,7 +1835,7 @@ msgstr "Зависимость модуля"
 #. module: base
 #: selection:maintenance.contract.wizard,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Черновик"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -1845,6 +1882,8 @@ msgid ""
 "If you use a formula type, use a python expression using the variable "
 "'object'."
 msgstr ""
+"Если Вы используете формулу, используйте выражения языка Python с переменной "
+"'object'."
 
 #. module: base
 #: field:res.partner.address,birthdate:0
@@ -1855,7 +1894,7 @@ msgstr "Дата рождения"
 #: model:ir.actions.act_window,name:base.action_partner_title_contact
 #: model:ir.ui.menu,name:base.menu_partner_title_contact
 msgid "Contact Titles"
-msgstr ""
+msgstr "Обращения к людям"
 
 #. module: base
 #: model:ir.model,name:base.model_res_partner_som
@@ -1870,12 +1909,12 @@ msgstr ""
 #. module: base
 #: field:ir.model.fields,select_level:0
 msgid "Searchable"
-msgstr ""
+msgstr "Доступно для поиска"
 
 #. module: base
 #: model:res.country,name:base.uy
 msgid "Uruguay"
-msgstr ""
+msgstr "Уругвай"
 
 #. module: base
 #: view:res.partner.event:0
@@ -1895,17 +1934,17 @@ msgstr "Префикс"
 #. module: base
 #: field:ir.actions.server,loop_action:0
 msgid "Loop Action"
-msgstr ""
+msgstr "Повторное действие"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "German / Deutsch"
-msgstr ""
+msgstr "Немецкий / Deutsch"
 
 #. module: base
 #: help:ir.actions.server,trigger_name:0
 msgid "Select the Signal name that is to be used as the trigger."
-msgstr ""
+msgstr "Выберите название Сигнала, который будет использован для триггера."
 
 #. module: base
 #: view:ir.actions.server:0
@@ -1930,17 +1969,17 @@ msgstr "Ссылка на ID"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "French / Français"
-msgstr ""
+msgstr "Французский / Français"
 
 #. module: base
 #: model:res.country,name:base.mt
 msgid "Malta"
-msgstr ""
+msgstr "Мальта"
 
 #. module: base
 #: field:ir.actions.server,fields_lines:0
 msgid "Field Mappings."
-msgstr ""
+msgstr "Отображения полей."
 
 #. module: base
 #: model:ir.model,name:base.model_ir_module_module
@@ -1955,7 +1994,7 @@ msgstr "Модуль"
 #: model:ir.actions.act_window,name:base.action_res_bank_form
 #: model:ir.ui.menu,name:base.menu_action_res_bank_form
 msgid "Bank List"
-msgstr ""
+msgstr "Список банков"
 
 #. module: base
 #: field:ir.attachment,description:0
@@ -1982,12 +2021,12 @@ msgstr ""
 #. module: base
 #: field:res.users,action_id:0
 msgid "Home Action"
-msgstr ""
+msgstr "Действие со стороны пользователя"
 
 #. module: base
 #: field:res.lang,grouping:0
 msgid "Separator Format"
-msgstr ""
+msgstr "Формат разделителя"
 
 #. module: base
 #: view:wizard.module.lang.export:0
@@ -1997,7 +2036,7 @@ msgstr "Экпорт языка"
 #. module: base
 #: selection:maintenance.contract.wizard,state:0
 msgid "Unvalidated"
-msgstr ""
+msgstr "Непроверено"
 
 #. module: base
 #: model:ir.ui.menu,name:base.next_id_9
@@ -2013,24 +2052,24 @@ msgstr "Массовая рассылка"
 #. module: base
 #: model:res.country,name:base.yt
 msgid "Mayotte"
-msgstr ""
+msgstr "Майотта"
 
 #. module: base
 #: wizard_view:module.lang.import,init:0
 msgid "You can also import .po files."
-msgstr ""
+msgstr "Вы можете также импортировать файлы .po."
 
 #. module: base
 #: code:addons/base/maintenance/maintenance.py:0
 #, python-format
 msgid "Unable to find a valid contract"
-msgstr ""
+msgstr "Невозможно найти действующий договор"
 
 #. module: base
 #: code:addons/base/ir/ir_actions.py:0
 #, python-format
 msgid "Please specify an action to launch !"
-msgstr ""
+msgstr "Пожалуйста, укажите действие для запуска!"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2051,7 +2090,7 @@ msgstr "Модули для установки, обновления, или у
 #. module: base
 #: view:res.payterm:0
 msgid "Payment Term"
-msgstr ""
+msgstr "Условие оплаты"
 
 #. module: base
 #: field:ir.report.custom,footer:0
@@ -2061,7 +2100,7 @@ msgstr "Нижний колонтитул отчета"
 #. module: base
 #: selection:res.lang,direction:0
 msgid "Right-to-Left"
-msgstr ""
+msgstr "Справа-налево"
 
 #. module: base
 #: wizard_view:module.lang.import,init:0
@@ -2096,7 +2135,7 @@ msgstr "terp-account"
 #: code:addons/base/module/module.py:0
 #, python-format
 msgid "Recursion error in modules dependencies !"
-msgstr ""
+msgstr "Ошибка рекурсии в зависимостях модулей!"
 
 #. module: base
 #: view:ir.model:0
@@ -2109,6 +2148,8 @@ msgid ""
 "Value Added Tax number. Check the box if the partner is subjected to the "
 "VAT. Used by the VAT legal statement."
 msgstr ""
+"Идентификационный номер налогоплательщика. Сделайте отметку, если партнер "
+"является плательщиком НДС. Используется для расчета НДС."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_module_category_tree
@@ -2119,7 +2160,7 @@ msgstr "Категории модулей"
 #. module: base
 #: selection:module.lang.install,init,lang:0
 msgid "Ukrainian / украї́нська мо́ва"
-msgstr ""
+msgstr "Украинский / украї́нська мо́ва"
 
 #. module: base
 #: selection:ir.actions.todo,state:0
@@ -2129,7 +2170,7 @@ msgstr "Не начато"
 #. module: base
 #: model:res.country,name:base.ru
 msgid "Russian Federation"
-msgstr ""
+msgstr "Российская Федерация"
 
 #. module: base
 #: field:res.company,name:0
@@ -2164,7 +2205,7 @@ msgstr "ИНН"
 #. module: base
 #: view:res.lang:0
 msgid "12. %w              ==> 5 ( Friday is the 6th day)"
-msgstr ""
+msgstr "12. %w              ==> 5 ( Пятница - 6й день)"
 
 #. module: base
 #: constraint:res.partner.category:0
@@ -2174,7 +2215,7 @@ msgstr "Ошибка ! Невозможно создать рекурсивну
 #. module: base
 #: view:res.lang:0
 msgid "%x - Appropriate date representation."
-msgstr ""
+msgstr "%x - Подходящий формат даты."
 
 #. module: base
 #: help:ir.module.repository,filter:0
@@ -2184,27 +2225,31 @@ msgid ""
 "- The second parenthesis must match the whole version number.\n"
 "- The last parenthesis must match the extension of the module."
 msgstr ""
+"Регулярное выражение для поиска модуля в хранилище:\n"
+"- В первых скобках указывается название модуля.\n"
+"- Во вторых скобках указывается номер версии.\n"
+"- В последних скобках указывается расширение модуля."
 
 #. module: base
 #: view:res.lang:0
 msgid "%M - Minute as a decimal number [00,59]."
-msgstr ""
+msgstr "%M - Минуты в виде десятичного числа [00, 59]."
 
 #. module: base
 #: model:res.country,name:base.tj
 msgid "Tajikistan"
-msgstr ""
+msgstr "Таджикистан"
 
 #. module: base
 #: model:ir.actions.act_window,name:base.act_values_form_action
 #: model:ir.ui.menu,name:base.menu_values_form_action
 msgid "Connect Actions To Client Events"
-msgstr ""
+msgstr "Ассоциировать действие с событиями клиента"
 
 #. module: base
 #: selection:ir.module.module,license:0
 msgid "GPL-2 or later version"
-msgstr ""
+msgstr "GPL версии 2 или более поздней"
 
 #. module: base
 #: selection:res.partner.event,type:0
@@ -2220,7 +2265,7 @@ msgstr ""
 #. module: base
 #: model:res.country,name:base.nr
 msgid "Nauru"
-msgstr ""
+msgstr "Науру"
 
 #. module: base
 #: model:ir.model,name:base.model_ir_property
@@ -2238,7 +2283,7 @@ msgstr "Форма"
 #. module: base
 #: model:res.country,name:base.me
 msgid "Montenegro"
-msgstr ""
+msgstr "Черногория"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2248,7 +2293,7 @@ msgstr "STOCK_QUIT"
 #. module: base
 #: view:ir.cron:0
 msgid "Technical Data"
-msgstr ""
+msgstr "Технические данные"
 
 #. module: base
 #: view:res.partner:0
@@ -2271,7 +2316,7 @@ msgstr "Для обновления"
 #. module: base
 #: model:res.country,name:base.ly
 msgid "Libya"
-msgstr ""
+msgstr "Ливия"
 
 #. module: base
 #: selection:ir.ui.menu,icon:0
@@ -2286,12 +2331,12 @@ msgstr "Репозитории"
 #. module: base
 #: model:res.country,name:base.cf
 msgid "Central African Republic"
-msgstr ""
+msgstr "Центрально-Африканская Республика"
 
 #. module: base
 #: model:res.country,name:base.li
 msgid "Liechtenstein"
-msgstr ""
+msgstr "Лихтенштейн"
 
 #. module: base
 #: model:res.partner.title,name:base.res_partner_title_ltd
@@ -2306,17 +2351,17 @@ msgstr "Штрих-код 13"
 #. module: base
 #: model:res.country,name:base.pt
 msgid "Portugal"
-msgstr ""
+msgstr "Португалия"
 
 #. module: base
 #: selection:maintenance.contract,state:0
 msgid "Unvalid"
-msgstr ""
+msgstr "Недействителен"
 
 #. module: base
 #: field:ir.module.module,certificate:0
 msgid "Quality Certificate"
-msgstr ""
+msgstr "Сертификат качества"
 
 #. module: base
 #: view:res.lang:0
@@ -2326,7 +2371,7 @@ msgstr ""
 #. module: base
 #: help:res.partner,customer:0
 msgid "Check this box if the partner is a customer."
-msgstr ""
+msgstr "Сделайте отметку, если партнёр - заказчик."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.res_lang_act_window
@@ -2339,12 +2384,12 @@ msgstr "Языки"
 #. module: base
 #: model:res.country,name:base.pw
 msgid "Palau"
-msgstr ""
+msgstr "Палау"
 
 #. module: base
 #: model:res.country,name:base.ec
 msgid "Ecuador"
-msgstr ""
+msgstr "Эквадор"
 
 #. module: base
 #: code:addons/base/module/wizard/wizard_export_lang.py:0
@@ -2354,17 +2399,20 @@ msgid ""
 "spreadsheet software. The file encoding is UTF-8. You have to translate the "
 "latest column before reimporting it."
 msgstr ""
+"Сохраните документ в файл .CSV и откройте его в вашем любимом табличном "
+"редакторе. Кодировка файла - UTF-8. Необходимо перевести последний столбец "
+"перед повторным импортом файла."
 
 #. module: base
 #: model:ir.actions.act_window,name:base.action_partner_customer_form
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Заказчики"
 
 #. module: base
 #: model:res.country,name:base.au
 msgid "Australia"
-msgstr ""
+msgstr "Австралия"
 
 #. module: base
 #: help:res.partner,lang:0
@@ -2379,7 +2427,7 @@ msgstr ""
 #. module: base
 #: rml:ir.module.reference:0
 msgid "Menu :"
-msgstr ""
+msgstr "Меню :"
 
 #. module: base
 #: selection:ir.model.fields,state:0
@@ -2400,7 +2448,7 @@ msgstr "содержимое SXW"
 #. module: base
 #: view:ir.cron:0
 msgid "Action to Trigger"
-msgstr ""
+msgstr "Действие триггера"
 
 #. module: base
 #: field:ir.report.custom.fields,fc0_operande:0
@@ -2441,6 +2489,8 @@ msgid ""
 "Specify the subject. You can use fields from the object, e.g. `Hello [[ "
 "object.partner_id.name ]]`"
 msgstr ""
+"Укажите объект. Вы можете использовать поля из объекта. Например, "
+"`Здравствуйте, [[ object.partner_id.name ]]`"
 
 #. module: base
 #: view:res.company:0
@@ -2450,7 +2500,7 @@ msgstr "Верхний/нижний колонтитул"
 #. module: base
 #: model:res.country,name:base.lb
 msgid "Lebanon"
-msgstr ""
+msgstr "Ливан"
 
 #. module: base
 #: wizard_field:module.lang.import,init,name:0
@@ -2460,7 +2510,7 @@ msgstr "Название языка"
 #. module: base
 #: model:res.country,name:base.va
 msgid "Holy See (Vatican City State)"
-msgstr ""
+msgstr "Ватикан (Папский Престол)"
 
 #. module: base
 #: help:ir.actions.server,condition:0
@@ -2468,6 +2518,8 @@ msgid ""
 "Condition that is to be tested before action is executed, e.g. "
 "object.list_price > object.cost_price"
 msgstr ""
+"Условие для проверки перед выполнением действия, например, "
+"object.list_price> object.cost_price"
 
 #. module: base
 #: wizard_field:base.module.import,init,module_file:0
@@ -2477,12 +2529,12 @@ msgstr ".ZIP-файл модуля"
 #. module: base
 #: field:res.roles,child_id:0
 msgid "Children"
-msgstr ""
+msgstr "Потомки"
 
 #. module: base
 #: field:workflow.transition,trigger_model:0
 msgid "Trigger Object"
-msgstr ""
+msgstr "Объект триггер"
 
 #. module: base
 #: selection:ir.report.custom,state:0
@@ -2498,12 +2550,12 @@ msgstr "Обновление системы"
 #. module: base
 #: field:workflow.activity,in_transitions:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "Входящие переходы"
 
 #. module: base
 #: model:res.country,name:base.sr
 msgid "Suriname"
-msgstr ""
+msgstr "Суринам"
 
 #. module: base
 #: field:ir.values,key2:0
@@ -2530,6 +2582,8 @@ msgid ""
 "You try to upgrade a module that depends on the module: %s.\n"
 "But this module is not available in your system."
 msgstr ""
+"Вы пробуете обновить модуль, зависящий от модуля: %s.\n"
+"Но этот модуль недоступен в вашей системе."
 
 #. module: base
 #: view:res.partner.address:0
@@ -3406,7 +3460,7 @@ msgstr ""
 #: model:ir.ui.menu,name:base.menu_partner_address_form
 #: view:res.partner.address:0
 msgid "Partner Addresses"
-msgstr "Адреса партнера"
+msgstr "Адреса партнеров"
 
 #. module: base
 #: selection:module.lang.install,init,lang:0
diff --git a/bin/addons/base/i18n/tr.po b/bin/addons/base/i18n/tr.po
index f0c19f600f9..595c74be26f 100644
--- a/bin/addons/base/i18n/tr.po
+++ b/bin/addons/base/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-01-24 18:52+0000\n"
+"PO-Revision-Date: 2010-01-25 05:45+0000\n"
 "Last-Translator: Oktay Altunergil <oktaya@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-01-25 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-01-26 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base
diff --git a/bin/addons/base/i18n/uk.po b/bin/addons/base/i18n/uk.po
index 323f6e08056..b944fba4d2f 100644
--- a/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-12-18 08:39+0000\n"
-"PO-Revision-Date: 2010-01-24 05:48+0000\n"
+"PO-Revision-Date: 2010-01-25 05:47+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-01-25 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-01-26 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base